a64ee97...main · astrolabe

.gitignore+1

@@ -1,3 +1,4 @@

11# OS X

22.DS_Store

33extras

4+globs

.vscode/settings.json+6

@@ -48,5 +48,11 @@

4848 }

4949 ]

5050 }

51+ ],

52+ "grammarly.selectors": [

53+ {

54+ "language": "markdown",

55+ "scheme": "file"

56+ }

5157 ]

5258}

.vscode/tasks.jsonnew file+13

@@ -0,0 +1,13 @@

1+{

2+ "version": "2.0.0",

3+ "tasks": [

4+ {

5+ "type": "npm",

6+ "script": "install:desk",

7+ "path": "ui",

8+ "problemMatcher": [],

9+ "label": "npm: install:desk - ui",

10+ "detail": "dotenv -c local npm run _install:desk"

11+ }

12+ ]

13+}

README.md+34−25

@@ -21,47 +21,56 @@ Astrolabe is built primarily using [Svelte], [Typescript], and [Tailwind CSS]. [

2121

2222To get started using Astrolabe first you need to run `npm install` inside the `ui` directory.

2323

24−To develop you'll need a running ship to point to. To do so you first need to add a `.env.local` file to the `ui` directory. This file will not be committed. Adding `VITE_SHIP_URL={URL}` where **{URL}** is the URL of the ship you would like to point to, will allow you to run `npm run dev`. This will proxy all requests to the ship except for those powering the interface, allowing you to see live data.

24+To develop you'll need a running ship to point to. If it's running somewhere other than `http://localhost:8081`, make a copy of `.env` in the `ui` directory and name it `.env.local`. This file will not be committed. Change `VITE_SHIP_URL` to the URL of the ship you would like to point to.

25+

26+Once your URL is correctly configured, you can run `npm run dev`. This will proxy all requests to the ship except for those powering the interface, allowing you to see live data.

2527

2628Regardless of what you run to develop, Vite will hot-reload code changes as you work so you don't have to constantly refresh.

2729

28−### Deploying with `glob-ames` glob

30+# Deploying

2931

30321. Spin up a comet or distribution ship.

31332. Mount an `%astrolabe` desk. In Dojo:

3234 1. `|merge %astrolabe our %base` to create a new desk.

33− 2. `|mount %work` to mount it.

35+ 2. `|mount %astrolabe` to mount it.

36+ 3. Set `ASTROLABE_DESK` in `.env.local` if the path to your desk is different.

37+3. Create and upload `glob-http`, if applicable (see below)

38+4. Bump the `version` in `desk.docket-0`.

34393. Install the desk

35− 1. From the root of the project: `./install.sh path/to/pier/astrolabe`

40+ 1. From the `ui` folder: `npm run install:desk`

41+ 2. (first time only, on dev ship): `|install our %astrolabe`

3642 2. From the distribution ship's dojo: `:treaty|unpublish %astrolabe`

3743 2. From middleman or distribution ship's dojo: `|commit %astrolabe`

3844 3. (if using a comet as a middleman) `|public %astrolabe`

3945 4. (if using a comet as a middleman) from the actual distribution ship: `|install ~comet-name %astrolabe` or `|resume %astrolabe`

4046 5. (if using a comet as a middleman) from the actual distribution ship: `|pause %astrolabe`

41−4. Build the UI with `npm run build` in the `ui` directory which will bundle all the code and assets into the `dist/` folder.

42−5. Upload the `dist/` folder as a glob to your distribution ship. Example url: https://distribution.urbit-ship.com/docket/upload

43−6. Publish the desk from dojo: `:treaty|publish %astrolabe`

44−

45−### Deploying with `glob-http` glob

47+4. Build UI and upload `glob-ames`

48+5. Publish the desk from dojo: `:treaty|publish %astrolabe`

4649

47−To deploy, run `npm run build` in the `ui` directory which will bundle all the code and assets into the `dist/` folder. This can then be made into a glob by doing the following:

50+## Deploying with `glob-ames` glob

51+Initial Setup:

52+1. Put the line `glob-ames+[~dister-midlev-mindyr 0v0]` in `desk.docket-0` if it's not there, where `~dister-midlevi-mindyr` is the `@p` of the distribution ship.

4853

49−1. Create or launch an urbit using the -F flag

50−2. On that urbit, if you don't already have a desk to run from, run `|merge %work our %base` to create a new desk and mount it with `|mount %work`.

51−3. Now the `%work` desk is accessible through the host OS's filesystem as a directory of that urbit's pier ie `~/zod/work`.

52−4. From the `ui` directory you can run `rsync -avL --delete dist/ ~/zod/work/astrolabe` where `~/zod` is your fake urbit's pier.

53−5. Once completed you can then run `|commit %work` on your urbit and you should see your files logged back out from the dojo.

54−6. Now run `=dir /=garden` to switch to the garden desk directory

55−7. You can now run `-make-glob %work /astrolabe` which will take the folder where you just added files and create a glob which can be thought of as a sort of bundle. It will be output to `~/zod/.urb/put`.

56−8. If you navigate to `~/zod/.urb/put` you should see a file that looks like this `glob-0v5.fdf99.nph65.qecq3.ncpjn.q13mb.glob`. The characters between `glob-` and `.glob` are a hash of the glob's contents.

57−9. Now that we have the glob it can be uploaded to any publicly available HTTP endpoint that can serve files. This allows the glob to distributed over HTTP.

58−10. Once you've uploaded the glob, you should then update the corresponding entry in the docket file at `desk/desk.docket-0`. Both the full URL and the hash should be updated to match the glob we just created, on the line that looks like this:

59−

60−```hoon

61− glob-http+['https://bootstrap.urbit.org/glob-0v5.fdf99.nph65.qecq3.ncpjn.q13mb.glob' 0v5.fdf99.nph65.qecq3.ncpjn.q13mb]

62−```

54+Every Time:

55+4. Build the UI with `npm run build` in the `ui` directory which will bundle all the code and assets into the `dist/` folder.

56+5. Upload the `dist/` folder as a glob to your distribution ship. Example url: https://distribution.urbit-ship.com/docket/upload

6357

64−11. This can now be safely committed and deployed.

58+## Deploying with `glob-http` glob

59+Initial Setup:

60+1. Spin up a globber ship (comet or fakezod) (or just reuse your dev ship for this).

61+2. Mount an `%globber` desk. In Dojo:

62+ 1. `|merge %globber our %base` to create a new desk.

63+ 2. `|mount %globber` to mount it.

64+ 3. Set `GLOBBER_DESK` in `.env.local` if the path to your globber desk is different.

65+

66+Every Time:

67+3. From the `ui` directory, run `npm run release` to build the ui, make the glob, and copy it to the `globs` folder. The command will also print out the glob hash/id.

68+4. Copy the string printed by the last step, and paste it into `desk.docket-0`.

69+5. Upload the glob in `/globs/` to any publicly available HTTP endpoint that can serve files. This allows the glob to be distributed over HTTP.

70+6. Once you've uploaded the glob, paste the url into `desk/desk.docket-0`. Both the full URL and the hash should be updated to match the glob we just created, on the line that looks like this:

71+ ```hoon

72+ glob-http+['https://bootstrap.urbit.org/glob-0v5.fdf99.nph65.qecq3.ncpjn.q13mb.glob' 0v5.fdf99.nph65.qecq3.ncpjn.q13mb]

73+ ```

6574

6675[svelte]: https://svelte.dev/

6776[typescript]: https://www.typescriptlang.org/

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/azimuthio.hoon+3−3

@@ -43,8 +43,8 @@

4343 url=url

4444 header-list=['Content-Type'^'application/json' ~]

4545 ^= body

46− %- some %- as-octt:mimes:html

47− %- en-json:html

46+ %- some %- as-octs:mimes:html

47+ %- en:json:html

4848 (request-to-json:rpc:ethereum id req)

4949 ==

5050 ;< ~ bind:m (send-request:strandio request)

@@ -62,7 +62,7 @@

6262 ?~ full-file.client-response

6363 (pure:m ~)

6464 =/ body=@t q.data.u.full-file.client-response

65− =/ jon=(unit json) (de-json:html body)

65+ =/ jon=(unit json) (de:json:html body)

6666 ?~ jon

6767 (pure:m ~)

6868 =, dejs-soft:format

base-desk/lib/bip/b173.hoon+1−1

@@ -11,7 +11,7 @@

1111|%

1212++ prefixes

1313 ^- (map network tape)

14− (my [[%main "bc"] [%testnet "tb"] ~])

14+ (my [[%main "bc"] [%testnet "tb"] [%regtest "bcrt"] ~])

1515++ charset "qpzry9x8gf2tvdw0s3jn54khce6mua7l"

1616+$ raw-decoded [hrp=tape data=(list @) checksum=(list @)]

1717:: below is a port of: https://github.com/bitcoinjs/bech32/blob/master/index.js

base-desk/lib/bip/b174.hoon+2

@@ -56,6 +56,8 @@

5656 1^0x0

5757 %testnet

5858 1^0x1

59+ %regtest

60+ 1^0x1

5961 ==

6062 :- (cat:byt ~[1^typ pubkey.h])

6163 %- cat:byt

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/cram.hoon−1

@@ -31,7 +31,6 @@

3131 =- (weld - $(p.gen t.p.gen))

3232 ?^ -.i.p.gen $(gen [%xray i.p.gen])

3333 ~| [%shut-tuna -.i.p.gen]

34− ~| [%shut-slamon -.p.i.p.gen]

3534 ?+ -.i.p.gen !!

3635 %manx ?>(?=(%xray -.p.i.p.gen) $(gen p.i.p.gen))

3736 %marl ?>(?=(%mcts -.p.i.p.gen) $(gen p.i.p.gen))

base-desk/lib/dbug.hoon+9−3

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

44::

55|%

66+$ poke

7− $% [%bowl ~]

7+ $% [%skip depth=@ud =poke]

8+ [%bowl ~]

89 [%state grab=cord]

910 [%incoming =about]

1011 [%outgoing =about]

@@ -32,8 +33,13 @@

3233 ?. ?=(%dbug mark)

3334 =^ cards agent (on-poke:ag mark vase)

3435 [cards this]

35− =/ dbug

36− !<(poke vase)

36+ =/ dbug !<(poke vase)

37+ =? dbug ?=([%skip %0 *] dbug) poke.dbug

38+ ?: ?=(%skip -.dbug)

39+ =^ cards agent

40+ %+ on-poke:ag %dbug

41+ !>(`poke`dbug(depth (dec depth.dbug)))

42+ [cards this]

3743 =; =tang

3844 ((%*(. slog pri 1) tang) [~ this])

3945 ?- -.dbug

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/ethereum.hoon+28−4

@@ -652,7 +652,7 @@

652652 :^ url %post

653653 %- ~(gas in *math)

654654 ~['Content-Type'^['application/json']~]

655− (some (as-octt (en-json:html jon)))

655+ (some (as-octs (en:json:html jon)))

656656 :: +light-json-request: like json-request, but for %l

657657 ::

658658 :: TODO: Exorcising +purl from our system is a much longer term effort;

@@ -665,7 +665,7 @@

665665 :* %'POST'

666666 (crip (en-purl:html url))

667667 ~[['content-type' 'application/json']]

668− (some (as-octt (en-json:html jon)))

668+ (some (as-octs (en:json:html jon)))

669669 ==

670670 ::

671671 ++ batch-read-request

@@ -733,7 +733,7 @@

733733 ::

734734 %eth-get-block-by-number

735735 :- 'eth_getBlockByNumber'

736− :~ (tape (num-to-hex bon.req))

736+ :~ (tape (num-to-hex-minimal bon.req))

737737 b+txs.req

738738 ==

739739 ::

@@ -942,12 +942,33 @@

942942 %- render-hex-bytes

943943 (as-octs:mimes:html n)

944944::

945+++ num-to-hex-minimal

946+ |= n=@

947+ ^- tape

948+ %- prefix-hex

949+ ((x-co:co 1) n)

950+::

945951++ address-to-hex

946952 |= a=address

947953 ^- tape

948954 %- prefix-hex

949955 (render-hex-bytes 20 `@`a)

950956::

957+++ address-to-checksum

958+ |= a=address

959+ ^- tape

960+ =/ hexed (render-hex-bytes 20 `@`a)

961+ =/ hash (keccak-256:keccak:crypto (as-octs:mimes:html (crip hexed)))

962+ =| ret=tape

963+ =/ pos 63

964+ |-

965+ ?~ hexed (prefix-hex (flop ret))

966+ =/ char i.hexed

967+ ?: (lth char 58) $(pos (dec pos), ret [char ret], hexed t.hexed)

968+ =/ nib (cut 2 [pos 1] hash)

969+ ?: (lth 7 nib) $(pos (dec pos), ret [(sub char 32) ret], hexed t.hexed)

970+ $(pos (dec pos), ret [char ret], hexed t.hexed)

971+::

951972++ transaction-to-hex

952973 |= h=@

953974 ^- tape

@@ -978,5 +999,8 @@

978999::

9791000++ hex-to-num

9801001 |= a=@t

981− (rash (rsh [3 2] a) hex)

1002+ ~| %non-hex-cord

1003+ ?> =((end [3 2] a) '0x')

1004+ =< ?<(=(0 p) q) %- need

1005+ (de:base16:mimes:html (rsh [3 2] a))

9821006--

base-desk/lib/ethio.hoon+3−3

@@ -76,8 +76,8 @@

7676 header-list=['Content-Type'^'application/json' ~]

7777 ::

7878 ^= body

79− %- some %- as-octt:mimes:html

80− %- en-json:html

79+ %- some %- as-octs:mimes:html

80+ %- en:json:html

8181 a+(turn reqs request-to-json:rpc:ethereum)

8282 ==

8383 ;< ~ bind:m

@@ -96,7 +96,7 @@

9696 ?~ full-file.client-response

9797 (pure:m ~)

9898 =/ body=@t q.data.u.full-file.client-response

99− =/ jon=(unit json) (de-json:html body)

99+ =/ jon=(unit json) (de:json:html body)

100100 ?~ jon

101101 (pure:m ~)

102102 =/ array=(unit (list response:rpc))

base-desk/lib/hark-store.hoon+22

@@ -171,6 +171,7 @@

171171++ dejs

172172 =, dejs:format

173173 |%

174+ ++ ship (su ;~(pfix sig fed:ag))

174175 :: TODO: fix +stab

175176 ::

176177 ++ pa

@@ -218,6 +219,26 @@

218219 :~ lid+lid

219220 bin+bin

220221 ==

222+ ++ content

223+ %- of

224+ :~ text+so

225+ ship+ship

226+ ==

227+ ::

228+ ++ body

229+ %- ot

230+ :~ title+(ar content)

231+ content+(ar content)

232+ time+di

233+ binned+pa

234+ link+pa

235+ ==

236+ ::

237+ ++ add-note

238+ %- ot

239+ :~ bin+bin

240+ body+body

241+ ==

221242 ::

222243 ++ action

223244 ^- $-(json ^action)

@@ -228,6 +249,7 @@

228249 read-count+place

229250 read-each+read-each

230251 read-note+bin

252+ add-note+add-note

231253 ==

232254 --

233255--

base-desk/lib/jose.hoon+11−3

@@ -33,7 +33,6 @@

3333 |^ |=([sor=$-(^ ?) val=json] (apex val sor ""))

3434 :: :: ++apex:en-json:html

3535 ++ apex

36− =, en-json:html

3736 |= [val=json sor=$-(^ ?) rez=tape]

3837 ^- tape

3938 ?~ val (weld "null" rez)

@@ -46,7 +45,7 @@

4645 |-

4746 ?~ t.p.val ^$(val i.p.val)

4847 ^$(val i.p.val, rez [',' $(p.val t.p.val)])

49− ::

48+ ::

5049 %b (weld ?:(p.val "true" "false") rez)

5150 %n (weld (trip p.val) rez)

5251 %s

@@ -60,7 +59,7 @@

6059 ?: ?=([@ ~] hed)

6160 [i.hed $(viz t.viz)]

6261 (weld hed $(viz t.viz))

63− ::

62+ ::

6463 %o

6564 :- '{'

6665 =. rez ['}' rez]

@@ -74,6 +73,15 @@

7473 =. rez [',' $(viz t.viz)]

7574 ^$(val [%s p.i.viz], rez [':' ^$(val q.i.viz)])

7675 ==

76+ ::

77+ ++ jesc

78+ =+ utf=|=(a=@ ['\\' 'u' ((x-co 4):co a)])

79+ |= a=@ ^- tape

80+ ?+ a ?:(&((gth a 0x1f) !=(a 0x7f)) [a ~] (utf a))

81+ %10 "\\n"

82+ %34 "\\\""

83+ %92 "\\\\"

84+ ==

7785 --

7886:: %/lib/jose

7987::

base-desk/lib/keygen.hoon+1−1

@@ -94,7 +94,7 @@

9494 |= seed=@

9595 ^- edkeys

9696 =+ =< [pub=pub:ex sec=sec:ex]

97− (pit:nu:crub:crypto 256 seed)

97+ (pit:nu:cric:crypto 256 seed %b ~)

9898 :- ^= auth

9999 :- (rsh 3 (end [3 33] pub))

100100 (rsh 3 (end [3 33] sec))

base-desk/lib/language-server/complete.hoon+4−3

@@ -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

@@ -42,7 +43,7 @@

4243 %+ turn ~(tap by q.r.q.ty)

4344 |= [term =tome]

4445 %+ turn

45− ~(tap by q.tome)

46+ ~(tap by tome)

4647 |= [name=term =hoon]

4748 ^- (pair term type)

4849 ~| term=term

@@ -226,7 +227,7 @@

226227 =* outer-loop $

227228 ?~ tomes

228229 ~

229− =/ arms ~(tap by q.q.i.tomes)

230+ =/ arms ~(tap by q.i.tomes)

230231 |- ^- (unit [term type])

231232 =* inner-loop $

232233 ?~ arms

base-desk/lib/language-server/easy-print.hoon+3−3

@@ -421,11 +421,11 @@

421421 ?:(?=([%plot *] q.yon) [q.hin p.q.yon] [q.hin q.yon ~])

422422 ::

423423 [%core *]

424− ?: ?=([[%$ * [[%$ @ *] ~ ~]] ~ ~] q.r.q.sut)

424+ ?: ?=([[%$ [[%$ @ *] ~ ~]] ~ ~] q.r.q.sut)

425425 =/ dad $(sut p.sut)

426426 :- p.dad

427427 ~! q.r.q.sut

428− [%gate q.n.q.q.n.q.r.q.sut sut(r.p.q %gold) q.dad]

428+ [%gate q.n.q.n.q.r.q.sut sut(r.p.q %gold) q.dad]

429429 =+ yad=$(sut p.sut)

430430 :- p.yad

431431 =+ ^= doy ^- [p=(list @ta) q=wine]

@@ -438,7 +438,7 @@

438438 %^ cat 3

439439 %~ rent co

440440 :+ %$ %ud

441− %- ~(rep by (~(run by q.r.q.sut) |=(tome ~(wyt by q.+<))))

441+ %- ~(rep by (~(run by q.r.q.sut) |=(tome ~(wyt by +<))))

442442 |=([[@ a=@u] b=@u] (add a b))

443443 %^ cat 3

444444 ?-(r.p.q.sut %gold '.', %iron '|', %lead '?', %zinc '&')

base-desk/lib/language-server/rune-snippet.hoon+2−2

@@ -509,8 +509,8 @@

509509 :- '!@'

510510 """

511511 $\{1:wing}

512− $\{2:if-exists}

513− $\{3:if-not-exists}

512+ $\{2:if-not-exists}

513+ $\{3:if-exists}

514514 """

515515 :- '!?'

516516 """

base-desk/lib/noun-diff.hoonnew file+213

@@ -0,0 +1,213 @@

1+=<

2+|%

3+++ diff

4+ |= [old=* new=*]

5+ ^- patch

6+ =/ del (extract-del (oracle old new) old)

7+ =/ ins (extract-ins (oracle old new) new)

8+ =/ allowed-holes (~(int in (find-del-holes del)) (find-ins-holes ins))

9+ =. del (filter-del-holes allowed-holes del)

10+ =/ ins (filter-ins-holes allowed-holes ins)

11+ =/ closed-patch (closure (gcp [del ins]))

12+ ?> =(& +.closed-patch)

13+ -.closed-patch

14+++ apply

15+ |= [patch=_id noun=*]

16+ ?- -.patch

17+ %diff

18+ =/ var-map (del del.patch noun)

19+ (ins ins.patch var-map)

20+ ::

21+ %cell

22+ ?> ?=(^ noun)

23+ [$(patch lhs.patch, noun -.noun) $(patch rhs.patch, noun +.noun)]

24+ ==

25+++ id

26+ ^- patch

27+ [%diff [%hole ~] [%hole ~]]

28++$ patch

29+ $% [%cell lhs=patch rhs=patch]

30+ [%diff ^diff]

31+ ==

32+--

33+::

34+|%

35++$ del-diff

36+ $% [%hole @]

37+ [%cell lhs=del-diff rhs=del-diff]

38+ [%ignore ~]

39+ ==

40++$ ins-diff

41+ $% [%hole @ original=*]

42+ [%cell lhs=ins-diff rhs=ins-diff]

43+ [%atom @]

44+ ==

45++$ final-ins-diff

46+ $% [%hole @]

47+ [%cell lhs=final-ins-diff rhs=final-ins-diff]

48+ [%atom @]

49+ ==

50++$ diff [del=del-diff ins=final-ins-diff]

51++$ patch

52+ $% [%cell lhs=patch rhs=patch]

53+ [%diff diff]

54+ ==

55+++ insify-noun

56+ |= noun=*

57+ ^- final-ins-diff

58+ ?- noun

59+ ^ [%cell $(noun -.noun) $(noun +.noun)]

60+ @ [%atom noun]

61+ ==

62+++ empty-set (silt `(list @)`~)

63+++ find-del-holes

64+ |= diff=del-diff

65+ ~+

66+ ^- (set @)

67+ ?- -.diff

68+ %hole (silt ~[+.diff])

69+ %cell (~(uni in $(diff lhs.diff)) $(diff rhs.diff))

70+ %ignore empty-set

71+ ==

72+++ find-final-ins-holes

73+ |= diff=final-ins-diff

74+ ~+

75+ ^- (set @)

76+ ?- -.diff

77+ %hole (silt ~[+.diff])

78+ %cell (~(uni in $(diff lhs.diff)) $(diff rhs.diff))

79+ %atom empty-set

80+ ==

81+++ find-ins-holes

82+ |= diff=ins-diff

83+ ~+

84+ ^- (set @)

85+ ?- -.diff

86+ %hole (silt ~[+<.diff])

87+ %cell (~(uni in $(diff lhs.diff)) $(diff rhs.diff))

88+ %atom empty-set

89+ ==

90+++ filter-del-holes

91+ |= [allowed-holes=(set @) diff=del-diff]

92+ ^- del-diff

93+ ?: ?=(%ignore -.diff) diff

94+ ?- -.diff

95+ %hole ?:((~(has in allowed-holes) +.diff) diff [%ignore ~])

96+ %cell [%cell $(diff +<.diff) $(diff +>.diff)]

97+ ==

98+++ filter-ins-holes

99+ |= [allowed-holes=(set @) diff=ins-diff]

100+ ^- final-ins-diff

101+ ?- -.diff

102+ %cell [%cell $(diff +<.diff) $(diff +>.diff)]

103+ %atom diff

104+ %hole

105+ ?: (~(has in allowed-holes) +<.diff) [%hole +<.diff]

106+ (insify-noun original:diff)

107+ ==

108+++ gcp

109+ |= diff=diff

110+ ^- patch

111+ ?- -.ins.diff

112+ %atom [%diff diff]

113+ %hole [%diff diff]

114+ %cell

115+ ?. ?=(%cell -.del.diff)

116+ [%diff diff]

117+ [%cell $(diff [+<.del.diff +<.ins.diff]) $(diff [+>.del.diff +>.ins.diff])]

118+ ==

119+++ closure

120+ |= =patch

121+ ^- [^patch ?]

122+ ?- -.patch

123+ %diff

124+ =/ del-holes (find-del-holes del:patch)

125+ =/ ins-holes (find-final-ins-holes ins:patch)

126+ =/ difference (~(dif in ins-holes) del-holes)

127+ [patch =(difference empty-set)]

128+ ::

129+ %cell

130+ =/ lhs $(patch lhs:patch)

131+ =/ rhs $(patch rhs:patch)

132+ ?: ?&(+.lhs +.rhs) [[%cell -.lhs -.rhs] &]

133+ $(patch (pull-diff [%cell -.lhs -.rhs]))

134+ ==

135+++ pull-diff

136+ |= =patch

137+ ^- [%diff del=del-diff ins=final-ins-diff]

138+ ?- -.patch

139+ %diff patch

140+ %cell

141+ =/ pulled-lhs $(patch lhs:patch)

142+ =/ pulled-rhs $(patch rhs:patch)

143+ :+ %diff

144+ [%cell del:pulled-lhs del:pulled-rhs]

145+ [%cell ins:pulled-lhs ins:pulled-rhs]

146+ ==

147+++ is-subtree

148+ |= [tree=* subtree=*]

149+ ~+

150+ ^- ?

151+ ?: =(tree subtree) &

152+ ?@ tree |

153+ ?| (is-subtree -.tree subtree)

154+ (is-subtree +.tree subtree)

155+ ==

156+++ oracle

157+ |= [a=* b=*]

158+ |= subtree=*

159+ ^- (unit @)

160+ ?: ?& (is-subtree a subtree)

161+ (is-subtree b subtree)

162+ ==

163+ `(mug subtree)

164+ ~

165+++ extract-del

166+ |= [oracle=$-(* (unit @)) subtree=*]

167+ ~+

168+ ^- del-diff

169+ =/ hash (oracle subtree)

170+ ?^ hash [%hole +.hash]

171+ ?@ subtree [%ignore ~]

172+ [%cell (extract-del oracle -.subtree) (extract-del oracle +.subtree)]

173+++ extract-ins

174+ |= [oracle=$-(* (unit @)) subtree=*]

175+ ~+

176+ ^- ins-diff

177+ =/ hash (oracle subtree)

178+ ?^ hash [%hole +.hash subtree]

179+ ?@ subtree [%atom subtree]

180+ [%cell (extract-ins oracle -.subtree) (extract-ins oracle +.subtree)]

181+++ ins

182+ |= [diff=final-ins-diff var-map=(map @ *)]

183+ ^- *

184+ ?- -.diff

185+ %atom +.diff

186+ %cell [$(diff +<.diff) $(diff +>.diff)]

187+ %hole (~(got by var-map) +.diff)

188+ ==

189+++ del

190+ |= [diff=del-diff noun=*]

191+ ^- (map @ *)

192+ |^ (go diff noun ((map @ *) ~))

193+ ++ go

194+ |= [diff=del-diff noun=* var-map=(map @ *)]

195+ ^- (map @ *)

196+ ?- -.diff

197+ %ignore

198+ var-map

199+ ::

200+ %hole

201+ =/ subtree (~(get by var-map) +.diff)

202+ ?~ subtree (~(put by var-map) +.diff noun)

203+ ?> =(+.subtree noun)

204+ var-map

205+ ::

206+ %cell

207+ ?> ?=(^ noun)

208+ =/ lhs-var-map $(diff +<.diff, noun -.noun)

209+ =/ rhs-var-map $(diff +>.diff, noun +.noun, var-map lhs-var-map)

210+ rhs-var-map

211+ ==

212+ --

213+--

base-desk/lib/ph/io.hoon+238−4

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

11/- *aquarium, spider

2−/+ libstrand=strand, *strandio, util=ph-util

2+/+ libstrand=strand, *strandio, util=ph-util, aqua-azimuth, vere

33=, strand=strand:libstrand

44|%

55++ send-events

@@ -88,7 +88,6 @@

8888 ^- form:m

8989 (pure:m ~)

9090::

91−::

9291++ init

9392 =/ m (strand ,~)

9493 ^- form:m

@@ -125,9 +124,11 @@

125124 1

126125 +(+.old-rut)

127126 ;< ~ bind:m (send-azimuth-action %breach who)

127+ ;< ~ bind:m ?~ old-rut (sleep ~s20) :: XX don't wait if possible

128+ (wait-for-sunk her who) :: wait only if previously talked

128129 |- ^- form:m

129130 =* loop $

130− ;< ~ bind:m (sleep ~s1)

131+ ;< ~ bind:m (sleep ~s10)

131132 ;< =bowl:spider bind:m get-bowl

132133 =/ aqua-pax

133134 :- %i

@@ -137,14 +138,58 @@

137138 (pure:m ~)

138139 loop

139140::

141+++ init-moon ::NOTE real moon always have the same keys

142+ |= [moon=ship fake=?]

143+ ?> ?=(%earl (clan:title moon))

144+ ?: fake (init-ship moon &)

145+ =/ m (strand ,~)

146+ ;< ~ bind:m

147+ %+ dojo (^sein:title moon)

148+ =/ =pass pub:ex:(get-keys:aqua-azimuth moon 1)

149+ "|moon {(scow %p moon)}, =public-key {(scow %uw pass)}"

150+ (init-ship moon |)

151+::

140152++ init-ship

153+ =| core=?(%mesa %ames) :: XX make %mesa the default core

141154 |= [=ship fake=?]

142155 =/ m (strand ,~)

143156 ^- form:m

144157 ~& > "starting {<ship>}"

145− ;< ~ bind:m (send-events (init:util ship fake))

158+ ;< ~ bind:m (send-events (init:util ship fake ~ core))

146159 (check-ship-booted ship)

147160::

161+++ init-comet

162+ =| core=?(%mesa %ames) :: XX make %mesa the default core

163+ |= comet=ship

164+ =/ m (strand ,~)

165+ ^- form:m

166+ :: hardcoded for:

167+ :: ~londeg-tirlys-somlyd-poltus--pintyn-tarbyl-bicnux-marbud

168+ ::

169+ =/ =feed:jael

170+ :* [%2 ~]

171+ who=comet

172+ ryf=0

173+ :_ ~

174+ :- lyf=1

175+ key=0wfm.lBEWM.08gfy.AxYjy.8-tBQ.uq-aa.LZt9c.CVQqd.XBJIs.

176+ CoG90.BNNGV.1ZmVi.ZbAhY.LuhwC.idNnU.lCVkt.Z4qug.7iY92

177+ ==

178+ ::

179+ ?> ?=(^ (veri:dawn:vere comet feed *point:azimuth-types ~))

180+ ~& > "mining comet under {<(^sein:title comet)>}"

181+ ;< ~ bind:m (send-events (init:util comet fake=%.n `feed core))

182+ (check-ship-booted comet)

183+::

184+:: Load network core protocol

185+::

186+++ load

187+ |= [who=ship ore=?(%mesa %ames)]

188+ =/ m (strand ,~)

189+ ^- form:m

190+ ;< ~ bind:m (send-events [%event who [/a/aqua/load %load ore]]~)

191+ (pure:m ~)

192+::

148193++ check-ship-booted

149194 |= =ship

150195 =/ m (strand ,~)

@@ -181,6 +226,129 @@

181226 (pure:m ~)

182227 loop

183228::

229+++ wait-for-flub

230+ |= [our=ship her=ship dap=term]

231+ =/ m (strand ,~)

232+ ^- form:m

233+ ;< =bowl:spider bind:m get-bowl

234+ |- ^- form:m

235+ =* loop $

236+ ;< [from=^ship =unix-effect] bind:m take-unix-effect

237+ ;< now=@da bind:m get-time

238+ ?. =(from our)

239+ :: our sends the $boon with the halted flow number, at this point

240+ :: gall has updated its state adding the app to gall's .halts map

241+ :: XX search deeper in the .unix-effect?

242+ ::

243+ loop

244+ =/ aqua-pax

245+ :- %i

246+ /(scot %p our)/gg/(scot %p our)//(scot %da now)/[%$]/noun

247+ =+ ;; flubs=(unit (jug ship term))

248+ (scry-aqua:util noun our.bowl now aqua-pax)

249+ ?~ flubs loop

250+ ?. (~(has ju u.flubs) her dap)

251+ loop

252+ (pure:m ~)

253+::

254+++ wait-for-spur

255+ |= [our=ship her=ship dap=term]

256+ =/ m (strand ,~)

257+ ^- form:m

258+ ;< =bowl:spider bind:m get-bowl

259+ |- ^- form:m

260+ =* loop $

261+ ;< [from=ship =unix-effect] bind:m take-unix-effect

262+ ;< now=@da bind:m get-time

263+ ?. =(from our)

264+ :: our ack to the %spur $boon is sent, at this point

265+ :: gall has updated its state adding the app to gall's .flubs map

266+ :: XX search deeper in the .unix-effect?

267+ ::

268+ loop

269+ =/ aqua-pax

270+ :- %i

271+ /(scot %p our)/gg/(scot %p our)//(scot %da now)/[%$]/noun

272+ =+ ;; flubs=(unit (jug ship term))

273+ (scry-aqua:util noun our.bowl now aqua-pax)

274+ ?~ flubs loop

275+ ?: (~(has ju u.flubs) her dap)

276+ loop

277+ (pure:m ~)

278+::

279+++ wait-for-has-halt

280+ |= [our=ship her=ship dap=term]

281+ =/ m (strand ,~)

282+ ^- form:m

283+ ;< =bowl:spider bind:m get-bowl

284+ |- ^- form:m

285+ =* loop $

286+ ;< [from=ship =unix-effect] bind:m take-unix-effect

287+ ;< now=@da bind:m get-time

288+ :: only %send or %push effects

289+ ::

290+ ?. ?=(?(%send %push) -.q.unix-effect)

291+ loop

292+ ~& >> from^unix-effect

293+ ?. =(from our)

294+ :: wait until our ack for the %flub $boon is sent, at this point

295+ :: gall has updated its state adding the app to gall's .flubs map

296+ :: XX search deeper in the .unix-effect?

297+ ::

298+ loop

299+ =/ aqua-pax

300+ :- %i

301+ /(scot %p our)/gh/(scot %p our)//(scot %da now)/[%$]/noun

302+ =+ ;; halts=(unit (jug app=term [ship =duct]))

303+ (scry-aqua:util noun our.bowl now aqua-pax)

304+ ?~ halts loop

305+ ?. (~(has by u.halts) dap) :: XX check .her as well

306+ loop

307+ (pure:m ~)

308+::

309+++ wait-for-del-halt

310+ |= [our=ship her=ship dap=term]

311+ =/ m (strand ,~)

312+ ^- form:m

313+ ;< =bowl:spider bind:m get-bowl

314+ |- ^- form:m

315+ =* loop $

316+ ;< [from=ship =unix-effect] bind:m take-unix-effect

317+ ;< now=@da bind:m get-time

318+ ?. =(from our)

319+ :: when the %spur $boon has been sent, gall has updated its state deleting

320+ :: the app from gall's .flubs map

321+ :: XX search deeper in the .unix-effect?

322+ ::

323+ loop

324+ =/ aqua-pax

325+ :- %i

326+ /(scot %p our)/gh/(scot %p our)//(scot %da now)/[%$]/noun

327+ =+ ;; halts=(unit (jug app=term [ship =duct]))

328+ (scry-aqua:util noun our.bowl now aqua-pax)

329+ ?~ halts loop

330+ ?: (~(has by u.halts) dap) :: XX check .her as well

331+ loop

332+ (pure:m ~)

333+::

334+++ wait-for-pac

335+ |= [our=ship to=ship]

336+ =/ m (strand ,~)

337+ ^- form:m

338+ ~& > "waiting for ack: {<[from=our to=to]>}"

339+ |- ^- form:m

340+ =* loop $

341+ ;< [from=ship =unix-effect] bind:m take-unix-effect

342+ ?. =(our from)

343+ loop

344+ :: only %send or %push effects

345+ ::

346+ ?. ?=(?(%send %push) -.q.unix-effect)

347+ loop

348+ :: XX check that this is an %ack?

349+ :: XX check that this is for .to?

350+ ::

351+ (pure:m ~)

184352:: Send "|hi" from one ship to another

185353::

186354++ send-hi

@@ -192,6 +360,64 @@

192360::

193361:: Send "|hi" and wait for "not responding" message

194362::

363+++ wait-for-sunk

364+ |= [from=@p to=@p]

365+ =/ m (strand ,~)

366+ (wait-for-output from "{(scow %p to)} has sunk")

367+::

368+++ wait-for-fact

369+ |= [=ship =mark =wire gate=$-([mark noun] ?)]

370+ =/ m (strand ,noun)

371+ ^- form:m

372+ ~& > "waiting for fact: {<mark>}"

373+ |- ^- form:m

374+ =* loop $

375+ ;< [her=^ship =unix-effect] bind:m take-unix-effect

376+ ?. =(her ship)

377+ loop

378+ ?. ?& =(wire p.unix-effect)

379+ ?=([%unto %raw-fact *] q.unix-effect)

380+ =(mark mark.unto.q.unix-effect)

381+ (gate mark noun.unto.q.unix-effect)

382+ ==

383+ loop

384+ (pure:m noun.unto.q.unix-effect)

385+::

386+++ wait-for-cork

387+ |= [our=ship her=ship flow=(each bone:ames side:ames)]

388+ =/ m (strand ,~)

389+ ^- form:m

390+ ;< =bowl:spider bind:m get-bowl

391+ |- ^- form:m

392+ =* loop $

393+ ;< [from=ship =unix-effect] bind:m take-unix-effect

394+ ;< now=@da bind:m get-time

395+ :: only %send or %push effects

396+ ::

397+ ?. ?=(?(%send %push) -.q.unix-effect)

398+ loop

399+ :: XX check that this is an %ack?

400+ ::

401+ ?. =(from our)

402+ :: wait until the ack for the %cork $plea is sent, at this point

403+ :: the publisher has already corked the flow

404+ ::

405+ loop

406+ =/ aqua-pax

407+ %+ weld /i/(scot %p our)/ax/(scot %p our)//(scot %da now)

408+ ?: ?=(%& -.flow)

409+ /corked/(scot %p her)/(scot %ud +.flow)/noun

410+ =/ [=bone:ames =dire:ames] +.flow

411+ /corked/(scot %p her)/[dire]/(scot %ud bone)/noun

412+ =+ ;; corked=(unit ?) (scry-aqua:util noun our.bowl now aqua-pax)

413+ ?~ corked loop

414+ ?. u.corked :: XX check .her as well

415+ loop

416+ ~& >> flow-is-corked/flow

417+ (pure:m ~)

418+::

419+:: Send "|hi" and wait for "not responding" message

420+::

195421++ send-hi-not-responding

196422 |= [from=@p to=@p]

197423 ~& > 'sending hi not responding'

@@ -244,6 +470,14 @@

244470 ;< ~ bind:m (send-events (insert-files:util her desk [pax warped] ~))

245471 (pure:m warped)

246472::

473+++ copy-file

474+ =/ m (strand ,~)

475+ |= [her=ship pax=path file=@t]

476+ ^- form:m

477+ ;< ~ bind:m

478+ (send-events (insert-files:util her %base [pax file] ~))

479+ (sleep ~s1)

480+::

247481:: Check /sur/aquarium/hoon on the given has the given contents.

248482::

249483++ check-file-touched

base-desk/lib/ph/util.hoon+25−12

@@ -16,9 +16,11 @@

1616:: Start a ship (low-level; prefer +raw-ship)

1717::

1818++ init

19− |= [who=ship fake=?]

19+ |= [who=ship ake=? eed=(unit feed:jael) ore=?(%mesa %ames)]

2020 ^- (list aqua-event)

21− [%init-ship who fake]~

21+ :~ [%init-ship who ake eed]

22+ [%event who [/a/aqua/load %load ore]]

23+ ==

2224::

2325:: Send dojo command

2426::

@@ -28,8 +30,8 @@

2830 %+ send-events-to who

2931 ^- (list unix-event)

3032 :~

31− [/d/term/1 %belt %ctl `@c`%e]

32− [/d/term/1 %belt %ctl `@c`%u]

33+ [/d/term/1 %belt %mod %ctl `@c`%e]

34+ [/d/term/1 %belt %mod %ctl `@c`%u]

3335 [/d/term/1 %belt %txt ((list @c) what)]

3436 [/d/term/1 %belt %ret ~]

3537 ==

@@ -40,7 +42,7 @@

4042 |= [who=ship what=term]

4143 ^- (list ph-event)

4244 %+ send-events-to who

43− :~ [/d/term/1 %belt %ctl (,@c what)]

45+ :~ [/d/term/1 %belt %mod %ctl (,@c what)]

4446 ==

4547::

4648:: Inject a file into a ship

@@ -59,18 +61,29 @@

5961::

6062:: Checks whether the given event is a dojo output blit containing the

6163:: given tape

62−::

64+::TODO should be rename -dill-output

6365++ is-dojo-output

6466 |= [who=ship her=ship uf=unix-effect what=tape]

67+ |^

6568 ?& =(who her)

6669 ?=(%blit -.q.uf)

67− ::

68− %+ lien p.q.uf

69− |= =blit:dill

70− ?. ?=(%lin -.blit)

71− |

72− !=(~ (find what p.blit))

70+ (lien p.q.uf handle-blit)

7371 ==

72+ ::

73+ ++ handle-blit

74+ |= =blit:dill

75+ ^- ?

76+ ?: ?=(%mor -.blit)

77+ (lien p.blit handle-blit)

78+ ?+ -.blit |

79+ %put !=(~ (find what p.blit))

80+ ::

81+ %klr

82+ %+ lien p.blit

83+ |= [* q=(list @c)]

84+ !=(~ (find what q))

85+ ==

86+ --

7487::

7588:: Test is successful if +is-dojo-output

7689::

base-desk/lib/pill.hoon+500−18

@@ -2,6 +2,7 @@

22::

33/- dice

44^?

5+=<

56|%

67::

78+$ pill

@@ -11,6 +12,14 @@

1112 boot-ova=(list)

1213 kernel-ova=(list unix-event)

1314 userspace-ova=(list unix-event)

15+ ==

16+ $: %cash

17+ $: nam=term

18+ boot-ova=(list)

19+ kernel-ova=(list unix-event)

20+ userspace-ova=(list unix-event)

21+ ==

22+ cache=(list)

1423 == ==

1524::

1625+$ unix-event

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

3241 [/sys/hoon hoon/hoon]

3342 [/sys/arvo hoon/arvo]

3443 ==

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

45+::

46+++ dirs

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

48+ ^- (list spur)

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

50+ %+ skim

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

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

3553:: +file-ovum: userspace filesystem load

3654::

3755:: bas: full path to / directory

3856::

3957++ 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]

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

5259 ^- unix-event

53− %. directories

60+ %. (dirs bas exc)

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

5562 ::

5663 sal=(list spur)

@@ -61,9 +68,13 @@

6168 =; hav ~& user-files+(lent hav)

6269 =/ =yuki:clay

6370 :- *(list tako:clay)

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

65− (turn hav |=([=path =page:clay] [path &+page]))

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

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

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

74+ (file-pages bas sal)

75+::

76+++ file-pages

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

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

6879 |- ^+ hav

6980 ?~ sal ~

@@ -95,13 +106,43 @@

95106::

96107:: +file-ovum2: electric boogaloo

97108::

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

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

110+::

111+++ get-wynn

112+ |= [sys=path new-wynn=?]

113+ ^- wynn

114+ ?. new-wynn

115+ :~ zuse+zuse

116+ lull+lull

117+ arvo+arvo

118+ hoon+hoon-version

119+ ==

120+ ~> %bout.[0 %get-wynn]

121+ =+ .^(zus=vase %ca (welp sys /zuse/hoon))

122+ =+ .^(lul=vase %ca (welp sys /lull/hoon))

123+ =+ .^(arv=vase %ca (welp sys /arvo/hoon))

124+ =+ .^(hun=vase %ca (welp sys /hoon/hoon))

125+ :~ [%zuse ;;(@ud q:(slap zus limb+%zuse))]

126+ [%lull ;;(@ud q:(slap lul limb+%lull))]

127+ [%arvo ;;(@ud q:(slap arv limb+%arvo))]

128+ [%hoon ;;(@ud q:(slap hun limb+%hoon-version))]

129+ ==

130+::

131+++ prep-ovum

132+ |= dez=(list path)

133+ ^- unix-event

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

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

136+ %+ roll dez

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

138+ %- ~(uni by out)

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

99140::

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

101142::

102143++ user-files

103− |= bas=path

104− %. directories:file-ovum

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

145+ %. (dirs bas exc)

105146 |= sal=(list spur)

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

107148 ::

@@ -135,4 +176,445 @@

135176 |- ^+ hav

136177 ?~ all hav

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

179+::

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

181+++ solid

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

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

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

185+ ::

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

187+ ^- pill

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

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

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

191+ ~& %solid-start

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

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

194+ =/ arvo-formula

195+ ~& %solid-loaded

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

197+ ?. dub

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

199+ ::

200+ =/ whole-hoon=hoon

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

202+ ~& %solid-parsed

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

204+ ~& %solid-arvo

205+ whole-formula

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

207+ ::

208+ ~& %solid-parsed

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

210+ ~& %solid-compiled

211+ =/ whole-src

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

213+ ~& %solid-double-loaded

214+ =/ whole-formula

215+ =< +

216+ .* [%noun whole-src]

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

218+ ~& %solid-double-compiled

219+ whole-formula

220+ ::

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

222+ ::

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

224+ ::

225+ =/ installed

226+ =< q

227+ %^ spin

228+ ^- (list ovum)

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

230+ %+ turn

231+ (snoc (turn dez tail) bas)

232+ |= =path

233+ (file-ovum2 [path exc])

234+ .*(0 arvo-formula)

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

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

237+ ::

238+ :: kernel-formula

239+ ::

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

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

242+ ::

243+ =/ kernel-formula

244+ [%7 arvo-formula %1 installed]

245+ ::

246+ :: boot-two: startup formula

247+ ::

248+ =/ boot-two

249+ => *[kernel-formula=^ tale=*]

250+ != [.*(0 kernel-formula) tale]

251+ ::

252+ :: boot-ova

253+ ::

254+ =/ boot-ova=(list)

255+ [aeon:eden:part boot-two kernel-formula ~]

256+ ::

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

258+ ::

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

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

261+ :: filesystem sync event.

262+ ::

263+ :+ %pill %solid

264+ :+ boot-ova ~

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

266+ ;: weld

267+ %+ turn dez

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

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

270+ ::

271+ ?. prime ~

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

273+ ::

274+ %+ turn dez

275+ |= [dek=desk *]

276+ ^- unix-event

277+ [/c/essential/[dek] %esse dek %.y]

278+ ==

279+::

280+++ brass

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

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

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

284+ ::

285+ |= [sys=path dez=(list [desk path]) cache=? prime=? new-wynn=? exc=(list spur)]

286+ ^- pill

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

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

289+ ::

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

291+ ::

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

293+ ::

294+ ~& %brass-parsing

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

296+ ~& %brass-parsed

297+ ::

298+ :: compiler-formula: compiler as nock formula

299+ ::

300+ ~& %brass-compiling

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

302+ ~& %brass-compiled

303+ ::

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

305+ ::

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

307+ ::

308+ :: boot-ova: startup events

309+ ::

310+ =/ boot-ova=(list)

311+ :~ aeon:eden:part

312+ boot:eden:part

313+ compiler-formula

314+ compiler-source

315+ arvo-source

316+ ==

317+ ::

318+ =/ kernel-ova=(list unix-event)

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

320+ (file-ovum2 [bas exc])

321+ ==

322+ ::

323+ =/ userspace-ova

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

325+ ;: weld

326+ %+ turn dez

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

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

329+ ::

330+ ?. prime ~

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

332+ ::

333+ %+ turn dez

334+ |= [dek=desk *]

335+ ^- unix-event

336+ [/c/essential/[dek] %esse dek %.y]

337+ ==

338+ ::

339+ =/ =wynn (get-wynn sys new-wynn)

340+ ::

341+ =/ cache=(list)

342+ ?. cache ~

343+ %~ tap by

344+ =< +

345+ %- mice

346+ :_ [%2 [%0 3] %0 2]

347+ ;: weld

348+ boot-ova

349+ ^- (list)

350+ :~ [*@da //arvo %wack *@uvJ]

351+ [*@da //arvo %whom *@p]

352+ [*@da //arvo %wyrd [~.nonce /] wynn]

353+ ==

354+ `(list)`(turn kernel-ova (lead *@da))

355+ `(list)`[*@da [/d/term/1 %boot & %fake *@p]]^~

356+ `(list)`(turn userspace-ova (lead *@da))

357+ `(list)`[*@da [/c/init-zest %zeal (turn dez |=([d=desk *] [d %live]))]]^~

358+ ==

359+ ::

360+ ~> %slog.[0 leaf+"brass: cache entries: {<(lent cache)>}"]

361+ ::

362+ :- %cash

363+ :_ cache

364+ [%brass boot-ova kernel-ova userspace-ova]

365+::

366+++ ivory

367+ |= sys=path

368+ ^- pill

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

370+ |^ =/ ver

371+ =/ sub *(trap vase)

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

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

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

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

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

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

378+ (build-lib sub | %vere)

379+ =/ nok !.

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

381+ != q:$:ver

382+ ivory/[nok ver ~]

383+ ::

384+ ++ build-sys

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

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

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

388+ ::

389+ ++ build-lib

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

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

392+ =/ hun=hoon

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

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

395+ ?. imp (swat sub hun)

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

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

398+ ::

399+ ++ mist

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

401+ ^- hoon

402+ =+ vas=vast

403+ ~| bon

404+ %+ scan (trip txt)

405+ %- full

406+ =; fud

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

408+ %- star

409+ ;~ pose vul

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

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

412+ ==

413+ :: +swel: +swat but with +slop

414+ ::

415+ ++ swel

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

417+ ^- (trap vase)

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

419+ => [tap=tap gun=gun]

420+ |. ~+

421+ =/ pro q:$:tap

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

423+ --

424+::

425+++ events

426+ |%

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

428+ +$ meta term

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

430+ ::

431+ ++ install

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

433+ ^- prop

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

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

436+ =- (murn - same)

437+ ^- (list (unit ovum))

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

439+ ::

440+ ?. pri ~

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

442+ ::

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

444+ ==

445+ --

446+--

447+::

448+~% %non ..part ~

449+:: +mice: %memo hint caching version of mink

450+::

451+|%

452+++ mice !.

453+ ~/ %mice

454+ |= [subject=* formula=*]

455+ =| trace=(list [@ta *])

456+ =| memo=(map)

457+ =; [ton=tone mem=_memo]

458+ ?. ?=(%0 -.ton)

459+ [ton ~]

460+ [ton mem]

461+ |^ ^- [tone _memo]

462+ ?+ formula [[%2 trace] memo]

463+ [^ *]

464+ =^ head memo $(formula -.formula)

465+ ?. ?=(%0 -.head) [head memo]

466+ =^ tail memo $(formula +.formula)

467+ :_ memo

468+ ?. ?=(%0 -.tail) tail

469+ [%0 product.head product.tail]

470+ ::

471+ [%0 axis=@]

472+ :_ memo

473+ =/ part (frag axis.formula subject)

474+ ?~ part [%2 trace]

475+ [%0 u.part]

476+ ::

477+ [%1 constant=*]

478+ [[%0 constant.formula] memo]

479+ ::

480+ [%2 subject=* formula=*]

481+ =^ subject memo $(formula subject.formula)

482+ ?. ?=(%0 -.subject) [subject memo]

483+ =^ formula memo $(formula formula.formula)

484+ ?. ?=(%0 -.formula) [formula memo]

485+ %= $

486+ subject product.subject

487+ formula product.formula

488+ ==

489+ ::

490+ [%3 argument=*]

491+ =^ argument memo $(formula argument.formula)

492+ :_ memo

493+ ?. ?=(%0 -.argument) argument

494+ [%0 .?(product.argument)]

495+ ::

496+ [%4 argument=*]

497+ =^ argument memo $(formula argument.formula)

498+ :_ memo

499+ ?. ?=(%0 -.argument) argument

500+ ?^ product.argument [%2 trace]

501+ [%0 .+(product.argument)]

502+ ::

503+ [%5 a=* b=*]

504+ =^ a memo $(formula a.formula)

505+ ?. ?=(%0 -.a) [a memo]

506+ =^ b memo $(formula b.formula)

507+ :_ memo

508+ ?. ?=(%0 -.b) b

509+ [%0 =(product.a product.b)]

510+ ::

511+ [%6 test=* yes=* no=*]

512+ =^ result memo $(formula test.formula)

513+ ?. ?=(%0 -.result) [result memo]

514+ ?+ product.result [[%2 trace] memo]

515+ %& $(formula yes.formula)

516+ %| $(formula no.formula)

517+ ==

518+ ::

519+ [%7 subject=* next=*]

520+ =^ subject memo $(formula subject.formula)

521+ ?. ?=(%0 -.subject) [subject memo]

522+ %= $

523+ subject product.subject

524+ formula next.formula

525+ ==

526+ ::

527+ [%8 head=* next=*]

528+ =^ head memo $(formula head.formula)

529+ ?. ?=(%0 -.head) [head memo]

530+ %= $

531+ subject [product.head subject]

532+ formula next.formula

533+ ==

534+ ::

535+ [%9 axis=@ core=*]

536+ =^ core memo

537+ $(formula core.formula)

538+ ?. ?=(%0 -.core) [core memo]

539+ =/ arm (frag axis.formula product.core)

540+ ?~ arm [[%2 trace] memo]

541+ %= $

542+ subject product.core

543+ formula u.arm

544+ ==

545+ ::

546+ [%10 [axis=@ value=*] target=*]

547+ ?: =(0 axis.formula) [[%2 trace] memo]

548+ =^ target memo $(formula target.formula)

549+ ?. ?=(%0 -.target) [target memo]

550+ =^ value memo $(formula value.formula)

551+ :_ memo

552+ ?. ?=(%0 -.value) value

553+ =/ mutant=(unit *)

554+ (edit axis.formula product.target product.value)

555+ ?~ mutant [%2 trace]

556+ [%0 u.mutant]

557+ ::

558+ [%11 tag=@ next=*]

559+ =^ next memo $(formula next.formula)

560+ :_ memo

561+ ?. ?=(%0 -.next) next

562+ :- %0

563+ .* subject

564+ [11 tag.formula 1 product.next]

565+ ::

566+ [%11 [tag=@ clue=*] next=*]

567+ =^ clue memo $(formula clue.formula)

568+ ?. ?=(%0 -.clue) [clue memo]

569+ ?: ?=(%memo tag.formula)

570+ ?^ hit=(~(get by memo) subject next.formula)

571+ [[%0 u.hit] memo]

572+ =^ ton memo $(formula next.formula)

573+ ?. ?=(%0 -.ton)

574+ [ton memo]

575+ ?: ?=(?(@ [%clay %ford *]) product.clue)

576+ [ton memo]

577+ [ton (~(put by memo) [subject next.formula] product.ton)]

578+ =^ next memo

579+ =? trace

580+ ?=(?(%hunk %hand %lose %mean %spot) tag.formula)

581+ [[tag.formula product.clue] trace]

582+ $(formula next.formula)

583+ :_ memo

584+ ?. ?=(%0 -.next) next

585+ :- %0

586+ .* subject

587+ [11 [tag.formula 1 product.clue] 1 product.next]

588+ ==

589+ ::

590+ ++ frag

591+ |= [axis=@ noun=*]

592+ ^- (unit)

593+ ?: =(0 axis) ~

594+ |- ^- (unit)

595+ ?: =(1 axis) `noun

596+ ?@ noun ~

597+ =/ pick (cap axis)

598+ %= $

599+ axis (mas axis)

600+ noun ?-(pick %2 -.noun, %3 +.noun)

601+ ==

602+ ::

603+ ++ edit

604+ |= [axis=@ target=* value=*]

605+ ^- (unit)

606+ ?: =(1 axis) `value

607+ ?@ target ~

608+ =/ pick (cap axis)

609+ =/ mutant

610+ %= $

611+ axis (mas axis)

612+ target ?-(pick %2 -.target, %3 +.target)

613+ ==

614+ ?~ mutant ~

615+ ?- pick

616+ %2 `[u.mutant +.target]

617+ %3 `[-.target u.mutant]

618+ ==

619+ --

138620--

base-desk/lib/ring.hoon+46−45

@@ -18,10 +18,10 @@

1818 ::

1919 ++ generate-public-linkage

2020 |= link-scope=@

21− ^- [data=@ h=@udpoint]

21+ ^- [data=@ h=@uxpoint]

2222 ::

2323 =/ data=@ (mod link-scope l:ed:crypto)

24− =/ h=@udpoint (scalarmult-base:ed:crypto data)

24+ =/ h=@uxpoint (scalarmult-base:ed:crypto data)

2525 [data h]

2626 :: +generate-linkage: linkage information from scope and private key

2727 ::

@@ -30,13 +30,13 @@

3030 :: y: y = [x] * h

3131 ++ generate-linkage

3232 |= [link-scope=(unit @) my-private-key=@]

33− ^- (unit [data=@ h=@udpoint y=@udpoint])

33+ ^- (unit [data=@ h=@uxpoint y=@uxpoint])

3434 ::

3535 ?~ link-scope

3636 ~

3737 ::

38− =+ [data=@ h=@udpoint]=(generate-public-linkage u.link-scope)

39− =/ y=@udpoint (scalarmult:ed:crypto my-private-key h)

38+ =+ [data=@ h=@uxpoint]=(generate-public-linkage u.link-scope)

39+ =/ y=@uxpoint (scalarmult:ed:crypto my-private-key h)

4040 [~ data h y]

4141 :: +generate-challenge: generate challenge from a given message

4242 ::

@@ -47,13 +47,13 @@

4747 ++ generate-challenge

4848 |= $: :: common to both linked and unlinked

4949 message=@

50− g=@udpoint

50+ g=@uxpoint

5151 :: high level universal state

5252 ::

53− link-state=(unit [data=@ h=@udpoint y=@udpoint])

53+ link-state=(unit [data=@ h=@uxpoint y=@uxpoint])

5454 :: point to include in challenge when link-state isn't ~

5555 ::

56− h=(unit @udpoint)

56+ h=(unit @uxpoint)

5757 ==

5858 ^- @

5959 :: concatenate and reduce our message down to a 512-bit hash

@@ -74,9 +74,9 @@

7474 :: +generate-challenges: generates the full list of challenges

7575 ::

7676 ++ generate-challenges

77− |= $: link-state=(unit [data=@ h=@udpoint y=@udpoint])

77+ |= $: link-state=(unit [data=@ h=@uxpoint y=@uxpoint])

7878 message=@

79− public-keys=(list @udpoint)

79+ public-keys=(list @uxpoint)

8080 ss=(list @)

8181 ::

8282 prev-k=@u

@@ -86,14 +86,14 @@

8686 ==

8787 ^- (list @)

8888 ::

89− =/ gs=@udpoint

89+ =/ gs=@uxpoint

9090 %- add-scalarmult-scalarmult-base:ed:crypto :*

9191 prev-ch

9292 (snag prev-k public-keys)

9393 prev-s

9494 ==

9595 ::

96− =/ hs=(unit @udpoint)

96+ =/ hs=(unit @uxpoint)

9797 ?~ link-state

9898 ~

9999 ::

@@ -125,8 +125,8 @@

125125 :: used to generate the (unit point) consumed by +generate-challenge.

126126 ::

127127 ++ scalarmult-h

128− |= [u=@ linkage=(unit [data=@ h=@udpoint y=@udpoint])]

129− ^- (unit @udpoint)

128+ |= [u=@ linkage=(unit [data=@ h=@uxpoint y=@uxpoint])]

129+ ^- (unit @uxpoint)

130130 ?~ linkage

131131 ~

132132 [~ (scalarmult:ed:crypto u h.u.linkage)]

@@ -143,9 +143,9 @@

143143 |= $: message=@

144144 link-scope=(unit @)

145145 ::

146− anonymity-set=(set @udpoint)

147− my-public-key=@udpoint

148− my-private-key=@udscalar

146+ anonymity-set=(set @uxpoint)

147+ my-public-key=@uxpoint

148+ my-private-key=@uxscalar

149149 ::

150150 eny=@uvJ

151151 ==

@@ -157,7 +157,7 @@

157157 (need (find [my-public-key ~] anonymity-list))

158158 :: Generate linkage information if given

159159 ::

160− =/ linkage=(unit [data=@ h=@udpoint y=@udpoint])

160+ =/ linkage=(unit [data=@ h=@uxpoint y=@uxpoint])

161161 (generate-linkage link-scope my-private-key)

162162 :: initialize our random number generator from entropy

163163 ::

@@ -237,7 +237,7 @@

237237 |= $: message=@

238238 link-scope=(unit @)

239239 ::

240− anonymity-set=(set @udpoint)

240+ anonymity-set=(set @uxpoint)

241241 signature=raw-ring-signature

242242 ==

243243 ^- ?

@@ -259,14 +259,14 @@

259259 =/ s2-to-end=(list @) t.t.s.signature

260260 :: anonymity-list: set of public keys listified in ring order

261261 ::

262− =/ anonymity-list=(list @udpoint)

262+ =/ anonymity-list=(list @uxpoint)

263263 ~(tap in anonymity-set)

264264 :: participants: length of :anonymity-list

265265 ::

266266 =/ participants=@u

267267 (lent anonymity-list)

268268 ::

269− =/ z0p=@udpoint

269+ =/ z0p=@uxpoint

270270 %- add-scalarmult-scalarmult-base:ed:crypto :*

271271 ch0.signature

272272 (head anonymity-list)

@@ -275,14 +275,14 @@

275275 :: generate the linkage using public data, and the y point from the

276276 :: signature

277277 ::

278− =/ linkage=(unit [data=@ h=@udpoint y=@udpoint])

278+ =/ linkage=(unit [data=@ h=@uxpoint y=@uxpoint])

279279 ?~ link-scope

280280 ~

281− =+ [data=@ h=@udpoint]=(generate-public-linkage u.link-scope)

281+ =+ [data=@ h=@uxpoint]=(generate-public-linkage u.link-scope)

282282 :- ~

283283 [data h (need y.signature)]

284284 ::

285− =/ z0pp=(unit @udpoint)

285+ =/ z0pp=(unit @uxpoint)

286286 ?~ linkage

287287 ~

288288 :- ~

@@ -319,7 +319,7 @@

319319 :: +seed-to-private-key-scalar: keyfile form to scalar we can multiply with

320320 ::

321321 ++ seed-to-private-key-scalar

322− |= sk=@I ^- @udscalar

322+ |= sk=@I ^- @uxscalar

323323 ?: (gth (met 3 sk) 32) !!

324324 =+ h=(shal (rsh [0 3] b:ed:crypto) sk)

325325 %+ add

@@ -347,44 +347,45 @@

347347 ::

348348 ++ ship-life-to-pubid

349349 |= [our=@p now=@da ship=@p =life]

350− ^- @udpoint

350+ ^- @uxpoint

351351 ::

352− =/ d=[=^life =pass]

352+ =/ d=[=^life =pass *]

353353 =/ scry-path=path

354− :~ %k

354+ :~ %j

355355 (scot %p our)

356+ %deed

356357 (scot %da now)

357358 (scot %p ship)

358359 (scot %ud life)

359360 ==

360− .^([^life pass] scry-path)

361+ .^([^life pass *] scry-path)

361362 :: we have the deed which has pass, which is several numbers +cat-ed

362363 :: together; pull out the keys

363364 ::

364365 =/ x=[crypt=@ auth=@] (get-public-key-from-pass pass.d)

365366 ::

366− `@udpoint`auth.x

367+ `@uxpoint`auth.x

367368 ::

368369 ++ build-signing-participants

369370 |= [our=@p now=@da invited=(list @p)]

370− ^- [(set [@p life]) (set @udpoint)]

371+ ^- [(set [@p life]) (set @uxpoint)]

371372 ::

372373 =| participants=(set [@p life])

373− =| keys=(set @udpoint)

374+ =| keys=(set @uxpoint)

374375 ::

375376 |-

376377 ?~ invited

377378 [participants keys]

378379 ::

379− =/ =life

380− .^(life k+/(scot %p our)/life/(scot %da now)/(scot %p i.invited))

380+ =/ lyfe=(unit @ud)

381+ .^((unit @ud) j+/(scot %p our)/lyfe/(scot %da now)/(scot %p i.invited))

381382 ::

382− ?: =(life 0)

383+ ?~ lyfe

383384 $(invited t.invited)

384385 ::

385− =/ pubkey=@udpoint (ship-life-to-pubid our now i.invited life)

386+ =/ pubkey=@uxpoint (ship-life-to-pubid our now i.invited u.lyfe)

386387 ::

387− =. participants (~(put in participants) [i.invited life])

388+ =. participants (~(put in participants) [i.invited u.lyfe])

388389 =. keys (~(put in keys) pubkey)

389390 ::

390391 $(invited t.invited)

@@ -392,15 +393,15 @@

392393 ::

393394 ++ build-verifying-participants

394395 |= [our=@p now=@da invited=(list [ship=@p =life])]

395− ^- (set @udpoint)

396+ ^- (set @uxpoint)

396397 ::

397− =| keys=(set @udpoint)

398+ =| keys=(set @uxpoint)

398399 ::

399400 |-

400401 ?~ invited

401402 keys

402403 ::

403− =/ pubkey=@udpoint

404+ =/ pubkey=@uxpoint

404405 (ship-life-to-pubid our now ship.i.invited life.i.invited)

405406 =. keys

406407 (~(put in keys) pubkey)

@@ -431,23 +432,23 @@

431432 =/ link-hash=(unit @) (bind link-scope |=(a=* (shaz (jam a))))

432433 :: get everyone's public keys

433434 ::

434− =/ p=[participants=(set [ship=@p =life]) keys=(set @udpoint)]

435+ =/ p=[participants=(set [ship=@p =life]) keys=(set @uxpoint)]

435436 (build-signing-participants:detail our now ~(tap in anonymity-set))

436437 :: get our ships' current life

437438 ::

438439 =/ our-life=life

439− .^(life %k /(scot %p our)/life/(scot %da now)/(scot %p our))

440+ .^(life %j /(scot %p our)/life/(scot %da now)/(scot %p our))

440441 :: get our ships' secret keyfile ring

441442 ::

442443 =/ secret-ring=ring

443− .^(ring %k /(scot %p our)/vein/(scot %da now)/(scot %ud our-life))

444+ .^(ring %j /(scot %p our)/vein/(scot %da now)/(scot %ud our-life))

444445 :: fetch the encoded auth seed from the ring

445446 ::

446447 =/ secret-auth-seed=@

447448 +:(get-private-key-from-ring:detail secret-ring)

448449 :: get our ships' public key

449450 ::

450− =/ public-key=@udpoint

451+ =/ public-key=@uxpoint

451452 (ship-life-to-pubid:detail our now our our-life)

452453 ::

453454 :- participants.p

@@ -466,7 +467,7 @@

466467 |= [our=@p now=@da message=* =ring-signature]

467468 ^- ?

468469 ::

469− =/ keys=(set @udpoint)

470+ =/ keys=(set @uxpoint)

470471 %^ build-verifying-participants:detail our now

471472 ~(tap in participants.ring-signature)

472473 ::

base-desk/lib/server.hoon+2−2

@@ -19,7 +19,7 @@

1919++ json-to-octs

2020 |= jon=json

2121 ^- octs

22− (as-octt:mimes:html (en-json:html jon))

22+ (as-octs:mimes:html (en:json:html jon))

2323::

2424++ app

2525 |%

@@ -114,7 +114,7 @@

114114 :_ `octs

115115 [200 [['content-type' 'image/svg+xml'] ?:(cache [max-1-wk ~] ~)]]

116116 ::

117− ++ ico-response

117+ ++ ico-response

118118 |= =octs

119119 ^- simple-payload:http

120120 [[200 [['content-type' 'image/x-icon'] max-1-wk ~]] `octs]

base-desk/lib/shoe.hoon+72−36

@@ -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-2

17+ $: %2

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-2

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)

@@ -189,7 +188,7 @@

189188 =^ cards shoe on-init:og

190189 [(deal cards) this]

191190 ::

192− ++ on-save !>([%shoe-app on-save:og state])

191+ ++ on-save :(slop !>(%shoe-app) on-save:og !>(state))

193192 ::

194193 ++ on-load

195194 |= old-state=vase

@@ -202,9 +201,45 @@

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+ |^ :: versions %0 and %1 stored the inner state double-vased.

205+ :: fixing this coincided with the 408 type-of-type migration.

206+ ::

207+ ?: ?=([%shoe-app * ?(%0 %1) *] q.old-state)

208+ =| old-outer=state-any

209+ =^ old-inner old-outer

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

211+ =^ caz shoe (on-load:og (next-vase:h136 old-inner))

212+ =^ cuz old-outer

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

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

215+ =? old-outer ?=(%1 -.old-outer) (state-1-to-2 old-outer)

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

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

218+ ::

219+ =+ !<(old=state-any (slot 7 old-state))

220+ ?> ?=(%2 -.old)

221+ =. state old

222+ ::

223+ =^ caz shoe (on-load:og (slot 6 old-state))

224+ [(deal caz) this]

225+ ::

226+ +$ state-any $%(state-2 state-1 state-0)

227+ +$ state-1 _%*(. *state-2 - %1)

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

229+ ++ state-1-to-2 |=(old=state-1 old(- %2))

230+ ++ state-0-to-1

231+ |= old=state-0

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

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

234+ |= id=@ta

235+ ^- card:agent:gall

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

237+ :- %1

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

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

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

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

242+ --

208243 ::

209244 ++ on-poke

210245 |= [=mark =vase]

@@ -326,19 +361,18 @@

326361 ++ on-watch

327362 |= =path

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

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

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

330365 =^ cards shoe

331366 (on-watch:og path)

332367 [(deal cards) this]

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

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

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

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

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

336370 =^ cards shoe

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

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

338372 :_ this

339373 %- deal

340374 :_ cards

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

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

342376 ::

343377 ++ on-leave

344378 |= =path

@@ -388,23 +422,25 @@

388422 =/ cobs=(list [wid=@ud (list tape)])

389423 (turn cows col-as-lines)

390424 =+ [lin=0 any=|]

425+ =+ len=(lent cobs)

391426 =| fez=(list sole-effect)

392427 |- ^+ fez

393− =; out=tape

428+ =; [line=(list tape) end=@ud]

394429 :: done when we're past the end of all columns

395430 ::

396− ?: (levy out (cury test ' '))

431+ ?: =(len end)

397432 (flop fez)

398433 =; fec=sole-effect

399434 $(lin +(lin), fez [fec fez])

435+ =/ out=tape

436+ (zing (join " " line))

400437 ?. bold txt+out

401438 klr+[[`%br ~ ~]^[(crip out)]~]~

402− %+ roll cobs

403− |= [[wid=@ud lines=(list tape)] out=tape]

404− %+ weld out

405− %+ weld ?~(out "" " ")

439+ %^ spin cobs 0

440+ |= [[wid=@ud lines=(list tape)] empty=@ud]

406441 =+ l=(swag [lin 1] lines)

407− ?^(l i.l (reap wid ' '))

442+ ?^ l [i.l empty]

443+ [(reap wid ' ') +(empty)]

408444 ::

409445 ++ col-as-lines

410446 |= [wid=@ud col=dime]

base-desk/lib/sink.hoonnew file+26

@@ -0,0 +1,26 @@

1+/+ noun-diff

2+|%

3+++ clog

4+ |$ [stut]

5+ $%

6+ [%flush stut]

7+ [%drain patch:noun-diff]

8+ ==

9+++ sink

10+ |* pats=(list path)

11+ |* stat=*

12+ |@

13+ ++ sync

14+ |= [stat=_stat]

15+ ^- [card:agent:gall _..sync]

16+ =/ dif

17+ %+ diff:noun-diff ^stat stat

18+ :-

19+ [%give %fact pats %noun !>(^-((clog) [%drain dif]))]

20+ ..sync(stat stat)

21+ ++ paths pats

22+ ++ flush

23+ ^- card:agent:gall

24+ [%give %fact pats %noun !>(^-((clog) [%flush stat]))]

25+ --

26+--

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+445

@@ -0,0 +1,445 @@

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+ [~ ~ [* %& * *]] [~[(pine 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 fake=& 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+ ++ apply :: Handle response from publisher.

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

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

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

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

113+ ?: ?=(%tomb what.res)

114+ =/ =flow old(stale &)

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

116+ (on-rock-poke fake=& current flow ~)

117+ ::

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

119+ ?- what.res

120+ %rock ?: (lte aeon.res aeon.old) [~ ~]

121+ [~ `[aeon.res | | rock.res]]

122+ %wave ?: (lte aeon.res aeon.old) [~ ~]

123+ ?> =(aeon.res +(aeon.old))

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

125+ ==

126+ ?~ new `0/sub

127+ :_ 0/(~(put by sub) current new) :_ ~

128+ (on-rock-poke fake=& current u.new wave)

129+ ::

130+ ++ handle-fake-on-rock

131+ |= =(on-rock:poke lake paths)

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

133+ ?~ flow=(~(get by sub) [src from path]:on-rock) ~

134+ ?~ u.flow ~

135+ ?. =([stale fail rock]:u.u.flow [stale fail rock]:on-rock) ~

136+ ~[(on-rock-poke fake=| [src from path]:on-rock u.u.flow wave.on-rock)]

137+ ::

138+ :: Non-public facing arms below

139+ ::

140+ ++ pine

141+ |= [who=ship which=dude where=paths]

142+ ^- card:agent:gall

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

144+ %agent [who which]

145+ %poke sss-to-pub/[result-type `result`[where dap.bowl]]

146+ ==

147+ ++ on-rock-poke

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

149+ ^- card:agent:gall

150+ :* %pass %+ zoom ?:(fake %fake %on-rock)

151+ (scot %ud aeon)^(scot %p ship)^dude^path

152+ %agent [our dap]:bowl

153+ %poke ?:(fake %sss-fake-on-rock %sss-on-rock)

154+ on-rock-type `from`[path ship dude stale fail rock wave]

155+ ==

156+ --

157+++ du :: Manage publications.

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

159+ =>

160+ |%

161+ +$ into (request:poke paths)

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

163+ +$ rule $~ [`5 5]

164+ [horizon=(unit @ud) frequency=@ud] :: Retention policy

165+ +$ tide

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

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

168+ rul=rule

169+ mem=(jug ship dude)

170+ ==

171+ +$ buoy

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

173+ alo=(unit (set ship))

174+ ==

175+ ++ pubs

176+ =< $>(%1 versioned)

177+ |%

178+ ++ update

179+ |= =versioned

180+ ^- pubs

181+ ?- -.versioned

182+ %1 versioned

183+ %0

184+ :- %1

185+ %- ~(run by +.versioned)

186+ |= =buoy-0:^versioned

187+ ^- buoy

188+ %= buoy-0

189+ tid

190+ ?@ tid.buoy-0 tid.buoy-0

191+ ^- tide

192+ %= tid.buoy-0

193+ rocks.rul

194+ ?: =(waves.rul.tid.buoy-0 0) ~

195+ `(mul [+(rocks) waves]:rul.tid.buoy-0)

196+ ::

197+ mem

198+ ^- (jug ship dude)

199+ %- ~(run by mem.tid.buoy-0)

200+ |= =(map dude @da)

201+ ^- (set dude)

202+ ~(key by map)

203+ ==

204+ ==

205+ ==

206+ ++ versioned

207+ =< $% [%0 (map paths buoy-0)]

208+ [%1 (map paths buoy)]

209+ ==

210+ |%

211+ +$ buoy-0

212+ $: tid=$~(*tide-0 $@(aeon tide-0))

213+ alo=(unit (set ship))

214+ ==

215+ +$ tide-0

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

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

218+ rul=[rocks=@ud waves=@ud]

219+ mem=(mip ship dude @da)

220+ ==

221+ --

222+ --

223+ --

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

225+ => .(pub +:(update:pubs pub))

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

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

228+ |%

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

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

231+ ^- pubs

232+ :- %1

233+ %- fall :_ (~(put by pub) path %*(. *$<(aeon buoy) rul.tid rule))

234+ %- mole |.

235+ %+ ~(jab by pub) path

236+ |= =buoy

237+ ?@ tid.buoy buoy

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

239+ ::

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

241+ |= path=paths

242+ ^- pubs

243+ :- %1

244+ %+ ~(jab by pub) path

245+ |= =buoy

246+ ?@ tid.buoy buoy

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

248+ rul.tid rul.tid.buoy

249+ wav.tid ~

250+ ==

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

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

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

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

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

256+ =? buoy ?=(@ tid.buoy)

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

258+ ?> ?=(^ tid.buoy)

259+ =* tide tid.buoy

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

261+ :- %- zing

262+ %+ turn ~(tap by mem.tide)

263+ |= [=ship =(set dude)]

264+ %+ turn ~(tap in set)

265+ |= =dude

266+ (send wave/[next wave] ship dude path)

267+ :- %1

268+ %+ ~(put by pub) path

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

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

271+ =. mem.tide ~

272+ ?. =(next (add aeon.last frequency.rul.tide)) buoy

273+ buoy(tid (form tide))

274+ ::

275+ ++ fork :: Fork a pub into an empty path.

276+ |= [from=paths to=paths]

277+ ^- pubs

278+ :- %1

279+ ?< (~(has by pub) to)

280+ (~(put by pub) to (~(got by pub) from))

281+ ::

282+ ++ copy :: Fork a sub into an empty path.

283+ |= [sub=_(mk-subs lake *) from=[ship dude *] to=paths]

284+ ^- pubs

285+ :- %1

286+ ?< (~(has by pub) to)

287+ %+ ~(put by pub) to

288+ %* . *$<(aeon buoy)

289+ rok.tid (put:rok ~ [aeon rock]:(need (~(got by +:sub) from)))

290+ ==

291+ ::

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

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

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

295+ %+ edit where

296+ |= =buoy

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

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

299+ %= buoy

300+ alo new

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

302+ %. mem.tid.buoy

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

304+ ==

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

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

307+ :: :: Block ships from paths.

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

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

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

311+ %+ perm whence

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

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

314+ :: :: Allow ships to paths.

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

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

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

318+ %+ perm where

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

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

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

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

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

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

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

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

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

328+ |= [path=paths =buoy]

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

330+ ?@ tide=tid.buoy ~

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

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

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

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

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

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

337+ ::

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

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

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

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

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

343+ ?@ tid.buoy

344+ :_ 1/pub :_ ~

345+ (send tomb/~ src.bowl dude.req path.req)

346+ :_ 1/pub :_ ~

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

348+ (send rock/last src.bowl dude.req path.req)

349+ ::

350+ ++ tell

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

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

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

354+ ?^ p.sign `1/pub

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

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

357+ ?@ tid.buoy

358+ :_ 1/pub :_ ~

359+ (send tomb/~ src.bowl dude path)

360+ ::

361+ => .(aeon +((slav %ud aeon)))

362+ ?^ dat=(get:wav wav.tid.buoy aeon)

363+ :_ 1/pub :_ ~

364+ (send wave/[aeon u.dat] src.bowl dude path)

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

366+ ?: (lte aeon key.last)

367+ :_ 1/pub :_ ~

368+ (send rock/last src.bowl dude path)

369+ :- ~

370+ :- %1

371+ %+ ~(put by pub) path

372+ %= buoy

373+ mem.tid (~(put ju mem.tid.buoy) src.bowl dude)

374+ ==

375+ ::

376+ :: Non-public facing arms below

377+ ::

378+ ++ send

379+ |= [payload=_|2:*(response:poke lake paths) =ship =dude path=paths]

380+ ^- card:agent:gall

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

382+ =/ callback=^path

383+ ?: ?=(%tomb what.payload) (zoom tomb-response/(scot %p ship)^dude^path)

384+ (zoom scry-response/(scot %p ship)^dude^(scot %ud aeon.payload)^path)

385+ :* %pass callback

386+ %agent [ship dude]

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

388+ [path dap.bowl payload]

389+ ==

390+ ++ latest

391+ |= =$@(aeon tide)

392+ ^- aeon

393+ ?@ tide tide

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

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

396+ ::

397+ ++ edit

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

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

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

401+ |= [path=paths caz=(list card:agent:gall) %1 =_pub]

402+ ?~ old=(~(get by pub) path) [caz 1/pub]

403+ =/ new=buoy (edit u.old)

404+ :_ 1/(~(put by pub) path new)

405+ %- weld :_ caz

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

407+ ?@ tid.u.old ~

408+ ?@ tid.new

409+ %- zing

410+ %+ turn ~(tap by mem.tid.u.old)

411+ |= [=ship =(set dude)]

412+ (turn ~(tap in set) |=(=dude (send tomb/~ ship dude path)))

413+ ?~ alo.new ~

414+ =/ new-alo=(jug ship dude)

415+ (malt (turn ~(tap in u.alo.new) (late *(set @))))

416+ %- zing

417+ %+ turn ~(tap by (~(dif by mem.tid.u.old) new-alo))

418+ |= [=ship =(set dude)]

419+ (turn ~(tap in set) |=(=dude (send tomb/~ ship dude path)))

420+ ::

421+ ++ form

422+ |= =tide

423+ ^+ tide

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

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

426+ =? rok.tide :: Create new rock.

427+ ?& !=(frequency.rul.tide 0)

428+ (gte max-wave (add aeon.max-rock frequency.rul.tide))

429+ ==

430+ %+ put:rok rok.tide

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

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

433+ ~| %aeon-awry

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

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

436+ =. rok.tide

437+ ?~ horizon.rul.tide :: Only keep genesis and latest.

438+ (gas:rok ~ (murn ~[(ram:rok rok.tide) (pry:rok rok.tide)] same))

439+ %^ lot:rok rok.tide :: Delete beyond horizon.

440+ ~

441+ (mole |.((sub max-wave (max [u.horizon frequency]:rul.tide))))

442+ ~| %rock-zero

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

444+ --

445+--

base-desk/lib/story.hoonnew file+88

@@ -0,0 +1,88 @@

1+/- *story

2+!:

3+^?

4+|%

5+:: XX generalize move to hoon.hoon

6+++ dif-ju

7+ |= [a=story b=story]

8+ ^- story

9+ :: if 0 is the empty set,

10+ :: a \ 0 = a

11+ :: 0 \ b = 0 :: anything in 0 but not in b is by definition 0

12+ ::

13+ ?: =(~ a) ~

14+ :: uno := (a-b) + (merged items in both a and b) + (b-a)

15+ :: ret := (a-b) + (merged items in both a and b)

16+ :: ret = (~(int by a) uno) :: preserve only the entries whose keys are in a

17+ =/ uno=story

18+ %- (~(uno by a) b)

19+ |= [k=tako:clay proses-a=proses proses-b=proses]

20+ ^- proses

21+ (~(dif in proses-a) proses-b)

22+ ::

23+ =/ ret=story (~(int by a) uno)

24+ :: normalizing step, remove any keys with null sets,

25+ :: which can occur if proses-a == proses-b above

26+ %- ~(gas by *story)

27+ (skip ~(tap by ret) |=([k=* v=proses] ?=(~ v)))

28+::

29+++ uni-ju

30+ |= [a=story b=story]

31+ ^- story

32+ :: 0 + b = b

33+ ?: =(~ a) b

34+ %- (~(uno by a) b)

35+ |= [k=tako:clay proses-a=proses proses-b=proses]

36+ ^- proses

37+ (~(uni in proses-a) proses-b)

38+::

39+:: Canonical textual representation

40+::

41+++ chapter-to-text

42+ |= [=tako:clay =proses]

43+ ^- wain

44+ :- (crip "commit: {<`@uv`tako>}")

45+ %- zing

46+ %+ join `wain`~['|||']

47+ %+ turn ~(tap in proses)

48+ |= prose

49+ ^- wain

50+ %- to-wain:format

51+ (rap 3 title '\0a\0a' body ~)

52+::

53+:: Parsers

54+::

55+++ parse-commit-hash

56+ ;~ sfix

57+ ;~ pfix (jest 'commit: ')

58+ (cook @uv ;~(pfix (jest '0v') viz:ag))

59+ ==

60+ ::

61+ (just '\0a')

62+ ==

63+::

64+++ parse-title

65+ ;~ sfix

66+ (cook crip (star prn))

67+ (jest '\0a\0a')

68+ ==

69+::

70+++ parse-body

71+ %+ cook of-wain:format

72+ %- star

73+ ;~ less

74+ ;~(pose (jest '|||\0a') (jest '---\0a'))

75+ (cook crip ;~(sfix (star prn) (just '\0a')))

76+ ==

77+::

78+++ parse-prose ;~(plug parse-title parse-body)

79+++ parse-rest-proses (star ;~(pfix (jest '|||\0a') parse-prose))

80+++ parse-proses (cook silt ;~(plug parse-prose parse-rest-proses))

81+++ parse-chapter ;~(plug parse-commit-hash parse-proses)

82+++ parse-story

83+ (cook ~(gas by *story) (star ;~(sfix parse-chapter (jest '---\0a'))))

84+::

85+:: N.B: If conflicting messages are written individually,

86+:: instead of under the same commit, we will overwrite previous entries

87+:: with later ones due to the nature of gas:by.

88+--

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/lib/strandio.hoon+171−14

@@ -73,21 +73,23 @@

7373 ^- form:m

7474 |= tin=strand-input:strand

7575 ?+ in.tin `[%skip ~]

76− ~ `[%wait ~]

76+ ~

77+ `[%wait ~]

78+ ::

7779 [~ %poke @ *]

7880 ?. =(mark p.cage.u.in.tin)

7981 `[%skip ~]

8082 `[%done q.cage.u.in.tin]

8183 ==

8284::

83−::

84−::

8585++ take-sign-arvo

8686 =/ m (strand ,[wire sign-arvo])

8787 ^- form:m

8888 |= tin=strand-input:strand

8989 ?+ in.tin `[%skip ~]

90− ~ `[%wait ~]

90+ ~

91+ `[%wait ~]

92+ ::

9193 [~ %sign *]

9294 `[%done [wire sign-arvo]:u.in.tin]

9395 ==

@@ -180,6 +182,53 @@

180182 `[%done ~]

181183 `[%fail %timer-error u.error.sign-arvo.u.in.tin]

182184 ==

185+++ take-whey

186+ |= =wire

187+ =/ m (strand ,[spar:ames fragment-size=@ud num-fragments=@ud])

188+ ^- form:m

189+ |= tin=strand-input:strand

190+ ?+ in.tin `[%skip ~]

191+ ~ `[%wait ~]

192+ ::

193+ [~ %sign * %ames %sage sage=*]

194+ ?. =(wire wire.u.in.tin)

195+ `[%skip ~]

196+ =/ =sage:mess:ames sage.sign-arvo.u.in.tin

197+ :^ ~ %done spar=p.sage

198+ ?~ q.sage

199+ [boq=13 tot=0]

200+ =< [boq tot]

201+ ;;([%whey boq=@ud tot=@ud] q.sage)

202+ ==

203+::

204+++ take-sage

205+ |= =wire

206+ =/ m (strand ,sage:mess:ames)

207+ ^- form:m

208+ |= tin=strand-input:strand

209+ ?+ in.tin `[%skip ~]

210+ ~ `[%wait ~]

211+ ::

212+ [~ %sign * %ames %sage sage=*]

213+ ?. =(wire wire.u.in.tin)

214+ `[%skip ~]

215+ `[%done sage.sign-arvo.u.in.tin]

216+ ==

217+:: XX deprecate in 409k

218+::

219+++ take-near

220+ |= =wire

221+ =/ m (strand ,[spar:ames (unit (unit page))])

222+ ^- form:m

223+ |= tin=strand-input:strand

224+ ?+ in.tin `[%skip ~]

225+ ~ `[%wait ~]

226+ ::

227+ [~ %sign * %ames %near ^ *]

228+ ?. =(wire wire.u.in.tin)

229+ `[%skip ~]

230+ `[%done +>.sign-arvo.u.in.tin]

231+ ==

183232::

184233++ take-poke-ack

185234 |= =wire

@@ -315,6 +364,78 @@

315364 ;< ~ bind:m (send-wait until)

316365 (take-wake `until)

317366::

367+++ mass

368+ =/ m (strand ,(list quac:dill))

369+ ^- form:m

370+ =/ =card:agent:gall [%pass /mass %arvo %d %mass ~]

371+ ;< ~ bind:m (send-raw-card card)

372+ ;< quz=(list quac:dill) bind:m take-meme

373+ (pure:m quz)

374+::

375+++ take-meme

376+ =/ m (strand ,(list quac:dill))

377+ ^- form:m

378+ |= tin=strand-input:strand

379+ ?+ in.tin `[%skip ~]

380+ ~ `[%wait ~]

381+ [~ %sign [%mass ~] %dill %meme *]

382+ `[%done p.sign-arvo.u.in.tin]

383+ ==

384+::

385+++ keen

386+ |= [=wire =spar:ames sec=(unit [@ @])]

387+ =/ m (strand ,~)

388+ ^- form:m

389+ (send-raw-card %pass wire %arvo %a %keen sec spar)

390+::

391+++ chum

392+ |= [=wire =spar:ames]

393+ =/ m (strand ,~)

394+ ^- form:m

395+ (send-raw-card %pass wire %arvo %a %chum spar)

396+::

397+++ keen-shut

398+ |= [=wire =spar:ames]

399+ =/ m (strand ,~)

400+ ^- form:m

401+ (send-raw-card %pass wire %keen & spar)

402+::

403+++ yawn

404+ |= [=wire =spar:ames]

405+ =/ m (strand ,~)

406+ ^- form:m

407+ (send-raw-card %pass wire %arvo %a %yawn spar)

408+::

409+++ whey

410+ |= [=wire boq=@ud =spar:ames]

411+ =/ m (strand ,~)

412+ ^- form:m

413+ :: encrypted using %chum namespace

414+ ::

415+ ;< our=@p bind:m get-our

416+ =. path.spar

417+ [%a %x '1' %$ %whey (scot %ud boq) (scot %p our) path.spar]

418+ (chum wire spar)

419+::

420+++ meta

421+ |= [=wire =spar:ames]

422+ =/ m (strand ,~)

423+ ^- form:m

424+ ?+ path.spar !!

425+ $% [%ames bone=@ %cork ~]

426+ [%ames bone=@ %sent seq=@ ~]

427+ [%flow bone=@ =dire:ames %cork ~]

428+ [?(%ames %flow) bone=@ =dire:ames ?(%sent %loads %naxp %acked) seq=@ ~]

429+ ==

430+ :: encrypted using %chum namespace

431+ ::

432+ ;< our=@p bind:m get-our

433+ %- send-raw-card

434+ :* %pass wire %arvo %a %chum

435+ spar(path [%a %x '1' %$ %meta (scot %p our) path.spar])

436+ ==

437+ ==

438+::

318439++ sleep

319440 |= for=@dr

320441 =/ m (strand ,~)

@@ -433,7 +554,6 @@

433554 %- pure:m

434555 ?~ full-file.client-response ''

435556 q.data.u.full-file.client-response

436−

437557::

438558++ fetch-cord

439559 |= url=tape

@@ -449,7 +569,7 @@

449569 =/ m (strand ,json)

450570 ^- form:m

451571 ;< =cord bind:m (fetch-cord url)

452− =/ json=(unit json) (de-json:html cord)

572+ =/ json=(unit json) (de:json:html cord)

453573 ?~ json

454574 (strand-fail %json-parse-error ~)

455575 (pure:m u.json)

@@ -474,6 +594,18 @@

474594 (pure:m ~)

475595 ?> =(%vase p.r.u.riot)

476596 (pure:m (some !<(vase q.r.u.riot)))

597+::

598+++ build-file-hard

599+ |= [[=ship =desk =case] =spur]

600+ =* arg +<

601+ =/ m (strand ,vase)

602+ ^- form:m

603+ ;< =riot:clay

604+ bind:m

605+ (warp ship desk ~ %sing %a case spur)

606+ ?> ?=(^ riot)

607+ ?> ?=(%vase p.r.u.riot)

608+ (pure:m !<(vase q.r.u.riot))

477609:: +build-mark: build a mark definition to a $dais

478610::

479611++ build-mark

@@ -537,7 +669,7 @@

537669 (take-writ /warp)

538670::

539671++ read-file

540− |= [[=ship =desk =case:clay] =spur]

672+ |= [[=ship =desk =case] =spur]

541673 =* arg +<

542674 =/ m (strand ,cage)

543675 ;< =riot:clay bind:m (warp ship desk ~ %sing %x case spur)

@@ -546,13 +678,14 @@

546678 (pure:m r.u.riot)

547679::

548680++ check-for-file

549− |= [[=ship =desk =case:clay] =spur]

681+ |= [[=ship =desk =case] =spur]

550682 =/ m (strand ,?)

551− ;< =riot:clay bind:m (warp ship desk ~ %sing %x case spur)

552− (pure:m ?=(^ riot))

683+ ;< =riot:clay bind:m (warp ship desk ~ %sing %u case spur)

684+ ?> ?=(^ riot)

685+ (pure:m !<(? q.r.u.riot))

553686::

554687++ list-tree

555− |= [[=ship =desk =case:clay] =spur]

688+ |= [[=ship =desk =case] =spur]

556689 =* arg +<

557690 =/ m (strand ,(list path))

558691 ;< =riot:clay bind:m (warp ship desk ~ %sing %t case spur)

@@ -560,6 +693,14 @@

560693 (strand-fail %list-tree >arg< ~)

561694 (pure:m !<((list path) q.r.u.riot))

562695::

696+++ list-desk

697+ |= [[=ship =desk =case] =spur]

698+ =* arg +<

699+ =/ m (strand arch)

700+ ;< =riot:clay bind:m (warp ship desk ~ %sing %y case spur)

701+ ?~ riot

702+ (strand-fail %list-desk >arg< ~)

703+ (pure:m !<(arch q.r.u.riot))

563704:: Take Clay read result

564705::

565706++ take-writ

@@ -586,6 +727,23 @@

586727 (poke [who %hood] %helm-hi !>(~))

587728 (pure:m ~)

588729::

730+++ eval-hoon

731+ |= [gen=hoon bez=(list beam)]

732+ =/ m (strand ,vase)

733+ ^- form:m

734+ =/ sut=vase !>(..zuse)

735+ |-

736+ ?~ bez

737+ (pure:m (slap sut gen))

738+ ;< vax=vase bind:m (build-file-hard i.bez)

739+ $(bez t.bez, sut (slop vax sut))

740+::

741+++ send-thread

742+ |= [=bear:khan =shed:khan =wire]

743+ =/ m (strand ,~)

744+ ^- form:m

745+ (send-raw-card %pass wire %arvo %k %lard bear shed)

746+::

589747:: Queue on skip, try next on fail %ignore

590748::

591749++ main-loop

@@ -734,7 +892,7 @@

734892 ;< =bowl:spider bind:m get-bowl

735893 =/ tid

736894 (scot %ta (cat 3 (cat 3 'strand_' file) (scot %uv (sham file eny.bowl))))

737− =/ poke-vase !>([`tid.bowl `tid beak file args])

895+ =/ poke-vase !>(`start-args:spider`[`tid.bowl `tid beak file args])

738896 ;< ~ bind:m (poke-our %spider %spider-start poke-vase)

739897 ;< ~ bind:m (sleep ~s0) :: wait for thread to start

740898 (pure:m tid)

@@ -748,10 +906,9 @@

748906 ^- form:m

749907 ;< =bowl:spider bind:m get-bowl

750908 =/ tid (scot %ta (cat 3 'strand_' (scot %uv (sham file eny.bowl))))

751− =/ poke-vase !>([`tid.bowl `tid file args])

909+ =/ poke-vase !>(`start-args:spider`[`tid.bowl `tid byk.bowl file args])

752910 ;< ~ bind:m (watch-our /awaiting/[tid] %spider /thread-result/[tid])

753911 ;< ~ bind:m (poke-our %spider %spider-start poke-vase)

754− ;< ~ bind:m (sleep ~s0) :: wait for thread to start

755912 ;< =cage bind:m (take-fact /awaiting/[tid])

756913 ;< ~ bind:m (take-kick /awaiting/[tid])

757914 ?+ p.cage ~|([%strange-thread-result p.cage file tid] !!)

base-desk/lib/test.hoon+55−2

@@ -13,7 +13,7 @@

1313 %+ weld result

1414 ^- tang

1515 :~ [%palm [": " ~ ~ ~] [leaf+"expected" (sell expected) ~]]

16− [%palm [": " ~ ~ ~] [leaf+"actual" (sell actual) ~]]

16+ [%palm [": " ~ ~ ~] [leaf+"actual " (sell actual) ~]]

1717 ==

1818 ::

1919 =? result !(~(nest ut p.actual) | p.expected)

@@ -38,7 +38,60 @@

3838 =/ b (mule a)

3939 ?- -.b

4040 %| ~

41− %& [leaf+"expected failure - succeeded" ~]

41+ %& ['expected failure - succeeded' ~]

42+ ==

43+:: +expect-success: kicks a trap, expecting success; returns trace on failure

44+::

45+++ expect-success

46+ |= a=(trap)

47+ ^- tang

48+ =/ b (mule a)

49+ ?- -.b

50+ %& ~

51+ %| ['expected success - failed' p.b]

52+ ==

53+::

54+:: +expect-fail-message: kicks a trap, expecting crash, compares the resulting error message

55+++ expect-fail-message

56+ |= [msg=@t a=(trap)]

57+ ^- tang

58+ =/ b (mule a)

59+ ?- -.b

60+ %| |^

61+ =/ =tang (flatten +.b)

62+ ?: ?=(^ (find (trip msg) tang))

63+ ~

64+ ['expected error message - not found' ~]

65+ ++ flatten

66+ |= tang=(list tank)

67+ =| res=tape

68+ |- ^- tape

69+ ?~ tang res

70+ $(tang t.tang, res (weld ~(ram re i.tang) res))

71+ --

72+ %& ['expected failure - succeeded' ~]

73+ ==

74+:: $a-test-chain: a sequence of tests to be run

75+::

76+:: NB: arms shouldn't start with `test-` so that `-test % ~` runs

77+::

78++$ a-test-chain

79+ $_

80+ |?

81+ ?: =(0 0)

82+ [%& p=*tang]

83+ [%| p=[tang=*tang next=^?(..$)]]

84+:: +run-chain: run a sequence of tests, stopping at first failure

85+::

86+++ run-chain

87+ |= seq=a-test-chain

88+ ^- tang

89+ =/ res $:seq

90+ ?- -.res

91+ %& p.res

92+ %| ?. =(~ tang.p.res)

93+ tang.p.res

94+ $(seq next.p.res)

4295 ==

4396:: +category: prepends a name to an error result; passes successes unchanged

4497::

base-desk/lib/verb.hoon+88−11

@@ -1,6 +1,6 @@

11:: Print what your agent is doing.

22::

3−/- verb

3+/- *verb

44::

55|= [loud=? =agent:gall]

66=| bowl-print=_|

@@ -14,7 +14,10 @@

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

1515 %- (print bowl |.("{<dap.bowl>}: on-init"))

1616 =^ cards agent on-init:ag

17− [[(emit-event %on-init ~) cards] this]

17+ :_ this

18+ :_ :_ cards

19+ (emit-event %on-init ~)

20+ (emit-event-plus bowl [%on-init ~] cards)

1821::

1922++ on-save

2023 ^- vase

@@ -26,7 +29,10 @@

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

2730 %- (print bowl |.("{<dap.bowl>}: on-load"))

2831 =^ cards agent (on-load:ag old-state)

29− [[(emit-event %on-load ~) cards] this]

32+ :_ this

33+ :_ :_ cards

34+ (emit-event %on-load ~)

35+ (emit-event-plus bowl [%on-load ~] cards)

3036::

3137++ on-poke

3238 |= [=mark =vase]

@@ -38,17 +44,23 @@

3844 %bowl `this(bowl-print !bowl-print)

3945 ==

4046 =^ cards agent (on-poke:ag mark vase)

41− [[(emit-event %on-poke mark) cards] this]

47+ :_ this

48+ :_ :_ cards

49+ (emit-event %on-poke mark)

50+ (emit-event-plus bowl [%on-poke mark (mug q.vase)] cards)

4251::

4352++ on-watch

4453 |= =path

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

4655 %- (print bowl |.("{<dap.bowl>}: on-watch on path {<path>}"))

4756 =^ cards agent

48− ?: ?=([%verb %events ~] path)

57+ ?: ?=([%verb ?(%events %events-plus) ~] path)

4958 [~ agent]

5059 (on-watch:ag path)

51− [[(emit-event %on-watch path) cards] this]

60+ :_ this

61+ :_ :_ cards

62+ (emit-event %on-watch path)

63+ (emit-event-plus bowl [%on-watch path] cards)

5264::

5365++ on-leave

5466 |= =path

@@ -57,7 +69,10 @@

5769 ?: ?=([%verb %event ~] path)

5870 [~ this]

5971 =^ cards agent (on-leave:ag path)

60− [[(emit-event %on-leave path) cards] this]

72+ :_ this

73+ :_ :_ cards

74+ (emit-event %on-leave path)

75+ (emit-event-plus bowl [%on-leave path] cards)

6176::

6277++ on-peek

6378 |= =path

@@ -70,7 +85,17 @@

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

7186 %- (print bowl |.("{<dap.bowl>}: on-agent on wire {<wire>}, {<-.sign>}"))

7287 =^ cards agent (on-agent:ag wire sign)

73− [[(emit-event %on-agent wire -.sign) cards] this]

88+ :_ this

89+ :_ :_ cards

90+ (emit-event %on-agent wire -.sign)

91+ =; =^sign

92+ (emit-event-plus bowl [%on-agent wire sign] cards)

93+ ?- -.sign

94+ %poke-ack [%poke-ack ?=(~ p.sign)]

95+ %watch-ack [%watch-ack ?=(~ p.sign)]

96+ %kick [%kick ~]

97+ %fact [%fact p.cage.sign (mug q.q.cage.sign)]

98+ ==

7499::

75100++ on-arvo

76101 |= [=wire =sign-arvo]

@@ -78,14 +103,20 @@

78103 %- %+ print bowl |.

79104 "{<dap.bowl>}: on-arvo on wire {<wire>}, {<[- +<]:sign-arvo>}"

80105 =^ cards agent (on-arvo:ag wire sign-arvo)

81− [[(emit-event %on-arvo wire [- +<]:sign-arvo) cards] this]

106+ :_ this

107+ :_ :_ cards

108+ (emit-event %on-arvo wire [- +<]:sign-arvo)

109+ (emit-event-plus bowl [%on-arvo wire [- +<]:sign-arvo] cards)

82110::

83111++ on-fail

84112 |= [=term =tang]

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

86114 %- (print bowl |.("{<dap.bowl>}: on-fail with term {<term>}"))

87115 =^ cards agent (on-fail:ag term tang)

88− [[(emit-event %on-fail term) cards] this]

116+ :_ this

117+ :_ :_ cards

118+ (emit-event %on-fail term)

119+ (emit-event-plus bowl [%on-fail term] cards)

89120--

90121::

91122++ print

@@ -99,7 +130,53 @@

99130 same

100131::

101132++ emit-event

102− |= =event:verb

133+ |= =event

103134 ^- card:agent:gall

104135 [%give %fact ~[/verb/events] %verb-event !>(event)]

136+::

137+++ emit-event-plus

138+ |= [=bowl:gall =cause cards=(list card:agent:gall)]

139+ ^- card:agent:gall

140+ =; event=event-plus

141+ [%give %fact ~[/verb/events-plus] %verb-event-plus !>(event)]

142+ =- [act.bowl now.bowl src.bowl sap.bowl cause -]

143+ %+ turn cards

144+ |= =card:agent:gall

145+ ^- effect

146+ ::TODO for %fact, %kick, could calculate how many ships affected

147+ ?- card

148+ [%pass * %agent * ?(%poke %poke-as) *]

149+ =, q.card

150+ =/ =cage ?-(-.task.q.card %poke cage.task, %poke-as [mark.task q.cage.task])

151+ [%poke p.card [ship name] p.cage `@`(mug q.q.cage)]

152+ ::

153+ [%pass * %agent * ?(%watch %watch-as) *]

154+ =, q.card

155+ =/ =path ?-(-.task.q.card %watch path.task, %watch-as path.task)

156+ [%watch p.card [ship name] path]

157+ ::

158+ [%pass * %agent * %leave *]

159+ =, q.card

160+ [%leave p.card [ship name]]

161+ ::

162+ [%give %fact *]

163+ =, p.card

164+ [%fact paths p.cage (mug q.q.cage)]

165+ ::

166+ [%give %kick *]

167+ [%kick paths.p.card]

168+ ::

169+ [%give ?(%poke-ack %watch-ack) *]

170+ ~| %explicit-ack

171+ !! :: shouldn't be given explicitly

172+ ::

173+ [%pass * %arvo *]

174+ [%arvo p.card -.q.card +<.q.card]

175+ ::

176+ [%pass *]

177+ [%arvo p.card %$ -.q.card]

178+ ::

179+ [%slip *]

180+ $(card [%pass //slip p.card])

181+ ==

105182--

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/css.hoonnew file+25

@@ -0,0 +1,25 @@

1+::

2+:::: /hoon/css/mar

3+ ::

4+/? 310

5+=, eyre

6+=, mimes:html

7+|_ mud=@t

8+++ grow :: convert to

9+ |%

10+ ++ mime [/text/css (as-octs mud)] :: convert to %mime

11+ ++ hymn :: convert to %hymn

12+ |^ html

13+ ++ style ;style

14+ ;- (trip mud)

15+ ==

16+ ++ html ;html:(head:"{style}" body)

17+ --

18+ --

19+++ grab

20+ |% :: convert from

21+ ++ mime |=([p=mite q=octs] (@t q.q))

22+ ++ noun @t :: clam from %noun

23+ --

24+++ grad %mime

25+--

base-desk/mar/hoon.hoon+285−31

@@ -1,41 +1,295 @@

1−:::: /hoon/hoon/mar

2− ::

3−/? 310

4−::

5−=, eyre

61|_ own=@t

72::

83++ grow :: convert to

94 |%

105 ++ mime `^mime`[/text/x-hoon (as-octs:mimes:html own)] :: convert to %mime

11− ++ elem :: convert to %html

12− ;div:pre(urb_codemirror "", mode "hoon"):"{(trip own)}"

13− :: =+ gen-id="src-{<`@ui`(mug own)>}"

14− :: ;div

15− :: ;textarea(id "{gen-id}"):"{(trip own)}"

16− :: ;script:"""

17− :: CodeMirror.fromTextArea(

18− :: window[{<gen-id>}],

19− :: \{lineNumbers:true, readOnly:true}

20− :: )

21− :: """

22− :: ==

236 ++ hymn

24− :: ;html:(head:title:"Source" "+{elem}")

25− ;html

26− ;head

27− ;title:"Source"

28− ;script@"//cdnjs.cloudflare.com/ajax/libs/codemirror/4.3.0/codemirror.js";

29− ;script@"/lib/syntax/hoon.js";

30− ;link(rel "stylesheet", href "//cdnjs.cloudflare.com/ajax/libs/".

31− "codemirror/4.3.0/codemirror.min.css");

32− ;link/"/lib/syntax/codemirror.css"(rel "stylesheet");

33− ==

34− ;body

35− ;textarea#src:"{(trip own)}"

36− ;script:'CodeMirror.fromTextArea(src, {lineNumbers:true, readOnly:true})'

7+ ^- manx

8+ =/ to-wall

9+ |= =tape

10+ ^- wall

11+ %+ roll (flop tape)

12+ |= [char=@tD =wall]

13+ ?~ wall

14+ [[char ~] ~]

15+ ?: =('\0a' char)

16+ [~ wall]

17+ [[char i.wall] t.wall]

18+ ::

19+ =/ src=tape (trip own)

20+ =/ count=@ud (lent (to-wall src))

21+ =; [style=tape script=tape]

22+ ;html

23+ ;head

24+ ;title: source

25+ ;meta(charset "utf-8");

26+ ;meta(name "viewport", content "width=device-width, initial-scale=1");

27+ ;style: {style}

28+ ==

29+ ;body

30+ ;div.viewer

31+ :: ;div.viewer-bar

32+ :: ;span.viewer-name: {(scow %ud count)} lines

33+ :: ;button.copy-link(id "copy-link", hidden ""): copy link

34+ :: ==

35+ ;div.code

36+ ;pre.gutter(id "gutter");

37+ ;div.code-body

38+ ;div(id "hl");

39+ ;pre.code-pre(id "code"): {src}

40+ ==

41+ ==

42+ ==

43+ ;script: {script}

44+ ==

3745 ==

38− ==

46+ ::

47+ :-

48+ ^~ ^= style

49+ ^- tape

50+ %- trip

51+ '''

52+ :root {

53+ --bg: #fbfbf9;

54+ --panel: #ffffff;

55+ --gutter-bg: #f3f3ef;

56+ --line: #e4e4dd;

57+ --fg: #2b2b2b;

58+ --fg-dim: #9a9a90;

59+ --sel: #fff7d6;

60+ --sel-edge: #f1e4a8;

61+ --accent: #4a6da7;

62+ --lh: 20px;

63+ --mono: ui-monospace, SFMono-Regular, "SF Mono", Menlo, Consolas,

64+ "Liberation Mono", "Courier New", monospace;

65+ }

66+ * { box-sizing: border-box; }

67+ html, body {

68+ margin: 0;

69+ height: 100%;

70+ background: var(--bg);

71+ color: var(--fg);

72+ font-family: var(--mono);

73+ -webkit-font-smoothing: antialiased;

74+ }

75+ .viewer {

76+ height: 100vh;

77+ display: flex;

78+ flex-direction: column;

79+ padding: 16px;

80+ gap: 12px;

81+ }

82+ .viewer-bar {

83+ flex: 0 0 auto;

84+ display: flex;

85+ align-items: center;

86+ gap: 12px;

87+ font-size: 13px;

88+ color: var(--fg-dim);

89+ }

90+ .viewer-name {

91+ flex: 1 1 auto;

92+ min-width: 0;

93+ overflow: hidden;

94+ text-overflow: ellipsis;

95+ white-space: nowrap;

96+ color: var(--fg);

97+ }

98+ .copy-link {

99+ flex: 0 0 auto;

100+ padding: 4px 12px;

101+ border: 1px solid var(--line);

102+ border-radius: 6px;

103+ background: var(--panel);

104+ color: var(--fg-dim);

105+ font: inherit;

106+ font-size: 12px;

107+ cursor: pointer;

108+ transition: color .12s, border-color .12s;

109+ }

110+ .copy-link:hover { color: var(--accent); border-color: var(--accent); }

111+ .copy-link[hidden] { display: none; }

112+ .code {

113+ flex: 1 1 auto;

114+ min-height: 0;

115+ display: flex;

116+ align-items: flex-start;

117+ overflow: auto;

118+ background: var(--panel);

119+ border: 1px solid var(--line);

120+ border-radius: 8px;

121+ }

122+ .code-body {

123+ position: relative;

124+ flex: 1 1 auto;

125+ min-width: 0;

126+ width: max-content;

127+ }

128+ #gutter, #code {

129+ margin: 0;

130+ padding: 14px 0;

131+ font-family: var(--mono);

132+ font-size: 13px;

133+ line-height: var(--lh);

134+ white-space: pre;

135+ tab-size: 2;

136+ }

137+ #gutter {

138+ position: sticky;

139+ left: 0;

140+ z-index: 2;

141+ flex: 0 0 auto;

142+ padding-left: 16px;

143+ padding-right: 12px;

144+ text-align: right;

145+ color: var(--fg-dim);

146+ background: var(--gutter-bg);

147+ border-right: 1px solid var(--line);

148+ user-select: none;

149+ -webkit-user-select: none;

150+ cursor: pointer;

151+ }

152+ #code {

153+ display: block;

154+ padding-left: 14px;

155+ padding-right: 18px;

156+ color: var(--fg);

157+ }

158+ #hl {

159+ position: absolute;

160+ left: 0;

161+ right: 0;

162+ z-index: 0; /* under the text */

163+ display: none;

164+ background: var(--sel);

165+ box-shadow: inset 2px 0 0 var(--sel-edge);

166+ pointer-events: none;

167+ }

168+ #code { position: relative; z-index: 1; } /* text above the bar */

169+ :focus-visible { outline: 2px solid var(--accent); outline-offset: -2px; }

170+ '''

171+ ^~ ^= code

172+ ^- tape

173+ %- trip

174+ '''

175+ (function () {

176+ "use strict";

177+ const panel = document.querySelector(".code"); // the scroll container

178+ const code = document.getElementById("code");

179+ const gutter = document.getElementById("gutter");

180+ const hl = document.getElementById("hl");

181+ if (!panel || !code || !gutter || !hl) return;

182+ const text = code.textContent;

183+ let lineCount = text.length ? text.split("\n").length : 1;

184+ if (text.endsWith("\n")) lineCount -= 1;

185+ if (lineCount < 1) lineCount = 1;

186+ (function fillGutter() {

187+ let s = "";

188+ for (let i = 1; i <= lineCount; i++) s += i + "\n";

189+ gutter.textContent = s;

190+ })();

191+ let lineH = 0;

192+ let codeTop = 0; // code's content-box top padding, the y-origin of line 1

193+ function measure() {

194+ const cs = getComputedStyle(code);

195+ const lh = parseFloat(cs.lineHeight);

196+ lineH = isNaN(lh) ? parseFloat(cs.fontSize) * 1.55 : lh;

197+ codeTop = parseFloat(cs.paddingTop) || 0;

198+ positionHighlight(); // keep the bar correct after a re-measure

199+ }

200+ let anchor = null;

201+ let selLo = 0;

202+ let selHi = 0;

203+ function positionHighlight() {

204+ if (!selLo) { hl.style.display = "none"; return; }

205+ hl.style.display = "block";

206+ hl.style.top = (codeTop + (selLo - 1) * lineH) + "px";

207+ hl.style.height = ((selHi - selLo + 1) * lineH) + "px";

208+ }

209+ function applySel(lo, hi) {

210+ selLo = lo;

211+ selHi = hi;

212+ positionHighlight();

213+ }

214+ function deselect() {

215+ selLo = selHi = 0;

216+ anchor = null;

217+ positionHighlight();

218+ history.replaceState(null, "", location.pathname + location.search);

219+ }

220+ function parseHash(hash) {

221+ const m = /^#L(\d+)(?:-L(\d+))?$/.exec(hash || "");

222+ if (!m) return null;

223+ let lo = parseInt(m[1], 10);

224+ let hi = m[2] ? parseInt(m[2], 10) : lo;

225+ if (hi < lo) { const t = lo; lo = hi; hi = t; }

226+ lo = Math.max(1, Math.min(lo, lineCount));

227+ hi = Math.max(1, Math.min(hi, lineCount));

228+ return [lo, hi];

229+ }

230+ function setHash(lo, hi) {

231+ const frag = lo === hi ? "L" + lo : "L" + lo + "-L" + hi;

232+ history.replaceState(null, "", "#" + frag);

233+ }

234+ function scrollToLine(n) {

235+ const y = codeTop + (n - 1) * lineH;

236+ if (y < panel.scrollTop || y > panel.scrollTop + panel.clientHeight) {

237+ panel.scrollTop = Math.max(0, y - panel.clientHeight / 2);

238+ }

239+ }

240+ function selectFromHash(scroll) {

241+ const r = parseHash(location.hash);

242+ if (!r) return false;

243+ anchor = r[0];

244+ applySel(r[0], r[1]);

245+ if (scroll) scrollToLine(r[0]);

246+ return true;

247+ }

248+ function lineFromEvent(e) {

249+ // y within the code content: pointer relative to the code pre's rendered

250+ // top, which already accounts for scroll since getBoundingClientRect is

251+ // viewport-relative and the pre moves as the panel scrolls.

252+ const rect = code.getBoundingClientRect();

253+ const y = e.clientY - rect.top - codeTop;

254+ let n = Math.floor(y / lineH) + 1;

255+ if (n < 1) n = 1;

256+ if (n > lineCount) n = lineCount;

257+ return n;

258+ }

259+ function onClick(e) {

260+ const inGutter = e.target === gutter;

261+ if (!inGutter && !e.shiftKey) return; // normal text interaction in code

262+ const n = lineFromEvent(e);

263+ if (!e.shiftKey && selLo === n && selHi === n) {

264+ deselect();

265+ return;

266+ }

267+ if (e.shiftKey && anchor !== null) {

268+ applySel(Math.min(anchor, n), Math.max(anchor, n));

269+ setHash(selLo, selHi);

270+ } else {

271+ anchor = n;

272+ applySel(n, n);

273+ setHash(n, n);

274+ }

275+ }

276+ gutter.addEventListener("click", onClick);

277+ code.addEventListener("click", onClick);

278+ document.addEventListener("keydown", function (e) {

279+ if (e.key === "Escape") deselect();

280+ });

281+ window.addEventListener("hashchange", function () {

282+ if (!selectFromHash(true)) deselect();

283+ });

284+ let rz = null;

285+ window.addEventListener("resize", function () {

286+ clearTimeout(rz);

287+ rz = setTimeout(measure, 100);

288+ });

289+ measure();

290+ selectFromHash(true);

291+ })();

292+ '''

39293 ++ txt

40294 (to-wain:format own)

41295 --

base-desk/mar/htm.hoon+2−11

@@ -2,14 +2,5 @@

22:::: /hoon/htm/mar

33 ::

44/? 310

5−|_ own=manx

6−::

7−++ grad %noun

8−++ grow :: convert to

9− |%

10− ++ noun own

11− ++ hymn own

12− --

13−++ grab |% :: convert from

14− ++ noun manx :: clam from %noun

15−-- --

5+/= htm /mar/html

6+htm

base-desk/mar/httr.hoon+1−2

@@ -5,12 +5,11 @@

55::

66=, eyre

77=, format

8−=, html

98|_ hit=httr

109++ grad %noun

1110++ grow |% ++ wall (turn wain trip)

1211 ++ wain (to-wain cord)

13− ++ json (need (de-json cord))

12+ ++ json (need (de:json:html cord))

1413 ++ cord q:octs

1514 ++ noun hit

1615 ++ octs

base-desk/mar/js.hoon+7−4

@@ -8,10 +8,13 @@

88++ grow

99 |%

1010 ++ mime [/application/javascript (as-octs:mimes:html (@t mud))]

11− ++ elem ;script

12− ;- (trip (@t mud))

13− ==

14− ++ hymn ;html:(head:"+{elem}" body)

11+ ++ hymn :: convert to %hymn

12+ |^ html

13+ ++ script ;script

14+ ;- (trip (@t mud))

15+ ==

16+ ++ html ;html:(head:"{script}" body)

17+ --

1518 --

1619++ grab

1720 |% :: convert from

base-desk/mar/json.hoon+4−4

@@ -8,17 +8,17 @@

88=, eyre

99=, format

1010=, html

11−|_ jon=json

11+|_ jon=^json

1212::

1313++ grow :: convert to

1414 |%

1515 ++ mime [/application/json (as-octs:mimes -:txt)] :: convert to %mime

16− ++ txt [(crip (en-json jon))]~

16+ ++ txt [(en:json jon)]~

1717 --

1818++ grab

1919 |% :: convert from

20− ++ mime |=([p=mite q=octs] (fall (rush (@t q.q) apex:de-json) *json))

21− ++ noun json :: clam from %noun

20+ ++ mime |=([p=mite q=octs] (fall (de:json (@t q.q)) *^json))

21+ ++ noun ^json :: clam from %noun

2222 ++ numb numb:enjs

2323 ++ time time:enjs

2424 --

base-desk/mar/json/rpc/response.hoon+1−2

@@ -16,11 +16,10 @@

1616 ^- response

1717 ~| hit

1818 ?: ?=(%2 (div p.hit 100))

19− =, html

2019 %- json

2120 ?~ r.hit

2221 a+~

23− (need (de-json q:u.r.hit))

22+ (need (de:json:html q:u.r.hit))

2423 fail+hit

2524 ++ json :: from json

2625 =, dejs-soft:format

base-desk/mar/kelvin.hoon+16−6

@@ -1,18 +1,28 @@

1−=/ weft ,[lal=@tas num=@ud] :: TODO remove after merge

2−|_ kel=weft

1+|_ kal=waft:clay

32++ grow

43 |%

54 ++ mime `^mime`[/text/x-kelvin (as-octs:mimes:html hoon)]

6− ++ noun kel

7− ++ hoon (crip "{<[lal num]:kel>}\0a")

5+ ++ noun kal

6+ ++ hoon

7+ %+ rap 3

8+ %+ turn

9+ %+ sort

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

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

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

13+ (gte num.a num.b)

14+ (gte lal.a lal.b)

15+ |= =weft

16+ (rap 3 '[%' (scot %tas lal.weft) ' ' (scot %ud num.weft) ']\0a' ~)

17+ ::

818 ++ txt (to-wain:format hoon)

919 --

1020++ grab

1121 |%

12− ++ noun weft

22+ ++ noun waft:clay

1323 ++ mime

1424 |= [=mite len=@ud tex=@]

15− !<(weft (slap !>(~) (ream tex)))

25+ (cord-to-waft:clay tex)

1626 --

1727++ grad %noun

1828--

base-desk/mar/noun.hoon+3

@@ -8,6 +8,9 @@

88++ grab |%

99 ++ noun *

1010 --

11+++ grow |%

12+ ++ mime [/application/x-urb-jam (as-octs:mimes:html (jam non))]

13+ --

1114++ grad

1215 |%

1316 ++ form %noun

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/mar/story-diff.hoonnew file+16

@@ -0,0 +1,16 @@

1+::

2+::::

3+ ::

4+/- *story

5+|_ =story-diff

6+::

7+++ grad %noun

8+++ grow

9+ |%

10+ ++ noun story-diff

11+ --

12+++ grab :: convert from

13+ |%

14+ ++ noun ^story-diff :: make from %noun

15+ --

16+--

base-desk/mar/story.hoonnew file+65

@@ -0,0 +1,65 @@

1+/- *story

2+/+ *story

3+|_ tale=story

4+++ grad

5+ |%

6+ ++ form %story-diff

7+ ++ diff

8+ |= tory=story

9+ ^- story-diff

10+ :: Given new story (tory), old story (tale), compute the diff

11+ :: additions = new - old

12+ :: deletions = old - new

13+ [(dif-ju tory tale) (dif-ju tale tory)]

14+ ++ pact

15+ |= dif=story-diff

16+ :: Compute the new story after applying dif to tale.

17+ ::

18+ ^- story

19+ =. tale (uni-ju tale additions.dif)

20+ =. tale (dif-ju tale deletions.dif)

21+ tale

22+ ++ join

23+ |= [ali=story-diff bob=story-diff]

24+ ^- (unit story-diff)

25+ =/ joined-additions (uni-ju additions.ali additions.bob)

26+ =/ joined-deletions (uni-ju deletions.ali deletions.bob)

27+ ::

28+ :: In a true join, we'd do a set intersection on the keys.

29+ :: If they're not equal, we have a conflict.

30+ :: In this case, we'd produce null and kick the flow to +mash

31+ ::

32+ %- some

33+ [joined-additions joined-deletions]

34+ ++ mash

35+ :: called by meld, force merge, annotating conflicts

36+ |= $: [als=ship ald=desk ali=story-diff]

37+ [bos=ship bod=desk bob=story-diff]

38+ ==

39+ ^- story-diff

40+ (need (join ali bob)) :: XX temporary, only because join doesn't fail

41+ --

42+::

43+++ grow :: convert to

44+ |% ::

45+ ++ mime :: to %mime

46+ [/text/x-urb-story (as-octs:mimes:html (of-wain:format txt))]

47+ ++ txt

48+ ^- wain

49+ %- zing

50+ %+ join `wain`~['---']

51+ %+ murn ~(tap by tale)

52+ |= [=tako:clay =proses]

53+ ^- (unit wain)

54+ ?~ proses ~

55+ (some (chapter-to-text tako proses))

56+ --

57+++ grab

58+ |% :: convert from

59+ ++ noun story :: clam from %noun

60+ ++ mime :: retrieve from %mime

61+ |= [p=mite q=octs]

62+ =/ story-text `@t`q.q

63+ `story`(rash story-text parse-story)

64+ --

65+--

base-desk/mar/tang.hoon+5−5

@@ -16,15 +16,15 @@

1616 %& a+p.result

1717 %| a+[a+[%s '[[output rendering error]]']~]~

1818 ==

19− ::

20− ++ elem

21− =- ;pre:code:"{(of-wall -)}"

22− ^- wall %- zing ^- (list wall)

23− (turn (flop tan) |=(a=tank (wash 0^160 a)))

19+ ++ txt

20+ ^- wain

21+ %+ turn (flop tan)

22+ |=(=tank (crip ~(ram re tank)))

2423 --

2524++ grab :: convert from

2625 |%

2726 ++ noun (list ^tank) :: clam from %noun

2827 ++ tank |=(a=^tank [a]~)

28+ ++ txt |=(=wain (flop (turn wain tank)))

2929 --

3030--

base-desk/mar/thread-done.hoonnew file+11

@@ -0,0 +1,11 @@

1+|_ res=*

2+++ grab

3+ |%

4+ ++ noun *

5+ --

6+++ grow

7+ |%

8+ ++ noun res

9+ --

10+++ grad %noun

11+--

base-desk/mar/thread-fail.hoonnew file+11

@@ -0,0 +1,11 @@

1+|_ err=[term tang]

2+++ grab

3+ |%

4+ ++ noun (pair term tang)

5+ --

6+++ grow

7+ |%

8+ ++ noun err

9+ --

10+++ grad %noun

11+--

base-desk/mar/txt.hoon−1

@@ -18,7 +18,6 @@

1818 => v=.

1919 |%

2020 ++ mime => v [/text/plain (as-octs (of-wain txt))]

21− ++ elem => v ;pre: {(trip (of-wain txt))}

2221 --

2322++ grad

2423 |%

base-desk/mar/udon.hoon−5

@@ -9,10 +9,6 @@

99 ++ mime [/text/x-unmark (as-octs:mimes:html mud)]

1010 ++ txt

1111 (to-wain:format mud)

12− ++ elem

13− ^- manx

14− =, cram

15− elm:(static (ream mud))

1612 ++ front :: XX performance, types

1713 ^- (map term knot)

1814 %- ~(run by inf:(static:cram (ream mud)))

@@ -28,5 +24,4 @@

2824 ++ txt of-wain:format

2925 --

3026++ grad %txt

31−++ garb /down

3227--

base-desk/mar/umd.hoon−4

@@ -9,10 +9,6 @@

99 ++ mime [/text/x-unmark (as-octs:mimes:html mud)]

1010 ++ txt

1111 (to-wain:format mud)

12− ++ elem

13− ^- manx

14− =, cram

15− elm:(static (ream mud))

1612 ++ front :: XX performance, types

1713 ^- (map term knot)

1814 %- ~(run by inf:(static:cram (ream mud)))

base-desk/mar/urb.hoon+1−1

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

11::

2−:::: /hoon/elem/urb/mar

2+:::: /hoon/urb/mar

33 ::

44/? 310

55=, mimes:html

base-desk/sources.txt+2−3

@@ -1,4 +1,3 @@

11urbit-src/pkg/base-dev

2−urbit-src/pkg/garden-dev

3−urbit-src/pkg/arvo/lib/naive

4−urbit-src/pkg/arvo/lib/tiny

2+urbit-src/pkg/landscape

3+urbit-src/pkg/arvo

base-desk/sur/aquarium.hoon+18−5

@@ -10,8 +10,6 @@

1010:: Short names are simply the first letter of each word plus `s` if

1111:: it's a list.

1212::

13−/+ pill

14−=, pill-lib=pill

1513|%

1614+$ az-log [topics=(lest @) data=@t]

1715+$ az-state

@@ -24,14 +22,23 @@

2422 aqua-event

2523 ==

2624::

27−+$ unix-event unix-event:pill-lib

28−+$ pill pill:pill-lib

25++$ unix-event ::NOTE like unix-event:pill-lib but for all tasks

26+ %+ pair wire

27+ $% [%wack p=@]

28+ [%what p=(list (pair path (cask)))]

29+ [%whom p=ship]

30+ [%boot ? $%($>(%fake task:jael) $>(%dawn task:jael))]

31+ [%wyrd p=vere]

32+ [%verb p=(unit ?)]

33+ task-arvo

34+ ==

2935::

3036+$ aqua-event

31− $% [%init-ship who=ship fake=?]

37+ $% [%init-ship who=ship fake=? feed=(unit feed:jael)]

3238 [%pause-events who=ship]

3339 [%snap-ships lab=term hers=(list ship)]

3440 [%restore-snap lab=term]

41+ [%read [from=[=ship life=@ubC] =path] for=[=lane:ames life=@ubC] num=@ud]

3542 [%event who=ship ue=unix-event]

3643 ==

3744::

@@ -64,6 +71,9 @@

6471 %+ pair wire

6572 $% [%blit p=(list blit:dill)]

6673 [%send p=lane:ames q=@]

74+ [%push p=(list lane:pact:ames) q=@]

75+ [%saxo sponsors=(list ship)]

76+ [%nail =ship lanes=(list lane:ames)]

6777 [%doze p=(unit @da)]

6878 [%thus p=@ud q=(unit hiss:eyre)]

6979 [%ergo p=@tas q=mode:clay]

@@ -72,5 +82,8 @@

7282 [%kill ~]

7383 [%init ~]

7484 [%request id=@ud request=request:http]

85+ [%turf p=(list turf)]

86+ [%unto =unto:gall] :: internal gifts to host ships

87+ :: (%facts are transformed to %raw-facts)

7588 ==

7689--

base-desk/sur/bitcoin.hoon+1−1

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

44:: chyg: whether account is (non-)change. 0 or 1

55:: bytc: "btc-byts" with dat cast to @ux

66|%

7−+$ network ?(%main %testnet)

7++$ network ?(%main %testnet %regtest)

88+$ hexb [wid=@ dat=@ux] :: hex byts

99+$ bits [wid=@ dat=@ub]

1010+$ xpub @ta

base-desk/sur/hood.hoon+283−197

@@ -1,152 +1,312 @@

1+/% kelvin %kelvin

12=, clay

23=* dude dude:gall

34|%

4−:: $snap: kiln snapshot

5++$ pike

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

7+ hash=@uv

8+ =zest

9+ wic=(set weft)

10+ ==

511::

6−+$ snap (map desk arak)

7−:: $diff: subscription update

12++$ pikes (map desk pike)

13+:: $jump: changes to update source change requests

814::

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]

15++$ jump

16+ $% [%all all=(map dock dock)] :: pending requests

17+ [%add old=dock new=dock] :: new request

18+ [%yea old=dock new=dock] :: approved

19+ [%nay old=dock new=dock] :: denied

1720 ==

18−:: $arak: foreign vat tracker

21+:: $rung: reference to upstream commit

1922::

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

21−:: .rein: configuration for agents

23++$ rung [=aeon =weft]

24+:: #sync-record: source and destination of a kiln sync

2225::

23−+$ arak

24− $: rail=(unit rail)

25− =rein

26++$ sync-record ::

27+ $: syd=desk :: local desk

28+ her=ship :: foreign ship

29+ sud=desk :: foreign desk

2630 ==

27−:: $rail: upstream tracking state

2831::

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

32++$ sync-state ::

33+ $: nun=@ta :: nonce

34+ kid=(unit desk) :: has kids desk too?

35+ let=@ud :: next revision

36+ nit=(unit ?) :: automerge or default

37+ hav=(unit @ud) :: update available

38+ yea=? :: update approved

39+ ==

3540::

36−+$ rail

37− $: publisher=(unit ship)

38− paused=?

39− =ship

40− =desk

41− =aeon

42− next=(list rung)

41++$ sync-update

42+ $% [%new for=sync-record rev=@ud]

43+ [%done for=sync-record rev=@ud]

44+ [%drop for=sync-record rev=@ud]

45+ [%pending pending=(set [for=sync-record rev=@ud])]

4346 ==

44−:: $rung: reference to upstream commit

4547::

46−+$ rung [=aeon =weft]

47−:: $rein: diff from desk manifest

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

49+:: +truncate-hash: get last 5 digits of hash and convert to tape

4850::

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

51+++ truncate-hash

52+ |= hash=@uv

53+ ^- tape

54+ (slag 2 <`@uv`(mod hash 0v1.00000)>)

55+:: +report-prep: get data required for reports

5256::

53−+$ rein

54− $: liv=_&

55− add=(set dude)

56− sub=(set dude)

57+++ report-prep

58+ |= [our=@p now=@da]

59+ =/ ego (scot %p our)

60+ =/ wen (scot %da now)

61+ :* .^(rock:tire %cx /[ego]//[wen]/tire)

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

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

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

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

66+ ==

5767 ==

58−::

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

6068:: +report-vats: report on all desk installations

6169::

6270++ report-vats

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

71+ |= [our=@p now=@da desks=(list desk) filt=@tas verb=?]

6472 ^- tang

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

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

73+ =/ ego (scot %p our)

74+ =/ wen (scot %da now)

75+ =+ prep=[tyr cone sor zyn]=(report-prep our now)

76+ ?: =(%$ filt)

77+ %- zing

78+ %+ turn

79+ ?^ desks

80+ (flop desks)

81+ %+ sort ~(tap in ~(key by tyr.prep))

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

83+ ?: |(=(a %kids) =(b %base)) &

84+ ?: |(=(a %base) =(b %kids)) |

85+ (aor b a)

86+ |=(syd=@tas (report-vat prep our now syd verb))

87+ =/ deks=(list [=desk =zest wic=(set weft)])

88+ ?~ desks

89+ %+ sort ~(tap by tyr.prep)

90+ |= [[a=desk *] [b=desk *]]

91+ ?: |(=(a %kids) =(b %base)) &

92+ ?: |(=(a %base) =(b %kids)) |

93+ (aor b a)

94+ %+ murn (flop desks)

95+ |= des=desk

96+ ^- (unit [=desk =zest wic=(set weft)])

97+ ?~ got=(~(get by tyr.prep) des)

98+ ~

99+ `[des u.got]

100+ ?: =(filt %blocking)

101+ =/ base-weft=(unit weft)

102+ %- ~(rep in wic:(~(got by tyr.prep) %base))

103+ |= [=weft out=(unit weft)]

104+ ?~ out

105+ `weft

106+ ?: (lth num.weft num.u.out)

107+ out

108+ `weft

109+ ?~ base-weft ~['%base already up-to-date']

110+ =/ blockers=(list desk)

111+ %+ sort

112+ ^- (list desk)

113+ %+ murn deks

114+ |= [=desk =zest wic=(set weft)]

115+ ^- (unit ^desk)

116+ ?. =(%live zest)

117+ ~

118+ ?: (~(has in wic) u.base-weft)

119+ ~

120+ `desk

121+ aor

122+ ?~ blockers ~['No desks blocking upgrade']

123+ %- zing

124+ ^- (list tang)

125+ :- :~ %+ rap 3

126+ :~ 'These desks are blocking upgrade to [%zuse '

127+ (scot %ud num.u.base-weft)

128+ ']:'

129+ == ==

130+ %+ turn blockers

131+ |=(syd=desk (report-vat prep our now syd verb))

132+ ::

133+ %- zing

134+ %+ turn

135+ ?+ filt !!

136+ %exists

137+ %+ skip deks

138+ |= [syd=desk *]

139+ ?~ got=(~(get by cone.prep) our syd)

140+ &

141+ =(0 let.u.got)

142+ ::

143+ %running

144+ %+ skim deks

145+ |=([* [zest=@tas *]] =(zest %live))

146+ ::

147+ %suspended

148+ %+ skip deks

149+ |= [syd=@tas [zest=@tas *]]

150+ ?| =(syd %kids)

151+ =(zest %live)

152+ ?~ got=(~(get by cone.prep) our syd)

153+ &

154+ =(0 let.u.got)

67155 ==

68− :- (report-kids our now)

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

156+ ::

157+ %exists-not

158+ %+ skim deks

159+ |= [syd=desk *]

160+ ?~ got=(~(get by cone.prep) our syd)

161+ |

162+ =(0 let.u.got)

163+ ==

164+ |=([syd=desk *] (report-vat prep our now syd verb))

70165:: +report-vat: report on a single desk installation

71166::

72167++ 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

168+ |= $: $: tyr=rock:tire =cone sor=(map desk (pair ship desk))

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

170+ ==

171+ our=ship now=@da syd=desk verb=?

172+ ==

173+ |^ ^- tang

174+ =/ ego (scot %p our)

175+ =/ wen (scot %da now)

176+ ?. ((sane %tas) syd)

177+ ~[(cat 3 'insane desk: %' syd)]

178+ ?. (~(has by cone) our syd)

179+ ~[(cat 3 'desk does not yet exist: %' syd)]

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

181+ ?: =(%kids syd)

182+ ~[(cat 3 '%kids %cz hash: ' (scot %uv hash))]

183+ =/ kel-path /[ego]/[syd]/[wen]/sys/kelvin

79184 ?. .^(? %cu kel-path)

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

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

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

185+ ~[(cat 3 'bad desk: %' syd)]

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

83187 ^- 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}"

188+ =/ =sink

189+ ?~ s=(~(get by sor) syd)

190+ ~

191+ ?~ z=(~(get by zyn) syd u.s)

192+ ~

193+ `[p.u.s q.u.s [kid let]:u.z]

194+ =/ meb=(list @uv)

195+ ?~ sink ~[hash]

196+ %+ turn

197+ .^ (list tako) %cs

198+ /[ego]/[syd]/[wen]/base/(scot %p her.u.sink)/[sud.u.sink]

199+ ==

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

201+ =/ dek (~(got by tyr) syd)

202+ =/ sat

203+ ?- zest.dek

204+ %live 'running'

205+ %dead 'suspended'

206+ %held 'suspended until next update'

207+ ==

208+ =/ kul=cord (print-wefts (waft-to-wefts waft))

209+ =/ ese=cord

210+ ?:(.^(? %cx /[ego]//[wen]/esse/[syd]) 'yes' 'no')

211+ =/ pax=path /(scot %p our)/[syd]/(scot %da now)

212+ ?. verb

213+ :~ '::'

214+ =+ .^(exist=? cu+(weld pax /desk/bill))

215+ ?. exist ' /desk/bill: missing'

216+ =+ .^(dudes=(list dude:gall) cx+(weld pax /desk/bill))

217+ (cat 3 ' /desk/bill: ' (crip "{<dudes>}"))

218+ (cat 3 ' pending updates: ' (print-wefts wic.dek))

219+ (cat 3 ' source ship: ' ?~(sink '~' (scot %p her.u.sink)))

220+ (cat 3 ' app status: ' sat)

221+ (cat 3 ' essential desk: ' ese)

222+ (cat 3 ' %cz hash ends in: ' (print-shorthash hash))

223+ (cat 3 ' /sys/kelvin: ' (print-wefts (waft-to-wefts waft)))

224+ (cat 3 '%' syd)

225+ ==

226+ ::

227+ =/ [on=(list @tas) of=(list @tas)]

228+ =/ [on=(list @tas) of=(list @tas)]

229+ %- ~(rep by ren:(~(got by cone) our syd))

230+ |= [[=dude:gall is-on=?] on=(list @tas) of=(list @tas)]

231+ ?: is-on

232+ [[dude on] of]

233+ [on [dude of]]

234+ [(sort on aor) (sort of aor)]

235+ :~ '::'

236+ (cat 3 ' pending updates: ' (print-wefts wic.dek))

237+ %^ cat 3 ' kids desk: ' ?~ sink '~'

238+ ?~ kid.u.sink '~'

239+ (cat 3 '%' u.kid.u.sink)

240+ (cat 3 ' source aeon: ' ?~(sink '~' (scot %ud let.u.sink)))

241+ (cat 3 ' source desk: ' ?~(sink '~' (cat 3 '%' sud.u.sink)))

242+ (cat 3 ' source ship: ' ?~(sink '~' (scot %p her.u.sink)))

243+ (cat 3 ' updates: ' ?~(sink 'local' 'remote'))

244+ %^ cat 3 ' publishing ship: ' ?~ got=(get-publisher our syd now)

245+ '~'

246+ (scot %p u.got)

247+ ::

248+ (cat 3 ' force off: ' (print-agents of))

249+ (cat 3 ' force on: ' (print-agents on))

250+ (cat 3 ' app status: ' sat)

251+ (cat 3 ' essential desk: ' ese)

252+ ::

253+ (cat 3 ' %cz hash: ' (scot %uv hash))

254+ (cat 3 ' base hash: ' (print-mergebases meb))

255+ (cat 3 ' /sys/kelvin: ' (print-wefts (waft-to-wefts waft)))

256+ (cat 3 '%' syd)

106257 ==

258+ ++ print-wefts

259+ |= wefts=(set weft)

260+ ^- @t

261+ ?: =(~ wefts)

262+ '~'

263+ %+ roll (sort ~(tap in wefts) aor)

264+ |= [=weft out=@t]

265+ ?: =('' out)

266+ (rap 3 '[%' lal.weft ' ' (scot %ud num.weft) ']' ~)

267+ (rap 3 out ' [%' lal.weft ' ' (scot %ud num.weft) ']' ~)

268+ ::

269+ ++ print-shorthash

270+ |= hash=@uv

271+ ^- @t

272+ (crip ((v-co:co 5) (end [0 25] hash)))

273+ ::

274+ ++ print-mergebases

275+ |= hashes=(list @uv)

276+ ^- @t

277+ ?~ hashes

278+ '~'

279+ ?~ t.hashes

280+ (scot %uv i.hashes)

281+ %+ roll `(list @uv)`hashes

282+ |= [hash=@uv out=@t]

283+ ?: =('' out)

284+ (print-shorthash hash)

285+ (rap 3 out ' ' (print-shorthash hash) ~)

286+ ::

287+ ++ print-agents

288+ |= agents=(list @tas)

289+ ^- @t

290+ ?~ agents

291+ '~'

292+ %+ roll `(list @tas)`agents

293+ |= [agent=@tas out=@tas]

294+ ?: =('' out)

295+ (cat 3 '%' agent)

296+ (rap 3 out ' %' agent ~)

297+ --

107298:: +report-kids: non-vat cz hash report for kids desk

108299::

109300++ report-kids

110301 |= [our=ship now=@da]

111302 ^- tank

112− =/ dek %kids

303+ =/ syd %kids

113304 =/ ego (scot %p our)

114305 =/ 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− =/ bob .^(blob cs/~[her syd yon %blob lob])

134− ::

135− ;; weft

136− ?- -.bob

137− %direct q.q.bob

138− %delta q.r.bob

139− ==

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

141−::

142−++ read-kelvin-local

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

144− ^- (unit weft)

145− ~| read-kelvin-local+desk

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

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

148− ~

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

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

307+ 'no %kids desk'

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

309+ (cat 3 '%kids %cz hash: ' (scot %uv hash))

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

151311::

152312++ read-bill-foreign

@@ -157,20 +317,15 @@

157317 =/ syd (scot %tas desk)

158318 =/ yon (scot %ud aeon)

159319 ::

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

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

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

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

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

164324 =/ fil (~(get by q.yak) /desk/bill)

165325 ?~ fil ~

166326 =/ lob (scot %uv u.fil)

167− =/ bob .^(blob cs/~[her syd yon %blob lob])

168− ::

169− ;; (list dude)

170− ?- -.bob

171− %direct q.q.bob

172− %delta q.r.bob

173− ==

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

328+ ;;((list dude) q.peg)

174329:: +read-bill: read contents of /desk/bill manifest

175330::

176331++ read-bill

@@ -179,21 +334,6 @@

179334 ?. .^(? cu/pax)

180335 *(list dude)

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

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

183−::

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

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

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

187−::

188−++ adjust-dudes

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

190− =rein

191− ==

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

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

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

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

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

197337::

198338++ get-remote-diff

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

@@ -219,39 +359,19 @@

219359 |= [our=ship =desk now=@da]

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

221361 %~ tap in

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

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

224−::

225−++ get-apps-want

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

227− ^- (list dude)

228− ?. liv.rein ~

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

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

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

232− duz

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

233363::

234364++ mergebase-hashes

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

236− ?~ rail.arak

237− ~

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

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

366+ =/ her (scot %p her)

239367 =/ ego (scot %p our)

240368 =/ wen (scot %da now)

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

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

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

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

243371::

244372++ enjs

245373 =, enjs:format

246374 |%

247− ++ vats

248− |= v=(list ^vat)

249− ^- json

250− %- pairs

251− %+ turn v

252− |= va=^vat

253− [desk.va (vat va)]

254− ::

255375 ++ tim

256376 |= t=@

257377 ^- json

@@ -264,15 +384,6 @@

264384 da+(tim da.c)

265385 ==

266386 ::

267− ++ vat

268− |= v=^vat

269− %- pairs

270− :~ desk+s+desk.v

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

272− cass+(cass cass.v)

273− arak+(arak arak.v)

274− ==

275− ::

276387 ++ weft

277388 |= w=^weft

278389 %- pairs

@@ -286,30 +397,5 @@

286397 :~ aeon+(numb aeon.r)

287398 weft+(weft weft.r)

288399 ==

289− ::

290− ++ rein

291− |= r=^rein

292− %- pairs

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

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

295− ==

296− ::

297− ++ arak

298− |= a=^arak

299− %- pairs

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

301− rein+(rein rein.a)

302− ==

303− ::

304− ++ rail

305− |= r=^rail

306− %- pairs

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

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

309− desk+s+desk.r

310− paused+b+paused.r

311− aeon+(numb aeon.r)

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

313− ==

314400 --

315401--

base-desk/sur/ring.hoon+1−1

@@ -15,7 +15,7 @@

1515 :: resistance...but if your private keys are compromised, your

1616 :: adversary can determine which signatures you made.

1717 ::

18− y=(unit @udpoint)

18+ y=(unit @uxpoint)

1919 ==

2020:: +ring-signature: higher level ring signature type

2121::

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/spider.hoon+14−1

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

11/+ libstrand=strand

22=, strand=strand:libstrand

33|%

4−+$ thread $-(vase _*form:(strand ,vase))

4++$ thread $-(vase shed:khan)

55+$ input [=tid =cage]

66+$ tid tid:strand

77+$ bowl bowl:strand

@@ -11,4 +11,17 @@

1111 %nonexistent :: 404

1212 %offline :: 504

1313 ==

14++$ start-args

15+ $: parent=(unit tid)

16+ use=(unit tid)

17+ =beak

18+ file=term

19+ =vase

20+ ==

21++$ inline-args

22+ $: parent=(unit tid)

23+ use=(unit tid)

24+ =beak

25+ =shed:khan

26+ ==

1427--

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

@@ -0,0 +1,39 @@

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+++ poke

14+ |%

15+ ++ request

16+ |* paths=mold

17+ $: path=paths

18+ =dude

19+ ==

20+ ++ response

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

22+ $: path=paths

23+ =dude

24+ $% [what=%tomb ~]

25+ [what=%rock =aeon =rock:lake]

26+ [what=%wave =aeon =wave:lake]

27+ == ==

28+ ++ on-rock

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

30+ $: path=paths

31+ src=ship

32+ from=dude

33+ stale=?

34+ fail=?

35+ =rock:lake

36+ wave=(unit wave:lake)

37+ ==

38+ --

39+--

base-desk/sur/story.hoonnew file+9

@@ -0,0 +1,9 @@

1+^?

2+|%

3++$ prose [title=@t body=@t]

4++$ proses (set prose)

5++$ story (jug tako:clay prose) :: set len > 1 means conflicting messages have been assigned

6++$ chapter [tako:clay proses] :: prose entry type

7++$ cash $%([%tako p=tako:clay] case) :: used in generators to accept a tako directly as well

8++$ story-diff [additions=story deletions=story]

9+--

base-desk/sur/verb.hoon+37−1

@@ -9,4 +9,40 @@

99 [%on-arvo =wire vane=term sign=term]

1010 [%on-fail =term]

1111 ==

12−--

12+::

13++$ event-plus

14+ $: act=@ud

15+ now=@da

16+ src=@p

17+ sap=path

18+ =cause

19+ effects=(list effect)

20+ ==

21+::

22++$ cause

23+ $% [%on-init ~]

24+ [%on-load ~]

25+ [%on-poke =mark mug=@ux]

26+ [%on-watch =path]

27+ [%on-leave =path]

28+ [%on-agent =wire =sign]

29+ [%on-arvo =wire vane=term sign=term]

30+ [%on-fail =term]

31+ ==

32+::

33++$ sign

34+ $% [%poke-ack ack=?]

35+ [%watch-ack ack=?]

36+ [%kick ~]

37+ [%fact =mark mug=@ux]

38+ ==

39+::

40++$ effect

41+ $% [%poke =wire =gill:gall =mark mug=@ux]

42+ [%watch =wire =gill:gall =path]

43+ [%leave =wire =gill:gall]

44+ [%fact paths=(list path) =mark mug=@ux]

45+ [%kick paths=(list path)]

46+ [%arvo =wire vane=term task=term]

47+ ==

48+--

bin/commit.shnew file+24

@@ -0,0 +1,24 @@

1+#!/bin/bash

2+

3+usage() { printf "Usage: $0 URBIT_DESK_DIRECTORY\n" 1>&2; exit 1; }

4+

5+cdir=$(dirname $0)

6+

7+if [ $# -eq 0 ]; then

8+ usage

9+ exit 2

10+fi

11+DESK_DIR=${@: -1}

12+DESK_DIR="${DESK_DIR/#\~/$HOME}"

13+PIER=$(dirname $DESK_DIR)

14+DESK=$(basename $DESK_DIR)

15+

16+port=$(cat $PIER/.http.ports | grep loopback | tr -s ' ' '\n' | head -n 1)

17+

18+lensa() {

19+ curl -s \

20+ --data "{\"source\":{\"dojo\":\"$2\"},\"sink\":{\"app\":\"$1\"}}" \

21+ "http://localhost:$port" | xargs printf %s | sed 's/\\n/\n/g'

22+}

23+

24+lensa 'hood' "+hood/commit %$DESK"

bin/get_glob.shnew file+19

@@ -0,0 +1,19 @@

1+#!/bin/bash

2+

3+usage() { printf "Usage: $0 URBIT_GLOBBER_DESK_DIRECTORY" 1>&2; exit 1; }

4+

5+cdir=$(dirname $0)

6+

7+if [ $# -eq 0 ]; then

8+ usage

9+ exit 2

10+fi

11+DESK="${1//\~/$HOME}"

12+GLOBS="$DESK/../.urb/put"

13+GLOB=$(ls -t $GLOBS | head -1)

14+TARGET_GLOBS="$cdir"/../globs/

15+mkdir -p $TARGET_GLOBS

16+cp "$GLOBS/$GLOB" $TARGET_GLOBS/

17+HASH="${GLOB//glob-/}"

18+HASH="${HASH//.glob/}"

19+echo $HASH

bin/install.shnew file+82

@@ -0,0 +1,82 @@

1+#!/bin/bash

2+#

3+# Taken from: https://github.com/timlucmiptev/btc-agents/blob/master/install.sh

4+# by ~timluc-miptev

5+#

6+# Modified HEAVILY

7+#

8+usage() { printf "Usage: $0 [-w] [-g] URBIT_DESK_DIRECTORY\n(-w: flag to watch and live copy code)\n(-g: install built ui to globber desk)\n" 1>&2; exit 1; }

9+

10+cdir=$(dirname $0)

11+

12+if [ $# -eq 0 ]; then

13+ usage

14+ exit 2

15+fi

16+DESK_DIR=${@: -1}

17+DESK_DIR="${DESK_DIR/#\~/$HOME}"

18+PIER=$(dirname $DESK_DIR)

19+DESK=$(basename $DESK_DIR)

20+EXCLUDE_FILE="${cdir}"/../config/ignore_files_on_install.txt

21+

22+port=$(cat $PIER/.http.ports | grep loopback | tr -s ' ' '\n' | head -n 1)

23+

24+lensd() {

25+ curl -s \

26+ --data "{\"source\":{\"dojo\":\"$1\"},\"sink\":{\"stdout\":null}}" \

27+ "http://localhost:$port" | xargs printf %s | sed 's/\\n/\n/g'

28+}

29+

30+lensa() {

31+ curl -s \

32+ --data "{\"source\":{\"dojo\":\"$2\"},\"sink\":{\"app\":\"$1\"}}" \

33+ "http://localhost:$port" | xargs printf %s | sed 's/\\n/\n/g'

34+}

35+

36+sync() {

37+ rsync -r --copy-links --exclude-from=$EXCLUDE_FILE "${cdir}"/../base-desk/* $DESK_DIR/

38+ rsync -r --copy-links --exclude-from=$EXCLUDE_FILE "${cdir}"/../docs-dev-desk/* $DESK_DIR/

39+ rsync -r --copy-links --exclude-from=$EXCLUDE_FILE "${cdir}"/../desk/* $DESK_DIR/

40+ if [ "$GLOBBER" ]; then

41+ rsync -r --copy-links "${cdir}"/../ui/dist/* $DESK_DIR/astrolabe

42+ fi

43+}

44+

45+

46+while getopts "wg" opt; do

47+ case ${opt} in

48+ w) WATCH_MODE="true"

49+ ;;

50+ g) GLOBBER="true"

51+ ;;

52+ *) usage

53+ ;;

54+ esac

55+done

56+

57+if [ -z "$WATCH_MODE" ]; then

58+ echo "Installed %astrolabe to ${DESK_DIR}"

59+ rm -r $DESK_DIR/*

60+ sync

61+ lensa 'hood' "+hood/commit %$DESK"

62+ if [ "$GLOBBER" ]; then

63+ lensd '-garden!make-glob %globber /astrolabe'

64+ GLOBS="$PIER/.urb/put"

65+ GLOB=$(ls -t $GLOBS | head -1)

66+ TARGET_GLOBS="$cdir"/../globs/

67+ mkdir -p $TARGET_GLOBS

68+ cp "$GLOBS/$GLOB" $TARGET_GLOBS/

69+ echo "copied from $GLOBS to $TARGET_GLOBS"

70+ HASH="${GLOB//glob-/}"

71+ HASH="${HASH//.glob/}"

72+ echo $HASH

73+ fi

74+else

75+ echo "Watching for changes to copy to ${DESK_DIR}..."

76+ rm -r $DESK_DIR/*

77+ while [ 0 ]

78+ do

79+ sleep 0.8

80+ sync

81+ done

82+fi

bin/make_glob.pynew file+208

@@ -0,0 +1,208 @@

1+#!/usr/bin/env python3

2+

3+import hashlib

4+import sys

5+from pathlib import Path

6+from urllib.parse import quote

7+

8+from noun import Cell, deep, intbytes, mug

9+

10+MIME_TYPES = {

11+ "css": "text/css",

12+ "gif": "image/gif",

13+ "html": "text/html",

14+ "ico": "image/x-icon",

15+ "jpeg": "image/jpeg",

16+ "jpg": "image/jpeg",

17+ "js": "application/javascript",

18+ "json": "application/json",

19+ "png": "image/png",

20+ "svg": "image/svg+xml",

21+ "ttf": "font/ttf",

22+ "webmanifest": "application/manifest+json",

23+ "woff": "font/woff",

24+ "woff2": "font/woff2",

25+}

26+BASE32 = "0123456789abcdefghijklmnopqrstuv"

27+

28+

29+class BitWriter:

30+ def __init__(self):

31+ self.output = bytearray()

32+ self.buffer = 0

33+ self.used = 0

34+ self.cursor = 0

35+

36+ def write(self, value, count):

37+ if count == 0:

38+ return

39+ self.buffer |= value << self.used

40+ self.used += count

41+ self.cursor += count

42+ byte_count = self.used // 8

43+ if byte_count:

44+ self.output.extend(self.buffer.to_bytes((self.used + 7) // 8, "little")[:byte_count])

45+ self.buffer >>= byte_count * 8

46+ self.used -= byte_count * 8

47+

48+ def finish(self):

49+ if self.used:

50+ self.output.append(self.buffer)

51+ self.buffer = 0

52+ self.used = 0

53+ return bytes(self.output)

54+

55+

56+def jam_bytes(value):

57+ writer = BitWriter()

58+ references = {}

59+

60+ def save(noun):

61+ references[noun] = writer.cursor

62+

63+ def mat(atom):

64+ if atom == 0:

65+ writer.write(1, 1)

66+ return

67+ atom_length = atom.bit_length()

68+ length_size = atom_length.bit_length()

69+ writer.write(1 << length_size, length_size + 1)

70+ writer.write(atom_length & ((1 << (length_size - 1)) - 1), length_size - 1)

71+ writer.write(atom, atom_length)

72+

73+ def back(reference):

74+ writer.write(3, 2)

75+ mat(reference)

76+

77+ def serialize(noun):

78+ duplicate = references.get(noun)

79+ if deep(noun):

80+ if duplicate is not None:

81+ back(duplicate)

82+ return

83+ save(noun)

84+ writer.write(1, 1)

85+ writer.write(0, 1)

86+ serialize(noun.head)

87+ serialize(noun.tail)

88+ return

89+ if duplicate is not None:

90+ atom_size = noun.bit_length()

91+ reference_size = duplicate.bit_length()

92+ if atom_size >= reference_size:

93+ back(duplicate)

94+ return

95+ save(noun)

96+ writer.write(0, 1)

97+ mat(noun)

98+

99+ serialize(value)

100+ return writer.finish()

101+

102+

103+def cord(value):

104+ return int.from_bytes(value.encode(), "little")

105+

106+

107+def path_noun(parts):

108+ result = 0

109+ for part in reversed(parts):

110+ result = Cell(cord(part), result)

111+ return result

112+

113+

114+def dor(a, b):

115+ if a == b:

116+ return True

117+ if deep(a):

118+ if not deep(b):

119+ return False

120+ if a.head == b.head:

121+ return dor(a.tail, b.tail)

122+ return dor(a.head, b.head)

123+ if deep(b):

124+ return True

125+ return a < b

126+

127+

128+def gor(a, b):

129+ a_mug = mug(a)

130+ b_mug = mug(b)

131+ return dor(a, b) if a_mug == b_mug else a_mug < b_mug

132+

133+

134+def map_put(tree, entry):

135+ if tree == 0:

136+ return Cell(entry, Cell(0, 0))

137+ node = tree.head

138+ if entry.head == node.head:

139+ return Cell(entry, tree.tail)

140+ left = tree.tail.head

141+ right = tree.tail.tail

142+ if gor(entry.head, node.head):

143+ return Cell(node, Cell(map_put(left, entry), right))

144+ return Cell(node, Cell(left, map_put(right, entry)))

145+

146+

147+def shas(salt, serialized):

148+ value_hash = int.from_bytes(hashlib.sha256(serialized).digest(), "little")

149+ length = max(32, len(intbytes(salt)))

150+ digest = hashlib.sha256((salt ^ value_hash).to_bytes(length, "little")).digest()

151+ return int.from_bytes(digest, "little")

152+

153+

154+def sham(serialized):

155+ hashed = shas(cord("sham"), serialized)

156+ mask = (1 << 128) - 1

157+ return (hashed & mask) ^ (hashed >> 128)

158+

159+

160+def scow_uv(value):

161+ if value == 0:

162+ return "0v0"

163+ digits = []

164+ while value:

165+ value, digit = divmod(value, 32)

166+ digits.append(BASE32[digit])

167+ digits = "".join(reversed(digits))

168+ first_length = (len(digits) - 1) % 5 + 1

169+ groups = [digits[:first_length]]

170+ groups.extend(digits[i:i + 5] for i in range(first_length, len(digits), 5))

171+ return "0v" + ".".join(groups)

172+

173+

174+def file_entry(root, file_path):

175+ relative = file_path.relative_to(root)

176+ parts = []

177+ for part in relative.parts:

178+ parts.extend(quote(segment, safe="-_~") for segment in part.split("."))

179+ extension = relative.suffix.removeprefix(".").lower()

180+ if extension not in MIME_TYPES:

181+ raise ValueError(f"no MIME type configured for {relative}")

182+ data = file_path.read_bytes()

183+ mime = Cell(path_noun(MIME_TYPES[extension].split("/")), Cell(len(data), int.from_bytes(data, "little")))

184+ return Cell(path_noun(parts), mime)

185+

186+

187+def make_glob(source, destination):

188+ root = Path(source)

189+ files = sorted((path for path in root.rglob("*") if path.is_file()), key=lambda path: path.as_posix())

190+ if not (root / "index.html").is_file():

191+ raise ValueError("glob source must contain index.html")

192+ glob = 0

193+ for file_path in files:

194+ glob = map_put(glob, file_entry(root, file_path))

195+ serialized = jam_bytes(glob)

196+ glob_hash = scow_uv(sham(serialized))

197+ output = Path(destination)

198+ output.mkdir(parents=True, exist_ok=True)

199+ filename = f"glob-{glob_hash}.glob"

200+ (output / filename).write_bytes(serialized)

201+ (output / "hash").write_text(glob_hash + "\n")

202+ print(filename)

203+

204+

205+if __name__ == "__main__":

206+ if len(sys.argv) != 3:

207+ raise SystemExit(f"usage: {sys.argv[0]} SOURCE_DIRECTORY OUTPUT_DIRECTORY")

208+ make_glob(sys.argv[1], sys.argv[2])

desk/app/astrolabe.hoon+96−61

@@ -1,26 +1,12 @@

11/- *astrolabe

2−/+ *astrolabe, *search, naive, default-agent, dbug, agentio

2+/+ *astrolabe, *search, slib=state

3+/+ *mip, naive, default-agent, dbug, agentio

34/$ udon-to-docu %udon %docu

45|%

5−+$ versioned-state

6− $% state-0

7− state-1

8− ==

9−+$ state-0

10− $: %0

11− spa=spawned

12− ==

13−+$ state-1

14− $: %1

15− fopoints=opoints :: forward ordered points

16− ropoints=opoints :: reversed ordered points, e.g. .~palnet-sampel

17− ==

18−::

19−+$ spawned (jug ship ship)

206+$ card card:agent:gall

217--

228%- agent:dbug

23−=| state-1

9+=| state-latest

2410=* state -

2511^- agent:gall

2612=<

@@ -32,18 +18,28 @@

3218++ on-init

3319 ^- (quip card _this)

3420 :_ this

35− [az-events-card:hc]~

21+ :~ ug-handler-card:hc

22+ groups-link-patch-card:hc

23+ talk-link-patch-card:hc

24+ az-events-card:hc

25+ ==

3626::

3727++ on-save !>(state)

3828++ on-load

3929 |= old-state=vase

4030 ^- (quip card _this)

4131 =/ old !<(versioned-state old-state)

42− =^ cards-0 old

43− ?. ?=(%0 -.old) `old

32+ =/ [cards-01=(list card) new=state-latest]

33+ ?. |(?=(?(%0 %1 %2 %3) -.old) (lth bump.old bump)) `old

4434 (on-naive-state:hc get-nas:hc)

45− ?> ?=(%1 -.old)

46− [cards-0 this(state old)]

35+ ?> ?=(%4 -.new)

36+ =/ cards=(list card)

37+ :~ ug-handler-card:hc

38+ groups-link-patch-card:hc

39+ talk-link-patch-card:hc

40+ ==

41+ =. cards (weld cards-01 cards)

42+ [cards this(state new)]

4743++ on-poke on-poke:def

4844++ on-watch on-watch:def

4945++ on-leave on-leave:def

@@ -52,21 +48,29 @@

5248 |= =path

5349 ^- (unit (unit cage))

5450 ?+ path (on-peek:def path)

51+ [%x %nop ~]

52+ ``noun+!>(~)

5553 [%x %point @ ~]

5654 ``astrolabe-point+!>((get-point:hc &3.path))

5755 [%x %point @ %spawned ?(~ [spawned-filter ~])]

5856 =/ =ship `@p`(slav %p &3.path)

59− =/ arg ?~(t.t.t.t.path %all i.t.t.t.t.path)

57+ =/ filter t.t.t.t.path

58+ =/ arg ?~(filter %all -.filter)

6059 ``astrolabe-point-set+!>((get-spawned-points:hc ship arg))

61− [%x %search @ ?(~ [%narrow ~])]

62− =/ =search-text (trip &3.path)

60+ [%x %search %patp @ ?(~ [%narrow ~])]

61+ =/ =search-text (trip &4.path)

62+ ?~ search-text ~|(%search-predicted-too-broad !!)

6363 =/ expand-search =(t.t.t.path ~)

64− ``astrolabe-point-set+!>((search-opoints:hc search-text expand-search))

64+ ``astrolabe-point-set+!>((search-opoints-patp:hc search-text expand-search))

65+ [%x %search %sigil @ ~]

66+ =/ =search-text (trip &4.path)

67+ ?~ search-text ~|(%search-predicted-too-broad !!)

68+ ``astrolabe-point-set+!>((search-opoints-sigil:hc search-text))

6569 [%x %peers ~]

6670 =/ peers .^((map ship ?(%alien %known)) %ax (scrio:hc %$ /peers))

6771 ``astrolabe-point-set+!>((turn ~(tap in peers) head))

6872 [%x %chart-data ~]

69− ``astrolabe-chart-data+!>(get-chart-data:hc)

73+ ``json+!>(get-chart-data:hc)

7074 [%x %doc ^]

7175 =/ doc-path=^path t.t.path

7276 =/ doc (read-doc:hc doc-path)

@@ -120,7 +124,7 @@

120124++ scrio ~(scry agentio bowl)

121125++ az-events-card [%pass /azimuth-events %agent [our.bowl %azimuth] %watch /event]

122126++ get-nas .^(^state:naive %gx (scrio %azimuth /nas/noun))

123−++ put-in-opoints

127+++ put-in-fropoints

124128 |= =ship

125129 ^- _state

126130 =. fopoints

@@ -128,6 +132,13 @@

128132 =. ropoints

129133 (put:ors ropoints (switch-words (to-q ship)) ~)

130134 state

135+::

136+++ put-in-spawn-mip

137+ |= [child=ship nas=^state:naive]

138+ ^- _state

139+ =/ =npoint (get-npoint-from-nas child nas)

140+ (put-in-spawn-mip:slib child npoint state)

141+::

131142++ on-naive-state

132143 |= nas=^state:naive

133144 ^- (quip card _state)

@@ -137,7 +148,8 @@

137148 ^- _state

138149 ?~ points state

139150 =/ =ship -.n.points

140− =. state (put-in-opoints ship)

151+ =. state (put-in-fropoints ship)

152+ =. state (put-in-spawn-mip ship nas)

141153 $(points l.points, state $(points r.points))

142154::

143155++ on-naive-diff

@@ -150,11 +162,15 @@

150162 :: %point " ship: {<ship.diff>} - {<+>-.diff>}"

151163 :: ==

152164 =? state ?=([%tx [* * * %spawn ship *] *] diff)

153− %- put-in-opoints

165+ %- put-in-fropoints

154166 ship.tx.raw-tx.diff

155167 =? state ?=([%point @ %owner *] diff)

156− %- put-in-opoints

168+ %- put-in-fropoints

157169 ship.diff

170+ =? state ?=([%point @ *] diff)

171+ %+ put-in-spawn-mip

172+ ship.diff

173+ get-nas

158174 `state

159175::

160176++ is-spawn-tx

@@ -181,6 +197,10 @@

181197 (sponsor-chain ship unpoint)

182198 (probable-dominion ship unpoint)

183199 ==

200+++ get-npoint-from-nas

201+ |= [=ship nas=^state:naive]

202+ ^- npoint

203+ (need (get:orm:naive points.nas ship))

184204::

185205++ run-spawned-points

186206 |* [agg=mold targ=ship nas=^state:naive filter=spawned-filter]

@@ -222,14 +242,25 @@

222242 |= [agg=@ud [spawn=ship *]]

223243 +(agg)

224244::

225−++ search-opoints

245+++ search-opoints-patp

226246 |= [=search-text expand-search=?]

227247 ^- (list ship)

228248 =/ search-fulls

229249 ?: expand-search

230250 (search-text-to-fulls search-text)

231251 ~[(search-text-to-full search-text)]

232− :: ~& (turn search-fulls |=(=search-full search-syls.search-full))

252+ (search-opoints search-fulls)

253+::

254+++ search-opoints-sigil

255+ |= [=search-text]

256+ ^- (list ship)

257+ =/ search-fulls

258+ ~[(sigil-search-text-to-full search-text)]

259+ (search-opoints search-fulls)

260+::

261+++ search-opoints

262+ |= [search-fulls=(list search-full)]

263+ ^- (list ship)

233264 =/ mr-searches (maybe-reverse-searches search-fulls 1.000)

234265 :: ~& (turn mr-searches |=(=mr-search pain.mr-search))

235266 :: ~& mr-searches

@@ -265,37 +296,41 @@

265296 $(ship parent, unpoint parent-point)

266297::

267298++ get-chart-data

268− ^- chart-data

299+ ^- json

269300 =/ nas get-nas

270− :: =/ galaxies (gulf 0 30) :: todo remove

271− %+ turn galaxies

272− |= =ship

273− =/ point (need (get:orm:naive points.nas ship))

274− (get-point-chart-data nas ship point)

301+ =/ main-data

302+ ^- tape

303+ %- ~(rep by spam)

304+ |= [[=ship kids=(map ship tape)] agg=tape]

305+ ^- tape

306+ %+ weld agg

307+ %+ pdata:smel (ship:smel ship)

308+ (flop ~(val by kids))

309+ =/ gal-data

310+ %+ pdata:smel "base"

311+ %+ turn galaxies

312+ |= gal=ship

313+ =/ npoint (get-npoint-from-nas gal nas)

314+ (pdata:smel (pmeta:smel gal npoint) ~)

315+ s+(crip :(weld "[" gal-data main-data "]"))

275316::

276−++ get-point-chart-data

277− |= [nas=^state:naive =ship =npoint]

278− ^- point-chart-data

279− =, sponsor.net.npoint

280− =/ desc-has

281− ?. has %none

282− ?: =(who (^sein:title ship))

283− %same

284− %diff

285− :- :* ship

286− dominion.npoint

287− [desc-has who]

288− ==

289− (get-spawned-chart-data nas ship)

290317::

291−++ get-spawned-chart-data

292− |= [nas=^state:naive =ship]

293− ^- chart-data

294− :: [*point-meta ~]~

295− %- (run-spawned-points chart-data ship nas %unlocked)

296− |= [agg=chart-data [spawn=^ship spawn-point=npoint]]

297− :_ agg

298− (get-point-chart-data nas spawn spawn-point)

318+++ ug-handler-card

319+ =/ ug-vase !>([/astrolabe '/apps/astrolabe/#'])

320+ [%pass /monkey-ug %agent [our.bowl %monkey] %poke [%bind-ug ug-vase]]

321+++ groups-link-patch-card

322+ =/ catch [%cord '/apps/groups/desk.js']

323+ =/ hatch [%before "."]

324+ =/ patch [/apps/groups catch hatch groups-link-thatch]

325+ =/ patch-kit-vase !>([/groups/astrolabe/link patch])

326+ [%pass /monkey/patch/groups/link %agent [our.bowl %monkey] %poke [%patch patch-kit-vase]]

327+++ talk-link-patch-card

328+ =/ catch [%cord '/apps/talk/desk.js']

329+ =/ hatch [%before "."]

330+ =/ patch [/apps/talk catch hatch groups-link-thatch]

331+ =/ patch-kit-vase !>([/talk/astrolabe/link patch])

332+ [%pass /monkey/patch/talk/link %agent [our.bowl %monkey] %poke [%patch patch-kit-vase]]

333+::

299334++ read-doc

300335 |= =path

301336 =/ doc-path=^path :(weld /doc/usr path /udon)

desk/desk.docket-0+3−3

@@ -1,10 +1,10 @@

11:~ title+'Astrolabe'

2− info+'Your guide to the Urbit constellations'

2+ info+'Your guide to the Urbit constellations. Search for ships, view their info, and explore the Star Chart.'

33 color+0x1f.243c

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

5− glob-ames+[~dister-midlev-mindyr 0v0]

5+ 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+[0 1 4]

7+ version+[1 0 7]

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

99 license+'MIT'

1010==

desk/desk.sealnew file+7

@@ -0,0 +1,7 @@

1+:- :~ [%watch & %azimuth /event]

2+ [%reads %gall `%x `%azimuth /]

3+ [%reads %clay `%u ~ /]

4+ [%reads %clay `%x ~ /]

5+ [%reads %ames `%x ~ /peers]

6+ ==

7+~

desk/doc.toc+3−1

@@ -1,4 +1,4 @@

1−/overview/udon About Astrolabe

1+/overview/udon Overview

22/usr User

33 /urbit-id/udon What is an Urbit ID?

44 /galaxy/udon Galaxies

@@ -8,6 +8,8 @@

88 /comet/udon Comets

99 /patpee/udon What is a @p?

1010 /phonemes/udon Phonemes - Prefixes & Suffixes

11+ /sigil/udon What is a Sigil?

1112 /azimuth/udon What is Azimuth?

1213 /l2/udon Layer 1 and Layer 2

1314 /keys/udon Networking Keys

15+ /astrolabe/udon About Astrolabe

desk/doc/overview.udon+5−3

@@ -1,9 +1,11 @@

11;>

22# Astrolabe

33

4−Currently Astrolabe lets you type in `@p`s or Azimuth point numbers

5−to look up ships on the network. There's also Help Documentation if

6−you want to learn more about how Urbit IDs work.

4+Currently Astrolabe lets you input `@p`s, Azimuth point numbers, or sigils

5+to look up ships on the network. Use the Star Chart to explore visually.

6+There's also Help Documentation if you want to learn more about how Urbit IDs work.

7+

8+[How to Use Astrolabe](/~/scry/docs/usr/astrolabe/astrolabe.html)

79

810## Info

911

desk/doc/usr/astrolabe.udon+58−6

@@ -9,6 +9,16 @@ spawned ships with partial or wildcard searches, e.g. `sampel-***net`.

99There's also Help Documentation if

1010you want to learn more about how Urbit IDs work.

1111

12+## Keyboard Shortcuts

13+

14+- `/` - focus the search bar

15+- `escape` - leave text fields, close help pages, etc

16+- `?` - open the help docs

17+- `s` - switch to sigil search

18+- `p` - switch to patp search

19+- `backspace` or `x` - clear sigil input info

20+

21+

1222## How to Use Search

1323

1424When you type part of a `@p` into the search bar, all your contacts and peers will be

@@ -26,13 +36,54 @@ if you search for `***hec`, it will search for all stars under `~hec`,

2636and all planets that match `~***hec-******`, but planets matching `~******-***hec`

2737will be ignored to prevent the search from taking too long.

2838

29−## Upcoming Features

39+## Sigil Search

40+

41+Clicking the symbol at the right of the search bar opens the Sigil Input Tool.

42+Use the dropdown at the top to select Galaxy, Star, or Planet.

43+Click on a square to start selecting sigil components.

44+

45+Select component categories on the right, and then click the options on the sigil

46+to add them to your search.

47+

48+The ^ button goes up a level so you can select another category.

49+The X button will clear sigil components from the current symbol,

50+except the basic shape. If only the basic shape remains, the X button will clear that.

51+At the top level, the X button will clear all inputs.

52+

53+Your contacts will be searched for any input.

54+When the search has become specific enough,

55+all spawned ships with matching sigils will be shown.

56+If your input is unambiguous, the page for the matching ship will be shown,

57+whether the ship is spawned or not.

58+

59+NOTE: Some sigil inputs are considered ambiguous, even if they exactly match

60+a particular sigil, because further details could match a different sigil.

61+E.g. `~zod` is a circle, but a circle in the suffix position might be intended as a more general search.

62+A future version of Astrolabe will allow you to view the ship

63+whose sigil most closely matches your search, even if the search is ambiguous.

64+

65+Read more about Sigils [here](/~/scry/docs/usr/astrolabe/sigil.html).

66+

67+## The Star Chart

68+

69+Click and drag to move your view; use the mouse wheel to zoom in and out. Click on a dot

70+to see the full Ship View. Enter full `@p`s in the search bar to find a specific point.

71+

72+Please note that stars [locked in the Linear Release Contract](/~/scry/docs/usr/astrolabe/star.html)

73+are not shown in the Star Chart, as they are not yet a part of the network (though they've technically

74+been spawned).

75+

76+The Sponsors/Parents toggle lets you switch between two different views of the network.

77+The default Sponsors view shows each planet under its sponsoring star and each

78+star under its sponsoring galaxy. Planets and Stars without sponsors are not

79+present in this view.

80+The Parent view simply shows each point under the point that spawned it. All spawned points

81+are shown in this view, with the exception of locked stars.

82+In both views, all galaxies are shown for completeness.

3083

31−In addition to improving the search feature over time, Astrolabe will one day feature:

32−- a Star Chart, where you can visually see the layout of the network and explore freely.

33−- Sigil Search, with which you can select the shapes of a sigil and search for ships

34− that match.

35−- Integrations with Groups, `%pals`, `%gora`, and whatever else seems fun and/or useful.

84+The All/Peers/Pals selector lets you filter which points are easily visible in the graph.

85+If you select Peers, only those ships that your ship has talked to will be full-colored.

86+If you select Pals, only ships you've added in `%pals` will be full-colored.

3687

3788## Info

3889

@@ -40,6 +91,7 @@ In addition to improving the search feature over time, Astrolabe will one day fe

4091- License: MIT

4192- App link: [~dister-midlev-mindyr/astrolabe](web+urbitgraph://~dister-midlev-mindyr/astrolabe)

4293- Discussion Group: [~poster-hoster-midlev-mindyr/astrolabe](web+urbitgraph://group/~poster-hoster-midlev-mindyr/astrolabe)

94+- [%quorum](web+urbitgraph://~dister-dister-sidnym-ladrut/quorum) board: ~poster-hoster-midlev-mindyr/astrolabe

4395- Grant/Proposal: [https://urbit.org/grants/astrolabe](https://urbit.org/grants/astrolabe)

4496- Source repo: [https://github.com/johnhyde/astrolabe](https://github.com/johnhyde/astrolabe)

4597- Bug reports: [https://github.com/johnhyde/astrolabe/issues](https://github.com/johnhyde/astrolabe/issues)

desk/doc/usr/sigil-input.udonnew file+27

@@ -0,0 +1,27 @@

1+;>

2+# How to Search by Sigil

3+

4+Use the dropdown at the top to select Galaxy, Star, or Planet.

5+Click on an empty square to start selecting sigil components.

6+

7+Select component categories on the right, and then click the options on the sigil

8+to add them to your search.

9+

10+The ^ button goes up a level so you can select another category.

11+The X button will clear sigil components from the current symbol,

12+except the basic shape. If only the basic shape remains, the X button will clear that.

13+At the top level, the X button will clear all inputs.

14+

15+Your contacts will be searched for any input.

16+When the search has become specific enough,

17+all spawned ships with matching sigils will be shown.

18+If your input is unambiguous, the page for the matching ship will be shown,

19+whether the ship is spawned or not.

20+

21+_NOTE:_ Some sigil inputs are considered ambiguous, even if they exactly match

22+a particular sigil, because further details could match a different sigil.

23+E.g. `~zod` is a circle, but a circle in the suffix position might be intended as a more general search.

24+A future version of Astrolabe will allow you to view the ship

25+whose sigil most closely matches your search, even if the search is ambiguous.

26+

27+_See Also:_ [*What is a Sigil?*](/~/scry/docs/usr/astrolabe/sigil.html)

desk/doc/usr/sigil.udonnew file+22

@@ -0,0 +1,22 @@

1+;>

2+# What is a Sigil?

3+

4+It's a default profile picture, based on your [`@p`](/~/scry/docs/usr/astrolabe/patpee.html).

5+Each 3-letter syllable corresponds to a sigil shape, or "symbol".

6+Since planet `@p`s have 4 syllables, a planet sigil is a 2x2 grid of 4 symbols.

7+Star sigils have 2 symbols, and galaxies have just 1.

8+

9+![planet sigils](/apps/astrolabe/sigil-example.png)

10+

11+## Is there a pattern to the sigil shapes?

12+

13+Some syllables which sound similar have similar symbols,

14+but there's no real system to it. The sigil shapes were manually selected and assigned,

15+with a focus on visual design rather than algorithmic purity.

16+

17+## Where did they come from?

18+

19+Tlon saw that Urbit IDs need a visual representation,

20+so they designed a system for generating default avatars.

21+You can read about it in the blog post [_Creating Sigils_](https://urbit.org/blog/creating-sigils).

22+

desk/doc/usr/star.udon+7

@@ -12,3 +12,10 @@ Stars can also choose to de-sponsor planets which abuse the network.

1212

1313Stars are NFTs, but they can be exchanged 1:1 for WSTR at [star.market](https://star.market/),

1414and you can trade fractional amounts of WSTR for ETH [on Uniswap V3](https://info.uniswap.org/#/pools/0x7f4a0822a6e3c085df795a8d78acbcd36f210ebf).

15+

16+## Locked stars and the Linear Release Contract

17+

18+To prevent galaxies from spawning too many stars all at once, many galaxies' stars were locked

19+in an Ethereum contract, to be slowly released (at a linear rate) over time.

20+Stars which are locked in this way will show the contract address as their owner,

21+and any stars held by this contract are considered locked, even if they are ready to be released.

desk/lib/astrolabe.hoon+89−51

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

11/- sur=astrolabe

2−/+ azimuth

2+/+ azimuth, naive

33=< [sur .]

44=, sur

55|%

@@ -25,8 +25,19 @@

2525 ^- ?

2626 (rev-f lte a b)

2727::

28−+$ opoints (tree [@ @]) :: ordered points [ship ~]

2928++ ors ((on @q @) rpor)

29+++ or-meta ((on @p tape) por:naive)

30+++ bi-meta

31+ =| a=(map * (map))

32+ |@

33+ ++ put

34+ |* [b=* c=* d=*]

35+ %+ ~(put by a) b

36+ %+ put:or-meta

37+ (~(gut by a) b ~)

38+ [c d]

39+ --

40+::

3041+$ page-info [size=_100 page=_0]

3142++ fits-on-page

3243 |= [i=@ =page-info]

@@ -37,27 +48,59 @@

3748 =/ page-end (add page-start size)

3849 &((gte i page-start) (lth i page-end))

3950::

40−++ palor :: @p alphabetical order

41− ~/ %por

42− |= [a=@p b=@p]

43− ^- ?

44− ?: =(a b) &

45− =| i=@

46− |-

47− ?: =(i 2)

48− :: second two bytes

49− (lte a b)

50− :: first two bytes

51− =+ [c=(end 3 a) d=(end 3 b)]

52− ?: =(c d)

53− $(a (rsh 3 a), b (rsh 3 b), i +(i))

54− (lth c d)

55−::

5651++ is-npoint-locked

5752 |= p=npoint

5853 .= linear-star-release:contracts:azimuth

5954 address.owner.own.p

6055::

56+++ split

57+ |* [nedl=(list) hstk=(list)]

58+ |- ^- (list _hstk)

59+ =/ brk (find nedl hstk)

60+ ?~ brk ~[hstk]

61+ =/ next (add u.brk (lent nedl))

62+ :- (scag u.brk hstk)

63+ $(hstk (slag next hstk))

64+::

65+++ smel

66+ |%

67+ ++ ship

68+ |= =^ship

69+ ^- tape

70+ (slag 1 (scow %p ship))

71+ ++ dom

72+ |= =dominion:naive

73+ ?- dominion

74+ %l1 ""

75+ %l2 "t"

76+ %spawn "s"

77+ ==

78+ ++ spo

79+ |= [self=^ship has=? spo=^ship]

80+ ?. has "~"

81+ =/ parent (^sein:title self)

82+ ?: =(spo parent)

83+ ""

84+ :(weld ":" (ship spo) "!" (ship parent))

85+ ++ pmeta

86+ |= [self=^ship point=npoint]

87+ ^- tape

88+ =/ self-str (ship self)

89+ =/ extras (weld (dom dominion.point) (spo self sponsor.net.point))

90+ ?~ extras self-str

91+ :(weld self-str ":" extras)

92+ ++ spa

93+ |= children=(list tape)

94+ =/ chil-str=tape (zing children)

95+ :: =/ chil-str=tape (reel children |=([a=tape b=tape] (weld a b)))

96+ ?~ chil-str ";"

97+ :(weld "[" chil-str "]")

98+ ++ pdata

99+ |= [pmeta=tape children=(list tape)]

100+ ^- tape

101+ (weld pmeta (spa children))

102+ --

103+::

61104++ nu :: parse number as hex

62105 |= jon=json

63106 ?> ?=([%s *] jon)

@@ -143,39 +186,6 @@

143186 ~

144187 ?: =('.' i.b) $(b t.b)

145188 [i.b $(b t.b)]

146− ++ point-meta

147− |= m=^point-meta

148− ^- (list [@tas json])

149− =/ main-pairs=(list [@tas json])

150− :~

151− p+(ship ship.m)

152− :: spa-count+(numb spa-count.m)

153− :: [%d s+dom.m]

154− ==

155− =? main-pairs !=(dom.m %l1)

156− :_ main-pairs

157− d+s+dom.m

158− ?: =(has.spo.m %same) main-pairs

159− :_ main-pairs

160− :- %s

161− ?: =(has.spo.m %none) ~

162− (ship who.spo.m)

163− ::

164− ++ point-chart-data

165− |= d=^point-chart-data

166− ^- json

167− =/ point-meta-pairs (point-meta -.d)

168− %- pairs

169− ?~ spa.d point-meta-pairs

170− %+ snoc point-meta-pairs

171− c+(chart-data spa.d)

172− :: spa+a+~

173− ::

174− ++ chart-data

175− |= d=^chart-data

176− ^- json

177− :- %a

178− (turn d point-chart-data)

179189 --

180190::

181191++ dejs

@@ -193,4 +203,32 @@

193203 ^- $-(json [%share ship])

194204 (of share+(su ;~(pfix sig fed:ag)) ~)

195205 --

206+::

207+::

208+++ groups-link-thatch

209+'''

210+const buttonText = 'View in Astrolabe';

211+setInterval(() => {

212+ const footer = document.querySelectorAll('section > div > footer')?.[0];

213+ if (!footer) return;

214+ if (footer.children[0].innerText === buttonText) return;

215+ const spans = document.querySelectorAll('section > div > div > div > span > span:first-child');

216+ spans.forEach((span) => {

217+ if (span.innerHTML !== '~') return;

218+ if (footer.children[0].innerText === buttonText) return;

219+ let cspan = span.parentElement;

220+ let patp = cspan.innerText;

221+ let b = document.createElement('a');

222+ b.innerHTML = buttonText;

223+ b.className = 'button';

224+ // b.href = 'web+urbitgraph://astrolabe/ship/' + patp;

225+ b.href = '/apps/astrolabe/#/ship/' + patp;

226+ b.target = '_blank';

227+ b.style.backgroundColor = "navy";

228+ b.style.marginLeft = "1rem";

229+ b.style.color = "white";

230+ footer.prepend(b);

231+ });

232+}, 100);

233+'''

196234--

desk/lib/search.hoon+47−5

@@ -12,7 +12,7 @@

1212++ prefixes ^~ (trip-syls sis:po)

1313++ suffixes ^~ (trip-syls dex:po)

1414++ full-opts ^~ (gulf .~zod .~fes)

15−++ galaxies ^~ `(list @p)``(list @)`full-opts

15+++ galaxies ^~ `(list @p)`full-opts

1616++ sanitize-search-text

1717 |= =search-text

1818 ^- tape

@@ -129,6 +129,25 @@

129129 ?: =(~[~ ~ ~ ~] search-opts.full)

130130 ~

131131 (some full)

132+::

133+++ sigil-search-text-to-full

134+ |= text=tape

135+ ^- search-full

136+ :- ~

137+ ^- search-opts

138+ %- flop

139+ %+ turn

140+ (split "_" text)

141+ |= ints-tape=tape

142+ ^- search-syl-opts

143+ ?: =(ints-tape "any")

144+ full-opts

145+ %+ turn

146+ (split "." ints-tape)

147+ |= =tape

148+ :: ~& tape

149+ `@q`(slav %ud (crip tape))

150+::

132151++ reverse-list :: that is, put first 2 in back "abcd" -> "cdab"

133152 |* lst=(list)

134153 ^- _lst

@@ -221,7 +240,10 @@

221240 |= [=syl cand=@]

222241 :: todo check cand < 256

223242 (tape-matches tape.syl (trip (tosd cand pfsf.syl)))

224−++ matches-search

243+++ syl-opts-match

244+ |= [opts=search-syl-opts cand=@]

245+ !=(~ (find ~[cand] opts))

246+++ matches-search-syls

225247 |= [search=search-syls cand-atom=@]

226248 =/ cand (rip 3 cand-atom)

227249 |-

@@ -240,6 +262,28 @@

240262 $(search t.search, cand t.cand)

241263 ==

242264::

265+++ matches-search-opts

266+ |= [search=search-opts cand-atom=@]

267+ =/ cand (rip 3 cand-atom)

268+ |-

269+ ^- ?

270+ ?~ search =(cand ~)

271+ ?~ cand

272+ ?& (syl-opts-match i.search 0)

273+ $(search t.search)

274+ ==

275+ :: =/ nncand ^- (lest @)

276+ :: ?~ cand ~[0] cand

277+ ?& (syl-opts-match i.search i.cand)

278+ $(search t.search, cand t.cand)

279+ ==

280+::

281+++ matches-search

282+ |= [search=search-full cand-atom=@]

283+ ?~ search-syls.search

284+ (matches-search-opts search-opts.search cand-atom)

285+ (matches-search-syls search-syls.search cand-atom)

286+::

243287++ opts-in-range

244288 |= [lb=@ rb=@ opts=(list @)]

245289 ^- search-syl-opts

@@ -282,8 +326,6 @@

282326 |* [agg=mold search=search-full points=opoints =page-info]

283327 |= [res=[count=@ =agg] f=$-([agg @q] agg)]

284328 ^- [count=@ =agg]

285− =/ s-syls search-syls.search

286− :: ~& s-syls

287329 =/ s-opts search-opts.search

288330 =+ [llb=.~zod rrb=`@q`(sub (bex 32) 1)]

289331 :: =< +

@@ -302,7 +344,7 @@

302344 =/ right-view (range-contains-search rlb rrb s-opts)

303345 =? res contains.left-view

304346 $(points l.points, rrb lrb, s-opts opts.left-view)

305− =? res (matches-search s-syls n)

347+ =? res (matches-search search n)

306348 =/ fits (fits-on-page count.res page-info)

307349 =. count.res +(count.res)

308350 =? agg.res fits (f agg.res n)

desk/lib/state.hoonnew file+21

@@ -0,0 +1,21 @@

1+/- *astrolabe

2+/+ *astrolabe

3+|%

4+++ put-in-spawn-mip

5+ |= [child=ship =npoint s=state-latest]

6+ ^- _s

7+ =/ parent (^sein:title child)

8+ ?: =(parent child) s

9+ ?: (is-npoint-locked npoint) s

10+ =/ pdata (pdata:smel (pmeta:smel child npoint) ~)

11+ =. spam.s (~(put bi spam.s) parent child pdata)

12+ =* spo sponsor.net.npoint

13+ =/ prev (~(gut by prev-spo.s) child parent)

14+ =. prev-spo.s (~(del by prev-spo.s) child)

15+ =? spam.s !=(parent prev)

16+ (~(del bi spam.s) prev child)

17+ ?. has.spo s

18+ =. prev-spo.s (~(put by prev-spo.s) child who.spo)

19+ =. spam.s (~(put bi spam.s) who.spo child pdata)

20+ s

21+--

desk/mar/astrolabe/chart-data.hoondeleted−14

@@ -1,14 +0,0 @@

1−/+ *astrolabe

2−|_ data=chart-data

3−++ grab

4− |%

5− ++ noun chart-data

6− :: ++ json point:dejs

7− --

8−++ grow

9− |%

10− ++ noun data

11− ++ json (chart-data:enjs data)

12− --

13−++ grad %noun

14−--

desk/mar/ico.hoonnew file+12

@@ -0,0 +1,12 @@

1+|_ dat=@

2+++ grow

3+ |%

4+ ++ mime [/image/x-icon (as-octs:mimes:html dat)]

5+ --

6+++ grab

7+ |%

8+ ++ mime |=([p=mite q=octs] q.q)

9+ ++ noun @

10+ --

11+++ grad %mime

12+--

desk/mar/seal.hoonnew file+12

@@ -0,0 +1,12 @@

1+|_ dat=@

2+++ grow

3+ |%

4+ ++ mime [/text (as-octs:mimes:html dat)]

5+ --

6+++ grab

7+ |%

8+ ++ mime |=([p=mite q=octs] q.q)

9+ ++ noun @

10+ --

11+++ grad %mime

12+--

desk/mar/webmanifest.hoonnew file+12

@@ -0,0 +1,12 @@

1+|_ dat=@

2+++ grow

3+ |%

4+ ++ mime [/application/'manifest+json' (as-octs:mimes:html dat)]

5+ --

6+++ grab

7+ |%

8+ ++ mime |=([p=mite q=octs] q.q)

9+ ++ noun @

10+ --

11+++ grad %mime

12+--

desk/sur/astrolabe.hoon+45−21

@@ -1,5 +1,48 @@

1−/+ naive

1+/+ naive, *mip

22|%

3++$ versioned-state

4+ $% state-0

5+ state-1

6+ state-2

7+ state-3

8+ state-4

9+ ==

10++$ state-latest state-4

11++$ state-0

12+ $: %0

13+ spa=spawned

14+ ==

15++$ state-1

16+ $: %1

17+ fropoints-1

18+ ==

19++$ state-2

20+ $: %2

21+ spam=spawn-mip

22+ fropoints-1

23+ ==

24++$ state-3

25+ $: %3

26+ prev-spo=(map ship ship) :: so we know who the old sponsor was when sponsor changes

27+ spam=spawn-mip

28+ fropoints-1

29+ ==

30++$ state-4

31+ $: %4

32+ bump=_1 :: bump to update state without changing the type

33+ prev-spo=(map ship ship) :: so we know who the old sponsor was when sponsor changes

34+ spam=spawn-mip

35+ fropoints-1

36+ ==

37+::

38++$ fropoints-1

39+ $: fopoints=opoints :: forward ordered points

40+ ropoints=opoints :: reversed ordered points, e.g. .~palnet-sampel

41+ ==

42++$ spawned (jug ship ship)

43++$ spawn-mip (mip ship ship tape)

44++$ opoints (tree [@ @]) :: ordered points [ship ~]

45+::

346+$ npoint point:naive

447++ unpoint (unit npoint)

548+$ point

@@ -11,24 +54,5 @@

1154 ==

1255+$ spawned-filter ?(%all %locked %unlocked)

1356::

14−+$ point-meta

15− $: =ship

16− :: spa-count=@ud

17− dom=dominion:naive

18− spo=[has=?(%none %same %diff) who=ship]

19− :: moons=(list ship)

20− ==

21−:: +$ point-chart-data

22−:: $% [%czar point-meta spa=chart-data]

23−:: [%king point-meta spa=chart-data]

24−:: [%duke point-meta]

25−:: ==

26−+$ point-chart-data [point-meta spa=chart-data]

27−:: +$ star-chart-data [self=point planets=(list point)]

28−:: +$ galaxy-chart-data stars=(list star-chart-data)

29−++ chart-data

30− |-

31− $@ ~

32− (list [point-meta spa=$])

33−

57+::

3458--

desk/sys.kelvin+1−1

@@ -1 +1 @@

1−[%zuse 418]

1+[%zuse 408]

desk/tests/lib/state.hoonnew file+59

@@ -0,0 +1,59 @@

1+/- *astrolabe

2+/+ *astrolabe, *state, *mip, *test

3+|%

4+++ test-put-in-spawn-mip

5+ =| state=state-latest

6+ =/ moved-to-bus=npoint

7+ =< .(who.sponsor.net ~bus)

8+ *npoint

9+ =/ moved-to-hec=npoint

10+ =< .(who.sponsor.net ~hec)

11+ *npoint

12+ ;: weld

13+ %+ expect-eq

14+ !> :-

15+ `~zod :: new prev-spo

16+ "marzod:s;" :: spawn-mip has something under ~zod

17+ !> =- :-

18+ (~(get by prev-spo) ~marzod)

19+ (~(gut bi spam) ~zod ~marzod "nothing!")

20+ (put-in-spawn-mip ~marzod *npoint state)

21+ ::

22+ %+ expect-eq

23+ !> :*

24+ `~hec :: new prev-spo

25+ "marzod:s:hec!zod;" :: under ~zod

26+ %.n :: nothing under ~bus

27+ "marzod:s:hec!zod;" :: under ~hec

28+ ==

29+ !>

30+ =. state (put-in-spawn-mip ~marzod *npoint state)

31+ =. state (put-in-spawn-mip ~marzod moved-to-bus state)

32+ =+ (put-in-spawn-mip ~marzod moved-to-hec state)

33+ :*

34+ (~(get by prev-spo) ~marzod)

35+ (~(gut bi spam) ~zod ~marzod "nothing!")

36+ (~(has by spam) ~bus)

37+ (~(gut bi spam) ~hec ~marzod "nothing!")

38+ ==

39+ ::

40+ %+ expect-eq

41+ !> :*

42+ `~zod :: new prev-spo

43+ "marzod:s;" :: under ~zod

44+ %.n :: nothing under ~bus

45+ %.n :: nothing under ~hec

46+ ==

47+ !>

48+ =. state (put-in-spawn-mip ~marzod *npoint state)

49+ =. state (put-in-spawn-mip ~marzod moved-to-bus state)

50+ =. state (put-in-spawn-mip ~marzod moved-to-hec state)

51+ =+ (put-in-spawn-mip ~marzod *npoint state)

52+ :*

53+ (~(get by prev-spo) ~marzod)

54+ (~(gut bi spam) ~zod ~marzod "nothing!")

55+ (~(has by spam) ~bus)

56+ (~(has by spam) ~hec)

57+ ==

58+ ==

59+--

flake.locknew file+27

@@ -0,0 +1,27 @@

1+{

2+ "nodes": {

3+ "nixpkgs": {

4+ "locked": {

5+ "lastModified": 1793341285,

6+ "narHash": "sha256-Y1CiZ4SoBUjLQyQM/pY+rS2dXD3CHLPstF0lmOc73D4=",

7+ "owner": "NixOS",

8+ "repo": "nixpkgs",

9+ "rev": "1c89083e451e891152365b799595cf7790a43325",

10+ "type": "github"

11+ },

12+ "original": {

13+ "owner": "NixOS",

14+ "ref": "nixos-unstable",

15+ "repo": "nixpkgs",

16+ "type": "github"

17+ }

18+ },

19+ "root": {

20+ "inputs": {

21+ "nixpkgs": "nixpkgs"

22+ }

23+ }

24+ },

25+ "root": "root",

26+ "version": 7

27+}

flake.nixnew file+73

@@ -0,0 +1,73 @@

1+{

2+ description = "Astrolabe Urbit desk";

3+

4+ inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";

5+

6+ outputs = { self, nixpkgs }:

7+ let

8+ systems = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ];

9+ forAllSystems = nixpkgs.lib.genAttrs systems;

10+ in

11+ {

12+ packages = forAllSystems (system:

13+ let

14+ pkgs = import nixpkgs { inherit system; };

15+ nounPy = pkgs.fetchurl {

16+ name = "noun.py";

17+ url = "https://raw.githubusercontent.com/urbit/tools/f9cda82a7699cad0c1c0f8c031a59e93f028e548/pkg/pynoun/noun.py";

18+ hash = "sha256-vSKQ/UuSmGTANfW5c3I9lQcUFycvqmu5gqysFuP5SAA=";

19+ };

20+ ui = pkgs.buildNpmPackage {

21+ pname = "astrolabe-ui";

22+ version = "0.3.0";

23+ src = ./ui;

24+ nodejs = pkgs.nodejs_22;

25+ npmDepsHash = "sha256-jCkfgNgBmq0mKjmXBbPwdpzBR/E09OgS9XD6O9hRHfw=";

26+ makeCacheWritable = true;

27+ npmFlags = [ "--legacy-peer-deps" ];

28+ npmBuildScript = "build";

29+

30+ installPhase = ''

31+ runHook preInstall

32+ cp -r dist $out

33+ runHook postInstall

34+ '';

35+ };

36+ in

37+ rec {

38+ inherit ui;

39+ desk = pkgs.stdenvNoCC.mkDerivation {

40+ pname = "astrolabe-desk";

41+ version = "1.0.7";

42+ dontUnpack = true;

43+ nativeBuildInputs = [ pkgs.rsync ];

44+

45+ installPhase = ''

46+ runHook preInstall

47+ mkdir -p $out

48+ rsync -r --copy-links --exclude-from=${./config/ignore_files_on_install.txt} ${./base-desk}/ $out/

49+ rsync -r --copy-links --exclude-from=${./config/ignore_files_on_install.txt} ${./docs-dev-desk}/ $out/

50+ rsync -r --copy-links --exclude-from=${./config/ignore_files_on_install.txt} ${./desk}/ $out/

51+ runHook postInstall

52+ '';

53+ };

54+ glob = pkgs.stdenvNoCC.mkDerivation {

55+ pname = "astrolabe-glob";

56+ version = "0.3.0";

57+ dontUnpack = true;

58+ nativeBuildInputs = [

59+ (pkgs.python3.withPackages (ps: [ ps.mmh3 ps.bitstring ]))

60+ ];

61+

62+ installPhase = ''

63+ runHook preInstall

64+ mkdir -p $TMPDIR/pynoun

65+ ln -s ${nounPy} $TMPDIR/pynoun/noun.py

66+ PYTHONPATH=$TMPDIR/pynoun python ${./bin/make_glob.py} ${ui} $out

67+ runHook postInstall

68+ '';

69+ };

70+ default = desk;

71+ });

72+ };

73+}

install.shdeleted−44

@@ -1,44 +0,0 @@

1−#!/bin/bash

2−#

3−# Taken from: https://github.com/timlucmiptev/btc-agents/blob/master/install.sh

4−# by ~timluc-miptev

5−#

6−usage() { printf "Usage: $0 [-w] URBIT_DESK_DIRECTORY \n(-w: flag to watch and live copy code)\n" 1>&2; exit 1; }

7−

8−if [ $# -eq 0 ]; then

9− usage

10− exit 2

11−fi

12−DESK=$1

13−EXCLUDE_FILE=config/ignore_files_on_install.txt

14−

15−while getopts "w" opt; do

16− case ${opt} in

17− w) WATCH_MODE="true"

18− DESK=$2

19− ;;

20− *) usage

21− ;;

22− esac

23−done

24−

25−if [ -z "$WATCH_MODE" ]; then

26− echo "Installed %astrolabe"

27− rm -r $DESK/*

28− rsync -r --copy-links --exclude-from=$EXCLUDE_FILE ./base-desk/* $DESK/

29− rsync -r --copy-links --exclude-from=$EXCLUDE_FILE ./docs-dev-desk/* $DESK/

30− rsync -r --copy-links --exclude-from=$EXCLUDE_FILE ./desk/* $DESK/

31−

32−else

33− echo "Watching for changes to copy to ${DESK}..."

34− rm -r $DESK/*

35− while [ 0 ]

36− do

37− sleep 0.8

38− rsync -r --copy-links --exclude-from=$EXCLUDE_FILE ./base-desk/* $DESK/

39− rsync -r --copy-links --exclude-from=$EXCLUDE_FILE ./docs-dev-desk/* $DESK/

40− rsync -r --copy-links --exclude-from=$EXCLUDE_FILE ./desk/* $DESK/

41−

42− done

43−fi

44−ls

ui/.envnew file+3

@@ -0,0 +1,3 @@

1+VITE_SHIP_URL=http://localhost:8081

2+ASTROLABE_DESK=~/urbit/zod/astrolabe

3+GLOBBER_DESK=~/urbit/zod/globber

ui/index.html+1

@@ -8,6 +8,7 @@

88 <link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png">

99 <link rel="manifest" href="/site.webmanifest">

1010 <meta name="viewport" content="width=device-width, initial-scale=1.0" />

11+ <meta name="color-scheme" content="light only">

1112 </head>

1213 <body>

1314 <div id="app" class="h-full"></div>

ui/package-lock.json+191−42

@@ -1,13 +1,14 @@

11{

22 "name": "urbit-astrolabe",

3− "version": "0.0.0",

3+ "version": "0.3.0",

44 "lockfileVersion": 2,

55 "requires": true,

66 "packages": {

77 "": {

88 "name": "urbit-astrolabe",

9− "version": "0.0.0",

9+ "version": "0.3.0",

1010 "dependencies": {

11+ "@johnhyde/sigil-js": "github:johnhyde/sigil-js",

1112 "@tlon/phonemes-js": "^1.0.0",

1213 "@tlon/sigil-js": "^1.4.5",

1314 "@urbit/api": "^2.1.0",

@@ -15,8 +16,9 @@

1516 "bn.js": "^5.2.0",

1617 "graphology": "^0.24.1",

1718 "lodash": "^4.17.21",

18− "sigma": "^2.3.1",

19+ "sigma-jh": "^2.4.2",

1920 "svelte-copy-to-clipboard": "^0.2.5",

21+ "svelte-markdown": "^0.2.3",

2022 "tippy.js": "^6.3.7",

2123 "urbit-ob": "^5.0.1"

2224 },

@@ -27,6 +29,7 @@

2729 "autoprefixer": "^10.4.2",

2830 "concurrently": "^7.0.0",

2931 "cross-env": "^7.0.3",

32+ "dotenv-cli": "^6.0.0",

3033 "postcss-cli": "^9.1.0",

3134 "sass": "^1.50.0",

3235 "svelte": "^3.48.0",

@@ -39,6 +42,28 @@

3942 "vite": "^2.7.2"

4043 }

4144 },

45+ "../../sigil-js": {

46+ "name": "@johnhyde/sigil-js",

47+ "version": "1.4.6",

48+ "extraneous": true,

49+ "license": "MIT",

50+ "dependencies": {

51+ "invariant": "^2.2.4",

52+ "svgson": "^4.0.0",

53+ "transformation-matrix": "2.1.1"

54+ },

55+ "devDependencies": {

56+ "@types/invariant": "^2.2.31",

57+ "@types/react": "^17.0.20",

58+ "husky": "^4.2.3",

59+ "prettier": "^1.19.1",

60+ "tsdx": "^0.14.1",

61+ "typescript": "^3.8.3"

62+ },

63+ "peerDependencies": {

64+ "react": "^16 || ^17"

65+ }

66+ },

4267 "node_modules/@babel/code-frame": {

4368 "version": "7.16.7",

4469 "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.16.7.tgz",

@@ -147,6 +172,19 @@

147172 "node": ">=6.9.0"

148173 }

149174 },

175+ "node_modules/@johnhyde/sigil-js": {

176+ "version": "1.4.6",

177+ "resolved": "git+ssh://git@github.com/johnhyde/sigil-js.git#f89ce78c34b5811ea19ddea4a6964ea8360e7b4d",

178+ "license": "MIT",

179+ "dependencies": {

180+ "invariant": "^2.2.4",

181+ "svgson": "^4.0.0",

182+ "transformation-matrix": "2.1.1"

183+ },

184+ "peerDependencies": {

185+ "react": "^16 || ^17"

186+ }

187+ },

150188 "node_modules/@microsoft/fetch-event-source": {

151189 "version": "2.0.1",

152190 "resolved": "https://registry.npmjs.org/@microsoft/fetch-event-source/-/fetch-event-source-2.0.1.tgz",

@@ -260,6 +298,11 @@

260298 "integrity": "sha512-aqkICXbM1oX5FfgZd2qSSAGdyo/NRxjWCamxoyi3T8iVQnzGge19HhDYzZ6NrVOW7bhcWNSq9XexWFtMzbB24A==",

261299 "dev": true

262300 },

301+ "node_modules/@types/marked": {

302+ "version": "4.0.7",

303+ "resolved": "https://registry.npmjs.org/@types/marked/-/marked-4.0.7.tgz",

304+ "integrity": "sha512-eEAhnz21CwvKVW+YvRvcTuFKNU9CV1qH+opcgVK3pIMI6YZzDm6gc8o2vHjldFk6MGKt5pueSB7IOpvpx5Qekw=="

305+ },

263306 "node_modules/@types/node": {

264307 "version": "17.0.8",

265308 "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.8.tgz",

@@ -775,7 +818,7 @@

775818 "node_modules/deep-rename-keys": {

776819 "version": "0.2.1",

777820 "resolved": "https://registry.npmjs.org/deep-rename-keys/-/deep-rename-keys-0.2.1.tgz",

778− "integrity": "sha1-7eeFN9emaivmFRfir5Vtf1ij8dg=",

821+ "integrity": "sha512-RHd9ABw4Fvk+gYDWqwOftG849x0bYOySl/RgX0tLI9i27ZIeSO91mLZJEp7oPHOMFqHvpgu21YptmDt0FYD/0A==",

779822 "dependencies": {

780823 "kind-of": "^3.0.2",

781824 "rename-keys": "^1.1.2"

@@ -849,6 +892,39 @@

849892 "integrity": "sha512-+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA==",

850893 "dev": true

851894 },

895+ "node_modules/dotenv": {

896+ "version": "16.0.1",

897+ "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.0.1.tgz",

898+ "integrity": "sha512-1K6hR6wtk2FviQ4kEiSjFiH5rpzEVi8WW0x96aztHVMhEspNpc4DVOUTEHtEva5VThQ8IaBX1Pe4gSzpVVUsKQ==",

899+ "dev": true,

900+ "engines": {

901+ "node": ">=12"

902+ }

903+ },

904+ "node_modules/dotenv-cli": {

905+ "version": "6.0.0",

906+ "resolved": "https://registry.npmjs.org/dotenv-cli/-/dotenv-cli-6.0.0.tgz",

907+ "integrity": "sha512-qXlCOi3UMDhCWFKe0yq5sg3X+pJAz+RQDiFN38AMSbUrnY3uZshSfDJUAge951OS7J9gwLZGfsBlWRSOYz/TRg==",

908+ "dev": true,

909+ "dependencies": {

910+ "cross-spawn": "^7.0.3",

911+ "dotenv": "^16.0.0",

912+ "dotenv-expand": "^8.0.1",

913+ "minimist": "^1.2.5"

914+ },

915+ "bin": {

916+ "dotenv": "cli.js"

917+ }

918+ },

919+ "node_modules/dotenv-expand": {

920+ "version": "8.0.3",

921+ "resolved": "https://registry.npmjs.org/dotenv-expand/-/dotenv-expand-8.0.3.tgz",

922+ "integrity": "sha512-SErOMvge0ZUyWd5B0NXMQlDkN+8r+HhVUsxgOO7IoPDOdDRD2JjExpN6y3KnFR66jsJMwSn1pqIivhU5rcJiNg==",

923+ "dev": true,

924+ "engines": {

925+ "node": ">=12"

926+ }

927+ },

852928 "node_modules/electron-to-chromium": {

853929 "version": "1.4.38",

854930 "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.38.tgz",

@@ -1153,7 +1229,7 @@

11531229 "node_modules/eventemitter3": {

11541230 "version": "2.0.3",

11551231 "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-2.0.3.tgz",

1156− "integrity": "sha1-teEHm1n7XhuidxwKmTvgYKWMmbo="

1232+ "integrity": "sha512-jLN68Dx5kyFHaePoXWPsCGW5qdyZQtLYHkxkg02/Mz6g0kYpDx4FyP6XfArhQdlOC4b8Mv+EMxPo/8La7Tzghg=="

11571233 },

11581234 "node_modules/events": {

11591235 "version": "3.3.0",

@@ -1277,7 +1353,7 @@

12771353 "node_modules/get-value": {

12781354 "version": "2.0.6",

12791355 "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz",

1280− "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=",

1356+ "integrity": "sha512-Ln0UQDlxH1BapMu3GPtf7CuYNwRZf2gwCuPqbyG6pB8WfmFpzqcy4xtAaAMUhnNqjMKTiCPZG2oMT3YSx8U2NA==",

12811357 "engines": {

12821358 "node": ">=0.10.0"

12831359 }

@@ -1390,7 +1466,7 @@

13901466 "node_modules/has-value": {

13911467 "version": "0.3.1",

13921468 "resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz",

1393− "integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=",

1469+ "integrity": "sha512-gpG936j8/MzaeID5Yif+577c17TxaDmhuyVgSwtnL/q8UUTySg8Mecb+8Cf1otgLoD7DDH75axp86ER7LFsf3Q==",

13941470 "dependencies": {

13951471 "get-value": "^2.0.3",

13961472 "has-values": "^0.1.4",

@@ -1403,7 +1479,7 @@

14031479 "node_modules/has-value/node_modules/isobject": {

14041480 "version": "2.1.0",

14051481 "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",

1406− "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=",

1482+ "integrity": "sha512-+OUdGJlgjOBZDfxnDjYYG6zp487z0JGNQq3cYQYg5f5hKR+syHMsaztzGeml/4kGG55CSpKSpWTY+jYGgsHLgA==",

14071483 "dependencies": {

14081484 "isarray": "1.0.0"

14091485 },

@@ -1414,7 +1490,7 @@

14141490 "node_modules/has-values": {

14151491 "version": "0.1.4",

14161492 "resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz",

1417− "integrity": "sha1-bWHeldkd/Km5oCCJrThL/49it3E=",

1493+ "integrity": "sha512-J8S0cEdWuQbqD9//tlZxiMuMNmxB8PlEwvYwuxsTmR1G5RXUePEX/SJn7aD0GMLieuZYSwNH0cQuJGwnYunXRQ==",

14181494 "engines": {

14191495 "node": ">=0.10.0"

14201496 }

@@ -1571,7 +1647,7 @@

15711647 "node_modules/isarray": {

15721648 "version": "1.0.0",

15731649 "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",

1574− "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="

1650+ "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ=="

15751651 },

15761652 "node_modules/isexe": {

15771653 "version": "2.0.0",

@@ -1582,7 +1658,7 @@

15821658 "node_modules/isobject": {

15831659 "version": "3.0.1",

15841660 "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",

1585− "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",

1661+ "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",

15861662 "engines": {

15871663 "node": ">=0.10.0"

15881664 }

@@ -1613,7 +1689,7 @@

16131689 "node_modules/kind-of": {

16141690 "version": "3.2.2",

16151691 "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",

1616− "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",

1692+ "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",

16171693 "dependencies": {

16181694 "is-buffer": "^1.1.5"

16191695 },

@@ -1680,6 +1756,17 @@

16801756 "sourcemap-codec": "^1.4.4"

16811757 }

16821758 },

1759+ "node_modules/marked": {

1760+ "version": "4.2.3",

1761+ "resolved": "https://registry.npmjs.org/marked/-/marked-4.2.3.tgz",

1762+ "integrity": "sha512-slWRdJkbTZ+PjkyJnE30Uid64eHwbwa1Q25INCAYfZlK4o6ylagBy/Le9eWntqJFoFT93ikUKMv47GZ4gTwHkw==",

1763+ "bin": {

1764+ "marked": "bin/marked.js"

1765+ },

1766+ "engines": {

1767+ "node": ">= 12"

1768+ }

1769+ },

16831770 "node_modules/merge2": {

16841771 "version": "1.4.1",

16851772 "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",

@@ -1795,7 +1882,7 @@

17951882 "node_modules/object-assign": {

17961883 "version": "4.1.1",

17971884 "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",

1798− "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",

1885+ "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==",

17991886 "peer": true,

18001887 "engines": {

18011888 "node": ">=0.10.0"

@@ -1818,7 +1905,7 @@

18181905 "node_modules/omit-deep": {

18191906 "version": "0.3.0",

18201907 "resolved": "https://registry.npmjs.org/omit-deep/-/omit-deep-0.3.0.tgz",

1821− "integrity": "sha1-IcivNJm8rdKWUaIyy8rLxSRF6+w=",

1908+ "integrity": "sha512-Lbl/Ma59sss2b15DpnWnGmECBRL8cRl/PjPbPMVW+Y8zIQzRrwMaI65Oy6HvxyhYeILVKBJb2LWeG81bj5zbMg==",

18221909 "dependencies": {

18231910 "is-plain-object": "^2.0.1",

18241911 "unset-value": "^0.1.1"

@@ -2380,10 +2467,10 @@

23802467 "node": ">=8"

23812468 }

23822469 },

2383− "node_modules/sigma": {

2384− "version": "2.3.1",

2385− "resolved": "https://registry.npmjs.org/sigma/-/sigma-2.3.1.tgz",

2386− "integrity": "sha512-YfQsVZf78CeIUv8EYLqp/yvhMwwBXGrbpy+rD1N2X9IqtJ11+VfQRjWfVqHDhjM8oPfWPsaJMtpWFQ8pIflvCA==",

2470+ "node_modules/sigma-jh": {

2471+ "version": "2.4.2",

2472+ "resolved": "https://registry.npmjs.org/sigma-jh/-/sigma-jh-2.4.2.tgz",

2473+ "integrity": "sha512-viB4M5Y79N5rAgs0z3M4Gff4HX53S+UMwblPDEH/Nkwwe7AcmcWwsEYsGv/xL/TNQzLIBBb0NaNAg5ZhnbEm8g==",

23872474 "dependencies": {

23882475 "@yomguithereal/helpers": "^1.1.1",

23892476 "events": "^3.3.0",

@@ -2513,7 +2600,6 @@

25132600 "version": "3.48.0",

25142601 "resolved": "https://registry.npmjs.org/svelte/-/svelte-3.48.0.tgz",

25152602 "integrity": "sha512-fN2YRm/bGumvjUpu6yI3BpvZnpIm9I6A7HR4oUNYd7ggYyIwSA/BX7DJ+UXXffLp6XNcUijyLvttbPVCYa/3xQ==",

2516− "dev": true,

25172603 "engines": {

25182604 "node": ">= 8"

25192605 }

@@ -2555,6 +2641,18 @@

25552641 "svelte": ">=3.19.0"

25562642 }

25572643 },

2644+ "node_modules/svelte-markdown": {

2645+ "version": "0.2.3",

2646+ "resolved": "https://registry.npmjs.org/svelte-markdown/-/svelte-markdown-0.2.3.tgz",

2647+ "integrity": "sha512-2h680NzTXnAD0CXhxe3GeHl6W+ayG4iKQRl+BIDRw+R0mUE0OiNxP1Vt8Rn+aWevB/LBiBIPCAwvL+0BkG057A==",

2648+ "dependencies": {

2649+ "@types/marked": "^4.0.1",

2650+ "marked": "^4.0.10"

2651+ },

2652+ "peerDependencies": {

2653+ "svelte": "^3.0.0"

2654+ }

2655+ },

25582656 "node_modules/svelte-preprocess": {

25592657 "version": "4.10.1",

25602658 "resolved": "https://registry.npmjs.org/svelte-preprocess/-/svelte-preprocess-4.10.1.tgz",

@@ -2765,7 +2863,7 @@

27652863 "node_modules/unset-value": {

27662864 "version": "0.1.2",

27672865 "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-0.1.2.tgz",

2768− "integrity": "sha1-UGgQuGfyfCpabpsEgzYx9t5Y0xA=",

2866+ "integrity": "sha512-yhv5I4TsldLdE3UcVQn0hD2T5sNCPv4+qm/CTUpRKIpwthYRIipsAPdsrNpOI79hPQa0rTTeW22Fq6JWRcTgNg==",

27692867 "dependencies": {

27702868 "has-value": "^0.3.1",

27712869 "isobject": "^3.0.0"

@@ -2900,7 +2998,7 @@

29002998 "node_modules/xml-lexer": {

29012999 "version": "0.2.2",

29023000 "resolved": "https://registry.npmjs.org/xml-lexer/-/xml-lexer-0.2.2.tgz",

2903− "integrity": "sha1-UYGTpKozTVj8fSSLVJB5uJkH4EY=",

3001+ "integrity": "sha512-G0i98epIwiUEiKmMcavmVdhtymW+pCAohMRgybyIME9ygfVu8QheIi+YoQh3ngiThsT0SQzJT4R0sKDEv8Ou0w==",

29043002 "dependencies": {

29053003 "eventemitter3": "^2.0.0"

29063004 }

@@ -2908,7 +3006,7 @@

29083006 "node_modules/xml-reader": {

29093007 "version": "2.4.3",

29103008 "resolved": "https://registry.npmjs.org/xml-reader/-/xml-reader-2.4.3.tgz",

2911− "integrity": "sha1-n4EMr3xCWlqvuEixxFEDyecddTA=",

3009+ "integrity": "sha512-xWldrIxjeAMAu6+HSf9t50ot1uL5M+BtOidRCWHXIeewvSeIpscWCsp4Zxjk8kHHhdqFBrfK8U0EJeCcnyQ/gA==",

29123010 "dependencies": {

29133011 "eventemitter3": "^2.0.0",

29143012 "xml-lexer": "^0.2.2"

@@ -3056,6 +3154,15 @@

30563154 "regenerator-runtime": "^0.13.4"

30573155 }

30583156 },

3157+ "@johnhyde/sigil-js": {

3158+ "version": "git+ssh://git@github.com/johnhyde/sigil-js.git#f89ce78c34b5811ea19ddea4a6964ea8360e7b4d",

3159+ "from": "@johnhyde/sigil-js@github:johnhyde/sigil-js",

3160+ "requires": {

3161+ "invariant": "^2.2.4",

3162+ "svgson": "^4.0.0",

3163+ "transformation-matrix": "2.1.1"

3164+ }

3165+ },

30593166 "@microsoft/fetch-event-source": {

30603167 "version": "2.0.1",

30613168 "resolved": "https://registry.npmjs.org/@microsoft/fetch-event-source/-/fetch-event-source-2.0.1.tgz",

@@ -3137,6 +3244,11 @@

31373244 "integrity": "sha512-aqkICXbM1oX5FfgZd2qSSAGdyo/NRxjWCamxoyi3T8iVQnzGge19HhDYzZ6NrVOW7bhcWNSq9XexWFtMzbB24A==",

31383245 "dev": true

31393246 },

3247+ "@types/marked": {

3248+ "version": "4.0.7",

3249+ "resolved": "https://registry.npmjs.org/@types/marked/-/marked-4.0.7.tgz",

3250+ "integrity": "sha512-eEAhnz21CwvKVW+YvRvcTuFKNU9CV1qH+opcgVK3pIMI6YZzDm6gc8o2vHjldFk6MGKt5pueSB7IOpvpx5Qekw=="

3251+ },

31403252 "@types/node": {

31413253 "version": "17.0.8",

31423254 "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.8.tgz",

@@ -3512,7 +3624,7 @@

35123624 "deep-rename-keys": {

35133625 "version": "0.2.1",

35143626 "resolved": "https://registry.npmjs.org/deep-rename-keys/-/deep-rename-keys-0.2.1.tgz",

3515− "integrity": "sha1-7eeFN9emaivmFRfir5Vtf1ij8dg=",

3627+ "integrity": "sha512-RHd9ABw4Fvk+gYDWqwOftG849x0bYOySl/RgX0tLI9i27ZIeSO91mLZJEp7oPHOMFqHvpgu21YptmDt0FYD/0A==",

35163628 "requires": {

35173629 "kind-of": "^3.0.2",

35183630 "rename-keys": "^1.1.2"

@@ -3568,6 +3680,30 @@

35683680 "integrity": "sha512-+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA==",

35693681 "dev": true

35703682 },

3683+ "dotenv": {

3684+ "version": "16.0.1",

3685+ "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.0.1.tgz",

3686+ "integrity": "sha512-1K6hR6wtk2FviQ4kEiSjFiH5rpzEVi8WW0x96aztHVMhEspNpc4DVOUTEHtEva5VThQ8IaBX1Pe4gSzpVVUsKQ==",

3687+ "dev": true

3688+ },

3689+ "dotenv-cli": {

3690+ "version": "6.0.0",

3691+ "resolved": "https://registry.npmjs.org/dotenv-cli/-/dotenv-cli-6.0.0.tgz",

3692+ "integrity": "sha512-qXlCOi3UMDhCWFKe0yq5sg3X+pJAz+RQDiFN38AMSbUrnY3uZshSfDJUAge951OS7J9gwLZGfsBlWRSOYz/TRg==",

3693+ "dev": true,

3694+ "requires": {

3695+ "cross-spawn": "^7.0.3",

3696+ "dotenv": "^16.0.0",

3697+ "dotenv-expand": "^8.0.1",

3698+ "minimist": "^1.2.5"

3699+ }

3700+ },

3701+ "dotenv-expand": {

3702+ "version": "8.0.3",

3703+ "resolved": "https://registry.npmjs.org/dotenv-expand/-/dotenv-expand-8.0.3.tgz",

3704+ "integrity": "sha512-SErOMvge0ZUyWd5B0NXMQlDkN+8r+HhVUsxgOO7IoPDOdDRD2JjExpN6y3KnFR66jsJMwSn1pqIivhU5rcJiNg==",

3705+ "dev": true

3706+ },

35713707 "electron-to-chromium": {

35723708 "version": "1.4.38",

35733709 "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.38.tgz",

@@ -3760,7 +3896,7 @@

37603896 "eventemitter3": {

37613897 "version": "2.0.3",

37623898 "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-2.0.3.tgz",

3763− "integrity": "sha1-teEHm1n7XhuidxwKmTvgYKWMmbo="

3899+ "integrity": "sha512-jLN68Dx5kyFHaePoXWPsCGW5qdyZQtLYHkxkg02/Mz6g0kYpDx4FyP6XfArhQdlOC4b8Mv+EMxPo/8La7Tzghg=="

37643900 },

37653901 "events": {

37663902 "version": "3.3.0",

@@ -3849,7 +3985,7 @@

38493985 "get-value": {

38503986 "version": "2.0.6",

38513987 "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz",

3852− "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg="

3988+ "integrity": "sha512-Ln0UQDlxH1BapMu3GPtf7CuYNwRZf2gwCuPqbyG6pB8WfmFpzqcy4xtAaAMUhnNqjMKTiCPZG2oMT3YSx8U2NA=="

38533989 },

38543990 "glob": {

38553991 "version": "7.2.0",

@@ -3933,7 +4069,7 @@

39334069 "has-value": {

39344070 "version": "0.3.1",

39354071 "resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz",

3936− "integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=",

4072+ "integrity": "sha512-gpG936j8/MzaeID5Yif+577c17TxaDmhuyVgSwtnL/q8UUTySg8Mecb+8Cf1otgLoD7DDH75axp86ER7LFsf3Q==",

39374073 "requires": {

39384074 "get-value": "^2.0.3",

39394075 "has-values": "^0.1.4",

@@ -3943,7 +4079,7 @@

39434079 "isobject": {

39444080 "version": "2.1.0",

39454081 "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",

3946− "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=",

4082+ "integrity": "sha512-+OUdGJlgjOBZDfxnDjYYG6zp487z0JGNQq3cYQYg5f5hKR+syHMsaztzGeml/4kGG55CSpKSpWTY+jYGgsHLgA==",

39474083 "requires": {

39484084 "isarray": "1.0.0"

39494085 }

@@ -3953,7 +4089,7 @@

39534089 "has-values": {

39544090 "version": "0.1.4",

39554091 "resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz",

3956− "integrity": "sha1-bWHeldkd/Km5oCCJrThL/49it3E="

4092+ "integrity": "sha512-J8S0cEdWuQbqD9//tlZxiMuMNmxB8PlEwvYwuxsTmR1G5RXUePEX/SJn7aD0GMLieuZYSwNH0cQuJGwnYunXRQ=="

39574093 },

39584094 "ignore": {

39594095 "version": "5.2.0",

@@ -4073,7 +4209,7 @@

40734209 "isarray": {

40744210 "version": "1.0.0",

40754211 "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",

4076− "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="

4212+ "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ=="

40774213 },

40784214 "isexe": {

40794215 "version": "2.0.0",

@@ -4084,7 +4220,7 @@

40844220 "isobject": {

40854221 "version": "3.0.1",

40864222 "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",

4087− "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8="

4223+ "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg=="

40884224 },

40894225 "js-tokens": {

40904226 "version": "4.0.0",

@@ -4110,7 +4246,7 @@

41104246 "kind-of": {

41114247 "version": "3.2.2",

41124248 "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",

4113− "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",

4249+ "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",

41144250 "requires": {

41154251 "is-buffer": "^1.1.5"

41164252 }

@@ -4165,6 +4301,11 @@

41654301 "sourcemap-codec": "^1.4.4"

41664302 }

41674303 },

4304+ "marked": {

4305+ "version": "4.2.3",

4306+ "resolved": "https://registry.npmjs.org/marked/-/marked-4.2.3.tgz",

4307+ "integrity": "sha512-slWRdJkbTZ+PjkyJnE30Uid64eHwbwa1Q25INCAYfZlK4o6ylagBy/Le9eWntqJFoFT93ikUKMv47GZ4gTwHkw=="

4308+ },

41684309 "merge2": {

41694310 "version": "1.4.1",

41704311 "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",

@@ -4250,7 +4391,7 @@

42504391 "object-assign": {

42514392 "version": "4.1.1",

42524393 "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",

4253− "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",

4394+ "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==",

42544395 "peer": true

42554396 },

42564397 "object-hash": {

@@ -4267,7 +4408,7 @@

42674408 "omit-deep": {

42684409 "version": "0.3.0",

42694410 "resolved": "https://registry.npmjs.org/omit-deep/-/omit-deep-0.3.0.tgz",

4270− "integrity": "sha1-IcivNJm8rdKWUaIyy8rLxSRF6+w=",

4411+ "integrity": "sha512-Lbl/Ma59sss2b15DpnWnGmECBRL8cRl/PjPbPMVW+Y8zIQzRrwMaI65Oy6HvxyhYeILVKBJb2LWeG81bj5zbMg==",

42714412 "requires": {

42724413 "is-plain-object": "^2.0.1",

42734414 "unset-value": "^0.1.1"

@@ -4641,10 +4782,10 @@

46414782 "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",

46424783 "dev": true

46434784 },

4644− "sigma": {

4645− "version": "2.3.1",

4646− "resolved": "https://registry.npmjs.org/sigma/-/sigma-2.3.1.tgz",

4647− "integrity": "sha512-YfQsVZf78CeIUv8EYLqp/yvhMwwBXGrbpy+rD1N2X9IqtJ11+VfQRjWfVqHDhjM8oPfWPsaJMtpWFQ8pIflvCA==",

4785+ "sigma-jh": {

4786+ "version": "2.4.2",

4787+ "resolved": "https://registry.npmjs.org/sigma-jh/-/sigma-jh-2.4.2.tgz",

4788+ "integrity": "sha512-viB4M5Y79N5rAgs0z3M4Gff4HX53S+UMwblPDEH/Nkwwe7AcmcWwsEYsGv/xL/TNQzLIBBb0NaNAg5ZhnbEm8g==",

46484789 "requires": {

46494790 "@yomguithereal/helpers": "^1.1.1",

46504791 "events": "^3.3.0",

@@ -4740,8 +4881,7 @@

47404881 "svelte": {

47414882 "version": "3.48.0",

47424883 "resolved": "https://registry.npmjs.org/svelte/-/svelte-3.48.0.tgz",

4743− "integrity": "sha512-fN2YRm/bGumvjUpu6yI3BpvZnpIm9I6A7HR4oUNYd7ggYyIwSA/BX7DJ+UXXffLp6XNcUijyLvttbPVCYa/3xQ==",

4744− "dev": true

4884+ "integrity": "sha512-fN2YRm/bGumvjUpu6yI3BpvZnpIm9I6A7HR4oUNYd7ggYyIwSA/BX7DJ+UXXffLp6XNcUijyLvttbPVCYa/3xQ=="

47454885 },

47464886 "svelte-check": {

47474887 "version": "2.2.11",

@@ -4772,6 +4912,15 @@

47724912 "dev": true,

47734913 "requires": {}

47744914 },

4915+ "svelte-markdown": {

4916+ "version": "0.2.3",

4917+ "resolved": "https://registry.npmjs.org/svelte-markdown/-/svelte-markdown-0.2.3.tgz",

4918+ "integrity": "sha512-2h680NzTXnAD0CXhxe3GeHl6W+ayG4iKQRl+BIDRw+R0mUE0OiNxP1Vt8Rn+aWevB/LBiBIPCAwvL+0BkG057A==",

4919+ "requires": {

4920+ "@types/marked": "^4.0.1",

4921+ "marked": "^4.0.10"

4922+ }

4923+ },

47754924 "svelte-preprocess": {

47764925 "version": "4.10.1",

47774926 "resolved": "https://registry.npmjs.org/svelte-preprocess/-/svelte-preprocess-4.10.1.tgz",

@@ -4899,7 +5048,7 @@

48995048 "unset-value": {

49005049 "version": "0.1.2",

49015050 "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-0.1.2.tgz",

4902− "integrity": "sha1-UGgQuGfyfCpabpsEgzYx9t5Y0xA=",

5051+ "integrity": "sha512-yhv5I4TsldLdE3UcVQn0hD2T5sNCPv4+qm/CTUpRKIpwthYRIipsAPdsrNpOI79hPQa0rTTeW22Fq6JWRcTgNg==",

49035052 "requires": {

49045053 "has-value": "^0.3.1",

49055054 "isobject": "^3.0.0"

@@ -4986,7 +5135,7 @@

49865135 "xml-lexer": {

49875136 "version": "0.2.2",

49885137 "resolved": "https://registry.npmjs.org/xml-lexer/-/xml-lexer-0.2.2.tgz",

4989− "integrity": "sha1-UYGTpKozTVj8fSSLVJB5uJkH4EY=",

5138+ "integrity": "sha512-G0i98epIwiUEiKmMcavmVdhtymW+pCAohMRgybyIME9ygfVu8QheIi+YoQh3ngiThsT0SQzJT4R0sKDEv8Ou0w==",

49905139 "requires": {

49915140 "eventemitter3": "^2.0.0"

49925141 }

@@ -4994,7 +5143,7 @@

49945143 "xml-reader": {

49955144 "version": "2.4.3",

49965145 "resolved": "https://registry.npmjs.org/xml-reader/-/xml-reader-2.4.3.tgz",

4997− "integrity": "sha1-n4EMr3xCWlqvuEixxFEDyecddTA=",

5146+ "integrity": "sha512-xWldrIxjeAMAu6+HSf9t50ot1uL5M+BtOidRCWHXIeewvSeIpscWCsp4Zxjk8kHHhdqFBrfK8U0EJeCcnyQ/gA==",

49985147 "requires": {

49995148 "eventemitter3": "^2.0.0",

50005149 "xml-lexer": "^0.2.2"

ui/package.json+20−7

@@ -1,17 +1,27 @@

11{

22 "name": "urbit-astrolabe",

3− "version": "0.0.0",

43 "type": "module",

4+ "version": "0.3.0",

55 "scripts": {

6− "dev:only": "vite --port 4000 --host",

7− "build:only": "vite build",

6+ "dev:vite": "vite --port 4000 --host",

7+ "build:vite": "vite build",

88 "tailwind:watch": "cross-env TAILWIND_MODE=watch cross-env NODE_ENV=development postcss src/styles/tailwind.css -o src/styles/tailwind-output.css -w",

99 "tailwind:build": "cross-env TAILWIND_MODE=build cross-env NODE_ENV=production postcss src/styles/tailwind.css -o src/styles/tailwind-output.css",

10− "dev": "concurrently \"npm run dev:only\" \"npm run tailwind:watch\"",

11− "build": "npm run tailwind:build && npm run build:only",

10+ "dev": "concurrently \"npm run dev:vite\" \"npm run tailwind:watch\"",

11+ "build": "npm run tailwind:build && npm run build:vite",

1212 "preview": "vite preview",

1313 "check": "svelte-check --tsconfig ./tsconfig.json",

14− "release": "npm run build && ../install.sh "

14+ "_install:glob": "../bin/install.sh -g $GLOBBER_DESK",

15+ "_install:desk": "../bin/install.sh $ASTROLABE_DESK",

16+ "_install:desk:watch": "../bin/install.sh -w $ASTROLABE_DESK",

17+ "install:glob": "dotenv -c local npm run _install:glob",

18+ "install:desk": "dotenv -c local npm run _install:desk",

19+ "install:desk:watch": "dotenv -c local npm run _install:desk:watch",

20+ "release": "npm run build && npm run install:glob",

21+ "_get-glob": "../bin/get_glob.sh $GLOBBER_DESK",

22+ "get-glob": "dotenv -c local npm run _get-glob",

23+ "_commit": "../bin/commit.sh $ASTROLABE_DESK",

24+ "commit": "dotenv -c local npm run _commit"

1525 },

1626 "devDependencies": {

1727 "@sveltejs/vite-plugin-svelte": "^1.0.0-next.30",

@@ -20,6 +30,7 @@

2030 "autoprefixer": "^10.4.2",

2131 "concurrently": "^7.0.0",

2232 "cross-env": "^7.0.3",

33+ "dotenv-cli": "^6.0.0",

2334 "postcss-cli": "^9.1.0",

2435 "sass": "^1.50.0",

2536 "svelte": "^3.48.0",

@@ -32,6 +43,7 @@

3243 "vite": "^2.7.2"

3344 },

3445 "dependencies": {

46+ "@johnhyde/sigil-js": "github:johnhyde/sigil-js",

3547 "@tlon/phonemes-js": "^1.0.0",

3648 "@tlon/sigil-js": "^1.4.5",

3749 "@urbit/api": "^2.1.0",

@@ -39,8 +51,9 @@

3951 "bn.js": "^5.2.0",

4052 "graphology": "^0.24.1",

4153 "lodash": "^4.17.21",

42− "sigma": "^2.3.1",

54+ "sigma-jh": "^2.4.2",

4355 "svelte-copy-to-clipboard": "^0.2.5",

56+ "svelte-markdown": "^0.2.3",

4457 "tippy.js": "^6.3.7",

4558 "urbit-ob": "^5.0.1"

4659 }

ui/public/sigil-example.pngnew file

Binary file not shown.

ui/src/App.svelte+38−2

@@ -1,9 +1,12 @@

11<script lang="ts">

22 import Router from 'svelte-spa-router';

3+ import SigilPage from './routes/SigilPage.svelte';

34 import HelpPage from './routes/HelpPage.svelte';

45 import Home from './routes/Home.svelte';

5− import HelpModal from './components/HelpModal.svelte';

6+ import HelpModal from '@/docs/HelpModal.svelte';

67 import "./styles/styles.scss";

8+ import docs from 'stores/docs';

9+ import keys from 'stores/keys';

710

811 // const routes = {

912 // '/help/:path?': HelpPage,

@@ -14,6 +17,7 @@

1417 // }

1518

1619 const routes = {

20+ '/sigil': SigilPage,

1721 '/help/:path?': HelpPage,

1822 // '/:patp?': Home,

1923 // '/ship/:patp?': Home,

@@ -28,6 +32,36 @@

2832 $: {

2933 document.title = title

3034 }

35+

36+ function inputEvent(event) {

37+ if (event.target.tagName == 'INPUT') return true;

38+ if (event.target.tagName == 'TEXTAREA') return true;

39+ return false;

40+ }

41+

42+ function handleKeyDown(event: KeyboardEvent) {

43+ keys.runCallbacks($keys.globalkeydown, event);

44+ if (!inputEvent(event)) {

45+ keys.runCallbacks($keys.keydown, event);

46+ }

47+ }

48+

49+ function handleKeyUp(event: KeyboardEvent) {

50+ keys.runCallbacks($keys.globalkeyup, event);

51+ if (!inputEvent(event)) {

52+ keys.runCallbacks($keys.keyup, event);

53+ }

54+ }

55+

56+ $:{

57+ $keys.keyup.get('?').set('app', () => docs.show(''));

58+ $keys.keyup.get('shift+?').set('app', () => docs.show(''));

59+ $keys.globalkeyup.get('escape').set('app', (event) => {

60+ if (inputEvent(event)) {

61+ event.target.blur();

62+ }

63+ });

64+ }

3165</script>

3266

3367<main class="h-full overflow-y-auto">

@@ -37,4 +71,6 @@

3771

3872<svelte:head>

3973 <title>{title}</title>

40−</svelte:head>

74+</svelte:head>

75+

76+<svelte:body on:keydown={handleKeyDown} on:keyup={handleKeyUp} />

ui/src/actions/sigma.tsdeleted−73

@@ -1,73 +0,0 @@

1−import tippy from 'tippy.js';

2−// import DocLink from '../components/docs/DocLink.svelte'; // TODO try to add a link in the tooltip somehow or something, like:

3−// const app = new DocLink({

4−// target: document.getElementBySelector('.tippy')

5−// })

6−

7−const defaultParams = {

8− theme: 'astrolabe',

9− delay: [500, 0],

10−};

11−

12−function getParams(paramsOrContent:any = {}, overrides = {}) {

13− let params = paramsOrContent;

14− if (typeof paramsOrContent === 'string') {

15− params = { content: paramsOrContent };

16− }

17− return {

18− ...defaultParams,

19− ...params,

20− ...overrides,

21− };

22−}

23−

24−export default function tooltip(node, paramsOrContent: any = {}) {

25− const onTrigger = () => {

26− console.log('triggered');

27− node.dispatchEvent(new CustomEvent("tooltipTriggered"));

28− };

29− const onUntrigger = () => {

30− console.log('untriggered');

31− node.dispatchEvent(new CustomEvent("tooltipUntriggered"));

32− };

33− const onClickOutside = (_, e) => {

34− e.stopPropagation();

35− };

36− const listeners = {

37− onTrigger,

38− onUntrigger,

39− onClickOutside,

40− }

41−

42− const params = getParams(paramsOrContent, listeners);

43− const { content } = params;

44−

45− // Let's make sure the "aria-label" attribute

46− // is set so our element is accessible:

47− // https://developer.mozilla.org/en-US/docs/Web/Accessibility/ARIA/ARIA_Techniques/Using_the_aria-label_attribute

48− if (!node.getAttribute("aria-label")) node.setAttribute("aria-label", content);

49−

50−

51− // Support any of the Tippy props by forwarding all "params":

52− // https://atomiks.github.io/tippyjs/v6/all-props/

53− const tip: any = tippy(node, params);

54− const hideTip = (e) => {

55− if (tip.state.isShown) {

56− tip.hide();

57− // e.stopPropagation();

58− }

59− }

60− node.addEventListener('click', hideTip);

61−

62−

63− return {

64− // If the props change, let's update the Tippy instance:

65− update: (newParams) => tip.setProps(getParams(newParams)),

66−

67− // Clean up the Tippy instance on unmount:

68− destroy: () => {

69− node.removeEventListener('click', hideTip);

70− tip.destroy();

71− }

72− };

73−};

ui/src/actions/symbolPartClick.tsnew file+27

@@ -0,0 +1,27 @@

1+function listenOnSvgElements(node, onPathChange) {

2+ const parts = node.querySelectorAll('path, circle, line');

3+ for (let part of parts) {

4+ if (part.getAttribute('dataisgeon') === 'true') continue;

5+ if (onPathChange) {

6+ part.onclick = () => {

7+ onPathChange(part.getAttribute('part-key'));

8+ };

9+ } else {

10+ part.onclick = null;

11+ }

12+ }

13+}

14+

15+export default function svgClick(node: HTMLElement, { onPartClick, enabled = true, svgString }) {

16+ if (enabled) listenOnSvgElements(node, onPartClick);

17+

18+ return {

19+ update: ({ onPartClick, enabled = true, svgString }) => {

20+ if (enabled) {

21+ listenOnSvgElements(node, onPartClick);

22+ } else {

23+ listenOnSvgElements(node, undefined);

24+ }

25+ },

26+ };

27+}

ui/src/actions/tooltip.ts+3−3

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

11import tippy from 'tippy.js';

2−// import DocLink from '../components/docs/DocLink.svelte'; // TODO try to add a link in the tooltip somehow or something, like:

2+// import DocLink from '@/docs/DocLink.svelte'; // TODO try to add a link in the tooltip somehow or something, like:

33// const app = new DocLink({

44// target: document.getElementBySelector('.tippy')

55// })

@@ -23,11 +23,11 @@ function getParams(paramsOrContent:any = {}, overrides = {}) {

2323

2424export default function tooltip(node, paramsOrContent: any = {}) {

2525 const onTrigger = () => {

26− console.log('triggered');

26+ // console.log('triggered');

2727 node.dispatchEvent(new CustomEvent("tooltipTriggered"));

2828 };

2929 const onUntrigger = () => {

30− console.log('untriggered');

30+ // console.log('untriggered');

3131 node.dispatchEvent(new CustomEvent("tooltipUntriggered"));

3232 };

3333 const onClickOutside = (_, e) => {

ui/src/assets/up-arrow.svgnew file+1

@@ -0,0 +1 @@

1+<svg width="24px" height="24px" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><g data-name="Layer 2"><g data-name="arrow-ios-upward"><rect width="24" height="24" transform="rotate(180 12 12)" opacity="0"/><path d="M18 15a1 1 0 0 1-.64-.23L12 10.29l-5.37 4.32a1 1 0 0 1-1.41-.15 1 1 0 0 1 .15-1.41l6-4.83a1 1 0 0 1 1.27 0l6 5a1 1 0 0 1 .13 1.41A1 1 0 0 1 18 15z"/></g></g></svg>

ui/src/assets/x.svgnew file+1

@@ -0,0 +1 @@

1+<svg width="24px" height="24px" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><g data-name="Layer 2"><g data-name="close"><rect width="24" height="24" transform="rotate(180 12 12)" opacity="0"/><path d="M13.41 12l4.3-4.29a1 1 0 1 0-1.42-1.42L12 10.59l-4.29-4.3a1 1 0 0 0-1.42 1.42l4.3 4.29-4.3 4.29a1 1 0 0 0 0 1.42 1 1 0 0 0 1.42 0l4.29-4.3 4.29 4.3a1 1 0 0 0 1.42 0 1 1 0 0 0 0-1.42z"/></g></g></svg>

ui/src/components/CollapsibleContent.svelte+4−5

@@ -1,18 +1,17 @@

11<script lang="ts">

2− import { slide } from 'svelte/transition';

3− import { quintOut } from 'svelte/easing';

4−

2+ import { slide } from 'svelte/transition';

53 export let open: boolean = true;

64</script>

75

86<div class="mt-2">

97 <button on:click={() => (open = !open)}>

10− <span class="font-mono">{open ? '▼' : '▶'}</span>

8+ <span class="font-mono inline-block transition duration-150 {open ? 'rotate-90' : ''}">▶</span>

119  

1210 <slot name="title"></slot>

1311 </button>

1412 {#if open}

15− <div class="ml-[22px]" transition:slide="{{duration: 50 }}">

13+

14+ <div class="ml-[22px]" transition:slide|local="{{duration: 150 }}">

1615 <slot name="content"></slot>

1716 </div>

1817 {/if}

ui/src/components/ExtensionWindow.sveltenew file+25

@@ -0,0 +1,25 @@

1+<script lang="ts">

2+ export let name: string;

3+ export let open = true;

4+ export let halfWidth = false;

5+ $: containerClasses = open ? ('w-full ' + (halfWidth ? 'md:w-1/2' : '')) : 'w-min justify-self-start';

6+ $: boxClasses = open ? 'border-gray-500' : 'border-gray-400 bg-gray-400';

7+ $: buttonClasses = open ? 'text-gray-600' : 'text-white';

8+</script>

9+

10+<div class="p-1 {containerClasses}">

11+ <div class="border rounded-md {boxClasses}" on:click={() => { if (!open) open = true; }}>

12+ <div class="flex flex-wrap">

13+ <button class="px-2 text-sm {buttonClasses}" on:click|stopPropagation={() => open = !open}>

14+ {name}

15+ </button>

16+ {#if open}

17+ <slot name="top-bar"/>

18+ {/if}

19+ </div>

20+ {#if open}

21+ <slot/>

22+ {/if}

23+ </div>

24+</div>

25+

ui/src/components/HomeScreenTiles.svelte+3−3

@@ -17,21 +17,21 @@

1717</script>

1818

1919<div class="pt-10 max-w-md w-full flex flex-wrap gap-5 justify-center">

20− <div class="rounded-lg bg-white flex-grow max-w-xs">

20+ <div class="rounded-lg bg-white grow max-w-xs">

2121 <DocLink modal path="astrolabe">

2222 <div class="p-5 text-xl text-center">

2323 About Astrolabe

2424 </div>

2525 </DocLink>

2626 </div>

27− <div class="rounded-lg bg-white flex-grow max-w-xs">

27+ <div class="rounded-lg bg-white grow max-w-xs">

2828 <DocLink modal path="">

2929 <div class="p-5 text-xl text-center">

3030 About Urbit IDs

3131 </div>

3232 </DocLink>

3333 </div>

34− <a class="rounded-lg bg-navy border border-gold flex-grow max-w-s" use:link href="/chart">

34+ <a class="rounded-lg bg-navy border border-gold grow max-w-s" use:link href="/chart">

3535 <p class="p-5 text-xl text-center text-white">

3636 <br/>

3737 Star Chart

ui/src/components/SearchBar.sveltedeleted−47

@@ -1,47 +0,0 @@

1−<script lang="ts">

2−

3− import { SearchAnalysis } from '../lib/id';

4−

5− export let patp: string = undefined;

6− export let searchQuery: RegExp = /~der/;

7− export let analysis: SearchAnalysis = new SearchAnalysis();

8− export let search = '';

9− export let pauseAnalysis: boolean = false;

10− let debouncedSearch = search;

11−

12− const placeholderText = "Search by @p or #. '*' matches any character";

13−

14− $: {

15− if (!pauseAnalysis) {

16− analysis = new SearchAnalysis(debouncedSearch);

17− if (analysis.queryIsValid) {

18− searchQuery = analysis.query;

19− } else {

20− searchQuery = undefined;

21− }

22− if (analysis.patpIsValid) {

23− patp = analysis.patp;

24− } else {

25− patp = undefined;

26− }

27− }

28− }

29−

30− let timer;

31− $: {

32− clearTimeout(timer);

33− timer = setTimeout(() => {

34− debouncedSearch = search;

35− }, 300);

36− }

37−</script>

38−

39−<div class="relative max-w-md rounded-full w-full">

40− <input type="text" class="p-4 py-2 w-full rounded-full"

41− spellcheck="false"

42− placeholder={placeholderText}

43− bind:value={search}

44− autofocus

45− />

46− <button class="absolute right-0 w-10 h-10 rounded-full bg-black transition-opacity opacity-10 hover:opacity-40"></button>

47−</div>

ui/src/components/ShipListing.svelte+17−11

@@ -1,16 +1,20 @@

11<script lang="ts">

22

3− import Sigil from "./Sigil.svelte";

3+ import Sigil from "@/common/Sigil.svelte";

4+ import PalStatusIndicator from '@/pals/PalStatusIndicator.svelte';

45 import { push } from 'svelte-spa-router'

5− import { normalizeId } from '../lib/id';

6− import { linkToShip as generateLinkToShip } from '../lib/link';

6+ import { normalizeId } from 'lib/id';

7+ import { linkToShip as generateLinkToShip } from 'lib/link';

8+ import { getPalStatus } from 'lib/pals';

9+ import store from 'stores/store';

710 export let ship: any;

811 export let linkToShip: boolean = false;

912 export let differentiateContacts = false;

1013

1114 $: patp = normalizeId(ship.patp);

15+ $: contact = $store.contacts[ship.patp];

1216 $: borderClass = differentiateContacts ? (

13− 'border-l-8 ' + (Object.keys(ship).length > 1 ? 'border-gold' : 'border-gray-300')

17+ 'border-l-8 ' + (contact ? 'border-gold' : 'border-gray-300')

1418 ) : '';

1519

1620 function handleClick() {

@@ -24,13 +28,15 @@

2428on:click={handleClick}

2529on:click

2630>

27− <div class="flex flex-wrap p-4 items-center">

28− <Sigil {patp} size={48} />

29− <!-- {#if ship.avatar}

30− <img src={ship.avatar} class="h-12 w-12 mr-4" />

31− {/if} -->

32− <p class="ml-4 break-words">

33− {patp}<br/>{ship.nickname ? `(${ship.nickname})` : ''}

31+ <div class="flex p-4 items-center gap-x-4">

32+ <Sigil {patp} size={48} useNew noShrink />

33+ <p class="break-words grow">

34+ <span class="align-middle mr-1">

35+ {patp}

36+ </span>

37+ <PalStatusIndicator status={getPalStatus($store.pals, patp)} class="inline" />

38+ <br/>

39+ {contact?.nickname ? `(${contact.nickname})` : ''}

3440 </p>

3541 </div>

3642</div>

ui/src/components/ShipListings.svelte+1−1

@@ -1,6 +1,6 @@

11<script lang="ts">

22 import { createEventDispatcher } from 'svelte';

3− import ShipListing from './ShipListing.svelte';

3+ import ShipListing from '@/ShipListing.svelte';

44 const dispatch = createEventDispatcher();

55

66 export let ships = [];

ui/src/components/ShipView.sveltedeleted−342

@@ -1,342 +0,0 @@

1−<script lang="ts">

2− import { clan, sein, patp2dec } from 'urbit-ob';

3−

4− import { cite, normalizeId } from '../lib/id';

5− import { getPoint, getSpawnedPoints } from '../lib/api';

6− import Sigil from "./Sigil.svelte";

7− import GoldBadge from './GoldBadge.svelte';

8− import TooltipAndDocLink from "./TooltipAndDocLink.svelte";

9− import ShipLink from './ShipLink.svelte';

10− import EthAddressLink from './EthAddressLink.svelte';

11− import CollapsibleContent from './CollapsibleContent.svelte';

12− import ShipChain from './ShipChain.svelte';

13− import ShipListings from './ShipListings.svelte';

14−

15− export let patp: string;

16−

17− let parentChain: any[];

18− let sponsorChain: any[];

19− let rawPointInfoPromise: any;

20− let rawPointInfo: any = null;

21− let pointInfo: any = {};

22− let rawSpawnedPointsPromise: any;

23− let rawSpawnedPoints: any = null;

24− let spawnedPoints: string[] = [];

25− const spawnStatusOptions = {

26− unspawned: {

27− text: 'unspawned',

28− tooltip: 'This point has not yet been spawned by its parent',

29− },

30− locked: {

31− text: 'locked',

32− tooltip: 'This point is currently locked in a Linear Release Contract',

33− },

34− spawned: {

35− text: 'spawned',

36− tooltip: `This point has been spawned`,

37− },

38− spawnedNoKeys: {

39− text: 'spawned (no keys set)',

40− tooltip: 'This point has been spawned, but no keys have been set',

41− },

42− }

43− const layerOptions = {

44− l1: {

45− text: 'on layer 1',

46− tooltip: 'This point is secured as an NFT on the Ethereum blockchain',

47− },

48− l2: {

49− text: 'on layer 2',

50− tooltip: `This point is secured by Urbit's "Layer 2" solution`,

51− },

52− spawn: {

53− text: 'spawns on layer 2',

54− tooltip: 'This point lives on layer 1, but it spawns new points on layer 2',

55− },

56− }

57−

58− $: shipClass = clan(patp);

59− $: azPoint = ['galaxy', 'star', 'planet'].includes(shipClass);

60− $: canSpawnPoints = ['galaxy', 'star'].includes(shipClass);

61− $: spawnableClassPlural = !canSpawnPoints ? '' : (shipClass === 'galaxy' ? 'Stars' : 'Planets');

62− $: {

63− let parents = [patp];

64− let galaxyFound = false;

65− let count = 10;

66− while (!galaxyFound && count > 0) {

67− count--;

68− if (count == 0) {

69− throw new Error("You've got an infinite loop in building the parent chain");

70− }

71− let firstItem = parents[0];

72− if (clan(firstItem) == 'galaxy') {

73− galaxyFound = true;

74− } else {

75− parents.unshift(sein(firstItem))

76− }

77− }

78− parents.pop();

79− parentChain = parents;

80− }

81− $: {

82− rawPointInfo = null;

83− if (azPoint) {

84− rawPointInfoPromise = getPoint(patp);

85− rawPointInfoPromise.then((info) => {

86− rawPointInfo = info;

87− }).catch((error) => {

88− rawPointInfo = { error };

89− });

90− }

91− }

92− $: {

93− rawSpawnedPoints = null;

94− if (canSpawnPoints) {

95− rawSpawnedPointsPromise = getSpawnedPoints(patp);

96− rawSpawnedPointsPromise.then((info) => {

97− rawSpawnedPoints = info;

98− }).catch((error) => {

99− rawSpawnedPoints = { error };

100− });

101− }

102− }

103− $: {

104− spawnedPoints = [];

105− if (rawSpawnedPoints?.points) {

106− spawnedPoints = rawSpawnedPoints?.points.map(patp => ({ patp: normalizeId(patp) }));

107− }

108− }

109− $: {

110− pointInfo = {};

111− let spawnStatus: any,

112− layer: any,

113− life: number,

114− rift: number,

115− spawnedCount: number;

116− let keysSet = false;

117− if (!azPoint) {

118−

119− } else if (rawPointInfo) {

120− if (rawPointInfo.point) {

121− const { point } = rawPointInfo;

122− const {

123− 'probable-dominion': dominion,

124− npoint

125− } = point;

126− layer = layerOptions[dominion];

127− spawnedCount = point['spa-count'];

128− sponsorChain = point['sponsor-chain'].reverse();

129− if (npoint) {

130− life = npoint.net.keys.life;

131− rift = npoint.net.rift;

132− if (life > 0) {

133− keysSet = true;

134− }

135−

136− pointInfo.proxies = npoint.own;

137− if (pointInfo.proxies.owner.address === '0x86cd9cd0992f04231751e3761de45cecea5d1801') {

138− spawnStatus = spawnStatusOptions.locked;

139− } else if (keysSet) {

140− spawnStatus = spawnStatusOptions.spawned;

141− } else {

142− spawnStatus = spawnStatusOptions.spawnedNoKeys;

143− }

144− // const { sponsor } = npoint.net;

145− // if (sponsor.has) {

146− // pointInfo.sponsor = normalizeId(sponsor.who);

147− // }

148− } else {

149− // no info found

150− spawnStatus = spawnStatusOptions.unspawned;

151− life = 0;

152− rift = 0;

153− }

154− } else {

155− // no info found

156− spawnStatus = spawnStatusOptions.unspawned;

157− life = 0;

158− rift = 0;

159− }

160− } else {

161− // request pending

162− }

163− pointInfo = {

164− ...pointInfo,

165− layer,

166− spawnStatus,

167− keysSet,

168− life,

169− rift,

170− spawnedCount,

171− };

172− }

173−</script>

174−

175−<div class="p-8 max-w-md w-full rounded-lg bg-white flex flex-col md:max-w-2xl">

176− <div class="flex flex-col items-center space-y-4 md:flex-row md:items-start md:space-x-8 md:space-y-0">

177− <div class="w-full max-w-[256px] md:min-w-[256px] flex-shrink-0">

178− <Sigil patp={patp} size={256} />

179− </div>

180− <div class="grow w-full min-w-0">

181− <h2 class="text-2xl text-center">

182− <TooltipAndDocLink

183− text="The ship's @p (click to learn more)"

184− doc="patpee" class="inline"

185− >

186− {cite(patp)}

187− </TooltipAndDocLink>

188− </h2>

189− {#if (!azPoint)}

190− <h3 class="text-lg text-center text-gray-700">{patp}</h3>

191− {/if}

192− <h4 class="text-center text-gray-700 break-words">

193− <!-- <TooltipAndDocLink

194− text="The integer representation of this ID"

195− doc="patpee" class="inline"

196− > -->

197− {patp2dec(patp)}

198−

199− </h4>

200− <div class="flex flex-wrap justify-center gap-1.5 my-1.5">

201− <GoldBadge title={"it's a " + shipClass} doc={shipClass}>{shipClass}</GoldBadge>

202− {#if azPoint}

203− {#if pointInfo.spawnStatus}

204− <GoldBadge title={pointInfo.spawnStatus.tooltip}>

205− {pointInfo.spawnStatus.text}

206− </GoldBadge>

207− {/if}

208− {#if pointInfo.layer}

209− <GoldBadge title={pointInfo.layer.tooltip} doc="l2">{pointInfo.layer.text}</GoldBadge>

210− {/if}

211− {:else if (shipClass === 'moon')}

212− <span>of</span>

213− <ShipLink patp={parentChain.at(-1)}></ShipLink>

214− {:else if (shipClass === 'comet')}

215− <span>under</span>

216− <ShipLink patp={parentChain.at(-1)}></ShipLink>

217− {/if}

218− </div>

219− <div class="mt-4 w-full break-words">

220− {#if parentChain.length > 0}

221− <p>

222− {parentChain.length === 1 ? 'Parent:' : 'Parent Chain:'}

223− <ShipChain shipChain={parentChain}></ShipChain>

224− </p>

225− {/if}

226− {#if azPoint}

227− <CollapsibleContent>

228− <b slot="title">Azimuth Details</b>

229− <div slot="content">

230− {#await rawPointInfoPromise}

231− Loading Azimuth info...

232− {:then}

233− {#if shipClass !== 'galaxy'}

234− <p>

235− {#if sponsorChain && sponsorChain.length > 0}

236− <p>

237− {sponsorChain.length === 1 ? 'Sponsor:' : 'Sponsor Chain:'}

238− <ShipChain shipChain={sponsorChain}></ShipChain>

239− </p>

240− {:else}

241− Unsponsored

242− {/if}

243− </p>

244− {/if}

245− <p>

246− <TooltipAndDocLink

247− text="Number of times this ship's keys have been set. Must be at least 1 to use the network."

248− doc="keys"

249− class="inline"

250− >

251− Key Revision:

252− {pointInfo.life}

253− </TooltipAndDocLink>

254− </p>

255− <p>

256− <TooltipAndDocLink

257− text="Number of times this ship has breached."

258− doc="keys"

259− class="inline"

260− >

261− Factory Resets:

262− {pointInfo.rift}

263− </TooltipAndDocLink>

264− </p>

265− {#if pointInfo.proxies}

266− <p>

267− <span>

268− Owner:

269− <EthAddressLink address={pointInfo.proxies.owner.address} />

270− </span>

271− </p>

272− <p>

273− <span>

274− Management Proxy:

275− <EthAddressLink address={pointInfo.proxies['management-proxy'].address}>

276− <span class="text-gray-700">not set</span>

277− </EthAddressLink>

278− </span>

279− </p>

280− <p>

281− <span>

282− Spawn Proxy:

283− <EthAddressLink address={pointInfo.proxies['spawn-proxy'].address}>

284− <span class="text-gray-700">not set</span>

285− </EthAddressLink>

286− </span>

287− </p>

288− <p>

289− <span>

290− Transfer Proxy:

291− <EthAddressLink address={pointInfo.proxies['transfer-proxy'].address}>

292− <span class="text-gray-700">not set</span>

293− </EthAddressLink>

294− </span>

295− </p>

296− {#if shipClass === 'galaxy'}

297− <p>

298− <span>

299− Voting Proxy:

300− <EthAddressLink address={pointInfo.proxies['voting-proxy'].address}>

301− [not set]

302− </EthAddressLink>

303− </span>

304− </p>

305− {/if}

306− {/if}

307−

308− <!-- {#if value && value.point}

309− <pre class="text-sm overflow-scroll">

310− Raw Info:{JSON.stringify(rawPointInfo, null, 2)}

311− </pre>

312− {/if} -->

313− {/await}

314− </div>

315− </CollapsibleContent>

316− {/if}

317− </div>

318− </div>

319− </div>

320− {#if canSpawnPoints}

321− <div class="mt-5 p-3 border-t">

322− {#await rawPointInfoPromise then}

323− <h3 class="text-lg">

324− {#if pointInfo.spawnedCount}

325− {pointInfo.spawnedCount} Spawned {spawnableClassPlural}:

326− {:else}

327− No Spawned {spawnableClassPlural}

328− {/if}

329− </h3>

330− {/await}

331− {#await rawSpawnedPointsPromise}

332− Loading {spawnableClassPlural}...

333− {:then}

334−

335− <ShipListings

336− ships={spawnedPoints}

337− linkToShips

338− />

339− {/await}

340− </div>

341− {/if}

342−</div>

ui/src/components/StarChart.svelte+134−35

@@ -1,33 +1,75 @@

11<script lang="ts">

2− import { push } from 'svelte-spa-router'

2+ import LoadingSpinner from '@/common/LoadingSpinner.svelte';

33

4− import Sigma from 'sigma';

4+ import { push } from 'svelte-spa-router';

5+ import { onDestroy } from 'svelte';

6+

7+ import Sigma from 'sigma-jh';

58 import Graph from 'graphology';

69

710 import { clan } from 'urbit-ob';

8− import { cite, normalizeId } from '../lib/id';

9− import { populateGraph } from '../lib/graph';

10− import { getChartData } from '../lib/api';

11− import { linkToShip } from '../lib/link';

11+ import DocLink from './docs/DocLink.svelte';

12+ import store from 'stores/store';

13+ import keys from 'stores/keys';

14+ import { parseChartData, populateGraph } from 'lib/graph';

15+ import { getChartData } from 'lib/api';

16+ import { linkToShip } from 'lib/link';

17+

18+ import InlineSelect from './buttons/InlineSelect.svelte';

1219

1320 export let patp: string;

1421 let s;

1522 let g = new Graph();

23+ let highlightedPatp;

24+

25+ let firstRender = true;

26+ let mouseDown = false;

27+ let isDragging = false;

28+ let stoppedDragging = Date.now();

1629

1730 function sigma(container: HTMLElement, params: any = {}) {

1831 try {

1932 window['s'] = s = new Sigma(g, container, {

2033 renderLabels: false,

34+ // hideEdgesOnMove: true,

35+ allowInvalidContainer: true,

2136 // labelColor: { color: WHITE },

2237 labelFont: 'monospace',

23− labelRenderedSizeThreshold: 9,

38+ labelRenderedSizeThreshold: 2.2,

2439 zIndex: true,

2540 maxCameraRatio: 10,

2641 });

2742

28− s.on('downNode', ({ node }) => {

29− push(linkToShip(node));

43+ s.on('clickNode', ({ node }) => {

44+ if (!isDragging && 100 < Date.now() - stoppedDragging) {

45+ push(linkToShip(node));

46+ }

47+ });

48+ s.on('afterRender', () => {

49+ if (firstRender) {

50+ firstRender = false;

51+ searchFunc();

52+ }

53+ });

54+ const mc = s.getMouseCaptor();

55+ mc.on("mousedown", () => {

56+ mouseDown = true;

57+ });

58+ mc.on('mousemove', () => {

59+ if (mouseDown) {

60+ isDragging = true;

61+ }

3062 });

63+ mc.on('mouseup', () => {

64+ if (!isDragging) {

65+ clearHighlight();

66+ } else {

67+ stoppedDragging = Date.now();

68+ }

69+ mouseDown = false;

70+ isDragging = false;

71+ })

72+

3173 } catch(e) {

3274 console.error('error in initializing sigma:', e);

3375 if (!params.retried) {

@@ -53,60 +95,85 @@

5395 rawChartData = { error };

5496 });

5597 }

56− $: rawChartData, populateGraph(g, rawChartData), s?.scheduleRefresh(), searchFunc();

98+ $: parsedChartData = parseChartData(rawChartData, filterSet);

99+ $: [parsedChartData, childKey], populateGraph(g, parsedChartData, childKey, () => {

100+ searchFunc();

101+ });

102+

103+ function clearHighlight() {

104+ const id = highlightedPatp;

105+ if (id) {

106+ setTimeout(() => {

107+ s.graph.removeNodeAttribute(id, 'highlighted');

108+ if (id == highlightedPatp)

109+ highlightedPatp = null;

110+ });

111+ }

112+ }

57113

58− let highlightedPatp;

59114 function searchFunc() {

115+ // console.log('searching for ' + patp);

60116 if (!s) return;

61− if (highlightedPatp) {

62− s.graph.removeNodeAttribute(highlightedPatp, 'highlighted');

63− highlightedPatp = null;

64− }

117+ if (highlightedPatp !== patp) clearHighlight();

65118 if (!patp) return;

66119 let point = s.getNodeDisplayData(patp);

67120 if (!point) return;

68121 s.graph.setNodeAttribute(patp, 'highlighted', true);

69122 highlightedPatp = patp;

70123

71− let ratio = 0.05;

124+ let ratio = 0.03;

72125 if (clan(patp) === 'star') {

73− ratio = 0.035;

126+ ratio = 0.008;

74127 } else if (clan(patp) === 'planet') {

75− ratio = 0.0025;

128+ ratio = 0.0005;

76129 }

77130

78131 s.camera.animate({

79132 x: point.x,

80133 y: point.y,

81134 ratio: ratio,

82− // ratio: 1,

83135 angle: 0

84136 }, {

85137 duration: 500,

86138 });

87− s.scheduleRefresh();

88139 };

89140

90− $: s, patp, searchFunc();

141+ $: [s, patp], searchFunc();

91142

92143 let helpBoxExpanded = false;

93144 let helpBoxClasses = '';

94145 $: {

95146 helpBoxClasses = helpBoxExpanded ?

96− "" :

97− "absolute border-r";

98− // refreshGraph();

99− if (s) {

100− s.resize();

101− s.scheduleRefresh();

102− }

147+ "w-full" :

148+ "border-r";

149+ }

150+ let childKey: ('sponsees' | 'children') = 'sponsees';

151+ let filterSet: Set<string> = null;

152+ $: peersSet = new Set($store.peers);

153+ $: palsSet = new Set(Object.keys($store.pals.outgoing));

154+

155+ function closeChart() {

156+ push('/');

157+ }

158+

159+ $: {

160+ $keys.keyup.get('escape').set('starChart', closeChart);

103161 }

162+

163+ onDestroy(() => {

164+ $keys.keyup.get('escape').delete('starChart');

165+ });

104166</script>

105167

106−<div class="border border-gold bg-navy w-full grow flex flex-col">

107− <div class="flex flex-wrap {helpBoxClasses} border-b border-gold bg-navy text-white z-10 cursor-pointer justify-center px-2 py-1 gap-4"

168+<div class="border border-gold bg-navy w-full grow flex flex-col relative">

169+ <div class="flex flex-wrap absolute {helpBoxClasses} border-b border-gold bg-navy text-white z-20 cursor-pointer justify-items-center px-2 py-1 gap-4"

108170 on:click={() => helpBoxExpanded = !helpBoxExpanded }>

109171 {#if helpBoxExpanded}

172+ <DocLink modal path="astrolabe">

173+ <div class="text-center justify-self-start">

174+ About Astrolabe

175+ </div>

176+ </DocLink>

110177 <div class="flex flex-wrap items-center gap-2">

111178 <div class="w-3 h-3 rounded-full bg-white"></div>

112179 Galaxy

@@ -117,18 +184,50 @@

117184 </div>

118185 <div class="flex flex-wrap items-center gap-2">

119186 <div class="w-3 h-3 rounded-full bg-l1-blue"></div>

120− L1 Planet

187+ Planet (L1)

121188 </div>

122189 <div class="flex flex-wrap items-center gap-2">

123190 <div class="w-3 h-3 rounded-full bg-l2-green"></div>

124− L2 Planet

191+ Planet (L2)

125192 </div>

193+ {#if s.nodeDataCache['~' + window.ship]}

194+ <div class="flex flex-wrap items-center gap-2">

195+ <div class="w-3 h-3 rounded-full bg-you"></div>

196+ You

197+ </div>

198+ {/if}

126199 {:else}

127− Help ({patp})

200+ ?

128201 {/if}

129202 </div>

130− <div class="grow flex">

131− <div class="w-full" use:sigma>

203+ <div class="flex flex-wrap absolute right-0 border-l border-b border-gold bg-navy text-white z-10 cursor-pointer justify-center px-2 py-1 gap-4"

204+ on:click={() => push('/') }>

205+ X

206+ </div>

207+ <div class="flex absolute -bottom-2 inset-x-0 text-white z-10 2xs:-bottom-3.5">

208+

209+

210+ <InlineSelect bind:value={childKey}

211+ options={[

212+ ['Sponsors', 'sponsees'],

213+ ['Parents', 'children']

214+ ]}

215+ ></InlineSelect>

216+ <InlineSelect bind:value={filterSet}

217+ options={[

218+ ['All', null],

219+ ['Peers', peersSet],

220+ ['Pals', palsSet],

221+ ]}

222+ ></InlineSelect>

223+

224+ </div>

225+ {#await chartDataPromise}

226+ <div class="flex items-center justify-center absolute inset-0">

227+ <LoadingSpinner/>

132228 </div>

229+ {/await}

230+ <div class="grow flex">

231+ <div class="w-full min-h-[20px]" use:sigma></div>

133232 </div>

134233</div>

ui/src/components/buttons/InlineSelect.sveltenew file+16

@@ -0,0 +1,16 @@

1+<script lang="ts">

2+ export let options: [string, any][];

3+ export let value: any;

4+ export let borderClass = "border-gold";

5+ export let onClass = "bg-navy";

6+ export let offClass = "bg-white";

7+</script>

8+

9+<div class="flex mx-auto border {borderClass} rounded divide-x divide-gold bg-navy">

10+ {#each options as option}

11+ <div class="px-1.5 cursor-pointer" class:text-gray-400={value !== option[1]} on:click={() => value = option[1]}>

12+ {option[0]}

13+ </div>

14+ {/each}

15+</div>

16+

ui/src/components/buttons/ToggleButton.svelte+4−3

@@ -1,10 +1,11 @@

11<script lang="ts">

22 export let on: boolean = true;

3+ export let borderClass = "border-navy";

4+ export let onClass = "bg-navy";

5+ export let offClass = "bg-white";

36</script>

47

58<button on:click

6− class="w-4 h-4 rounded-full border border-navy"

7− class:bg-white={!on}

8− class:bg-navy={on}

9+ class={`w-4 h-4 rounded-full border ${borderClass} ${on ? onClass : offClass}`}

910/>

1011

ui/src/components/common/ChartLink.sveltenew file+11

@@ -0,0 +1,11 @@

1+<script lang="ts">

2+ import { link } from 'svelte-spa-router'

3+ import { linkToChart } from 'lib/link';

4+

5+ export let patp = null;

6+</script>

7+

8+<a href={linkToChart(patp)} use:link

9+ class="bg-navy text-white px-2 py-1 rounded no-underline">

10+ <slot/>

11+</a>

ui/src/components/EthAddressLink.svelte → ui/src/components/common/EthAddressLink.svelterenamed+2−2

@@ -1,6 +1,6 @@

11<script lang="ts">

2− import CopyToClipboard from "svelte-copy-to-clipboard";

3− import tooltip from "../actions/tooltip";

2+ import CopyToClipboard from 'svelte-copy-to-clipboard';

3+ import tooltip from 'actions/tooltip';

44

55 let overrideText = null;

66

ui/src/components/GoldBadge.svelte → ui/src/components/common/GoldBadge.svelterenamed

The content is the same.

ui/src/components/Sigil.svelte → ui/src/components/common/Legil.svelterenamed+16−6

@@ -1,11 +1,15 @@

11<script lang="ts">

22 import { clan } from 'urbit-ob';

3− import { sigil, stringRenderer } from '@tlon/sigil-js';

4− import moonPng from '../assets/moon.png';

5− import cometSvg from '../assets/comet.svg';

3+ import { legil, stringRenderer } from '@johnhyde/legil-js';

4+ import { sigilScalingFunction } from 'lib/sigil';

5+ import moonPng from 'assets/moon.png';

6+ import cometSvg from 'assets/comet.svg';

67

78 export let patp: string;

89 export let size: number;

10+ export let fgColor: string = 'white';

11+ export let bgColor: string = 'black';

12+ export let altBgColor: string = undefined;

913 let svgString: any;

1014 let imgSrc: any;

1115

@@ -13,13 +17,19 @@

1317 $: displaySigil = ['galaxy', 'star', 'planet'].includes(shipClass);

1418 $: {

1519 if (displaySigil) {

16− const svgAST = sigil({

20+ let svgAST;

21+ svgAST = legil({

1722 patp: patp,

1823 size,

19− colors: ['black', 'white'],

24+ colors: [bgColor, fgColor],

25+ autoScaleStrokes: true,

26+ strokeScalingFunctionV2: sigilScalingFunction,

2027 });

2128 svgAST.attributes.preserveAspectRatio = 'xMidYMin slice';

2229 svgString = stringRenderer(svgAST);

30+ if (altBgColor) {

31+ svgString = svgString.replace(/rect fill="[^"]+"/, `rect fill="${altBgColor}"`);

32+ }

2333 } else if (shipClass === 'moon') {

2434 imgSrc = moonPng;

2535 } else {

@@ -28,7 +38,7 @@

2838 }

2939</script>

3040

31−<div class="flex-grow" style:max-width="{size}px">

41+<div class="grow" style:max-width="{size}px">

3242 {#if displaySigil}

3343 {@html svgString}

3444 {:else}

ui/src/components/common/LoadingSpinner.sveltenew file+8

@@ -0,0 +1,8 @@

1+<script lang="ts">

2+ export let spinnerClass = "text-white";

3+</script>

4+

5+<svg class="animate-spin h-5 w-5 mx-auto {spinnerClass}" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24">

6+ <circle class="opacity-25" cx="12" cy="12" r="10" stroke="currentColor" stroke-width="4"></circle>

7+ <path class="opacity-75" fill="currentColor" d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4zm2 5.291A7.962 7.962 0 014 12H0c0 3.042 1.135 5.824 3 7.938l3-2.647z"></path>

8+</svg>

ui/src/components/ShipLink.svelte → ui/src/components/common/ShipLink.svelterenamed+2−2

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

11<script lang="ts">

22 import { link } from 'svelte-spa-router'

3− import { cite, normalizeId } from '../lib/id';

4− import { linkToShip } from '../lib/link';

3+ import { cite, normalizeId } from 'lib/id';

4+ import { linkToShip } from 'lib/link';

55 export let patp: string;

66 $: normalizedId = normalizeId(patp);

77</script>

ui/src/components/common/Sigil.sveltenew file+65

@@ -0,0 +1,65 @@

1+<script lang="ts">

2+ import { clan } from 'urbit-ob';

3+ // import { sigil as sigil1, stringRenderer as sr1 } from '@tlon/sigil-js';

4+ import { sigil as sigil2, stringRenderer as sr2 } from '@johnhyde/sigil-js';

5+ import { sigilScalingFunction, crowdedSigilScalingFunction } from 'lib/sigil';

6+ import moonPng from 'assets/moon.png';

7+ import cometSvg from 'assets/comet.svg';

8+

9+ export let patp: string;

10+ export let size: number;

11+ export let useNew: boolean = false;

12+ export let fgColor: string = 'white';

13+ export let bgColor: string = 'black';

14+ export let altBgColor: string = undefined;

15+ export let noShrink: boolean = false;

16+ let svgString: any;

17+ let imgSrc: any;

18+

19+ $: noShrinkClasses = noShrink ? 'shrink-0' : '';

20+ $: noShrinkWidth = noShrink ? size+'px' : 'initial';

21+

22+ $: shipClass = clan(patp);

23+ $: crowded = ['comet', 'moon'].includes(shipClass);

24+ $: {

25+ // if (displaySigil) {

26+ // let sigil = sigil1;

27+ // let sr = sr1;

28+ // let svgAST;

29+ // if (useNew) {

30+ let sigil = sigil2;

31+ let sr = sr2;

32+ let svgAST = sigil({

33+ patp: patp,

34+ size,

35+ colors: [bgColor, fgColor],

36+ autoScaleStrokes: true,

37+ strokeScalingFunctionV2: crowded ? crowdedSigilScalingFunction : sigilScalingFunction,

38+ });

39+ // } else {

40+ // svgAST = sigil({

41+ // patp: patp,

42+ // size,

43+ // colors: [bgColor, fgColor],

44+ // });

45+ // }

46+ svgAST.attributes.preserveAspectRatio = 'xMidYMin slice';

47+ svgString = sr(svgAST);

48+ if (altBgColor) {

49+ svgString = svgString.replace(/rect fill="[^"]+"/, `rect fill="${altBgColor}"`);

50+ }

51+ // } else if (shipClass === 'moon') {

52+ // imgSrc = moonPng;

53+ // } else {

54+ // imgSrc = cometSvg;

55+ // }

56+ }

57+</script>

58+

59+<div class="grow {noShrinkClasses}" style:max-width="{size}px" style:width={noShrinkWidth}>

60+

61+ {@html svgString}

62+ <!-- {:else}

63+ <img src={imgSrc} alt={shipClass} class="mx-auto" />

64+ {/if} -->

65+</div>

ui/src/components/Tooltip.svelte → ui/src/components/common/Tooltip.svelterenamed+1−2

@@ -1,6 +1,5 @@

11<script lang="ts">

2− import { tick } from "svelte";

3− import tooltip from "../actions/tooltip";

2+ import tooltip from 'actions/tooltip';

43 export let text: string = '';

54 let className: string = '';

65 export { className as class };

ui/src/components/TooltipAndDocLink.svelte → ui/src/components/common/TooltipAndDocLink.svelterenamed+1−1

@@ -1,6 +1,6 @@

11<script lang="ts">

22 import Tooltip from "./Tooltip.svelte";

3− import DocLink from './docs/DocLink.svelte'; // TODO try to add a link in the tooltip somehow or something

3+ import DocLink from '@/docs/DocLink.svelte'; // TODO try to add a link in the tooltip somehow or something

44 export let text: string = '';

55 export let doc: string = '';

66 let className: string = '';

ui/src/components/docs/Doc.svelte+13−4

@@ -1,9 +1,10 @@

11<script lang="ts">

2− import { createEventDispatcher } from 'svelte';

2+ import { createEventDispatcher, onDestroy } from 'svelte';

33 import DocContent from './DocContent.svelte';

44 import DocHome from './DocHome.svelte';

5− import Hamburger from '../buttons/Hamburger.svelte';

6− import CloseButton from '../buttons/CloseButton.svelte';

5+ import Hamburger from '@/buttons/Hamburger.svelte';

6+ import CloseButton from '@/buttons/CloseButton.svelte';

7+ import keys from 'stores/keys';

78

89 export let path: string;

910

@@ -17,6 +18,14 @@

1718 function navigate(path) {

1819 dispatch('navigate', path);

1920 }

21+

22+ $: {

23+ $keys.globalkeyup.get('escape').set('doc', close);

24+ }

25+

26+ onDestroy(() => {

27+ $keys.globalkeyup.get('escape').delete('doc');

28+ });

2029</script>

2130

2231<div class="rounded-lg bg-white">

@@ -26,7 +35,7 @@

2635 {:else}

2736 <div class="w-7 h-7" />

2837 {/if}

29− <div class="flex-grow text-center text-xl">

38+ <div class="grow text-center text-xl">

3039 Help

3140 </div>

3241 <CloseButton on:click={close} />

ui/src/components/docs/DocContent.svelte+5−3

@@ -2,8 +2,10 @@

22

33 import { createEventDispatcher } from 'svelte';

44

5− import docLinks from "../../actions/docLinks";

6− import docs from "../../stores/docs";

5+ import docLinks from "actions/docLinks";

6+ import docs from "stores/docs";

7+

8+ import LoadingSpinner from "@/common/LoadingSpinner.svelte";

79

810 export let path:string;

911

@@ -22,7 +24,7 @@

2224

2325<div class="doc">

2426 {#await docs.getDoc(path)}

25− <h3>Loading page...</h3>

27+ <LoadingSpinner spinnerClass="text-black" />

2628 {:then docHtml}

2729 <div use:docLinks={navigate}>

2830 {@html convertLinks(docHtml)}

ui/src/components/docs/DocHome.svelte+3

@@ -52,6 +52,9 @@

5252 </DocLink>

5353 </li>

5454 </ul>

55+ <DocLink path="sigil" on:navigate>

56+ <h2>What is a Sigil?</h2>

57+ </DocLink>

5558 <DocLink path="azimuth" on:navigate>

5659 <h2>What is Azimuth?</h2>

5760 </DocLink>

ui/src/components/docs/DocLink.svelte+1−1

@@ -1,6 +1,6 @@

11<script lang="ts">

22 import { createEventDispatcher } from 'svelte';

3− import docs from '../../stores/docs';

3+ import docs from 'stores/docs';

44

55 export let path:string;

66 export let modal:boolean = false;

ui/src/components/HelpModal.svelte → ui/src/components/docs/HelpModal.svelterenamed+4−4

@@ -1,6 +1,6 @@

11<script lang="ts">

2− import docs from '../stores/docs';

3− import Doc from './docs/Doc.svelte';

2+ import docs from 'stores/docs';

3+ import Doc from './Doc.svelte';

44

55 function close() {

66 docs.hide()

@@ -12,8 +12,8 @@

1212</script>

1313

1414{#if $docs.show}

15− <div class="absolute w-full h-full bg-navy opacity-50 cursor-pointer z-10" on:click/>

16− <div class="absolute w-full h-full z-10 overflow-y-auto" on:click={close}>

15+ <div class="absolute w-full h-full bg-navy opacity-50 cursor-pointer z-50" on:click/>

16+ <div class="absolute w-full h-full z-50 overflow-y-auto" on:click={close}>

1717 <div class="mx-4 2xs:mx-8 md:max-w-xl md:mx-auto">

1818 <div class="py-4 2xs:py-8">

1919 <div on:click|stopPropagation>

ui/src/components/extensions/AppIcon.sveltenew file+61

@@ -0,0 +1,61 @@

1+<script lang="ts">

2+ import CopyToClipboard from 'svelte-copy-to-clipboard';

3+ import { uxToHex } from 'lib/utils';

4+ import { getAppByPath } from 'lib/apps';

5+ import store from 'stores/store';

6+ import LoadingSpinner from '@/common/LoadingSpinner.svelte';

7+

8+ export let path: string;

9+

10+ $: desk = path.split('/')[1];

11+ $: appPromise = getAppByPath(path);

12+ $: appUrbitGraphLink = `web+urbitgraph://${path}`;

13+ $: appLink = `/apps/grid/perma?ext=${appUrbitGraphLink}`;

14+

15+ let overrideText = null;

16+

17+ const handleSuccessfullyCopied = (e) => {

18+ overrideText = 'Copied!';

19+ setTimeout(() => {

20+ overrideText = null;

21+ }, 1000);

22+ }

23+

24+ const handleFailedCopy = () => {

25+ alert('failed to copy :(');

26+ }

27+</script>

28+

29+<div class="w-20 text-sm text-center">

30+ <a class="block w-20 h-20 border border-gray-300 bg-gray-600 text-white rounded-lg overflow-hidden"

31+ href={appLink} target="_blank">

32+ {#await appPromise}

33+ <div class="flex h-full items-center">

34+ <LoadingSpinner />

35+ </div>

36+ {:then app}

37+ <div style:background-color={uxToHex(app.color)} class="h-full w-full text-sm">

38+ {#if app.image}

39+ <img src={app.image} alt="app icon"

40+ class="aspect-square object-cover w-full h-full"

41+ />

42+ {/if}

43+ </div>

44+ {:catch}

45+ {path}

46+ {/await}

47+ </a>

48+ <CopyToClipboard text={path} on:copy={handleSuccessfullyCopied} on:fail={handleFailedCopy} let:copy>

49+ <span on:click={copy}>

50+ {#if overrideText}

51+ {overrideText}

52+ {:else}

53+ {#await appPromise}

54+ {desk}

55+ {:then app}

56+ {app.title}

57+ {/await}

58+ {/if}

59+ </span>

60+ </CopyToClipboard>

61+</div>

ui/src/components/extensions/AppsShipViewExtension.sveltenew file+56

@@ -0,0 +1,56 @@

1+<script lang="ts">

2+

3+ import { sein } from 'urbit-ob';

4+ import uniq from 'lodash/uniq';

5+ import tooltip from 'actions/tooltip';

6+ import { normalizeId, filterIdsForChildMoons } from 'lib/id';

7+ import { filterObject } from 'lib/utils';

8+ import { addAllies, delAllies } from 'lib/apps';

9+ import store from 'stores/store';

10+ import ExtensionWindow from '@/ExtensionWindow.svelte';

11+ import AppIcon from './AppIcon.svelte';

12+

13+ export let patp: string;

14+ $: moons = filterIdsForChildMoons($store.peers, patp);

15+ $: possibleAllies = [patp, ...moons];

16+ $: knownApps = uniq(Object.values(filterObject($store.apps.allies, (ally) => {

17+ ally = normalizeId(ally);

18+ return patp === ally || sein(ally) === patp;

19+ })).flat());

20+ $: nonAllies = possibleAllies.filter((ally) => !$store.apps.allies[ally]);

21+ $: emptyAllies = possibleAllies.filter((ally) => {

22+ let apps = $store.apps.allies[ally];

23+ return apps && !apps.length;

24+ });

25+</script>

26+<ExtensionWindow name="Apps" halfWidth>

27+ <svelte:fragment slot="top-bar">

28+ <div class="grow m-2 flex justify-end align-center">

29+ {#if nonAllies.length > 0}

30+ <button class="bg-gray-200 ml-3 px-2 rounded"

31+ on:click={() => addAllies(nonAllies)}

32+ >

33+ Check for More

34+ </button>

35+ {/if}

36+ {#if emptyAllies.length > 0}

37+ <button class="bg-gray-200 ml-3 px-2 rounded"

38+ on:click={() => delAllies(emptyAllies)}

39+ >

40+ Stop Watching

41+ <span use:tooltip={emptyAllies.join(', ')}>

42+ {emptyAllies.length} Ship{emptyAllies.length > 1 ? 's': ''}

43+ </span>

44+ </button>

45+ {/if}

46+ </div>

47+ </svelte:fragment>

48+ {#if knownApps.length > 0}

49+ <div class="flex flex-wrap p-2 gap-2 justify-center">

50+ {#each knownApps as app}

51+ <AppIcon path={app} />

52+ {/each}

53+ </div>

54+ {/if}

55+</ExtensionWindow>

56+

ui/src/components/extensions/GroupsShipViewExtension.sveltenew file+15

@@ -0,0 +1,15 @@

1+<script lang="ts">

2+ import { uxToHex } from 'lib/utils';

3+ import { normalizeId } from 'lib/id';

4+ import store from 'stores/store';

5+ import ExtensionWindow from '@/ExtensionWindow.svelte';

6+

7+ export let patp: string;

8+</script>

9+

10+{#if patp}

11+ <ExtensionWindow name="Shared Groups">

12+ TODO: implement for Groups 2, don't bother with Groups 1

13+ </ExtensionWindow>

14+{/if}

15+

ui/src/components/extensions/ProfileShipViewExtension.sveltenew file+52

@@ -0,0 +1,52 @@

1+<script lang="ts">

2+ import SvelteMarkdown from 'svelte-markdown';

3+ import { uxToHex } from 'lib/utils';

4+ import { normalizeId } from 'lib/id';

5+ import store from 'stores/store';

6+ import Sigil from "@/common/Sigil.svelte";

7+ import ExtensionWindow from '@/ExtensionWindow.svelte';

8+

9+ export let patp: string;

10+ $: contact = $store.contacts[normalizeId(patp)];

11+ $: color = contact && uxToHex(contact.color);

12+ $: somethingToShow = contact && (contact.nickname || contact.cover || contact.avatar || contact.bio);

13+</script>

14+

15+{#if somethingToShow}

16+ <ExtensionWindow name="Groups Profile">

17+ <svelte:fragment slot="top-bar">

18+ {#if contact.nickname}

19+ <div class="grow m-1 flex justify-center align-center">

20+ {contact.nickname}

21+ </div>

22+ {/if}

23+ </svelte:fragment>

24+ <div class="flex flex-wrap py-2">

25+ {#if contact.cover}

26+ <img src={contact.cover} alt="profile cover image"

27+ class="m-1 -mb-16 w-full h-48 border border-black rounded-lg object-cover min-w-0"

28+ />

29+ {/if}

30+ <div class="flex flex-wrap md:flex-nowrap justify-center">

31+ <div class="mx-8 max-w-[128px] min-w-[128px] h-fit grow overflow-hidden rounded-lg">

32+ {#if contact.avatar}

33+ <img src={contact.avatar} alt="custom avatar"

34+ class="aspect-square object-cover max-w-[128px] min-w-0"

35+ />

36+ {:else}

37+ <Sigil patp={patp} size={128} bgColor={color} useNew />

38+ {/if}

39+ </div>

40+ {#if contact.bio}

41+ <div class="text-sm p-3 bg-white rounded-tl-lg rounded-br-lg whitespace-pre-line">

42+ <SvelteMarkdown source={contact.bio} />

43+ </div>

44+ {/if}

45+ </div>

46+ <!-- <p class="whitespace-pre-line">

47+ {contact.bio}

48+ </p> -->

49+ </div>

50+ </ExtensionWindow>

51+{/if}

52+

ui/src/components/pals/PalStatusIndicator.sveltenew file+191

@@ -0,0 +1,191 @@

1+<script lang="ts">

2+ import type { PalStatus } from 'lib/pals';

3+ import tooltip from 'actions/tooltip';

4+ export let status: PalStatus = 'unconnected';

5+ export let acked: boolean = true;

6+ let className: string = '';

7+ export { className as class };

8+

9+ let statusDescription = '', viewBox = '', width = '25';

10+ $: {

11+ switch (status) {

12+ case 'mutual':

13+ statusDescription = 'you are pals'

14+ viewBox = '12 12 100 100';

15+ width = '25';

16+ break;

17+ case 'outgoing':

18+ statusDescription = 'you added them in pals'

19+ viewBox = '0 12 68 100';

20+ width = '17';

21+ if (!acked) {

22+ statusDescription += ' (pending)'

23+ }

24+ break;

25+ case 'incoming':

26+ statusDescription = 'they added you in pals'

27+ viewBox = '24 12 76 100';

28+ width = '19';

29+ break;

30+ }

31+ }

32+</script>

33+{#if status !== 'unconnected'}

34+ <svg width={width} height="25" {viewBox} fill="none" xmlns="http://www.w3.org/2000/svg"

35+ use:tooltip={statusDescription}

36+ class={className}

37+ >

38+

39+ {#if status == 'mutual'}

40+ <path d="M108 50

41+ C108 61.9348 103.259 73.3807 94.8198 81.8198

42+ C86.3807 90.2589 74.9347 95 63 95

43+ C51.0653 95 39.6193 90.2589 31.1802 81.8198

44+ C22.7411 73.3807 18 61.9347 18 50" stroke="black" stroke-width="10"></path><path d="M87.5114 31.5994

45+ C87.5114 28.4354 84.9226 25.8466 81.7585 25.8466

46+ C78.5945 25.8466 76.0057 28.4354 76.0057 31.5994

47+ C76.0057 34.7635 78.5945 37.3523 81.7585 37.3523

48+ C84.9226 37.3523 87.5114 34.7635 87.5114 31.5994

49+ Z

50+ M51.0767 31.5994

51+ C51.0767 28.4354 48.4879 25.8466 45.3239 25.8466

52+ C42.1598 25.8466 39.571 28.4354 39.571 31.5994

53+ C39.571 34.7635 42.1598 37.3523 45.3239 37.3523

54+ C48.4879 37.3523 51.0767 34.7635 51.0767 31.5994

55+ Z" fill="black"></path>

56+ {:else if status == 'outgoing' }

57+ {#if acked}

58+ <path d="M50 95

59+ C44.0905 95 38.2389 93.836 32.7792 91.5746

60+ C27.3196 89.3131 22.3588 85.9984 18.1802 81.8198

61+ C14.0016 77.6412 10.6869 72.6804 8.42542 67.2208

62+ C6.16396 61.7611 5 55.9095 5 50" stroke="black" stroke-width="10"></path><path d="M30.5546 65.9099

63+ L28.7868 67.6777

64+ L32.3223 71.2132

65+ L34.0901 69.4454

66+ L30.5546 65.9099

67+ Z

68+ M67.6777 32.3223

69+ L39.7938 39.7938

70+ L60.2062 60.2062

71+ L67.6777 32.3223

72+ Z

73+ M34.0901 69.4454

74+ L53.5355 50

75+ L50 46.4645

76+ L30.5546 65.9099

77+ L34.0901 69.4454

78+ Z" fill="black"></path>

79+ {:else}

80+ <path d="M50 95

81+ C44.0905 95 38.2389 93.836 32.7792 91.5746

82+ C27.3196 89.3131 22.3588 85.9984 18.1802 81.8198

83+ C14.0016 77.6412 10.6869 72.6804 8.42542 67.2208

84+ C6.16396 61.7611 5 55.9095 5 50" stroke="black" stroke-width="10"></path><path d="M31.4384 66.7938

85+ L30.5546 67.6777

86+ L32.3223 69.4454

87+ L33.2062 68.5616

88+ L31.4384 66.7938

89+ Z

90+ M67.6777 32.3223

91+ L53.7357 36.0581

92+ L63.9419 46.2643

93+ L67.6777 32.3223

94+ Z

95+ M33.2062 68.5616

96+ L34.974 66.7938

97+ L33.2062 65.026

98+ L31.4384 66.7938

99+ L33.2062 68.5616

100+ Z

101+ M38.5095 63.2583

102+ L42.045 59.7227

103+ L40.2773 57.955

104+ L36.7417 61.4905

105+ L38.5095 63.2583

106+ Z

107+ M45.5806 56.1872

108+ L49.1161 52.6517

109+ L47.3483 50.8839

110+ L43.8128 54.4194

111+ L45.5806 56.1872

112+ Z

113+ M52.6516 49.1161

114+ L56.1872 45.5806

115+ L54.4194 43.8128

116+ L50.8839 47.3484

117+ L52.6516 49.1161

118+ Z

119+ M59.7227 42.0451

120+ L63.2583 38.5095

121+ L61.4905 36.7418

122+ L57.9549 40.2773

123+ L59.7227 42.0451

124+ Z

125+ M30.5546 65.9099

126+ L28.7868 67.6777

127+ L32.3223 71.2132

128+ L34.0901 69.4454

129+ L30.5546 65.9099

130+ Z

131+ M67.6777 32.3223

132+ L39.7938 39.7938

133+ L60.2062 60.2062

134+ L67.6777 32.3223

135+ Z

136+ M34.0901 69.4454

137+ L35.8579 67.6777

138+ L32.3223 64.1421

139+ L30.5546 65.9099

140+ L34.0901 69.4454

141+ Z

142+ M39.3934 64.1421

143+ L42.9289 60.6066

144+ L39.3934 57.0711

145+ L35.8579 60.6066

146+ L39.3934 64.1421

147+ Z

148+ M46.4645 57.0711

149+ L50 53.5355

150+ L46.4645 50

151+ L42.9289 53.5355

152+ L46.4645 57.0711

153+ Z

154+ M53.5355 50

155+ L57.0711 46.4645

156+ L53.5355 42.9289

157+ L50 46.4645

158+ L53.5355 50

159+ Z

160+ M60.6066 42.9289

161+ L64.1421 39.3934

162+ L60.6066 35.8579

163+ L57.0711 39.3934

164+ L60.6066 42.9289

165+ Z" fill="black"></path>

166+ {/if}

167+ {:else if status == 'incoming' }

168+ <path d="M95 50

169+ C95 55.9095 93.836 61.7611 91.5746 67.2208

170+ C89.3131 72.6804 85.9984 77.6412 81.8198 81.8198

171+ C77.6412 85.9984 72.6804 89.3131 67.2208 91.5746

172+ C61.7611 93.836 55.9095 95 50 95" stroke="black" stroke-width="10"></path><path d="M67.2383 68.7383

173+ L59.7669 40.8545

174+ L39.3545 61.2669

175+ L67.2383 68.7383

176+ Z

177+ M31.5294 29.4939

178+ L29.7617 27.7262

179+ L26.2261 31.2617

180+ L27.9939 33.0295

181+ L31.5294 29.4939

182+ Z

183+ M53.0962 51.0607

184+ L31.5294 29.4939

185+ L27.9939 33.0295

186+ L49.5607 54.5962

187+ L53.0962 51.0607

188+ Z" fill="black"></path>

189+ {/if}

190+ </svg>

191+{/if}

ui/src/components/pals/PalTagger.sveltenew file+40

@@ -0,0 +1,40 @@

1+<script lang="ts">

2+ import { getPal, tagPal, untagPal } from 'lib/pals';

3+ import store from 'stores/store';

4+

5+ export let patp: string;

6+

7+ $: pal = getPal($store.pals, patp);

8+

9+ let newTagText = '';

10+ $: newTags = newTagText.split(',').map(t => t.trim());

11+ $: sanitizedNewTags = newTags.map(t => t.toLocaleLowerCase().replaceAll(/[^-_.~a-z0-9]+/g, '_'));

12+ $: newTagsAreValid = newTags.every(tagIsValid);

13+ $: validationClasses = newTagsAreValid ? '' : 'border-red-500 bg-red-100'

14+

15+ function tagIsValid(tag: string): boolean {

16+ return /^[-_.~a-z0-9]*$/.test(tag);

17+ }

18+

19+ async function onTagSubmit({ key }) {

20+ if (newTagText && key == 'Enter') {

21+ await tagPal(patp, sanitizedNewTags);

22+ newTagText = '';

23+ }

24+ }

25+</script>

26+

27+<div class="flex flex-wrap gap-1 text-sm justify-center">

28+ {#each pal.tags as tag}

29+ <div class="flex bg-gray-200 rounded divide-gray-500 divide-x items-center">

30+ <span class="px-1">

31+ {tag}

32+ </span>

33+ <button class="px-1 text-gray-500" on:click={() => untagPal(patp, tag)}>

34+ X

35+ </button>

36+ </div>

37+ {/each}

38+</div>

39+<input type="text" class="px-1 text-sm border border-gray-400 rounded {validationClasses}"

40+ on:keydown={onTagSubmit} bind:value={newTagText} placeholder="add_tags, like_this" />

ui/src/components/pals/PalsShipViewExtension.sveltenew file+34

@@ -0,0 +1,34 @@

1+<script lang="ts">

2+ import { getPal, addPal, removePal } from 'lib/pals';

3+ import store from 'stores/store';

4+ import ExtensionWindow from '@/ExtensionWindow.svelte';

5+ import PalStatusIndicator from './PalStatusIndicator.svelte';

6+ import PalTagger from './PalTagger.svelte';

7+

8+ export let patp: string;

9+

10+ $: pal = getPal($store.pals, patp);

11+ $: palAdded = pal.status == 'outgoing' || pal.status == 'mutual';

12+ $: [buttonText, buttonFunc] = palAdded ? ['Remove Pal', removePal] : ['Add Pal', addPal];

13+ $: itsUs = patp.substring(1) === window.ship;

14+</script>

15+

16+{#if $store.palsInstalled && !itsUs}

17+ <ExtensionWindow name="%pals" halfWidth>

18+ <svelte:fragment slot="top-bar">

19+ <div class="grow ml-1 my-2 flex justify-center align-center">

20+ <PalStatusIndicator status={pal.status} acked={pal.ack} />

21+ <button class="bg-gray-200 ml-3 px-2 rounded" on:click={() => buttonFunc(patp)}>

22+ {buttonText}

23+ </button>

24+ </div>

25+ </svelte:fragment>

26+

27+ {#if palAdded}

28+ <div class="flex flex-wrap justify-center gap-3 my-3 conteents">

29+ <PalTagger {patp}></PalTagger>

30+ </div>

31+ {/if}

32+ </ExtensionWindow>

33+{/if}

34+

ui/src/components/search/SearchBar.sveltenew file+152

@@ -0,0 +1,152 @@

1+<script lang="ts">

2+ import SigilInput from './sigil/SigilInput.svelte';

3+ import Symbol from './sigil/Symbol.svelte';

4+

5+ import docs from 'stores/docs';

6+ import keys from 'stores/keys';

7+ import { SearchAnalysis } from 'lib/id';

8+ import { SigilQuery } from 'lib/sigil';

9+

10+ export let patp: string = undefined;

11+ export let analysis: SearchAnalysis = new SearchAnalysis();

12+ export let search = '';

13+ export let sigilQuery: SigilQuery = new SigilQuery('planet');

14+ sigilQuery.urlString = search;

15+ export let searchMode: ('patp' | 'sigil') = 'patp';

16+ export let allowSigilSearch: boolean = true;

17+ let defaultPlaceholderText = "Search by @p or #. '*' matches any character";

18+ export let placeholderText = defaultPlaceholderText;

19+

20+ $: {

21+ placeholderText = placeholderText ? placeholderText : defaultPlaceholderText;

22+ }

23+ $: {

24+ searchMode = allowSigilSearch ? searchMode : 'patp';

25+ }

26+ $: showSigilInput = searchMode == 'sigil';

27+

28+ let bouncySearch: string = search;

29+ let debouncedSearch: string = bouncySearch;

30+

31+ let timer;

32+ $: {

33+ if (!showSigilInput){

34+ if (bouncySearch !== search) {

35+ clearTimeout(timer);

36+ timer = setTimeout(() => {

37+ search = bouncySearch;

38+ }, 300);

39+ }

40+ }

41+ }

42+

43+ function updateSigilUrlString() {

44+ if (showSigilInput) {

45+ if (search !== sigilQuery.urlString) {

46+ sigilQuery.urlString = search;

47+ }

48+ }

49+ }

50+

51+ function updateSigilSearch() {

52+ if (showSigilInput) {

53+ if (sigilQuery.isNotEmpty) {

54+ search = sigilQuery.urlString;

55+ } else {

56+ search = '';

57+ }

58+ }

59+ }

60+

61+ $: search, updateSigilUrlString();

62+ $: sigilQuery.urlString, updateSigilSearch();

63+

64+ $: {

65+ if (showSigilInput) {

66+ if (sigilQuery.isDefinitive) {

67+ patp = sigilQuery.patp;

68+ } else {

69+ patp = undefined;

70+ }

71+ } else {

72+ analysis = new SearchAnalysis(search);

73+ if (analysis.patpIsValid) {

74+ patp = analysis.patp;

75+ } else {

76+ patp = undefined;

77+ }

78+ bouncySearch = search = analysis.search;

79+ }

80+ }

81+

82+ let searchInput;

83+ let searchFocused = false;

84+ function onFocus() { searchFocused = true; }

85+ function onBlur() { searchFocused = false; }

86+ function focus() { if (searchInput) searchInput.focus() }

87+ function blur() { if (searchInput) searchInput.blur() }

88+ $:{

89+ $keys.keyup.get('/').set('searchBar', focus);

90+ // generic binding in App.svelte takes care of blur

91+ $keys.keyup.get('p').set('searchBar', closeSigilInput);

92+ $keys.keyup.get('s').set('searchBar', openSigilInput);

93+ }

94+

95+ function openSigilInput() {

96+ if (allowSigilSearch)

97+ searchMode = 'sigil';

98+ }

99+

100+ function closeSigilInput() {

101+ searchMode = 'patp';

102+ bouncySearch = patp || analysis.search;

103+ debouncedSearch = bouncySearch;

104+ search = debouncedSearch;

105+ }

106+

107+ function showSigilDoc() {

108+ docs.show('sigil-input');

109+ }

110+

111+ const buttonClasses = 'rounded-full bg-black text-white text-sm transition-opacity opacity-50 hover:opacity-80';

112+</script>

113+

114+<div class="relative max-w-md w-full">

115+ {#if showSigilInput}

116+ <div class="rounded-2xl bg-white overflow-hidden">

117+ <SigilInput bind:sigilQuery></SigilInput>

118+ </div>

119+ <button

120+ on:click={showSigilDoc}

121+ class="absolute top-2 left-2 w-6 h-6 {buttonClasses}"

122+ >

123+ ?

124+ </button>

125+ <button

126+ on:click={closeSigilInput}

127+ class="absolute top-2 right-2 w-20 h-6 {buttonClasses}"

128+ >

129+ patp or #

130+ </button>

131+ {:else}

132+ <input type="text" class="p-4 py-2 w-full rounded-full"

133+ spellcheck="false"

134+ placeholder={placeholderText}

135+ on:input={(e) => bouncySearch = e.target.value}

136+ on:focus={onFocus} on:blur={onBlur}

137+ bind:this={searchInput}

138+ value={search}

139+ autofocus

140+ />

141+ {#if allowSigilSearch}

142+ <button

143+ on:click={openSigilInput}

144+ class="absolute top-1 right-1 w-8 h-8 {buttonClasses}"

145+ >

146+ <Symbol components={'gci.lvf.lhf.lbhb.atrf4.al3.cbl2lf.cbl2mb'.split('.')} size={32}

147+ altBgColor="transparent"

148+ />

149+ </button>

150+ {/if}

151+ {/if}

152+</div>

ui/src/components/SearchResultNavButtons.svelte → ui/src/components/search/SearchResultNavButtons.svelterenamed

The content is the same.

ui/src/components/SearchResults.svelte → ui/src/components/search/SearchResults.svelterenamed+18−9

@@ -1,15 +1,18 @@

11<script lang="ts">

22

33 import type { Patp, Rolodex } from '@urbit/api';

4− import { searchPoints } from '../lib/api';

5− import { searchedContacts } from '../stores/searchStores';

6− import ShipListings from './ShipListings.svelte';

4+ import { searchPoints } from 'lib/api';

5+ import type { SigilQuery } from 'lib/sigil';

6+ import { searchedContacts } from 'stores/searchStores';

7+ import ShipListings from '@/ShipListings.svelte';

78 import SearchSettings from './SearchSettings.svelte';

89 import SearchResultsNavButtons from './SearchResultsNavButtons.svelte';

910

10− export let query: RegExp;

11− export let search: string;

12− // export let patp: string;

11+ export let regexQuery: RegExp;

12+ export let sigilQuery: SigilQuery;

13+ export let patpSearch: string;

14+ export let searchMode: ('patp' | 'sigil') = 'patp';

15+

1316 let combinedSearchResults = [];

1417 let searchedPointsP: Promise<any>;

1518 let searchedPoints: Patp[] = [];

@@ -25,14 +28,19 @@

2528 $: {

2629 clearTimeout(timer);

2730 timer = setTimeout(() => {

28− searchedContacts.search(query);

31+ if (searchMode == 'patp') {

32+ searchedContacts.searchPatp(regexQuery);

33+ } else if (searchMode == 'sigil') {

34+ searchedContacts.searchSigil(sigilQuery.querySyls);

35+ }

2936 }, 1000);

3037 }

38+

3139 function doSearch() {

3240 const searchSnap = search;

3341 searchStatus = 'prog';

3442 console.log(`starting search for "${searchSnap}"`);

35− searchedPointsP = searchPoints(searchSnap);

43+ searchedPointsP = searchPoints(searchSnap, searchMode);

3644 searchedPointsP.then((points) => {

3745 if (search === searchSnap) {

3846 searchedPoints = points;

@@ -48,7 +56,8 @@

4856 }

4957 });

5058 }

51− $: search, doSearch();

59+ $: search = (searchMode === 'sigil') ? sigilQuery.string : patpSearch;

60+ $: [search], doSearch();

5261

5362 $: {

5463 const contactSearchResults: Rolodex = JSON.parse(JSON.stringify($searchedContacts));

ui/src/components/SearchResultsNavButtons.svelte → ui/src/components/search/SearchResultsNavButtons.svelterenamed

The content is the same.

ui/src/components/SearchSettings.svelte → ui/src/components/search/SearchSettings.svelterenamed+3−3

@@ -1,8 +1,8 @@

11<script lang="ts">

2− import ToggleButton from './buttons/ToggleButton.svelte';

2+ import ToggleButton from '../buttons/ToggleButton.svelte';

33

4− import { searchSettings } from '../stores/searchStores';

5− import { toggleStoreKey } from '../lib/utils';

4+ import { searchSettings } from 'stores/searchStores';

5+ import { toggleStoreKey } from 'lib/utils';

66

77 function toggleMoons() {

88 toggleStoreKey(searchSettings, 'includeMoons');

ui/src/components/search/sigil/ClanSelect.sveltenew file+44

@@ -0,0 +1,44 @@

1+<script lang="ts">

2+ import ClanSelectOption from './ClanSelectOption.svelte';

3+

4+ import { capitalize } from 'lib/utils';

5+ import { CLANS, Clan } from 'types/sigil';

6+ import keys from 'stores/keys';

7+

8+ export let clan: Clan = 'planet';

9+

10+ let dropdownOpen = false;

11+

12+ function openDropdown() { dropdownOpen = true }

13+ function closeDropdown() { dropdownOpen = false }

14+

15+ function selectClan(itemClan: typeof clan) {

16+ clan = itemClan;

17+ dropdownOpen = false;

18+ }

19+

20+ $: {

21+ $keys.keyup.get('escape').set('clanSelect', closeDropdown);

22+ }

23+</script>

24+

25+<div class="text-xl text-center bg-white">

26+ <p

27+ on:click={openDropdown}

28+ class=" py-2"

29+ >

30+ {capitalize(clan)}

31+ <span class="font-mono">▼</span>

32+ </p>

33+ {#if dropdownOpen}

34+ <div class="absolute z-20 top-1 w-full flex flex-col mx-auto divide-y bg-white rounded-2xl border-b">

35+ <h3 class="py-2" on:click={closeDropdown}>

36+ Select Sigil Type

37+ </h3>

38+ {#each CLANS as itemClan}

39+ <ClanSelectOption clan={itemClan} on:click={() => selectClan(itemClan)} />

40+ {/each}

41+ </div>

42+ {/if}

43+</div>

44+

ui/src/components/search/sigil/ClanSelectOption.sveltenew file+17

@@ -0,0 +1,17 @@

1+<script lang="ts">

2+ import { capitalize } from 'lib/utils';

3+ import MiniFakeSigil from './MiniFakeSigil.svelte';

4+

5+ export let sigilSearch = {};

6+ export let clan: ('galaxy' | 'star' | 'planet') = 'planet';

7+

8+ let dropdownOpen = true;

9+</script>

10+

11+<div class="flex items-center justify-center gap-2 py-2" on:click>

12+ <h3>

13+ {capitalize(clan)}:

14+ </h3>

15+ <MiniFakeSigil {clan} />

16+</div>

17+

ui/src/components/search/sigil/GeonSelector.sveltenew file+30

@@ -0,0 +1,30 @@

1+<script lang="ts">

2+ import SymbolInputModeSelectorButton from './SymbolInputModeSelectorButton.svelte';

3+

4+ import { searchSettings } from 'stores/searchStores';

5+ import type { SymbolQuery } from 'lib/sigil';

6+ import { GEONS } from 'types/sigil';

7+ import { arePartsPlausible } from 'lib/sigil';

8+

9+ export let symbolQuery: SymbolQuery;

10+ export let popMode: Function;

11+

12+ function setGeon(geon) {

13+ symbolQuery.geon = geon;

14+ popMode();

15+ }

16+

17+ $: componentsSansGeon = symbolQuery.components.filter(c => c[0] !== 'g');

18+</script>

19+

20+{#each GEONS as geon}

21+ {@const plausible = $searchSettings.allowFictionalSigils ||

22+ arePartsPlausible(componentsSansGeon, symbolQuery.symbolType, [geon])

23+ }

24+ <SymbolInputModeSelectorButton components={[geon]}

25+ focused={geon === symbolQuery.geon}

26+ enabled={plausible}

27+ on:click={() => setGeon(geon)}

28+ />

29+{/each}

30+

ui/src/components/search/sigil/MiniFakeSigil.sveltenew file+25

@@ -0,0 +1,25 @@

1+<script lang="ts">

2+ import { sigilFromSymbols, stringRenderer as sr, symbolFromDef } from '@johnhyde/sigil-js';

3+

4+ export let clan: ('galaxy' | 'star' | 'planet') = 'planet';

5+

6+ let size = 32;

7+ let squareDef = ['gci'];

8+ let square = symbolFromDef(squareDef);

9+ let sigilProps = {

10+ size,

11+ renderer: sr,

12+ colors: ['white', 'black'],

13+ icon: true,

14+ }

15+ let sigils = {

16+ galaxy: sigilFromSymbols([square], sigilProps),

17+ star: sigilFromSymbols([square, square], sigilProps),

18+ planet: sigilFromSymbols([square, square, square, square], sigilProps),

19+ }

20+ $: sigilWidth = (clan === 'galaxy' ? size / 2 : size);

21+</script>

22+

23+<div style:width="{sigilWidth}px">

24+ {@html sigils[clan]}

25+</div>

ui/src/components/search/sigil/SigilInput.sveltenew file+104

@@ -0,0 +1,104 @@

1+<script lang="ts">

2+ import SymbolInputModeSelector from './SymbolInputModeSelector.svelte';

3+ import SymbolInputNavButtons from './SymbolInputNavButtons.svelte';

4+ import SymbolInput from './SymbolInput.svelte';

5+ import ClanSelect from './ClanSelect.svelte';

6+ import ToggleButton from '@/buttons/ToggleButton.svelte';

7+

8+ import type { SigilQuery } from 'lib/sigil';

9+ import { toggleStoreKey } from 'lib/utils';

10+ import { searchSettings } from 'stores/searchStores';

11+ import keys from 'stores/keys';

12+

13+ export let sigilQuery: SigilQuery;

14+ let focusedSymbolIndex: number = undefined;

15+ let inputComponents: string[] = [];

16+

17+ $: gridClasses = (sigilQuery.clan === 'galaxy' ? 'max-w-[10rem] grid items-center' : 'max-w-[18rem] grid grid-cols-2 items-center');

18+

19+ function unfocusSymbol() {

20+ focusedSymbolIndex = undefined;

21+ }

22+ $: focusedSymbol = sigilQuery.activeSymbols[focusedSymbolIndex];

23+ $: {

24+ const numActiveSymbols = sigilQuery.activeSymbols.length;

25+ if (focusedSymbolIndex >= numActiveSymbols) {

26+ focusedSymbolIndex = numActiveSymbols - 1;

27+ }

28+ }

29+

30+ function toggleAllowFictional() {

31+ toggleStoreKey(searchSettings, 'allowFictionalSigils');

32+ }

33+

34+ function clear() {

35+ sigilQuery = sigilQuery.clearSymbols();

36+ }

37+

38+ $: {

39+ sigilQuery.allowFictional = $searchSettings.allowFictionalSigils;

40+ }

41+

42+ function keyboardClear() {

43+ if (!focusedSymbol) {

44+ clear();

45+ }

46+ }

47+

48+ $: {

49+ $keys.keyup.get('x').set('sigilInput', keyboardClear);

50+ $keys.keyup.get('backspace').set('sigilInput', keyboardClear);

51+ }

52+</script>

53+

54+<div>

55+ <ClanSelect bind:clan={sigilQuery.clan} />

56+ <div class="flex flex-col xs:flex-row">

57+ <div class="grow-[2] w-full xs:m-0 xs:max-w-[18rem]" on:click={unfocusSymbol}>

58+ <div class="min-h-[14rem] mx-auto p-4 {gridClasses} xs:rounded-bl-2xl">

59+ {#each sigilQuery.activeSymbols as symbol, index}

60+ <SymbolInput

61+ bind:symbolQuery={symbol}

62+ {focusedSymbolIndex}

63+ {index}

64+ clan={sigilQuery.clan}

65+ {inputComponents}

66+ on:click={() => focusedSymbolIndex = index}

67+ />

68+ {/each}

69+ </div>

70+ </div>

71+ <div class="px-4 py-2 border-t grow rounded-b-2xl xs:border-l xs:border-t-0 xs:rounded-bl-none">

72+ {#if focusedSymbol}

73+ <SymbolInputModeSelector

74+ bind:symbolQuery={focusedSymbol}

75+ bind:inputComponents

76+ unfocusSymbol={unfocusSymbol}

77+ />

78+ {:else}

79+ <SymbolInputNavButtons onClear={sigilQuery.isNotEmpty ? clear : null} />

80+ <p class="mt-2">

81+ Allow impossible Sigils:

82+ <ToggleButton on:click={toggleAllowFictional} on={$searchSettings.allowFictionalSigils} />

83+ </p>

84+ {/if}

85+ </div>

86+ </div>

87+ <!-- {#each sigilQuery.activeSymbols as symbol}

88+ {@const plausibleSyllables = symbol.plausibleSyllables}

89+ {@const plausibleParts = symbol.plausibleParts}

90+ <p>

91+ {#if plausibleSyllables.length < 20 && plausibleSyllables.length > 0}

92+ {plausibleSyllables.join(', ')}:

93+ {#if plausibleParts.length < 20 && plausibleParts.length > 0}

94+ {plausibleParts.join(', ')}

95+ {:else}

96+ {plausibleParts.length}

97+ {/if}

98+ {:else}

99+ {plausibleSyllables.length}

100+ {/if}

101+ </p>

102+ {/each} -->

103+

104+</div>

ui/src/components/search/sigil/Symbol.sveltenew file+79

@@ -0,0 +1,79 @@

1+<script lang="ts">

2+ import { createEventDispatcher } from 'svelte';

3+ import { sigilFromSymbols, stringRenderer as sr, symbolFromDef } from '@johnhyde/sigil-js';

4+ import { sigilScalingFunction } from 'lib/sigil';

5+ import symbolPartClick from 'actions/symbolPartClick';

6+

7+ export let components: string[];

8+ export let size: number;

9+ export let fgColor: string = 'black';

10+ export let bgColor: string = 'white';

11+ export let altBgColor: string = undefined;

12+ export let hoverColor: string = '#8f8';

13+ export let opacity: number = 1;

14+ export let inverted: boolean = false;

15+ export let interactive: boolean = false;

16+ export let strokeWidthFactor: number = 1;

17+ let svgString: any;

18+

19+ const dispatch = createEventDispatcher();

20+

21+ $: {

22+ const symbol = symbolFromDef(components);

23+ let colors = [bgColor, fgColor];

24+ let tempAltBgColor = altBgColor;

25+ if (inverted) {

26+ colors = [fgColor, bgColor];

27+ if (!tempAltBgColor) tempAltBgColor = bgColor;

28+ }

29+ const svgAST = sigilFromSymbols(

30+ [symbol],

31+ {

32+ size,

33+ colors,

34+ margin: false,

35+ autoScaleStrokes: true,

36+ strokeScalingFunctionV2: (s) => {

37+ return strokeWidthFactor * sigilScalingFunction(s);

38+ },

39+ },

40+ );

41+ svgAST.attributes.preserveAspectRatio = 'xMidYMin slice';

42+ svgString = sr(svgAST);

43+ if (tempAltBgColor) {

44+ svgString = svgString.replace(/rect fill="[^"]+"/, `rect fill="${tempAltBgColor}"`);

45+ }

46+ }

47+

48+ function onPartClick(partId: string) {

49+ dispatch('partClick', partId);

50+ }

51+</script>

52+

53+<style lang="scss" global>

54+ .interactive {

55+ svg {

56+ pointer-events: none;

57+ }

58+

59+ path, circle, line {

60+ pointer-events: auto;

61+

62+ &:not([dataisgeon="true"]):hover {

63+ stroke: var(--hoverColor);

64+ }

65+ }

66+

67+ circle:not([dataisgeon="true"]):not([fill="none"]):hover {

68+ fill: var(--hoverColor);

69+ }

70+ }

71+</style>

72+

73+<div class="aspect-square" class:interactive style:max-width="{size}px"

74+ style="--hoverColor: {hoverColor}; opacity: {opacity};"

75+ on:click

76+ use:symbolPartClick={{ onPartClick, enabled: interactive, svgString }}

77+>

78+ {@html svgString}

79+</div>

ui/src/components/search/sigil/SymbolInput.sveltenew file+105

@@ -0,0 +1,105 @@

1+<script lang="ts">

2+ import Symbol from './Symbol.svelte';

3+ import without from 'lodash/without';

4+

5+ import { searchSettings } from 'stores/searchStores';

6+ import type { SymbolQuery } from 'lib/sigil';

7+ import { filterPartsByGeon } from 'lib/sigil';

8+

9+ export let symbolQuery: SymbolQuery;

10+ export let focusedSymbolIndex: number;

11+ export let index: number = 0;

12+ export let clan: string = 'galaxy';

13+ export let inputComponents: string[] = [];

14+ export let fgColor = 'black';

15+ export let bgColor = 'white';

16+ let size = 128;

17+

18+ let translateClass;

19+ $: {

20+ translateClass = 'translate-x-0 translate-y-0';

21+ if (focusedSymbolIndex !== undefined) {

22+ if (clan === 'star') {

23+ translateClass = index ? 'origin-right' : 'origin-left';

24+ } else if (clan === 'planet') {

25+ let cornerIndex = index;

26+ if (!focused) cornerIndex = focusedSymbolIndex;

27+ switch (cornerIndex) {

28+ case 0: translateClass = 'translate-x-1/4 translate-y-1/4'; break;

29+ case 1: translateClass = '-translate-x-1/4 translate-y-1/4'; break;

30+ case 2: translateClass = 'translate-x-1/4 -translate-y-1/4'; break;

31+ case 3:

32+ default: translateClass = '-translate-x-1/4 -translate-y-1/4';

33+ }

34+ }

35+ }

36+ }

37+ $: scaleClass = 'scale-150 ';

38+

39+ $: focused = index === focusedSymbolIndex;

40+ $: focusedClasses = (

41+ focused ? `${scaleClass} z-10`

42+ : (focusedSymbolIndex !== undefined ? 'scale-50' : '' )

43+ );

44+

45+ function onPartDelete({ detail: partId }) {

46+ symbolQuery = symbolQuery.removePart(partId);

47+ }

48+

49+ function onPartClick({ detail: partId }) {

50+ symbolQuery = symbolQuery.addPart(partId);

51+ }

52+

53+ let filteredInputComponents = [];

54+ let inputContainsStrokes;

55+ $: {

56+ if (inputComponents) {

57+ filteredInputComponents = without(inputComponents, ...symbolQuery.components);

58+ } else {

59+ filteredInputComponents = [];

60+ }

61+ filteredInputComponents = filterPartsByGeon(filteredInputComponents, symbolQuery.geon);

62+ }

63+ $: {

64+ inputContainsStrokes = undefined !== filteredInputComponents.find((c) => {

65+ return c[0] === 'l' || c[0] === 'a' || c[0] === 'b';

66+ });

67+ }

68+ $: plausible = $searchSettings.allowFictionalSigils || symbolQuery.isPlausible;

69+</script>

70+

71+<div class="aspect-square relative flex transition {translateClass} {focusedClasses}"

72+ style:max-width="{size}px"

73+ on:click|stopPropagation

74+>

75+ {#if symbolQuery.components.length > 0}

76+ <Symbol components={symbolQuery.components} {size}

77+ inverted={!symbolQuery.geon}

78+ interactive={focused}

79+ strokeWidthFactor={focused ? 2 : 1}

80+ fgColor={!plausible ? 'red' : (symbolQuery.isPerfectMatch ? 'black' : '#333')}

81+ bgColor="white"

82+ altBgColor="transparent"

83+ hoverColor="red"

84+ on:partClick={onPartDelete}

85+ />

86+ {:else}

87+ <div class="border-[1.5px] border-white grow bg-white">

88+ <div class="rounded-md border-4 border-gray-500 h-full"></div>

89+ </div>

90+ {/if}

91+ {#if focused && filteredInputComponents.length}

92+ <div class="absolute inset-0 pointer-events-none">

93+ <Symbol components={filteredInputComponents} {size}

94+ strokeWidthFactor={inputContainsStrokes ? 2.5 : 1}

95+ fgColor={symbolQuery.geon ? bgColor : fgColor}

96+ bgColor={!symbolQuery.geon ? bgColor : fgColor}

97+ altBgColor="transparent"

98+ opacity={0.5}

99+ inverted

100+ interactive

101+ on:partClick={onPartClick}

102+ />

103+ </div>

104+ {/if}

105+</div>

ui/src/components/search/sigil/SymbolInputModeSelector.sveltenew file+168

@@ -0,0 +1,168 @@

1+<script lang="ts">

2+ import SymbolInputNavButtons from './SymbolInputNavButtons.svelte';

3+

4+ import GeonSelector from './GeonSelector.svelte';

5+ import SymbolInputModeSelectorButton from './SymbolInputModeSelectorButton.svelte';

6+

7+ import { searchSettings } from 'stores/searchStores';

8+ import keys from 'stores/keys';

9+ import type { PartType, ModeDef, ModeDefs } from 'types/sigil';

10+ import type { SymbolQuery } from 'lib/sigil';

11+ import { MODE_DEFS } from 'types/sigil';

12+ import { filterPartsByGeon, getDeepParts } from 'lib/sigil';

13+

14+ export let symbolQuery: SymbolQuery = null;

15+ export let inputComponents: string[] = [];

16+ export let unfocusSymbol: Function = () => {};

17+

18+ let mode: string = null;

19+ let subMode: string = null;

20+ let modeDef: ModeDef = undefined;

21+ let unselectedSubModesExist: boolean = false;

22+ let modeDefs: ModeDefs = MODE_DEFS;

23+ let plausibleModeDefs: { name: string, def: ModeDef }[] = [];

24+

25+ function showGeonSelector() {

26+ if (!symbolQuery.components.length && !mode) {

27+ mode = 'geon';

28+ subMode = null;

29+ }

30+ }

31+

32+ $: symbolQuery.components, showGeonSelector();

33+

34+ function pushMode(newMode: string) {

35+ const subModes = modeDef?.modes;

36+ if (subModes || subMode) {

37+ subMode = newMode;

38+ } else {

39+ mode = newMode;

40+ subMode = null;

41+ }

42+ }

43+

44+ function popMode() {

45+ if (mode || subMode) {

46+ mode = null;

47+ subMode = null;

48+ } else {

49+ unfocusSymbol();

50+ }

51+ }

52+

53+ $: {

54+ let modeResolved = false;

55+ let count = 0;

56+ while (!modeResolved && count < 5) {

57+ modeDef = undefined;

58+ modeDefs = MODE_DEFS;

59+ if (mode) {

60+ modeDef = MODE_DEFS[mode];

61+ }

62+ unselectedSubModesExist = !!modeDef?.modes;

63+ if (unselectedSubModesExist) {

64+ modeDefs = modeDef.modes;

65+ if (subMode) {

66+ if (modeDefs[subMode]) {

67+ modeDef = modeDefs[subMode];

68+ } else {

69+ console.error(`Unknown subMode: ${subMode} of ${mode} in defs:`, modeDefs);

70+ subMode = null;

71+ }

72+ }

73+ }

74+ unselectedSubModesExist = !!modeDef?.modes;

75+ if (!isDefPlausible(modeDef) && mode !== 'geon') {

76+ if (subMode) {

77+ subMode = null;

78+ } else {

79+ mode = null;

80+ }

81+ } else {

82+ plausibleModeDefs = getPlausibleModeDefs(modeDefs);

83+ if (unselectedSubModesExist) {

84+ subMode = plausibleModeDefs[0].name;

85+ } else {

86+ modeResolved = true;

87+ }

88+ }

89+ count++;

90+ if (count >= 5 && !modeResolved) {

91+ console.error("sigil input mode resulotion failed");

92+ }

93+ }

94+ inputComponents = [];

95+ if (modeDef?.parts?.length) {

96+ inputComponents = modeDef.parts;

97+ if (!$searchSettings.allowFictionalSigils) {

98+ inputComponents = symbolQuery.filterPlausibleParts(inputComponents);

99+ }

100+ }

101+ }

102+

103+ function isDefPlausible(def: ModeDef): boolean {

104+ if (!def) return true;

105+ const deepParts = getDeepParts(def);

106+ return $searchSettings.allowFictionalSigils || symbolQuery.arePartsPlausible(deepParts);

107+ }

108+

109+ function getPlausibleModeDefs(modeDefs: ModeDefs) {

110+ return Object.entries(modeDefs).map(([modeName, def]) => {

111+ const plausible = isDefPlausible(def);

112+ if (!plausible && modeName !== 'geon') return null;

113+ const parts = filterPartsByGeon(def.displayParts || def.parts, symbolQuery.geon);

114+ return {

115+ name: modeName,

116+ def: {

117+ ...def,

118+ parts,

119+ },

120+ };

121+ }).filter(mode => mode !== null);

122+ }

123+

124+ function clear() {

125+ // If a geon is present it should be preserved, unless it's the only component

126+ // If there's only 1 component, it should be removed

127+ // Otherwise, at least one component might be a geon and should be preserved

128+ if (symbolQuery.components.length === 1) {

129+ symbolQuery = symbolQuery.clear();

130+ } else {

131+ symbolQuery = symbolQuery.clearExceptPartType('geon');

132+ }

133+ }

134+

135+ $: {

136+ $keys.keyup.get('x').set('sigilMode', clear);

137+ $keys.keyup.get('backspace').set('sigilMode', clear);

138+ $keys.keyup.get('escape').set('sigilMode', popMode);

139+ }

140+</script>

141+

142+<style lang="scss">

143+ .grid-cols-custom {

144+ grid-template-columns: repeat(auto-fill, 48px);

145+ }

146+</style>

147+

148+<div class="mx-auto flex justify-center xs:items-center xs:flex-col">

149+ <SymbolInputNavButtons onDone={popMode} onClear={clear} hideClearButton={symbolQuery.components.length == 0} />

150+ <div class="max-w-[15rem] h-full grid grid-cols-custom gap-1 justify-center xs:max-w-[8rem]">

151+ {#if mode === 'geon'}

152+ <GeonSelector bind:symbolQuery {popMode} />

153+ {:else}

154+ {#each plausibleModeDefs as { name, def: { parts } }}

155+ <SymbolInputModeSelectorButton components={parts} focused={mode === name || subMode === name}

156+ on:click={() => pushMode(name)}

157+ />

158+ {/each}

159+ {/if}

160+ </div>

161+ <!-- <p class="break-all w-24">

162+ mode: {mode}

163+ </p>

164+ <p class="break-all w-24">

165+ sub: {subMode}

166+ </p> -->

167+</div>

168+

ui/src/components/search/sigil/SymbolInputModeSelectorButton.sveltenew file+33

@@ -0,0 +1,33 @@

1+<script lang="ts">

2+ import { createEventDispatcher } from 'svelte';

3+ import Symbol from './Symbol.svelte';

4+

5+ export let components: string[] = [];

6+ export let focused: boolean = false;

7+ export let enabled: boolean = true;

8+ export let padding: number = undefined;

9+

10+ const dispatch = createEventDispatcher();

11+ let size = 48;

12+

13+ $: focusedClasses = focused ? 'border-2 border-gold-s1 p-[3px]' : 'border border-gray-500 p-[4px]';

14+ $: enabledClasses = enabled ? '' : 'opacity-50';

15+ $: includesGeon = components.find(c => c[0] === 'g') !== undefined;

16+ $: defaultPadding = includesGeon ? 0 : 0;

17+ $: actualPadding = padding !== undefined ? padding : defaultPadding;

18+

19+ function onClick(e) {

20+ if (enabled) dispatch('click', e);

21+ }

22+</script>

23+<div

24+class="bg-white rounded-md w-[48px] {focusedClasses} {enabledClasses}"

25+on:click={onClick}

26+>

27+<div class:cursor-pointer={enabled}

28+ style:padding="{actualPadding}px"

29+>

30+ <Symbol {components} {size} inverted={!includesGeon} />

31+</div>

32+</div>

33+

ui/src/components/search/sigil/SymbolInputNavButtons.sveltenew file+30

@@ -0,0 +1,30 @@

1+<script lang="ts">

2+ import upArrow from 'assets/up-arrow.svg';

3+ import xIcon from 'assets/x.svg';

4+

5+ export let onDone: () => void = null;

6+ export let onClear: () => void = null;

7+ export let hideDoneButton = false;

8+ export let hideClearButton = false;

9+

10+ $: showDoneButton = (onDone && !hideDoneButton);

11+ $: showClearButton = (onClear && !hideClearButton);

12+

13+ let buttonClasses = 'cursor-pointer border border-gray-500 rounded-md aspect-square w-[48px]';

14+</script>

15+

16+<style lang="scss">

17+ .grid-cols-custom {

18+ grid-template-columns: repeat(auto-fill, 48px);

19+ }

20+</style>

21+

22+<div class="grid gap-1 self-start justify-center mr-1 xs:mr-0 xs:mb-1 xs:self-stretch {(showDoneButton && showClearButton) ? 'grid-cols-custom' : ''}">

23+ {#if showDoneButton}

24+ <img src={upArrow} alt="done" class={buttonClasses} on:click={onDone}/>

25+ {/if}

26+ {#if showClearButton}

27+ <img src={xIcon} alt="clear" class={buttonClasses} on:click={onClear}/>

28+ {/if}

29+ </div>

30+

ui/src/components/ship_view/AzimuthDetails.sveltenew file+90

@@ -0,0 +1,90 @@

1+<script lang="ts">

2+ import { clan } from 'urbit-ob';

3+ import TooltipAndDocLink from '@/common/TooltipAndDocLink.svelte';

4+ import EthAddressLink from '@/common/EthAddressLink.svelte';

5+ import ShipChain from './ShipChain.svelte';

6+

7+ export let patp: string;

8+ export let pointInfo: any = {};

9+

10+

11+ $: shipClass = clan(patp);

12+ $: azPoint = ['galaxy', 'star', 'planet'].includes(shipClass);

13+</script>

14+

15+{#if azPoint && pointInfo.life !== undefined}

16+ {#if shipClass !== 'galaxy'}

17+ <p>

18+ {#if pointInfo.sponsorChain && pointInfo.sponsorChain.length > 0}

19+ <p>

20+ {pointInfo.sponsorChain.length === 1 ? 'Sponsor:' : 'Sponsor Chain:'}

21+ <ShipChain shipChain={pointInfo.sponsorChain}></ShipChain>

22+ </p>

23+ {:else}

24+ Unsponsored

25+ {/if}

26+ </p>

27+ {/if}

28+ <p>

29+ <TooltipAndDocLink

30+ text="Number of times this ship's keys have been set. Must be at least 1 to use the network."

31+ doc="keys"

32+ class="inline"

33+ >

34+ Key Revision:

35+ {pointInfo.life}

36+ </TooltipAndDocLink>

37+ </p>

38+ <p>

39+ <TooltipAndDocLink

40+ text="Number of times this ship has breached."

41+ doc="keys"

42+ class="inline"

43+ >

44+ Factory Resets:

45+ {pointInfo.rift}

46+ </TooltipAndDocLink>

47+ </p>

48+ {#if pointInfo.proxies}

49+ <p>

50+ <span>

51+ Owner:

52+ <EthAddressLink address={pointInfo.proxies.owner.address} />

53+ </span>

54+ </p>

55+ <p>

56+ <span>

57+ Management Proxy:

58+ <EthAddressLink address={pointInfo.proxies['management-proxy'].address}>

59+ <span class="text-gray-700">not set</span>

60+ </EthAddressLink>

61+ </span>

62+ </p>

63+ <p>

64+ <span>

65+ Spawn Proxy:

66+ <EthAddressLink address={pointInfo.proxies['spawn-proxy'].address}>

67+ <span class="text-gray-700">not set</span>

68+ </EthAddressLink>

69+ </span>

70+ </p>

71+ <p>

72+ <span>

73+ Transfer Proxy:

74+ <EthAddressLink address={pointInfo.proxies['transfer-proxy'].address}>

75+ <span class="text-gray-700">not set</span>

76+ </EthAddressLink>

77+ </span>

78+ </p>

79+ {#if shipClass === 'galaxy'}

80+ <p>

81+ <span>

82+ Voting Proxy:

83+ <EthAddressLink address={pointInfo.proxies['voting-proxy'].address}>

84+ [not set]

85+ </EthAddressLink>

86+ </span>

87+ </p>

88+ {/if}

89+ {/if}

90+{/if}

ui/src/components/ShipChain.svelte → ui/src/components/ship_view/ShipChain.svelterenamed+1−1

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

11<script lang="ts">

2− import ShipLink from './ShipLink.svelte';

2+ import ShipLink from '@/common/ShipLink.svelte';

33

44 export let shipChain: string[];

55</script>

ui/src/components/ship_view/ShipChildrenTabs.sveltenew file+136

@@ -0,0 +1,136 @@

1+<script lang="ts">

2+ import { clan } from 'urbit-ob';

3+

4+ import { normalizeId, filterIdsForChildMoons } from 'lib/id';

5+ import { getSpawnedPoints, getUnlockedSpawnedPoints, getLockedSpawnedPoints } from 'lib/api';

6+ import store from 'stores/store';

7+ import ShipListings from '@/ShipListings.svelte';

8+

9+ export let patp: string;

10+ export let spawnedCount: number = undefined;

11+

12+ let rawSpawnedPointsPromise: any;

13+ let rawSpawnedPoints: any = null;

14+ let rawLockedPointsPromise: any;

15+ let rawLockedPoints: any = null;

16+ let spawnedPoints: string[] = [];

17+ let lockedPoints: string[] = [];

18+

19+ $: shipClass = clan(patp);

20+ $: azPoint = ['galaxy', 'star', 'planet'].includes(shipClass);

21+ $: canSpawnPoints = ['galaxy', 'star'].includes(shipClass);

22+ $: spawnableClassPlural = !canSpawnPoints ? '' : (shipClass === 'galaxy' ? 'Star' : 'Planet');

23+ $: {

24+ rawSpawnedPoints = null;

25+ rawLockedPoints = null;

26+ if (canSpawnPoints) {

27+ let galaxy = shipClass === 'galaxy';

28+ let getSpawnedPointsFunc = galaxy ? getUnlockedSpawnedPoints : getSpawnedPoints;

29+ if (galaxy) {

30+ rawLockedPointsPromise = getLockedSpawnedPoints(patp);

31+ rawLockedPointsPromise.then((info) => {

32+ rawLockedPoints = info;

33+ }).catch((error) => {

34+ rawLockedPoints = { error };

35+ });

36+ }

37+ rawSpawnedPointsPromise = getSpawnedPointsFunc(patp);

38+ rawSpawnedPointsPromise.then((info) => {

39+ rawSpawnedPoints = info;

40+ }).catch((error) => {

41+ rawSpawnedPoints = { error };

42+ });

43+ }

44+ }

45+ $: {

46+ spawnedPoints = [];

47+ if (rawSpawnedPoints?.points) {

48+ spawnedPoints = rawSpawnedPoints?.points.map(patpToShip);

49+ }

50+ }

51+ $: {

52+ lockedPoints = [];

53+ if (rawLockedPoints?.points) {

54+ lockedPoints = rawLockedPoints?.points.map(patpToShip);

55+ }

56+ }

57+ $: trueSpawnedCount = spawnedCount || spawnedPoints.length;

58+ $: spawnedTab = {

59+ name: 'Spawned',

60+ plural: 'Spawned ' + spawnableClassPlural + (trueSpawnedCount == 1 ? '' : 's'),

61+ promise: rawSpawnedPointsPromise,

62+ points: spawnedPoints,

63+ count: trueSpawnedCount,

64+ };

65+ $: lockedTab = {

66+ name: 'Locked',

67+ plural: 'Locked ' + spawnableClassPlural + (lockedPoints.length == 1 ? '' : 's'),

68+ promise: rawLockedPointsPromise,

69+ points: lockedPoints,

70+ count: lockedPoints.length,

71+ };

72+ $: moons = filterIdsForChildMoons($store.peers, patp).map(patpToShip);

73+ $: moonsTab = {

74+ name: 'Moons',

75+ plural: 'Known Moon' + (moons.length == 1 ? '' : 's'),

76+ promise: true,

77+ points: moons,

78+ count: moons.length,

79+ };

80+ let tabIndex = 0;

81+ let tabs = [];

82+ $: {

83+ tabs = [];

84+ if (spawnedCount !== undefined || spawnedPoints.length > 0) {

85+ tabs.push(spawnedTab);

86+ }

87+ if (lockedPoints.length > 0) {

88+ tabs.push(lockedTab);

89+ }

90+ if (azPoint) {

91+ tabs.push(moonsTab);

92+ }

93+ }

94+ $: tab = tabs[tabIndex];

95+

96+ function patpToShip(id: string) {

97+ return { patp: normalizeId(id) };

98+ }

99+</script>

100+

101+<div class="p-3">

102+ {#if tabs.length > 1}

103+ <div class="flex gap-x-1">

104+ {#each tabs as tab, i}

105+ <h3 on:click={() => tabIndex = i}

106+ class:bg-gray-200={tabIndex !== i}

107+ class="px-2 border border-gray-300 border-b-0 rounded-t-md cursor-pointer"

108+ >

109+ {tab.name}

110+ </h3>

111+ {/each}

112+ </div>

113+ {/if}

114+ {#if tab}

115+ <div>

116+ <h3 class="text-lg m-2">

117+ {#if tab.count}

118+ {tab.count} {tab.plural}:

119+ {:else}

120+ No {tab.plural}

121+ {/if}

122+ </h3>

123+ {#await tab.promise}

124+ Loading {tab.plural}...

125+ {:then}

126+

127+ <ShipListings

128+ ships={tab.points}

129+ linkToShips

130+ differentiateContacts

131+ />

132+ {/await}

133+ </div>

134+ {/if}

135+</div>

136+

ui/src/components/ship_view/ShipView.sveltenew file+130

@@ -0,0 +1,130 @@

1+<script lang="ts">

2+ import { clan, patp2dec } from 'urbit-ob';

3+

4+ import { cite, normalizeId } from 'lib/id';

5+ import { getPoint, getSpawnedPoints } from 'lib/api';

6+ import { generateParentChain, processPointInfo } from 'lib/ship';

7+ import Sigil from '@/common/Sigil.svelte';

8+ import GoldBadge from '@/common/GoldBadge.svelte';

9+ import TooltipAndDocLink from '@/common/TooltipAndDocLink.svelte';

10+ import ShipLink from '@/common/ShipLink.svelte';

11+ import ChartLink from '@/common/ChartLink.svelte';

12+ import EthAddressLink from '@/common/EthAddressLink.svelte';

13+ import LoadingSpinner from '@/common/LoadingSpinner.svelte';

14+ import CollapsibleContent from '@/CollapsibleContent.svelte';

15+ import ShipChain from './ShipChain.svelte';

16+ import AzimuthDetails from './AzimuthDetails.svelte';

17+ import ShipChildrenTabs from './ShipChildrenTabs.svelte';

18+ import ProfileShipViewExtension from '~/components/extensions/ProfileShipViewExtension.svelte';

19+ import PalsShipViewExtension from '@/pals/PalsShipViewExtension.svelte';

20+ import AppsShipViewExtension from '@/extensions/AppsShipViewExtension.svelte';

21+ // import GroupsShipViewExtension from '~/components/extensions/GroupsShipViewExtension.svelte';

22+

23+ export let patp: string;

24+

25+ let parentChain: any[];

26+ let rawPointInfoPromise: any;

27+ let rawPointInfo: any = null;

28+ let pointInfo: any = {};

29+

30+ $: shipClass = clan(patp);

31+ $: azPoint = ['galaxy', 'star', 'planet'].includes(shipClass);

32+ $: {

33+ parentChain = generateParentChain(patp);

34+ }

35+ $: {

36+ rawPointInfo = null;

37+ if (azPoint) {

38+ rawPointInfoPromise = getPoint(patp);

39+ rawPointInfoPromise.then((info) => {

40+ rawPointInfo = info;

41+ }).catch((error) => {

42+ rawPointInfo = { error };

43+ });

44+ }

45+ }

46+ $: {

47+ pointInfo = {};

48+ if (azPoint) {

49+ pointInfo = processPointInfo(rawPointInfo);

50+ }

51+ }

52+</script>

53+

54+<div class="p-8 max-w-md w-full rounded-lg bg-white flex flex-col md:max-w-2xl">

55+ <div class="flex flex-col items-center space-y-4 md:flex-row md:items-start md:space-x-8 md:space-y-0">

56+ <div class="w-full max-w-[256px] md:min-w-[256px] flex-shrink-0">

57+ <Sigil patp={patp} size={256} useNew />

58+ </div>

59+ <div class="grow w-full min-w-0">

60+ <h2 class="text-2xl text-center">

61+ <TooltipAndDocLink

62+ text="The ship's @p (click to learn more)"

63+ doc="patpee" class="inline"

64+ >

65+ {cite(patp)}

66+ </TooltipAndDocLink>

67+ </h2>

68+ {#if (!azPoint)}

69+ <h3 class="text-lg text-center text-gray-700">{patp}</h3>

70+ {/if}

71+ <h4 class="text-center text-gray-700 break-words">

72+ {patp2dec(patp)}

73+ </h4>

74+ <div class="flex flex-wrap justify-center gap-1.5 my-1.5">

75+ <GoldBadge title={"it's a " + shipClass} doc={shipClass}>{shipClass}</GoldBadge>

76+ {#if azPoint}

77+ {#if pointInfo.spawnStatus}

78+ <GoldBadge title={pointInfo.spawnStatus.tooltip}>

79+ {pointInfo.spawnStatus.text}

80+ </GoldBadge>

81+ {/if}

82+ {#if pointInfo.layer}

83+ <GoldBadge title={pointInfo.layer.tooltip} doc="l2">{pointInfo.layer.text}</GoldBadge>

84+ {/if}

85+ {:else if (shipClass === 'moon')}

86+ <span>of</span>

87+ <ShipLink patp={parentChain.at(-1)}></ShipLink>

88+ {:else if (shipClass === 'comet')}

89+ <span>under</span>

90+ <ShipLink patp={parentChain.at(-1)}></ShipLink>

91+ {/if}

92+ </div>

93+ {#if pointInfo?.spawnedUnlocked}

94+ <div class="w-full text-center my-3">

95+ <ChartLink {patp}>View in Star Chart ↗</ChartLink>

96+ </div>

97+ {/if}

98+ <div class="mt-4 w-full break-words">

99+ {#if parentChain.length > 0}

100+ <p>

101+ {parentChain.length === 1 ? 'Parent:' : 'Parent Chain:'}

102+ <ShipChain shipChain={parentChain}></ShipChain>

103+ </p>

104+ {/if}

105+ {#if azPoint}

106+ {#await rawPointInfoPromise}

107+ <LoadingSpinner spinnerClass="text-black" />

108+ {:then}

109+ <CollapsibleContent>

110+ <b slot="title">Azimuth Details</b>

111+ <div slot="content">

112+ <AzimuthDetails {patp} {pointInfo}></AzimuthDetails>

113+ </div>

114+ </CollapsibleContent>

115+ {/await}

116+ {/if}

117+ </div>

118+ </div>

119+ </div>

120+ <div class="flex flex-wrap shrink min-h-0 h-fit -m-1 mt-2 justify-evenly justify-items-center">

121+ <ProfileShipViewExtension {patp} />

122+ <PalsShipViewExtension {patp} />

123+ <AppsShipViewExtension {patp} />

124+ </div>

125+ {#if azPoint}

126+ <div class="mt-5 border-t">

127+ <ShipChildrenTabs {patp} />

128+ </div>

129+ {/if}

130+</div>

ui/src/lib/api.ts+17−5

@@ -10,6 +10,8 @@ const api: UrbitApi = new UrbitApi('', '', window.desk);

1010api.ship = window.ship;

1111// api.connect();

1212

13+export { api };

14+

1315export function scry<T = any>(path: string): Promise<T> {

1416 return api.scry<T>({ app: 'astrolabe', path });

1517}

@@ -22,19 +24,29 @@ export function getSpawnedPoints(patp: string): Promise<any> {

2224 return scry<any>(`/point/${patp}/spawned`);

2325}

2426

27+export function getLockedSpawnedPoints(patp: string): Promise<any> {

28+ return scry<any>(`/point/${patp}/spawned/locked`);

29+}

30+

31+export function getUnlockedSpawnedPoints(patp: string): Promise<any> {

32+ return scry<any>(`/point/${patp}/spawned/unlocked`);

33+}

34+

2535export function getPeers(): Promise<any> {

2636 return scry<any>(`/peers`);

2737}

2838

29−export async function searchPoints(search: string): Promise<Patp[]> {

30− const { points } = await scry<any>(`/search/${search}`);

39+export async function searchPoints(search: string, mode: ('patp' | 'sigil')): Promise<Patp[]> {

40+ const { points } = await scry<any>(`/search/${mode}/${search}`);

3141 return points.map(normalizeId);

3242}

3343

34−export function getChartData(): Promise<any> {

35− return scry<any>(`/chart-data`);

44+export function getChartData(old = false): Promise<any> {

45+ return scry<any>('/chart-data' + (old ? '-old' : ''));

3646}

3747

48+window['gcd'] = getChartData;

49+

3850export function getDoc(path: string): Promise<string> {

3951 return scry<string>(`/doc/${path}`);

4052}

@@ -84,7 +96,7 @@ export function subscribeToContacts(e: (data: any) => void): Promise<any> {

8496 console.error(`Subscription to contact-store/all just get "err"`);

8597 },

8698 quit: () => {

87− console.error(`Subscription to contact-store/all just get "quit"`)

99+ console.error(`Subscription to contact-store/all just get "quit"`);

88100 }

89101 })

90102}

ui/src/lib/apps.tsnew file+177

@@ -0,0 +1,177 @@

1+import _get from 'lodash/get';

2+import { compose } from 'lodash/fp';

3+import type { Apps } from 'types/store';

4+import store from 'stores/store';

5+import { sleep } from 'lib/utils';

6+import { api } from 'lib/api';

7+import { normalizeId } from 'lib/id';

8+

9+export function getProvidedApps(patp: string): Promise<any> {

10+ return api.scry<any>({ app: 'treaty', path: `/treaties/${patp}` });

11+}

12+

13+// Unused, use subscription

14+export function getKnownApps(): Promise<any> {

15+ return api.scry<any>({ app: 'treaty', path: `/allies` }).then(processAllies);

16+}

17+

18+export function getApp(ship: string, desk: string): Promise<any> {

19+ return getAppByPath(`${normalizeId(ship)}/${desk}`);

20+}

21+

22+// @param path - ship/desk e.g. ~mister-dister-dozzod-dozzod/webterm

23+export async function getAppByPath(path: string, retry: number = 2): Promise<any> {

24+ try {

25+ return await api.scry<any>({ app: 'treaty', path: `/treaty/${path}` });

26+ } catch (e) {

27+ if (retry > 0) {

28+ console.log(`Got error when fetching app: ${path}.\nTrying at most ${retry} more time(s)`);

29+ await sleep(750);

30+ return getAppByPath(path, retry - 1);

31+ } else {

32+ throw e;

33+ }

34+ }

35+}

36+

37+export function getInstalledApps(): Promise<any> {

38+ return api.scry<any>({ app: 'docket', path: `/charges` });

39+}

40+

41+export async function sendAllyUpdate(cmd: string, ship: string) {

42+ let result = await api.poke({

43+ app: 'treaty',

44+ mark: 'ally-update-0',

45+ json: { [cmd]: normalizeId(ship) },

46+ });

47+ return result;

48+}

49+

50+export function addAlly(patp: string) {

51+ return sendAllyUpdate('add', patp);

52+}

53+

54+export function delAlly(patp: string) {

55+ return sendAllyUpdate('del', patp);

56+}

57+

58+export async function addAllies(ships: string[]) {

59+ let results = await Promise.allSettled(ships.map((ship: string) => {

60+ return addAlly(normalizeId(ship));

61+ }));

62+ results = results.filter(r => r.status === 'fulfilled').map((r) => {

63+ return (r as PromiseFulfilledResult<any>).value;

64+ });

65+ return results;

66+}

67+

68+export async function delAllies(ships: string[], retry: number = 0) {

69+ let results = await Promise.allSettled(ships.map((ship: string) => {

70+ return delAlly(normalizeId(ship));

71+ }));

72+ results = results.filter(r => r.status === 'fulfilled').map((r) => {

73+ return (r as PromiseFulfilledResult<any>).value;

74+ });

75+ return results;

76+}

77+

78+export function processAllies(rawPals: any): Apps {

79+ let allies = rawPals.ini;

80+ let paths = Object.values(allies).flat() as string[];

81+ let set = new Set(paths);

82+ return {

83+ allies,

84+ set,

85+ };

86+}

87+

88+export type AllyUpdate = AllyUpdateIni | AllyUpdateAdd | AllyUpdateDel | AllyUpdateNew;

89+

90+export interface AllyUpdateIni {

91+ ini: {

92+ [ship: string]: string[];

93+ }

94+}

95+

96+export interface AllyUpdateNew {

97+ new: {

98+ ship: string;

99+ alliance: string[];

100+ }

101+}

102+

103+export interface AllyUpdateAdd {

104+ add: string;

105+}

106+

107+export interface AllyUpdateDel {

108+ del: string;

109+}

110+

111+export function handleAllyUpdateIni(json: AllyUpdate, apps: Apps): Apps {

112+ const data = _get(json, 'ini', false);

113+ if (data) {

114+ apps = processAllies(json)

115+ }

116+ return apps;

117+};

118+

119+export function handleAllyUpdateNew(json: AllyUpdate, apps: Apps): Apps {

120+ const data = _get(json, 'new', false);

121+ if (data) {

122+ apps = processAllies({

123+ ini: {

124+ ...apps.allies,

125+ [data.ship]: data.alliance,

126+ }

127+ });

128+ }

129+ return apps;

130+};

131+

132+export function handleAllyUpdateAdd(json: AllyUpdate, apps: Apps): Apps {

133+ const data = _get(json, 'add', false);

134+ if (data) {

135+ apps = processAllies({

136+ ini: {

137+ ...apps.allies,

138+ [data]: [],

139+ }

140+ });

141+ }

142+ return apps;

143+};

144+

145+export function handleAllyUpdateDel(json: AllyUpdate, apps: Apps): Apps {

146+ const data = _get(json, 'del', false);

147+ if (data && (data in apps.allies)) {

148+ delete apps.allies[data];

149+ apps = processAllies({

150+ ini: apps.allies,

151+ });

152+ }

153+ return apps;

154+};

155+

156+export function handleAllyUpdateEvent(updateApps) {

157+ return (allyUpdate: AllyUpdate) => {

158+ console.log(`received ally-update: ${Object.keys(allyUpdate)}`);

159+ const reducers = [handleAllyUpdateIni, handleAllyUpdateNew, handleAllyUpdateAdd, handleAllyUpdateDel];

160+ const reducer = compose(reducers.map(r => sta => r(allyUpdate, sta)));

161+ updateApps(reducer);

162+ };

163+}

164+

165+export function subscribeToApps(e: (data: any) => void): Promise<any> {

166+ return api.subscribe({

167+ app: 'treaty',

168+ path: '/allies',

169+ event: handleAllyUpdateEvent(e),

170+ err: () => {

171+ console.error(`Subscription to treaty/all just got "err"`);

172+ },

173+ quit: () => {

174+ console.error(`Subscription to treaty/all just got "quit"`);

175+ }

176+ })

177+}

ui/src/lib/colors.ts+10

@@ -1,7 +1,17 @@

1+export const ORANGE_GOLD = '#f7d392';

12export const GOLD = '#fcd34d';

23export const GOLDT2 = '#fddc71';

4+export const GOLDS1 = '#e3be45';

5+export const GOLDS2 = '#caa93e';

36export const WHITE = '#FFF';

47export const LGREY = '#BBB';

58export const DGREY = '#777';

9+export const DDGREY = '#555';

610export const BLUE = '#1792c7';

711export const GREEN = '#17c76a';

12+export const YOU_ARE_HERE = '#802';

13+export const YOU = '#b01';

14+export const YOUR_STAR = '#d71';

15+export const YOUR_GAL = '#fb1';

16+export const SUB_PICKED = LGREY;

17+export const NOT_PICKED = DDGREY;

ui/src/lib/graph.ts+313−104

@@ -1,8 +1,177 @@

11import Graph from 'graphology';

2−import { clan, sein, patp2dec, patp } from 'urbit-ob';

32import * as colors from './colors';

43

4+const example = '[0[3216291:t;9219219;4608:s[156546;1612196;219621:~;321965149:4608;]1280[4289594624;4278191360;426672256;4260168960;4260824320;4246668544;4246144256;4253746432;4235396352;4230415616;4225697024;4227007744;4219667712;4222616832;4224648448;4214490368;4215997696;4219143424;4237296896;]]]'

5+

6+export interface ChartPoint {

7+ patp: string,

8+ dominion: ('l1' | 'l2' | 'spawn'),

9+ picked: boolean,

10+ pickedChildren?: boolean,

11+ pickedSponsees?: boolean,

12+ sponsor?: string,

13+ parent?: string,

14+ children?: ChartPoint[],

15+ sponsees?: ChartPoint[],

16+}

17+

18+interface ChartSubs {

19+ children: ChartPoint[],

20+ sponsees: ChartPoint[],

21+}

22+

23+class ChartDataParser {

24+ filter: Set<string>;

25+

26+ constructor(filter: Set<string>) {

27+ this.filter = filter;

28+ }

29+

30+ parseMetaString(metaString: string): ChartPoint {

31+ let idString, subMetaString = '';

32+ const colIndex = metaString.indexOf(':');

33+ if (colIndex === -1) {

34+ idString = metaString;

35+ } else {

36+ idString = metaString.slice(0, colIndex);

37+ subMetaString = metaString.slice(colIndex + 1);

38+ }

39+ const patp = '~' + idString;

40+ const meta: ChartPoint = {

41+ patp,

42+ picked: !this.filter ? true : (this.filter.has(patp)),

43+ dominion: 'l1',

44+ }

45+ if (subMetaString) {

46+ const firstChar = subMetaString[0];

47+ if (firstChar === 't') {

48+ meta.dominion = 'l2';

49+ subMetaString = subMetaString.slice(1);

50+ } else if (firstChar === 's') {

51+ meta.dominion = 'spawn';

52+ subMetaString = subMetaString.slice(1);

53+ }

54+ if (subMetaString) {

55+ if (subMetaString[0] === '~') {

56+ meta.sponsor = null;

57+ } else {

58+ let [sponsor, parent] = subMetaString.slice(1).split('!');

59+ meta.sponsor = '~' + sponsor;

60+ meta.parent = '~' + parent;

61+ }

62+ }

63+ }

64+ return meta;

65+ }

66+

67+ extractMeta(data: string): [ChartPoint, string] {

68+ const index = data.search(/[[;]/);

69+ if (index === -1) {

70+ throw new Error(`No point meta present in ${data}`);

71+ }

72+ const metaString = data.slice(0, index);

73+ data = data.slice(index);

74+ return [this.parseMetaString(metaString), data];

75+ }

76+

77+ extractChildren(data: string, sup: string = undefined): [ChartSubs, string] {

78+ if (data[0] === ';')

79+ return [{

80+ children: [],

81+ sponsees: [],

82+ }, data.slice(1)];

83+ if (data[0] !== '[') throw new Error('Invalid children in data: ' + data.slice(0, 20));

84+

85+ let endFound = false;

86+ let counter = 0;

87+ data = data.slice(1);

88+ const children = [];

89+ const sponsees = [];

90+ while (!endFound && data.length && counter < 20000) {

91+ if (data[0] === ']') {

92+ endFound = true;

93+ data = data.slice(1);

94+ } else {

95+ let sub;

96+ [sub, data] = this.extractChartPoint(data);

97+ if (!sub.parent || sub.parent === sup)

98+ children.push(sub);

99+ if (sub.sponsor === undefined || sub.sponsor === sup)

100+ sponsees.push(sub);

101+ }

102+ counter++;

103+ }

104+ return [{ children, sponsees }, data];

105+ }

106+

107+ extractChartPoint(data: string): [ChartPoint, string] {

108+ let point, subs;

109+ [point, data] = this.extractMeta(data);

110+ [subs, data] = this.extractChildren(data, point.patp);

111+ point = {

112+ ...point,

113+ ...subs,

114+ };

115+ return [point, data];

116+ }

117+

118+ linkChartData(points: ChartPoint[], store: any): ChartPoint[] {

119+ if (!points) return points;

120+ return points.map(point => {

121+ if (!store[point.patp]) return point;

122+ if (!point.children?.length) {

123+ point.children = this.linkChartData(store[point.patp].children, store);

124+ let picked = point.children.filter(child => child.picked || child.pickedChildren);

125+ point.pickedChildren = picked.length > 0;

126+ }

127+ if (!point.sponsees?.length) {

128+ point.sponsees = this.linkChartData(store[point.patp].sponsees, store);

129+ let picked = point.sponsees.filter(child => child.picked || child.pickedSponsees);

130+ point.pickedSponsees = picked.length > 0;

131+ }

132+ return point;

133+ });

134+ }

135+

136+ parse(str: string): ChartSubs {

137+ if (!str) return { children: [], sponsees: [] };

138+ let [{ children: baseChildren }, _] = this.extractChildren(str, undefined);

139+ let store = {};

140+ baseChildren.forEach(child => {

141+ store[child.patp] = {

142+ children: child.children,

143+ sponsees: child.sponsees,

144+ };

145+ });

146+ let base: ChartPoint = {

147+ patp: '~base',

148+ dominion: 'l1',

149+ picked: true,

150+ }

151+

152+ let points = this.linkChartData([base], store);

153+ return {

154+ children: points[0].children || [],

155+ sponsees: points[0].sponsees || [],

156+ }

157+ }

158+}

159+

160+export function parseChartData(data: string, filter: Set<string>): ChartSubs {

161+ let start = Date.now();

162+ let parser = new ChartDataParser(filter);

163+ let parsed = parser.parse(data);

164+ // console.log(`finished parsing chart data to js object in ${Date.now() - start} ms`);

165+ return parsed;

166+}

167+

5168const circle = 2 * Math.PI;

169+function chordLength(radius, radians) {

170+ return 2 * radius * Math.sin(radians / 2);

171+}

172+function distancePolar(r1, th1, r2, th2) {

173+ return Math.sqrt((r1 * r1) + (r2 * r2) - (2 * r1 * r2 * Math.cos(th2 - th1)));

174+}

6175export function arrangePointsInSpirals(

7176 numPoints,

8177 {

@@ -10,18 +179,22 @@ export function arrangePointsInSpirals(

10179 startX = 0, startY = 0,

11180 maxArms = 6, maxPerArm = 45,

12181 makeSingleArmCircle = false,

13− }): { coords: any[], numArms: number } {

182+ }): { coords: any[], numArms: number, minDistanceBetween: number } {

14183 const numSmallEnoughArms = Math.ceil(numPoints / maxPerArm);

15184 let eRootNumArms = Math.max(1, Math.floor(Math.pow(numPoints, 1 / Math.E)));

16185 const numArms = Math.max(numSmallEnoughArms, eRootNumArms);

17186 const singleArmCircle = makeSingleArmCircle && numArms === 1;

18187 const numPerArm = numPoints / numArms;

19− // todo refine theta range, and rename maxPerArm (misnomer)

20188 let armThetaRange = numPerArm * Math.min(Math.PI / 12, 0.25 * circle / numArms);

21189 if (singleArmCircle) {

22190 minDistance = maxDistance;

23− armThetaRange = 2 * Math.PI;

191+ armThetaRange = circle;

24192 }

193+ const distanceRange = maxDistance - minDistance;

194+ const pointWeight = 1 / numPerArm;

195+ let minDistanceBetween = distancePolar(minDistance, 0,

196+ minDistance + distanceRange * pointWeight, armThetaRange * pointWeight);

197+ if (numPoints <= 3) minDistanceBetween = maxDistance * 0.75;

25198 const coords = [];

26199 let lastArm = null;

27200 let indexInArm = null;

@@ -34,15 +207,11 @@ export function arrangePointsInSpirals(

34207 indexInArm = 0;

35208 }

36209 const interArmProgress = arm / numArms;

37− // (i - (numarms * i/numpoints) * (numpoints/numarms)) / numperarm

38− // const intraArmProgress = (i - arm * numPerArm) / numPerArm;

39210 const beginningOfNextArm = Math.floor(numPerArm * (arm + 1));

40211 const numInThisArm = beginningOfNextArm - (i - indexInArm);

41212 const intraArmProgress = indexInArm / numInThisArm;

42− // const intraArmProgress = (numArms * overallProgress) % 1;

43213 const theta = circle * interArmProgress + armThetaRange * intraArmProgress;

44− let baseLine = maxDistance - minDistance;

45− let line = (minDistance + baseLine * intraArmProgress);

214+ let line = (minDistance + distanceRange * intraArmProgress);

46215 let x = 0 + startX + line * Math.cos(theta);

47216 let y = 0 + startY + line * Math.sin(theta);

48217 coords.push({

@@ -54,15 +223,24 @@ export function arrangePointsInSpirals(

54223 return {

55224 coords,

56225 numArms,

226+ minDistanceBetween,

57227 };

58228}

59−

60−export

61−

62−function populateGraph(g: Graph, rawChartData: any[]) {

63− if (!(rawChartData instanceof Array)) return;

229+type childKey = ('sponsees' | 'children');

230+export function populateGraph(g: Graph, chartSubs: ChartSubs, subsKey: childKey, callback?): Graph {

231+ let pickedSubsKey = subsKey == 'children' ? 'pickedChildren' : 'pickedSponsees';

232+ function pickedColor(point: ChartPoint, normal: string) {

233+ return point.picked ? normal : (point[pickedSubsKey] ? colors.SUB_PICKED : colors.NOT_PICKED);

234+ }

235+ function pickedArmColor(point: ChartPoint, normal: string) {

236+ return point[pickedSubsKey] ? normal : colors.NOT_PICKED;

237+ }

238+ let points = chartSubs[subsKey];

239+ if (!(points instanceof Array)) return;

64240 if (!g) {

65241 g = new Graph();

242+ } else {

243+ g.clear();

66244 }

67245

68246 let sponsorEdges = [];

@@ -74,140 +252,171 @@ function populateGraph(g: Graph, rawChartData: any[]) {

74252 let b = 9000000;

75253 let theta = 0;

76254

77− rawChartData.forEach((galaxy, gi) => {

255+ points.forEach((galaxy, gi) => {

78256 offsetX = 0 + (a + b * theta) * Math.cos(theta);

79257 offsetY = 0 + (a + b * theta) * Math.sin(theta);

80258

81259 theta = 0.15 * (gi+1) * (1 - .15 * (gi / 256));

82− const gPatp = '~' + galaxy.p;

260+ const gPatp = galaxy.patp;

261+ const itsYou = gPatp === '~' + window.ship;

83262 g.addNode(gPatp, {

84− // id: gPatp,

85263 label: gPatp,

86264 size: 3,

87− color: colors.WHITE,

88− // color: colors.'#fcd34d',

265+ color: itsYou ? colors.YOU : pickedColor(galaxy, colors.WHITE),

89266 x: offsetX,

90267 y: offsetY,

91268 zIndex: 10,

92269 });

93270

94− const stars = galaxy.c || [];

271+ const stars = galaxy[subsKey] || [];

95272 const numStars = stars.length;

96273 const maxStarDistance = 60000 * 128;

274+ const minStarDistance = maxStarDistance / 4;

97275 const starSize = 1.2 / Math.pow(numStars, 1 / 7);

98276 const {

99277 coords: starCoords,

100278 numArms: numStarArms,

279+ minDistanceBetween: minDistanceBetweenStars,

101280 } = arrangePointsInSpirals(numStars,

102281 {

103282 maxDistance: maxStarDistance,

104− minDistance: maxStarDistance / 4,

283+ minDistance: minStarDistance,

105284 startX: offsetX,

106285 startY: offsetY,

107286 makeSingleArmCircle: true,

108287 });

109288 let lastStarArm = null;

110289 let lastStarPatp = null;

290+ let GSarmColor = pickedArmColor(galaxy, colors.LGREY)

111291 stars.forEach((star, si) => {

112− const sPatp = '~' + star.p;

292+ const sPatp = star.patp;

113293

114294 const [starX, starY] = starCoords[si].coords;

115295 const arm = starCoords[si].arm;

116− g.addNode(sPatp, {

117− label: sPatp,

118− size: starSize,

119− // color: colors.arm % 2 == 0 ? LGREY : DGREY,

120− color: colors.GOLDT2,

121− x: starX,

122− y: starY,

123− zIndex: 8,

124− });

125− if (lastStarArm == arm) {

126− g.addEdge(sPatp, lastStarPatp, {

127− color: colors.LGREY,

128− size: 0.1,

129− zIndex: 7,

130− });

131− } else {

132− g.addEdge(sPatp, gPatp, {

133− color: colors.LGREY,

134− size: 0.2,

135− zIndex: 9,

136− });

137− }

138− lastStarArm = arm;

139− lastStarPatp = sPatp;

140− if (star.s) {

141− sponsorEdges.push([sPatp, '~' + star.s, {

142− color: colors.GREEN,

143− size: 0.2,

144− zIndex: 11,

145− }]);

296+

297+ const itsYou = sPatp === '~' + window.ship;

298+ if (itsYou) {

299+ g.setNodeAttribute(gPatp, 'color', colors.YOUR_GAL);

146300 }

147−

148− const planets = star.c || [];

149− const numPlanets = planets.length;

150− const maxPlanetDistance = starSize * 1.6 * 4000 * 64;

151− const {

152− coords: planetCoords,

153− numArms: numPlanetArms,

154− } = arrangePointsInSpirals(numPlanets,

155− {

156− maxDistance: maxPlanetDistance,

157− minDistance: maxPlanetDistance / 4,

158− startX: starX,

159− startY: starY,

160− maxArms: 30,

161− makeSingleArmCircle: true,

162− });

163− let lastPlanetArm = null;

164− let lastPlanetPatp = null;

165− planets.forEach((planet, pi) => {

166− const pPatp = '~' + planet.p;

167− // const circle = 2 * Math.PI;

168− // let line = 16000 * 64;

169− // let planetX = 0 + starX + Math.cos(circle * pi / numPlanets) * line;

170− // let planetY = 0 + starY + Math.sin(circle * pi / numPlanets) * line;

171−

172− const [planetX, planetY] = planetCoords[pi].coords;

173− const arm = planetCoords[pi].arm;

174− g.addNode(pPatp, {

175− label: pPatp,

176− size: .15,

177− color: planet.d == 'l2' ? colors.GREEN : colors.BLUE,

178− x: planetX,

179− y: planetY,

180− zIndex: 6,

301+ try {

302+ g.addNode(sPatp, {

303+ label: sPatp,

304+ size: starSize,

305+ color: itsYou ? colors.YOU : pickedColor(star, colors.GOLDT2),

306+ x: starX,

307+ y: starY,

308+ zIndex: 8,

181309 });

182− if (lastPlanetArm == arm) {

183− g.addEdge(pPatp, lastPlanetPatp, {

184− color: colors.DGREY,

185− size: 0.05,

186− zIndex: 5,

310+ if (lastStarArm == arm) {

311+ g.addEdge(sPatp, lastStarPatp, {

312+ color: GSarmColor,

313+ size: 0.1,

314+ zIndex: 7,

187315 });

188316 } else {

189− if (numPlanetArms == 1) {

190− g.addEdge(pPatp, sPatp, {

191− color: colors.DGREY,

192− size: 0.05,

193− zIndex: 5,

317+ g.addEdge(sPatp, gPatp, {

318+ color: GSarmColor,

319+ size: 0.2,

320+ zIndex: 9,

194321 });

195322 }

196− }

197− if (planet.s) {

198− sponsorEdges.push([pPatp, '~' + planet.s, {

323+ lastStarArm = arm;

324+ lastStarPatp = sPatp;

325+ if (star.sponsor) {

326+ sponsorEdges.push([sPatp, star.sponsor, {

199327 color: colors.GREEN,

200− size: 0.05,

201− zIndex: 11,

328+ size: 0.2,

329+ zIndex: 11,

202330 }]);

203331 }

204− lastPlanetArm = arm;

205− lastPlanetPatp = pPatp;

206− });

332+

333+ const planets = star[subsKey] || [];

334+ const numPlanets = planets.length;

335+ // const maxPlanetDistance = starSize * 1.6 * 4000 * 64;

336+ const maxPlanetDistance = minDistanceBetweenStars * 0.45;

337+ const minPlanetDistance = maxPlanetDistance / 4;

338+ const {

339+ coords: planetCoords,

340+ numArms: numPlanetArms,

341+ minDistanceBetween: minDistanceBetweenPlanets,

342+ } = arrangePointsInSpirals(numPlanets,

343+ {

344+ maxDistance: maxPlanetDistance,

345+ minDistance: minPlanetDistance,

346+ startX: starX,

347+ startY: starY,

348+ maxArms: 30,

349+ makeSingleArmCircle: true,

350+ });

351+ let lastPlanetArm = null;

352+ let lastPlanetPatp = null;

353+ let SParmColor = pickedArmColor(star, colors.DGREY)

354+ planets.forEach((planet, pi) => {

355+ const pPatp = planet.patp;

356+ const [planetX, planetY] = planetCoords[pi].coords;

357+ const arm = planetCoords[pi].arm;

358+ const planetSize = Math.sqrt(Math.min(minPlanetDistance, minDistanceBetweenPlanets)) / 1300;

359+ const planetEdgeSize = planetSize / 3;

360+ const itsYou = pPatp === '~' + window.ship;

361+ if (itsYou) {

362+ g.setNodeAttribute(sPatp, 'color', colors.YOUR_STAR);

363+ g.setNodeAttribute(gPatp, 'color', colors.YOUR_GAL);

364+ }

365+ try {

366+ g.addNode(pPatp, {

367+ label: pPatp,

368+ size: planetSize,

369+ color: itsYou ? colors.YOU : pickedColor(planet, planet.dominion == 'l2' ? colors.GREEN : colors.BLUE),

370+ x: planetX,

371+ y: planetY,

372+ zIndex: 6,

373+ });

374+ if (lastPlanetArm == arm) {

375+ g.addEdge(pPatp, lastPlanetPatp, {

376+ color: SParmColor,

377+ size: planetEdgeSize,

378+ zIndex: 5,

379+ });

380+ } else {

381+ if (numPlanetArms == 1) {

382+ g.addEdge(pPatp, sPatp, {

383+ color: SParmColor,

384+ size: planetEdgeSize,

385+ zIndex: 5,

386+ });

387+ }

388+ }

389+ if (planet.sponsor) {

390+ sponsorEdges.push([pPatp, planet.sponsor, {

391+ color: colors.GREEN,

392+ size: planetEdgeSize,

393+ zIndex: 11,

394+ }]);

395+ }

396+ lastPlanetArm = arm;

397+ lastPlanetPatp = pPatp;

398+ } catch (e) {

399+ let msg = `Couldn't add ${pPatp} to the graph`;

400+ console.error(msg, e);

401+ alertMe(msg + '\n' + e.message);

402+ }

403+ });

404+ } catch (e) {

405+ let msg = `Couldn't add ${sPatp} to the graph`;

406+ console.error(msg, e);

407+ alertMe(msg + '\n' + e.message);

408+ }

207409 });

208410 });

209411 sponsorEdges.forEach(([point, sponsor, attrs]) => {

210412 // g.addEdge(point, sponsor, attrs);

211413 });

414+ if (callback) {

415+ setTimeout(callback, 0);

416+ }

212417 return g;

213418}

419+

420+function alertMe(msg: string) {

421+ alert('Encountered an error, please tell ~midlev-mindyr: ' + msg);

422+}

ui/src/lib/id.ts+29−5

@@ -1,6 +1,6 @@

11import BN from 'bn.js';

22import type { Patp } from '@urbit/api'

3−import { hex2patp, patp2hex, patp as any2patp } from 'urbit-ob';

3+import { hex2patp, patp2hex, patp as any2patp, sein } from 'urbit-ob';

44import { isStringNaN, listStrings } from './utils';

55

66// 340282366920938463463374607431768211455

@@ -435,14 +435,18 @@ function cite(ship: string) {

435435 return `~${patp}`;

436436}

437437

438−function splitIdIntoWords(str: string): string[] {

439− return str.split(/(?:--|[-_^])/);

438+export function splitIdIntoWords(str: string): string[] {

439+ return desig(str).split(/(?:--|[-_^])/);

440+}

441+

442+export function splitIdIntoSyls(str: string): string[] {

443+ return splitIdIntoWords(str).map(word => [word.slice(0,3), word.slice(3,6)]).flat();

440444}

441445

442446function padWithWild(search: string) {

443447 let words = search.split(/[_^]/);

444− words[0] = '*'.repeat(6 - words[0].length) + words[0];

445− words[1] += '*'.repeat(6 - words[1].length);

448+ words[0] = '*'.repeat(Math.max(0, 6 - words[0].length)) + words[0];

449+ words[1] += '*'.repeat(Math.max(0, 6 - words[1].length));

446450 return words.join(search.match(/([_^])/)[1]);

447451}

448452

@@ -497,11 +501,31 @@ function analyzeSearch(search: string): SearchAnalysis {

497501 return new SearchAnalysis(search);

498502}

499503

504+function isMoonLength(patp: string): boolean {

505+ return patp.length > 14 && patp.length <= 28;

506+}

507+

508+function isCometLength(patp: string): boolean {

509+ return patp.length > 28;

510+}

511+

512+function filterIdsForChildMoons(ids: string[], parentId: string): string[] {

513+ return ids.filter((peerId) => {

514+ if (!isMoonLength(peerId)) return false;

515+ return sein(peerId) === normalizeId(parentId);

516+ })

517+}

518+

500519export {

520+ prefixes,

521+ suffixes,

501522 SearchAnalysis,

502523 normalizeId,

503524 normalizeIdAndDesig,

504525 cite,

505526 convertSearchTextToRegex,

506527 analyzeSearch,

528+ isMoonLength,

529+ isCometLength,

530+ filterIdsForChildMoons,

507531};

ui/src/lib/link.ts+12−1

@@ -1,5 +1,16 @@

11import { buildQuerystring } from './utils';

22

33export function linkToShip(patp: string, queryParams = {}): string {

4− return `/ship/${patp}` + buildQuerystring(queryParams);

4+ return `/ship/${encodeURIComponent(patp)}` + buildQuerystring(queryParams);

5+}

6+

7+export function linkToSearch(search: string, queryParams = {}): string {

8+ return `/search/${encodeURIComponent(search)}` + buildQuerystring(queryParams);

9+}

10+

11+export function linkToChart(patp: string): string {

12+ if (patp) {

13+ return `/chart/${encodeURIComponent(patp)}`;

14+ }

15+ return `/chart`;

516}

ui/src/lib/pals.tsnew file+91

@@ -0,0 +1,91 @@

1+import type { Patp } from '@urbit/api';

2+// import uniq from 'lodash/without';

3+// import without from 'lodash/without';

4+import type { Pals, PalList, PalNames, Pal, PalInfo, PalStatus } from 'types/store';

5+import store from 'stores/store';

6+import { api } from 'lib/api';

7+import { normalizeId, normalizeIdAndDesig } from 'lib/id';

8+

9+export function getPals() {

10+ return api.scry<any>({ app: 'pals', path: '/json' }).then(processPals);

11+}

12+

13+function palCommand(cmd: string, ship: string, tags: string[] = []) {

14+ return {

15+ [cmd]: {

16+ ship: normalizeIdAndDesig(ship),

17+ in: tags,

18+ },

19+ };

20+}

21+

22+export async function sendPalCommand(cmd: string, ship: string, tags: string[] = []) {

23+ let result = await api.poke({

24+ app: 'pals',

25+ mark: 'pals-command',

26+ json: palCommand(cmd, ship, tags),

27+ });

28+ store.refreshPals();

29+ return result;

30+}

31+

32+export function addPal(patp: string, tags: string[] = []) {

33+ return sendPalCommand('meet', patp, tags);

34+}

35+

36+export function removePal(patp: string) {

37+ return sendPalCommand('part', patp, []);

38+}

39+

40+export function tagPal(patp: string, tag: (string | string[])) {

41+ if (typeof tag == 'string') tag = [tag];

42+ return addPal(patp, tag);

43+}

44+

45+export function untagPal(patp: string, tag: (string | string[])) {

46+ if (typeof tag == 'string') tag = [tag];

47+ return sendPalCommand('part', patp, tag);

48+}

49+

50+export function processPals(rawPals: any): Pals {

51+ let incoming: PalNames = {};

52+ let outgoing: PalList = {};

53+ let mutuals: PalList = {};

54+

55+ Object.entries(rawPals.incoming).forEach(([patp, bool]) => {

56+ incoming[normalizeId(patp)] = bool as boolean;

57+ });

58+ (Object.entries(rawPals.outgoing) as [string, any][]).forEach(([patp, { lists, ack }]) => {

59+ patp = normalizeId(patp);

60+ outgoing[patp] = {

61+ tags: lists as string[],

62+ ack: ack as boolean,

63+ };

64+ if (incoming[patp]) {

65+ mutuals[patp] = outgoing[patp];

66+ }

67+ });

68+

69+ return {

70+ incoming,

71+ outgoing,

72+ mutuals,

73+ };

74+}

75+

76+export function getPalStatus(pals: Pals, patp: Patp): PalStatus {

77+ if (pals.mutuals[patp]) return 'mutual';

78+ if (pals.outgoing[patp]) return 'outgoing';

79+ if (pals.incoming[patp]) return 'incoming';

80+ return 'unconnected';

81+}

82+

83+export function getPal(pals: Pals, patp: Patp): PalInfo {

84+ return {

85+ patp,

86+ status: getPalStatus(pals, patp),

87+ tags: [],

88+ ack: null,

89+ ...pals.outgoing[patp],

90+ };

91+}

ui/src/lib/ship.tsnew file+114

@@ -0,0 +1,114 @@

1+import { clan, sein } from 'urbit-ob';

2+

3+export const spawnStatusOptions = {

4+ unspawned: {

5+ text: 'unspawned',

6+ tooltip: 'This point has not yet been spawned by its parent',

7+ },

8+ locked: {

9+ text: 'locked',

10+ tooltip: 'This point is currently locked in a Linear Release Contract',

11+ },

12+ spawned: {

13+ text: 'spawned',

14+ tooltip: `This point has been spawned`,

15+ },

16+ spawnedNoKeys: {

17+ text: 'spawned (no keys set)',

18+ tooltip: 'This point has been spawned, but no keys have been set',

19+ },

20+};

21+export const layerOptions = {

22+ l1: {

23+ text: 'on layer 1',

24+ tooltip: 'This point is secured as an NFT on the Ethereum blockchain',

25+ },

26+ l2: {

27+ text: 'on layer 2',

28+ tooltip: `This point is secured by Urbit's "Layer 2" solution`,

29+ },

30+ spawn: {

31+ text: 'spawns on layer 2',

32+ tooltip: 'This point lives on layer 1, but it spawns new points on layer 2',

33+ },

34+};

35+

36+export function generateParentChain(patp: string): any[] {

37+ let parents = [patp];

38+ let galaxyFound = false;

39+ let count = 10;

40+ while (!galaxyFound && count > 0) {

41+ count--;

42+ if (count == 0) {

43+ throw new Error("You've got an infinite loop in building the parent chain");

44+ }

45+ let firstItem = parents[0];

46+ if (clan(firstItem) == 'galaxy') {

47+ galaxyFound = true;

48+ } else {

49+ parents.unshift(sein(firstItem))

50+ }

51+ }

52+ parents.pop();

53+ return parents;

54+}

55+

56+export function processPointInfo(rawPointInfo: any): any {

57+ let pointInfo: any = {};

58+ let spawnStatus: any,

59+ spawnedUnlocked: boolean = false,

60+ layer: any,

61+ life: number,

62+ rift: number,

63+ spawnedCount: number,

64+ sponsorChain: any[];

65+ let keysSet = false;

66+ if (!rawPointInfo) {

67+ // request pending

68+ } else {

69+ // defaults in case no info found

70+ spawnStatus = spawnStatusOptions.unspawned;

71+ life = 0;

72+ rift = 0;

73+

74+ if (rawPointInfo.point) {

75+ const { point } = rawPointInfo;

76+ const {

77+ 'probable-dominion': dominion,

78+ npoint

79+ } = point;

80+ layer = layerOptions[dominion];

81+ spawnedCount = point['spa-count'];

82+ sponsorChain = point['sponsor-chain'].reverse();

83+

84+ if (npoint) {

85+ life = npoint.net.keys.life;

86+ rift = npoint.net.rift;

87+ if (life > 0) {

88+ keysSet = true;

89+ }

90+ pointInfo.proxies = npoint.own;

91+ if (pointInfo.proxies.owner.address === '0x86cd9cd0992f04231751e3761de45cecea5d1801') {

92+ spawnStatus = spawnStatusOptions.locked;

93+ } else if (keysSet) {

94+ spawnStatus = spawnStatusOptions.spawned;

95+ spawnedUnlocked = true;

96+ } else {

97+ spawnStatus = spawnStatusOptions.spawnedNoKeys;

98+ spawnedUnlocked = true;

99+ }

100+ }

101+ }

102+ }

103+ return {

104+ ...pointInfo,

105+ layer,

106+ spawnStatus,

107+ spawnedUnlocked,

108+ keysSet,

109+ life,

110+ rift,

111+ spawnedCount,

112+ sponsorChain,

113+ };

114+}

ui/src/lib/sigil.tsnew file+387

@@ -0,0 +1,387 @@

1+import intersection from 'lodash/intersection';

2+import without from 'lodash/without';

3+import uniq from 'lodash/uniq';

4+import { partParents, symbolDefs } from '@johnhyde/sigil-js';

5+

6+import type { Clan, Geon, ModeDef, PartType, SymbolType } from 'types/sigil';

7+import { PART_TYPES } from 'types/sigil';

8+import { prefixes, suffixes } from 'lib/id';

9+

10+export function sigilScalingFunction(size: number): number {

11+ return 3.5 * Math.sqrt(51 / size);

12+}

13+

14+export function crowdedSigilScalingFunction(size: number): number {

15+ return 2.8 * Math.sqrt(51 / size);

16+}

17+

18+export class SigilQuery {

19+ clan: Clan;

20+ symbols: SymbolQuery[];

21+ allowFictional: boolean = false;

22+

23+ constructor(clan: Clan = 'planet', symbols = []) {

24+ this.clan = clan;

25+ this.symbols = symbols;

26+ this.padSymbols();

27+ }

28+

29+ padSymbols() {

30+ if (this.symbols.length === 1) {

31+ this.symbols.unshift(new SymbolQuery(this));

32+ }

33+ while (this.symbols.length < 4) {

34+ this.symbols.push(new SymbolQuery(this));

35+ }

36+ this.symbols = this.symbols.slice(0, 4);

37+ this.symbols.forEach((symbol, i) => {

38+ if (i % 2 === 0) {

39+ symbol.symbolType = 'prefix';

40+ // symbol.components = ['gci', 'lhf'];

41+ } else {

42+ symbol.symbolType = 'suffix';

43+ // symbol.components = ['gsq', 'atrf4'];

44+ }

45+ });

46+ this.symbols = this.symbols;

47+ }

48+

49+ clearSymbols() {

50+ this.symbols = [];

51+ this.padSymbols();

52+ return this;

53+ }

54+

55+ get activeSymbols() {

56+ if (this.clan === 'galaxy')

57+ return [this.symbols[1]];

58+ if (this.clan === 'star')

59+ return this.symbols.slice(0, 2);

60+ return this.symbols;

61+ }

62+

63+ get isPlausible() {

64+ return this.activeSymbols.every(symbol => symbol.isPlausible);

65+ }

66+

67+ get queryParts(): string[][] {

68+ return this.activeSymbols.map(symbol => symbol.components);

69+ }

70+

71+ get querySyls(): string[][] {

72+ return this.activeSymbols.map(symbol => symbol.plausibleSyllables);

73+ }

74+

75+ get queryInts(): number[][] {

76+ let ints = this.activeSymbols.map(symbol => symbol.plausibleInts);

77+ if (ints.length > 1) {

78+ ints[0] = without(ints[0], 0);

79+ }

80+ return ints;

81+ }

82+

83+ get isDefinitive() {

84+ return this.querySyls.every(syls => syls.length === 1);

85+ }

86+

87+ get isNotEmpty() {

88+ return this.activeSymbols.some(symbol => symbol.components.length > 0);

89+ }

90+

91+ get isWorthSearching() {

92+ if (!this.isNotEmpty) return false; // 🙃

93+ if (!this.isPlausible) return false;

94+ return true;

95+ }

96+

97+ get string(): string {

98+ return this.queryInts.map((int) => int.length == 256 ? 'any' : int.join('.')).join('_');

99+ }

100+

101+ get urlString(): string {

102+ return this.queryParts.map(parts => parts.join('.')).join('_');

103+ }

104+

105+ set urlString(str: string) {

106+ if (!str) return;

107+ const queryParts = str.split('_').map(sym => sym.split('.').filter(part => part !== ''));

108+ switch (queryParts.length) {

109+ case 1:

110+ this.clan = 'galaxy';

111+ break;

112+ case 2:

113+ this.clan = 'star';

114+ break;

115+ case 4:

116+ this.clan = 'planet';

117+ break;

118+ default:

119+ return;

120+ }

121+ let symbols;

122+ try {

123+ symbols = queryParts.map((parts) => {

124+ let symbol = new SymbolQuery(this, parts);

125+ if (symbol.components.length !== parts.length) {

126+ throw new Error(`Invalid component ids: ${without(parts, ...symbol.components)}`);

127+ }

128+ });

129+ } catch (e) {

130+ console.log("Couldn't load in sigil query text:", e.message);

131+ this.clan = 'planet';

132+ symbols = [];

133+ }

134+ this.padSymbols();

135+ }

136+

137+ get patp(): string {

138+ if (!this.isDefinitive) return '';

139+ const querySyls = this.querySyls.flat();

140+ let patp = '~' + querySyls[0];

141+ if (querySyls.length > 1) {

142+ patp += querySyls[1];

143+ if (querySyls.length > 2) {

144+ patp += '-' + querySyls[2] + querySyls[3];

145+ }

146+ }

147+ return patp;

148+ }

149+

150+ setSymbol(symbol: SymbolQuery, activeSymbolIndex: number) {

151+ if (activeSymbolIndex >= this.activeSymbols.length)

152+ throw new Error(`Symbol index ${activeSymbolIndex} out of range for clan: ${this.clan}`);

153+ this.activeSymbols[activeSymbolIndex] = symbol;

154+ }

155+}

156+

157+const equivalentParts = {

158+ lfhb: 'lfhbm',

159+ lfhbm: 'lfhb',

160+ atlf2: 'atlf2l',

161+ atlf2l: 'atlf2',

162+ atlf4: 'atlf4l',

163+ atlf4l: 'atlf4',

164+ atlf6: 'atlf6l',

165+ atlf6l: 'atlf6',

166+}

167+

168+function addEquivalentParts(parts: string[]): string[] {

169+ const moreParts = parts.map(partId => equivalentParts[partId]).filter(part => part);

170+ return [...parts, ...moreParts];

171+}

172+

173+function getSyllablesBySymbolType(symbolType: SymbolType): string[] {

174+ if (symbolType === 'prefix') {

175+ return prefixes;

176+ } else if (symbolType === 'suffix') {

177+ return suffixes;

178+ } else {

179+ return [...prefixes, ...suffixes];

180+ }

181+}

182+

183+export function getPlausibleSyllables(parts: string[], symbolType: SymbolType): string[] {

184+ let plausibleSyllables = getSyllablesBySymbolType(symbolType);

185+ const possibilitiesByPart = parts.map((partId) => {

186+ let parents = partParents[partId];

187+ const otherPart = equivalentParts[partId];

188+ if (otherPart) {

189+ parents = [...parents, ...partParents[otherPart]];

190+ }

191+ return parents;

192+ });

193+ plausibleSyllables = intersection(plausibleSyllables, ...possibilitiesByPart);

194+ return plausibleSyllables;

195+}

196+

197+function convertSyllableToInt(syl: string, symbolType: SymbolType): number {

198+ let syls = getSyllablesBySymbolType(symbolType);

199+ return syls.findIndex(s => s === syl) % 256;

200+}

201+

202+export function getPlausibleNewParts(parts: string[], symbolType: SymbolType): string[] {

203+ const syllables: string[] = getPlausibleSyllables(parts, symbolType);

204+ let plausibleParts = uniq(syllables.map((syllable) => symbolDefs[syllable]).flat());

205+ plausibleParts = addEquivalentParts(plausibleParts);

206+ return without(plausibleParts, ...parts);

207+}

208+

209+export function filterPlausibleParts(parts: string[], symbolType: SymbolType, newParts: string[]): string[] {

210+ const plausibleParts = getPlausibleNewParts(parts, symbolType);

211+ return intersection(newParts, plausibleParts);

212+}

213+

214+export function arePartsPlausible(parts: string[], symbolType: SymbolType, newParts: string[]): boolean {

215+ return filterPlausibleParts(parts, symbolType, newParts).length > 0;

216+}

217+

218+function hasComplement(partId: string): boolean {

219+ const secondToLastChar = partId.slice(-2)[0];

220+ return partId[0] === 'c' && (secondToLastChar === 'm' || secondToLastChar === 'l');

221+}

222+

223+function getComplementaryCircleId(circleId: string): string {

224+ let newId = circleId.replace(/m(?=.$)/, 'l');

225+ if (newId === circleId) {

226+ newId = circleId.replace(/l(?=.$)/, 'm');

227+ }

228+ circleId = newId;

229+ circleId = circleId.replace(/f$/, 'b');

230+ if (newId === circleId) {

231+ circleId = circleId.replace(/b$/, 'f');

232+ }

233+ return circleId;

234+}

235+

236+function getPartTypeIndex(partId: string): number {

237+ return PART_TYPES.findIndex(p => p[0] === partId[0]);

238+}

239+

240+export function filterPartsByGeon(parts: string[], geon: Geon): string[] {

241+ if (['gq1', 'gbs'].includes(geon)) {

242+ parts = without(parts, 'ctr2mb', 'ctr2lf', 'atrf2', 'atra2', 'atrb2');

243+ } else {

244+ parts = without(parts, 'ctr3mf', 'ctr3lb');

245+ }

246+ if (['gq2', 'gfs'].includes(geon)) {

247+ parts = without(parts, 'ctl3mb', 'ctl3lf', 'ctl2mb', 'ctl2lf', 'atlf2', 'atla2', 'atlb2');

248+ } else {

249+ parts = without(parts, 'ctl3mf', 'ctl3lb');

250+ }

251+ if (['gq3', 'gbs'].includes(geon)) {

252+ parts = without(parts, 'cbl3mb', 'cbl3lf', 'cbl2mb', 'cbl2lf', 'ablf2', 'ablb2');

253+ } else {

254+ parts = without(parts, 'cbl3mf', 'cbl3lb');

255+ }

256+ if (['gq4', 'gfs'].includes(geon)) {

257+ parts = without(parts, 'cbr2mb', 'cbr2lf', 'abrf2', 'abrb2', 'arb2');

258+ }

259+ return parts;

260+}

261+

262+export function filterFakeParts(parts: string[]): string[] {

263+ return parts.filter(part => partParents[part]);

264+}

265+

266+export class SymbolQuery {

267+ sigilQuery?: SigilQuery;

268+ symbolType: SymbolType;

269+ components: string[];

270+

271+ constructor(sigilQuery: SigilQuery = undefined, components = [], symbolType: SymbolType = 'suffix') {

272+ this.sigilQuery = sigilQuery;

273+ this.components = components;

274+ this.symbolType = symbolType;

275+ this.cleanupParts();

276+ }

277+

278+ set geon(geon: Geon) {

279+ this.components = this.components.filter(c => c[0] !== 'g');

280+ if (geon)

281+ this.components = [geon, ...this.components];

282+ this.cleanupParts();

283+ }

284+

285+ get geon(): Geon {

286+ return this.components.find(c => c[0] === 'g');

287+ }

288+

289+ get allowFictional() {

290+ if (this.sigilQuery) return this.sigilQuery.allowFictional;

291+ return true;

292+ }

293+

294+ get plausibleSyllables() {

295+ return getPlausibleSyllables(this.components, this.symbolType);

296+ }

297+

298+ get plausibleInts() {

299+ return this.plausibleSyllables.map(syl => convertSyllableToInt(syl, this.symbolType));

300+ }

301+

302+ get isPlausible() {

303+ return this.plausibleSyllables.length > 0;

304+ }

305+

306+ get plausibleParts() {

307+ return getPlausibleNewParts(this.components, this.symbolType);

308+ }

309+

310+ get isPerfectMatch() {

311+ const syls = this.plausibleSyllables;

312+ if (syls.length === 1) return true;

313+ const compLength = this.components.length;

314+ return syls.map(syl => symbolDefs[syl].length).some(length => length === compLength);

315+ }

316+

317+ filterPlausibleParts(parts: string[]): string[] {

318+ return filterPlausibleParts(this.components, this.symbolType, parts);

319+ }

320+

321+ arePartsPlausible(parts: string[]): boolean {

322+ return arePartsPlausible(this.components, this.symbolType, parts);

323+ }

324+

325+ cleanupParts() {

326+ this.components = uniq(this.components);

327+ this.components = filterPartsByGeon(this.components, this.geon);

328+ this.components = filterFakeParts(this.components);

329+ // if (!this.allowFictional) {

330+ // this.components = this.plausibleParts;

331+ // }

332+ this.components = this.components.sort((c1, c2) => {

333+ let i1 = getPartTypeIndex(c1);

334+ let i2 = getPartTypeIndex(c2);

335+ let diff = i1 - i2;

336+ if (diff !== 0) return diff;

337+ if (c1[0] === 'c') {

338+ return c1.localeCompare(c2);

339+ } else {

340+ return c2.localeCompare(c1);

341+ }

342+ });

343+ }

344+

345+ clearPartType(partType: PartType) {

346+ this.components = this.components.filter(c => c[0] !== partType[0]);

347+ return this;

348+ }

349+

350+ clearExceptPartType(partType: PartType) {

351+ this.components = this.components.filter(c => c[0] === partType[0]);

352+ return this;

353+ }

354+

355+ clear() {

356+ this.components = [];

357+ return this;

358+ }

359+

360+ addPart(partId: string) {

361+ this.components = [...this.components, partId];

362+ if (hasComplement(partId)) {

363+ const otherPartId = getComplementaryCircleId(partId);

364+ this.components = [...this.components, otherPartId];

365+ }

366+ this.cleanupParts();

367+ return this;

368+ }

369+

370+ removePart(partId: string) {

371+ this.components = without(this.components, partId);

372+ if (hasComplement(partId)) {

373+ const otherPartId = getComplementaryCircleId(partId);

374+ this.components = without(this.components, otherPartId);

375+ }

376+ this.cleanupParts();

377+ return this;

378+ }

379+}

380+

381+export function getDeepParts(def: ModeDef): string[] {

382+ if (def.modes) {

383+ return uniq(Object.values(def.modes).map(getDeepParts).flat());

384+ } else {

385+ return def.parts || [];

386+ }

387+}

ui/src/lib/utils.ts+18

@@ -41,3 +41,21 @@ export function toggleStoreKey(store, key) {

4141 [key]: !store[key],

4242 }));

4343}

44+

45+export function capitalize(string: string): string {

46+ return string.charAt(0).toUpperCase() + string.slice(1);

47+}

48+

49+export function uxToHex(ux: string) {

50+ let value = ux;

51+ if (ux.length > 2 && ux.substring(0, 2) === '0x') {

52+ value = ux.substring(2)

53+ }

54+

55+ value = value.replace('.', '').padStart(6, '0');

56+ return '#' + value;

57+}

58+

59+export function sleep(ms) {

60+ return new Promise(resolve => setTimeout(resolve, ms));

61+}

ui/src/routes/HelpPage.svelte+2−2

@@ -1,8 +1,8 @@

11<script lang="ts">

22 import { onMount } from 'svelte';

33 import { push } from 'svelte-spa-router';

4− import docs from '../stores/docs';

5− import Doc from '../components/docs/Doc.svelte';

4+ import docs from 'stores/docs';

5+ import Doc from '@/docs/Doc.svelte';

66 export let params: any = {};

77 $: path = params.path || '';

88

ui/src/routes/Home.svelte+110−55

@@ -1,62 +1,111 @@

11<script lang="ts">

2− import Router from 'svelte-spa-router';

3− import { link, push, replace, location, querystring } from 'svelte-spa-router'

4− import pageName from '../stores/pageName';

5− import { SearchAnalysis } from '../lib/id';

6− import { linkToShip } from '../lib/link';

7− import SearchBar from "../components/SearchBar.svelte";

8− import SearchResults from "../components/SearchResults.svelte";

9− import ShipView from '../components/ShipView.svelte';

10− import StarChart from '../components/StarChart.svelte';

11− import ValidationProblems from '../components/ValidationProblems.svelte';

12− import HomeScreenTiles from '../components/HomeScreenTiles.svelte';

2+ import { push, replace, location, querystring } from 'svelte-spa-router'

3+ import pageName from 'stores/pageName';

4+ import { SearchAnalysis } from 'lib/id';

5+ import { SigilQuery } from 'lib/sigil';

6+ import { buildQuerystring } from 'lib/utils';

7+ import { linkToShip, linkToChart, linkToSearch } from 'lib/link';

8+ import SearchBar from "@/search/SearchBar.svelte";

9+ import SearchResults from "@/search/SearchResults.svelte";

10+ import ShipView from '@/ship_view/ShipView.svelte';

11+ import StarChart from '@/StarChart.svelte';

12+ import ValidationProblems from '@/ValidationProblems.svelte';

13+ import HomeScreenTiles from '@/HomeScreenTiles.svelte';

1314 export let params: any = {};

15+

1416 let analysis: SearchAnalysis = new SearchAnalysis();

17+ let sigilQuery: SigilQuery = new SigilQuery('planet');

1518 let navigating = false;

16−

17− let search: string = (new URLSearchParams($querystring)).get('search') || params.arg || '';

19+

20+ let searchParams = new URLSearchParams($querystring);

21+ function getUrlSearchMode(searchParams) {

22+ return (searchParams.get('mode') == 'sigil') ? 'sigil' : 'patp';

23+ }

24+ let searchMode: ('patp' | 'sigil') = getUrlSearchMode(searchParams);

25+ let search: string = searchParams.get('search') || params.arg || '';

26+ let patp: string = undefined;

1827 let urlSearch = search;

19− // let urlChanged;

20− let urlChangedSinceAnalysisPatp = false;

28+ let urlSearchMode = searchMode;

29+ let urlChangedSinceShipQuery = false;

2130 $: {

22− const potentialUrlSearch = (new URLSearchParams($querystring)).get('search') || params.arg || '';

31+ const searchParams = new URLSearchParams($querystring);

32+ const potentialUrlSearch = searchParams.get('search') || params.arg || '';

2333 if (($location + $querystring).includes(potentialUrlSearch)) {

2434 urlSearch = potentialUrlSearch;

25− // urlChanged = Date.now();

26− urlChangedSinceAnalysisPatp = true;

35+ urlSearchMode = getUrlSearchMode(searchParams);

36+ urlChangedSinceShipQuery = true;

2737 navigating = false;

38+ // console.log('url changed');

2839 }

2940 }

3041 $: {

31− // analysisPatpChanged = (analysis.patp || true) && Date.now();

32− urlChangedSinceAnalysisPatp = (analysis.patp || true) && false;

42+ urlChangedSinceShipQuery = (search || true) && searchMode && false;

43+ // console.log('search changed');

44+ }

45+ function autoNav() {

46+ // console.log('autonav');

47+ if ((search !== urlSearch || searchMode !== urlSearchMode)) {

48+ if (urlChangedSinceShipQuery) {

49+ search = urlSearch;

50+ searchMode = urlSearchMode;

51+ // console.log('url wins');

52+ } else {

53+ navigating = true;

54+ // console.log('search wins');

55+ // create a temp one because the real one doesn't always update in time!

56+ let tempAnalysis = new SearchAnalysis(search);

57+ if (params.mode === 'chart') {

58+ // console.log('to chart');

59+ navToChart(tempAnalysis.patpIsValid);

60+ } else {

61+ if (tempAnalysis.patpIsValid) {

62+ // console.log('to ship view');

63+ navToShipView(tempAnalysis.patp, true);

64+ } else {

65+ const fromShipMode = params.mode === 'ship';

66+ // console.log('to search');

67+ navToSearch(fromShipMode);

68+ }

69+ }

70+ }

71+ }

3372 }

73+ $: urlSearch, urlSearchMode, search, searchMode, autoNav();

3474 function nav(path, addToHistory = false) {

3575 (addToHistory ? push : replace)(path);

3676 }

3777 function navHome(addToHistory = false) {

3878 params.mode = null;

3979 params.arg = null;

40− nav('/', addToHistory);

80+ if (searchMode == 'patp') {

81+ nav('/', addToHistory);

82+ } else {

83+ nav('/' + buildQuerystring({ mode: searchMode }), addToHistory);

84+ }

4185 }

42− function navToShipView(addToHistory = false) {

86+ function navToShipView(patp, addToHistory = false) {

4387 params.mode = 'ship';

44− params.arg = analysis.patp;

45− if (analysis.patp === search) {

46− nav(linkToShip(analysis.patp), addToHistory);

88+ params.arg = patp;

89+ if (patp === search) {

90+ nav(linkToShip(patp), addToHistory);

4791 } else {

48− nav(linkToShip(analysis.patp, { search }), addToHistory);

92+ nav(linkToShip(patp, { search, mode: searchMode }), addToHistory);

4993 }

5094 }

5195 function navToSearch(addToHistory = false) {

5296 if (!search) {

5397 navHome(addToHistory);

54− } else if (analysis.queryIsValid) {

98+ } else {

5599 params.mode = 'search';

56100 params.arg = search;

57− nav(`/search/${search}`, addToHistory);

101+ nav(linkToSearch(search, { mode: searchMode }), addToHistory);

58102 }

59103 }

104+ function navToChart(addToHistory = true) {

105+ params.mode = 'chart';

106+ params.arg = search;

107+ nav(linkToChart(search), addToHistory);

108+ }

60109

61110 function navToMode(mode, addToHistory = false) {

62111 switch (mode) {

@@ -70,22 +119,6 @@

70119 navHome(addToHistory);

71120 }

72121 }

73− // $: urlChangedSinceAnalysisPatp = (urlChanged - analysisPatpChanged) > 1000;

74− function autoNav() {

75− if (params.mode !== 'chart' && search !== urlSearch) {

76− if (urlChangedSinceAnalysisPatp) {

77− search = urlSearch;

78− } else if (analysis.search === search) {

79− navigating = true;

80− if (analysis.patpIsValid) {

81− navToShipView(true);

82− } else {

83− navToSearch(params.mode === 'ship');

84− }

85− }

86− }

87− }

88− $: urlSearch, analysis, autoNav();

89122 $: {

90123 let properMode = params.mode;

91124 if (properMode === 'chart') {

@@ -102,8 +135,10 @@

102135 }

103136 }

104137

138+ let placeholderText;

105139 $: {

106140 if (analysis.search === urlSearch) {

141+ placeholderText = undefined;

107142 switch (params.mode) {

108143 case 'ship':

109144 $pageName = params.arg;

@@ -113,6 +148,8 @@

113148 break;

114149 case 'chart':

115150 $pageName = 'Star Chart';

151+ placeholderText = 'Search by @p or #.';

152+ break;

116153 default:

117154 $pageName = null;

118155 }

@@ -122,19 +159,37 @@

122159

123160</script>

124161

125−<div class="p-4 min-h-full flex flex-col items-center space-y-8 2xs:p-8">

126− <SearchBar bind:analysis bind:search />

127−

128− {#if params.mode == "chart"}

129− <StarChart patp={analysis.patpIsValid ? analysis.patp : null} />

130− {:else if analysis.patpIsValid}

131− <ShipView patp={analysis.patp} />

132− {:else if (analysis.queryIsValid)}

133− <SearchResults query={analysis.query} search={analysis.search} />

134− {:else if (analysis.search.length > 0)}

162+<div class="p-4 space-y-4 min-h-full flex flex-col items-center 2xs:p-8 2xs:space-y-8">

163+ <SearchBar bind:analysis bind:sigilQuery bind:search bind:searchMode bind:patp {placeholderText}

164+ allowSigilSearch={params.mode !== 'chart'}

165+ />

166+ <!-- <div class="bg-white">

167+ <p>

168+ Mode: {params.mode}

169+ </p>

170+ <p>

171+ Search: {search}

172+ </p>

173+ <p>

174+ URL Search: {urlSearch}

175+ </p>

176+ <p>

177+ Search mode: {searchMode}

178+ </p>

179+ <p>

180+ Patp: {patp}

181+ </p>

182+ </div> -->

183+ {#if params.mode == 'chart'}

184+ <StarChart patp={patp || null} />

185+ {:else if patp}

186+ <ShipView {patp} />

187+ {:else if (searchMode === 'patp' && analysis.queryIsValid) || (searchMode === 'sigil' && sigilQuery.isWorthSearching)}

188+ <SearchResults regexQuery={analysis.query} sigilQuery={sigilQuery}

189+ patpSearch={analysis.search} {searchMode} />

190+ {:else if (analysis.search.length > 0 && analysis.queryProblems.length > 0)}

135191 <ValidationProblems problems={analysis.queryProblems} />

136192 {:else}

137193 <HomeScreenTiles />

138194 {/if}

139−

140195</div>

ui/src/routes/SigilPage.sveltenew file+61

@@ -0,0 +1,61 @@

1+<script lang="ts">

2+ import { prefixes, suffixes } from 'lib/id';

3+ import Sigil from "@/common/Sigil.svelte";

4+ // import Legil from "@/common/Legil.svelte";

5+

6+ let index: number = undefined;

7+ let altBgColor = 'red';

8+

9+ let phonemes = prefixes.map(p => p + 'zod').concat(suffixes).sort().map(p => '~' + p);

10+

11+ function into(i) {

12+ index = i;

13+ }

14+

15+ function out() {

16+ index = undefined;

17+ }

18+

19+ function forward() {

20+ index = index + 1;

21+ index = Math.min(511, index);

22+ }

23+

24+ function back() {

25+ index = index - 1;

26+ index = Math.max(0, index);

27+ }

28+</script>

29+

30+<div class="bg-white m-4">

31+ {#if index == undefined}

32+ <div class="flex flex-wrap">

33+ {#each phonemes as phoneme, i}

34+ <div class="w-[128px] m-2" on:click={() => into(i)}>

35+ <h2>

36+ {phoneme}

37+ </h2>

38+ <div class="flex">

39+ <Sigil patp={phoneme} size={64} {altBgColor} />

40+ <Sigil patp={phoneme} size={64} {altBgColor} useNew />

41+

42+ </div>

43+ </div>

44+ {/each}

45+ </div>

46+ {:else}

47+ <div class="flex gap-2">

48+ <button class="p-4 border" on:click={back}><</button>

49+ <button class="p-4 border" on:click={out}>^</button>

50+ <button class="p-4 border" on:click={forward}>></button>

51+ </div>

52+ <h2>

53+ {phonemes[index]}

54+ </h2>

55+ <div class="flex w-full">

56+ <Sigil patp={phonemes[index]} size={400} {altBgColor} />

57+ <Sigil patp={phonemes[index]} size={400} {altBgColor} useNew />

58+

59+ </div>

60+ {/if}

61+</div>

ui/src/stores/docs.ts+1−2

@@ -1,8 +1,7 @@

11import { writable } from 'svelte/store';

22

3−import { getDoc } from '../lib/api';

3+import { getDoc } from 'lib/api';

44const docs = {};

5−// import type { AppState, Contacts } from '../types/store';

65

76const initStore: any = {

87 show: false,

ui/src/stores/keys.tsnew file+68

@@ -0,0 +1,68 @@

1+import { writable, get } from 'svelte/store';

2+

3+const docs = {};

4+

5+class MapWithDefault<K, V> extends Map<K, V> {

6+ default: Function;

7+

8+ get(key: K) {

9+ if (!this.has(key)) {

10+ this.set(key, this.default());

11+ }

12+ return super.get(key);

13+ }

14+

15+ constructor(defaultFunction: () => V) {

16+ super();

17+ this.default = defaultFunction;

18+ }

19+}

20+

21+type Bindings = MapWithDefault<string, MapWithDefault<string, Function>>;

22+interface KeysStore {

23+ keydown: Bindings;

24+ keyup: Bindings;

25+ globalkeydown: Bindings;

26+ globalkeyup: Bindings;

27+};

28+function newEmptyBindings(): Bindings {

29+ return new MapWithDefault(() => new MapWithDefault(() => Function));

30+}

31+const initStore: KeysStore = {

32+ keydown: newEmptyBindings(),

33+ keyup: newEmptyBindings(),

34+ globalkeydown: newEmptyBindings(),

35+ globalkeyup: newEmptyBindings(),

36+};

37+

38+const store = writable(initStore);

39+const { subscribe, update, set } = store;

40+

41+function runCallbacks(bindings: Bindings, event: KeyboardEvent) {

42+ let els = [];

43+ if (event.ctrlKey) els.push('ctrl');

44+ if (event.metaKey) els.push('cmd');

45+ if (event.altKey) els.push('alt');

46+ if (event.shiftKey) els.push('shift');

47+ els.push(event.key == ' ' ? 'Space' : event.key.toLowerCase());

48+ let combo = els.join('+');

49+ // console.log(event);

50+ let callbacks = bindings.get(combo);

51+ if (callbacks) {

52+ callbacks.forEach((callback) => {

53+ try {

54+ if (callback)

55+ callback(event);

56+ } catch (e) {

57+ console.error(e);

58+ }

59+ });

60+ }

61+}

62+

63+export default {

64+ subscribe,

65+ update,

66+ set,

67+ runCallbacks,

68+};

ui/src/stores/searchStores.ts+38−16

@@ -2,36 +2,58 @@ import { writable, derived } from 'svelte/store';

22

33import type { Contact, Rolodex } from '@urbit/api';

44import store from './store';

5−import type { StoreState, SearchedContactsState } from '../types/store';

6−import { SearchSettings } from '../types/store';

7−import { filterObject } from '../lib/utils';

5+import type { StoreState, SearchedContactsState } from 'types/store';

6+import { createEmptyContact } from 'types/store';

7+import { SearchSettings } from 'types/store';

8+import { splitIdIntoSyls, isMoonLength, isCometLength } from 'lib/id';

9+import { filterObject } from 'lib/utils';

810

911const searchSettings = writable(new SearchSettings());

1012

1113const searchedContacts = derived([store, searchSettings], deriveSearchedContacts);

12−searchedContacts.search = store.search;

14+searchedContacts.searchPatp = store.searchPatp;

15+searchedContacts.searchSigil = store.searchSigil;

1316

1417function deriveSearchedContacts([$store, $searchSettings]): SearchedContactsState {

15− if (!$store.query) {

16− return {};

18+ let idMatches;

19+ if ($store.searchMode === 'patp') {

20+ if (!$store.patpQuery) {

21+ return {};

22+ }

23+ idMatches = idMatchesRegex;

24+ } else {

25+ if (!$store.sigilQuery) {

26+ return {};

27+ }

28+ idMatches = idMatchesSyls;

1729 }

18− function idMatchesSearch(id) {

19− if (!$store.query.test(id)) return false;

20− if (!$searchSettings.includeMoons && id.length > 14 && id.length <= 28) {

30+ function isIdAllowed(id) {

31+ if (!$searchSettings.includeMoons && isMoonLength(id)) {

2132 return false;

2233 }

23− if (!$searchSettings.includeComets && id.length > 28) {

34+ if (!$searchSettings.includeComets && isCometLength(id)) {

2435 return false;

2536 }

2637 return true;

2738 }

28− const filteredContacts = filterObject($store.contacts, idMatchesSearch) as Rolodex;

39+ function idMatchesSyls(id) {

40+ if (!isIdAllowed(id)) return false;

41+ const idSyls = splitIdIntoSyls(id);

42+ if (idSyls.length !== $store.sigilQuery.length) return false;

43+ return idSyls.every((syl, index) => {

44+ const symbolSyls = $store.sigilQuery[index];

45+ if (symbolSyls.length == 256) return true;

46+ return symbolSyls.includes(syl);

47+ });

48+ }

49+ function idMatchesRegex(id) {

50+ if (!$store.patpQuery.test(id)) return false;

51+ return isIdAllowed(id);

52+ }

53+ const filteredContacts = filterObject($store.contacts, idMatches) as Rolodex;

2954 $store.peers.forEach((id) => {

30− if (idMatchesSearch(id) && !filteredContacts[id]) {

31− filteredContacts[id] = {

32− nickname: null, bio: null, status: null, color: null, avatar: null,

33− cover: null, groups: [], 'last-updated': 0,

34− } as Contact

55+ if (idMatches(id) && !filteredContacts[id]) {

56+ filteredContacts[id] = createEmptyContact();

3557 }

3658 })

3759 return filteredContacts;

ui/src/stores/store.ts+48−9

@@ -1,15 +1,29 @@

11import { writable } from 'svelte/store';

22

33import type { Rolodex } from '@urbit/api';

4−import { subscribeToContacts, getPeers } from '../lib/api';

5−import type { StoreState } from '../types/store';

6−import { normalizeId } from '../lib/id';

7−import { setStoreKey } from '../lib/utils';

4+import { subscribeToContacts, getPeers } from 'lib/api';

5+import type { StoreState, Apps } from 'types/store';

6+import { normalizeId } from 'lib/id';

7+import { setStoreKey } from 'lib/utils';

8+import { getPals } from 'lib/pals';

9+import { subscribeToApps } from 'lib/apps';

810

911const initStore: StoreState = {

1012 contacts: {},

11− peers: {},

12− query: null,

13+ peers: [],

14+ pals: {

15+ incoming: {},

16+ outgoing: {},

17+ mutuals: {},

18+ },

19+ palsInstalled: false,

20+ apps: {

21+ allies: {},

22+ set: new Set(),

23+ },

24+ patpQuery: null,

25+ sigilQuery: null,

26+ searchMode: 'patp',

1327 connection: 'disconnected',

1428 ship: window.ship,

1529};

@@ -17,8 +31,14 @@ const initStore: StoreState = {

1731const store = writable(initStore);

1832const { subscribe, update, set } = store;

1933

20−function search(idQuery: RegExp) {

21− setStoreKey(store, 'query', idQuery);

34+function searchPatp(patpQuery: RegExp) {

35+ setStoreKey(store, 'patpQuery', patpQuery);

36+ setStoreKey(store, 'searchMode', 'patp');

37+}

38+

39+function searchSigil(syls: string[][]) {

40+ setStoreKey(store, 'sigilQuery', syls);

41+ setStoreKey(store, 'searchMode', 'sigil');

2242}

2343

2444function reset() {

@@ -40,4 +60,23 @@ getPeers().then(({ points }) => {

4060 setStoreKey(store, 'peers', points.map(normalizeId));

4161});

4262

43−export default { subscribe, set, search, reset };

63+function refreshPals() {

64+ return getPals().then((pals) => {

65+ setStoreKey(store, 'pals', pals);

66+ setStoreKey(store, 'palsInstalled', true);

67+ });

68+}

69+refreshPals();

70+

71+function updateApps(callback: (apps) => Apps): void {

72+ update($store => {

73+ return {

74+ ...$store,

75+ apps: callback($store.apps),

76+ };

77+ });

78+}

79+

80+subscribeToApps(updateApps);

81+

82+export default { subscribe, set, searchPatp, searchSigil, refreshPals, reset };

ui/src/styles/tailwind-output.css+863−109

@@ -487,46 +487,130 @@ Ensure the default browser behavior of the `hidden` attribute.

487487.relative {

488488 position: relative;

489489}

490+.inset-0 {

491+ top: 0px;

492+ right: 0px;

493+ bottom: 0px;

494+ left: 0px;

495+}

496+.inset-x-0 {

497+ left: 0px;

498+ right: 0px;

499+}

500+.inset-x-auto {

501+ left: auto;

502+ right: auto;

503+}

504+.inset-x-full {

505+ left: 100%;

506+ right: 100%;

507+}

490508.right-0 {

491509 right: 0px;

492510}

511+.-bottom-2 {

512+ bottom: -0.5rem;

513+}

493514.top-0 {

494515 top: 0px;

495516}

496−.z-10 {

497− z-index: 10;

517+.bottom-0 {

518+ bottom: 0px;

519+}

520+.-bottom-12 {

521+ bottom: -3rem;

522+}

523+.-bottom-8 {

524+ bottom: -2rem;

525+}

526+.-bottom-4 {

527+ bottom: -1rem;

528+}

529+.-bottom-5 {

530+ bottom: -1.25rem;

531+}

532+.-bottom-3 {

533+ bottom: -0.75rem;

534+}

535+.top-1 {

536+ top: 0.25rem;

537+}

538+.right-1 {

539+ right: 0.25rem;

540+}

541+.top-2 {

542+ top: 0.5rem;

543+}

544+.right-2 {

545+ right: 0.5rem;

546+}

547+.right-4 {

548+ right: 1rem;

549+}

550+.right-3 {

551+ right: 0.75rem;

552+}

553+.left-1 {

554+ left: 0.25rem;

555+}

556+.left-2 {

557+ left: 0.5rem;

498558}

499559.z-20 {

500560 z-index: 20;

501561}

562+.z-10 {

563+ z-index: 10;

564+}

565+.z-50 {

566+ z-index: 50;

567+}

568+.col-span-3 {

569+ grid-column: span 3 / span 3;

570+}

571+.col-span-2 {

572+ grid-column: span 2 / span 2;

573+}

502574.m-4 {

503575 margin: 1rem;

504576}

577+.m-2 {

578+ margin: 0.5rem;

579+}

580+.-m-1 {

581+ margin: -0.25rem;

582+}

505583.m-8 {

506584 margin: 2rem;

507585}

508586.-m-2 {

509587 margin: -0.5rem;

510588}

511−.mx-4 {

512− margin-left: 1rem;

513− margin-right: 1rem;

589+.m-auto {

590+ margin: auto;

514591}

515−.mx-8 {

516− margin-left: 2rem;

517− margin-right: 2rem;

592+.m-1 {

593+ margin: 0.25rem;

518594}

519−.my-1\.5 {

520− margin-top: 0.375rem;

521− margin-bottom: 0.375rem;

595+.mx-auto {

596+ margin-left: auto;

597+ margin-right: auto;

522598}

523599.my-1 {

524600 margin-top: 0.25rem;

525601 margin-bottom: 0.25rem;

526602}

527−.mx-auto {

528− margin-left: auto;

529− margin-right: auto;

603+.my-3 {

604+ margin-top: 0.75rem;

605+ margin-bottom: 0.75rem;

606+}

607+.mx-4 {

608+ margin-left: 1rem;

609+ margin-right: 1rem;

610+}

611+.mx-8 {

612+ margin-left: 2rem;

613+ margin-right: 2rem;

530614}

531615.my-4 {

532616 margin-top: 1rem;

@@ -544,23 +628,39 @@ Ensure the default browser behavior of the `hidden` attribute.

544628 margin-top: 0px;

545629 margin-bottom: 0px;

546630}

631+.my-auto {

632+ margin-top: auto;

633+ margin-bottom: auto;

634+}

635+.-mx-1 {

636+ margin-left: -0.25rem;

637+ margin-right: -0.25rem;

638+}

639+.mx-1 {

640+ margin-left: 0.25rem;

641+ margin-right: 0.25rem;

642+}

643+.my-1\.5 {

644+ margin-top: 0.375rem;

645+ margin-bottom: 0.375rem;

646+}

547647.mt-2 {

548648 margin-top: 0.5rem;

549649}

550650.ml-\[22px\] {

551651 margin-left: 22px;

552652}

553−.ml-1 {

554− margin-left: 0.25rem;

653+.mr-1 {

654+ margin-right: 0.25rem;

555655}

556−.-mt-2 {

557− margin-top: -0.5rem;

656+.ml-8 {

657+ margin-left: 2rem;

558658}

559659.mr-4 {

560660 margin-right: 1rem;

561661}

562−.ml-4 {

563− margin-left: 1rem;

662+.ml-1 {

663+ margin-left: 0.25rem;

564664}

565665.mt-4 {

566666 margin-top: 1rem;

@@ -568,6 +668,12 @@ Ensure the default browser behavior of the `hidden` attribute.

568668.mt-5 {

569669 margin-top: 1.25rem;

570670}

671+.ml-4 {

672+ margin-left: 1rem;

673+}

674+.-mt-2 {

675+ margin-top: -0.5rem;

676+}

571677.-mt-1 {

572678 margin-top: -0.25rem;

573679}

@@ -595,6 +701,36 @@ Ensure the default browser behavior of the `hidden` attribute.

595701.mt-20 {

596702 margin-top: 5rem;

597703}

704+.-ml-1 {

705+ margin-left: -0.25rem;

706+}

707+.mr-3 {

708+ margin-right: 0.75rem;

709+}

710+.ml-auto {

711+ margin-left: auto;

712+}

713+.mb-1 {

714+ margin-bottom: 0.25rem;

715+}

716+.mr-2 {

717+ margin-right: 0.5rem;

718+}

719+.mr-0 {

720+ margin-right: 0px;

721+}

722+.-mb-24 {

723+ margin-bottom: -6rem;

724+}

725+.-mb-20 {

726+ margin-bottom: -5rem;

727+}

728+.-mb-16 {

729+ margin-bottom: -4rem;

730+}

731+.mb-2 {

732+ margin-bottom: 0.5rem;

733+}

598734.-mt-0\.5 {

599735 margin-top: -0.125rem;

600736}

@@ -622,9 +758,29 @@ Ensure the default browser behavior of the `hidden` attribute.

622758.hidden {

623759 display: none;

624760}

761+.aspect-square {

762+ aspect-ratio: 1 / 1;

763+}

625764.h-full {

626765 height: 100%;

627766}

767+.h-3 {

768+ height: 0.75rem;

769+}

770+.h-\[100vh\] {

771+ height: 100vh;

772+}

773+.h-12 {

774+ height: 3rem;

775+}

776+.h-5 {

777+ height: 1.25rem;

778+}

779+.h-fit {

780+ height: -webkit-fit-content;

781+ height: -moz-fit-content;

782+ height: fit-content;

783+}

628784.h-10 {

629785 height: 2.5rem;

630786}

@@ -634,15 +790,6 @@ Ensure the default browser behavior of the `hidden` attribute.

634790.h-8 {

635791 height: 2rem;

636792}

637−.h-12 {

638− height: 3rem;

639−}

640−.h-3 {

641− height: 0.75rem;

642−}

643−.h-\[100vh\] {

644− height: 100vh;

645−}

646793.h-2 {

647794 height: 0.5rem;

648795}

@@ -658,27 +805,76 @@ Ensure the default browser behavior of the `hidden` attribute.

658805.h-24 {

659806 height: 6rem;

660807}

808+.h-20 {

809+ height: 5rem;

810+}

811+.h-48 {

812+ height: 12rem;

813+}

814+.h-64 {

815+ height: 16rem;

816+}

817+.h-72 {

818+ height: 18rem;

819+}

820+.h-16 {

821+ height: 4rem;

822+}

823+.h-auto {

824+ height: auto;

825+}

826+.h-0 {

827+ height: 0px;

828+}

829+.h-min {

830+ height: -webkit-min-content;

831+ height: -moz-min-content;

832+ height: min-content;

833+}

834+.h-40 {

835+ height: 10rem;

836+}

837+.h-60 {

838+ height: 15rem;

839+}

840+.min-h-\[20px\] {

841+ min-height: 20px;

842+}

661843.min-h-full {

662844 min-height: 100%;

663845}

664846.min-h-0 {

665847 min-height: 0px;

666848}

849+.min-h-\[14rem\] {

850+ min-height: 14rem;

851+}

667852.w-full {

668853 width: 100%;

669854}

670−.w-10 {

671− width: 2.5rem;

672−}

673−.w-12 {

674− width: 3rem;

855+.w-min {

856+ width: -webkit-min-content;

857+ width: -moz-min-content;

858+ width: min-content;

675859}

676860.w-3 {

677861 width: 0.75rem;

678862}

863+.w-\[128px\] {

864+ width: 128px;

865+}

679866.w-\[100vw\] {

680867 width: 100vw;

681868}

869+.w-12 {

870+ width: 3rem;

871+}

872+.w-5 {

873+ width: 1.25rem;

874+}

875+.w-10 {

876+ width: 2.5rem;

877+}

682878.w-7 {

683879 width: 1.75rem;

684880}

@@ -691,18 +887,55 @@ Ensure the default browser behavior of the `hidden` attribute.

691887.w-6 {

692888 width: 1.5rem;

693889}

890+.w-48 {

891+ width: 12rem;

892+}

893+.w-24 {

894+ width: 6rem;

895+}

896+.w-20 {

897+ width: 5rem;

898+}

899+.w-8 {

900+ width: 2rem;

901+}

902+.w-64 {

903+ width: 16rem;

904+}

905+.w-72 {

906+ width: 18rem;

907+}

908+.w-16 {

909+ width: 4rem;

910+}

911+.w-40 {

912+ width: 10rem;

913+}

914+.w-fit {

915+ width: -webkit-fit-content;

916+ width: -moz-fit-content;

917+ width: fit-content;

918+}

919+.w-max {

920+ width: -webkit-max-content;

921+ width: -moz-max-content;

922+ width: max-content;

923+}

924+.w-\[48px\] {

925+ width: 48px;

926+}

694927.min-w-0 {

695928 min-width: 0px;

696929}

930+.min-w-\[128px\] {

931+ min-width: 128px;

932+}

697933.max-w-md {

698934 max-width: 28rem;

699935}

700936.max-w-xs {

701937 max-width: 20rem;

702938}

703−.max-w-\[256px\] {

704− max-width: 256px;

705−}

706939.max-w-sm {

707940 max-width: 24rem;

708941}

@@ -712,6 +945,27 @@ Ensure the default browser behavior of the `hidden` attribute.

712945.max-w-2xl {

713946 max-width: 42rem;

714947}

948+.max-w-xl {

949+ max-width: 36rem;

950+}

951+.max-w-lg {

952+ max-width: 32rem;

953+}

954+.max-w-\[128px\] {

955+ max-width: 128px;

956+}

957+.max-w-\[256px\] {

958+ max-width: 256px;

959+}

960+.max-w-\[10rem\] {

961+ max-width: 10rem;

962+}

963+.max-w-\[18rem\] {

964+ max-width: 18rem;

965+}

966+.max-w-\[15rem\] {

967+ max-width: 15rem;

968+}

715969.flex-shrink-0 {

716970 flex-shrink: 0;

717971}

@@ -721,15 +975,67 @@ Ensure the default browser behavior of the `hidden` attribute.

721975.shrink {

722976 flex-shrink: 1;

723977}

978+.shrink-0 {

979+ flex-shrink: 0;

980+}

724981.flex-grow {

725982 flex-grow: 1;

726983}

727984.grow {

728985 flex-grow: 1;

729986}

987+.grow-\[2\] {

988+ flex-grow: 2;

989+}

730990.border-collapse {

731991 border-collapse: collapse;

732992}

993+.origin-bottom-right {

994+ transform-origin: bottom right;

995+}

996+.origin-left {

997+ transform-origin: left;

998+}

999+.origin-right {

1000+ transform-origin: right;

1001+}

1002+.origin-top-left {

1003+ transform-origin: top left;

1004+}

1005+.origin-top-right {

1006+ transform-origin: top right;

1007+}

1008+.origin-bottom-left {

1009+ transform-origin: bottom left;

1010+}

1011+.translate-x-0 {

1012+ --tw-translate-x: 0px;

1013+ transform: translate(var(--tw-translate-x), var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y));

1014+}

1015+.translate-y-0 {

1016+ --tw-translate-y: 0px;

1017+ transform: translate(var(--tw-translate-x), var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y));

1018+}

1019+.translate-x-1\/4 {

1020+ --tw-translate-x: 25%;

1021+ transform: translate(var(--tw-translate-x), var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y));

1022+}

1023+.translate-y-1\/4 {

1024+ --tw-translate-y: 25%;

1025+ transform: translate(var(--tw-translate-x), var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y));

1026+}

1027+.-translate-x-1\/4 {

1028+ --tw-translate-x: -25%;

1029+ transform: translate(var(--tw-translate-x), var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y));

1030+}

1031+.-translate-y-1\/4 {

1032+ --tw-translate-y: -25%;

1033+ transform: translate(var(--tw-translate-x), var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y));

1034+}

1035+.rotate-90 {

1036+ --tw-rotate: 90deg;

1037+ transform: translate(var(--tw-translate-x), var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y));

1038+}

7331039.rotate-45 {

7341040 --tw-rotate: 45deg;

7351041 transform: translate(var(--tw-translate-x), var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y));

@@ -738,41 +1044,140 @@ Ensure the default browser behavior of the `hidden` attribute.

7381044 --tw-rotate: -45deg;

7391045 transform: translate(var(--tw-translate-x), var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y));

7401046}

1047+.scale-150 {

1048+ --tw-scale-x: 1.5;

1049+ --tw-scale-y: 1.5;

1050+ transform: translate(var(--tw-translate-x), var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y));

1051+}

1052+.scale-50 {

1053+ --tw-scale-x: .5;

1054+ --tw-scale-y: .5;

1055+ transform: translate(var(--tw-translate-x), var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y));

1056+}

7411057.transform {

7421058 transform: translate(var(--tw-translate-x), var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y));

7431059}

1060+@-webkit-keyframes spin {

1061+

1062+ to {

1063+ transform: rotate(360deg);

1064+ }

1065+}

1066+@keyframes spin {

1067+

1068+ to {

1069+ transform: rotate(360deg);

1070+ }

1071+}

1072+.animate-spin {

1073+ -webkit-animation: spin 1s linear infinite;

1074+ animation: spin 1s linear infinite;

1075+}

7441076.cursor-pointer {

7451077 cursor: pointer;

7461078}

7471079.resize {

7481080 resize: both;

7491081}

1082+.auto-cols-min {

1083+ grid-auto-columns: -webkit-min-content;

1084+ grid-auto-columns: min-content;

1085+}

1086+.auto-cols-fr {

1087+ grid-auto-columns: minmax(0, 1fr);

1088+}

1089+.auto-cols-max {

1090+ grid-auto-columns: -webkit-max-content;

1091+ grid-auto-columns: max-content;

1092+}

1093+.grid-flow-row {

1094+ grid-auto-flow: row;

1095+}

1096+.grid-flow-col {

1097+ grid-auto-flow: column;

1098+}

1099+.grid-flow-row-dense {

1100+ grid-auto-flow: row dense;

1101+}

1102+.grid-flow-col-dense {

1103+ grid-auto-flow: column dense;

1104+}

1105+.auto-rows-min {

1106+ grid-auto-rows: -webkit-min-content;

1107+ grid-auto-rows: min-content;

1108+}

1109+.auto-rows-auto {

1110+ grid-auto-rows: auto;

1111+}

1112+.auto-rows-max {

1113+ grid-auto-rows: -webkit-max-content;

1114+ grid-auto-rows: max-content;

1115+}

7501116.grid-cols-3 {

7511117 grid-template-columns: repeat(3, minmax(0, 1fr));

7521118}

1119+.grid-cols-2 {

1120+ grid-template-columns: repeat(2, minmax(0, 1fr));

1121+}

1122+.grid-cols-1 {

1123+ grid-template-columns: repeat(1, minmax(0, 1fr));

1124+}

1125+.grid-cols-4 {

1126+ grid-template-columns: repeat(4, minmax(0, 1fr));

1127+}

1128+.grid-cols-6 {

1129+ grid-template-columns: repeat(6, minmax(0, 1fr));

1130+}

1131+.grid-rows-2 {

1132+ grid-template-rows: repeat(2, minmax(0, 1fr));

1133+}

1134+.grid-rows-none {

1135+ grid-template-rows: none;

1136+}

1137+.grid-rows-3 {

1138+ grid-template-rows: repeat(3, minmax(0, 1fr));

1139+}

7531140.flex-col {

7541141 flex-direction: column;

7551142}

7561143.flex-wrap {

7571144 flex-wrap: wrap;

7581145}

1146+.place-content-center {

1147+ place-content: center;

1148+}

1149+.place-items-stretch {

1150+ place-items: stretch;

1151+}

7591152.content-center {

7601153 align-content: center;

7611154}

1155+.items-start {

1156+ align-items: flex-start;

1157+}

7621158.items-center {

7631159 align-items: center;

7641160}

1161+.justify-end {

1162+ justify-content: flex-end;

1163+}

7651164.justify-center {

7661165 justify-content: center;

7671166}

768−.gap-5 {

769− gap: 1.25rem;

1167+.justify-between {

1168+ justify-content: space-between;

7701169}

771−.gap-1\.5 {

772− gap: 0.375rem;

1170+.justify-evenly {

1171+ justify-content: space-evenly;

7731172}

774−.gap-1 {

775− gap: 0.25rem;

1173+.justify-items-center {

1174+ justify-items: center;

1175+}

1176+.justify-items-stretch {

1177+ justify-items: stretch;

1178+}

1179+.gap-5 {

1180+ gap: 1.25rem;

7761181}

7771182.gap-4 {

7781183 gap: 1rem;

@@ -780,6 +1185,23 @@ Ensure the default browser behavior of the `hidden` attribute.

7801185.gap-2 {

7811186 gap: 0.5rem;

7821187}

1188+.gap-1 {

1189+ gap: 0.25rem;

1190+}

1191+.gap-3 {

1192+ gap: 0.75rem;

1193+}

1194+.gap-1\.5 {

1195+ gap: 0.375rem;

1196+}

1197+.gap-x-4 {

1198+ -moz-column-gap: 1rem;

1199+ column-gap: 1rem;

1200+}

1201+.gap-x-1 {

1202+ -moz-column-gap: 0.25rem;

1203+ column-gap: 0.25rem;

1204+}

7831205.gap-x-2 {

7841206 -moz-column-gap: 0.5rem;

7851207 column-gap: 0.5rem;

@@ -788,10 +1210,6 @@ Ensure the default browser behavior of the `hidden` attribute.

7881210 -moz-column-gap: 0.75rem;

7891211 column-gap: 0.75rem;

7901212}

791−.gap-x-4 {

792− -moz-column-gap: 1rem;

793− column-gap: 1rem;

794−}

7951213.space-y-4 > :not([hidden]) ~ :not([hidden]) {

7961214 --tw-space-y-reverse: 0;

7971215 margin-top: calc(1rem * calc(1 - var(--tw-space-y-reverse)));

@@ -827,6 +1245,51 @@ Ensure the default browser behavior of the `hidden` attribute.

8271245 border-right-width: calc(1px * var(--tw-divide-x-reverse));

8281246 border-left-width: calc(1px * calc(1 - var(--tw-divide-x-reverse)));

8291247}

1248+.divide-gold > :not([hidden]) ~ :not([hidden]) {

1249+ --tw-divide-opacity: 1;

1250+ border-color: rgb(252 211 77 / var(--tw-divide-opacity));

1251+}

1252+.divide-black > :not([hidden]) ~ :not([hidden]) {

1253+ --tw-divide-opacity: 1;

1254+ border-color: rgb(0 0 0 / var(--tw-divide-opacity));

1255+}

1256+.divide-gray-800 > :not([hidden]) ~ :not([hidden]) {

1257+ --tw-divide-opacity: 1;

1258+ border-color: rgb(31 41 55 / var(--tw-divide-opacity));

1259+}

1260+.divide-gray-600 > :not([hidden]) ~ :not([hidden]) {

1261+ --tw-divide-opacity: 1;

1262+ border-color: rgb(75 85 99 / var(--tw-divide-opacity));

1263+}

1264+.divide-red-600 > :not([hidden]) ~ :not([hidden]) {

1265+ --tw-divide-opacity: 1;

1266+ border-color: rgb(220 38 38 / var(--tw-divide-opacity));

1267+}

1268+.divide-gray-200 > :not([hidden]) ~ :not([hidden]) {

1269+ --tw-divide-opacity: 1;

1270+ border-color: rgb(229 231 235 / var(--tw-divide-opacity));

1271+}

1272+.divide-gray-400 > :not([hidden]) ~ :not([hidden]) {

1273+ --tw-divide-opacity: 1;

1274+ border-color: rgb(156 163 175 / var(--tw-divide-opacity));

1275+}

1276+.divide-gray-300 > :not([hidden]) ~ :not([hidden]) {

1277+ --tw-divide-opacity: 1;

1278+ border-color: rgb(209 213 219 / var(--tw-divide-opacity));

1279+}

1280+.divide-gray-500 > :not([hidden]) ~ :not([hidden]) {

1281+ --tw-divide-opacity: 1;

1282+ border-color: rgb(107 114 128 / var(--tw-divide-opacity));

1283+}

1284+.place-self-center {

1285+ place-self: center;

1286+}

1287+.self-start {

1288+ align-self: flex-start;

1289+}

1290+.self-center {

1291+ align-self: center;

1292+}

8301293.justify-self-start {

8311294 justify-self: start;

8321295}

@@ -845,6 +1308,13 @@ Ensure the default browser behavior of the `hidden` attribute.

8451308.overflow-y-auto {

8461309 overflow-y: auto;

8471310}

1311+.whitespace-pre-line {

1312+ white-space: pre-line;

1313+}

1314+.break-normal {

1315+ overflow-wrap: normal;

1316+ word-break: normal;

1317+}

8481318.break-words {

8491319 overflow-wrap: break-word;

8501320}

@@ -866,6 +1336,39 @@ Ensure the default browser behavior of the `hidden` attribute.

8661336.rounded-xl {

8671337 border-radius: 0.75rem;

8681338}

1339+.rounded-sm {

1340+ border-radius: 0.125rem;

1341+}

1342+.rounded-2xl {

1343+ border-radius: 1rem;

1344+}

1345+.rounded-3xl {

1346+ border-radius: 1.5rem;

1347+}

1348+.rounded-b-2xl {

1349+ border-bottom-right-radius: 1rem;

1350+ border-bottom-left-radius: 1rem;

1351+}

1352+.rounded-t-2xl {

1353+ border-top-left-radius: 1rem;

1354+ border-top-right-radius: 1rem;

1355+}

1356+.rounded-t-md {

1357+ border-top-left-radius: 0.375rem;

1358+ border-top-right-radius: 0.375rem;

1359+}

1360+.rounded-br-2xl {

1361+ border-bottom-right-radius: 1rem;

1362+}

1363+.rounded-bl-none {

1364+ border-bottom-left-radius: 0px;

1365+}

1366+.rounded-tl-lg {

1367+ border-top-left-radius: 0.5rem;

1368+}

1369+.rounded-br-lg {

1370+ border-bottom-right-radius: 0.5rem;

1371+}

8691372.border {

8701373 border-width: 1px;

8711374}

@@ -875,11 +1378,20 @@ Ensure the default browser behavior of the `hidden` attribute.

8751378.border-8 {

8761379 border-width: 8px;

8771380}

1381+.border-2 {

1382+ border-width: 2px;

1383+}

1384+.border-0 {

1385+ border-width: 0px;

1386+}

1387+.border-\[1\.5px\] {

1388+ border-width: 1.5px;

1389+}

8781390.border-l-8 {

8791391 border-left-width: 8px;

8801392}

881−.border-t {

882− border-top-width: 1px;

1393+.border-r {

1394+ border-right-width: 1px;

8831395}

8841396.border-b {

8851397 border-bottom-width: 1px;

@@ -887,21 +1399,35 @@ Ensure the default browser behavior of the `hidden` attribute.

8871399.border-l {

8881400 border-left-width: 1px;

8891401}

890−.border-r {

891− border-right-width: 1px;

1402+.border-t {

1403+ border-top-width: 1px;

8921404}

893−.border-gold {

1405+.border-b-0 {

1406+ border-bottom-width: 0px;

1407+}

1408+.border-none {

1409+ border-style: none;

1410+}

1411+.border-gray-500 {

8941412 --tw-border-opacity: 1;

895− border-color: rgb(252 211 77 / var(--tw-border-opacity));

1413+ border-color: rgb(107 114 128 / var(--tw-border-opacity));

8961414}

897−.border-navy {

1415+.border-gray-400 {

8981416 --tw-border-opacity: 1;

899− border-color: rgb(31 36 60 / var(--tw-border-opacity));

1417+ border-color: rgb(156 163 175 / var(--tw-border-opacity));

1418+}

1419+.border-gold {

1420+ --tw-border-opacity: 1;

1421+ border-color: rgb(252 211 77 / var(--tw-border-opacity));

9001422}

9011423.border-gray-300 {

9021424 --tw-border-opacity: 1;

9031425 border-color: rgb(209 213 219 / var(--tw-border-opacity));

9041426}

1427+.border-navy {

1428+ --tw-border-opacity: 1;

1429+ border-color: rgb(31 36 60 / var(--tw-border-opacity));

1430+}

9051431.border-white {

9061432 --tw-border-opacity: 1;

9071433 border-color: rgb(255 255 255 / var(--tw-border-opacity));

@@ -910,25 +1436,49 @@ Ensure the default browser behavior of the `hidden` attribute.

9101436 --tw-border-opacity: 1;

9111437 border-color: rgb(0 0 0 / var(--tw-border-opacity));

9121438}

913−.border-gray-400 {

1439+.border-red-500 {

9141440 --tw-border-opacity: 1;

915− border-color: rgb(156 163 175 / var(--tw-border-opacity));

1441+ border-color: rgb(239 68 68 / var(--tw-border-opacity));

9161442}

917−.bg-gold {

918− --tw-bg-opacity: 1;

919− background-color: rgb(252 211 77 / var(--tw-bg-opacity));

1443+.border-gold-s5 {

1444+ --tw-border-opacity: 1;

1445+ border-color: rgb(126 106 39 / var(--tw-border-opacity));

9201446}

921−.bg-navy {

1447+.border-gold-s2 {

1448+ --tw-border-opacity: 1;

1449+ border-color: rgb(202 169 62 / var(--tw-border-opacity));

1450+}

1451+.border-gold-s1 {

1452+ --tw-border-opacity: 1;

1453+ border-color: rgb(227 190 69 / var(--tw-border-opacity));

1454+}

1455+.border-gray-800 {

1456+ --tw-border-opacity: 1;

1457+ border-color: rgb(31 41 55 / var(--tw-border-opacity));

1458+}

1459+.border-gray-600 {

1460+ --tw-border-opacity: 1;

1461+ border-color: rgb(75 85 99 / var(--tw-border-opacity));

1462+}

1463+.border-gray-200 {

1464+ --tw-border-opacity: 1;

1465+ border-color: rgb(229 231 235 / var(--tw-border-opacity));

1466+}

1467+.bg-gray-400 {

9221468 --tw-bg-opacity: 1;

923− background-color: rgb(31 36 60 / var(--tw-bg-opacity));

1469+ background-color: rgb(156 163 175 / var(--tw-bg-opacity));

9241470}

9251471.bg-white {

9261472 --tw-bg-opacity: 1;

9271473 background-color: rgb(255 255 255 / var(--tw-bg-opacity));

9281474}

929−.bg-black {

1475+.bg-navy {

9301476 --tw-bg-opacity: 1;

931− background-color: rgb(0 0 0 / var(--tw-bg-opacity));

1477+ background-color: rgb(31 36 60 / var(--tw-bg-opacity));

1478+}

1479+.bg-gold {

1480+ --tw-bg-opacity: 1;

1481+ background-color: rgb(252 211 77 / var(--tw-bg-opacity));

9321482}

9331483.bg-l1-blue {

9341484 --tw-bg-opacity: 1;

@@ -938,6 +1488,10 @@ Ensure the default browser behavior of the `hidden` attribute.

9381488 --tw-bg-opacity: 1;

9391489 background-color: rgb(23 199 106 / var(--tw-bg-opacity));

9401490}

1491+.bg-you {

1492+ --tw-bg-opacity: 1;

1493+ background-color: rgb(187 0 17 / var(--tw-bg-opacity));

1494+}

9411495.bg-orange-gold {

9421496 --tw-bg-opacity: 1;

9431497 background-color: rgb(247 211 146 / var(--tw-bg-opacity));

@@ -946,6 +1500,14 @@ Ensure the default browser behavior of the `hidden` attribute.

9461500 --tw-bg-opacity: 1;

9471501 background-color: rgb(209 213 219 / var(--tw-bg-opacity));

9481502}

1503+.bg-gray-200 {

1504+ --tw-bg-opacity: 1;

1505+ background-color: rgb(229 231 235 / var(--tw-bg-opacity));

1506+}

1507+.bg-black {

1508+ --tw-bg-opacity: 1;

1509+ background-color: rgb(0 0 0 / var(--tw-bg-opacity));

1510+}

9491511.bg-amber-300 {

9501512 --tw-bg-opacity: 1;

9511513 background-color: rgb(252 211 77 / var(--tw-bg-opacity));

@@ -954,10 +1516,6 @@ Ensure the default browser behavior of the `hidden` attribute.

9541516 --tw-bg-opacity: 1;

9551517 background-color: rgb(253 224 71 / var(--tw-bg-opacity));

9561518}

957−.bg-gray-400 {

958− --tw-bg-opacity: 1;

959− background-color: rgb(156 163 175 / var(--tw-bg-opacity));

960−}

9611519.bg-orange-300 {

9621520 --tw-bg-opacity: 1;

9631521 background-color: rgb(253 186 116 / var(--tw-bg-opacity));

@@ -982,10 +1540,6 @@ Ensure the default browser behavior of the `hidden` attribute.

9821540 --tw-bg-opacity: 1;

9831541 background-color: rgb(253 230 138 / var(--tw-bg-opacity));

9841542}

985−.bg-gray-200 {

986− --tw-bg-opacity: 1;

987− background-color: rgb(229 231 235 / var(--tw-bg-opacity));

988−}

9891543.bg-gold-t8 {

9901544 --tw-bg-opacity: 1;

9911545 background-color: rgb(254 246 219 / var(--tw-bg-opacity));

@@ -1014,6 +1568,48 @@ Ensure the default browser behavior of the `hidden` attribute.

10141568 --tw-bg-opacity: 1;

10151569 background-color: rgb(227 190 69 / var(--tw-bg-opacity));

10161570}

1571+.bg-blue-800 {

1572+ --tw-bg-opacity: 1;

1573+ background-color: rgb(30 64 175 / var(--tw-bg-opacity));

1574+}

1575+.bg-green-900 {

1576+ --tw-bg-opacity: 1;

1577+ background-color: rgb(20 83 45 / var(--tw-bg-opacity));

1578+}

1579+.bg-green-100 {

1580+ --tw-bg-opacity: 1;

1581+ background-color: rgb(220 252 231 / var(--tw-bg-opacity));

1582+}

1583+.bg-blue-200 {

1584+ --tw-bg-opacity: 1;

1585+ background-color: rgb(191 219 254 / var(--tw-bg-opacity));

1586+}

1587+.bg-gray-500 {

1588+ --tw-bg-opacity: 1;

1589+ background-color: rgb(107 114 128 / var(--tw-bg-opacity));

1590+}

1591+.bg-red-200 {

1592+ --tw-bg-opacity: 1;

1593+ background-color: rgb(254 202 202 / var(--tw-bg-opacity));

1594+}

1595+.bg-red-100 {

1596+ --tw-bg-opacity: 1;

1597+ background-color: rgb(254 226 226 / var(--tw-bg-opacity));

1598+}

1599+.bg-gray-600 {

1600+ --tw-bg-opacity: 1;

1601+ background-color: rgb(75 85 99 / var(--tw-bg-opacity));

1602+}

1603+.fill-transparent {

1604+ fill: transparent;

1605+}

1606+.object-cover {

1607+ -o-object-fit: cover;

1608+ object-fit: cover;

1609+}

1610+.p-1 {

1611+ padding: 0.25rem;

1612+}

10171613.p-5 {

10181614 padding: 1.25rem;

10191615}

@@ -1032,17 +1628,35 @@ Ensure the default browser behavior of the `hidden` attribute.

10321628.p-6 {

10331629 padding: 1.5rem;

10341630}

1035−.p-1 {

1036− padding: 0.25rem;

1631+.p-0 {

1632+ padding: 0px;

10371633}

1038−.py-0\.5 {

1039− padding-top: 0.125rem;

1040− padding-bottom: 0.125rem;

1634+.p-\[3px\] {

1635+ padding: 3px;

1636+}

1637+.p-\[4px\] {

1638+ padding: 4px;

10411639}

10421640.px-2 {

10431641 padding-left: 0.5rem;

10441642 padding-right: 0.5rem;

10451643}

1644+.py-1 {

1645+ padding-top: 0.25rem;

1646+ padding-bottom: 0.25rem;

1647+}

1648+.px-4 {

1649+ padding-left: 1rem;

1650+ padding-right: 1rem;

1651+}

1652+.px-0\.5 {

1653+ padding-left: 0.125rem;

1654+ padding-right: 0.125rem;

1655+}

1656+.px-0 {

1657+ padding-left: 0px;

1658+ padding-right: 0px;

1659+}

10461660.py-0 {

10471661 padding-top: 0px;

10481662 padding-bottom: 0px;

@@ -1059,10 +1673,6 @@ Ensure the default browser behavior of the `hidden` attribute.

10591673 padding-left: 1.5rem;

10601674 padding-right: 1.5rem;

10611675}

1062−.px-4 {

1063− padding-left: 1rem;

1064− padding-right: 1rem;

1065−}

10661676.py-8 {

10671677 padding-top: 2rem;

10681678 padding-bottom: 2rem;

@@ -1071,18 +1681,6 @@ Ensure the default browser behavior of the `hidden` attribute.

10711681 padding-left: 2rem;

10721682 padding-right: 2rem;

10731683}

1074−.py-1 {

1075− padding-top: 0.25rem;

1076− padding-bottom: 0.25rem;

1077−}

1078−.px-0\.5 {

1079− padding-left: 0.125rem;

1080− padding-right: 0.125rem;

1081−}

1082−.px-0 {

1083− padding-left: 0px;

1084− padding-right: 0px;

1085−}

10861684.px-3 {

10871685 padding-left: 0.75rem;

10881686 padding-right: 0.75rem;

@@ -1091,6 +1689,14 @@ Ensure the default browser behavior of the `hidden` attribute.

10911689 padding-left: 0.25rem;

10921690 padding-right: 0.25rem;

10931691}

1692+.px-1\.5 {

1693+ padding-left: 0.375rem;

1694+ padding-right: 0.375rem;

1695+}

1696+.py-0\.5 {

1697+ padding-top: 0.125rem;

1698+ padding-bottom: 0.125rem;

1699+}

10941700.pt-10 {

10951701 padding-top: 2.5rem;

10961702}

@@ -1139,9 +1745,9 @@ Ensure the default browser behavior of the `hidden` attribute.

11391745.font-mono {

11401746 font-family: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;

11411747}

1142−.text-3xl {

1143− font-size: 1.875rem;

1144− line-height: 2.25rem;

1748+.text-sm {

1749+ font-size: 0.875rem;

1750+ line-height: 1.25rem;

11451751}

11461752.text-xl {

11471753 font-size: 1.25rem;

@@ -1155,9 +1761,9 @@ Ensure the default browser behavior of the `hidden` attribute.

11551761 font-size: 1.125rem;

11561762 line-height: 1.75rem;

11571763}

1158−.text-sm {

1159− font-size: 0.875rem;

1160− line-height: 1.25rem;

1764+.text-3xl {

1765+ font-size: 1.875rem;

1766+ line-height: 2.25rem;

11611767}

11621768.text-base {

11631769 font-size: 1rem;

@@ -1166,6 +1772,9 @@ Ensure the default browser behavior of the `hidden` attribute.

11661772.font-bold {

11671773 font-weight: 700;

11681774}

1775+.capitalize {

1776+ text-transform: capitalize;

1777+}

11691778.leading-4 {

11701779 line-height: 1rem;

11711780}

@@ -1175,30 +1784,40 @@ Ensure the default browser behavior of the `hidden` attribute.

11751784.leading-3 {

11761785 line-height: .75rem;

11771786}

1787+.leading-5 {

1788+ line-height: 1.25rem;

1789+}

1790+.leading-8 {

1791+ line-height: 2rem;

1792+}

1793+.text-gray-600 {

1794+ --tw-text-opacity: 1;

1795+ color: rgb(75 85 99 / var(--tw-text-opacity));

1796+}

11781797.text-white {

11791798 --tw-text-opacity: 1;

11801799 color: rgb(255 255 255 / var(--tw-text-opacity));

11811800}

1801+.text-gray-800 {

1802+ --tw-text-opacity: 1;

1803+ color: rgb(31 41 55 / var(--tw-text-opacity));

1804+}

11821805.text-gray-700 {

11831806 --tw-text-opacity: 1;

11841807 color: rgb(55 65 81 / var(--tw-text-opacity));

11851808}

1186−.text-green-600 {

1809+.text-black {

11871810 --tw-text-opacity: 1;

1188− color: rgb(22 163 74 / var(--tw-text-opacity));

1811+ color: rgb(0 0 0 / var(--tw-text-opacity));

11891812}

1190−.text-gray-800 {

1813+.text-green-600 {

11911814 --tw-text-opacity: 1;

1192− color: rgb(31 41 55 / var(--tw-text-opacity));

1815+ color: rgb(22 163 74 / var(--tw-text-opacity));

11931816}

11941817.text-gray-500 {

11951818 --tw-text-opacity: 1;

11961819 color: rgb(107 114 128 / var(--tw-text-opacity));

11971820}

1198−.text-gray-600 {

1199− --tw-text-opacity: 1;

1200− color: rgb(75 85 99 / var(--tw-text-opacity));

1201−}

12021821.text-green-500 {

12031822 --tw-text-opacity: 1;

12041823 color: rgb(34 197 94 / var(--tw-text-opacity));

@@ -1215,6 +1834,10 @@ Ensure the default browser behavior of the `hidden` attribute.

12151834 --tw-text-opacity: 1;

12161835 color: rgb(252 211 77 / var(--tw-text-opacity));

12171836}

1837+.text-gray-300 {

1838+ --tw-text-opacity: 1;

1839+ color: rgb(209 213 219 / var(--tw-text-opacity));

1840+}

12181841.underline {

12191842 -webkit-text-decoration-line: underline;

12201843 text-decoration-line: underline;

@@ -1226,32 +1849,95 @@ Ensure the default browser behavior of the `hidden` attribute.

12261849.underline-offset-2 {

12271850 text-underline-offset: 2px;

12281851}

1852+.opacity-25 {

1853+ opacity: 0.25;

1854+}

1855+.opacity-75 {

1856+ opacity: 0.75;

1857+}

12291858.opacity-50 {

12301859 opacity: 0.5;

12311860}

12321861.opacity-10 {

12331862 opacity: 0.1;

12341863}

1864+.opacity-20 {

1865+ opacity: 0.2;

1866+}

1867+.opacity-30 {

1868+ opacity: 0.3;

1869+}

1870+.opacity-40 {

1871+ opacity: 0.4;

1872+}

1873+.opacity-5 {

1874+ opacity: 0.05;

1875+}

12351876.outline {

12361877 outline-style: solid;

12371878}

1879+.ring {

1880+ --tw-ring-offset-shadow: var(--tw-ring-inset) 0 0 0 var(--tw-ring-offset-width) var(--tw-ring-offset-color);

1881+ --tw-ring-shadow: var(--tw-ring-inset) 0 0 0 calc(3px + var(--tw-ring-offset-width)) var(--tw-ring-color);

1882+ box-shadow: var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow, 0 0 #0000);

1883+}

1884+.blur {

1885+ --tw-blur: blur(8px);

1886+ filter: var(--tw-blur) var(--tw-brightness) var(--tw-contrast) var(--tw-grayscale) var(--tw-hue-rotate) var(--tw-invert) var(--tw-saturate) var(--tw-sepia) var(--tw-drop-shadow);

1887+}

1888+.drop-shadow {

1889+ --tw-drop-shadow: drop-shadow(0 1px 2px rgb(0 0 0 / 0.1)) drop-shadow(0 1px 1px rgb(0 0 0 / 0.06));

1890+ filter: var(--tw-blur) var(--tw-brightness) var(--tw-contrast) var(--tw-grayscale) var(--tw-hue-rotate) var(--tw-invert) var(--tw-saturate) var(--tw-sepia) var(--tw-drop-shadow);

1891+}

1892+.sepia {

1893+ --tw-sepia: sepia(100%);

1894+ filter: var(--tw-blur) var(--tw-brightness) var(--tw-contrast) var(--tw-grayscale) var(--tw-hue-rotate) var(--tw-invert) var(--tw-saturate) var(--tw-sepia) var(--tw-drop-shadow);

1895+}

12381896.filter {

12391897 filter: var(--tw-blur) var(--tw-brightness) var(--tw-contrast) var(--tw-grayscale) var(--tw-hue-rotate) var(--tw-invert) var(--tw-saturate) var(--tw-sepia) var(--tw-drop-shadow);

12401898}

1899+.transition {

1900+ transition-property: color, background-color, border-color, fill, stroke, opacity, box-shadow, transform, filter, -webkit-text-decoration-color, -webkit-backdrop-filter;

1901+ transition-property: color, background-color, border-color, text-decoration-color, fill, stroke, opacity, box-shadow, transform, filter, backdrop-filter;

1902+ transition-property: color, background-color, border-color, text-decoration-color, fill, stroke, opacity, box-shadow, transform, filter, backdrop-filter, -webkit-text-decoration-color, -webkit-backdrop-filter;

1903+ transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1);

1904+ transition-duration: 150ms;

1905+}

12411906.transition-opacity {

12421907 transition-property: opacity;

12431908 transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1);

12441909 transition-duration: 150ms;

12451910}

1911+.transition-transform {

1912+ transition-property: transform;

1913+ transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1);

1914+ transition-duration: 150ms;

1915+}

1916+.transition-all {

1917+ transition-property: all;

1918+ transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1);

1919+ transition-duration: 150ms;

1920+}

1921+.duration-150 {

1922+ transition-duration: 150ms;

1923+}

12461924.hover\:bg-gray-200:hover {

12471925 --tw-bg-opacity: 1;

12481926 background-color: rgb(229 231 235 / var(--tw-bg-opacity));

12491927}

1250−.hover\:opacity-40:hover {

1251− opacity: 0.4;

1928+.hover\:opacity-80:hover {

1929+ opacity: 0.8;

12521930}

12531931@media (min-width: 360px) {

12541932

1933+ .\32xs\:-bottom-3\.5 {

1934+ bottom: -0.875rem;

1935+ }

1936+

1937+ .\32xs\:-bottom-3 {

1938+ bottom: -0.75rem;

1939+ }

1940+

12551941 .\32xs\:m-8 {

12561942 margin: 2rem;

12571943 }

@@ -1261,6 +1947,12 @@ Ensure the default browser behavior of the `hidden` attribute.

12611947 margin-right: 2rem;

12621948 }

12631949

1950+ .\32xs\:space-y-8 > :not([hidden]) ~ :not([hidden]) {

1951+ --tw-space-y-reverse: 0;

1952+ margin-top: calc(2rem * calc(1 - var(--tw-space-y-reverse)));

1953+ margin-bottom: calc(2rem * var(--tw-space-y-reverse));

1954+ }

1955+

12641956 .\32xs\:p-8 {

12651957 padding: 2rem;

12661958 }

@@ -1270,6 +1962,60 @@ Ensure the default browser behavior of the `hidden` attribute.

12701962 padding-bottom: 2rem;

12711963 }

12721964}

1965+@media (min-width: 475px) {

1966+

1967+ .xs\:m-0 {

1968+ margin: 0px;

1969+ }

1970+

1971+ .xs\:mr-0 {

1972+ margin-right: 0px;

1973+ }

1974+

1975+ .xs\:mb-1 {

1976+ margin-bottom: 0.25rem;

1977+ }

1978+

1979+ .xs\:max-w-\[18rem\] {

1980+ max-width: 18rem;

1981+ }

1982+

1983+ .xs\:max-w-\[8rem\] {

1984+ max-width: 8rem;

1985+ }

1986+

1987+ .xs\:flex-row {

1988+ flex-direction: row;

1989+ }

1990+

1991+ .xs\:flex-col {

1992+ flex-direction: column;

1993+ }

1994+

1995+ .xs\:items-center {

1996+ align-items: center;

1997+ }

1998+

1999+ .xs\:self-stretch {

2000+ align-self: stretch;

2001+ }

2002+

2003+ .xs\:rounded-bl-2xl {

2004+ border-bottom-left-radius: 1rem;

2005+ }

2006+

2007+ .xs\:rounded-bl-none {

2008+ border-bottom-left-radius: 0px;

2009+ }

2010+

2011+ .xs\:border-l {

2012+ border-left-width: 1px;

2013+ }

2014+

2015+ .xs\:border-t-0 {

2016+ border-top-width: 0px;

2017+ }

2018+}

12732019@media (min-width: 768px) {

12742020

12752021 .md\:mx-auto {

@@ -1277,6 +2023,10 @@ Ensure the default browser behavior of the `hidden` attribute.

12772023 margin-right: auto;

12782024 }

12792025

2026+ .md\:w-1\/2 {

2027+ width: 50%;

2028+ }

2029+

12802030 .md\:min-w-\[256px\] {

12812031 min-width: 256px;

12822032 }

@@ -1293,6 +2043,10 @@ Ensure the default browser behavior of the `hidden` attribute.

12932043 flex-direction: row;

12942044 }

12952045

2046+ .md\:flex-nowrap {

2047+ flex-wrap: nowrap;

2048+ }

2049+

12962050 .md\:items-start {

12972051 align-items: flex-start;

12982052 }

ui/src/types/sigil.tsnew file+148

@@ -0,0 +1,148 @@

1+export const CLANS = ['galaxy', 'star', 'planet'] as const;

2+export type Clan = typeof CLANS[number];

3+

4+export const PART_TYPES = ['geon', 'line', 'arc', 'bezier', 'circle', 'donut'] as const;

5+export type PartType = typeof PART_TYPES[number];

6+

7+export const GEONS = ['gci', 'gsq', 'ghl', 'ghr', 'ght', 'ghb', 'gq1', 'gq2', 'gq3', 'gq4', 'gfs', 'gbs'];

8+export type Geon = typeof GEONS[number];

9+

10+export type SymbolType = ('prefix' | 'suffix');

11+

12+export interface ModeDef {

13+ modes?: ModeDefs;

14+ displayParts?: string[];

15+ parts?: string[];

16+}

17+

18+export interface ModeDefs {

19+ [mode: string]: ModeDef

20+}

21+

22+

23+export const MODE_DEFS: ModeDefs = {

24+ geon: {

25+ // modes: {},

26+ displayParts: ['ghb'],

27+ },

28+ line: {

29+ modes: {

30+ mainFulls: {

31+ parts: ['lvf', 'lhf', 'lff', 'lbf'],

32+ },

33+ halvesFulls: {

34+ parts: ['lvfl', 'lvfr', 'lhft', 'lhfb', 'lfht', 'lfhb', 'lbht', 'lbhb'],

35+ },

36+ forwards: {

37+ parts: ['lff', 'lfft', 'lffb'],

38+ },

39+ backwards: {

40+ parts: ['lbf', 'lbft'],

41+ },

42+ weirds: {

43+ parts: ['lbhtf', 'lbrf', 'lfhm'],

44+ }

45+ },

46+ parts: ['lvf', 'lvfl', 'lvfr', 'lhf', 'lhft', 'lhfb', 'lff', 'lbf'],

47+ },

48+ arcCorner: {

49+ modes: {

50+ trFulls: {

51+ parts: ['atrf8', 'atrf6', 'atrf4', 'atrf2'],

52+ },

53+ trHalves: {

54+ parts: [/*'atra8',*/ 'atra6', 'atra4', 'atra2', 'atrb8', 'atrb6', 'atrb4', 'atrb2'],

55+ displayParts: ['atrb8', 'atrb6', 'atrb4', 'atrb2'],

56+ },

57+ tlFulls: {

58+ parts: ['atlf8', 'atlf6', 'atlf4', 'atlf2'],

59+ },

60+ tlHalves: {

61+ parts: ['atla8', 'atla6', 'atla4', 'atla2', 'atlb8', 'atlb6', 'atlb4', 'atlb2'],

62+ displayParts: ['atlb8', 'atlb6', 'atlb4', 'atlb2'],

63+ },

64+ blFulls: {

65+ parts: ['ablf8', 'ablf6', 'ablf4', 'ablf2'],

66+ },

67+ blHalves: {

68+ parts: ['ablb8', 'ablb6', 'ablb4', 'ablb2'],

69+ displayParts: ['ablb8', 'ablb6', 'ablb4', 'ablb2'],

70+ },

71+ brFulls: {

72+ parts: ['abrf8', 'abrf6', 'abrf4', 'abrf2'],

73+ },

74+ brHalves: {

75+ parts: ['abrb8', 'abrb6', 'abrb4', 'abrb2'],

76+ displayParts: ['abrb8', 'abrb6', 'abrb4', 'abrb2'],

77+ },

78+ },

79+ parts: ['ablf8', 'ablf6', 'ablf4', 'ablf2'],

80+ },

81+ arc: {

82+ modes: {

83+ rings: {

84+ parts: ['am081', 'am082', 'am083', 'am08s'],

85+ },

86+ diagonals: {

87+ parts: ['am741', 'am742', 'am743', 'am422', 'am423'],

88+ },

89+ topsBottoms: {

90+ parts: ['ab2', 'ab3', 'ab4', 'at1', 'at3', 'at4'],

91+ },

92+ leftsRights: {

93+ parts: ['al2', 'al3', 'al4', 'ar1', 'ar2', 'ar4'/*, 'arb2'*/],

94+ },

95+ rights: {

96+ parts: ['am642', 'am643'],

97+ },

98+ middles: {

99+ parts: ['am222', 'am223', 'am622', 'am623'],

100+ },

101+ middless: {

102+ parts: ['am142', 'am443'],

103+ },

104+ topRights: {

105+ parts: ['am021', 'am022', 'am023', 'am242', 'arb2'],

106+ },

107+ },

108+ parts: ['am222', 'am223', 'ar4', 'ar2', 'ar1'],

109+ },

110+ circle: {

111+ modes: {

112+ mediums: {

113+ parts: [

114+ 'cmmb',

115+ 'ctl3mb', 'cbl3mb',

116+ 'ct2mb', 'cb2mb', 'cl2mb', 'cr2mb', 'ctl2mb', 'ctr2mb', 'cbl2mb', 'cbr2mb',

117+ 'ctl1mb', 'ctr1mb', 'cbl1mb', 'cbr1mb',

118+ 'cbl3mf', 'ctr3mf', 'ctl3mf',

119+ ],

120+ displayParts: [

121+ 'cmmb',

122+ 'ctl3mb', 'cbl3mb',

123+ 'ct2mb', 'cb2mb', 'cl2mb', 'cr2mb', 'ctl2mb', 'ctr2mb', 'cbl2mb', 'cbr2mb',

124+ 'ctl1mb', 'ctr1mb', 'cbl1mb', 'cbr1mb',

125+ 'ctr3mf',

126+ ],

127+ },

128+ sides: {

129+ parts: ['cl1mb', 'cr1mb', 'cl3mb', 'cr3mb'],

130+ },

131+ smalls: {

132+ parts: ['cr1sb', 'cr2sb'],

133+ },

134+ },

135+ displayParts: [

136+ 'cbr3mb', 'ctl3mb',

137+ 'cmmb',

138+ 'ct2mb', 'cl2mb', 'cb2mb', 'cr2mb',

139+ ],

140+ },

141+ donut: {

142+ parts: ['dbl', 'dl', 'dm', 'dtl', 'dtr'],

143+ displayParts: ['dbl', /*'dl',*/ 'dm', 'dtl', 'dtr'],

144+ },

145+ bezier: {

146+ parts: ['b1l1', 'b1l2', 'b1l3', 'b4t2', 'b4t3'],

147+ },

148+};

ui/src/types/store.ts+49−1

@@ -1,5 +1,12 @@

11import type { ConnectionStatus } from './connection';

22import type { Patp, Group, Contact, Rolodex } from '@urbit/api';

3+

4+export function createEmptyContact(): Contact {

5+ return {

6+ nickname: null, bio: null, status: null, color: null, avatar: null,

7+ cover: null, groups: [], 'last-updated': 0,

8+ };

9+}

310export interface Contacts {

411 [contact: string]: Contact;

512};

@@ -7,6 +14,40 @@ export interface Contacts {

714export interface Docs {

815 [doc: string]: string;

916};

17+

18+export interface PalNames {

19+ [patp: Patp]: boolean;

20+}

21+

22+export interface Pal {

23+ tags: string[];

24+ ack: boolean;

25+}

26+

27+export interface PalList {

28+ [patp: Patp]: Pal;

29+}

30+

31+export interface Pals {

32+ incoming: PalNames;

33+ outgoing: PalList;

34+ mutuals: PalList;

35+}

36+

37+export const PAL_STATUSES = ['mutual', 'outgoing', 'incoming', 'unconnected'] as const;

38+export type PalStatus = typeof PAL_STATUSES[number];

39+export interface PalInfo extends Pal {

40+ patp: Patp;

41+ status: PalStatus;

42+}

43+

44+export interface Apps {

45+ allies: {

46+ [ally: string]: string[],

47+ },

48+ set: Set<string>,

49+}

50+

1051export interface StoreState {

1152 // Urbit

1253 // groups: {

@@ -14,7 +55,12 @@ export interface StoreState {

1455 // };

1556 contacts: Rolodex;

1657 peers: Patp[];

17− query: RegExp;

58+ pals: Pals;

59+ palsInstalled: boolean;

60+ apps: Apps,

61+ patpQuery: RegExp;

62+ sigilQuery: string[][];

63+ searchMode: ('patp' | 'sigil');

1864 // contacts: Contacts;

1965 // contactSearchResults: Contacts;

2066 // chats: [];

@@ -27,4 +73,6 @@ export type SearchedContactsState = Rolodex;

2773export class SearchSettings {

2874 includeMoons: boolean = true;

2975 includeComets: boolean = false;

76+

77+ allowFictionalSigils: boolean = false;

3078}

ui/svelte.config.js+2−2

@@ -1,4 +1,4 @@

1−import sveltePreprocess from 'svelte-preprocess'

1+import sveltePreprocess from 'svelte-preprocess';

22

33export default {

44 // Consult https://github.com/sveltejs/svelte-preprocess

@@ -10,4 +10,4 @@ export default {

1010

1111 handler(warning)

1212 },

13−}

13+};

ui/tailwind.config.cjs+1

@@ -14,6 +14,7 @@ module.exports = {

1414 'orange-gold': '#f7d392',

1515 'l1-blue': '#1792c7',

1616 'l2-green': '#17c76a',

17+ 'you': '#b01',

1718 'gold-s1': '#e3be45',

1819 'gold-s2': '#caa93e',

1920 'gold-s3': '#b09436',

ui/tsconfig.json+9

@@ -7,6 +7,15 @@

77 "module": "esnext",

88 "resolveJsonModule": true,

99 "baseUrl": ".",

10+ "paths": {

11+ "~/*": ["src/*"],

12+ "@/*": ["src/components/*"],

13+ "lib/*": ["src/lib/*"],

14+ "stores/*": ["src/stores/*"],

15+ "assets/*": ["src/assets/*"],

16+ "actions/*": ["src/actions/*"],

17+ "types/*": ["src/types/*"],

18+ },

1019 /**

1120 * Typecheck JS in `.svelte` and `.js` files by default.

1221 * Disable checkJs if you'd like to use dynamic types in JS.

ui/vite.config.ts+22−2

@@ -1,14 +1,34 @@

11import { loadEnv, defineConfig } from 'vite';

22import { svelte } from '@sveltejs/vite-plugin-svelte'

33import { urbitPlugin } from '@urbit/vite-plugin-urbit';

4+import path from 'path';

45

56// https://vitejs.dev/config/

67export default ({ mode }) => {

78 Object.assign(process.env, loadEnv(mode, process.cwd()));

89 const SHIP_URL = process.env.SHIP_URL || process.env.VITE_SHIP_URL || 'http://localhost:8080';

9− console.log(SHIP_URL);

10+ console.log('SHIP_URL', SHIP_URL);

1011

1112 return defineConfig({

12− plugins: [urbitPlugin({ base: 'astrolabe', target: SHIP_URL, secure: false }), svelte()]

13+ plugins: [

14+ urbitPlugin({ base: 'astrolabe', target: SHIP_URL, secure: false }),

15+ svelte(),

16+ ],

17+ resolve: {

18+ alias: {

19+ '~': path.resolve('./src'),

20+ '@': path.resolve('./src/components'),

21+ lib: path.resolve('./src/lib'),

22+ stores: path.resolve('./src/stores'),

23+ assets: path.resolve('./src/assets'),

24+ actions: path.resolve('./src/actions'),

25+ types: path.resolve('./src/types'),

26+ },

27+ },

28+ server: {

29+ fs: {

30+ strict: false,

31+ },

32+ },

1333 });

1434};