arvo: full vane names in $sign

This commit is contained in:
Joe Bryan 2020-12-07 16:22:26 -08:00
parent 83dd7384c6
commit 17736990ed
22 changed files with 106 additions and 108 deletions

View File

@ -370,7 +370,7 @@
=/ nack-count=@ud (slav %ud i.t.wire)
=/ who=@p (slav %p i.t.t.wire)
=/ pax t.t.t.wire
?> ?=([%b %wake *] sign-arvo)
?> ?=([%behns %wake *] sign-arvo)
~? ?=(^ error.sign-arvo)
"behn errored in backoff timers, continuing anyway"
:_ this

View File

@ -195,7 +195,7 @@
=/ nack-count=@ud (slav %ud i.t.wire)
=/ who=@p (slav %p i.t.t.wire)
=/ pax t.t.t.wire
?> ?=([%b %wake *] sign-arvo)
?> ?=([%behn %wake *] sign-arvo)
~? ?=(^ error.sign-arvo)
"behn errored in backoff timers, continuing anyway"
:_ this

View File

@ -66,7 +66,7 @@
++ on-arvo
|= [=wire =sign-arvo]
^- (quip card _this)
?. ?=([%e %bound *] sign-arvo)
?. ?=([%eyre %bound *] sign-arvo)
(on-arvo:def wire sign-arvo)
~? !accepted.sign-arvo
[dap.bowl "bind rejected!" binding.sign-arvo]

View File

@ -946,7 +946,7 @@
[%try-rejoin @ *]
=/ rid=resource:store (de-path:res t.t.wire)
=/ nack-count (slav %ud i.t.wire)
?> ?=([%b %wake *] sign-arvo)
?> ?=([%behn %wake *] sign-arvo)
~? ?=(^ error.sign-arvo)
"behn errored in backoff timers, continuing anyway"
=/ new=^wire [%try-rejoin (scot %ud +(nack-count)) t.t.wire]

View File

@ -244,7 +244,7 @@
(on-arvo:def wire sign-arvo)
=/ =resource (de-path:resource t.t.wire)
=/ nack-count=@ud (slav %ud i.t.wire)
?> ?=([%b %wake *] sign-arvo)
?> ?=([%behn %wake *] sign-arvo)
~? ?=(^ error.sign-arvo)
"behn errored in backoff timers, continuing anyway"
:_ this

View File

@ -258,7 +258,7 @@
^- (quip card _this)
?. ?=([%autoseen ~] wire)
(on-arvo:def wire sign-arvo)
?> ?=([%b %wake *] sign-arvo)
?> ?=([%behn %wake *] sign-arvo)
:_ this(last-seen now.bowl)
~[autoseen-timer:ha]
::

View File

@ -65,7 +65,7 @@
:: pass on dill blits for the session
::
[%view %$ ~]
?. ?=([%d %blit *] sign-arvo)
?. ?=([%dill %blit *] sign-arvo)
~| [%unexpected-sign [- +<]:sign-arvo]
!!
:_ this
@ -78,7 +78,7 @@
[%tube @ @ ~]
=* from i.t.wire
=* to i.t.t.wire
?. ?=([%c %writ *] sign-arvo)
?. ?=([%clay %writ *] sign-arvo)
~| [%unexpected-sign [- +<]:sign-arvo]
!!
:_ this

View File

@ -100,8 +100,8 @@
^- (quip card _this)
=^ cards state
?+ sign-arvo (on-arvo:def wire sign-arvo)
[%e %bound *] `state
[%c *] (handle-build:lsp wire +.sign-arvo)
[%eyre %bound *] `state
[%clay *] (handle-build:lsp wire +.sign-arvo)
==
[cards this]
::

View File

@ -67,7 +67,7 @@
=/ nack-count=@ud (slav %ud i.t.wire)
=/ who=@p (slav %p i.t.t.wire)
=/ pax t.t.t.wire
?> ?=([%b %wake *] sign-arvo)
?> ?=([%behn %wake *] sign-arvo)
~? ?=(^ error.sign-arvo)
"behn errored in backoff timers, continuing anyway"
:_ this

View File

@ -362,7 +362,7 @@
=. starting.state
(~(jab by starting.state) yarn |=([=trying =vase] [%none vase]))
~| sign+[- +<]:sign-arvo
?> ?=([?(%b %c) %writ *] sign-arvo)
?> ?=([?(%behn %clay) %writ *] sign-arvo)
=/ =riot:clay p.sign-arvo
?~ riot
(thread-fail-not-running tid %build-thread-error *tang)

View File

@ -173,7 +173,7 @@
|= tin=strand-input:strand
?+ in.tin `[%skip ~]
~ `[%wait ~]
[~ %sign [%wait @ ~] %b %wake *]
[~ %sign [%wait @ ~] %behn %wake *]
?. |(?=(~ until) =(`u.until (slaw %da i.t.wire.u.in.tin)))
`[%skip ~]
?~ error.sign-arvo.u.in.tin
@ -340,7 +340,7 @@
;< ~ bind:m (send-raw-card card)
|= tin=strand-input:strand
=* loop $
?: ?& ?=([~ %sign [%timeout @ ~] %b %wake *] in.tin)
?: ?& ?=([~ %sign [%timeout @ ~] %behn %wake *] in.tin)
=((scot %da when) i.t.wire.u.in.tin)
==
`[%fail %timeout ~]
@ -370,7 +370,7 @@
|= tin=strand-input:strand
?+ in.tin `[%skip ~]
~ `[%wait ~]
[~ %sign [%request ~] %i %http-response %finished *]
[~ %sign [%request ~] %iris %http-response %finished *]
`[%done client-response.sign-arvo.u.in.tin]
==
::
@ -395,9 +395,9 @@
|= tin=strand-input:strand
?+ in.tin `[%skip ~]
~ `[%wait ~]
[~ %sign [%request ~] %i %http-response %cancel *]
[~ %sign [%request ~] %iris %http-response %cancel *]
`[%done ~]
[~ %sign [%request ~] %i %http-response %finished *]
[~ %sign [%request ~] %iris %http-response %finished *]
`[%done `client-response.sign-arvo.u.in.tin]
==
::
@ -516,7 +516,7 @@
|= tin=strand-input:strand
?+ in.tin `[%skip ~]
~ `[%wait ~]
[~ %sign * ?(%b %c) %writ *]
[~ %sign * ?(%behn %clay) %writ *]
?. =(wire wire.u.in.tin)
`[%skip ~]
`[%done +>.sign-arvo.u.in.tin]

View File

@ -1008,9 +1008,9 @@
++ smit
|= [cap=tape sub=vase pax=path txt=@t]
^- vase
~> %slog.[0 leaf+"{cap}: {(scow p+(mug txt))}"]
~> %slog.[0 leaf/"{cap}: {(scow p+(mug txt))}"]
%- road |.
~_ leaf/cap
~_ leaf/"{cap}: build failed"
(slap sub (rain pax txt))
::
++ create
@ -1252,7 +1252,7 @@
::
~? !lac.fad
:- (runt [(lent bars.gem) '|'] "")
[%slip vane.gem (symp +>-.task) duct]
[%slip [vane.gem vane] (symp +>-.task) duct]
::
(call duct vane task)
::
@ -1332,13 +1332,15 @@
?. =(2 (met 3 vis))
[vis %$]
[(end 3 vis) (rsh 3 vis)]
=. way (grow way)
::
?: ?=(%$ way)
(peek:pith lyc car bem)
?. (~(has by van.mod) way)
::
=. way (grow way)
?~ van=(~(get by van.mod) way)
~
(peek:(plow way) lyc car bem)
%. [lyc car bem]
peek:spin:(~(plow va [vil u.van]) now peek)
:: +call: advance to target
::
++ call
@ -1350,10 +1352,11 @@
~> %mean.'call: bad waif'
;;(waif q.p.task)
::
=. way (grow way)
%+ push [way duct bars.gem]
~| bar-stack=`(list ^duct)`[duct bars.gem]
%. task
call:(spin:(plow (grow way)) duct eny dud)
call:(spin:(plow way) duct eny dud)
:: +take: retreat along call-stack
::
++ take
@ -1365,9 +1368,9 @@
::
?> ?=(~ duct)
(xeno:pith wire ;;(card q.p.gift))
::
:: the caller was a vane
::
=. way (grow way)
%+ push [way duct bars.gem]
::
:: cons source onto .gift to make a $sign
@ -1375,7 +1378,7 @@
~| wire=wire
~| bar-stack=`(list ^duct)`[duct bars.gem]
%. [wire [vane.gem gift]]
take:(spin:(plow (grow way)) duct eny dud)
take:(spin:(plow way) duct eny dud)
:: +push: finalize an individual step
::
++ push
@ -1383,7 +1386,7 @@
^+ this
=^ moz sac
(~(refine-moves me sac vil) zom)
=. van.mod (~(put by van.mod) (grow vane.gum) [vax sac])
=. van.mod (~(put by van.mod) vane.gum [vax sac])
(emit `plan`[`germ`gum `(list move)`moz])
:: +plow: operate on a vane, in time and space
::
@ -1814,9 +1817,9 @@
++ smit
|= [cap=tape sub=(trap vase) pax=path txt=@t]
^- (trap vase)
~> %slog.[0 leaf+"{cap}: {(scow p+(mug txt))}"]
~> %slog.[0 leaf/"{cap}: {(scow p+(mug txt))}"]
%- road |.
~_ leaf/cap
~_ leaf/"{cap}: build failed"
(swat sub (rain pax txt))
--
::

View File

@ -634,11 +634,11 @@
:: $sign: response from other vane
::
+$ sign
$~ [%b %wake ~]
$% $: %b
$% [%wake error=(unit tang)]
$~ [%behn %wake ~]
$% $: %behn
$% $>(%wake gift:able:behn)
== ==
$: %j
$: %jael
$% [%private-keys =life vein=(map life ring)]
[%public-keys =public-keys-result]
[%turf turfs=(list turf)]
@ -783,7 +783,7 @@
[~ larval-gate]
:: larval event drainage timer; pop and process a queued event
::
?. ?=([%b %wake *] sign)
?. ?=([%behn %wake *] sign)
~> %slog.0^leaf/"ames: larva: strange sign"
[~ larval-gate]
:: if crashed, print, dequeue, and set next drainage timer
@ -916,11 +916,11 @@
[@ %done *] (on-take-done:event-core wire error.sign)
[@ %boon *] (on-take-boon:event-core wire payload.sign)
::
[%b %wake *] (on-take-wake:event-core wire error.sign)
[%behn %wake *] (on-take-wake:event-core wire error.sign)
::
[%j %turf *] (on-take-turf:event-core turfs.sign)
[%j %private-keys *] (on-priv:event-core [life vein]:sign)
[%j %public-keys *] (on-publ:event-core wire public-keys-result.sign)
[%jael %turf *] (on-take-turf:event-core turfs.sign)
[%jael %private-keys *] (on-priv:event-core [life vein]:sign)
[%jael %public-keys *] (on-publ:event-core wire public-keys-result.sign)
==
::
[moves ames-gate]

View File

@ -15,8 +15,8 @@
$>(%flog task:able:dill) :: log output
== == ::
+$ sign
$~ [%b %wake ~]
$% [%b $>(%wake gift:able)]
$~ [%behn %wake ~]
$% [%behn $>(%wake gift:able)]
==
::
+$ behn-state

View File

@ -318,26 +318,26 @@
== == ::
+$ riot (unit rant) :: response+complete
+$ sign :: in result $<-
$~ [%b %wake ~] ::
$% $: %a :: by %ames
$~ [%behn %wake ~] ::
$% $: %ames ::
$> $? %boon :: response
%done :: (n)ack
%lost :: lost boon
== ::
gift:able:ames ::
== ::
$: %b :: by %behn
$: %behn ::
$% $>(%wake gift:able:behn) :: timer activate
$>(%writ gift:able) :: XX %slip
== == ::
$: %c :: by %clay
$: %clay ::
$> $? %mere ::
%note ::
%writ ::
== ::
gift:able ::
== ::
$: %j :: by %jael
$: %jael ::s
$>(%public-keys gift:able:jael) ::
== ::
$: @tas :: by any

View File

@ -65,22 +65,22 @@
task:able:jael ::
== == ::
+$ sign :: in result $<-
$~ [%d %blit ~] ::
$% $: %b ::
$~ [%dill %blit ~] ::
$% $: %behn ::
$% $>(%writ gift:able:clay) :: XX %slip
$>(%mere gift:able:clay) :: XX %slip
== == ::
$: %c ::
$: %clay ::
$> $? %mere ::
%note ::
%writ ::
== ::
gift:able:clay ::
== ::
$: %d ::
$: %dill ::
$>(%blit gift:able:dill) ::
== ::
$: %g ::
$: %gall ::
$> $? %onto ::
%unto ::
== ::
@ -255,14 +255,14 @@
|= [tea=wire sih=sign]
^+ +>
?- sih
[%g %onto *]
[%gall %onto *]
:: ~& [%take-gall-onto +>.sih]
?- -.+>.sih
%| (crud %onto p.p.+>.sih)
%& (done %blit [%lin (tuba "{<p.p.sih>}")]~)
==
::
[%g %unto *]
[%gall %unto *]
:: ~& [%take-gall-unto +>.sih]
?- -.+>.sih
%poke-ack ?~(p.p.+>.sih +>.$ (crud %coup u.p.p.+>.sih))
@ -273,18 +273,18 @@
%fact (from ;;(dill-blit q:`vase`+>+>.sih))
==
::
[%c %note *]
[%clay %note *]
(from %out (tuba p.sih ' ' ~(ram re q.sih)))
::
[?(%b %c) %writ *]
[?(%behn %clay) %writ *]
init
::
[?(%b %c) %mere *]
[?(%behn %clay) %mere *]
?: ?=(%& -.p.sih)
mere
(mean >%dill-mere-fail< >p.p.p.sih< q.p.p.sih)
::
[%d %blit *]
[%dill %blit *]
(done +.sih)
==
--

View File

@ -47,18 +47,10 @@
:: +sign: private response from another vane to eyre
::
+$ sign
$% :: %b: from behn
::
$: %b
::
::
$% $: %behn
$% [%wake error=(unit tang)]
== ==
:: %g: from gall
::
$: %g
::
::
$: %gall
gift:able:gall
:: $>(%unto gift:able:gall)
== ==
@ -2317,7 +2309,7 @@
~|(%eyre-take-dud (mean tang.u.dud))
=> %= .
sign
?: ?=(%g -.sign)
?: ?=(%gall -.sign)
?> ?=(%unto +<.sign)
sign
sign
@ -2340,7 +2332,7 @@
::
++ run-app-request
::
?> ?=([%g %unto *] sign)
?> ?=([%gall %unto *] sign)
::
::
?> ?=([%poke-ack *] p.sign)
@ -2363,7 +2355,7 @@
=/ event-args [[eny duct now rof] server-state.ax]
::
?> ?=([@ *] t.wire)
?: ?=([%g %unto %watch-ack *] sign)
?: ?=([%gall %unto %watch-ack *] sign)
?~ p.p.sign
:: received a positive acknowledgment: take no action
::
@ -2375,13 +2367,13 @@
=^ moves server-state.ax (handle-gall-error u.p.p.sign)
[moves http-server-gate]
::
?: ?=([%g %unto %kick ~] sign)
?: ?=([%gall %unto %kick ~] sign)
=/ handle-response handle-response:(per-server-event event-args)
=^ moves server-state.ax
(handle-response %continue ~ &)
[moves http-server-gate]
::
?> ?=([%g %unto %fact *] sign)
?> ?=([%gall %unto %fact *] sign)
=/ =mark p.cage.p.sign
=/ =vase q.cage.p.sign
?. ?= ?(%http-response-header %http-response-data %http-response-cancel)
@ -2414,7 +2406,7 @@
~|([%bad-channel-wire wire] !!)
::
%timeout
?> ?=([%b %wake *] sign)
?> ?=([%behn %wake *] sign)
?^ error.sign
[[duct %slip %d %flog %crud %wake u.error.sign]~ http-server-gate]
=/ discard-channel
@ -2431,7 +2423,7 @@
[moves http-server-gate]
::
?(%poke %subscription)
?> ?=([%g %unto *] sign)
?> ?=([%gall %unto *] sign)
~| wire
?> ?=([@ @ @t @ *] wire)
=* channel-id i.t.t.wire
@ -2448,7 +2440,7 @@
::
++ sessions
::
?> ?=([%b %wake *] sign)
?> ?=([%behn %wake *] sign)
::
?^ error.sign
[[duct %slip %d %flog %crud %wake u.error.sign]~ http-server-gate]
@ -2473,7 +2465,7 @@
(min next expiry-time)
::
++ acme-ack
?> ?=([%g %unto *] sign)
?> ?=([%gall %unto *] sign)
::
?> ?=([%poke-ack *] p.sign)
?~ p.p.sign

View File

@ -1,3 +1,4 @@
!:
:: :: %gall, agent execution
!? 163
::
@ -506,7 +507,7 @@
++ mo-handle-sys-era
|= [=path =sign-arvo]
^+ mo-core
?> ?=([%j %public-keys *] sign-arvo)
?> ?=([%jael %public-keys *] sign-arvo)
?> ?=([%era ~] path)
?. ?=(%breach -.public-keys-result.sign-arvo)
mo-core
@ -521,7 +522,7 @@
=/ [dap=term her=@ta desk=@ta dat=@ta ~] t.path
=/ tim (slav da+dat)
=/ =beak [(slav %p her) desk da+tim]
?> ?=([?(%b %c) %writ *] sign-arvo)
?> ?=([?(%behn %clay) %writ *] sign-arvo)
|^ ^+ mo-core
?~ p.sign-arvo
(fail leaf+"gall: failed to build agent {<dap>}" ~)
@ -548,7 +549,7 @@
|= [=path =sign-arvo]
^+ mo-core
?> ?=([%lyv ~] path)
?> ?=([?(%b %c) %wris *] sign-arvo)
?> ?=([?(%behn %clay) %wris *] sign-arvo)
=/ bek=beak [our %home p.sign-arvo]
=/ nex=(list [=care:clay =^path]) ~(tap in q.sign-arvo)
~> %slog.[0 leaf+"gall: reloading agents"]
@ -575,7 +576,7 @@
^+ mo-core
::
?> ?=([%lag ~] path)
?> ?=([%a %clog *] sign-arvo)
?> ?=([%ames %clog *] sign-arvo)
::
=/ agents=(list term) ~(tap in ~(key by yokes.state))
|- ^+ mo-core
@ -598,7 +599,7 @@
=/ him (slav %p i.t.path)
=/ dap i.t.t.path
::
?> ?=([?(%g %b) %unto *] sign-arvo)
?> ?=([?(%gall %behn) %unto *] sign-arvo)
=/ =sign:agent +>.sign-arvo
::
?- -.sign
@ -631,7 +632,7 @@
=/ foreign-agent i.t.t.wire
::
?+ sign-arvo !!
[%a %done *]
[%ames %done *]
=^ remote-request outstanding.state
?~ t.t.t.wire
=/ full-wire sys+wire
@ -664,7 +665,7 @@
%missing (mo-give:(mo-give %unto %watch-ack err) %unto %poke-ack err)
==
::
[%a %boon *]
[%ames %boon *]
?^ t.t.t.wire
:: kill subscriptions which use the old wire format
::
@ -672,7 +673,7 @@
=/ =ames-response ;;(ames-response payload.sign-arvo)
(mo-handle-ames-response ames-response)
::
[%a %lost *]
[%ames %lost *]
:: note this should only happen on reverse bones, so only facts
:: and kicks
::
@ -709,7 +710,7 @@
?. =(nonce.u.yoke i.t.path)
%- (slog leaf+"gall: got old {<+<.sign-arvo>} for {<dap>}" ~)
mo-core
?. ?=([?(%g %b) %unto *] sign-arvo)
?. ?=([?(%gall %behn) %unto *] sign-arvo)
?: ?=(%| -.agent.u.yoke)
%- (slog leaf+"gall: {<dap>} dozing, dropping {<+<.sign-arvo>}" ~)
mo-core
@ -760,7 +761,7 @@
=/ card
?: ?=(%& -.blocker)
[%slip %g %deal sock dap p.blocker]
[%pass /clear-huck %b %huck %g %unto p.blocker]
[%pass /clear-huck %b %huck `sign-arvo`[%gall %unto p.blocker]]
[duct card]
$(moves [move moves])
:: +mo-filter-queue: remove all blocked tasks from ship.
@ -1525,7 +1526,7 @@
=. ap-core
(ap-pass wire %agent dock %leave ~)
=/ way [%out (scot %p p.dock) q.dock wire]
(ap-pass way %arvo %b %huck `sign-arvo`[%g %unto %kick ~])
(ap-pass way %arvo %b %huck `sign-arvo`[%gall %unto %kick ~])
:: +ap-mule: run virtualized with intercepted scry, preserving type
::
:: Compare +mute and +mule. Those pass through scry, which
@ -1778,7 +1779,7 @@
~| [%gall-take-failed wire]
?> ?=([?(%sys %use) *] wire)
=< mo-abet
%. [t.wire ?:(?=([%b %heck *] syn) syn.syn syn)]
%. [t.wire ?:(?=([%behn %heck *] syn) syn.syn syn)]
?- i.wire
%sys mo-handle-sys:(mo-abed:mo duct)
%use mo-handle-use:(mo-abed:mo duct)

View File

@ -98,16 +98,16 @@
== == == ::
:: ::
+$ sign :: in result $<-
$~ [%a %done ~] ::
$% $: %a ::
$~ [%behn %wake ~] ::
$% $: %ames ::
$% $>(%boon gift:able:ames) :: message response
$>(%done gift:able:ames) :: message (n)ack
$>(%lost gift:able:ames) :: lost boon
== == ::
$: %b ::
$: %behn ::
$>(%wake gift:able:behn) ::
== ::
$: %g ::
$: %gall ::
$> $? %onto ::
%unto ::
== ::
@ -528,25 +528,25 @@
|= [tea=wire hen=duct hin=sign]
^+ +>
?- hin
[%a %done *]
[%ames %done *]
?~ error.hin +>.$
~& [%done-bad tag.u.error.hin]
%- (slog tang.u.error.hin)
::TODO fail:et
+>.$
::
[%a %boon *]
[%ames %boon *]
=+ ;; [%public-keys-result =public-keys-result] payload.hin
%- curd =< abet
(public-keys:~(feel su hen now pki etn) pos.zim.pki public-keys-result)
::
[%a %lost *]
[%ames %lost *]
:: TODO: better error handling
::
~| %jael-ames-lost
!!
::
[%b %wake *]
[%behn %wake *]
?^ error.hin
%- %+ slog
leaf+"jael unable to resubscribe, run :azimuth-tracker|listen"
@ -559,11 +559,11 @@
%- curd =< abet
(sources:~(feel su hen now pki etn) ships source)
::
[%g %onto *]
[%gall %onto *]
~& [%jael-onto tea hin]
+>.$
::
[%g %unto *]
[%gall %unto *]
?- +>-.hin
%kick ~|([%jael-unexpected-quit tea hin] !!)
%poke-ack

View File

@ -2193,9 +2193,11 @@
[%j task:able:jael]
[@tas %meta vase]
==
:: full vane names are required in vanes
::
+$ sign-arvo :: in result $<-
$% [%a gift:able:ames]
$: %b
$% [%ames gift:able:ames]
$: %behn
$% gift:able:behn
$>(%wris gift:able:clay)
$>(%writ gift:able:clay)
@ -2203,12 +2205,12 @@
$>(%unto gift:able:gall)
==
==
[%c gift:able:clay]
[%d gift:able:dill]
[%e gift:able:eyre]
[%g gift:able:gall]
[%i gift:able:iris]
[%j gift:able:jael]
[%clay gift:able:clay]
[%dill gift:able:dill]
[%eyre gift:able:eyre]
[%gall gift:able:gall]
[%iris gift:able:iris]
[%jael gift:able:jael]
==
:: $unix-task: input from unix
::

View File

@ -102,7 +102,7 @@
::
++ handle-arvo-response
|= [=wire =sign-arvo]
?> ?=([%b %wake *] sign-arvo)
?> ?=([%behn %wake *] sign-arvo)
?> ?=([@ *] wire)
=/ who (,@p (slav %p i.wire))
=^ cards piers

View File

@ -118,7 +118,7 @@
++ handle-arvo-response
|= [=wire =sign-arvo]
^- (quip card:agent:gall _this)
?> ?=([%i %http-response %finished *] sign-arvo)
?> ?=([%iris %http-response %finished *] sign-arvo)
?> ?=([@ *] wire)
=/ who (,@p (slav %p i.wire))
=/ =httr:eyre