ilyakooo0/urbit
1
0
Fork 0
mirror of https://github.com/ilyakooo0/urbit.git synced 2024-11-28 19:55:53 +03:00
Code Issues Packages Projects Releases Wiki Activity

Updated circle query paths to be slightly more flexible in the data they subscribe to.

Browse Source 
Internal %peer paths in the guardian got a bit messy.
This commit is contained in:
Fang 2017-11-03 15:54:25 +01:00
parent 58268b784c
commit 6e4b9fe6b7
4 changed files with 135 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/talk-agent.hoon
View File

@ -259,7 +259,7 @@
%peer
/
broker
/circle/[inbox]
/circle/[inbox]/grams/config/group
==
==
::

178
app/talk-guardian.hoon
View File

@ -768,15 +768,16 @@
$config :: full changes to us need to get split up.
?: &(=(cir.rum so-cir) ?=($full -.dif.rum))
(so-config-full `shape cof.dif.rum)
:: remotes are fine.
:: we only subscribe to remotes' configs.
?: =(src cir.rum)
(so-delta-our rum)
:: remotes of remotes are not.
~? =(src so-cir) %but-src-is-us
+>
$status :: ignore foreign remotes.
?. |(=(src cir.rum) =(src so-cir)) +>
(so-delta-our rum)
~! %unexpected-remote-config-from-remote
!!
$status :: we only subscribe to remotes' locals.
?: |(=(src cir.rum) =(src so-cir))
(so-delta-our rum)
~! %unexpected-remote-status-from-remote
!!
$remove (so-delta-our %config src %remove ~)
==
::
@ -1551,8 +1552,9 @@
%+ turn ~(tap in srs)
|= {cir/circle ran/range}
^- (unit card)
?: =(cir sa-cir) ~ :: ignore self-subs
`(circle-peer nom cir ran)
?: =(cir sa-cir) ~ :: ignore self-subs
=+ wat=[%grams %config-l %group-l ~]
`(circle-peer nom wat cir ran)
::
++ sa-abjure ::< unsubscribe us
::> unsubscribes this story from each circle.
@ -1566,7 +1568,12 @@
:_ ~
=+ rap=(range-to-path ran)
:* %pull
(welp /circle/[nom]/(scot %p hos.cir)/[nom.cir] rap)
;: welp
/[nom]/(scot %p hos.cir)
/circle/[nom.cir]
/grams/config-l/group-l
rap
==
[hos.cir dap.bol]
~
==
@ -1603,6 +1610,23 @@
::> ||
::+|
::
++ target ::< ship+path from wire
::> parses {wir} to obtain the target ship and the
::> query path.
::
|= wir/wire
^- (pair ship path)
?+ wir !!
{@ @ $circle *}
[(slav %p i.t.wir) t.t.wir]
::
{$burden *}
[(above our.bol) wir]
::
{@ $report *}
[(slav %p i.wir) t.wir]
==
::
++ etch ::< parse wire
::> parses {wir} to obtain either %circle with story
::> and circle or %repeat with message number, source
@ -1610,16 +1634,15 @@
::
|= wir/wire
^- weir
?+ -.wir !!
$circle
?> ?=({@ @ @ *} t.wir)
?+ wir !!
{@ @ $circle @ *}
:: us, host, $circle, target
:^ %circle
i.t.wir
[(slav %p i.t.t.wir) i.t.t.t.wir]
i.wir
[(slav %p i.t.wir) i.t.t.t.wir]
(path-to-range t.t.t.t.wir)
::
$repeat
?> ?=({@ @ @ $~} t.wir)
{$repeat @ @ @ $~}
:+ %repeat
[(slav %p i.t.wir) i.t.t.wir]
((list serial) (cue (slav %ud i.t.t.t.wir)))
@ -1652,13 +1675,13 @@
::> constructs a %peer move to subscribe {nom} to a
::> source.
::
|= {nom/naem source}
|= {nom/naem wat/(list circle-data) source}
^- card
=+ rap=(range-to-path ran)
=+ pax=:(welp /circle/[nom.cir] wat (range-to-path ran))
:* %peer
(welp /circle/[nom]/(scot %p hos.cir)/[nom.cir] rap)
(welp /[nom]/(scot %p hos.cir) pax)
[hos.cir dap.bol]
(welp /circle/[nom.cir] rap)
pax
==
::
::> ||
@ -1727,8 +1750,12 @@
:+ %+ turn
(~(so-first-grams so:ta nom.qer ~ u.soy) ran.qer)
(cury gram-to-envelope nom.qer)
[shape.u.soy mirrors.u.soy]
[locals.u.soy remotes.u.soy]
:- shape.u.soy
?. (~(has in wat.qer) %config-r) ~
mirrors.u.soy
:- locals.u.soy
?. (~(has in wat.qer) %group-r) ~
remotes.u.soy
==
::
++ dedicate ::< rumor-story to theirs
@ -1777,6 +1804,22 @@
%. uid.gam
~(got by known:(~(got by stories) nom))
::
++ circle-feel-story ::<
::>
::
|= {wat/(set circle-data) nom/naem det/delta-story}
^- ?
?: =(wat ~) &
%- ~(has in wat)
?+ -.det %hasnot
$gram %grams
$new %config-l
$config ?: =(cir.det [our.bol nom])
%config-l %config-r
$status ?: =(cir.det [our.bol nom])
%group-l %group-r
==
::
++ feel ::< delta to rumor
::> if the given delta changes the result of the given
::> query, produce the relevant rumor.
@ -1813,22 +1856,17 @@
`[%burden nom.det (dedicate (above our.bol) nom.det det.det)]
::
$circle
?. ?=($story -.det) ~
?. =(nom.qer nom.det) ~
?: ?=(?($follow $burden) -.det.det) ~ :: internal-only delta
=/ ren
%. ran.qer
=- ~(so-in-range so:ta nom.qer ~ -)
(~(got by stories) nom.qer)
?. in.ren ~
::TODO move up? we also check for $follow above, why?
?: ?=(?($follow $inherited $sequent) -.det.det) ~
=/ rum/rumor-story
?+ -.det.det det.det
$gram
[%gram (gram-to-envelope nom.det gam.det.det)]
==
`[%circle rum]
?. ?=($story -.det) ~
?. =(nom.qer nom.det) ~
?. (circle-feel-story wat.qer nom.det det.det) ~
=/ sor (~(got by stories) nom.qer)
?. in:(~(so-in-range so:ta nom.qer ~ sor)) ~
?. ?=(?($gram $new $config $status) -.det.det) ~
:+ ~ %circle
?+ det.det det.det
{$gram *}
[%gram (gram-to-envelope nom.det gam.det.det)]
==
==
::
++ affection ::< rumors to interested
@ -1864,7 +1902,31 @@
::> into a query structure.
::
|= pax/path
(coins-to-query (path-to-coins pax))
?. ?=({$circle @tas *} pax)
(coins-to-query (path-to-coins pax))
=/ qer/query [%circle i.t.pax ~ ~]
?> ?=($circle -.qer) :: for type system.
=+ pax=t.t.pax
|- ^+ qer
?~ pax qer
::TODO can probably do this a bit better...
?+ i.pax
qer(ran (path-to-range pax))
::
circle-data %_ $ pax t.pax
wat.qer (~(put in wat.qer) i.pax)
==
$group %_ $ pax t.pax
wat.qer %- ~(uni in wat.qer)
^+ wat.qer
(sy %group-l %group-r ~)
==
$config %_ $ pax t.pax
wat.qer %- ~(uni in wat.qer)
^+ wat.qer
(sy %config-l %config-r ~)
==
==
::
++ path-to-coins ::< path to coin list
::> parse a path into a list of coins.
@ -1884,7 +1946,6 @@
[%reader ul]
[%burden (at /[%p])]
[%report ul]
[%circle (al term rang)]
==
++ term (do %tas)
++ rang (mu (al plac (mu (un plac))))
@ -2002,23 +2063,16 @@
^- (quip move _+>)
[~ +>]
::
++ reap ::< catch-all reap
::> handle all remote errors.
::
++ reap ::< subscription n/ack
::> update state to reflect subscription success
:::
|= {wir/wire fal/(unit tang)}
^- (quip move _+>)
?~ fal [~ +>]
~| reap-fail+wir
(mean u.fal)
::
++ reap-circle ::< subscription n/ack
::> if subscribing failed, update state to reflect
::> that.
::
::TODO update to handle all subscription kinds.
|= {wir/wire fal/(unit tang)}
^- (quip move _+>)
%+ etch-circle [%circle wir]
?. ?=({@ @ $circle *} wir)
?~ fal [~ +>]
~| reap-fail+wir
(mean u.fal)
%+ etch-circle wir
|= {nom/naem src/source}
?~ fal
%- pre-bake
@ -2028,10 +2082,18 @@
%- pre-bake
ta-done:(ta-leave:ta nom src)
::
++ quit-circle ::< dropped subscription
++ quit ::< dropped subscription
::> gall dropped out subscription. resubscribe.
::
|= wir/wire
^- (quip move _+>)
:_ +>
=+ tar=(target wir)
[0 %peer wir [p.tar dap.bol] q.tar]~
::
++ quit-circle ::< dropped circle sub
::> gall dropped our subscription. resubscribe.
::
::TODO update for all subscription kinds.
|= wir/wire
^- (quip move _+>)
%+ etch-circle [%circle wir]

5
lib/talk.hoon
View File

@ -61,11 +61,14 @@
::
++ path-to-range ::< path to msg range
::> turns the tail of a subscription path into a
::> range structure.
::> range structure, skipping over non-range terms.
::
|= pax/path
^- range
?~ pax ~
:: skip past non-number parts of path.
?: ?=({$~ $~} [(slaw %da i.pax) (slaw %ud i.pax)])
$(pax t.pax)
:+ ~
=+ hed=(slaw %da i.pax)
?^ hed [%da u.hed]

43
sur/talk.hoon
View File

@ -25,40 +25,17 @@
$% {$reader $~} ::< shared ui state
{$burden who/ship} ::< duties to share
{$report $~} ::< duty reports
{$circle nom/naem ran/range} ::< story query
::{$circle nom/naem wat/circle-data} ::< story query
:: okay, the problem here is that we want to have
:: separate subscriptions for the different kinds
:: of story data. we can do that, but then if we
:: want all data and a specific range for the
:: messages (very common) then we need to do
:: three separate subscriptions.
:: possible solution would be adding range to all
:: story queries, but that feels weird irt
:: presence and configs.
:: (also, that would make for poor query design:
:: having a ~ halfway through is ugly.)
::
:: /circle/name/range
:: /circle/name/all
:: /circle/name/grams/range
:: /circle/name/crowd/local
:: /circle/name/grams&crowd/range/local
:: /circle/name/grams
:: /circle/name/crowd
::
::TODO look at graphql and think about doing
:: multiple queries in a single %peer.
::TODO being able to specify desired message
:: types may or may not also be nice to have.
:: ie just %app msgs, for a dashboard display.
{$circle nom/naem wat/(set circle-data) ran/range}::< story query
::TODO in the future, we may want much more ::
:: detailed querying abilities. ::
== ::
++ circle-data ::> kinds of circle data
$? $grams ::< messages
$group-l ::< local presence
$group-r ::< remote presences
$config-l ::< local config
$config-r ::< remote configs
== ::
::++ circle-data ::> queried data
:: $% {$all $~} ::< everything, always
:: {$grams ran/range} ::< messages (in range)
:: {$crowd wer/where} ::< presence
:: {$lobby wer/where} ::< configurations
:: == ::
++ range ::> inclusive msg range
%- unit ::< ~ means everything
$: hed/place ::< start of range