7aa7661 · astrolabe · git.iko.soy

git.iko.soy/astrolabe

support zuse 414

commit7aa7661fda671a576c969f7535d7fdaf278728f1 authorJohn Hyde <johnhydefour@gmail.com> dateWed 5 Apr 2023, 13:55 (4 years ago) parent281dbe3

18 files changed+1015−516

compare with main

unifiedsplit

base-desk/lib/agentio.hoon+4−6 base-desk/lib/azimuth.hoon+9−9 base-desk/lib/bitcoin-utils.hoon+2−1 base-desk/lib/dill.hoon+94 base-desk/lib/language-server/complete.hoon+2−1 base-desk/lib/pill.hoon+250−17 base-desk/lib/shoe.hoon+53−28 base-desk/lib/sole.hoon+24 base-desk/lib/sss.hoon+371 base-desk/lib/strand.hoon+1−188 base-desk/mar/belt.hoon+3−12 base-desk/mar/blit.hoon+3−44 base-desk/mar/sole/action.hoon+3−1 base-desk/sur/hood.hoon+149−206 base-desk/sur/sole.hoon+2−1 base-desk/sur/sss.hoon+43 desk/desk.docket-0+1−1 desk/sys.kelvin+1−1

base-desk/lib/agentio.hoon+4−6

@@ -66,7 +66,7 @@

6666 ::

6767 ++ rest

6868 |= p=@da

69− (arvo %b %wait p)

69+ (arvo %b %rest p)

7070 ::

7171 ++ warp

7272 |= [wer=ship =riff:clay]

@@ -85,16 +85,14 @@

8585 ?:(?=(%sing genre) [genre mood] [genre mood])

8686 (warp-our q.byk.bowl `rave)

8787 ::

88+ ++ tire

89+ (arvo %c %tire `~)

90+ ::

8891 ++ connect

8992 |= [=binding:eyre app=term]

9093 (arvo %e %connect binding app)

9194 --

9295::

93−++ fact-curry

94− |* [=mark =mold]

95− |= [paths=(list path) fac=mold]

96− (fact mark^!>(fac) paths)

97−::

9896++ fact-kick

9997 |= [=path =cage]

10098 ^- (list card)

base-desk/lib/azimuth.hoon+9−9

@@ -114,29 +114,29 @@

114114 ::

115115 :: Testnet contract addresses

116116 ::

117− ++ ropsten-contracts

117+ ++ goerli-contracts

118118 |%

119119 ++ azimuth

120− 0x308a.b6a6.024c.f198.b57e.008d.0ac9.ad02.1988.6579

120+ 0xbb61.fa68.3e4b.9104.18e2.7b00.a143.8a93.6234.df52

121121 ::

122122 ++ ecliptic

123− 0x8b9f.86a2.8921.d9c7.05b3.113a.755f.b979.e1bd.1bce

123+ 0xe129.0a32.9014.5e63.e6a8.ec1e.f661.6906.856d.0c8f

124124 ::

125125 ++ linear-star-release

126− 0x1f8e.dd03.1ee4.1474.0aed.b39b.84fb.8f2f.66ca.422f

126+ 0x0

127127 ::

128128 ++ conditional-star-release

129129 0x0

130130 ::

131131 ++ delegated-sending

132− 0x3e8c.a510.354b.c2fd.bbd6.1502.52d9.3105.c9c2.7bbe

132+ 0x0

133133 ::

134134 ++ naive

135− 0xe7cf.4b83.06d3.11ba.ca15.585f.e3f0.7cd0.441c.21d1

135+ 0x56e3.7137.cdaf.c026.a732.e8e8.40cd.621e.d50b.d210

136136 ::

137− ++ launch 4.601.630

138− ++ public launch

139− ++ chain-id 3

137+ ++ launch 7.834.742

138+ ++ public 7.834.800

139+ ++ chain-id 5

140140 --

141141 ::

142142 :: Local contract addresses

base-desk/lib/bitcoin-utils.hoon+2−1

@@ -143,6 +143,7 @@

143143 |= a=@

144144 ^- hexb

145145 =/ l=@ (met 3 a)

146+ ?: =(l 0) 1^a

146147 ?: =(l 1) 1^a

147148 ?: =(l 2) (cat:byt ~[1^0xfd (flip:byt 2^a)])

148149 ?: (lte l 4) (cat:byt ~[1^0xfe (flip:byt 4^a)])

@@ -162,7 +163,7 @@

162163 %0xfe 2

163164 %0xff 3

164165 ==

165− :_ (drop:byt (add 1 len) h)

166+ :_ (drop:byt (add 1 (bex len)) h)

166167 %- flip:byt

167168 (take:byt (bex len) (drop:byt 1 h))

168169 :: +dea: atom instead of hexb for parsed CompactSize

base-desk/lib/dill.hoonnew file+94

@@ -0,0 +1,94 @@

1+:: dill: utilities for dill's data structures

2+::

3+=, dill

4+|%

5+++ enjs

6+ |%

7+ ++ blit

8+ |= =blit:dill

9+ ^- json

10+ =, enjs:format

11+ %+ frond -.blit

12+ ?- -.blit

13+ %bel b+&

14+ %clr b+&

15+ %hop ?@ p.blit (numb p.blit)

16+ (pairs 'x'^(numb x.p.blit) 'y'^(numb y.p.blit) ~)

17+ %put a+(turn p.blit |=(c=@c s+(tuft c)))

18+ %nel b+&

19+ %url s+p.blit

20+ %wyp b+&

21+ %mor a+(turn p.blit ^blit)

22+ ::

23+ %sag

24+ %- pairs

25+ :~ 'path'^(path p.blit)

26+ 'file'^s+(en:base64:mimes:html (as-octs:mimes:html (jam q.blit)))

27+ ==

28+ ::

29+ %sav

30+ %- pairs

31+ :~ 'path'^(path p.blit)

32+ 'file'^s+(en:base64:mimes:html (as-octs:mimes:html q.blit))

33+ ==

34+ ::

35+ %klr

36+ :- %a

37+ %+ turn p.blit

38+ |= [=stye text=(list @c)]

39+ %- pairs

40+ :~ 'text'^a+(turn text |=(c=@c s+(tuft c)))

41+ ::

42+ :- 'stye'

43+ %- pairs

44+ |^ :~ 'back'^(color p.q.stye)

45+ 'fore'^(color q.q.stye)

46+ 'deco'^a+(turn ~(tap in p.stye) |=(d=deco ?~(d ~ s+d)))

47+ ==

48+ ++ color

49+ |= =tint

50+ ?@ tint ?~(tint ~ s+tint)

51+ =, tint

52+ (pairs r+(numb r) g+(numb g) b+(numb b) ~)

53+ --

54+ ==

55+ ==

56+ --

57+::

58+++ dejs

59+ |%

60+ ++ belt

61+ |= jon=json

62+ ^- belt:dill

63+ ?: ?=([%s *] jon)

64+ (taft p.jon)

65+ =, dejs:format

66+ %. jon

67+ %- of

68+ |^ :* mod+(ot 'mod'^mod 'key'^bot ~)

69+ txt+(ar (cu taft so))

70+ bol

71+ ==

72+ ::

73+ ++ bol

74+ :~ aro+(su (perk %d %l %r %u ~))

75+ bac+ul

76+ del+ul

77+ hit+(ot 'x'^ni 'y'^ni ~)

78+ ret+ul

79+ ==

80+ ::

81+ ++ bot

82+ |= j=json

83+ ^- bolt:dill

84+ ?+ j !!

85+ [%s *] (taft p.j)

86+ [%o *] ((of bol) j)

87+ ==

88+ ::

89+ ++ mod

90+ |= j=json

91+ ((su (perk %ctl %met %hyp ~)) j)

92+ --

93+ --

94+--

base-desk/lib/language-server/complete.hoon+2−1

@@ -3,7 +3,8 @@

33::

44=/ debug |

55|%

6−+* option [item]

6+++ option

7+ |$ [item]

78 [term=cord detail=item]

89::

910:: Like +rose except also produces line number

base-desk/lib/pill.hoon+250−17

@@ -32,25 +32,23 @@

3232 [/sys/hoon hoon/hoon]

3333 [/sys/arvo hoon/arvo]

3434 ==

35+:: +dirs: filter for userspace directories to include

36+::

37+++ dirs

38+ |= [bas=path exc=(list spur)]

39+ ^- (list spur)

40+ ?~ exc ~(tap in dir:.^(arch %cy bas))

41+ %+ skim

42+ ~(tap in dir:.^(arch %cy bas))

43+ |=(=spur =(~ (find ~[spur] exc)))

3544:: +file-ovum: userspace filesystem load

3645::

3746:: bas: full path to / directory

3847::

3948++ file-ovum

40− =/ directories=(list path)

41− :~ /app :: %gall applications

42− /gen :: :dojo generators

43− /lib :: libraries

44− /mar :: mark definitions

45− /sur :: structures

46− /sys :: system files

47− /ted :: :spider strands

48− /web :: %eyre web content

49− /desk :: desk manifest

50− ==

51− |= [des=desk bas=path]

49+ |= [des=desk bas=path exc=(list spur)]

5250 ^- unix-event

53− %. directories

51+ %. (dirs bas exc)

5452 |= :: sal: all spurs to load from

5553 ::

5654 sal=(list spur)

@@ -64,7 +62,11 @@

6462 %- ~(gas by *(map path (each page lobe:clay)))

6563 (turn hav |=([=path =page] [path &+page]))

6664 [/c/sync [%park des &+yuki *rang:clay]]

67− =| hav=(list [path page])

65+ (file-pages bas sal)

66+::

67+++ file-pages

68+ |= [bas=path sal=(list spur)]

69+ =| hav=(list [path page:clay])

6870 |- ^+ hav

6971 ?~ sal ~

7072 =. hav $(sal t.sal)

@@ -95,13 +97,23 @@

9597::

9698:: +file-ovum2: electric boogaloo

9799::

98−++ file-ovum2 |=(p=path `unix-event`[//arvo what/(user-files p)])

100+++ file-ovum2 |=(z=[path (list spur)] `unix-event`[//arvo what/(user-files z)])

101+::

102+++ prep-ovum

103+ |= dez=(list path)

104+ ^- unix-event

105+ =- ~& clay-blobs+~(wyt by -)

106+ [/c/inflate [%prep -]]

107+ %+ roll dez

108+ |= [bas=path out=(map lobe:clay page:clay)]

109+ %- ~(uni by out)

110+ .^(_out %cs (snoc bas %bloc))

99111::

100112:: +user-files: all userspace hoon files

101113::

102114++ user-files

103− |= bas=path

104− %. directories:file-ovum

115+ |= [bas=path exc=(list spur)]

116+ %. (dirs bas exc)

105117 |= sal=(list spur)

106118 ^- (list (pair path (cask)))

107119 ::

@@ -135,4 +147,225 @@

135147 |- ^+ hav

136148 ?~ all hav

137149 $(all t.all, hav ^$(tyl [p.i.all tyl]))

150+::

151+::TODO include %prep task in solid and brass?

152+++ solid

153+ :: sys: root path to boot system, `/~me/[desk]/now/sys`

154+ :: dez: secondary desks and their root paths

155+ :: exc: list of desk folders to exclude

156+ ::

157+ |= [sys=path dez=(list [desk path]) dub=? now=@da prime=? exc=(list spur)]

158+ ^- pill

159+ =/ bas=path (scag 3 sys)

160+ =/ compiler-path (weld sys /hoon)

161+ =/ arvo-path (weld sys /arvo)

162+ ~& %solid-start

163+ =/ compiler-src .^(@t %cx (weld compiler-path /hoon))

164+ =/ arvo-src .^(@t %cx (weld arvo-path /hoon))

165+ =/ arvo-formula

166+ ~& %solid-loaded

167+ =/ compiler-hoon (rain compiler-path compiler-src)

168+ ?. dub

169+ :: compile arvo against hoon, with our current compiler

170+ ::

171+ =/ whole-hoon=hoon

172+ [%tsgr compiler-hoon [%tsgr [%$ 7] (rain arvo-path arvo-src)]]

173+ ~& %solid-parsed

174+ =/ whole-formula q:(~(mint ut %noun) %noun whole-hoon)

175+ ~& %solid-arvo

176+ whole-formula

177+ :: compile arvo against hoon, with a freshly compiled hoon (via +ride)

178+ ::

179+ ~& %solid-parsed

180+ =/ compiler-formula q:(~(mint ut %noun) %noun compiler-hoon)

181+ ~& %solid-compiled

182+ =/ whole-src

183+ (rap 3 ['=> ' compiler-src '=> +7 ' arvo-src ~])

184+ ~& %solid-double-loaded

185+ =/ whole-formula

186+ =< +

187+ .* [%noun whole-src]

188+ [%8 compiler-formula [%9 2 %10 [6 %0 3] [%0 2]]]

189+ ~& %solid-double-compiled

190+ whole-formula

191+ ::

192+ ~& [%solid-kernel `@ux`(mug arvo-formula)]

193+ ::

194+ :: installed: Arvo gate (formal interface) with %zuse and vanes installed

195+ ::

196+ =/ installed

197+ =< q

198+ %^ spin

199+ ^- (list ovum)

200+ :- (boot-ovum:pill compiler-src arvo-src)

201+ %+ turn

202+ (snoc (turn dez tail) bas)

203+ |= =path

204+ (file-ovum2 [path exc])

205+ .*(0 arvo-formula)

206+ |= [ovo=ovum ken=*]

207+ [~ (slum ken [now ovo])]

208+ ::

209+ :: boot-two: startup formula

210+ ::

211+ :: We evaluate :arvo-formula (for jet registration),

212+ :: then ignore the result and produce .installed

213+ ::

214+ =/ boot-two

215+ => *[arvo-formula=^ installed=^ tale=*]

216+ != =+(.*(0 arvo-formula) [installed tale])

217+ ::

218+ :: boot-ova

219+ ::

220+ =/ boot-ova=(list)

221+ [aeon:eden:part boot-two arvo-formula installed ~]

222+ ::

223+ :: a pill is a 3-tuple of event-lists: [boot kernel userspace]

224+ ::

225+ :: Our kernel event-list is ~, as we've already installed them.

226+ :: Our userspace event-list is a list containing a full %clay

227+ :: filesystem sync event.

228+ ::

229+ :+ %pill %solid

230+ :+ boot-ova ~

231+ =. dez (snoc dez [%base bas])

232+ %+ weld

233+ %+ turn dez

234+ |= [dek=desk bas=path]

235+ (file-ovum [dek bas exc])

236+ ?. prime ~

237+ [(prep-ovum (turn dez tail))]~

238+::

239+++ brass

240+ :: sys: root path to boot system, `/~me/[desk]/now/sys`

241+ :: dez: secondary desks and their root paths

242+ :: exc: list of desk folders to exclude

243+ ::

244+ |= [sys=path dez=(list [desk path]) prime=? exc=(list spur)]

245+ ^- pill

246+ =/ bas=path (scag 3 sys)

247+ :: compiler-source: hoon source file producing compiler, `sys/hoon`

248+ ::

249+ =+ compiler-source=.^(@t %cx (welp sys /hoon/hoon))

250+ ::

251+ :: compiler-twig: compiler as hoon expression

252+ ::

253+ ~& %brass-parsing

254+ =+ compiler-twig=(rain /sys/hoon/hoon compiler-source)

255+ ~& %brass-parsed

256+ ::

257+ :: compiler-formula: compiler as nock formula

258+ ::

259+ ~& %brass-compiling

260+ =+ compiler-formula=q:(~(mint ut %noun) %noun compiler-twig)

261+ ~& %brass-compiled

262+ ::

263+ :: arvo-source: hoon source file producing arvo kernel, `sys/arvo`

264+ ::

265+ =+ arvo-source=.^(@t %cx (welp sys /arvo/hoon))

266+ ::

267+ :: boot-ova: startup events

268+ ::

269+ =/ boot-ova=(list)

270+ :~ aeon:eden:part

271+ boot:eden:part

272+ compiler-formula

273+ compiler-source

274+ arvo-source

275+ ==

276+ :: a pill is a 3-tuple of event-lists: [boot kernel userspace]

277+ ::

278+ :+ %pill %brass

279+ :+ boot-ova

280+ :~ (boot-ovum compiler-source arvo-source)

281+ (file-ovum2 [bas exc])

282+ ==

283+ =. dez (snoc dez [%base bas])

284+ %+ weld

285+ %+ turn dez

286+ |= [dek=desk bas=path]

287+ (file-ovum [dek bas exc])

288+ ?. prime ~

289+ [(prep-ovum (turn dez tail))]~

290+::

291+++ ivory

292+ |= sys=path

293+ ^- pill

294+ =/ lib (snoc (scag 3 sys) %lib)

295+ |^ =/ ver

296+ =/ sub *(trap vase)

297+ =. sub (build-sys sub %hoon)

298+ =. sub (build-sys sub %arvo)

299+ =. sub (build-sys sub %lull)

300+ =. sub (build-sys sub %zuse)

301+ =. sub (build-lib sub & %ethereum)

302+ =. sub (build-lib sub & %azimuth)

303+ (build-lib sub | %vere)

304+ =/ nok !.

305+ => *[ver=(trap vase) ~]

306+ != q:$:ver

307+ ivory/[nok ver ~]

308+ ::

309+ ++ build-sys

310+ |= [sub=(trap vase) nam=term] ^- (trap vase)

311+ ~> %slog.[0 leaf+"ivory: building /sys/{(trip nam)}"]

312+ (swat sub (rain /sys/[nam]/hoon .^(@t cx+(welp sys /[nam]/hoon))))

313+ ::

314+ ++ build-lib

315+ |= [sub=(trap vase) imp=? nam=term] ^- (trap vase)

316+ ~> %slog.[0 leaf+"ivory: building /lib/{(trip nam)}"]

317+ =/ hun=hoon

318+ %+ mist /lib/[nam]/hoon

319+ .^(@t cx+(welp lib /[nam]/hoon))

320+ ?. imp (swat sub hun)

321+ (swel sub [%ktts nam hun])

322+ :: +mist: +rain but skipping past ford runes

323+ ::

324+ ++ mist

325+ |= [bon=path txt=@]

326+ ^- hoon

327+ =+ vas=vast

328+ ~| bon

329+ %+ scan (trip txt)

330+ %- full

331+ =; fud

332+ (ifix [;~(plug gay fud) gay] tall:vas(wer bon))

333+ %- star

334+ ;~ pose vul

335+ %+ ifix [fas (just `@`10)]

336+ (star ;~(less (just `@`10) next))

337+ ==

338+ :: +swel: +swat but with +slop

339+ ::

340+ ++ swel

341+ |= [tap=(trap vase) gen=hoon]

342+ ^- (trap vase)

343+ =/ gun (~(mint ut p:$:tap) %noun gen)

344+ => [tap=tap gun=gun]

345+ |. ~+

346+ =/ pro q:$:tap

347+ [[%cell p.gun p:$:tap] [.*(pro q.gun) pro]]

348+ --

349+::

350+++ events

351+ |%

352+ +$ prop [%prop meta tier (list ovum)]

353+ +$ meta term

354+ +$ tier ?(%fore %hind) :: before or after userspace

355+ ::

356+ ++ install

357+ |= [as=desk =beak pri=?]

358+ ^- prop

359+ :^ %prop (rap 3 %install '-' as ~) %hind

360+ ::TODO will exclude non-:directories files, such as /changelog/txt

361+ =- (murn - same)

362+ ^- (list (unit ovum))

363+ :~ `(file-ovum as (en-beam beak /) ~)

364+ ::

365+ ?. pri ~

366+ `(prep-ovum (en-beam beak /) ~)

367+ ::

368+ `[/d/install/[as] [%seat as]]

369+ ==

370+ --

138371--

base-desk/lib/shoe.hoon+53−28

@@ -13,15 +13,15 @@

1313/- *sole

1414/+ sole, auto=language-server-complete

1515|%

16−+$ state-0

17− $: %0

18− soles=(map @ta sole-share)

16++$ state-1

17+ $: %1

18+ soles=(map sole-id sole-share)

1919 ==

2020:: $card: standard gall cards plus shoe effects

2121::

2222+$ card

2323 $% card:agent:gall

24− [%shoe sole-ids=(list @ta) effect=shoe-effect] :: ~ sends to all soles

24+ [%shoe sole-ids=(list sole-id) effect=shoe-effect] :: ~ sends to all

2525 ==

2626:: $shoe-effect: easier sole-effects

2727::

@@ -47,30 +47,30 @@

4747 :: if the head of the result is true, instantly run the command

4848 ::

4949 ++ command-parser

50− |~ sole-id=@ta

50+ |~ =sole-id

5151 |~(nail *(like [? command-type]))

5252 :: +tab-list: autocomplete options for the session (to match +command-parser)

5353 ::

5454 ++ tab-list

55− |~ sole-id=@ta

55+ |~ =sole-id

5656 :: (list [@t tank])

5757 *(list (option:auto tank))

5858 :: +on-command: called when a valid command is run

5959 ::

6060 ++ on-command

61− |~ [sole-id=@ta command=command-type]

61+ |~ [=sole-id command=command-type]

6262 *(quip card _^|(..on-init))

6363 ::

6464 ++ can-connect

65− |~ sole-id=@ta

65+ |~ =sole-id

6666 *?

6767 ::

6868 ++ on-connect

69− |~ sole-id=@ta

69+ |~ =sole-id

7070 *(quip card _^|(..on-init))

7171 ::

7272 ++ on-disconnect

73− |~ sole-id=@ta

73+ |~ =sole-id

7474 *(quip card _^|(..on-init))

7575 ::

7676 ::NOTE standard gall agent arms below, though they may produce %shoe cards

@@ -119,27 +119,27 @@

119119 |* [shoe=* command-type=mold]

120120 |_ =bowl:gall

121121 ++ command-parser

122− |= sole-id=@ta

122+ |= =sole-id

123123 (easy *[? command-type])

124124 ::

125125 ++ tab-list

126− |= sole-id=@ta

126+ |= =sole-id

127127 ~

128128 ::

129129 ++ on-command

130− |= [sole-id=@ta command=command-type]

130+ |= [=sole-id command=command-type]

131131 [~ shoe]

132132 ::

133133 ++ can-connect

134− |= sole-id=@ta

134+ |= =sole-id

135135 (team:title [our src]:bowl)

136136 ::

137137 ++ on-connect

138− |= sole-id=@ta

138+ |= =sole-id

139139 [~ shoe]

140140 ::

141141 ++ on-disconnect

142− |= sole-id=@ta

142+ |= =sole-id

143143 [~ shoe]

144144 --

145145:: +agent: creates wrapper core that handles sole events and calls shoe arms

@@ -147,7 +147,7 @@

147147++ agent

148148 |* command-type=mold

149149 |= =(shoe command-type)

150− =| state-0

150+ =| state-1

151151 =* state -

152152 ^- agent:gall

153153 =>

@@ -164,8 +164,7 @@

164164 %+ turn

165165 ?^ sole-ids.card sole-ids.card

166166 ~(tap in ~(key by soles))

167− |= sole-id=@ta

168− /sole/[sole-id]

167+ id-to-path:sole

169168 ::

170169 %table

171170 =; fez=(list sole-effect)

@@ -202,9 +201,36 @@

202201 ?. ?=([%shoe-app ^] q.old-state)

203202 =^ cards shoe (on-load:og old-state)

204203 [(deal cards) this]

205− =^ old-inner state +:!<([%shoe-app vase state-0] old-state)

206− =^ cards shoe (on-load:og old-inner)

207− [(deal cards) this]

204+ |^ =| old-outer=state-any

205+ =^ old-inner old-outer

206+ +:!<([%shoe-app vase state-any] old-state)

207+ :: ~! q.old-state

208+ :: ?+ +>.q.old-state !!

209+ :: [%0 *] +:!<([%shoe-app vase state-0] old-state)

210+ :: [%1 *] +:!<([%shoe-app vase state-1] old-state)

211+ :: ==

212+ =^ caz shoe (on-load:og old-inner)

213+ =^ cuz old-outer

214+ ?. ?=(%0 -.old-outer) [~ old-outer]

215+ (state-0-to-1 old-outer)

216+ ?> ?=(%1 -.old-outer)

217+ [(weld cuz (deal caz)) this(state old-outer)]

218+ ::

219+ +$ state-any $%(state-1 state-0)

220+ +$ state-0 [%0 soles=(map @ta sole-share)]

221+ ++ state-0-to-1

222+ |= old=state-0

223+ ^- (quip card:agent:gall state-1)

224+ :- %+ turn ~(tap in ~(key by soles.old))

225+ |= id=@ta

226+ ^- card:agent:gall

227+ [%give %kick ~[/sole/[id]] ~]

228+ :- %1

229+ %- ~(gas by *(map sole-id sole-share))

230+ %+ murn ~(tap by soles.old)

231+ |= [id=@ta s=sole-share]

232+ (bind (upgrade-id:sole id) (late s))

233+ --

208234 ::

209235 ++ on-poke

210236 |= [=mark =vase]

@@ -326,19 +352,18 @@

326352 ++ on-watch

327353 |= =path

328354 ^- (quip card:agent:gall agent:gall)

329− ?. ?=([%sole @ ~] path)

355+ ?~ sole-id=(path-to-id:sole path)

330356 =^ cards shoe

331357 (on-watch:og path)

332358 [(deal cards) this]

333− =* sole-id i.t.path

334− ?> (can-connect:og sole-id)

335− =. soles (~(put by soles) sole-id *sole-share)

359+ ?> (can-connect:og u.sole-id)

360+ =. soles (~(put by soles) u.sole-id *sole-share)

336361 =^ cards shoe

337− (on-connect:og sole-id)

362+ (on-connect:og u.sole-id)

338363 :_ this

339364 %- deal

340365 :_ cards

341− [%shoe [sole-id]~ %sole %pro & dap.bowl "> "]

366+ [%shoe [u.sole-id]~ %sole %pro & dap.bowl "> "]

342367 ::

343368 ++ on-leave

344369 |= =path

base-desk/lib/sole.hoon+24

@@ -136,4 +136,28 @@

136136 =+ dat=(transmute [%mor leg] [%ins pos `@c`0])

137137 ?> ?=(%ins -.dat)

138138 p.dat

139+::

140+::

141+++ path-to-id

142+ |= =path

143+ ^- (unit sole-id)

144+ ?. ?=([%sole @ ?(~ [@ ~])] path) ~

145+ ?~ who=(slaw %p i.t.path) ~

146+ `[u.who ?~(t.t.path %$ i.t.t.path)]

147+::

148+++ id-to-path

149+ |= sole-id

150+ ^- path

151+ ::TODO this whole "no empty path ending" business feels icky.

152+ :: do we want default session to be ~.~ ?

153+ :: concern here is that outsiders cannot subscribe to the default

154+ :: session, because /sole/~zod/ isn't a valid path...

155+ [%sole (scot %p who) ?~(ses ~ /[ses])]

156+::

157+++ upgrade-id

158+ |= old=@ta

159+ ^- (unit sole-id)

160+ %+ rush old

161+ %+ cook (late %$)

162+ ;~(pfix (jest 'drum_~') fed:ag)

139163--

base-desk/lib/sss.hoonnew file+371

@@ -0,0 +1,371 @@

1+/- *sss

2+/+ *mip

3+::

4+|%

5+++ mk-subs :: Create sub-map.

6+ |* [=(lake) paths=mold]

7+ -:+6:(da lake paths)

8+::

9+++ mk-pubs :: Create pub-map.

10+ |* [=(lake) paths=mold]

11+ -:+6:(du lake paths)

12+::

13+++ mk-mar :: Create mar.

14+ |* =(lake)

15+ |_ =(response:poke lake *)

16+ ++ grow

17+ |%

18+ ++ noun response

19+ --

20+ ++ grab

21+ |%

22+ ++ noun (response:poke lake *)

23+ --

24+ ++ grad %noun

25+ --

26+++ fled :: Like +sped but head is a path.

27+ |= vax=vase

28+ ^- vase

29+ :_ q.vax

30+ %- ~(play ut p.vax)

31+ =- [%wtgr [%wtts - [%& 2]~] [%$ 1]]

32+ =/ pax ~| %path-none ;;(path -.q.vax)

33+ |- ^- spec

34+ ?~ pax [%base %null]

35+ [%bccl ~[[%leaf %ta -.pax] $(pax +.pax)]]

36+::

37+++ zoom |= =noun ~| %need-path $/sss/;;(path noun)

38+::

39+++ da :: Manage subscriptions.

40+ |* [=(lake) paths=mold]

41+ =>

42+ |%

43+ +$ from (on-rock:poke lake paths)

44+ +$ into (response:poke lake paths)

45+ +$ result (request:poke paths)

46+ +$ fail [paths ship dude]

47+ +$ flow [=aeon stale=_| fail=_| =rock:lake]

48+ +$ subs [%0 (map [ship dude paths] (unit flow))]

49+ --

50+ |= $: sub=subs

51+ =bowl:gall

52+ result-type=type

53+ on-rock-type=type

54+ fail-type=type

55+ ==

56+ => .(sub +.sub)

57+ |%

58+ ++ surf :: Subscribe to [ship dude path].

59+ |= which=[ship dude paths]

60+ ^- (quip card:agent:gall subs)

61+ ?+ flow=(~(get by sub) which) `0/sub

62+ ~ [~[(pine which)] 0/(~(put by sub) which ~)]

63+ [~ ~] [~[(pine which)] 0/sub]

64+ [~ ~ [* %& * *]] [~[(scry `+(aeon.u.u.flow) which)] 0/sub]

65+ ==

66+ ++ quit (corl (lead %0) ~(del by sub)) :: Unsub from [ship dude path].

67+ ++ read :: See current subscribed states.

68+ ^- (map [ship dude paths] [stale=? fail=? =rock:lake])

69+ %- malt %+ murn ~(tap by sub)

70+ |= [key=[ship dude paths] val=(unit flow)]

71+ ?~ val ~

72+ `[key +.u.val]

73+ :: :: Check poke-ack for errors.

74+ :: :: If an %sss-on-rock poke nacks,

75+ ++ chit :: that state is flagged as failed.

76+ |= [[aeon=term ship=term dude=term path=paths] =sign:agent:gall]

77+ ^- subs

78+ :- %0

79+ ?> ?=(%poke-ack -.sign)

80+ ?~ p.sign sub

81+ %+ ~(jab by sub) [(slav %p ship) dude path]

82+ |= (unit flow)

83+ =/ =flow (need +<)

84+ ?> =(aeon.flow (slav %ud aeon))

85+ `flow(fail &)

86+ :: :: Check poke-ack for errors.

87+ :: :: If a scry request nacks,

88+ ++ tell :: that state is flagged as stale.

89+ |= [[ship=term =dude aeon=term path=paths] =sign:agent:gall]

90+ ^- (quip card:agent:gall subs)

91+ ?> ?=(%poke-ack -.sign)

92+ ?~ p.sign `0/sub

93+ =/ current [ship=(slav %p ship) dude=dude path=path]

94+ ?+ flow=(~(get by sub) current) `0/sub

95+ [~ ~ *]

96+ =. stale.u.u.flow &

97+ :_ 0/(~(put by sub) current u.flow)

98+ ~[(on-rock-poke current u.u.flow ~)]

99+ ::

100+ [~ ~]

101+ :_ 0/(~(del by sub) current) :_ ~

102+ :* %pass (zoom surf-fail/aeon/ship/dude/path)

103+ %agent [our dap]:bowl

104+ %poke %sss-surf-fail fail-type ^- fail

105+ [path ship dude]:current

106+ ==

107+ ==

108+ :: :: Check if we're still interested

109+ :: :: in a wave. If no, no-op.

110+ :: :: If yes, scry.

111+ ++ behn :: (See https://gist.github.com/belisarius222/7f8452bfea9b199c0ed717ab1778f35b)

112+ |= [ship=term =dude aeon=term path=paths]

113+ ^- (list card:agent:gall)

114+ %- fall :_ ~ %- mole |.

115+ =/ ship (slav %p ship)

116+ =/ aeon (slav %ud aeon)

117+ ?: (lte aeon aeon:(fall (~(got by sub) ship dude path) *flow)) ~

118+ ~[(scry `aeon ship dude path)]

119+ ::

120+ ++ apply :: Handle response from publisher.

121+ |= res=(response:poke lake paths)

122+ ^- (quip card:agent:gall subs)

123+ %- fall :_ `0/sub %- mole |.

124+ =* current [src.bowl dude.res path.res]

125+ =/ old=flow (fall (~(got by sub) current) *flow)

126+ ?- type.res

127+ %tomb

128+ =/ =flow old(stale &)

129+ :_ 0/(~(put by sub) current `flow) :_ ~

130+ (on-rock-poke current flow ~)

131+ ::

132+ %yore

133+ :_ 0/sub :_ ~

134+ (pine src.bowl dude.res path.res)

135+ ::

136+ %nigh

137+ :_ 0/sub :_ ~

138+ (behn-s25 [dude aeon path]:res)

139+ ::

140+ %scry

141+ =/ [wave=(unit wave:lake) =flow]

142+ ?- what.res

143+ %rock ?> (gte aeon.res aeon.old)

144+ [~ [aeon.res | | rock.res]]

145+ %wave ?> =(aeon.res +(aeon.old))

146+ [`wave.res [aeon.res | | (wash:lake rock.old wave.res)]]

147+ ==

148+ :_ 0/(~(put by sub) current `flow)

149+ :~ (on-rock-poke current flow wave)

150+ (scry `+(aeon.res) src.bowl dude.res path.res)

151+ ==

152+ ==

153+ ::

154+ :: Non-public facing arms below

155+ ::

156+ ++ behn-s25

157+ |= [=dude =aeon path=noun]

158+ ^- card:agent:gall

159+ :* %pass (zoom behn/(scot %p src.bowl)^dude^(scot %ud aeon)^path)

160+ %arvo %b %wait (add ~s25 now.bowl)

161+ ==

162+ ++ pine |= [ship dude paths] (scry ~ +<)

163+ ++ scry

164+ |= [when=(unit aeon) who=ship which=dude where=paths]

165+ ^- card:agent:gall

166+ =/ when ?~ when ~ (scot %ud u.when)

167+ :* %pass (zoom scry-request/(scot %p who)^which^when^where)

168+ %agent [who which]

169+ %poke %sss-to-pub :- result-type ^- result

170+ [where dap.bowl ^when]

171+ ==

172+ ++ on-rock-poke

173+ |= [[=ship =dude path=paths] flow wave=(unit wave:lake)]

174+ ^- card:agent:gall

175+ :* %pass (zoom on-rock/(scot %ud aeon)^(scot %p ship)^dude^path)

176+ %agent [our dap]:bowl

177+ %poke %sss-on-rock on-rock-type ^- from

178+ [path ship dude stale fail rock wave]

179+ ==

180+ --

181+++ du :: Manage publications.

182+ |* [=(lake) paths=mold]

183+ =>

184+ |%

185+ +$ into (request:poke paths)

186+ +$ result (response:poke lake paths)

187+ +$ rule [rocks=_1 waves=_5] :: Retention policy

188+ +$ tide

189+ $: rok=((mop aeon rock:lake) gte)

190+ wav=((mop aeon wave:lake) lte)

191+ rul=rule

192+ mem=(mip ship dude @da)

193+ ==

194+ +$ buoy

195+ $: tid=$~(*tide $@(aeon tide))

196+ alo=(unit (set ship))

197+ ==

198+ +$ pubs [%0 (map paths buoy)]

199+ --

200+ |= [pub=pubs =bowl:gall result-type=type]

201+ => .(pub +.pub)

202+ =* rok ((on aeon rock:lake) gte)

203+ =* wav ((on aeon wave:lake) lte)

204+ |%

205+ ++ rule :: Set new retention policy.

206+ |= [path=paths =^rule]

207+ ^- pubs

208+ :- %0

209+ %+ ~(jab by pub) path

210+ |= =buoy

211+ ?@ tid.buoy buoy

212+ buoy(tid (form tid.buoy(rul rule)))

213+ ::

214+ ++ wipe :: Create new rock and wipe rest.

215+ |= path=paths

216+ ^- pubs

217+ :- %0

218+ %+ ~(jab by pub) path

219+ |= =buoy

220+ ?@ tid.buoy buoy

221+ %* . buoy(tid (form tid.buoy(rul [0 1])))

222+ rul.tid rul.tid.buoy

223+ wav.tid ~

224+ ==

225+ ++ give :: Give a wave on a path.

226+ |= [path=paths =wave:lake]

227+ ^- (quip card:agent:gall pubs)

228+ ?~ ((soft ^path) path) ~| %need-path !!

229+ =/ buoy (~(gut by pub) path *buoy)

230+ ?@ tide=tid.buoy ~| %dead-path !! ::TODO is this good behavior?

231+ =/ next=aeon +((latest tide))

232+ :- %+ murn ~(tap bi mem.tide)

233+ |= [=ship =dude =@da]

234+ ?: (lth da now.bowl) ~

235+ `(send scry/wave/wave ship dude next path)

236+ :- %0

237+ %+ ~(put by pub) path

238+ =/ last=[=aeon =rock:lake] (fall (pry:rok rok.tide) *[key val]:rok)

239+ =. wav.tide (put:wav wav.tide next wave)

240+ =. mem.tide (~(del by mem.tide) next)

241+ ?. =(next (add aeon.last waves.rul.tide)) buoy

242+ buoy(tid (form tide))

243+ ::

244+ ++ perm :: Change permissions with gate.

245+ |= [where=(list paths) diff=$-((unit (set ship)) (unit (set ship)))]

246+ ^- pubs

247+ %+ edit where

248+ |= =buoy

249+ =/ new=_alo.buoy (diff alo.buoy)

250+ ?@ tid.buoy buoy(alo new)

251+ %= buoy

252+ alo new

253+ mem.tid ?~ new mem.tid.buoy

254+ %. mem.tid.buoy

255+ ~(int by (malt (turn ~(tap in u.new) (late *(map @ @)))))

256+ ==

257+ ++ public (curr perm _~) :: Make list of paths public.

258+ ++ secret (curr perm _`~) :: Make list of paths secret.

259+ :: :: Block ships from paths.

260+ ++ block :: No-ops on public paths.

261+ |= [who=(list ship) whence=(list paths)]

262+ ^- pubs

263+ %+ perm whence

264+ |= old=(unit (set ship))

265+ ?~ old ~ `(~(dif in u.old) (sy who))

266+ :: :: Allow ships to paths.

267+ ++ allow :: Any public paths will no-op.

268+ |= [who=(list ship) where=(list paths)]

269+ ^- pubs

270+ %+ perm where

271+ |= old=(unit (set ship))

272+ ?~ old ~ `(~(gas in u.old) who)

273+ :: :: Kill a list of paths, i.e. tell

274+ ++ kill :: subs to not expect updates.

275+ (curr edit |=(=buoy buoy(tid (latest tid.buoy))))

276+ :: :: Reopen list of killed paths.

277+ ++ live :: No-ops on live paths.

278+ %+ curr edit

279+ |= =buoy

280+ ?^ tid.buoy buoy

281+ %*(. buoy(tid *tide) rok.tid (put:rok ~ +(tid.buoy) *rock:lake))

282+ ::

283+ ++ read :: See current published states.

284+ ^- (map paths [allowed=(unit (set ship)) =rock:lake])

285+ %- malt %+ murn ~(tap by pub)

286+ |= [path=paths =buoy]

287+ ^- (unit [paths (unit (set ship)) rock:lake])

288+ ?@ tide=tid.buoy ~

289+ :^ ~ path alo.buoy =< rock

290+ =/ snap=[=aeon =rock:lake] (fall (pry:rok rok.tide) *[key val]:rok)

291+ %+ roll (tap:wav (lot:wav wav.tide `aeon.snap ~))

292+ |= [[=aeon =wave:lake] =_snap]

293+ ?. =(aeon +(aeon.snap)) snap

294+ [aeon (wash:lake rock.snap wave)]

295+ ::

296+ ++ apply :: Handle request from subscriber.

297+ |= req=(request:poke paths)

298+ ^- (quip card:agent:gall pubs)

299+ =/ =buoy (~(gut by pub) path.req *buoy)

300+ ?< &(?=(^ alo.buoy) !(~(has in u.alo.buoy) src.bowl))

301+ ?@ tid.buoy

302+ :_ 0/pub :_ ~

303+ (send tomb/~ src.bowl dude.req tid.buoy path.req)

304+ ?~ when.req

305+ =/ last (fall (pry:rok rok.tid.buoy) *[=key =val]:rok)

306+ :_ 0/pub :_ ~

307+ (send scry/rock/val.last src.bowl dude.req key.last path.req)

308+ ?^ dat=(get:wav wav.tid.buoy u.when.req)

309+ :_ 0/pub :_ ~

310+ (send scry/wave/u.dat src.bowl [dude u.when path]:req)

311+ ?: %+ lte u.when.req

312+ key::(fall (ram:wav wav.tid.buoy) (pry:rok rok.tid.buoy) [=key val]:wav)

313+ :_ 0/pub :_ ~

314+ (send yore/~ src.bowl [dude u.when path]:req)

315+ ?> =(u.when.req +((latest tid.buoy)))

316+ :- ~[(send nigh/~ src.bowl [dude u.when path]:req)]

317+ :- %0

318+ %+ ~(put by pub) path.req

319+ %= buoy

320+ mem.tid (~(put bi mem.tid.buoy) src.bowl dude.req (add ~s25 now.bowl))

321+ ==

322+ ::

323+ :: Non-public facing arms below

324+ ::

325+ ++ send

326+ |= [payload=_|3:*(response:poke lake paths) =ship =dude =aeon path=paths]

327+ ^- card:agent:gall

328+ =* mark (cat 3 %sss- name:lake)

329+ :* %pass (zoom scry-response/(scot %p ship)^dude^(scot %ud aeon)^path)

330+ %agent [ship dude]

331+ %poke mark result-type ^- (response:poke lake paths)

332+ [path dap.bowl aeon payload]

333+ ==

334+ ++ latest

335+ |= =$@(aeon tide)

336+ ^- aeon

337+ ?@ tide tide

338+ %+ max (fall (bind (pry:rok rok.tide) head) 0)

339+ (fall (bind (ram:wav wav.tide) head) 0)

340+ ::

341+ ++ edit

342+ |= [ps=(list paths) edit=$-(buoy buoy)]

343+ ^- pubs

344+ :- %0

345+ %- ~(rep in (sy ps))

346+ |= [path=paths =_pub]

347+ %- fall :_ pub %- mole |.

348+ (~(jab by pub) path edit)

349+ ::

350+ ++ form

351+ |= =tide

352+ ^+ tide

353+ =/ max-rock=[=aeon =rock:lake] (fall (pry:rok rok.tide) *[key val]:rok)

354+ =/ max-wave (fall (bind (ram:wav wav.tide) head) 0)

355+ =. rok.tide

356+ %+ gas:rok +<-:gas:rok

357+ %- tab:rok :_ [~ +(rocks.rul.tide)]

358+ ?: ?| =(waves.rul.tide 0)

359+ (lth max-wave (add aeon.max-rock waves.rul.tide))

360+ ==

361+ rok.tide

362+ %+ put:rok rok.tide

363+ %+ roll (tab:wav wav.tide `aeon.max-rock max-wave)

364+ |: [*[now=aeon =wave:lake] `[prev=aeon =rock:lake]`max-rock]

365+ ~| %aeon-awry

366+ ?> =(now +(prev))

367+ [now (wash:lake rock wave)]

368+ ~| %rock-zero

369+ tide(wav (lot:wav wav.tide (bind (ram:rok rok.tide) |=([r=@ *] (dec r))) ~))

370+ --

371+--

base-desk/lib/strand.hoon+1−188

@@ -1,188 +1 @@

1−|%

2−+$ card card:agent:gall

3−+$ input

4− $% [%poke =cage]

5− [%sign =wire =sign-arvo]

6− [%agent =wire =sign:agent:gall]

7− [%watch =path]

8− ==

9−+$ strand-input [=bowl in=(unit input)]

10−+$ tid @tatid

11−+$ bowl

12− $: our=ship

13− src=ship

14− tid=tid

15− mom=(unit tid)

16− wex=boat:gall

17− sup=bitt:gall

18− eny=@uvJ

19− now=@da

20− byk=beak

21− ==

22−::

23−:: cards: cards to send immediately. These will go out even if a

24−:: later stage of the computation fails, so they shouldn't have

25−:: any semantic effect on the rest of the system.

26−:: Alternately, they may record an entry in contracts with

27−:: enough information to undo the effect if the computation

28−:: fails.

29−:: wait: don't move on, stay here. The next sign should come back

30−:: to this same callback.

31−:: skip: didn't expect this input; drop it down to be handled

32−:: elsewhere

33−:: cont: continue computation with new callback.

34−:: fail: abort computation; don't send effects

35−:: done: finish computation; send effects

36−::

37−++ strand-output-raw

38− |* a=mold

39− $~ [~ %done *a]

40− $: cards=(list card)

41− $= next

42− $% [%wait ~]

43− [%skip ~]

44− [%cont self=(strand-form-raw a)]

45− [%fail err=(pair term tang)]

46− [%done value=a]

47− ==

48− ==

49−::

50−++ strand-form-raw

51− |* a=mold

52− $-(strand-input (strand-output-raw a))

53−::

54−:: Abort strand computation with error message

55−::

56−++ strand-fail

57− |= err=(pair term tang)

58− |= strand-input

59− [~ %fail err]

60−::

61−:: Asynchronous transcaction monad.

62−::

63−:: Combo of four monads:

64−:: - Reader on input

65−:: - Writer on card

66−:: - Continuation

67−:: - Exception

68−::

69−++ strand

70− |* a=mold

71− |%

72− ++ output (strand-output-raw a)

73− ::

74− :: Type of an strand computation.

75− ::

76− ++ form (strand-form-raw a)

77− ::

78− :: Monadic pure. Identity computation for bind.

79− ::

80− ++ pure

81− |= arg=a

82− ^- form

83− |= strand-input

84− [~ %done arg]

85− ::

86− :: Monadic bind. Combines two computations, associatively.

87− ::

88− ++ bind

89− |* b=mold

90− |= [m-b=(strand-form-raw b) fun=$-(b form)]

91− ^- form

92− |= input=strand-input

93− =/ b-res=(strand-output-raw b)

94− (m-b input)

95− ^- output

96− :- cards.b-res

97− ?- -.next.b-res

98− %wait [%wait ~]

99− %skip [%skip ~]

100− %cont [%cont ..$(m-b self.next.b-res)]

101− %fail [%fail err.next.b-res]

102− %done [%cont (fun value.next.b-res)]

103− ==

104− ::

105− :: The strand monad must be evaluted in a particular way to maintain

106− :: its monadic character. +take:eval implements this.

107− ::

108− ++ eval

109− |%

110− :: Indelible state of a strand

111− ::

112− +$ eval-form

113− $: =form

114− ==

115− ::

116− :: Convert initial form to eval-form

117− ::

118− ++ from-form

119− |= =form

120− ^- eval-form

121− form

122− ::

123− :: The cases of results of +take

124− ::

125− +$ eval-result

126− $% [%next ~]

127− [%fail err=(pair term tang)]

128− [%done value=a]

129− ==

130− ::

131− ++ validate-mark

132− |= [in=* =mark =bowl]

133− ^- cage

134− =+ .^ =dais:clay %cb

135− /(scot %p our.bowl)/[q.byk.bowl]/(scot %da now.bowl)/[mark]

136− ==

137− =/ res (mule |.((vale.dais in)))

138− ?: ?=(%| -.res)

139− ~|(%spider-mark-fail (mean leaf+"spider: ames vale fail {<mark>}" p.res))

140− [mark p.res]

141− ::

142− :: Take a new sign and run the strand against it

143− ::

144− ++ take

145− :: cards: accumulate throughout recursion the cards to be

146− :: produced now

147− =| cards=(list card)

148− |= [=eval-form =strand-input]

149− ^- [[(list card) =eval-result] _eval-form]

150− =* take-loop $

151− =. in.strand-input

152− ?~ in.strand-input ~

153− =/ in u.in.strand-input

154− ?. ?=(%agent -.in) `in

155− ?. ?=(%fact -.sign.in) `in

156− ::

157− :- ~

158− :+ %agent wire.in

159− [%fact (validate-mark q.q.cage.sign.in p.cage.sign.in bowl.strand-input)]

160− :: run the strand callback

161− ::

162− =/ =output (form.eval-form strand-input)

163− :: add cards to cards

164− ::

165− =. cards

166− %+ welp

167− cards

168− :: XX add tag to wires?

169− cards.output

170− :: case-wise handle next steps

171− ::

172− ?- -.next.output

173− %wait [[cards %next ~] eval-form]

174− %skip [[cards %next ~] eval-form]

175− %fail [[cards %fail err.next.output] eval-form]

176− %done [[cards %done value.next.output] eval-form]

177− %cont

178− :: recurse to run continuation with initialization input

179− ::

180− %_ take-loop

181− form.eval-form self.next.output

182− strand-input [bowl.strand-input ~]

183− ==

184− ==

185− --

186− --

187−--

188−::

1+rand

base-desk/mar/belt.hoon+3−12

@@ -1,5 +1,7 @@

11:: belt: runtime belt structure

22::

3+/+ dill

4+::

35|_ =belt:dill

46++ grad %noun

57:: +grab: convert from

@@ -7,18 +9,7 @@

79++ grab

810 |%

911 ++ noun belt:dill

10− ++ json

11− ^- $-(^json belt:dill)

12− =, dejs:format

13− %- of

14− :~ aro+(su (perk %d %l %r %u ~))

15− bac+ul

16− ctl+(cu taft so)

17− del+ul

18− met+(cu taft so)

19− ret+ul

20− txt+(ar (cu taft so))

21− ==

12+ ++ json belt:dejs:dill

2213 --

2314:: +grow: convert to

2415::

base-desk/mar/blit.hoon+3−44

@@ -1,5 +1,7 @@

11:: blit: runtime blit structure

22::

3+/+ dill

4+::

35|_ =blit:dill

46++ grad %noun

57:: +grab: convert from

@@ -13,49 +15,6 @@

1315++ grow

1416 |%

1517 ++ noun blit

16− ++ json

17− ^- ^json

18− =, enjs:format

19− %+ frond -.blit

20− ?- -.blit

21− %bel b+&

22− %clr b+&

23− %hop (numb p.blit)

24− %lin a+(turn p.blit |=(c=@c s+(tuft c)))

25− %mor b+&

26− %url s+p.blit

27− ::

28− %sag

29− %- pairs

30− :~ 'path'^(path p.blit)

31− 'file'^s+(en:base64:mimes:html (as-octs:mimes:html (jam q.blit)))

32− ==

33− ::

34− %sav

35− %- pairs

36− :~ 'path'^(path p.blit)

37− 'file'^s+(en:base64:mimes:html (as-octs:mimes:html q.blit))

38− ==

39− ::

40− %klr

41− :- %a

42− %+ turn p.blit

43− |= [=stye text=(list @c)]

44− %- pairs

45− :~ 'text'^a+(turn text |=(c=@c s+(tuft c)))

46− ::

47− :- 'stye'

48− %- pairs

49− |^ :~ 'back'^(color p.q.stye)

50− 'fore'^(color q.q.stye)

51− 'deco'^a+(turn ~(tap in p.stye) |=(d=deco ?~(d ~ s+d)))

52− ==

53− ++ color

54− |= =tint

55− ?@ tint ?~(tint ~ s+tint)

56− s+(crip ((x-co:co 6) (rep 3 ~[b g r]:tint)))

57− --

58− ==

59− ==

18+ ++ json (blit:enjs:dill blit)

6019 --

6120--

base-desk/mar/sole/action.hoon+3−1

@@ -20,7 +20,9 @@

2020 |= jon=^json ^- sole-action

2121 %- need %. jon

2222 => [dejs-soft:format ..sole-action]

23− |^ (ot id+so dat+(fo %ret (of det+change tab+ni ~)) ~)

23+ |^ (ot id+id dat+(fo %ret (of det+change tab+ni ~)) ~)

24+ ++ id

25+ (ot who+(su ;~(pfix sig fed:ag)) ses+so ~)

2426 ++ fo

2527 |* [a=term b=fist]

2628 |=(c=json ?.(=([%s a] c) (b c) (some [a ~])))

base-desk/sur/hood.hoon+149−206

@@ -1,147 +1,159 @@

11=, clay

22=* dude dude:gall

33|%

4−:: $snap: kiln snapshot

5−::

6−+$ snap (map desk arak)

7−:: $diff: subscription update

8−::

9−+$ diff

10− $% [%block =desk =arak =weft blockers=(set desk)]

11− [%reset =desk =arak]

12− [%commit =desk =arak]

13− [%merge-sunk =desk =arak =tang]

14− [%merge-fail =desk =arak =tang]

15− [%suspend =desk =arak]

16− [%revive =desk =arak]

4++$ pike

5+ $: sync=(unit [=ship =desk])

6+ hash=@uv

7+ =zest

8+ wic=(set weft)

179 ==

18−:: $arak: foreign vat tracker

1910::

20−:: .rail: upstream tracking state, if any

21−:: .rein: configuration for agents

22−::

23−+$ arak

24− $: rail=(unit rail)

25− =rein

26− ==

27−:: $rail: upstream tracking state

11++$ pikes (map desk pike)

2812::

29−:: .publisher: Ship that originally published desk, if available

30−:: .paused: is tracking paused? or live

31−:: .ship: upstream ship (could be .our)

32−:: .desk: name of upstream desk

33−:: .aeon: next aeon to pull from upstream

34−:: .next: list of pending commits with future kelvins

35−::

36−+$ rail

37− $: publisher=(unit ship)

38− paused=?

39− =ship

40− =desk

41− =aeon

42− next=(list rung)

43− ==

4413:: $rung: reference to upstream commit

4514::

4615+$ rung [=aeon =weft]

47−:: $rein: diff from desk manifest

48−::

49−:: .liv: suspended? if suspended, no agents should run

50−:: .add: agents not in manifest that should be running

51−:: .sub: agents in manifest that should not be running

52−::

53−+$ rein

54− $: liv=_&

55− add=(set dude)

56− sub=(set dude)

57− ==

58−::

59−+$ vat [=desk hash=@uv =cass =arak]

60−:: +report-vats: report on all desk installations

6116::

17++$ sync-state [nun=@ta kid=(unit desk) let=@ud]

18++$ sink (unit [her=@p sud=desk kid=(unit desk) let=@ud])

6219++ report-vats

63− |= [our=@p now=@da]

64− ^- tang

65− =+ .^ raz=(list vat)

66− %gx /(scot %p our)/hood/(scot %da now)/kiln/vats/noun

20+ =| $: =cone

21+ sor=(map desk [ship desk])

22+ zyn=(map [desk ship desk] sync-state)

23+ desks=(set desk)

24+ =pikes

25+ =rock:tire:clay

26+ kel=weft

6727 ==

68− :- (report-kids our now)

69− (turn raz |=(v=vat (report-vat our now v)))

70−:: +report-vat: report on a single desk installation

71−::

72−++ report-vat

73− |= [our=ship now=@da vat]

74− ^- tank

75− ?: =(ud.cass 0)

76− leaf+"desk does not yet exist: {<desk>}"

77− =/ kel-path

78− /(scot %p our)/[desk]/(scot %da now)/sys/kelvin

79− ?. .^(? %cu kel-path)

80− leaf+"bad desk: {<desk>}"

81− =+ .^(=weft %cx kel-path)

82− :+ %rose ["" "{<desk>}" "::"]

83− ^- tang

84− =/ meb (mergebase-hashes our desk now arak)

85− =/ poz

86− ?~ rail.arak "local"

87− ?:(paused.u.rail.arak "paused" "tracking")

88− =/ sat ?:(liv.rein.arak "running" "suspended")

89− =/ pen

90− ?~ rail.arak "~"

91− <(turn next.u.rail.arak |=([@ lal=@tas num=@] [lal num]))>

92− :~ leaf/"/sys/kelvin: {<[lal num]:weft>}"

93− leaf/"base hash: {?.(=(1 (lent meb)) <meb> <(head meb)>)}"

94− leaf/"%cz hash: {<hash>}"

95− ::

96− leaf/"app status: {sat}"

97− leaf/"force on: {?:(=(~ add.rein.arak) "~" <add.rein.arak>)}"

98− leaf/"force off: {?:(=(~ sub.rein.arak) "~" <sub.rein.arak>)}"

99− ::

100− leaf/"publishing ship: {?~(rail.arak <~> <publisher.u.rail.arak>)}"

101− leaf/"updates: {poz}"

102− leaf/"source ship: {?~(rail.arak <~> <ship.u.rail.arak>)}"

103− leaf/"source desk: {?~(rail.arak <~> <desk.u.rail.arak>)}"

104− leaf/"source aeon: {?~(rail.arak <~> <aeon.u.rail.arak>)}"

105− leaf/"pending updates: {pen}"

106− ==

107−:: +report-kids: non-vat cz hash report for kids desk

108−::

109−++ report-kids

110− |= [our=ship now=@da]

111− ^- tank

112− =/ dek %kids

113− =/ ego (scot %p our)

114− =/ wen (scot %da now)

115− ?. (~(has in .^((set desk) %cd /[ego]//[wen])) dek)

116− leaf/"no %kids desk"

117− =+ .^(hash=@uv %cz /[ego]/[dek]/[wen])

118− leaf/"%kids %cz hash: {<hash>}"

119−:: +read-kelvin-foreign: read /sys/kelvin from a foreign desk

120−::

121−++ read-kelvin-foreign

122− |= [=ship =desk =aeon]

123− ^- weft

124− ~| read-foreign-kelvin/+<

125− =/ her (scot %p ship)

126− =/ syd (scot %tas desk)

127− =/ yon (scot %ud aeon)

128− ::

129− =/ dom .^(dome cv/~[her syd yon])

130− =/ tak (scot %uv (~(got by hit.dom) let.dom))

131− =/ yak .^(yaki cs/~[her syd yon %yaki tak])

132− =/ lob (scot %uv (~(got by q.yak) /sys/kelvin))

133− =/ peg .^(page cs/~[her syd yon %blob lob])

134− ;;(weft q.peg)

135−:: +read-kelvin-local: read /sys/kelvin from a local desk

136−::

137−++ read-kelvin-local

138− |= [our=ship =desk now=@da]

139− ^- (unit weft)

140− ~| read-kelvin-local+desk

141− =/ pax (en-beam [our desk da+now] /sys/kelvin)

142− ?. .^(? cu/pax)

143− ~

144− [~ .^(weft cx/pax)]

28+ |_ [our=@p now=@da]

29+ +* ego (scot %p our)

30+ wen (scot %da now)

31+ ++ $

32+ |= [? ? ? ? ?]

33+ (report-vats:abed +<)

34+ ++ abed

35+ %= ..abed

36+ cone .^(^cone %cx /[ego]//[wen]/domes)

37+ sor .^((map desk [ship desk]) %gx /[ego]/hood/[wen]/kiln/sources/noun)

38+ zyn .^ (map [desk ship desk] sync-state) %gx

39+ /[ego]/hood/[wen]/kiln/syncs/noun

40+ ==

41+ desks .^((set desk) %cd /[ego]/base/[wen])

42+ pikes .^(^pikes %gx /[ego]/hood/[wen]/kiln/pikes/kiln-pikes)

43+ rock .^(rock:tire:clay %cx /[ego]//[wen]/tire)

44+ kel (weft .^(* cx/(en-beam [our %base da+now] /sys/kelvin)))

45+ ==

46+ ++ vat-info

47+ |= desk=_`desk`%base

48+ =/ pike (~(got by pikes) desk)

49+ =/ zest -:(~(got by rock) desk)

50+ =/ kel-path /[ego]/[desk]/[wen]/sys/kelvin

51+ =/ sink=sink

52+ ?~ s=(~(get by sor) desk)

53+ ~

54+ ?~ z=(~(get by zyn) desk u.s)

55+ ~

56+ `[-.u.s +.u.s +.u.z]

57+ =/ hash .^(@uv %cz /[ego]/[desk]/[wen])

58+ =/ dek (~(got by rock) desk)

59+ =/ =dome (~(got by cone) our desk)

60+ =+ .^(=waft %cx kel-path)

61+ :* &1 &2 &3 &4 &5 &6 &7 &8

62+ desk=desk

63+ ^= running =(%live zest)

64+ ^= suspended =(%dead zest)

65+ ^= exists !=(ud.cass 0):.^(=cass %cw /[ego]/[desk]/[wen])

66+ ^= bad-desk ?!(.^(? %cu kel-path))

67+ ^= meb :: =(list @uv)

68+ ?~ sink [hash]~

69+ (mergebase-hashes our desk now her.u.sink sud.u.sink)

70+ ^- [on=(list [@tas ?]) of=(list [@tas ?])]

71+ (skid ~(tap by ren.dome) |=([* ?] +<+))

72+ ^= sat

73+ ?- zest.dek

74+ %live "running"

75+ %dead "suspended"

76+ %held "suspended until next update"

77+ ==

78+ ^- kul=tape

79+ %+ roll

80+ %+ sort

81+ ~(tap in (waft-to-wefts:clay waft))

82+ |= [a=weft b=weft]

83+ ?: =(lal.a lal.b)

84+ (lte num.a num.b)

85+ (lte lal.a lal.b)

86+ |= [=weft =tape]

87+ (welp " {<[lal num]:weft>}" tape)

88+ ^= blocking

89+ ?& !=(%base desk)

90+ !=(%live zest.pike)

91+ !(~(has in wic.pike) kel)

92+ == ==

93+ ++ report-vats

94+ |= $: verb=?

95+ show-suspended=?

96+ show-running=?

97+ show-blocking=?

98+ show-nonexistent=?

99+ ==

100+ %+ turn

101+ %+ skim

102+ %+ turn ~(tap in desks)

103+ |= =desk (vat-info desk)

104+ |= vat-info

105+ :: just unconditionally show "bad" desks, whatever that means

106+ ?| bad-desk

107+ &(suspended show-suspended)

108+ &(running show-running)

109+ &(blocking show-blocking)

110+ &(!exists show-nonexistent)

111+ ==

112+ |= =vat-info

113+ :+ %rose [" " " " "::"]

114+ :- leaf+"{<desk.vat-info>}"

115+ %- flop

116+ %- report-vat

117+ [verb vat-info]

118+ ++ report-vat

119+ |= [verb=? vat-info]

120+ ^- tang

121+ ?: !exists

122+ ~[leaf+"desk does not yet exist: {<desk>}"]

123+ ?: =(%kids desk)

124+ ~[leaf+"%kids %cz hash: {<hash>}"]

125+ ?: bad-desk

126+ ~[leaf+"bad desk: {<desk>}"]

127+ %- flop

128+ ?. verb

129+ :~ leaf/"/sys/kelvin: {kul}"

130+ leaf/"app status: {sat}"

131+ leaf/"publishing ship: {?~(sink <~> <(get-publisher our desk now)>)}"

132+ leaf/"pending updates: {<`(list [@tas @ud])`~(tap in wic.dek)>}"

133+ ==

134+ :~ leaf/"/sys/kelvin: {kul}"

135+ leaf/"base hash: {?.(=(1 (lent meb)) <meb> <(head meb)>)}"

136+ leaf/"%cz hash: {<hash>}"

137+ ::

138+ leaf/"app status: {sat}"

139+ leaf/"force on: {?:(=(~ on) "~" <on>)}"

140+ leaf/"force off: {?:(=(~ of) "~" <of>)}"

141+ ::

142+ leaf/"publishing ship: {?~(sink <~> <(get-publisher our desk now)>)}"

143+ leaf/"updates: {?~(sink "local" "remote")}"

144+ leaf/"source ship: {?~(sink <~> <her.u.sink>)}"

145+ leaf/"source desk: {?~(sink <~> <sud.u.sink>)}"

146+ leaf/"source aeon: {?~(sink <~> <let.u.sink>)}"

147+ leaf/"kids desk: {?~(sink <~> ?~(kid.u.sink <~> <u.kid.u.sink>))}"

148+ leaf/"pending updates: {<`(list [@tas @ud])`~(tap in wic.dek)>}"

149+ ==

150+ ++ report-kids

151+ ^- tank

152+ ?. (~(has in .^((set desk) %cd /[ego]//[wen])) %kids)

153+ leaf/"no %kids desk"

154+ =+ .^(hash=@uv %cz /[ego]/kids/[wen])

155+ leaf/"%kids %cz hash: {<hash>}"

156+ --

145157:: +read-bill-foreign: read /desk/bill from a foreign desk

146158::

147159++ read-bill-foreign

@@ -152,7 +164,7 @@

152164 =/ syd (scot %tas desk)

153165 =/ yon (scot %ud aeon)

154166 ::

155− =/ dom .^(dome cv/~[her syd yon])

167+ =/ dom .^(domo cv/~[her syd yon])

156168 =/ tak ~| aeons=~(key by hit.dom)

157169 (scot %uv (~(got by hit.dom) aeon))

158170 =/ yak .^(yaki cs/~[her syd yon %yaki tak])

@@ -169,21 +181,6 @@

169181 ?. .^(? cu/pax)

170182 *(list dude)

171183 .^((list dude) cx/pax)

172−:: +adjust-dudes: which agents should be started and stopped

173−::

174−:: Will ask Gall to start agents that it's already running

175−:: but that should be ok, and might be safer in case other

176−:: unprocessed moves would have turned them off.

177−::

178−++ adjust-dudes

179− |= $: local=[our=ship =desk now=@da]

180− =rein

181− ==

182− ^- [jolt=(list dude) idle=(list dude)]

183− =/ all=(list dude) (read-bill local)

184− =/ want (get-apps-want local all rein)

185− =/ have (get-apps-live local)

186− [want (skip have ~(has in (sy want)))]

187184::

188185++ get-remote-diff

189186 |= [our=ship here=desk now=@da her=ship there=desk when=aeon]

@@ -210,38 +207,18 @@

210207 ^- (list [=dude live=?])

211208 %~ tap in

212209 .^((set [=dude live=?]) ge+/(scot %p our)/[desk]/(scot %da now))

213−:: +get-apps-want: find which apps should be running on a desk

214−::

215−++ get-apps-want

216− |= [local=[our=ship =desk now=@da] duz=(list dude) =rein]

217− ^- (list dude)

218− ?. liv.rein ~

219− ?. |(=(`zuse+zuse (read-kelvin-local local)) =(%base desk.local)) ~

220− =. duz (skip duz ~(has in sub.rein))

221− =. duz (weld duz (skip ~(tap in add.rein) ~(has in (sy duz))))

222− duz

223210::

224211++ mergebase-hashes

225− |= [our=@p =desk now=@da =arak]

226− ?~ rail.arak

227− ~

228− =/ her (scot %p ship.u.rail.arak)

212+ |= [our=@p syd=desk now=@da her=ship sud=desk]

213+ =/ her (scot %p her)

229214 =/ ego (scot %p our)

230215 =/ wen (scot %da now)

231− %+ turn .^((list tako) %cs ~[ego desk wen %base her desk.u.rail.arak])

232− |=(=tako .^(@uv %cs ~[ego desk wen %hash (scot %uv tako)]))

216+ %+ turn .^((list tako) %cs ~[ego syd wen %base her sud])

217+ |=(=tako .^(@uv %cs ~[ego syd wen %hash (scot %uv tako)]))

233218::

234219++ enjs

235220 =, enjs:format

236221 |%

237− ++ vats

238− |= v=(list ^vat)

239− ^- json

240− %- pairs

241− %+ turn v

242− |= va=^vat

243− [desk.va (vat va)]

244− ::

245222 ++ tim

246223 |= t=@

247224 ^- json

@@ -254,15 +231,6 @@

254231 da+(tim da.c)

255232 ==

256233 ::

257− ++ vat

258− |= v=^vat

259− %- pairs

260− :~ desk+s+desk.v

261− hash+s+(scot %uv hash.v)

262− cass+(cass cass.v)

263− arak+(arak arak.v)

264− ==

265− ::

266234 ++ weft

267235 |= w=^weft

268236 %- pairs

@@ -276,30 +244,5 @@

276244 :~ aeon+(numb aeon.r)

277245 weft+(weft weft.r)

278246 ==

279− ::

280− ++ rein

281− |= r=^rein

282− %- pairs

283− :~ add+a+(turn ~(tap in add.r) (lead %s))

284− sub+a+(turn ~(tap in sub.r) (lead %s))

285− ==

286− ::

287− ++ arak

288− |= a=^arak

289− %- pairs

290− :~ rail+?~(rail.a ~ (rail u.rail.a))

291− rein+(rein rein.a)

292− ==

293− ::

294− ++ rail

295− |= r=^rail

296− %- pairs

297− :~ ship+s+(scot %p ship.r)

298− publisher+?~(publisher.r ~ s+(scot %p u.publisher.r))

299− desk+s+desk.r

300− paused+b+paused.r

301− aeon+(numb aeon.r)

302− next+a+(turn next.r rung)

303− ==

304247 --

305248--

base-desk/sur/sole.hoon+2−1

@@ -3,8 +3,9 @@

33 ::

44^?

55|%

6++$ sole-id [who=@p ses=@ta]

67+$ sole-action :: sole to app

7− $: id=@ta :: duct id

8+ $: id=sole-id :: session id

89 $= dat

910 $% :: [%abo ~] :: reset interaction

1011 [%det sole-change] :: command line edit

base-desk/sur/sss.hoonnew file+43

@@ -0,0 +1,43 @@

1+|%

2+++ lake

3+ |$ [rock wave]

4+ $_ ^?

5+ |%

6+ ++ name *term

7+ +$ rock ^rock

8+ +$ wave ^wave

9+ ++ wash |~ [rock wave] *rock

10+ --

11++$ aeon @ud

12++$ dude dude:agent:gall

13++$ what ?(%rock %wave)

14+++ poke

15+ |%

16+ ++ request

17+ |* paths=mold

18+ $: path=paths

19+ =dude

20+ when=(unit aeon)

21+ ==

22+ ++ response

23+ |* [=(lake) paths=mold]

24+ $: path=paths

25+ =dude

26+ =aeon

27+ $% [type=?(%nigh %yore %tomb) ~]

28+ $: type=%scry

29+ $% [what=%rock =rock:lake]

30+ [what=%wave =wave:lake]

31+ == == == ==

32+ ++ on-rock

33+ |* [=(lake) paths=mold]

34+ $: path=paths

35+ src=ship

36+ from=dude

37+ stale=?

38+ fail=?

39+ =rock:lake

40+ wave=(unit wave:lake)

41+ ==

42+ --

43+--

desk/desk.docket-0+1−1

@@ -4,7 +4,7 @@

44 image+'https://raw.githubusercontent.com/johnhyde/astrolabe/main/ui/src/assets/astrolabe-tile.svg'

55 glob-http+['https://s3.us-east-2.amazonaws.com/warkgnall.com/urbit/astrolabe/globs/glob-0v4.88rt1.guqn5.nnatp.lca68.ej9aj.glob' 0v4.88rt1.guqn5.nnatp.lca68.ej9aj]

66 base+'astrolabe'

7− version+[1 0 4]

7+ version+[1 0 5]

88 website+'https://github.com/johnhyde/astrolabe'

99 license+'MIT'

1010==

desk/sys.kelvin+1−1

@@ -1 +1 @@

1−[%zuse 417]

1+[%zuse 414]