Merge pull request #4236 from tloncorp/hm/hooks-cleanup

hooks: remaining cleanup

desk/app/channels-server.hoon

@@ -361,16 +361,16 @@
       =/  seq
         %+  skim
           seq.action
-        |=  =id:h
-        (~(has by hooks.hooks) id)
+        ~(has by hooks.hooks)
       =.  order.hooks  (~(put by order.hooks) nest.action seq)
-      (give-hook-response %order nest.action seq)
+      =/  =response:h  [%order nest.action seq]
+      (give %fact ~[/v0/hooks] hook-response-0+!>(response))
     ::
         %config
       ho-abet:(ho-configure:(ho-abed:ho-core id.action) +>.action)
     ::
-        %wait
-      ho-abet:(ho-wait:(ho-abed:ho-core id.action) +>.action)
+        %cron
+      ho-abet:(ho-cron:(ho-abed:ho-core id.action) +>.action)
     ::
         %rest
       ho-abet:(ho-rest:(ho-abed:ho-core id.action) origin.action)
@@ -543,7 +543,7 @@
   ^+  cor
   ?+  pole  ~|(bad-arvo-take/pole !!)
       [%hooks rest=*]
-    (wakeup-hook rest.pole)
+    (wake-hook rest.pole)
   ==
 ::
 ++  watch-groups  (safe-watch /groups [our.bowl %groups] /groups)
@@ -799,17 +799,16 @@
         (run-hooks event nest 'react action blocked')
       ?:  ?=(%.n -.result)
         ((slog p.result) no-op)
-      =/  new=c-post:c
+      =/  new=$>(?(%add-react %del-react) c-post:c)
         ?>  ?=([%on-post %react *] p.result)
-        ?~  react.p.result  [%del-react id.c-post ship.p.result]
+        ?~  react.p.result
+          [%del-react id.c-post ship.p.result]
         [%add-react id.c-post [ship u.react]:p.result]
       =/  [update=? reacts=v-reacts:c]
-        %+  ca-c-react  reacts.u.u.post
-        ?>(?=(?(%add-react %del-react) -.new) new)
+        (ca-c-react reacts.u.u.post new)
       ?.  update  no-op
       :-  `[%post id.c-post %reacts reacts]
-      %=  ca-core
-          posts.channel
+      %=  ca-core  posts.channel
         (put:on-v-posts:c posts.channel id.c-post ~ u.u.post(reacts reacts))
       ==
     ::
@@ -821,8 +820,7 @@
         (ca-c-reply u.u.post c-reply.c-post)
       ?~  update  no-op
       :-  `[%post id.c-post u.update]
-      %=  ca-core
-          posts.channel
+      %=  ca-core  posts.channel
         (put:on-v-posts:c posts.channel id.c-post ~ u.u.post)
       ==
     ==
@@ -895,13 +893,12 @@
         (run-hooks event nest 'delete blocked')
       ?:  ?=(%.n -.result)
         ((slog p.result) [~ replies])
-      =/  new=c-reply:c
+      =/  new=$>(?(%add-react %del-react) c-reply:c)
         ?>  ?=([%on-reply %react *] p.result)
         ?~  react.p.result  [%del-react id.c-reply ship.p.result]
         [%add-react id.c-reply [ship u.react]:p.result]
       =/  [update=? reacts=v-reacts:c]
-        %+  ca-c-react  reacts.u.u.reply
-        ?>(?=(?(%add-react %del-react) -.new) new)
+        (ca-c-react reacts.u.u.reply new)
       ?.  update  `replies
       :-  `[%reply id.c-reply %reacts reacts]
       (put:on-v-replies:c replies id.c-reply ~ u.u.reply(reacts reacts))
@@ -1005,9 +1002,9 @@
   %+  welp
   /(scot %p our.bowl)/[dude]/(scot %da now.bowl)
   path
-++  get-hook-context
+++  get-hook-bowl
   |=  [channel=(unit [nest:c v-channel:c]) =config:h]
-  ^-  context:h
+  ^-  bowl:h
   =/  group
     ?~  channel  ~
     =*  flag  group.perm.perm.+.u.channel
@@ -1024,12 +1021,8 @@
       [now our src eny]:bowl
   ==
 ::
-++  give-hook-response
-  |=  =response:h
-  ^+  cor
-  (give %fact ~[/v0/hooks] hook-response-0+!>(response))
 ++  ho-core
-  |_  [=id:h =hook:h gone=_|]
+  |_  [id=id-hook:h =hook:h gone=_|]
   ++  ho-core  .
   ++  emit  |=(=card ho-core(cor (^emit card)))
   ++  emil  |=(caz=(list card) ho-core(cor (^emil caz)))
@@ -1041,7 +1034,7 @@
     ==
   ::
   ++  ho-abed
-    |=  i=id:h
+    |=  i=id-hook:h
     ho-core(id i, hook (~(got by hooks.hooks) i))
   ::
   ++  ho-add
@@ -1057,71 +1050,62 @@
         ((slog 'compilation result:' p.result) ~)
       `p.result
     =.  hook  [id %0 name *data:m src compiled !>(~) ~]
-    =.  cor
-      =/  error=(unit tang)
-        ?:(?=(%& -.result) ~ `p.result)
-      (give-hook-response [%set id name src meta.hook error])
-    ho-core
+    =/  error=(unit tang)
+      ?:(?=(%& -.result) ~ `p.result)
+    (ho-give-response [%set id name src meta.hook error])
   ++  ho-edit
     |=  [name=(unit @t) src=(unit @t) meta=(unit data:m)]
     =?  src.hook  ?=(^ src)  u.src
     =/  result=(each vase tang)
       (compile:utils src.hook)
     ?:  ?=(%| -.result)
-      =.  cor
-        %-  give-hook-response
-        [%set id name.hook src.hook meta.hook `p.result]
-      ho-core
+      %-  ho-give-response
+      [%set id name.hook src.hook meta.hook `p.result]
     =?  name.hook  ?=(^ name)  u.name
     =?  meta.hook  ?=(^ meta)  u.meta
     =.  compiled.hook  `p.result
-    =.  cor
-      %-  give-hook-response
-      [%set id name.hook src.hook meta.hook ~]
-    ho-core
+    %-  ho-give-response
+    [%set id name.hook src.hook meta.hook ~]
   ::
   ++  ho-del
     =.  gone  &
     =.  cor
       %+  roll
-        ~(tap by (~(gut by crons.hooks) id *(map origin:h cron:h)))
-      |=  [[=origin:h =cron:h] cr=_cor]
-      (unschedule-cron:cr origin cron)
+        ~(tap by (~(gut by crons.hooks) id *cron:h))
+      |=  [[=origin:h =job:h] cr=_cor]
+      (unschedule-cron:cr origin job)
     =.  crons.hooks  (~(del by crons.hooks) id)
     =.  order.hooks
       %+  roll
         ~(tap by order.hooks)
-      |=  [[=nest:c ids=(list id:h)] or=(map nest:c (list id:h))]
+      |=  [[=nest:c ids=(list id-hook:h)] or=(map nest:c (list id-hook:h))]
       =-  (~(put by or) nest -)
-      (skip ids |=(i=id:h =(id i)))
-    =.  delayed.hooks
+      (skip ids |=(i=id-hook:h =(id i)))
+    =.  waiting.hooks
       %+  roll
-        ~(tap by delayed.hooks)
-      |=  [[=delay-id:h d=[* delayed-hook:h]] dh=_delayed.hooks]
-      ?.  =(id hook.d)  dh
-      (~(del by dh) delay-id)
-    =.  cor  (give-hook-response [%gone id])
-    ho-core
+        ~(tap by waiting.hooks)
+      |=  [[=id-wait:h w=[* waiting-hook:h]] wh=_waiting.hooks]
+      ?.  =(id hook.w)  wh
+      (~(del by wh) id-wait)
+    (ho-give-response [%gone id])
   ++  ho-configure
     |=  [=nest:c =config:h]
     ^+  ho-core
     =.  config.hook  (~(put by config.hook) nest config)
-    =.  cor  (give-hook-response [%config id nest config])
-    ho-core
-  ++  ho-wait
+    (ho-give-response [%config id nest config])
+  ++  ho-cron
     |=  [=origin:h schedule=$@(@dr schedule:h) =config:h]
     ^+  ho-core
-    =/  schedule
-      ?:  ?=(@ schedule)  [now.bowl schedule]
-      schedule
-    =/  crons  (~(gut by crons.hooks) id *(map origin:h cron:h))
-    =/  =cron:h  [id schedule config]
+    =?  schedule  ?=(@ schedule)
+      [now.bowl schedule]
+    ?>  ?=(^ schedule)
+    =/  =cron:h  (~(gut by crons.hooks) id *cron:h)
+    =/  =job:h  [id schedule config]
     =.  crons.hooks
       =-  (~(put by crons.hooks) id.hook -)
-      (~(put by crons) origin cron)
-    =.  cor  (schedule-cron origin cron)
-    =.  cor  (give-hook-response [%wait id origin schedule config])
-    ho-core
+      (~(put by cron) origin job)
+    =.  cor  (schedule-cron origin job)
+    (ho-give-response [%cron id origin schedule config])
   ++  ho-rest
     |=  =origin:h
     ^+  ho-core
@@ -1130,116 +1114,118 @@
     =.  crons.hooks
       (~(put by crons.hooks) id (~(del by crons) origin))
     =.  cor  (unschedule-cron origin cron)
-    =.  cor  (give-hook-response [%rest id origin])
-    ho-core
+    (ho-give-response [%rest id origin])
   ++  ho-run-single
     |=  [=event:h prefix=tape =origin:h =config:h]
     =/  channel
       ?@  origin  ~
       ?~  ch=(~(get by v-channels) origin)  ~
       `[origin u.ch]
-    =/  =context:h  (get-hook-context channel config)
+    =/  =bowl:h  (get-hook-bowl channel config)
     =/  return=(unit return:h)
-      (run-hook:utils [event context(hook hook)] hook)
+      (run-hook:utils [event bowl(hook hook)] hook)
     ?~  return
       %-  (slog (crip "{prefix} {<id>} failed, running on {<origin>}") ~)
       ho-core
     %-  (slog (crip "{prefix} {<id>} ran on {<origin>}") ~)
     =.  hook  hook(state new-state.u.return)
     =.  cor  (run-hook-effects effects.u.return origin)
     ho-core
+  ++  ho-give-response
+    |=  =response:h
+    (give %fact ~[/v0/hooks] hook-response-0+!>(response))
   --
 ++  run-hooks
   |=  [=event:h =nest:c default=cord]
   ^-  [(each event:h tang) _cor]
   =;  [result=(each event:h tang) effects=(list effect:h)]
     [result (run-hook-effects effects nest)]
-  =/  current-event  event
   =|  effects=(list effect:h)
   =/  order  (~(gut by order.hooks) nest ~)
   =/  channel  `[nest (~(got by v-channels) nest)]
-  =/  =context:h  (get-hook-context channel *config:h)
+  =/  =bowl:h  (get-hook-bowl channel *config:h)
   |-
   ?~  order
-    [&+current-event effects]
+    [&+event effects]
   =*  next  $(order t.order)
   =/  hook  (~(got by hooks.hooks) i.order)
-  =/  ctx  context(hook hook, config (~(gut by config.hook) nest ~))
+  =.  bowl  bowl(hook hook, config (~(gut by config.hook) nest ~))
   =/  return=(unit return:h)
-    (run-hook:utils [current-event ctx] hook)
+    (run-hook:utils [event bowl] hook)
   ?~  return  next
   =*  result  result.u.return
   =.  effects  (weld effects effects.u.return)
   =.  hooks.hooks  (~(put by hooks.hooks) i.order hook(state new-state.u.return))
   ?:  ?=(%denied -.result)
     [|+~[(fall msg.result default)] effects]
-  =.  current-event  new.result
+  =.  event  event.result
   next
-++  wakeup-hook
+++  wake-hook
   |=  =(pole knot)
   ^+  cor
-  ?+  pole  ~|(bad-arvo-take/pole !!)
-      [%delayed id=@ ~]
-    =/  =id:h  (slav %uv id.pole)
-    ?~  delay=(~(get by delayed.hooks) id)  cor
+  ?+  pole  ~|(bad-arvo-take+pole !!)
+      [%waiting id=@ ~]
+    =/  id=id-hook:h  (slav %uv id.pole)
+    ?~  wh=(~(get by waiting.hooks) id)  cor
     ::  make sure we clean up
-    =.  delayed.hooks  (~(del by delayed.hooks) id)
+    =.  waiting.hooks  (~(del by waiting.hooks) id)
     ::  ignore premature fires
-    ?:  (lth now.bowl fires-at.u.delay)  cor
-    =*  origin  origin.u.delay
-    =/  hook  (~(got by hooks.hooks) hook.u.delay)
+    ?:  (lth now.bowl fires-at.u.wh)  cor
+    =*  origin  origin.u.wh
+    =/  hook  (~(got by hooks.hooks) hook.u.wh)
     =/  config  ?@(origin ~ (~(gut by config.hook) origin ~))
-    =/  args  [[%wake +.u.delay] "delayed hook" origin config]
-    ho-abet:(ho-run-single:(ho-abed:ho-core hook.u.delay) args)
+    =/  args  [[%wake +.u.wh] "waiting hook" origin config]
+    ho-abet:(ho-run-single:(ho-abed:ho-core hook.u.wh) args)
   ::
       [%cron id=@ kind=?(%chat %diary %heap) ship=@ name=@ ~]
-    =/  =id:h  (slav %uv id.pole)
+    =/  id=id-hook:h  (slav %uv id.pole)
     =/  =origin:h  [kind.pole (slav %p ship.pole) name.pole]
     ::  if unscheduled, ignore
-    ?~  crons=(~(get by crons.hooks) id)  cor
-    ?~  cron=(~(get by u.crons) origin)  cor
+    ?~  cron=(~(get by crons.hooks) id)  cor
+    ?~  job=(~(get by u.cron) origin)  cor
     ::  ignore premature fires
-    ?:  (lth now.bowl next.schedule.u.cron)  cor
-    =.  next.schedule.u.cron
+    ?:  (lth now.bowl next.schedule.u.job)  cor
+    =.  next.schedule.u.job
       ::  we don't want to run the cron for every iteration it would
       ::  have run 'offline', so we check here to make sure that the
       ::  next fire time is in the future
-      =/  next  (add [next repeat]:schedule.u.cron)
+      ::
+      =/  next  (add [next repeat]:schedule.u.job)
       |-
       ?:  (gte next now.bowl)  next
-      $(next (add next repeat.schedule.u.cron))
+      $(next (add next repeat.schedule.u.job))
     =.  crons.hooks
       %+  ~(put by crons.hooks)  id
-      (~(put by u.crons) origin u.cron)
+      (~(put by u.cron) origin u.job)
     =.  cor
-      (schedule-cron origin u.cron)
-    =/  args  [[%cron ~] "cron job" origin config.u.cron]
-    ho-abet:(ho-run-single:(ho-abed:ho-core hook.u.cron) args)
+      (schedule-cron origin u.job)
+    =/  args  [[%cron ~] "cron job" origin config.u.job]
+    ho-abet:(ho-run-single:(ho-abed:ho-core id-hook.u.job) args)
   ==
 ++  schedule-cron
-  |=  [=origin:h =cron:h]
+  |=  [=origin:h =job:h]
   ^+  cor
   =/  wire
-    %+  welp  /hooks/cron/(scot %uv hook.cron)
+    %+  welp  /hooks/cron/(scot %uv id-hook.job)
     ?@  origin  ~
     /[kind.origin]/(scot %p ship.origin)/[name.origin]
-  (emit [%pass wire %arvo %b %wait next.schedule.cron])
+  (emit [%pass wire %arvo %b %wait next.schedule.job])
 ++  unschedule-cron
-  |=  [=origin:h =cron:h]
+  |=  [=origin:h =job:h]
   =/  wire
-    %+  welp  /hooks/cron/(scot %uv hook.cron)
+    %+  welp  /hooks/cron/(scot %uv id-hook.job)
     ?@  origin  ~
     /[kind.origin]/(scot %p ship.origin)/[name.origin]
-  (emit [%pass wire %arvo %b %rest next.schedule.cron])
-++  schedule-delay
-  |=  dh=delayed-hook:h
-  =/  =wire  /hooks/delayed/(scot %uv id.dh)
-  (emit [%pass wire %arvo %b %wait fires-at.dh])
-++  unschedule-delay
-  |=  =id:h
+  (emit [%pass wire %arvo %b %rest next.schedule.job])
+++  schedule-waiting
+  |=  wh=waiting-hook:h
+  =/  =wire  /hooks/waiting/(scot %uv id.wh)
+  (emit [%pass wire %arvo %b %wait fires-at.wh])
+++  unschedule-waiting
+  |=  id=id-hook:h
   ^+  cor
-  ?~  previous=(~(get by delayed.hooks) id)  cor
-  =/  =wire  /hooks/delayed/(scot %uv id.u.previous)
+  ?~  previous=(~(get by waiting.hooks) id)  cor
+  =/  =wire  /hooks/waiting/(scot %uv id.u.previous)
   (emit [%pass wire %arvo %b %rest fires-at.u.previous])
 ++  run-hook-effects
   |=  [effects=(list effect:h) =origin:h]
@@ -1277,10 +1263,10 @@
     (emit [%pass /hooks/effect %agent [our.bowl %contacts] %poke cage])
   ::
       %wait
-    =/  =wire  /hooks/delayed/(scot %uv id.effect)
-    =.  cor  (unschedule-delay id.effect)
-    =.  delayed.hooks
-      (~(put by delayed.hooks) id.effect [origin +.effect])
-    (schedule-delay +.effect)
+    =/  =wire  /hooks/waiting/(scot %uv id.effect)
+    =.  cor  (unschedule-waiting id.effect)
+    =.  waiting.hooks
+      (~(put by waiting.hooks) id.effect [origin +.effect])
+    (schedule-waiting +.effect)
   ==
 --