d3db9a8...master · sphinx

git.iko.soy/sphinx

on master help sign in

.github/actions/glob/action.ymldeleted−29

since splitsnapshots

unifiedsplit

@@ -1,29 +0,0 @@

1−name: 'glob'

2−description: 'Create a glob and push to develop'

3−inputs:

4− folder:

5− description: "Folder to glob"

6− required: true

7− docket:

8− description: "Docket file to edit"

9− required: true

10−outputs:

11− hash:

12− description: "Glob hash"

13− value: ${{ steps.glob.outputs.hash }}

14−runs:

15− using: "composite"

16− steps:

17− - name: Set up S3cmd cli tool

18− uses: s3-actions/s3cmd@v1.4.0

19− with:

20− provider: aws

21− region: 'us-east-1'

22− access_key: ${{ secrets.S3_ACCESS_KEY }}

23− secret_key: ${{ secrets.S3_SECRET_KEY }}

24− host_base: nyc3.digitaloceanspaces.com

25− host_bucket: '%(bucket)s.nyc3.digitaloceanspaces.com'

26− - id: glob

27− shell: bash

28− run:

29− ./.github/helpers/glob.sh "${{ inputs.folder }}" ${{ inputs.docket }}

.github/helpers/glob.shdeleted−35

@@ -1,35 +0,0 @@

1−#!/usr/bin/env bash

2−

3−# this script globs a folder of files, then subsequently uploads the

4−# glob to bootstrap.urbit.org and replaces the hash in the docket file.

5−# assumes gcloud credentials are loaded and gsutil installed.

6−

7−# $1: the folder of files to glob

8−# $2: the location of the docket file

9−

10−# globber is a prebooted and docked fakezod

11−curl https://bootstrap.urbit.org/globberv3.tgz | tar xzk

12−./zod/.run -d

13−

14−dojo () {

15− curl -s --data '{"source":{"dojo":"'"$1"'"},"sink":{"stdout":null}}' http://localhost:12321

16−}

17−

18−hood () {

19− curl -s --data '{"source":{"dojo":"+hood/'"$1"'"},"sink":{"app":"hood"}}' http://localhost:12321

20−}

21−

22−rsync -avL $1 zod/work/glob

23−hood "commit %work"

24−dojo "-garden!make-glob %work /glob"

25−

26−s3cmd put zod/.urb/put/*.glob -P s3://hmillerdev/sphinx/

27−gsutil cp zod/.urb/put/*.glob gs://bootstrap.urbit.org

28−hash=$(ls -1 -c zod/.urb/put | head -1 | sed "s/glob-$[a-z0-9\.]*$.glob/\1/")

29−sed -i "s/glob\-[a-z0-9\.]*glob' *[a-z0-9\.]*\]/glob-$hash.glob' $hash]/g" $2

30−

31−echo "hash=$(echo $hash)" >> $GITHUB_OUTPUT

32−

33−hood "exit"

34−sleep 5s

35−rm -rf zod

.github/workflows/deploy.ymldeleted−80

@@ -1,80 +0,0 @@

1−name: Deploy Sphinx

2−on:

3− workflow_dispatch:

4− inputs:

5− tag:

6− type: string

7− required: false

8− default: master

9− description: Enter the tag to deploy

10− push:

11− branches:

12− - 'master'

13−jobs:

14− build-frontend:

15− runs-on: ubuntu-latest

16− name: 'Build Frontend'

17− steps:

18− - uses: actions/checkout@v3

19− with:

20− ref: ${{ github.event.inputs.tag }}

21− - uses: actions/setup-node@v3

22− with:

23− node-version-file: ./ui/.nvmrc

24− - working-directory: ./ui

25− run: |

26− npm ci

27− npm run build

28− - uses: actions/upload-artifact@v3

29− with:

30− name: 'ui-dist'

31− path: ui/dist

32− glob:

33− runs-on: ubuntu-latest

34− name: 'Make a glob'

35− needs: build-frontend

36− steps:

37− - uses: actions/checkout@v3

38− with:

39− ref: ${{ github.event.inputs.tag }}

40− - uses: actions/download-artifact@v3

41− with:

42− name: 'ui-dist'

43− path: ui/dist

44− - name: 'glob'

45− uses: ./.github/actions/glob

46− with:

47− folder: 'ui/dist/*'

48− docket: 'desk/desk.docket-0'

49− - name: Commit and Push Glob

50− run: |

51− git config --global user.name github-actions

52− git config --global user.email github-actions@github.com

53− git add desk/desk.docket-0

54− git commit -n -m "update glob: ${{ steps.glob.outputs.hash }} [skip actions]" || echo "No changes to commit"

55− INPUT=${{ github.event.inputs.tag }}

56− BRANCH=${INPUT:-"master"}

57− git pull origin $BRANCH --rebase --autostash

58− git push

59− # deploy:

60− # runs-on: ubuntu-latest

61− # needs: glob

62− # name: "Deploy sphinx to live"

63− # steps:

64− # - uses: actions/checkout@v3

65− # with:

66− # ref: ${{ github.event.inputs.tag }}

67− # - id: 'auth'

68− # uses: 'google-github-actions/auth@v1'

69− # with:

70− # credentials_json: '${{ secrets.JANEWAY_SERVICE_KEY }}'

71− # - name: 'Set up Cloud SDK'

72− # uses: 'google-github-actions/setup-gcloud@v1'

73− # - id: deploy

74− # name: Deploy

75− # run:

76− # ./.github/helpers/deploy.sh tloncorp/landscape-apps groups wannec-dozzod-marzod us-west1-b ${{ github.event.inputs.tag }}

77− # env:

78− # SSH_SEC_KEY: ${{ secrets.JANEWAY_SSH_SEC_KEY }}

79− # SSH_PUB_KEY: ${{ secrets.JANEWAY_SSH_PUB_KEY }}

80− # URBIT_REPO_TAG: ${{ vars.URBIT_REPO_TAG }}

.gitignorenew file+2

@@ -0,0 +1,2 @@

1+/result

2+/result-*

README.md+105−25

@@ -1,45 +1,125 @@

1# sphinx

3−## Desk

3+A search engine powered by you and your pals for finding answers to your

4+riddles.

5−The desk currently has the minimum amount of files necessary to distribute an application and should be distributable immediately. Any further Hoon development should happen here.

6+sphinx keeps a directory of listings: apps, groups, notebook posts and links.

7+The listings you publish go to your mutual pals and on to their mutual pals,

8+theirs come to you, and you search everything you've received.

7−TODO: Add further documentation on beginning Hoon development

10+## Install

9−## UI

12+sphinx runs on the kernels listed in `desk/sys.kelvin`, currently

13+`[%zuse 408]`. Check your ship first: in the dojo, `+vats %base` must show

14+`/sys/kelvin: [%zuse 408]`. If it shows an older kernel, let your ship finish

15+its update first. If the update is blocked, Landscape lists the apps that

16+block it, and `|bump` suspends them.

11−sphinx is built primarily using [React], [Typescript], and [Tailwind CSS]. [Vite] ensures that all code and assets are loaded appropriately, bundles the application for distribution and provides a functional dev environment.

18+Then, in your ship's dojo:

13−### Getting Started

20+```

21+|install ~donmec-sallud %sphinx

22+```

23+

24+For a new install, you can also search for ~donmec-sallud in Landscape and

25+install sphinx from there.

26+

27+sphinx shares listings through %pals. Install it with

28+`|install ~paldev %pals` and add your friends as pals. Without %pals you only

29+see your own listings.

30+

31+### Moving from ~nocsyx-lassul

32+

33+sphinx used to be distributed from ~nocsyx-lassul. Its last release there

34+only supports `[%zuse 412]`, so it can't run on a current ship. On a

35+`[%zuse 412]` ship it blocks the kernel update until you `|bump`. After the

36+kernel check above, switch it to ~donmec-sallud in the dojo:

37+

38+```

39+|install ~donmec-sallud %sphinx

40+```

41+

42+Your listings are kept. Use the dojo for this: Landscape's Get App can't

43+switch an existing install. It asks ~nocsyx-lassul again, and docket refuses

44+because sphinx is already installed.

45+

46+If you ran `|install` before your ship reached `[%zuse 408]`, sphinx stays

47+suspended after the update, and another `|install` only prints

48+`already syncing`. Run `|uninstall %sphinx`, then

49+`|install ~donmec-sallud %sphinx` again. Your listings are kept.

50+

51+## Development

52+

53+The repo has two parts:

54+

55+- `desk/`: the Hoon agent, its marks and libraries, and the docket file.

56+- `ui/`: the web interface, built with [React], [TypeScript],

57+ [Tailwind CSS] and [Vite].

15−To get started using sphinx first you need to run `npm install` inside the `ui` directory.

59+### Build

17−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.

61+With Nix:

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

63+```sh

64+nix build .#desk -o result-desk # the desk; Nix makes its files read-only

65+nix build .#glob -o result-glob # the UI, built for /apps/sphinx/

66+```

67+

68+To put the desk on a test ship, copy it writable and with `--delete`, as in

69+RELEASING.md step 2. vere aborts at `|unmount` if the mount is read-only.

70+

71+```sh

72+chmod -R u+w result-desk-rw 2>/dev/null; rm -rf result-desk-rw &&

73+cp -RL result-desk result-desk-rw && chmod -R u+w result-desk-rw &&

74+rsync -rpc --delete result-desk-rw/ <pier>/sphinx/

75+```

76+

77+The desk output adds what `desk/` needs from urbit's `base-dev` and

78+landscape's `desk-dev`. Both are pinned in `flake.nix` for the kelvin in

79+`desk/sys.kelvin`. When you port sphinx to a new kernel, update those two

80+inputs together with `desk/sys.kelvin`.

81+

82+Without Nix, run `npm install` and `npm run build` in `ui/` to build the UI

83+into `ui/dist/`. Use the Node version in `ui/.nvmrc`.

84+

85+To publish a release from ~donmec-sallud, follow [RELEASING.md](RELEASING.md).

21−### Deploying

87+### Working on the UI

23−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:

89+You need a running ship with sphinx installed. In `ui/`:

90+

91+1. Run `npm install`.

92+2. Create `ui/.env.local` with `VITE_SHIP_URL=<URL>`, where `<URL>` is your

93+ ship's web address, for example `http://localhost:8080`. Git ignores this

94+ file.

95+3. Run `npm run dev` and open the address it prints.

96+

97+The dev server sends every request except those for the interface itself to

98+the ship, so you see live data. Vite reloads the page as you change the code.

99+

100+### The tile image

101+

102+The tile is inlined in `desk/desk.docket-0` as a `data:` URI, so Landscape

103+doesn't load it from another server.

104+

105+To get the SVG out:

106+

107+```sh

108+sed -n "s|^ image+'data:image/svg+xml;base64,$.*$'\$|\1|p" desk/desk.docket-0 | base64 -d > tile.svg

109+```

110

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

111+To put a new one in, print a new `image+` line and replace the old line in

26−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`.

112+`desk/desk.docket-0` with it:

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

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

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

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

31−7. You can now run `-make-glob %work /sphinx` 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`.

32−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.

33−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.

34−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:

113

36−```hoon

114+```sh

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

115+printf " image+'data:image/svg+xml;base64,%s'\n" "$(base64 < tile.svg | tr -d '\n')"

38```

116```

117

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

118+Keep the rest of the file as it is. Docket rewrites the file when a glob is

119+uploaded, and the hash copy-back in RELEASING.md should only change the hash.

120+A new tile doesn't need a new glob.

121

42−[react]: https://reactjs.org/

122+[react]: https://react.dev/

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

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

44[tailwind css]: https://tailwindcss.com/

124[tailwind css]: https://tailwindcss.com/

45[vite]: https://vitejs.dev/

125[vite]: https://vitejs.dev/

RELEASING.mdnew file+166

@@ -0,0 +1,166 @@

1+# Releasing sphinx

3+sphinx is published from ~donmec-sallud. Ships install it with

4+`|install ~donmec-sallud %sphinx` and then follow it: the desk syncs from

5+~donmec-sallud's `%sphinx` desk, and docket fetches the UI (the glob) over ames

6+from ~donmec-sallud.

8+A release has three parts:

10+1. **Desk**: copy `nix build .#desk` into ~donmec-sallud's mounted `%sphinx`

11+ desk and commit it.

12+2. **Glob**: if the UI changed, upload `nix build .#glob` at `/docket/upload`.

13+ Docket hashes it and writes the hash into the desk's `desk.docket-0`.

14+3. **Hash copy-back**: copy that `desk.docket-0` back into the repo and commit

15+ it.

16+

17+Never skip the copy-back. On every commit of the desk, docket compares the hash

18+in `desk.docket-0` with the glob it serves, and when they differ it drops the

19+glob and waits for a new upload. So a stale hash in the repo takes the UI down

20+at the next release, on ~donmec-sallud and on every ship that installed

21+sphinx, until the glob is uploaded again.

22+

23+## Before you start

24+

25+- [ ] ~donmec-sallud runs a kernel listed in `desk/sys.kelvin`. In its dojo,

26+ `+vats %base` prints it on the `/sys/kelvin:` line. If it isn't listed,

27+ port the desk to that kernel first.

28+- [ ] Optional: bump `version` in `desk/desk.docket-0`. Landscape and the

29+ sphinx footer show it.

30+- [ ] Everything is committed and pushed. The release is whatever the repo

31+ builds.

32+

33+The commands below use these shell variables:

34+

35+```sh

36+server=user@host # ssh login of the user that runs ~donmec-sallud's vere and owns the pier

37+pier=/path/to/donmec-sallud # the pier directory on that machine

38+```

39+

40+## 1. Build

41+

42+From the repo root:

43+

44+```sh

45+nix build .#desk -o result-desk

46+nix build .#glob -o result-glob

47+```

48+

49+## 2. Desk

50+

51+First release only, in ~donmec-sallud's dojo:

52+

53+```

54+|new-desk %sphinx

55+|mount %sphinx

56+```

57+

58+Leave the desk mounted. The copy-back in step 4 reads the mounted file.

59+

60+Every release, copy the desk into the mount from a writable copy of the

61+build:

62+

63+```sh

64+chmod -R u+w result-desk-rw 2>/dev/null; rm -rf result-desk-rw &&

65+cp -RL result-desk result-desk-rw && chmod -R u+w result-desk-rw &&

66+rsync -rpc --delete result-desk-rw/ "$server:$pier/sphinx/"

67+ssh "$server" find "$pier/sphinx" '!' -perm -u+w # must print nothing

68+```

69+

70+- The `&&`s stop the copy when an earlier step fails, so a leftover

71+ `result-desk-rw` from an interrupted run is never sent.

72+- Send a writable copy. Nix store files and directories are read-only, and

73+ `-p` copies their modes into the mount. Don't rely on `rsync --chmod=u+w`:

74+ macOS's `rsync` (openrsync) accepts it and ignores it. In a read-only

75+ mount, vere aborts when it has to delete a file, for example at

76+ `|unmount %sphinx` in step 3, and clay's writes to read-only files fail.

77+- `-c` compares contents. Don't use `rsync -a`: Nix store files all have

78+ mtime 1, so with `-a` rsync can skip an edited file of the same size.

79+

80+Then in the dojo:

81+

82+```

83+|commit %sphinx

84+```

85+

86+The dojo lists the changed files, for example

87+`: /~donmec-sallud/sphinx/4/desk/docket-0`. A commit that changes nothing

88+prints nothing. A mark or build error rejects the whole commit, so fix the

89+desk and repeat this step.

90+

91+First release only:

92+

93+```

94+|install our %sphinx

95+|public %sphinx

96+:treaty|publish %sphinx

97+```

98+

99+- `|install our %sphinx` starts the app on ~donmec-sallud. Docket then prints

100+ `docket: awaiting manual glob for %sphinx desk` until step 3.

101+- `|public %sphinx` lets other ships read the desk. Without it, clay doesn't

102+ answer their requests, so `|install ~donmec-sallud %sphinx` waits without

103+ an error. A waiting install continues by itself once the desk is public.

104+- `:treaty|publish %sphinx` lists sphinx under ~donmec-sallud in Landscape's

105+ app search. It also makes the desk public.

106+

107+## 3. Glob

108+

109+Upload on the first release and whenever `ui/` changed since the last one. If

110+you're unsure, upload anyway: the same files give the same hash.

111+

112+1. Log in to ~donmec-sallud's web interface in Chrome or Firefox. Safari can't

113+ upload folders. `+code` in the dojo prints the password.

114+2. Open `/docket/upload` on that host, pick the desk `sphinx`, choose the

115+ `result-glob` folder and press **glob!**. If the folder picker won't follow

116+ the `result-glob` symlink, press ⇧⌘G and paste the path that

117+ `readlink result-glob` prints.

118+3. The page answers `successfully globbed`.

119+4. Refresh the mount in the dojo:

120+

121+ ```

122+ |unmount %sphinx

123+ |mount %sphinx

124+ ```

125+

126+ Docket wrote the new hash into clay. vere rewrites a mounted file only

127+ while it still holds exactly what clay last wrote there. If the

128+ `desk.docket-0` you committed differs in any byte from what docket prints

129+ (another layout, or a final newline an editor added), the mounted file

130+ keeps the old hash, and any later `|commit %sphinx`, even one with no

131+ edits, puts the old hash back and takes the UI down. The remount rewrites

132+ the mount from clay. It's harmless when the file is already current, so

133+ always do it.

134+

135+## 4. Hash copy-back

136+

137+After every upload and remount:

138+

139+```sh

140+scp "$server:$pier/sphinx/desk.docket-0" desk/desk.docket-0

141+```

142+

143+Only the hash on the `glob-ames` line should change. Commit

144+`desk/desk.docket-0` and push it.

145+

146+## 5. Check

147+

148+- [ ] `/apps/sphinx/` on ~donmec-sallud loads.

149+- [ ] The dojo has not printed `docket: awaiting manual glob for %sphinx desk`

150+ since the last commit or upload.

151+- [ ] `+vats %sphinx` shows `app status: running`.

152+- [ ] First release only: another ship can `|install ~donmec-sallud %sphinx`.

153+ Its log shows `kiln: merge into %sphinx succeeded` and

154+ `docket: fetching %ames glob for %sphinx desk`.

155+- [ ] A ship that installed sphinx shows the release at `/apps/sphinx/`.

156+ After a glob upload, it answers 404 until it has downloaded the new

157+ glob from ~donmec-sallud.

158+

159+## If the UI is down

160+

161+`docket: awaiting manual glob for %sphinx desk` after a commit means the hash

162+in the desk's `desk.docket-0` doesn't match the glob docket serves, usually

163+because a copy-back or a remount was skipped. Build the glob from the released

164+commit, upload it and remount (step 3), then do the copy-back (step 4). Other

165+ships pick up the corrected `desk.docket-0` and fetch the glob again on their

166+own.

desk/app/sphinx.hoon+106−16

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

15 state-1:s

16 state:s

17 ==

18+ :: +guard-verb: refuse /verb watches from other ships

19+ ::

20+ :: lib/verb (here and inside lib/gossip) answers /verb/events and

21+ :: /verb/events-plus for anyone, and those carry every poke, card

22+ :: and wire of the agent, the mutuals in gossip's wires included

23+ ::

24+ ++ guard-verb

25+ |= inner=agent:gall

26+ ^- agent:gall

27+ |_ =bowl:gall

28+ +* this .

29+ ag ~(. inner bowl)

30+ ++ on-init

31+ ^- (quip card _this)

32+ =^ cards inner on-init:ag

33+ [cards this]

34+ ::

35+ ++ on-save on-save:ag

36+ ++ on-load

37+ |= old=vase

38+ ^- (quip card _this)

39+ =^ cards inner (on-load:ag old)

40+ :: and end the /verb watches other ships made before this guard

41+ ::

42+ :_ this

43+ %+ weld cards

44+ %+ murn ~(val by sup.bowl)

45+ |= [=ship =path]

46+ ^- (unit card)

47+ ?. &(?=([%verb *] path) !=(our.bowl ship)) ~

48+ `[%give %kick ~[path] `ship]

49+ ::

50+ ++ on-poke

51+ |= [=mark =vase]

52+ ^- (quip card _this)

53+ =^ cards inner (on-poke:ag mark vase)

54+ [cards this]

55+ ::

56+ ++ on-watch

57+ |= =path

58+ ^- (quip card _this)

59+ ?< &(?=([%verb *] path) !=(our.bowl src.bowl))

60+ =^ cards inner (on-watch:ag path)

61+ [cards this]

62+ ::

63+ ++ on-leave

64+ |= =path

65+ ^- (quip card _this)

66+ =^ cards inner (on-leave:ag path)

67+ [cards this]

68+ ::

69+ ++ on-peek on-peek:ag

70+ ++ on-agent

71+ |= [=wire =sign:agent:gall]

72+ ^- (quip card _this)

73+ =^ cards inner (on-agent:ag wire sign)

74+ [cards this]

75+ ::

76+ ++ on-arvo

77+ |= [=wire =sign-arvo]

78+ ^- (quip card _this)

79+ =^ cards inner (on-arvo:ag wire sign-arvo)

80+ [cards this]

81+ ::

82+ ++ on-fail

83+ |= [=term =tang]

84+ ^- (quip card _this)

85+ =^ cards inner (on-fail:ag term tang)

86+ [cards this]

87+ --

18 --

88 --

19=| state:s

89=| state:s

20=* state -

90=* state -

21=<

91=<

92+ %- guard-verb

22− %+ verb &

93+ %+ verb |

23 %- %+ agent:gossip

94 %- %+ agent:gossip

24− [2 %mutuals %mutuals]

95+ [2 %mutuals %mutuals |]

25 %- malt

96 %- malt

26 ^- (list [mark $-(* vase)])

97 ^- (list [mark $-(* vase)])

27 :~ [%directory-listing |=(n=* !>((grab-listing n)))]

98 :~ [%directory-listing |=(n=* !>((grab-listing n)))]

@@ -61,7 +132,7 @@

61 |= =directory:s

132 |= =directory:s

62 =/ purged (purge-invalid directory)

133 =/ purged (purge-invalid directory)

63 :* %2

134 :* %2

64− (reindex directory)

135+ (reindex purged)

65 purged

136 purged

66 (purge-foreign purged)

137 (purge-foreign purged)

67 ==

138 ==

@@ -75,10 +146,15 @@

75 |= =directory:s

146 |= =directory:s

76 ^- directory:s

147 ^- directory:s

77 %- malt

148 %- malt

78− %+ skim

149+ %+ skim

79− ~(tap by directory)

150+ ~(tap by directory)

80 |= [=hash:s =listing:s]

151 |= [=hash:s =listing:s]

152+ :: the old %directory handler kept peers' entries under any key

153+ ::

154+ ?& =(hash hash.listing)

155+ =(hash (digest post.listing))

81− (listing-valid listing)

156+ (listing-valid listing)

157+ ==

82 ++ purge-foreign

158 ++ purge-foreign

83 |= =directory:s

159 |= =directory:s

84 ^- directory:s

160 ^- directory:s

@@ -142,13 +218,16 @@

142 cor

218 cor

143 ::

219 ::

144 %remove

220 %remove

221+ ?> from-self

145 =+ !<(=hash:s vase)

222 =+ !<(=hash:s vase)

146 di-abet:di-remove:(di-abed:di-core hash)

223 di-abet:di-remove:(di-abed:di-core hash)

147 ==

224 ==

148 ++ publish

225 ++ publish

149 |= [=declare:s core=_cor]

226 |= [=declare:s core=_cor]

150 ^+ cor

227 ^+ cor

151− ::

228+ :: .core accumulates a %declarations batch: a skipped listing must

229+ :: return it, not the pre-batch .cor, or the batch so far is lost

230+ ::

152 ?> from-self

231 ?> from-self

153 =/ listing

232 =/ listing

154 :* post=q.declare

233 :* post=q.declare

@@ -157,10 +236,10 @@

157 source=our.bowl

236 source=our.bowl

158 time=now.bowl

237 time=now.bowl

159 ==

238 ==

160− ?: (~(has by directory) hash.listing)

239+ ?: (~(has by directory.core) hash.listing)

161 ~& 'Listing already exists.'

240 ~& 'Listing already exists.'

162− cor

241+ core

163− ?. (listing-valid listing) cor

242+ ?. (listing-valid listing) core

164 di-abet:(di-publish:(di-abed:di-core:core hash.listing) listing)

243 di-abet:(di-publish:(di-abed:di-core:core hash.listing) listing)

165 --

244 --

166::

245::

@@ -194,10 +273,21 @@

194 ::

273 ::

195 %directory

274 %directory

196 =+ !<(d=directory:s vase)

275 =+ !<(d=directory:s vase)

197− =. directory (~(uni by directory) d)

276+ :: take only listings we don't have yet that pass the checks a

277+ :: %directory-listing gets: a peer's map must not replace our

278+ :: listings, and each listing may be indexed only once

279+ ::

280+ =/ new=(list [=hash:s =listing:s])

281+ %+ skim ~(tap by d)

282+ |= [=hash:s l=listing:s]

283+ ?& =(hash hash.l)

284+ =(hash (digest post.l))

285+ !(~(has by directory) hash)

286+ (listing-valid l)

287+ ==

288+ =. directory (~(gas by directory) new)

198 =. index

289 =. index

199− %+ roll

290+ %+ roll new

200− ~(tap by d)

201 |= [[=hash:s l=listing:s] i=_index]

291 |= [[=hash:s l=listing:s] i=_index]

202 (~(catalog delver i) hash l)

292 (~(catalog delver i) hash l)

203 cor

293 cor

@@ -290,8 +380,8 @@

290 ==

380 ==

291++ get-listings

381++ get-listings

292 |= l=(list hash)

382 |= l=(list hash)

293− %+ turn l

383+ %+ murn l

294− |=(=hash:s (~(got by directory) hash))

384+ |=(=hash:s (~(get by directory) hash))

295++ from-self =(our src):bowl

385++ from-self =(our src):bowl

296++ di-core

386++ di-core

297 |_ [=listing:s =hash:s gone=_|]

387 |_ [=listing:s =hash:s gone=_|]

@@ -306,7 +396,7 @@

306 di-core(hash h, listing (~(gut by directory) h *listing:s))

396 di-core(hash h, listing (~(gut by directory) h *listing:s))

307 ++ di-remove

397 ++ di-remove

308 =. gone &

398 =. gone &

309− =/ keys (~(got by trail.index) hash)

399+ =/ keys (~(gut by trail.index) hash ~)

310 =. trail.index (~(del by trail.index) hash)

400 =. trail.index (~(del by trail.index) hash)

311 =. lookup.index

401 =. lookup.index

312 ^- lookup:s

402 ^- lookup:s

desk/desk.docket-0+11−10

@@ -1,10 +1,11 @@

1+:~

1−:~ title+'sphinx'

2+ title+'sphinx'

2− info+'A search engine powered by you and your pals for finding answers to your riddles'

3+ info+'A search engine powered by you and your pals for finding answers to your riddles'

3− color+0xb2.5068

4+ color+0xb2.5068

4− image+'https://nyc3.digitaloceanspaces.com/hmillerdev/nocsyx-lassul/2022.7.16..04.35.22-sphinx-web-shifted.svg'

5+ version+[0 7 0]

5− glob-http+['https://nyc3.digitaloceanspaces.com/hmillerdev/sphinx/glob-0v7.folii.k685s.mjn1b.46up6.but26.glob' 0v7.folii.k685s.mjn1b.46up6.but26]

6− base+'sphinx'

7− version+[0 6 0]

8− website+'https://github.com'

6+ website+'https://github.com/iko-soy/sphinx'

9− license+'MIT'

7+ license+'MIT'

8+ image+'data:image/svg+xml;base64,<svg xmlns="http://www.w3.org/2000/svg" viewBox="-30 15 600 600" fill="none"><style>.st1{fill:#e7ab79}</style><path class="st1" d="M294.69 562.96c-3.34 0-6.68-.09-10.02.02-7.59.25-15.1-.2-22.55-1.85-9.54-2.12-17.85-6.57-24.62-13.53-4.15-4.27-7.97-8.94-11.4-13.81-10.42-14.82-20.49-29.89-30.86-44.75-11.88-17.02-24.04-33.85-35.88-50.9-8.43-12.14-16.56-24.48-24.72-36.8-2.01-3.04-4.57-5.16-7.76-6.88-21.33-11.51-38.84-27.18-51.46-48.03-3.64-6.02-7.27-12.06-10.5-18.3-4.56-8.81-6.98-18.39-9.04-28.04-4.67-21.86-2.49-43.12 6.68-63.45 5.78-12.82 11.93-25.5 18.66-37.84 14.67-26.92 31.19-52.67 50.37-76.65 8.48-10.6 17.53-20.65 28.09-29.26 20.2-16.47 42.97-27.94 67.99-35.05 8.47-2.41 17.05-4.18 25.81-5.26 6.97-.86 13.82-2.61 20.78-3.6 8.18-1.15 16.4-2.04 24.63-2.78 9.45-.85 18.93-1.58 28.41-2.04 14.99-.73 29.85.72 44.64 3.25 23.6 4.03 46.85 9.56 69.98 15.68 3.05.81 6.01 1.98 9.05 2.85 3.19.91 4.46 3.04 4.57 6.23.28 8.79.74 17.57.99 26.36.15 5.45.08 10.91.03 16.36-.04 3.57.65 6.97 1.78 10.34 3.47 10.34 6.93 20.68 10.3 31.04 3.1 9.53 6.05 19.11 9.17 28.63 1.2 3.67 2.48 7.35 4.14 10.82 8.32 17.47 16.72 34.9 25.19 52.29 5.78 11.86 11.72 23.63 17.6 35.45.63 1.26 1.19 2.55 1.89 3.77 4.7 8.28 3.84 16.59-.09 24.77-2.59 5.39-5.52 10.61-8.39 15.86-5.4 9.88-10.76 19.78-16.32 29.57-3.3 5.81-4.66 12.01-5.13 18.61-1.3 18.41-3.07 36.78-5.91 55.04-1.79 11.46-2.91 23.02-4.47 34.52-1.54 11.32-3.2 22.63-4.91 33.92-2 13.21-4.17 26.4-6.11 39.62-.38 2.6-1.13 4.74-3.3 6.28-.43.3-.8.68-1.21 1.02-7.97 6.77-7.97 6.81-18.5 7.01-6.68.12-13.37.12-20.05.14-1.23 0-2.46-.1-3.69-.19-2.31-.16-3.86-1.17-4.71-3.5-2.27-6.28-4.73-12.48-7.08-18.73-1.11-2.96-2.2-5.93-3.21-8.92-.53-1.59-1.67-2.35-3.17-2.27-3.5.19-7.03.38-10.46 1.01-1.1.2-2.24 1.64-2.83 2.79-1.31 2.53-3.26 3.38-5.99 3.42-15.65.24-31.3.56-46.95.91-2.33.05-4.13-.57-5.24-2.72-.63-1.21-1.66-1.67-3.05-1.63-5.45.14-10.91.17-16.36.33-2.59.08-3.26.99-2.23 3.33 3.34 7.56 6.83 15.05 10.28 22.56.95 2.08 2.06 4.09 2.9 6.21 1.15 2.93.51 4.41-2.62 4.92-5.2.85-10.45 1.54-15.7 1.81-5.79.31-11.6.07-17.41.07-.03.01-.03-.01-.03-.03zm77.94-401.47c-4.95.14-10.93.18-16.9.5-7.9.42-15.79 1.08-23.51 3-15.45 3.85-30.08 9.79-44.02 17.45-2.45 1.35-4.82 2.96-6.9 4.82-1.79 1.6-3.59 3.52-4.57 5.66-3.06 6.71-6.08 13.48-8.49 20.44-3.52 10.18-4.2 20.73-1.57 31.21 4.51 18.01 12.51 34.33 24.89 48.32 8.33 9.42 18.03 17.29 28.54 24.11 3.51 2.28 7.36 4.17 11.28 5.68 5.41 2.08 11.03 3.6 16.53 5.44 2.24.75 4.35.75 6.68.18 11.44-2.82 22.9-5.54 34.39-8.14 7.2-1.63 14.5-2.83 21.68-4.53 5.65-1.34 9.6.53 12.44 5.37.62 1.06 1.28 2.11 2 3.11 1.13 1.57 2.24 1.6 3.21-.15 4.87-8.76 9.81-17.49 13.09-27.03 4.93-14.31 4.8-29.06 3.67-43.85-.78-10.16-1.97-20.29-2.94-30.44-.32-3.36-1.03-4.08-4.34-3.44-5.79 1.11-11.54.87-17.32-.01-2.61-.4-5.21-.79-7.83-1.12-1.62-.2-2.47.79-1.76 2.2 1.26 2.5 2.64 4.97 4.15 7.33 3.13 4.89 6.34 9.73 9.61 14.52 2.39 3.51 2.89 7.21 1.07 11-2.41 5.02-4.26 10.52-9.72 13.36-1.44.75-1.98 2.12-1.6 3.57.39 1.48 1.1 2.9 1.85 4.25 1.11 1.98 2.49 3.81 3.55 5.81.93 1.76 1.18 3.8.31 5.62-1.17 2.47-1.46 4.92-1.26 7.64.25 3.46-1.52 5.79-4.91 6.5-2.72.57-5.58.75-8.37.65-10.02-.35-20.03-.64-30.04.32-1.74.17-3.52.19-5.27.1-1.99-.11-3.17-1.02-3.02-2.23.23-1.88 1.79-1.94 3.19-2.03 5.26-.35 10.53-.85 15.8-.89 6.5-.05 12.99.36 19.49.43 2.25.02 4.54-.23 6.76-.63 1.28-.23 2.13-1.3 2.04-2.71-.1-1.53-.84-2.74-2.45-3.01-1.2-.21-2.45-.21-3.68-.24-4.4-.09-8.8-.03-13.19-.25-6.44-.31-12.59.85-18.58 3.13-2.46.93-4.96 1.88-7.53 2.36-1.83.34-3.91.27-5.67-.28-3.08-.96-3.91-4.41-1.73-6.8 1.03-1.13 2.46-1.98 3.85-2.69 4.23-2.15 8.56-4.12 12.8-6.25 7.98-4.01 16.42-6.19 25.34-6.53 1.4-.05 2.82-.14 4.18-.46.52-.12 1.31-1.04 1.22-1.4-.19-.71-.78-1.52-1.43-1.84-.74-.36-1.72-.32-2.59-.29-4.39.19-8.77.5-13.17.63-3.15.09-6.31.13-9.45-.11-2.02-.16-3.03-1.29-2.81-2.48.32-1.74 1.73-2.03 3.17-2.23.35-.05.7-.04 1.05-.06 5.8-.17 11.61-.23 17.4-.56 3.67-.21 7.34-.72 10.97-1.32 2.08-.35 4.12-1.13 5.24-3.17.21-.39.2-.98.1-1.43-.04-.18-.6-.36-.91-.35-10.71.52-21.42 1.08-32.13 1.6-2.58.13-4.82 1.09-6.67 2.81-1.79 1.67-3.41 3.53-5.08 5.34-.71.77-1.23 1.75-2.03 2.39-.43.35-1.39.43-1.91.19s-1-.99-1.11-1.59c-.11-.63.06-1.46.41-2 4.13-6.41 8.94-11.74 17.41-11.96 8.09-.21 16.17-.65 24.24-1.08 2.81-.15 5.61-.51 8.39-.9 3.56-.5 4.78-2.75 3.23-6-.68-1.42-1.64-2.7-2.51-4.02-3.59-5.43-7.31-10.77-10.76-16.29-2.91-4.65-5.4-9.63-5.4-15.24 0-6.85.51-13.69.81-20.54.02-.35.16-.68.22-1.03 1.04-6.34 4.73-10.43 10.72-12.55 8.44-2.98 16.83-3.53 25.11.57.63.31 1.27.62 1.92.88 2.16.85 2.78.58 3.33-1.74 1.55-6.51.9-6.16-4.35-7.8-9.78-3.06-19.82-4.64-29.99-5.71-12.25-1.26-24.49-2.33-37.86-1.09zm-157.08 6.29c-1.34-10.1-2.5-20.23-4.06-30.3-2.47-15.97-5.21-31.91-7.84-47.85-.09-.52-.14-1.05-.27-1.55-.27-1.01-1.22-1.23-2-.45-.49.5-.94 1.04-1.38 1.59-17.03 21.28-33.91 42.67-49.99 64.68-8.72 11.93-17.02 24.14-24.52 36.88-6.89 11.7-12.68 23.91-16.76 36.89-2.71 8.63-4.01 17.41-3.11 26.5 1.05 10.66 1.76 21.36 2.68 32.04.71 8.23 1.39 16.46 2.32 24.66.76 6.73 1.24 6.96 7.93 6.46 14.02-1.05 28.04-2.03 42.05-3.13 5.25-.41 10.48-1.16 15.73-1.63 9.27-.83 18.42-2.85 27.79-2.63 1.22.03 2.46-.17 3.67-.39 2.17-.4 2.54-1.13 1.82-3.35-.16-.5-.38-.98-.59-1.47-3.97-9.6-7.18-19.44-9.89-29.47-.53-1.95-1.77-3.78-2.95-5.47-2.72-3.88-5.89-7.47-8.39-11.49-8.89-14.3-13.75-29.54-10.55-46.66 1.92-10.29 6.18-19.35 12.96-27.28 4.4-5.15 9.87-8.37 16.57-9.46 1.21-.2 2.41-.48 3.63-.67 5.47-.85 5.47-.84 5.15-6.45zm45.01 64.1c-.41-7.41 1.06-14.64 3.61-21.62 1.93-5.27 4.42-10.34 6.55-15.55 3.31-8.08 9.3-13.58 16.92-17.37 7.4-3.68 14.83-7.33 22.48-10.44 10.12-4.11 20.55-7.52 31.47-8.56 11.37-1.09 22.8-1.6 34.21-2.1 13.38-.59 26.72.19 40 1.98 7.67 1.03 15.33 2.09 22.75 4.43 2.18.69 4.39 1.29 6.61 1.79 1.59.36 2.3-.18 2.54-1.81.18-1.21.21-2.45.25-3.68.28-7.56.5-15.12.83-22.68.13-2.98.59-5.96.67-8.94.09-3.15-.7-4.02-3.89-4.5-11.65-1.73-23.31-3.45-34.98-5.07-2.42-.34-4.91-.29-7.37-.26-1.62.02-2.59 1.02-2.78 2.63-.12 1.04-.11 2.1-.15 3.16-.23 5.8-.4 11.6-.69 17.39-.21 4.01-1.47 5.17-5.67 5.15-2.63-.01-5.26-.42-7.9-.45-4.21-.05-8.49-.38-12.61.26-3.75.58-6.1-.63-7.99-3.53-1.25-1.91-2.55-3.8-3.68-5.79-3.03-5.36-6.15-10.68-8.89-16.18-1.39-2.8-3.12-3.9-6.19-3.59-8.4.85-16.85 1.2-25.2 2.35-25.11 3.43-49.86 8.81-74.49 14.7-8.71 2.08-17.28 4.79-25.87 7.37-3.42 1.03-3.73 1.53-3.36 4.89.86 7.86 1.91 15.71 2.81 23.56.35 3.02 1.54 5.02 4.64 6.25 6.89 2.73 11.49 8.02 14.27 14.78 1.47 3.56 2.63 7.28 3.59 11.02 2.68 10.38 4.98 20.86 7.8 31.2 3.88 14.25 7.9 28.46 12.22 42.58 4.82 15.74 14.12 28.67 26.59 39.23 7.24 6.13 14.98 11.67 22.47 17.51 7.54 5.88 15.72 10.7 24.59 14.22 4.54 1.8 7.63 4.85 9.8 9.07 2.49 4.85 5.21 9.59 7.49 14.54 11.39 24.77 22.68 49.59 34 74.39.58 1.28 1.12 2.59 1.74 3.84 1.01 2.02 1.81 2.1 3.52.43 4.53-4.43 4.81-5.71 2.1-11.54-6.6-14.19-13.22-28.38-19.9-42.54-3.3-6.99-7.15-13.75-10-20.92-5.02-12.6-10.66-24.89-16.63-37.06-1.2-2.45-2.84-3.82-5.36-4.55-3.38-.98-6.68-2.21-10.04-3.23-6.8-2.07-13.08-5.18-18.81-9.35-4.26-3.11-8.47-6.29-12.59-9.59-19.76-15.84-32.29-36.4-39.31-60.53-1.61-5.61-2.49-11.33-2.17-17.29zm76.24 120.04c-1.82-.92-2.86-1.44-3.89-1.97-4.38-2.24-8.99-4.13-13.09-6.8-12.08-7.89-23.76-16.36-34.55-25.96-12.32-10.95-21.56-24.05-26.71-39.84-1.04-3.17-2.18-6.32-3.12-9.52-6.41-21.76-11.82-43.78-16.97-65.86-1.21-5.2-3.05-10.1-6.16-14.45-3.08-4.3-7.06-7.72-12.34-8.36-10.22-1.25-19.73.5-26.63 9.14-11.81 14.82-15.31 31.46-9.69 49.58 5.38 17.34 16.28 30.98 30.23 42.3 4.17 3.38 9 5.51 14.34 6.24 1.52.21 3.18.18 4.67-.18 8.22-1.99 12.42-10.33 9.07-18.12-1.18-2.73-2.86-5.24-4.23-7.9-.55-1.07-1.02-2.23-1.22-3.41-.09-.52.43-1.41.93-1.7.49-.29 1.42-.26 1.94.02.74.4 1.46 1.05 1.87 1.78 2.07 3.67 4.23 7.31 5.98 11.13 1.35 2.93 1.31 6.11.45 9.3-1.2 4.41-3.35 8.17-7.13 10.75-2.52 1.72-2.92 3.73-1.75 6.34.36.8.59 1.65.9 2.48 5.8 15.59 15.24 28.86 26.44 40.94 4.96 5.34 11.01 9.27 17.67 12.23 3.37 1.5 6.79 2.91 10.07 4.6 6.31 3.24 13.06 4.07 19.97 3.81 2.59-.1 5.32-.61 7.67-1.64 4.67-2.04 9.38-3.81 15.28-4.93zm118.43-219.96c-.3.07-.6.14-.91.21-.19 1.2-.5 2.4-.55 3.61-.24 5.27-.38 10.54-.6 15.81-.35 8.25-.36 16.53-2.45 24.6-2.22 8.53-3.43 17.22-3.69 26.01-.47 16.54.57 32.99 2.73 49.42 1.61 12.23 1.55 24.55-.99 36.73-.18.86-.44 1.71-.53 2.58-.2 2.06.41 3.03 2.41 3.36 2.6.43 5.22.79 7.84.94 8.77.51 17.55.84 26.32 1.39 6.66.42 13.31 1.05 19.96 1.62 5.25.45 10.5 1.02 15.75 1.39 4.55.32 5.39-.73 3.93-5.15-.88-2.65-2.16-5.19-3.42-7.69-5.13-10.21-10.44-20.33-15.45-30.6-9.49-19.43-18.85-38.91-28.17-58.42-1.58-3.32-2.84-6.81-3.99-10.31-5.45-16.7-10.8-33.44-16.21-50.16-.57-1.81-1.31-3.57-1.98-5.34zm-145.39 264.4c.23.81.42 2.03.92 3.11.96 2.07 2.1 4.06 3.17 6.08 5.91 11.2 12.01 22.3 17.67 33.63 5.97 11.96 11.5 24.14 17.23 36.21 1.51 3.18 3.02 6.36 4.65 9.47 1.11 2.11 1.87 2.11 3.55.37 4.99-5.19 9.96-10.42 15.02-15.54 3.09-3.13 6.43-6 9.5-9.15 6.36-6.53 6.4-4.31 2.4-13.36-7.39-16.73-15.07-33.34-22.65-49.99-4.74-10.4-9.49-20.8-14.31-31.17-1.18-2.55-2.63-4.98-3.95-7.46-.75-1.41-1.89-1.86-3.5-1.73-4.43.34-8.67 1.29-12.75 3.08-4.26 1.87-7.34 4.73-8.72 9.28-2.5 8.24-5.05 16.47-7.57 24.71-.2.66-.36 1.35-.66 2.46zm-31.62 26.67c3.37.03 4.13-.61 4.62-2.99.11-.52.11-1.05.21-1.57 2.73-14.87 5.45-29.73 8.19-44.6.61-3.28 1.35-6.54 1.91-9.84.54-3.22.19-3.9-2.75-5.49-1.7-.92-3.46-1.74-5.25-2.46-11.9-4.76-21.5-12.45-29.38-22.51-9.06-11.57-16.84-23.85-21.4-37.93-.86-2.67-2.23-4.01-5.19-4.21-7.24-.5-13.53-3.53-19.18-8-.96-.76-1.93-1.52-2.97-2.17-.14-.09-.99.48-.96.63.29 1.37.66 2.73 1.08 4.06 3.29 10.42 7.79 20.35 12.19 30.33 5.67 12.87 11.28 25.77 16.77 38.71 6.04 14.24 11.94 28.55 17.84 42.85 2.1 5.08 5.03 9.67 8.11 14.16 2.73 3.97 6.38 7.05 10.74 9.13 2.03.98 4.27 1.51 5.42 1.9zm122.21 64.48c5.62 0 11.25-.13 16.86.05 3.07.1 5.3-.96 7.41-3.14 5.61-5.81 11.4-11.45 17.12-17.16 6.1-6.08 12.28-12.07 18.26-18.27 2.42-2.51 4.54-5.35 6.48-8.25 1.4-2.09.5-3.84-2.03-4.06-2.78-.25-5.62-.21-8.41.03-5.6.48-11.2 1-16.75 1.82-10.94 1.62-21.85 3.48-32.77 5.2-2.36.37-4.3 1.3-5.86 3.17-8.9 10.69-19 20.22-29 29.85-2.78 2.68-5.51 5.43-8.11 8.28-.98 1.07-2.89 2.23-1.82 3.86.45.68 2.58.45 3.92.33 11.54-1.03 23.08-2.1 34.7-1.71zm-131.31-62.04c.32 1.18.4 1.86.68 2.45 5.28 11.3 10.32 22.73 15.94 33.86 8.96 17.73 18.41 35.2 26.21 53.49.28.65.61 1.26.93 1.89.69 1.38 1.82 2.21 3.34 2.21 5.62 0 11.24-.05 16.86-.18 1.27-.03 1.76-1.02 1.28-2.29-.43-1.15-1-2.25-1.53-3.35-3.58-7.44-7.14-14.9-10.77-22.32-7.74-15.79-15.12-31.73-21.62-48.07-.84-2.12-1.62-4.32-2.81-6.24-3.49-5.67-8-9.8-15.35-9.03-3.21.34-6.3-.18-9.33-1.25-1.11-.39-2.24-.69-3.83-1.17zm-140.05-88.84c4.97-.37 8.65-.78 12.33-.9 18.8-.61 37.57-1.71 56.3-3.49 6.3-.6 12.57-1.42 18.85-2.19 2.46-.3 3-1.23 2.02-3.58-1.23-2.91-2.65-5.75-3.91-8.65-.87-2.01-2.3-3-4.5-2.94-5.27.15-10.61-.24-15.79.48-23.18 3.19-46.49 4.79-69.83 6.05-1.75.09-3.51.25-5.25.51-3.35.51-3.76 1.29-2.1 4.03 1.18 1.95 2.69 3.72 3.76 5.73 2.04 3.88 4.87 5.93 8.12 4.95zM384.63 140.3c0 .08.01.16.01.24 2.1.18 4.2.46 6.31.5 2.99.05 3.77-.66 3.91-3.68.18-3.69.3-7.39.2-11.07-.19-7.02-.07-14.02-1.01-21.04-.86-6.45-3.94-11.19-8.84-14.96-2.21-1.7-4.72-3.02-7.18-4.37-3.2-1.75-3.46-2.14-2.82-5.83.12-.69.43-1.37.43-2.06-.02-3.5.39-7.1-.29-10.48-1.33-6.52-5.93-10.68-11.77-13.28-3.34-1.49-7.02-2.22-10.55-3.27-7.2-2.15-13.92-.51-20.36 2.79-6.09 3.11-7.64 5.9-6.93 12.7.46 4.44 1.66 8.8 5.14 11.81 4.68 4.04 9.8 7.34 16.22 8.23 4.79.66 5.97 2.36 5.39 7.23-.74 6.27.19 12.31 2.26 18.15 3.36 9.51 8.78 17.98 14.07 26.49 1.39 2.24 3.27 2.78 5.84 2.47 3.29-.42 6.64-.41 9.97-.57zm-218.5 236.51v-.1c10.35-.43 20.7-.86 31.04-1.29.53-.02 1.05-.11 1.57-.14 11.39-.64 22.78-1.27 34.16-1.9.88-.05 1.76.01 2.63-.06 1.67-.13 2.17-.83 1.55-2.46-1.23-3.29-2.56-6.54-3.89-9.79-1.79-4.4-2.85-5.05-7.52-4.72-8.05.56-16.1 1.28-24.16 1.62-14.21.6-28.43.92-42.64 1.44-4.73.18-9.46.58-14.18.97-1.92.16-2.4 1.23-1.3 2.88 2.52 3.8 5.17 7.53 7.71 11.32 1.09 1.63 2.58 2.25 4.47 2.24 3.54-.03 7.05-.01 10.56-.01zm56.4 64.6c0 .04 0 .09.01.13 13.32-.49 26.65-.98 39.97-1.48 1.4-.05 2.82-.08 4.2-.28 1.79-.26 2.48-1.33 1.76-2.98-1.76-4.02-3.66-7.97-5.53-11.93-.75-1.6-2.09-2.28-3.82-2.32-1.05-.02-2.1-.11-3.16-.1-11.93.09-23.87.08-35.8.34-8.06.17-16.12.72-24.18 1.1-4.03.19-8.06.34-12.09.62-1.95.14-2.61 1.2-1.71 2.83 2.39 4.29 4.9 8.52 7.39 12.74.76 1.3 1.94 1.98 3.49 1.96 1.4-.01 2.81.05 4.21.01 8.43-.2 16.85-.43 25.26-.64zm-4.29-106.57c-2.37.2-3.96.25-5.52.47-22.84 3.19-45.83 4.42-68.86 5.09-4.39.13-8.77.5-13.15.87-1.64.14-2.23 1.26-1.33 2.56 2.61 3.75 5.33 7.42 8.04 11.1.96 1.3 2.3 1.24 3.8 1.16 14.74-.86 29.48-1.68 44.22-2.44 10.53-.54 21.07-.95 31.61-1.47 2.81-.14 5.61-.45 8.41-.73 3.13-.31 3.56-.99 2.35-4.13-1.07-2.79-2.45-5.46-3.47-8.27-1.21-3.36-3.37-4.81-6.1-4.21zm-12.44 66.71h-31.87c-1.4 0-2.81-.04-4.21.06-1.27.09-1.82 1.09-1.17 2.25 1.55 2.75 3.23 5.43 4.82 8.16 4.81 8.24 4.81 8.23 14.39 7.68 9.81-.57 19.62-1.35 29.44-1.63 12.27-.36 24.55-1.47 36.84-.46.87.07 1.76.04 2.63-.01 1.77-.11 2.19-.87 1.3-2.38-2.13-3.63-4.37-7.2-6.38-10.89-1.03-1.9-2.39-2.93-4.53-3.03-4.55-.21-9.1-.68-13.64-.62-8.94.12-17.88.54-27.62.87zm-.47-4.77v-.47c12.47-.17 24.94-.33 37.41-.5.18 0 .35 0 .53-.01 3.24-.2 3.86-.99 2.71-3.89-1.29-3.26-2.89-6.41-4.15-9.69-1.11-2.9-3.15-4.07-6.1-4-5.62.13-11.25.11-16.86.4-15.61.81-31.21 1.78-46.82 2.6-4.56.24-9.14.16-13.7.32-1.62.06-2.25 1.1-1.5 2.5 1.58 2.94 3.46 5.72 4.92 8.71 1.53 3.1 3.79 4.12 7.19 4.07 12.12-.14 24.25-.04 36.37-.04zm60.74 108.32c0 .08.01.16.01.23 5.97-.25 11.93-.54 17.9-.72 4.74-.14 9.49-.12 14.23-.23 2.67-.06 3.09-.72 1.9-3.25-1.78-3.82-3.83-7.52-5.52-11.38-1.32-2.99-3.39-4.3-6.6-3.99-1.05.1-2.11.01-3.16.06-7.9.33-15.79.87-23.69.97-12.99.15-25.98 1.41-38.98.37-.35-.03-.7-.02-1.05 0-2.29.11-2.84 1.02-1.57 3.03 2.53 4.01 5.37 7.83 7.76 11.93 2.06 3.53 4.82 4.51 8.76 4.26 9.99-.61 20-.87 30.01-1.28zm-48.92-41.75c7.92-.35 15.29-.7 22.65-1 11.22-.46 22.45-.89 33.67-1.35 1.04-.04 2.1-.15 3.11-.41 1.4-.36 1.98-1.43 1.37-2.84-1.6-3.7-3.32-7.36-5.04-11-.66-1.4-1.89-2.03-3.42-2.03-1.23 0-2.46.01-3.68.07-5.26.28-10.51.72-15.77.85-17.02.42-34.04.72-51.06 1.07-.7.01-1.41 0-2.1.06-2.25.21-2.68 1.04-1.47 3.14 2.02 3.49 4.22 6.89 6.17 10.41 1.27 2.29 3.08 3.12 5.61 3.05 3.49-.1 7-.02 9.96-.02zm22.27 19.05v.18c14.74-.51 29.49-1.02 44.23-1.53.88-.03 1.76-.03 2.62-.18 2.12-.36 2.77-1.4 1.96-3.3-.76-1.77-1.68-3.48-2.59-5.18-3.85-7.27-3.08-6.85-11.28-6.53-18.43.7-36.85 1.4-55.28 2.07-3.33.12-6.68.06-10.01.18-1.63.06-2.21 1.05-1.4 2.49 1.63 2.91 3.44 5.72 5.09 8.62 1.25 2.2 3.04 3.23 5.58 3.21 7.03-.06 14.06-.03 21.08-.03zm25.63 27.96c-3.69 0-10.56-.07-17.41.03-3.69.06-7.38.36-11.06.66-1.69.14-2.17 1.13-1.16 2.54 2.98 4.14 6.06 8.2 9.13 12.28 1.32 1.75 3.22 1.97 5.22 1.85 4.91-.3 9.82-.7 14.74-.89 13.18-.52 26.36-.95 39.54-1.43 1.23-.04 2.47-.06 3.67-.29 1.76-.33 2.3-1.29 1.64-3.1-.77-2.15-1.98-4.16-2.56-6.35-1.34-5.07-5-6.36-9.59-6.38-1.06-.01-2.11-.02-3.17.02-8.59.3-17.2.62-28.99 1.06zm240.66-193.58c.01-.05.01-.1.02-.14 3.17 0 6.33.04 9.5-.03 1.03-.02 2.36.01 3.02-.59 2.67-2.42 3.99-5.7 4.95-9.09.12-.42-.55-1.29-1.07-1.6-.72-.44-1.62-.68-2.48-.79-3.14-.4-6.28-.82-9.44-1.05-19.63-1.46-39.27-2.88-58.9-4.3-.88-.06-1.76-.07-2.64-.09-1.56-.03-2.76.62-3.42 2.02-1.5 3.18-2.99 6.37-4.38 9.6-.63 1.46-.03 2.34 1.64 2.44 3.51.22 7.03.28 10.54.48 17.56 1.03 35.11 2.09 52.66 3.14zm-9.6 17.73c0-.04.01-.08.01-.12 1.4 0 2.81.01 4.21 0 9.91-.06 7.81 1.14 12.8-7.66 2.6-4.58 2.16-5.17-3.17-5.35-12.1-.42-24.19-.79-36.28-1.38-6.65-.32-13.28-1.14-19.92-1.57-4.55-.3-9.11-.34-13.67-.45-1.43-.03-2.91.16-3.71 1.53-1.86 3.17-3.67 6.38-5.38 9.63-.47.89.02 1.77 1.05 1.99 1.02.22 2.08.27 3.13.33 7.7.42 15.41.84 23.12 1.23 12.59.61 25.2 1.21 37.81 1.82zm-60.08 1.78c0-.06 0-.12.01-.17-.7 0-1.4-.01-2.11 0-2.7.05-3.34.75-2.46 3.08 1.3 3.45 2.79 6.82 4.2 10.22.84 2.02 2.36 2.91 4.56 2.84 2.46-.08 4.91-.04 7.37-.08 14.74-.28 29.48-.6 44.21-.86 8.86-.16 7.26 1.36 11.88-7.32 2.18-4.1 1.81-4.59-3-4.76-11.05-.38-22.1-.64-33.14-1.14-10.51-.47-21.01-1.19-31.52-1.81zM229.63 79.72c.1 1.26.12 1.79.19 2.31 1.39 10.42 2.72 20.85 4.21 31.25.7 4.85 1.62 9.68 2.62 14.48.53 2.54 1.4 3.08 3.65 2.55 4.09-.97 8.17-2.02 12.21-3.17 2.28-.65 2.58-1.37 2.11-3.96-.16-.86-.39-1.71-.56-2.57-1.72-8.76-3.52-17.51-5.11-26.3-.9-5-1.43-10.06-2.13-15.09-.65-4.68-1.78-5.65-6.14-4.72-2.91.62-5.74 1.57-8.6 2.4-1.75.52-2.58 1.71-2.45 2.82zm-6.79-.95c-4.68 1.19-9.1 2.26-13.49 3.46-1.35.37-1.84 1.55-1.71 2.92.08.87.27 1.73.41 2.6 1.62 9.51 3.23 19.02 4.86 28.53 1.01 5.88 1.99 11.76 3.06 17.63.49 2.67 1.42 3.23 4.05 2.49 3.04-.86 6.06-1.78 9.04-2.82 2.7-.94 3.06-1.63 2.74-4.27-.06-.52-.22-1.03-.31-1.55-2.49-14.17-4.52-28.41-5.86-42.74-.13-1.39-.32-2.83-.81-4.12-.29-.79-1.22-1.35-1.98-2.13zm226.58 418.26c8.79 0 15.48.01 22.17-.01 1.05 0 2.2.16 3.13-.2.87-.33 2.02-1.15 2.18-1.93.91-4.47 1.63-8.98 2.25-13.51.22-1.61-.78-2.64-2.45-2.83-.7-.08-1.4-.15-2.1-.14-11.78.28-23.56.58-35.34.86-1.82.04-3.47.49-4.79 1.83-2.59 2.63-5.32 5.15-7.73 7.94-1.18 1.37-2.94 2.85-2.2 5.05.88 2.62 3.36 2.24 5.38 2.33 7.19.32 14.4.47 19.5.61zM300.17 362.3c-1.46-.06-1.7.1-2.39 2.37-.2.67-.36 1.36-.49 2.05-2.43 12.94-4.88 25.88-7.25 38.83-.82 4.49-1.41 9.02-2.15 13.52-.38 2.32.1 4.03 2.46 5.16 2.04.98 3.86 2.41 5.8 3.62 1.56.97 2.29.72 2.58-1.02.58-3.46.95-6.96 1.6-10.41 2.97-15.72 6.97-31.18 12.17-46.31.46-1.33.94-2.65 1.28-4.01.4-1.6-.11-2.44-1.65-2.62-3.65-.42-7.32-.73-11.96-1.18zM261.19 69.87c-1.55.42-4.46 1.06-7.26 2.03-2.99 1.03-3.37 1.66-2.89 4.65 1.83 11.26 3.68 22.51 5.68 33.74.74 4.14 1.83 8.22 2.93 12.29.58 2.13 1.28 2.51 3.49 2.13 3.11-.53 6.22-1.14 9.28-1.89 2.22-.54 2.57-1.2 2.22-3.39-.19-1.21-.55-2.39-.81-3.59-.91-4.29-2-8.55-2.67-12.88-1.5-9.71-2.77-19.46-4.15-29.19-.45-3.21-1.26-3.91-5.82-3.9zm18.48-3.18c-.41.05-2.01.08-3.54.43-3.67.85-4.51 2.05-4.41 5.95.03 1.05.06 2.12.22 3.15 1.45 9.55 2.81 19.12 4.44 28.63.77 4.49 2 8.91 3.17 13.32.59 2.21 1.32 2.66 3.41 2.33 2.95-.47 5.89-1.03 8.78-1.74 2.23-.55 2.8-1.64 2.42-3.91-.12-.69-.37-1.36-.54-2.04-2.5-10.07-4.55-20.22-5.85-30.51-.53-4.18-1.12-8.36-1.74-12.52-.48-3.17-.74-3.33-4.14-3.22-.35.01-.7.04-2.22.13zm6.43 464.11c0 .22.01.44.01.66-5.98 0-11.96-.11-17.94.03-5.09.12-10.18.51-15.27.85-.61.04-1.19.52-1.78.79.29.61.45 1.33.89 1.8 2.02 2.21 4.19 4.28 6.15 6.52 2.89 3.31 6.36 4.52 10.78 4.13 14.71-1.28 29.44-2.28 44.16-3.47 4.03-.32 4.4-1.12 2.83-5.08-.32-.82-.78-1.59-1.01-2.43-1.04-3.72-3.56-4.72-7.2-4.53-7.2.4-14.41.51-21.62.73zm182.3-159.43c0-.06.01-.13.01-.19 6.48.29 12.97.59 19.45.88 3.26.14 3.56-.08 4.33-3.17.67-2.71 1.09-5.42 2.57-7.95 2.55-4.34 2.05-5.05-2.94-4.97-15.44.25-30.87.56-46.31.85-.88.02-1.76.06-2.63.17-2.62.33-3.15 1.05-2.3 3.4.78 2.14 1.79 4.19 2.6 6.33.93 2.47 2.68 3.43 5.26 3.55 6.66.29 13.31.72 19.96 1.1zM296.78 64.67c-5.21-.2-6.32.92-5.92 5.97.03.35.05.7.1 1.05 1.84 13.4 4.03 26.73 7.38 39.85.3 1.19.52 2.47 1.15 3.48.49.78 1.61 1.78 2.35 1.7 3.64-.39 7.27-1.03 10.87-1.76 1.42-.29 1.82-1.55 1.57-2.91-.16-.86-.41-1.7-.65-2.55-3.79-13.52-7.57-27.05-11.38-40.56-1.11-3.87-1.5-4.11-5.47-4.27zM451.4 501.91v-.23c-1.05 0-2.11.03-3.16 0-6.14-.18-12.27-.4-18.41-.55-2-.05-2.63.69-2.06 2.57.96 3.19 2.17 6.3 3.1 9.5.8 2.75 2.4 3.96 5.33 3.99 11.58.11 23.16.36 34.73.57 1.62.03 2.73-.61 3-2.28.58-3.64 1.17-7.27 1.65-10.92.19-1.44-.65-2.36-2.08-2.52-1.22-.14-2.45-.12-3.68-.13-6.14-.01-12.28 0-18.42 0zM314.97 63.97c-1.53 0-2.41.01-3.29 0-4.88-.07-5.57.79-4.44 5.53.24 1.02.49 2.05.78 3.06 3.23 11.12 6.46 22.23 9.69 33.34.54 1.85 1.08 3.7 1.64 5.55.47 1.56 1.57 2.33 3.15 2.22 1.92-.13 3.83-.41 5.74-.61 3.19-.33 3.76-.71 2.98-4.53-.42-2.06-1.05-4.07-1.56-6.12-2.72-10.89-5.54-21.75-8.1-32.67-1.38-5.96-1.18-6.01-6.59-5.77zm158.6 327.33c4.39 0 8.78.08 13.17-.03 3.02-.08 3.71-.79 4.07-3.67.29-2.26.52-4.54.69-6.81.19-2.63-.52-3.49-3.19-3.69-4.73-.34-9.46-.58-14.19-.85-5.43-.31-10.87-.62-16.3-.89-2.63-.13-5.26-.26-7.9-.25-1.71 0-2.47.88-1.91 2.28 1.5 3.75 3.04 7.48 4.84 11.09.46.92 1.81 1.65 2.9 1.95 1.84.51 3.8.78 5.71.83 4.02.13 8.07.05 12.11.04zm-20.29 130.85v-.24c-5.27 0-10.54-.07-15.81.03-2.49.04-3.14.98-2.4 3.38 1.03 3.36 2.28 6.65 3.34 9.99.68 2.15 2.12 3.09 4.3 3.17 4.39.16 8.78.52 13.16.51 3.86-.02 7.71-.45 11.57-.67 2.08-.12 3.2-1.18 3.5-3.22.42-2.78.95-5.54 1.31-8.32.41-3.13-.11-3.83-3.19-3.99-5.25-.29-10.51-.44-15.78-.64zm-83.48 1.12v-.92c5.96 0 11.92.04 17.88-.03 1.37-.01 3.27.12 4.02-.67 2.61-2.77 4.85-5.9 7.13-8.97.13-.17-.51-1.26-.98-1.44-.78-.3-1.71-.27-2.59-.3-7.01-.21-14.02-.39-21.02-.58-3.51-.1-7.01-.16-10.52-.29-2-.08-3.86.21-5.34 1.7-2.97 2.98-5.94 5.96-8.84 9-.39.42-.69 1.41-.46 1.81.25.43 1.17.66 1.79.67 6.31.04 12.62.02 18.93.02zm64.74 17.28c-.54-1.92-.87-3.29-1.31-4.63-4.11-12.53-8.23-25.06-12.37-37.58-.33-1-.74-1.98-1.19-2.93-.56-1.18-1.43-2.02-2.82-2.06-1.4-.04-2.82-.13-4.21 0-1.96.19-2.66 1.29-2.18 3.34.32 1.37.79 2.7 1.25 4.03 4.7 13.82 9.49 27.61 14.08 41.47 2.09 6.31 2.98 4.99 6.7 1.38.93-.91 1.51-2.2 2.05-3.02zm26.77-66.89c4.22 0 9.49.06 14.75-.02 3.77-.06 4.56-.8 5.06-4.54.32-2.43.5-4.89.65-7.34.15-2.53-.4-3.33-2.86-3.33-6.14 0-12.28.17-18.42.35-2.37.07-4.36 1.06-6.05 2.79-3.44 3.51-7 6.9-10.44 10.41-.52.53-.65 1.44-.97 2.18.66.14 1.33.43 1.99.4 5.08-.25 10.16-.56 16.29-.9zm-41.35-377.8h.15c0-3.51-.04-7.03.01-10.54.12-8.34.87-7.68-7.98-9.87-5.02-1.24-5.65-.75-5.46 4.3.34 8.95.85 17.89 1.3 26.83.31 6.13.9 6.71 7.13 7.11.35.02.7.05 1.05.05 3.01.03 3.76-.65 3.79-3.65.03-4.76.01-9.5.01-14.23zm-39.21 409.58v.4c4.38 0 8.76.03 13.14-.02 1.39-.01 2.81-.12 4.17-.39 1.19-.24 1.81-1.17 1.36-2.37-.87-2.29-1.87-4.53-2.84-6.78-.94-2.17-2.56-3.1-4.97-3.11-9.28-.01-18.54-.58-27.81.82-4.83.73-5.41.64-3.93 5.85.14.51.36.99.46 1.51.57 2.83 2.25 4.15 5.18 4.11 5.09-.07 10.17-.02 15.24-.02zm44.18-409.12h-.25c0 3.34-.01 6.68 0 10.02.01 1.58-.03 3.17.09 4.74.22 3 .71 3.65 3.61 4.33 1.7.4 3.47.57 5.21.69 2.62.18 3.09-.26 3.23-2.86.09-1.75 0-3.52.07-5.27.29-7.02.57-14.05.92-21.06.23-4.69-.14-5.25-4.9-6.41-1.53-.37-3.07-.78-4.63-1.01-2.64-.4-3.28.05-3.33 2.61-.09 4.73-.02 9.47-.02 14.22zm50.33 313.33v.64c3.34 0 6.68.09 10.02-.03 2.45-.09 3.1-.69 3.52-3.06.43-2.42.77-4.87.87-7.32.11-2.71-.64-3.52-3.34-3.6-9.48-.29-18.97-.48-28.46-.68-1.16-.02-1.58.84-1.18 1.77 1.31 3.07 2.78 6.07 4.12 9.12.97 2.21 2.64 3.17 4.98 3.16 3.15-.01 6.31 0 9.47 0zm-72.44-302.37c-.3-9.27-.58-18.54-.9-27.81-.04-1.22-.26-2.44-.41-3.65-.23-1.94-1.23-3.2-3.19-3.68-2.89-.71-5.75-1.52-8.65-2.21-1.76-.42-2.29.03-2.11 1.83.48 4.88.95 9.76 1.66 14.61.19 1.28.98 2.66 1.89 3.62 4.75 5.05 7.13 11.13 8.28 17.84.27 1.58-.37 3.79 2.07 4.26 1.31.24 1.76-1.12 1.36-4.81zm24.36 81.83v.28c-1.92 0-3.85-.09-5.77.02-3.38.2-6.41 1.44-9.34 3.17-3.72 2.2-4.67 5.41-4.15 9.37.18 1.36 1 1.74 2.24 1.33.5-.16.97-.4 1.46-.59 5.8-2.27 11.79-3.18 18.01-2.5 3.13.34 6.27.69 9.41.8.88.03 2.15-.5 2.63-1.2 1.33-1.94.65-5.67-1.11-7.21-2.03-1.78-4.42-2.85-7.1-3.12-2.08-.21-4.18-.24-6.28-.35zm48.3 226.01v-.25c-2.61-.17-5.22-.4-7.84-.47-1.6-.05-2.13.94-1.46 2.43.07.16.13.33.23.47 3.44 4.46 6.28 9.15 6.8 14.97.14 1.6 1.5 2.35 3.07 2.2 2.26-.21 4.5-.55 6.75-.87 1.35-.19 2.29-.98 2.51-2.31.72-4.3 1.5-8.6 1.98-12.92.25-2.23-.68-3.08-3.14-3.21-2.96-.16-5.93-.04-8.9-.04zM330.24 85.3c.39 1.67.74 3.35 1.18 5 1.31 4.9 2.65 9.79 3.98 14.69 1.82 6.71.75 7.26 9.67 6.78.52-.03 1.05-.09 1.57-.14 1.52-.15 2.09-1.02 1.96-2.5-.43-4.87-.86-9.74-1.23-14.61-.13-1.78-.83-3.01-2.66-3.39-5.03-1.05-9.55-3.25-14.47-5.83zm98.61 130.26c3.19-.57 6.85-.97 10.35-1.93 2.61-.72 3.44-2.94 2.72-5.42-.6-2.06-2.33-2.63-4.09-2.7-5.59-.24-11.19-.49-16.78-.36-3.72.09-7.15 1.62-10.37 3.47-.6.34-1.19.75-1.66 1.26-.72.79-.62 1.73.29 2.21 1.06.56 2.24 1.02 3.42 1.21 5.19.78 10.39 1.46 16.12 2.26zm-29.53 69.33c3.45 0 7.12.02 10.8-.01 1.04-.01 2.12-.04 3.12-.3 1.67-.44 2.38-2.24 1.57-3.78-1.24-2.38-3.29-3.61-5.92-3.74-2.8-.13-5.6-.16-8.4-.1-6.04.13-11.77 1.6-17.19 4.24-3.93 1.92-7.82 3.93-11.69 5.96-1.66.87-3.22 1.91-4.83 2.87 2.13 1.31 3.82-.4 5.7-.83.34-.08.67-.21.99-.34 8.2-3.54 16.68-5.24 25.85-3.97zm50.45-183.79h.22V87.46c0-3.42-2.32-4.28-5.31-4.33-.54-.01-1.32.58-1.59 1.1-.38.74-.51 1.68-.54 2.54-.28 8.91-.6 17.83-.72 26.74-.05 3.34 1.64 4.59 5.01 4.38 1.42-.09 2.35-.78 2.61-2.12.24-1.19.3-2.43.31-3.65.03-3.67.01-7.34.01-11.02zM273.82 550.17c-.04.29-.07.58-.11.87.98.3 1.93.71 2.93.88 2.42.41 4.85.88 7.29 1.03 6.31.39 12.64.72 18.96.87 5.27.13 10.55.08 15.82-.08 2.5-.08 3.73-1.06 3.64-2.25-.15-1.8-1.77-3.91-3.42-4.24-1.02-.21-2.1-.24-3.15-.22-3.16.06-6.33.09-9.48.32-9.29.66-18.57 1.4-27.85 2.15-1.55.12-3.09.44-4.63.67zm198.65-96.58v-.07c2.46 0 4.91.05 7.37-.02 1.58-.04 2.73-.94 3.01-2.47.58-3.28 1.08-6.57 1.41-9.88.17-1.69-.78-2.58-2.59-2.53-1.92.05-3.83.44-5.75.56-2.13.14-3.44 1.19-4.55 3.02-1.72 2.84-3.79 5.46-5.72 8.17-.41.57-1.07 1.05-1.23 1.67-.11.43.42 1.47.7 1.48 2.44.12 4.9.07 7.35.07zm-29.13-267.72c-.73-.81-1.37-1.86-2.3-2.48-8.73-5.8-17.84-5.75-27.03-1.31-1.62.78-2.79 2.54-4.07 3.93-.28.3-.16.97-.22 1.47.49.04 1.05.27 1.45.11 9.99-4.27 20.06-4.52 30.24-.71.31.12.73.16 1.02.04.26-.12.43-.49.91-1.05zm10.46 357.89c-4.2-.26-7.37-.4-10.52-.68-3.44-.3-5.58 1.7-7.46 4.12-.19.25.21 1.33.6 1.57.54.33 1.35.32 2.05.31 6.68-.15 13.36-.35 20.04-.49 2.5-.05 4.28-1.44 5.92-3.07.28-.28.33-.9.3-1.35-.01-.16-.59-.39-.91-.39-3.68-.03-7.37-.02-10.02-.02zm-47.07-27.89v-.04c.35 0 .7.02 1.05 0 2.93-.18 3.5-.9 2.67-3.57-1.66-5.35-3.37-10.69-5.1-16.02-.26-.81-.6-1.77-1.22-2.23-.58-.43-1.63-.46-2.38-.28-.31.08-.65 1.24-.5 1.78.36 1.34 1.02 2.6 1.52 3.91.81 2.12 1.59 4.26 2.37 6.4 1.02 2.76 1.36 5.35-.9 7.85-1.09 1.21-.38 2.12 1.45 2.2.34.01.69 0 1.04 0zM383.69 81.41c-.28-3.24-.36-5.53-.72-7.77-.24-1.5-.89-2.93-1.36-4.39-2.18 1.15-.72 3.08-.94 4.63-.32 2.25-.45 4.52-.59 6.79-.08 1.36 1.16 2.62 2.25 2.17.61-.25.93-1.22 1.35-1.89.07-.12.01-.34.01.46z"/><path class="st1" d="M317.38 207.58c.87.4 1.46.82 2.1.96 6.37 1.3 12.72 2.66 19.12 3.79 8.72 1.54 17.15.22 25.32-3.04 1.31-.52 2.57-1.16 3.88-1.66 1.94-.74 3.24-.51 3.65.68.61 1.74-.68 2.54-1.86 3.32-.58.38-1.22.7-1.86.99-8.81 4.04-18.04 5.94-27.71 4.79-5.4-.64-10.75-1.73-16.08-2.8-4.13-.83-8.21-1.93-12.29-2.99-1.17-.3-2.35-.75-3.37-1.39-1.26-.79-1.46-2.65-.36-3.67 1-.94 2.22-1.7 3.46-2.31 9.53-4.73 19.55-7.85 30.15-9.03 7.16-.8 14.3-2 21.51-.54 1.38.28 2.47-.09 2.96-1.49.58-1.69 0-3.4-1.33-4.14-.31-.17-.63-.32-.96-.42-11.5-3.39-22.93-4.98-34.6-.31-9.64 3.86-19.29 7.65-28.22 13.01-2.08 1.25-4.13 2.77-5.71 4.59-3.05 3.51-3.13 7.03.08 10.41 3.37 3.55 7.15 6.76 10.99 9.82 3.29 2.62 6.87 4.9 10.4 7.2 4.66 3.03 7.64 7.19 8.88 12.59.75 3.25 1.55 6.5 2.1 9.79 1.3 7.66 3.46 15.06 6.07 22.35 1.84 5.12 3.46 10.33 5.05 15.54.4 1.31.51 2.78.36 4.14-.07.64-.98 1.41-1.68 1.69-.45.17-1.44-.29-1.78-.76-.6-.82-.95-1.85-1.28-2.83-2.18-6.5-4.47-12.96-6.43-19.52-1.85-6.22-3.36-12.55-4.96-18.84-.47-1.87-.84-3.78-1.09-5.7-.95-7.27-4.42-12.62-10.87-16.47-4.95-2.95-9.36-6.82-13.91-10.41-1.79-1.41-3.38-3.08-4.93-4.75-6.49-7-4.26-13.82 1.11-19.03 1.74-1.69 3.91-3 6.01-4.25 9.71-5.76 19.99-10.33 30.67-13.94 8.86-3 17.87-3.6 26.98-.97 2.19.63 4.45 1.03 6.67 1.56 5.12 1.23 10.33 2.15 15.06 4.67 1.64.87 2.52.09 2.61-1.84.11-2.37-.96-4.07-2.85-5.29-6.12-3.96-12.62-7.01-20-7.59-8.86-.69-17.54.06-25.93 3.31-6.72 2.6-13.56 4.89-20.25 7.57-3.41 1.37-6.6 3.28-9.88 4.97-1.4.73-2.74 1.6-4.17 2.26-1.83.84-3.19.59-3.68-.59-.69-1.65.23-2.79 1.51-3.51 4.6-2.57 9.08-5.44 13.92-7.45 7.95-3.3 16.1-6.12 24.23-8.96 8.81-3.08 17.96-3.42 27.09-2.18 7.43 1.01 14.12 4.28 20.21 8.59 4.85 3.43 6.07 10.44 3 15.55-1.03 1.72-2.56 2.33-4.51 1.49-1.93-.83-3.7-2.04-5.61-2.9-2.25-1.01-3.16-.38-3.5 2.13-.98 7.39-.97 7.35-8.48 5.92-2.06-.39-4.19-.81-6.26-.72-11.62.53-23.14 1.71-34.09 6.02-1.56.58-3.33.9-4.66 2.59zM231.73 205.14c-.69 7.15-3.25 14.92-10.18 19.94-4.73 3.43-5.54 6.94-3.95 12.07 1.35 4.34 2.16 8.86 3.17 13.3.34 1.5 1.03 3.17-.78 4.22-1.26.73-2.52-.39-3.51-3-.31-.82-.61-1.66-.79-2.51-1.26-6.19-2.45-12.39-3.76-18.57-.5-2.36.08-4.1 2.17-5.39 1.19-.74 2.25-1.68 3.38-2.51 5.08-3.74 7.78-8.98 9.15-14.95 2.64-11.53-8.01-19.02-17.59-15.42-4.37 1.64-8.15 4.1-11.2 7.62-3.01 3.48-4.25 7.59-4.26 12.15 0 1.41-.22 2.89-1.95 3.32-1.26.31-2.37-1.12-2.41-3.41-.09-4.87 1.18-9.42 4.04-13.38 4.39-6.09 10.33-10.01 17.68-11.52 10.62-2.22 20.78 6.1 20.79 18.04zM217.39 270.13c.01-3.38 2.95-6.04 6.68-6.04 3.71 0 6.6 2.73 6.52 6.16-.08 3.44-2.96 6.37-6.38 6.5-3.54.14-6.83-3.05-6.82-6.62zm8.62.38c-.7-.76-1.15-1.61-1.53-1.59-.7.05-1.37.63-2.05.98.4.64.72 1.71 1.22 1.81.58.12 1.33-.63 2.36-1.2zM392.08 121.29c-.37 3.64-.64 6.97-1.05 10.28-.34 2.72-1.88 4.47-4.63 5.05-.69.14-1.36.36-2.05.51-6.74 1.48-8.23.89-11.05-5.48-3.69-8.35-7.2-16.79-10.61-25.26-1.04-2.59-1.61-5.38-2.22-8.12-.3-1.35-.36-2.8-.24-4.19.52-6.03 4.99-9.1 10.74-7.29 5.18 1.63 9.37 4.75 12.58 9.14 3.91 5.35 6.26 11.37 7.52 17.82.49 2.59.7 5.22 1.01 7.54zm-4.76 1.42c-.21-8.52-2.29-15.7-6.31-22.29-2.14-3.51-5.03-6.32-8.8-8.09-.95-.44-1.94-.87-2.96-1.07-2.46-.49-4.13.75-4.36 3.28-.11 1.2-.06 2.49.25 3.65.81 3.05 1.67 6.1 2.76 9.06 1.63 4.45 3.42 8.85 5.24 13.22 1.41 3.4 2.97 6.75 4.48 10.11.97 2.17 2.8 2.42 4.86 2.12 2.55-.38 3.52-1.1 3.96-3.47.45-2.4.66-4.86.88-6.52zM352.02 84.34c-1.82-.39-4.91-.99-7.97-1.73-1.01-.24-1.97-.76-2.88-1.27-9.32-5.28-9.71-16.95-.77-22.86 2.55-1.69 5.39-2.59 8.43-2.65 6.19-.11 11.78 1.58 16.5 5.74 5.14 4.53 5.92 10.3 2.11 16.02-3.36 5.05-8.39 6.6-15.42 6.75zm-1.65-24.15c-1.72.28-3.52.32-5.14.9-3.73 1.33-6.21 3.97-6.75 8-.43 3.24 2 7.05 5.87 8.52 2.9 1.11 6.08 1.95 9.16 2.04 4.13.12 7.99-1.2 10.32-5.13 2.01-3.39 1.73-6.32-1.14-9.02-3.43-3.22-7.39-5.33-12.32-5.31z"/></svg>'

9+ base+'sphinx'

10+ glob-ames+[~donmec-sallud 0v0]

10−==

11+==

desk/gen/publish-all.hoon+13−13

@@ -2,28 +2,28 @@

2/+ *sphinx

3:- %say

4|= $: [now=@da eny=@uv =beak]

5− [ ~]

5+ [~ ~]

6 ==

7:- %declarations

8^- (list declare:s)

9−:* :- %friends

9+:~ :- %friends

10− ['networked subject' %group 'web+urbitgraph://group/~matwet/networked-subject' 'https://subject.network | networked subject' 'https://urbits3.ams3.digitaloceanspaces.com/sitful-hatred/2022.7.07..17.15.52-ns.png' ~['hosting' 'networking' 'urbit' 'ops']]

10+ ['networked subject' %group 'web+urbitgraph://group/~matwet/networked-subject' 'https://subject.network | networked subject' ~['hosting' 'networking' 'urbit' 'ops'] 'https://urbits3.ams3.digitaloceanspaces.com/sitful-hatred/2022.7.07..17.15.52-ns.png' '']

11 :- %friends

12− ['Hooniverse' %group 'web+urbitgraph://group/~hiddev-dannut/new-hooniverse' 'Community based Hoon learning for all levels. For discussion of Hoon specific to Uqbar, join ~hiddev-dannut/uhoon' 'https://i.imgur.com/ghThlz7.png' ~['hoon' 'dev' 'urbit' 'programming' 'education']]

12+ ['Hooniverse' %group 'web+urbitgraph://group/~hiddev-dannut/new-hooniverse' 'Community based Hoon learning for all levels. For discussion of Hoon specific to Uqbar, join ~hiddev-dannut/uhoon' ~['hoon' 'dev' 'urbit' 'programming' 'education'] 'https://i.imgur.com/ghThlz7.png' '']

13 :- %friends

14− ['Hollow Mars Theory' %group 'web+urbitgraph://group/~rabsef-bicrym/hollow-mars-theory' 'Definitely NOT a Conspiracy Chat' '' ~['conspiracies' 'ufos' 'steel beams']]

14+ ['Hollow Mars Theory' %group 'web+urbitgraph://group/~rabsef-bicrym/hollow-mars-theory' 'Definitely NOT a Conspiracy Chat' ~['conspiracies' 'ufos' 'steel beams'] '' '']

15 :- %friends

16− ['celestial systems' %group 'web+urbitgraph://group/~nocsyx-lassul/celestial-systems' 'A place for pilots who are building hosting providers' '' ~['hosting' 'ops' 'urbit']]

16+ ['celestial systems' %group 'web+urbitgraph://group/~nocsyx-lassul/celestial-systems' 'A place for pilots who are building hosting providers' ~['hosting' 'ops' 'urbit'] '' '']

17 :- %friends

18− ['Structure' %group 'web+urbitgraph://group/~fabled-faster/structure' 'Urbit Structural Design and Engineering Group. Always Thinking About Mechanics.' 'https://fabled-faster.nyc3.digitaloceanspaces.com/fabled-faster/2022.1.27..17.59.43-image.png' ~['design' 'ux' 'hci' 'urbit']]

18+ ['Structure' %group 'web+urbitgraph://group/~fabled-faster/structure' 'Urbit Structural Design and Engineering Group. Always Thinking About Mechanics.' ~['design' 'ux' 'hci' 'urbit'] 'https://fabled-faster.nyc3.digitaloceanspaces.com/fabled-faster/2022.1.27..17.59.43-image.png' '']

19 :- %friends

20− ['The Marketplace' %group 'web+urbitgraph://group/~tirrel/the-marketplace' 'Welcome to The Marketplace, featuring The Pit, Urbit\'s first open-outcry market!' 'https://snipboard.io/U0IYyi.jpg' ~['urbit' 'market' 'sell' 'buy']]

20+ ['The Marketplace' %group 'web+urbitgraph://group/~tirrel/the-marketplace' 'Welcome to The Marketplace, featuring The Pit, Urbit\'s first open-outcry market!' ~['urbit' 'market' 'sell' 'buy'] 'https://snipboard.io/U0IYyi.jpg' '']

21 :- %friends

22− ['The Forge' %group 'web+urbitgraph://group/~middev/the-forge' 'pale fire computing' 'https://nyc3.digitaloceanspaces.com/archiv/littel-wolfur/2021.5.06..21.01.58-the%20forge.png' ~['dev' 'programming' 'hoon' 'urbit']]

22+ ['The Forge' %group 'web+urbitgraph://group/~middev/the-forge' 'pale fire computing' ~['dev' 'programming' 'hoon' 'urbit'] 'https://nyc3.digitaloceanspaces.com/archiv/littel-wolfur/2021.5.06..21.01.58-the%20forge.png' '']

23 :- %friends

24− ['UFORIA' %group 'web+urbitgraph://group/~tiplec-lacnyx/ufora' 'UFO Research, Investigations, and Analysis' 'https://tiplec-lacnyx.nyc3.digitaloceanspaces.com/tiplec-lacnyx/2021.12.27..06.09.47-change1.jpg' ~['UFO' 'conspiracies' 'research']]

24+ ['UFORIA' %group 'web+urbitgraph://group/~tiplec-lacnyx/ufora' 'UFO Research, Investigations, and Analysis' ~['UFO' 'conspiracies' 'research'] 'https://tiplec-lacnyx.nyc3.digitaloceanspaces.com/tiplec-lacnyx/2021.12.27..06.09.47-change1.jpg' '']

25 :- %friends

26− ['Urbit Community' %group 'web+urbitgraph://group/~bitbet-bolbel/urbit-community' 'World hub, help desk, meet and greet, etc.' 'https://fabled-faster.nyc3.digitaloceanspaces.com/fabled-faster/2021.4.02..21.52.41-UC.png' ~['general' 'urbit' 'community' 'help']]

26+ ['Urbit Community' %group 'web+urbitgraph://group/~bitbet-bolbel/urbit-community' 'World hub, help desk, meet and greet, etc.' ~['general' 'urbit' 'community' 'help'] 'https://fabled-faster.nyc3.digitaloceanspaces.com/fabled-faster/2021.4.02..21.52.41-UC.png' '']

27 :- %friends

28− ['Urbytes' %group 'web+urbitgraph://group/~nartes-fasrum/urbytes' 'We feed and water Mars.' '' ~['cooking' 'food' 'beverages' 'peanut butter eggs']]

28+ ['Urbytes' %group 'web+urbitgraph://group/~nartes-fasrum/urbytes' 'We feed and water Mars.' ~['cooking' 'food' 'beverages' 'peanut butter eggs'] '' '']

29−==

29+==

desk/lib/gossip.hoon+283−58

@@ -1,14 +1,10 @@

1−:: gossip: data sharing with pals

1+:: gossip: data sharing with pals (and pals of pals, etc)

2+::

3+:: v1.1.1: sneaky whisper

2::

4::

3:: automates using /app/pals for peer & content discovery,

5:: automates using /app/pals for peer & content discovery,

4:: letting the underlying agent focus on handling the data.

6:: letting the underlying agent focus on handling the data.

5::

7::

6−:: at the time of writing, this library has not seen much real-world

7−:: use yet. it may be subject to behavioral or interface changes.

8−:: it tries its best to not generate obscene amounts of network load,

9−:: but has not yet proven itself in the real world.

10−:: for the time being, please tread carefully.

11−::

12:: usage

8:: usage

13::

9::

14:: to use this library, call its +agent arm with an initial

10:: to use this library, call its +agent arm with an initial

@@ -44,6 +40,10 @@

44:: setting hops to 1 distributes the data to direct pals only.

40:: setting hops to 1 distributes the data to direct pals only.

45:: setting hops to 0 prevents emission of any gossip data at all,

41:: setting hops to 0 prevents emission of any gossip data at all,

46:: even during initial subscription setup.

42:: even during initial subscription setup.

43+:: setting pass to true causes 50% of locally-originating data to be

44+:: proxied through a random "tell" peer. note that the proxy will have

45+:: a 50% chance of proxying in turn. for low amounts of hops, data could

46+:: escape the local social graph entirely.

47::

48:: (we introduce the /~/etc path prefix convention to indicate paths

49:: that are for library-specific use only.

@@ -75,6 +75,12 @@

75:: we may want to use pokes exclusively, instead of watches/facts,

76:: making it easier to exclude the src.bowl, include metadata, etc.

77::

78+:: we currently only emit every rumor as a fact once at most. but we might

79+:: receive it again later, with a higher hop count. if we want to try for

80+:: maximum reach within the given hops, we should re-send if we receive a

81+:: known rumor with higher hop counter. but this may not be worth the added

82+:: complexity...

83+::

78:: what if this was a userspace-infrastructure app instead of a wrapper?

84:: what if this was a userspace-infrastructure app instead of a wrapper?

79:: how would ensuring installation of this app-dependency work?

85:: how would ensuring installation of this app-dependency work?

80:: it gains us... a higher chance of peers having this installed.

86:: it gains us... a higher chance of peers having this installed.

@@ -93,6 +99,7 @@

93:: - if pals ever watch-nacks (it shouldn't), we try rewatching after ~m1.

99:: - if pals ever watch-nacks (it shouldn't), we try rewatching after ~m1.

94::

100::

95:: - for facts produced on /~/gossip/source, we

101:: - for facts produced on /~/gossip/source, we

102+:: - 50% chance to redirect into the "pass flow" (see below)

96:: - wrap them as %gossip-rumor to send them out on /~/gossip/gossip

103:: - wrap them as %gossip-rumor to send them out on /~/gossip/gossip

97:: - for new pals matching the hear mode, we watch their /~/gossip/gossip

104:: - for new pals matching the hear mode, we watch their /~/gossip/gossip

98:: - for gone pals, we leave that watch

105:: - for gone pals, we leave that watch

@@ -102,6 +109,16 @@

102:: - re-emit them as facts on /~/gossip/gossip if there are hops left

109:: - re-emit them as facts on /~/gossip/gossip if there are hops left

103:: - for nacks on those watches, we retry after ~m30

110:: - for nacks on those watches, we retry after ~m30

104::

111::

112+:: - other gossip instances may poke us with rumors directly

113+:: - the inner agent learns the rumor normally, as if it came from a fact

114+:: - based on randomness (50/50), we do one of two things:

115+:: - publish the rumor as a fact to our subscribers, like the above

116+:: - poke a randomly selected peer (in the "tell" set) with the rumor

117+:: - when poking, store the rumor until we receive a poke-ack

118+:: - upon receiving a positive poke-ack, delete the local datum

119+:: - upon receiving a negative poke-ack, do the 50/50 again

120+:: - if we do not receive a poke-ack within some time, do the 50/50 again

121+::

105/- pals

122/- pals

106/+ lp=pals, dbug, verb

123/+ lp=pals, dbug, verb

107::

124::

@@ -112,6 +129,8 @@

112 ==

129 ==

113+$ meta-0 hops=_0

130+$ meta-0 hops=_0

114::

131::

132++$ hash @uv

133+::

115+$ whos

134+$ whos

116 $? %anybody :: any ship discoverable through pals

135 $? %anybody :: any ship discoverable through pals

117 %targets :: any ship we've added as a pal

136 %targets :: any ship we've added as a pal

@@ -123,7 +142,11 @@

123 :: (1 hop is pals only, 0 stops exposing data at all)

142 :: (1 hop is pals only, 0 stops exposing data at all)

124 hear=whos :: who to subscribe to

143 hear=whos :: who to subscribe to

125 tell=whos :: who to allow subscriptions from

144 tell=whos :: who to allow subscriptions from

145+ pass=? :: whether to (50/50) emit data through proxy

126 ==

146 ==

147+::

148+++ pass-timeout ~s30

149+::

127++ invent

150++ invent

128 |= =cage

151 |= =cage

129 ^- card:agent:gall

152 ^- card:agent:gall

@@ -146,23 +169,27 @@

146 ^- $-(agent:gall agent:gall)

169 ^- $-(agent:gall agent:gall)

147 |^ agent

170 |^ agent

148 ::

171 ::

149− +$ state-0

172+ +$ state-3

150− $: %0

173+ $: %3

151− manner=config :: latest config

174+ manner=config :: latest config

152− memory=(set @uv) :: datums seen

175+ memory=(set hash) :: datums seen (by inner agent)

176+ shared=(set hash) :: datums shared (as fact)

177+ passed=(map hash [rumor @da]) :: pending relays & timeouts

178+ misses=(set ship) :: ships that won't relay

153− future=(list rumor) :: rumors of unknown kinds

179+ future=(list rumor) :: rumors of unknown kinds

154 ==

180 ==

155 ::

181 ::

156 +$ card card:agent:gall

182 +$ card card:agent:gall

157 ::

183 ::

158 ++ helper

184 ++ helper

159− |_ [=bowl:gall state-0]

185+ |_ [=bowl:gall state-3]

160 +* state +<+

186 +* state +<+

161 pals ~(. lp bowl)

187 pals ~(. lp bowl)

162 ++ en-cage

188 ++ en-cage

163 |= =(cask *)

189 |= =(cask *)

164 ^- cage

190 ^- cage

165 ?^ to=(~(get by grab) p.cask)

191 ?^ to=(~(get by grab) p.cask)

192+ ::TODO +soft or otherwise virtualize? don't want to risk crashes, right?

166 [p.cask (u.to q.cask)]

193 [p.cask (u.to q.cask)]

167 ~& [gossip+dap.bowl %no-mark p.cask]

194 ~& [gossip+dap.bowl %no-mark p.cask]

168 [%gossip-unknown !>(cask)]

195 [%gossip-unknown !>(cask)]

@@ -177,6 +204,10 @@

177 ~| [%en-rumor initial-hops=hops.manner]

204 ~| [%en-rumor initial-hops=hops.manner]

178 [%0 `meta-0`(dec hops.manner)]

205 [%0 `meta-0`(dec hops.manner)]

179 ::

206 ::

207+ ++ en-hash

208+ |= rumor

209+ (sham data)

210+ ::

180 ++ play-card :: en-rumor relevant facts, handle config changes

211 ++ play-card :: en-rumor relevant facts, handle config changes

181 |= =card

212 |= =card

182 ^- (quip ^card _state)

213 ^- (quip ^card _state)

@@ -211,11 +242,68 @@

211 ?> =(/~/gossip/source path)

242 ?> =(/~/gossip/source path)

212 :: if hops is configured at 0, we don't broadcast at all.

243 :: if hops is configured at 0, we don't broadcast at all.

213 ::

244 ::

214− =. memory (~(put in memory) (sham (de-cage cage.p.card)))

215− ?: =(0 hops.manner) [caz state]

216− =- [[- caz] state]

217 =/ =rumor (en-rumor cage.p.card)

245 =/ =rumor (en-rumor cage.p.card)

246+ =. memory (~(put in memory) (en-hash rumor))

247+ ?: =(0 hops.manner)

248+ [caz state]

249+ =^ cas state (emit-rumor rumor)

250+ [(weld cas caz) state]

251+ ::

252+ ++ emit-rumor :: gossip a rumor as-is

253+ |= =rumor

254+ ^- (quip card _state)

255+ =/ =hash (en-hash rumor)

256+ =* fact

218− card(paths.p [/~/gossip/gossip]~, cage.p [%gossip-rumor !>(rumor)])

257+ :- [%give %fact [/~/gossip/gossip]~ %gossip-rumor !>(rumor)]~

258+ %_ state

259+ passed (~(del by passed) hash)

260+ shared (~(put in shared) hash)

261+ ==

262+ :: if we don't want to proxy, always send as fact

263+ ::

264+ ?. pass.manner

265+ fact

266+ :: if we want to proxy, do so 50% of the time

267+ ::

268+ ?. =(0 (~(rad og eny.bowl) 2))

269+ fact

270+ :: if we're proxying, but there's no reasonable targets, send as fact

271+ ::

272+ =/ aides=(set ship)

273+ :: reasonable targets do not include ourselves, whoever

274+ :: caused us to want to (re)send this rumor, or ships that failed

275+ :: to proxy for us before.

276+ :: that last one is important because we need to avoid the mistake of

277+ :: occasionally sending them pokes that just linger in our outbound

278+ :: ames flows and keep retrying. (ideally we'd do those all pokes for

279+ :: a target on the same flow, but we really like storing information

280+ :: in the wire and don't want to do per-relay queues in state. we also

281+ :: don't particularly care about ordering guarantees for gossip.)

282+ :: we don't just get the set of ships with active incoming or outgoing

283+ :: subscriptions, because that constrains the set unnecessarily. for

284+ :: some configs, ships in .tell (that aren't in .hear) might be

285+ :: running the agent without actively listening to us.

286+ ::

287+ =- (~(dif in (~(del in (~(del in -) our.bowl)) src.bowl)) misses)

288+ ?- tell.manner

289+ %anybody (~(uni in (targets:pals ~.)) leeches:pals)

290+ %targets (targets:pals ~.)

291+ %mutuals (mutuals:pals ~.)

292+ ==

293+ =/ count=@ud ~(wyt in aides)

294+ ?: =(0 count)

295+ fact

296+ :: poke a randomly chosen proxy with the rumor

297+ ::

298+ =/ proxy=ship (snag (~(rad og +(eny.bowl)) count) ~(tap in aides))

299+ =/ =time (add now.bowl pass-timeout)

300+ =. passed (~(put by passed) hash [rumor time])

301+ :_ state

302+ =/ =wire /~/gossip/passed/(scot %p proxy)/(scot %uv hash)

303+ =/ =cage gossip-rumor+!>(rumor)

304+ :~ [%pass wire %agent [proxy dap.bowl] %poke cage]

305+ [%pass wire %arvo %b %wait time]

306+ ==

219 ::

307 ::

220 ++ play-cards

308 ++ play-cards

221 |= cards=(list card)

309 |= cards=(list card)

@@ -242,15 +330,18 @@

242 [%gossip-rumor !>((en-rumor cage.p.i.cards))]

330 [%gossip-rumor !>((en-rumor cage.p.i.cards))]

243 $(out (snoc out i.cards), cards t.cards)

331 $(out (snoc out i.cards), cards t.cards)

244 ::

332 ::

245− ++ resend-rumor

333+ ++ jump-rumor :: relay a rumor if we haven't yet

246 |= =rumor

334 |= =rumor

247− ^- (unit card)

335+ ^- (quip card _state)

336+ =/ =hash (en-hash rumor)

337+ ?: (~(has in shared) hash) [~ state]

248 ?> =(%0 kind.rumor) ::NOTE should have been checked for already

338 ?> =(%0 kind.rumor) ::NOTE should have been checked for already

249− ?~ meta=((soft ,hops=@ud) meta.rumor) ~

339+ ?~ meta=((soft ,hops=@ud) meta.rumor) [~ state]

250 =* hops hops.u.meta

340 =* hops hops.u.meta

251− ?: =(0 hops) ~

341+ ?: =(0 hops) [~ state]

252 =. meta.rumor (dec hops)

342 =. meta.rumor (dec hops)

253− `[%give %fact [/~/gossip/gossip]~ %gossip-rumor !>(rumor)]

343+ :- [%give %fact [/~/gossip/gossip]~ %gossip-rumor !>(rumor)]~

344+ state(shared (~(put in shared) (en-hash rumor)))

254 ::

345 ::

255 ++ may-watch

346 ++ may-watch

256 |= who=ship

347 |= who=ship

@@ -364,7 +455,7 @@

364 ::

455 ::

365 ++ agent

456 ++ agent

366 |= inner=agent:gall

457 |= inner=agent:gall

367− =| state-0

458+ =| state-3

368 =* state -

459 =* state -

369 %+ verb |

460 %+ verb |

370 %- agent:dbug

461 %- agent:dbug

@@ -382,22 +473,70 @@

382 =^ cards state (play-cards:up cards)

473 =^ cards state (play-cards:up cards)

383 [(weld watch-pals:up cards) this]

474 [(weld watch-pals:up cards) this]

384 ::

475 ::

385− ++ on-save !>([[%gossip state] on-save:og])

476+ ++ on-save (slop !>([%gossip state]) on-save:og)

386 ++ on-load

477 ++ on-load

387 |= ole=vase

478 |= ole=vase

388 ^- (quip card _this)

479 ^- (quip card _this)

389 ?. ?=([[%gossip *] *] q.ole)

480 ?. ?=([[%gossip *] *] q.ole)

390 =. manner init

481 =. manner init

391− =^ cards inner (on-load:og ole)

482+ =^ cards inner (on-load:og ole)

392 =^ cards state (play-cards:up cards)

483 =^ cards state (play-cards:up cards)

393 [(weld watch-pals:up cards) this]

484 [(weld watch-pals:up cards) this]

394 ::

485 ::

395− =+ !<([[%gossip old=state-0] ile=vase] ole)

486+ |^ =+ !<([%gossip old=state-any] (slot 2 ole))

487+ =/ ile=vase (slot 3 ole)

488+ =? old ?=(%0 -.old) (state-0-to-1 old)

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

490+ :: before version 3, we stored the inner +on-save vase inside

491+ :: our own +on-save vase. undoing this double-vasing coincided

492+ :: with the h135 type-of-type upgrade.

493+ ::

494+ =? ile ?=(%2 -.old) (next-vase:h136 !<(vase:h136 ile))

495+ =? old ?=(%2 -.old) (state-2-to-3 old)

496+ ?> ?=(%3 -.old)

396− =. state old

497+ =. state old

397− =^ cards inner (on-load:og ile)

498+ =^ cards inner (on-load:og ile)

398− =^ cards state (play-cards:up cards)

499+ =^ cards state (play-cards:up cards)

399− ::TODO for later versions, add :future retry logic as needed

500+ ::TODO for later versions, add :future retry logic as needed

400− [cards this]

501+ [cards this]

502+ ::

503+ +$ state-any $%(state-0 state-1 state-2 state-3)

504+ ::

505+ +$ state-2

506+ $: %2

507+ manner=config

508+ memory=(set hash)

509+ shared=(set hash)

510+ passed=(map hash [rumor @da])

511+ misses=(set ship)

512+ future=(list rumor)

513+ ==

514+ ++ state-2-to-3

515+ |=(s=state-2 s(- %3))

516+ ::

517+ +$ state-1

518+ $: %1

519+ manner=config

520+ memory=(set hash)

521+ shared=(set hash)

522+ passed=(map hash [rumor @da])

523+ future=(list rumor)

524+ ==

525+ ++ state-1-to-2

526+ |= state-1

527+ [%2 manner memory shared passed ~ future]

528+ ::

529+ +$ state-0 [%0 manner=config-0 memory=(set hash) future=(list rumor)]

530+ +$ config-0 [hops=_1 hear=whos tell=whos]

531+ ++ state-0-to-1

532+ |= state-0

533+ ^- state-1

534+ [%1 (config-0-to-1 manner) memory memory ~ future]

535+ ++ config-0-to-1

536+ |= config-0

537+ ^- config

538+ [hops hear tell pass.init]

539+ --

401 ::

540 ::

402 ++ on-watch

541 ++ on-watch

403 |= =path

542 |= =path

@@ -414,13 +553,43 @@

414 =^ cards state (play-first-cards:up cards)

553 =^ cards state (play-first-cards:up cards)

415 [cards this]

554 [cards this]

416 ::

555 ::

556+ ++ on-poke

557+ |= [=mark =vase]

558+ ^- (quip card _this)

559+ ::TODO gossip config pokes

560+ ?. =(%gossip-rumor mark)

561+ =^ cards inner (on-poke:og +<)

562+ =^ cards state (play-cards:up cards)

563+ [cards this]

564+ ?. (want-target:up src.bowl)

565+ ~|(%gossip-rejected !!)

566+ :: we're getting pokes from them, so we should try relaying through

567+ :: them again if we stopped doing so

568+ ::NOTE this only ever cleans out .misses for ships producing content

569+ ::

570+ =. misses (~(del in misses) src.bowl)

571+ ::TODO dedupe with +on-agent %fact

572+ =+ !<(=rumor vase)

573+ =/ =hash (en-hash:up rumor)

574+ ?: (~(has in memory) hash)

575+ [~ this]

576+ ?. =(%0 kind.rumor)

577+ ~& [gossip+dap.bowl %delaying-unknown-rumor-kind kind.rumor]

578+ [~ this(future [rumor future])]

579+ =. memory (~(put in memory) hash)

580+ =/ mage=cage (en-cage:up data.rumor)

581+ =^ cards inner (on-agent:og /~/gossip/gossip %fact mage)

582+ =^ caz1 state (play-cards:up cards)

583+ =^ caz2 state (emit-rumor:up rumor)

584+ [(weld caz1 caz2) this]

585+ ::

417 ++ on-agent

586 ++ on-agent

418 |= [=wire =sign:agent:gall]

587 |= [=wire =sign:agent:gall]

419 ^- (quip card _this)

588 ^- (quip card _this)

420 ?. ?=([%~.~ %gossip *] wire)

589 ?. ?=([%~.~ %gossip *] wire)

421 =^ cards inner (on-agent:og wire sign)

590 =^ cards inner (on-agent:og wire sign)

422 =^ cards state (play-cards:up cards)

591 =^ cards state (play-cards:up cards)

423− [cards this]

592+ [cards this]

424 ::

593 ::

425 ?+ t.t.wire ~|([%gossip %unexpected-wire wire] !!)

594 ?+ t.t.wire ~|([%gossip %unexpected-wire wire] !!)

426 [%gossip @ ~]

595 [%gossip @ ~]

@@ -433,18 +602,26 @@

433 ?. =(%gossip-rumor mark)

602 ?. =(%gossip-rumor mark)

434 ~& [gossip+dap.bowl %ignoring-unexpected-fact mark=mark]

603 ~& [gossip+dap.bowl %ignoring-unexpected-fact mark=mark]

435 [~ this]

604 [~ this]

605+ :: we're getting facts from them, so we should try relaying through

606+ :: them again if we stopped doing so

607+ ::NOTE this only ever cleans out .misses for ships in .hear

608+ ::

609+ =. misses (~(del in misses) src.bowl)

610+ ::TODO de-dupe with +on-poke

436 =+ !<(=rumor vase)

611 =+ !<(=rumor vase)

437− =/ hash (sham data.rumor)

612+ =/ =hash (en-hash:up rumor)

438 ?: (~(has in memory) hash)

613 ?: (~(has in memory) hash)

614+ =^ cards state (jump-rumor:up rumor)

439− [~ this]

615+ [cards this]

440 ?. =(%0 kind.rumor)

616 ?. =(%0 kind.rumor)

441 ~& [gossip+dap.bowl %delaying-unknown-rumor-kind kind.rumor]

617 ~& [gossip+dap.bowl %delaying-unknown-rumor-kind kind.rumor]

442 [~ this(future [rumor future])]

618 [~ this(future [rumor future])]

619+ =. memory (~(put in memory) hash)

443 =/ mage=cage (en-cage:up data.rumor)

620 =/ mage=cage (en-cage:up data.rumor)

444 =^ cards inner (on-agent:og /~/gossip/gossip sign(cage mage))

621 =^ cards inner (on-agent:og /~/gossip/gossip sign(cage mage))

445− =^ cards state (play-cards:up cards)

622+ =^ caz1 state (play-cards:up cards)

446− :_ this(memory (~(put in memory) hash))

623+ =^ caz2 state (jump-rumor:up rumor)

447− (weld (drop (resend-rumor:up rumor)) cards)

624+ [(weld caz1 caz2) this]

448 ::

625 ::

449 %watch-ack

626 %watch-ack

450 :_ this

627 :_ this

@@ -471,6 +648,32 @@

471 ~& [gossip+dap.bowl %unexpected-poke-ack wire]

648 ~& [gossip+dap.bowl %unexpected-poke-ack wire]

472 [~ this]

649 [~ this]

473 ==

650 ==

651+ ::

652+ [%passed ?([@ ~] [@ @ ~])]

653+ ?. ?=(%poke-ack -.sign)

654+ ~& [gossip+dap.bowl %unexpected-sign wire -.sign]

655+ [~ this]

656+ ~| t.t.wire

657+ :: regardless of anything else: if they acked the poke, they are

658+ :: accepting of relay requests, if they nacked they're unaccepting

659+ ::

660+ =. misses

661+ ?: ?=(~ p.sign)

662+ (~(del in misses) src.bowl)

663+ (~(put in misses) src.bowl)

664+ =/ =hash

665+ ?: ?=([@ ~] t.t.t.wire)

666+ (slav %uv i.t.t.t.wire)

667+ (slav %uv i.t.t.t.t.wire)

668+ ?~ rum=(~(get by passed) hash)

669+ [~ this]

670+ ::NOTE emitting rest is cute, but doesn't actually work reliably,

671+ :: due to userspace duct shenanigans. %wake logic will have to

672+ :: be defensive...

673+ =/ rest=card [%pass wire %arvo %b %rest +.u.rum]

674+ ?~ p.sign [[rest]~ this(passed (~(del by passed) hash))]

675+ =^ caz state (emit-rumor:up -.u.rum)

676+ [[rest caz] this]

474 ::

677 ::

475 [%pals @ ~]

678 [%pals @ ~]

476 ?- -.sign

679 ?- -.sign

@@ -542,6 +745,14 @@

542 ++ on-peek

745 ++ on-peek

543 |= =path

746 |= =path

544 ^- (unit (unit cage))

747 ^- (unit (unit cage))

748+ ?: =(/x/whey path)

749+ :+ ~ ~

750+ :- %mass

751+ !> ^- (list mass)

752+ :- %gossip^&+state

753+ =/ dat (on-peek:og path)

754+ ?: ?=(?(~ [~ ~]) dat) ~

755+ (fall ((soft (list mass)) q.q.u.u.dat) ~)

545 ?: =(/x/dbug/state path)

756 ?: =(/x/dbug/state path)

546 ``noun+(slop on-save:og !>(gossip=state))

757 ``noun+(slop on-save:og !>(gossip=state))

547 ?. ?=([@ %~.~ %gossip *] path)

758 ?. ?=([@ %~.~ %gossip *] path)

@@ -560,14 +771,6 @@

560 =^ cards state (play-cards:up cards)

771 =^ cards state (play-cards:up cards)

561 [cards this]

772 [cards this]

562 ::

773 ::

563− ++ on-poke

564− |= cage

565− ^- (quip card _this)

566− ::TODO gossip config pokes?

567− =^ cards inner (on-poke:og +<)

568− =^ cards state (play-cards:up cards)

569− [cards this]

570− ::

571 ++ on-arvo

774 ++ on-arvo

572 |= [=wire sign=sign-arvo:agent:gall]

775 |= [=wire sign=sign-arvo:agent:gall]

573 ^- (quip card _this)

776 ^- (quip card _this)

@@ -575,19 +778,41 @@

575 =^ cards inner (on-arvo:og wire sign)

778 =^ cards inner (on-arvo:og wire sign)

576 =^ cards state (play-cards:up cards)

779 =^ cards state (play-cards:up cards)

577 [cards this]

780 [cards this]

578− ?> ?=([%retry *] t.t.wire)

579− ?> ?=(%wake +<.sign)

580− ?+ t.t.t.wire ~|(wire !!)

781+ ?+ t.t.wire ~|(wire !!)

581− [%pals *]

782+ [%passed ?([@ ~] [@ @ ~])]

582− ::NOTE this might result in subscription wire re-use,

783+ =/ =hash

583− :: but if we hit this path we should be loud anyway.

784+ ?: ?=([@ ~] t.t.t.wire)

584− [watch-pals:up this]

785+ (slav %uv i.t.t.t.wire)

786+ (slav %uv i.t.t.t.t.wire)

787+ ?~ rum=(~(get by passed) hash) [~ this]

788+ :: since timer cancellation isn't fully reliable, this timer fire

789+ :: might be from a relay that nacked our poke. if the timer fired

790+ :: earlier than expected, assume that to be the case and no-op.

791+ ::

792+ ?: (gth +.u.rum now.bowl) [~ this]

793+ :: they failed to respond to our relay request in time, mark them as

794+ :: unaccepting (if we know who they are from a the new-style wire)

795+ :: and try sending the rumor again

796+ ::

797+ =? misses ?=([@ @ ~] t.t.t.wire)

798+ (~(put in misses) (slav %p i.t.t.t.wire))

799+ =^ cards state (emit-rumor:up -.u.rum)

800+ [cards this]

585 ::

801 ::

802+ [%retry *]

803+ ?> ?=(%wake +<.sign)

804+ ?+ t.t.t.wire ~|(wire !!)

805+ [%pals *]

806+ ::NOTE this might result in subscription wire re-use,

807+ :: but if we hit this path we should be loud anyway.

808+ [watch-pals:up this]

809+ ::

586− [%watch @ ~]

810+ [%watch @ ~]

587− :_ this

811+ :_ this

588− =/ target=ship (slav %p i.t.t.t.t.wire)

812+ =/ target=ship (slav %p i.t.t.t.t.wire)

589− ?. (want-target:up target) ~

813+ ?. (want-target:up target) ~

590− (watch-target:up target)

814+ (watch-target:up target)

815+ ==

591 ==

816 ==

592 ::

817 ::

593 ++ on-fail

818 ++ on-fail

@@ -598,4 +823,4 @@

598 [cards this]

823 [cards this]

599 --

824 --

600 --

825 --

601−--

826+--

desk/lib/pals.hoon+8−2

@@ -1,6 +1,9 @@

1:: pals: manual peer discovery

2::

3+/- *pals

4+::

3|_ bowl:gall

5|_ bowl:gall

6+++ records (s ^records /)

4++ leeches (s (set ship) /leeches)

7++ leeches (s (set ship) /leeches)

5++ targets |= list=@ta (s (set ship) %targets ?~(list / /[list]))

8++ targets |= list=@ta (s (set ship) %targets ?~(list / /[list]))

6++ mutuals |= list=@ta (s (set ship) %mutuals ?~(list / /[list]))

9++ mutuals |= list=@ta (s (set ship) %mutuals ?~(list / /[list]))

@@ -8,8 +11,11 @@

8++ target |= [list=@ta =ship] (s _| /mutuals/[list]/(scot %p ship))

11++ target |= [list=@ta =ship] (s _| /mutuals/[list]/(scot %p ship))

9++ mutual |= [list=@ta =ship] (s _| /mutuals/[list]/(scot %p ship))

12++ mutual |= [list=@ta =ship] (s _| /mutuals/[list]/(scot %p ship))

10::

13::

14+++ labels ?. running `(set @ta)`~

15+ ~(key by dir:.^(arch %gy (snoc base %targets)))

16+::

11−++ base ~+ /(scot %p our)/pals/(scot %da now)

17+++ base ~+ `path`/(scot %p our)/pals/(scot %da now)

12−++ running ~+ .^(? %gu base)

18+++ running ~+ .^(? %gu (snoc base %$))

13::

19::

14++ s

20++ s

15 |* [=mold =path] ~+

21 |* [=mold =path] ~+

desk/lib/sphinx-json.hoon+6−4

@@ -26,10 +26,12 @@

26 |= =search:s

27 %- pairs

28 :~ listings/a/(turn listings.search listing)

29+ :: numb, not (scot %ud): 1.234 would be read as a fraction

30+ ::

29− start/n/(scot %ud start.search)

31+ start/(numb start.search)

30− limit/n/(scot %ud limit.search)

32+ limit/(numb limit.search)

31− size/n/(scot %ud size.search)

33+ size/(numb size.search)

32− total/n/(scot %ud total.search)

34+ total/(numb total.search)

33 ==

35 ==

34 ++ directory

36 ++ directory

35 |= d=directory:s

37 |= d=directory:s

desk/lib/sphinx.hoon+30−18

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

47 %+ turn

48 entries

49 |=(=entry hash.entry)

50+:: +lengths-valid: bounds on what a peer can send, checked before

51+:: anything is indexed

52+::

53+:: source and time aren't in the digest, so a peer picks them too:

54+:: +time:enjs crashes before 1970, and rendering a huge atom is

55+:: quadratic

56+::

50++ lengths-valid

57++ lengths-valid

51 |= l=listing

58 |= l=listing

52− ?& (lte (lent (trip title.post.l)) 77)

59+ ?& (lte (met 3 title.post.l) 77)

53− (lte (lent (trip description.post.l)) 256)

60+ (lte (met 3 description.post.l) 256)

54 (lte (lent tags.post.l) 8)

61 (lte (lent tags.post.l) 8)

62+ (levy tags.post.l |=(tag=@t (lte (met 3 tag) 1.024)))

55− (lte (lent (trip link.post.l)) 1.024)

63+ (lte (met 3 link.post.l) 1.024)

56− (lte (lent (trip image.post.l)) 1.024)

64+ (lte (met 3 image.post.l) 1.024)

65+ (lte (met 3 color.post.l) 1.024)

66+ (lte (met 3 source.l) 16)

67+ (gte time.l ~1970.1.1)

68+ (lth time.l ~275000.1.1)

57 ==

69 ==

58++ urls-valid

70++ urls-valid

59 |= l=listing

71 |= l=listing

@@ -64,13 +76,9 @@

64 &(!=(image ~) !=(link ~))

76 &(!=(image ~) !=(link ~))

65++ listing-valid

77++ listing-valid

66 |= l=listing

78 |= l=listing

67− =/ lengths (lengths-valid l)

79+ :: lengths first: don't parse urls of oversized listings

68− =/ urls (urls-valid l)

80+ ::

69− :: ~& title.post.l

70− :: ~& hash.l

71− :: ~& ['urls' ?:(urls 'valid' 'invalid')]

72− :: ~& ['lengths' ?:(lengths 'valid' 'invalid')]

73− &(lengths urls)

81+ &((lengths-valid l) (urls-valid l))

74++ delver

82++ delver

75 |_ [=lookup =trigrams =phonetics =trail]

83 |_ [=lookup =trigrams =phonetics =trail]

76 ++ get

84 ++ get

@@ -88,8 +96,11 @@

88 (sift:sift description.post.l)

96 (sift:sift description.post.l)

89 |= word=@t

97 |= word=@t

90 [word ~[[hash rank=8]]]

98 [word ~[[hash rank=8]]]

99+ :: +iching is quadratic in the length of a key, so long

100+ :: tags aren't indexed

101+ ::

91 %+ turn

102 %+ turn

92− tags.post.l

103+ (skim tags.post.l |=(tag=@t (lte (met 3 tag) 64)))

93 |= tag=@t

104 |= tag=@t

94 [(norm:sift tag) ~[[hash rank=12]]]

105 [(norm:sift tag) ~[[hash rank=12]]]

95 %+ turn

106 %+ turn

@@ -100,12 +111,13 @@

100 ==

111 ==

101 =/ keys ~(tap in ~(key by entries))

112 =/ keys ~(tap in ~(key by entries))

102 =. trail (~(put by trail) hash keys)

113 =. trail (~(put by trail) hash keys)

103− =. lookup

114+ :: only touch the new keys: rebuilding the whole map for every

104− %- ~(uni by entries)

115+ :: listing made cataloging a directory quadratic

105− %- ~(rut by lookup)

116+ ::

117+ =. lookup

118+ %+ roll ~(tap by entries)

106− |= [=key value=(list entry)]

119+ |= [[=key value=(list entry)] lok=_lookup]

107− ?. (~(has by entries) key) value

108− (weld value (~(got by entries) key))

120+ (~(put by lok) key (weld value (~(gut by lok) key ~)))

109 =. trigrams

121 =. trigrams

110 %+ roll

122 %+ roll

111 %+ snoc

123 %+ snoc

desk/sys.kelvin+1−4

@@ -1,4 +1 @@

1−[%zuse 417]

1+[%zuse 408]

2−[%zuse 416]

3−[%zuse 415]

4−[%zuse 414]

flake.locknew file+63

@@ -0,0 +1,63 @@

1+{

2+ "nodes": {

3+ "landscape": {

4+ "flake": false,

5+ "locked": {

6+ "lastModified": 1781809440,

7+ "narHash": "sha256-woNZKzK8xlBxnMMrQOzInA7+gGxs7BgjGbmTi7OGi6g=",

8+ "owner": "tloncorp",

9+ "repo": "landscape",

10+ "rev": "3ea2679f2003ed3ca1a6b322cd7857a774eac305",

11+ "type": "github"

12+ },

13+ "original": {

14+ "owner": "tloncorp",

15+ "repo": "landscape",

16+ "rev": "3ea2679f2003ed3ca1a6b322cd7857a774eac305",

17+ "type": "github"

18+ }

19+ },

20+ "nixpkgs": {

21+ "locked": {

22+ "lastModified": 1792210252,

23+ "narHash": "sha256-Mh0PUaIv4nFY+8wAGonaEh8iBzwsmdNlwjVHmFg1Biw=",

24+ "owner": "NixOS",

25+ "repo": "nixpkgs",

26+ "rev": "09063bd1f2b36fd9fd793c36dfade7bd40a93dfc",

27+ "type": "github"

28+ },

29+ "original": {

30+ "owner": "NixOS",

31+ "ref": "nixos-unstable",

32+ "repo": "nixpkgs",

33+ "type": "github"

34+ }

35+ },

36+ "root": {

37+ "inputs": {

38+ "landscape": "landscape",

39+ "nixpkgs": "nixpkgs",

40+ "urbit": "urbit"

41+ }

42+ },

43+ "urbit": {

44+ "flake": false,

45+ "locked": {

46+ "lastModified": 1785851358,

47+ "narHash": "sha256-eHoGwqirk7zMpOn/y8dKqozz5IiQ7nqek/ypxIOaRiU=",

48+ "owner": "urbit",

49+ "repo": "urbit",

50+ "rev": "5a187fededc4582a34fcd6055c67bb63e0917b94",

51+ "type": "github"

52+ },

53+ "original": {

54+ "owner": "urbit",

55+ "ref": "408k-2",

56+ "repo": "urbit",

57+ "type": "github"

58+ }

59+ }

60+ },

61+ "root": "root",

62+ "version": 7

63+}

flake.nixnew file+98

@@ -0,0 +1,98 @@

1+{

2+ description = "sphinx desk";

4+ inputs = {

5+ nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";

7+ # Dependency desks. Keep them on releases for the kelvin in

8+ # desk/sys.kelvin ([%zuse 408]) and bump them together with it.

9+ urbit = {

10+ # release tag for [%zuse 408]

11+ url = "github:urbit/urbit/408k-2";

12+ flake = false;

13+ };

14+ landscape = {

15+ # No 408 tag: the staging head Tlon promoted on 2026-06-18, whose

16+ # desk/sys.kelvin lists [%zuse 410] [%zuse 409] [%zuse 408].

17+ url = "github:tloncorp/landscape/3ea2679f2003ed3ca1a6b322cd7857a774eac305";

18+ flake = false;

19+ };

20+ };

21+

22+ outputs =

23+ {

24+ self,

25+ nixpkgs,

26+ urbit,

27+ landscape,

28+ }:

29+ let

30+ forAllSystems = nixpkgs.lib.genAttrs nixpkgs.lib.systems.flakeExposed;

31+

32+ # Only what ./desk needs from the dependency desks: its imports,

33+ # transitively, and the marks for its file types plus json and mime.

34+ # 408 clay builds every mark on the desk at each commit and OTA, and one

35+ # that fails to build rejects the whole event, so extra marks are a

36+ # liability.

37+ basePicks = [

38+ "lib/dbug.hoon"

39+ "lib/default-agent.hoon"

40+ "lib/skeleton.hoon"

41+ "lib/strand.hoon"

42+ "lib/strandio.hoon"

43+ "lib/verb.hoon"

44+ "sur/spider.hoon"

45+ "sur/verb.hoon"

46+ "mar/bill.hoon"

47+ "mar/hoon.hoon"

48+ "mar/json.hoon"

49+ "mar/kelvin.hoon"

50+ "mar/mime.hoon"

51+ "mar/noun.hoon"

52+ "mar/txt.hoon"

53+ ];

54+ # desk.docket-0 needs mar/docket-0, which imports lib/docket and

55+ # sur/docket.

56+ docketPicks = [

57+ "lib/docket.hoon"

58+ "mar/docket-0.hoon"

59+ "sur/docket.hoon"

60+ ];

61+ in

62+ {

63+ packages = forAllSystems (

64+ system:

65+ let

66+ pkgs = nixpkgs.legacyPackages.${system};

67+ in

68+ {

69+ # The picks, then ./desk on top. -L copies symlink targets, so the

70+ # desk is plain files.

71+ desk = pkgs.runCommandLocal "sphinx-desk" { } ''

72+ mkdir $out

73+ for f in ${toString basePicks}; do

74+ install -Dm644 ${urbit}/pkg/base-dev/$f $out/$f

75+ done

76+ for f in ${toString docketPicks}; do

77+ install -Dm644 ${landscape}/desk-dev/$f $out/$f

78+ done

79+ cp -RL ${./desk}/. $out

80+ '';

81+ # The UI files, served under /apps/sphinx/. Upload this directory at

82+ # /docket/upload on the ship in desk/desk.docket-0's glob-ames.

83+ glob = pkgs.buildNpmPackage {

84+ name = "sphinx-glob";

85+ src = ./ui;

86+ nodejs = pkgs.nodejs_22;

87+ npmDepsHash = "sha256-uOUDkt0spCWdlOfto5Y3o5R9PP6oeYmGMcwUjEdzC/M=";

88+ installPhase = ''

89+ runHook preInstall

90+ cp -R dist $out

91+ runHook postInstall

92+ '';

93+ };

94+ default = self.packages.${system}.desk;

95+ }

96+ );

97+ };

98+}

ui/.nvmrc+1−1

@@ -1 +1 @@

1−18.16.0

1+22

ui/index.html+1−1

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

8 <link rel="icon" href="/src/assets/favicon.svg" sizes="any" type="image/svg+xml" />

9 <link rel="mask-icon" href="/src/assets/safari-pinned-tab.svg" color="#000000" />

10 <link rel="apple-touch-icon" sizes="180x180" href="/src/assets/apple-touch-icon.png" />

11− <link rel="manifest" href="/src/assets/manifest.json" />

11+ <link rel="manifest" href="/manifest.json" />

12 </head>

13 <body class="font-sans text-mauve bg-linen antialiased">

14 <div id="app"></div>

ui/package-lock.json+1

@@ -26,6 +26,7 @@

26 "react-router-dom": "^6.3.0",

27 "react-select": "^5.4.0",

28 "remove-markdown-and-html": "^0.1.0",

29+ "urbit-ob": "^5.0.1",

29 "zustand": "^4.0.0-rc.1"

30 "zustand": "^4.0.0-rc.1"

30 },

31 },

31 "devDependencies": {

32 "devDependencies": {

ui/package.json+1

@@ -28,6 +28,7 @@

28 "react-router-dom": "^6.3.0",

29 "react-select": "^5.4.0",

30 "remove-markdown-and-html": "^0.1.0",

31+ "urbit-ob": "^5.0.1",

31 "zustand": "^4.0.0-rc.1"

32 "zustand": "^4.0.0-rc.1"

32 },

33 },

33 "devDependencies": {

34 "devDependencies": {

ui/src/assets/android-chrome-512x512.png → ui/public/android-chrome-512x512.pngrenamed

Binary file not shown.

ui/src/assets/manifest.json → ui/public/manifest.jsonrenamed+1−1

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

3 "short_name": "sphinx",

4 "icons": [

5 {

6− "src": "/apps/grid/android-chrome-512x512.png",

6+ "src": "/apps/sphinx/android-chrome-512x512.png",

7 "sizes": "512x512",

8 "type": "image/png"

9 }

ui/src/api.ts+6

@@ -3,4 +3,10 @@ import Urbit from "@urbit/http-api";

3const api = new Urbit('', '', window.desk);

4api.ship = window.ship;

6+// @urbit/http-api 2.x adds `window.addEventListener('beforeunload', this.delete)`

7+// unbound, so its beacon is sent to `${location dir}/undefined` (404) and the

8+// channel is left open until eyre's 12h timeout. Replace it with a bound one.

9+window.removeEventListener('beforeunload', api.delete);

10+window.addEventListener('beforeunload', () => api.delete());

11+

6export default api;

12export default api;

ui/src/components/Listing.tsx+6−6

@@ -3,7 +3,7 @@ import { deSig } from '@urbit/api';

3import React from 'react';

4import { ListingImage } from './ListingImage';

5import { Listing as ListingType } from '../types/sphinx';

6−import { normalizeLink, refToURL } from '../utils';

6+import { channelURL, normalizeLink, refToURL } from '../utils';

7import { Pals } from '../state/pals';

8import { ChannelPreview } from '../types';

9import { useChannelPreview } from '../state/groups';

@@ -19,14 +19,14 @@ function getURL(link: string | { nest: string, where: string }, preview?: Channe

19 return link;

20 }

22− const prefix = `/apps/groups`;

22+ // Tlon routes channels under their group, which only the preview knows.

23− const suffix = `/${link.nest}/${link.where}`

23+ // A post deep link (post/:authorId/:postId) would also need the author,

24−

24+ // which listing refs don't carry, so link to the post's channel.

25 if (!preview) {

26− return `${prefix}/1/chan${suffix}`;

26+ return '/apps/groups/';

27 }

29− return `${prefix}/groups/${preview.group.flag}/channels${suffix}`;

29+ return channelURL(preview.group.flag, link.nest);

30}

32export const Listing = ({ hash, time, source, post, remove, removePal, outgoing }: ListingProps) => {

ui/src/components/ListingImage.tsx+3−3

@@ -1,6 +1,6 @@

1−import { uxToHex } from '@urbit/api';

2import cn from 'classnames';

1import cn from 'classnames';

3import React from 'react';

2import React from 'react';

3+import { normalizeColor } from '../utils';

5interface ListingImageProps {

6 image: string;

@@ -15,12 +15,12 @@ export const ListingImage = ({ image, color, className, imageClasses, colorClass

15 <img

16 src={image}

17 className={cn('object-cover', className, imageClasses)}

18− style={{ backgroundColor: color ? `#${uxToHex(color)}` : undefined }}

18+ style={{ backgroundColor: color ? normalizeColor(color) : undefined }}

19 />

20 ) : (

21 <div

22 className={cn('bg-rosy/20', className, colorClasses)}

23− style={{ backgroundColor: color ? `#${uxToHex(color)}` : undefined }}

23+ style={{ backgroundColor: color ? normalizeColor(color) : undefined }}

24 />

25 )

26}

ui/src/components/Meta.tsx+4−2

@@ -3,6 +3,8 @@ import React, { useEffect, useState } from 'react';

3import api from '../api';

4import { Logo } from './Logo';

6+const SOURCE = 'github.com/iko-soy/sphinx';

6interface MetaProps {

8interface MetaProps {

7 className?: string;

9 className?: string;

10}

@@ -30,9 +32,9 @@ export const Meta = ({ className }: MetaProps) => {

30 </div>

32 </div>

31 <a

33 <a

32 className="inline-block font-mono default-ring underline rounded-md hover:text-rosy"

34 className="inline-block font-mono default-ring underline rounded-md hover:text-rosy"

33− href="web+urbitgraph://group/~nocsyx-lassul/sphinx"

35+ href={`https://${SOURCE}`}

34 >

36 >

35− ~nocsyx-lassul/sphinx

37+ {SOURCE}

36 </a>

38 </a>

37 </footer>

39 </footer>

38 )

40 )

ui/src/components/TagField.tsx+67−54

@@ -3,6 +3,7 @@ import React, { Component, KeyboardEventHandler, useCallback, useState } from 'r

3import CreatableSelect from 'react-select/creatable';

4import { ActionMeta, components, ControlProps, MultiValue, MultiValueGenericProps, MultiValueRemoveProps, OnChangeValue } from 'react-select';

5import { XIcon } from '@heroicons/react/solid';

6+import { MAX_TAG_BYTES, MAX_TAGS, byteLength } from '../utils';

7export interface Option {

8export interface Option {

8 readonly label: string;

9 readonly label: string;

@@ -81,64 +82,76 @@ export const TagField = ({ tags, onTags, className }: TagFieldProps) => {

81 switch (event.key) {

82 switch (event.key) {

82 case 'Enter':

83 case 'Enter':

83 case 'Tab':

84 case 'Tab':

84− setInput('');

85+ // %sphinx drops listings with more than 8 tags and doesn't index

85− onTags([...tags, createOption(input)])

86+ // longer tags, so keep the input; Tab still moves on

87+ if (tags.length >= MAX_TAGS || byteLength(input) > MAX_TAG_BYTES) {

88+ if (event.key === 'Enter') event.preventDefault();

89+ return;

90+ }

91+

86 event.preventDefault();

92 event.preventDefault();

93+ setInput('');

94+ if (!tags.some(t => t.value === input)) {

95+ onTags([...tags, createOption(input)])

96+ }

87 }

97 }

88 }, [input, tags]);

98 }, [input, tags]);

90 return (

100 return (

101+ <div className={className}>

91− <CreatableSelect<Option, true>

102+ <CreatableSelect<Option, true>

92− className={className}

93− components={{

103+ components={{

94− ...components,

104+ ...components,

95− Control,

105+ Control,

96− MultiValueContainer: TagContainer,

106+ MultiValueContainer: TagContainer,

97− MultiValueLabel: TagLabel,

107+ MultiValueLabel: TagLabel,

98− MultiValueRemove: TagRemove,

108+ MultiValueRemove: TagRemove,

99− DropdownIndicator: null

109+ DropdownIndicator: null

100− }}

110+ }}

101− styles={{

111+ styles={{

102− control: (base) => ({}),

112+ control: (base) => ({}),

103− input: (base) => ({

113+ input: (base) => ({

104− ...base,

114+ ...base,

105− padding: 0,

115+ padding: 0,

106− margin: 0,

116+ margin: 0,

107− }),

117+ }),

108− clearIndicator: (base) => ({

118+ clearIndicator: (base) => ({

109− ...base,

119+ ...base,

110− cursor: 'pointer',

120+ cursor: 'pointer',

111− padding: 0

121+ padding: 0

112− }),

122+ }),

113− multiValue: (base) => ({

123+ multiValue: (base) => ({

114− ...base,

124+ ...base,

115− backgroundColor: '',

125+ backgroundColor: '',

116− margin: '0 2px',

126+ margin: '0 2px',

117− }),

127+ }),

118− multiValueRemove: (base) => ({

128+ multiValueRemove: (base) => ({

119− ...base,

129+ ...base,

120− paddingRight: '',

130+ paddingRight: '',

121− paddingLeft: '',

131+ paddingLeft: '',

122− '&:hover': {

132+ '&:hover': {

123− color: 'inherit',

133+ color: 'inherit',

124− backgroundColor: 'inherit',

134+ backgroundColor: 'inherit',

125− },

135+ },

126− }),

136+ }),

127− valueContainer: (base) => ({

137+ valueContainer: (base) => ({

128− ...base,

138+ ...base,

129− padding: 0

139+ padding: 0

130− })

140+ })

131− }}

141+ }}

132− isOptionDisabled={() => tags.length >= 8}

142+ isOptionDisabled={() => tags.length >= MAX_TAGS}

133− inputValue={input}

143+ inputValue={input}

134− isClearable

144+ isClearable

135− isMulti

145+ isMulti

136− menuIsOpen={false}

146+ menuIsOpen={false}

137− onChange={handleChange}

147+ onChange={handleChange}

138− onInputChange={handleInputChange}

148+ onInputChange={handleInputChange}

139− onKeyDown={handleKeyDown}

149+ onKeyDown={handleKeyDown}

140− placeholder="Type something and press enter..."

150+ placeholder="Type something and press enter..."

141− value={tags}

151+ value={tags}

142− />

152+ />

153+ {byteLength(input) > MAX_TAG_BYTES && <div className='text-mauve/50 text-xs mt-1'>{MAX_TAG_BYTES} bytes per tag maximum</div>}

154+ {tags.length >= MAX_TAGS && <div className='text-mauve/50 text-xs mt-1'>{MAX_TAGS} tags maximum</div>}

155+ </div>

143 );

156 );

144}

157}

ui/src/env.d.ts+4

@@ -8,4 +8,8 @@ interface ImportMeta {

9declare module 'remove-markdown-and-html' {

10 export default function removeMd(input: string): string;

11+}

12+

13+declare module 'urbit-ob' {

14+ export function isValidPatp(patp: string): boolean;

11}

15}

ui/src/manage-listings/AllListings.tsx+2−1

@@ -7,6 +7,7 @@ import { Paginator } from '../components/Paginator';

7import { useSearch } from '../state/search';

8import { Remove, Search } from '../types/sphinx';

9import { PUBLISHED_KEY } from '../keys';

10+import { formatUd } from '../utils';

11interface RouteParams extends Record<string, string | undefined> {

12interface RouteParams extends Record<string, string | undefined> {

12 limit?: string;

13 limit?: string;

@@ -28,7 +29,7 @@ export const AllListings = () => {

28 key: (start, size) => ['all', start, size],

29 key: (start, size) => ['all', start, size],

29 fetcher: (start, size) => api.scry<Search>({

30 fetcher: (start, size) => api.scry<Search>({

30 app: 'sphinx',

31 app: 'sphinx',

31− path: `/lookup/all/${start}/${size}`

32+ path: `/lookup/all/${formatUd(start)}/${formatUd(size)}`

32 }),

33 }),

33 enabled: true,

34 enabled: true,

34 limit,

35 limit,

ui/src/manage-listings/Post.tsx+28−13

@@ -8,17 +8,32 @@ import { ErrorMessage } from '../components/ErrorMessage';

8import { Filter } from '../components/Filter';

9import { Option, TagField } from '../components/TagField';

10import { Declare, Post as PostForm, PostType } from '../types/sphinx';

11+import {

12+ MAX_DESCRIPTION_BYTES, MAX_TAG_BYTES, MAX_TAGS, MAX_TITLE_BYTES, MAX_URL_BYTES,

13+ byteLength, isListingImage, isListingLink

14+} from '../utils';

12−function errorMessages(length: number) {

16+function errorMessages(length: number, url?: string) {

13 return {

17 return {

14 required: 'This field is required.',

18 required: 'This field is required.',

15− maxLength: `The maximum length is ${length}.`

19+ bytes: `The maximum length is ${length} bytes (accented letters and emoji count as 2-4).`,

20+ url

16 }

21 }

17}

22}

24+// lib/sphinx +lengths-valid counts UTF-8 bytes and drops longer listings silently

25+const maxBytes = (max: number) => ({ bytes: (value: string) => byteLength(value || '') <= max });

26+

27+// what lib/validate-url rejects, which %sphinx also drops silently

28+const URL_RULES = 'no spaces, #fragments, non-ASCII letters or characters like | [ ] { }';

29+

19export const Post = () => {

30export const Post = () => {

20 const [params] = useSearchParams();

31 const [params] = useSearchParams();

32+ // ?tags= can bring in tags that TagField wouldn't take

21− const defaultTags = params.getAll('tags').map(t => ({ label: t, value: t})) || [];

33+ const defaultTags = params.getAll('tags')

34+ .filter((t, i, all) => t && byteLength(t) <= MAX_TAG_BYTES && all.indexOf(t) === i)

35+ .slice(0, MAX_TAGS)

36+ .map(t => ({ label: t, value: t}));

22 const [tags, setTags] = useState<MultiValue<Option>>(defaultTags);

37 const [tags, setTags] = useState<MultiValue<Option>>(defaultTags);

23 const [image, setImage] = useState<string>('');

38 const [image, setImage] = useState<string>('');

24 const form = useForm<PostForm>({

39 const form = useForm<PostForm>({

@@ -70,43 +85,43 @@ export const Post = () => {

70 <h1 className='text-2xl font-semibold'>Add a Listing</h1>

85 <h1 className='text-2xl font-semibold'>Add a Listing</h1>

71 </header>

86 </header>

72 <FormProvider {...form}>

87 <FormProvider {...form}>

88+ {/* only our checks: the browser's type="url" check refuses relative links like /1/group/~zod/x */}

73− <form onSubmit={handleSubmit(onSubmit)}>

89+ <form noValidate onSubmit={handleSubmit(onSubmit)}>

74 <div className='flex w-full space-x-6'>

90 <div className='flex w-full space-x-6'>

75 <div className='flex-1 space-y-3'>

91 <div className='flex-1 space-y-3'>

76 <div>

92 <div>

77 <label htmlFor='title' className='text-sm font-semibold'>Title</label>

93 <label htmlFor='title' className='text-sm font-semibold'>Title</label>

78 <div className='flex items-center space-x-2'>

94 <div className='flex items-center space-x-2'>

79− <input {...register('title', { required: true, maxLength: 77 })} className='flex-1 w-full py-1 px-2 bg-fawn/30 focus:outline-none focus:ring-2 ring-lavender rounded-lg border border-fawn/30' placeholder='sphinx'/>

95+ <input {...register('title', { required: true, validate: maxBytes(MAX_TITLE_BYTES) })} className='flex-1 w-full py-1 px-2 bg-fawn/30 focus:outline-none focus:ring-2 ring-lavender rounded-lg border border-fawn/30' placeholder='sphinx'/>

80 <Filter selected={type} onSelect={(value) => setValue('type', value)} />

96 <Filter selected={type} onSelect={(value) => setValue('type', value)} />

81 </div>

97 </div>

82− <ErrorMessage className='mt-1' field="title" messages={errorMessages(77)}/>

98+ <ErrorMessage className='mt-1' field="title" messages={errorMessages(MAX_TITLE_BYTES)}/>

83 </div>

99 </div>

84 <div className='flex items-center space-x-6'>

100 <div className='flex items-center space-x-6'>

85 <div className='flex-1 space-y-3'>

101 <div className='flex-1 space-y-3'>

86 <div>

102 <div>

87 <label htmlFor='image' className='text-sm font-semibold'>Image</label>

103 <label htmlFor='image' className='text-sm font-semibold'>Image</label>

88 <input type="url" {...register('image', {

104 <input type="url" {...register('image', {

89− maxLength: 1024

105+ validate: { ...maxBytes(MAX_URL_BYTES), url: isListingImage }

90 })} className='flex-1 w-full py-1 px-2 bg-fawn/30 focus:outline-none focus:ring-2 ring-lavender rounded-lg border border-fawn/30' placeholder='https://nyc3.digitaloceanspaces.com/...' />

106 })} className='flex-1 w-full py-1 px-2 bg-fawn/30 focus:outline-none focus:ring-2 ring-lavender rounded-lg border border-fawn/30' placeholder='https://nyc3.digitaloceanspaces.com/...' />

91− <ErrorMessage className='mt-1' field="image" messages={errorMessages(1024)}/>

107+ <ErrorMessage className='mt-1' field="image" messages={errorMessages(MAX_URL_BYTES, `Use a web address (https://host/path) with ${URL_RULES}.`)}/>

92 </div>

108 </div>

93 <div>

109 <div>

94 <label htmlFor='link' className='text-sm font-semibold'>Link</label>

110 <label htmlFor='link' className='text-sm font-semibold'>Link</label>

95− <input type="url" {...register('link', { required: true, maxLength: 1024 })} className='flex-1 w-full py-1 px-2 bg-fawn/30 focus:outline-none focus:ring-2 ring-lavender rounded-lg border border-fawn/30' placeholder='web+urbitgraph://~nocsyx-lassul/sphinx' />

111+ <input type="url" {...register('link', { required: true, validate: { ...maxBytes(MAX_URL_BYTES), url: isListingLink } })} className='flex-1 w-full py-1 px-2 bg-fawn/30 focus:outline-none focus:ring-2 ring-lavender rounded-lg border border-fawn/30' placeholder='web+urbitgraph://~donmec-sallud/sphinx' />

96− <ErrorMessage className='mt-1' field="link" messages={errorMessages(1024)} />

112+ <ErrorMessage className='mt-1' field="link" messages={errorMessages(MAX_URL_BYTES, `Use a link with ${URL_RULES}.`)} />

97 </div>

113 </div>

98 </div>

114 </div>

99 <img className='flex-none object-cover w-28 h-28 mt-4 border-2 border-dashed border-mauve/60 rounded-lg' src={image || undefined} />

115 <img className='flex-none object-cover w-28 h-28 mt-4 border-2 border-dashed border-mauve/60 rounded-lg' src={image || undefined} />

100 </div>

116 </div>

101 <div>

117 <div>

102 <label htmlFor='description' className='text-sm font-semibold'>Description</label>

118 <label htmlFor='description' className='text-sm font-semibold'>Description</label>

103− <textarea {...register('description', { required: true, maxLength: 256 })} rows={2} className='align-middle w-full py-1 px-2 bg-fawn/30 focus:outline-none focus:ring-2 ring-lavender rounded-lg border border-fawn/30' placeholder='An app for answering your riddles' />

119+ <textarea {...register('description', { required: true, validate: maxBytes(MAX_DESCRIPTION_BYTES) })} rows={2} className='align-middle w-full py-1 px-2 bg-fawn/30 focus:outline-none focus:ring-2 ring-lavender rounded-lg border border-fawn/30' placeholder='An app for answering your riddles' />

104− <ErrorMessage className='mt-1' field="description" messages={errorMessages(256)} />

120+ <ErrorMessage className='mt-1' field="description" messages={errorMessages(MAX_DESCRIPTION_BYTES)} />

105 </div>

121 </div>

106 <div>

122 <div>

107 <label className='text-sm font-semibold'>Tags</label>

123 <label className='text-sm font-semibold'>Tags</label>

108 <TagField tags={tags} onTags={setTags} />

124 <TagField tags={tags} onTags={setTags} />

109− {tags.length === 8 && <div className='text-mauve/50 text-xs mt-1'>8 tags maximum</div>}

110 </div>

125 </div>

111 <div className='pt-3'>

126 <div className='pt-3'>

112 <div className='flex justify-between border-t border-zinc-300 py-3'>

127 <div className='flex justify-between border-t border-zinc-300 py-3'>

ui/src/pages/Search.tsx+3−3

@@ -14,7 +14,7 @@ import { usePals } from '../state/pals';

14import { TagCloud } from '../components/TagCloud';

15import { useTags } from '../state/tags';

16import { useSearch } from '../state/search';

17−import { encodeLookup } from '../utils';

17+import { encodeLookup, formatUd } from '../utils';

18import { lookupKey } from '../keys';

20interface RouteParams extends Record<string, string | undefined> {

@@ -46,7 +46,7 @@ export const Search = () => {

46 key: lookupKey(selected, lookup),

47 fetcher: (start, size) => api.scry<SearchType>({

48 app: 'sphinx',

49− path: `/lookup/${selected}/${start}/${size}/${encodeLookup(lookup)}`

49+ path: `/lookup/${selected}/${formatUd(start)}/${formatUd(size)}/${encodeLookup(lookup)}`

50 }),

51 enabled: !!lookup,

52 limit,

@@ -88,7 +88,7 @@ export const Search = () => {

88 </header>

89 {!palsInstalled && (

90 <div>

91− <a href="/apps/grid/leap/search/~paldev/apps/~paldev/pals" className='inline-flex items-center py-1 px-2 mr-2 font-semibold bg-green-800 text-linen rounded-md'>

91+ <a href="/apps/landscape/search/~paldev/apps/~paldev/pals" className='inline-flex items-center py-1 px-2 mr-2 font-semibold bg-green-800 text-linen rounded-md'>

92 <PlusSmIcon className='h-4 w-4' />

93 install pals

94 </a>

ui/src/pages/Tag.tsx+2−2

@@ -11,7 +11,7 @@ import { TagCloud } from '../components/TagCloud';

11import { useSearch } from '../state/search';

12import { useTags } from '../state/tags';

13import { Remove, Search } from '../types/sphinx';

14−import { encodeLookup } from '../utils';

14+import { encodeLookup, formatUd } from '../utils';

15import { tagKey } from '../keys';

17interface RouteParams extends Record<string, string | undefined> {

@@ -34,7 +34,7 @@ export const Tag = () => {

34 key: tagKey(tag),

35 fetcher: (start, size) => api.scry<Search>({

36 app: 'sphinx',

37− path: `/lookup/tag/${start}/${size}/${encodeLookup(tag)}`

37+ path: `/lookup/tag/${formatUd(start)}/${formatUd(size)}/${encodeLookup(tag)}`

38 }),

39 enabled: !!tag,

40 limit,

ui/src/state/apps.ts+7−4

@@ -3,16 +3,19 @@ import { useQuery } from "@tanstack/react-query"

3import api from "../api";

4import { Post, Search } from "../types/sphinx";

5import { APP_LISTINGS_KEY, CHARGES_KEY, VATS_KEY } from "../keys";

6+import { MAX_DESCRIPTION_BYTES, MAX_TITLE_BYTES, listingImage, truncateBytes } from "../utils";

7function getAppPost(app: string, pike: Pike, charge: Charge): Post {

8function getAppPost(app: string, pike: Pike, charge: Charge): Post {

8 const ship = pike.sync?.ship || `~${window.ship}`;

9 const ship = pike.sync?.ship || `~${window.ship}`;

10 return {

11 return {

11 type: 'app',

12 type: 'app',

12− title: charge.title,

13+ title: truncateBytes(charge.title, MAX_TITLE_BYTES),

14+ // the desk on the publisher, which may differ from the local name

15+ // (|install ~ship %desk, =local %other)

13− link: `/1/desk/${ship}/${app}`, //`/apps/grid/search/${ship}/apps/${ship}/${app}`,

16+ link: `/1/desk/${ship}/${pike.sync?.desk || app}`,

14− description: charge.info || charge.title,

17+ description: truncateBytes(charge.info || charge.title, MAX_DESCRIPTION_BYTES),

15− image: charge.image || '',

18+ image: listingImage(charge.image),

16 color: charge.color,

19 color: charge.color,

17 tags: ['app']

20 tags: ['app']

18 }

21 }

ui/src/state/groups.ts+9−8

@@ -4,7 +4,7 @@ import { PostType, Search } from "../types/sphinx";

4import { ChannelPreview, Groups } from "../types";

5import { useMemo } from "react";

6import { GROUPS_KEY, GROUP_LISTINGS_KEY } from "../keys";

7−import { getColor, getImage, isColor } from "../utils";

7+import { MAX_DESCRIPTION_BYTES, MAX_TITLE_BYTES, getColor, getImage, isColor, listingImage, truncateBytes } from "../utils";

9export const usePublicGroups = () => {

10 const { data, ...query } = useQuery(GROUPS_KEY,

@@ -37,11 +37,11 @@ export const useGroups = () => {

37 loading: loading || isLoading,

38 groups: groups.map(([k,v]) => ({ key: k, post: {

39 type: 'group' as PostType,

40− title: v.meta.title,

40+ title: truncateBytes(v.meta.title, MAX_TITLE_BYTES),

41 link: `/1/group/${k}`, //`/apps/groups/groups/${k}`,

42− image: getImage(v.meta.image) || getImage(v.meta.cover) || '',

42+ image: listingImage(getImage(v.meta.image) || getImage(v.meta.cover)),

43 color: getColor(v.meta.image) || getColor(v.meta.cover) || '',

44− description: v.meta.description,

44+ description: truncateBytes(v.meta.description, MAX_DESCRIPTION_BYTES),

45 tags: ['group']

46 }}))

47 .filter(({ post }) => !d || d.listings.length === 0 || !d.listings.some(l => l.post.link === post.link || l.post.title === post.title))

@@ -49,15 +49,17 @@ export const useGroups = () => {

49}

51export function useChannelPreview(nest: string): ChannelPreview | undefined {

52− const { groups } = usePublicGroups();

52+ const { groups, isFetched } = usePublicGroups();

53 const group = groups.find(([,g]) => {

54 return !!g.channels[nest];

55 });

57+ // %groups asks the channel's host and answers once (mark channel-preview-1)

57 const { data } = useQuery(['channel-preview', nest],

58 const { data } = useQuery(['channel-preview', nest],

58− () => api.subscribeOnce<ChannelPreview>('groups', `/chan/${nest}`, 5000),

59+ () => api.subscribeOnce<ChannelPreview>('groups', `/v1/channels/${nest}/preview`, 5000),

59 {

60 {

61+ // only for channels outside our groups, so wait until those are known

60− enabled: groups && !!nest && !group,

62+ enabled: isFetched && !!nest && !group,

61 refetchOnMount: false,

63 refetchOnMount: false,

62 refetchOnWindowFocus: false,

64 refetchOnWindowFocus: false,

63 },

65 },

@@ -69,7 +71,6 @@ export function useChannelPreview(nest: string): ChannelPreview | undefined {

69 group: {

71 group: {

70 flag: group[0],

72 flag: group[0],

71 meta: group[1].meta,

73 meta: group[1].meta,

72− secret: group[1].secret

73 }

74 }

74 } : data;

75 } : data;

75}

76}

ui/src/state/posts.ts+49−38

@@ -1,35 +1,39 @@

1−import _ from "lodash";

2import { useQuery } from "@tanstack/react-query"

1import { useQuery } from "@tanstack/react-query"

3import api from "../api"

2import api from "../api"

4import { PostType, Search } from "../types/sphinx";

3import { PostType, Search } from "../types/sphinx";

5import { usePublicGroups } from "./groups";

4import { usePublicGroups } from "./groups";

6import { POST_LISTINGS_KEY, notesKey } from "../keys";

5import { POST_LISTINGS_KEY, notesKey } from "../keys";

7−import { Diary, DiaryOutlines, GroupChannel, NoteContent, Shelf, VerseInline, inlineToString } from "../types";

6+import { ChannelsResponse, Diary, GroupChannel, NoteContent, PagedChannelPosts, VerseInline, inlineToString } from "../types";

8import { useMemo } from "react";

7import { useMemo } from "react";

9import { udToDec } from '@urbit/api';

8import { udToDec } from '@urbit/api';

9+import { MAX_DESCRIPTION_BYTES, MAX_TITLE_BYTES, listingImage, normalizeLink, truncateBytes } from "../utils";

10+

11+// notebooks are %channels channels of kind %diary, keyed by nest

12+// "diary/~ship/name" (the old %diary agent is gone from the %groups desk)

13+const DIARY_PREFIX = 'diary/';

11export const useNotebooks = () => {

15export const useNotebooks = () => {

12 const { groups, isLoading: groupsLoading } = usePublicGroups();

16 const { groups, isLoading: groupsLoading } = usePublicGroups();

13− const { data, isLoading } = useQuery(notesKey(), () => api.scry<Shelf>({

17+ const { data, isLoading } = useQuery(notesKey(), () => api.scry<ChannelsResponse>({

14− app: 'diary',

18+ app: 'channels',

15− path: '/shelf'

19+ path: '/v1/channels'

16 }));

20 }));

17−

21+

18 const notebooks = useMemo(() => {

22 const notebooks = useMemo(() => {

19 const nbs: Record<string, GroupChannel & Diary> = {};

23 const nbs: Record<string, GroupChannel & Diary> = {};

20− debugger;

21 if (!data) return nbs;

24 if (!data) return nbs;

23− Object.entries(data).forEach(([k,v]) => {

26+ Object.entries(data).forEach(([nest, v]) => {

27+ if (!nest.startsWith(DIARY_PREFIX)) return;

28+ const flag = nest.slice(DIARY_PREFIX.length);

24 const group = groups.find(([g]) => g === v.perms.group);

29 const group = groups.find(([g]) => g === v.perms.group);

25 if (!group) return;

30 if (!group) return;

27− debugger;

28− const channel = group[1].channels[`diary/${k}`];

32+ const channel = group[1].channels[nest];

29 if (!channel) return;

33 if (!channel) return;

31 if (channel.readers.length === 0) {

35 if (channel.readers.length === 0) {

32− nbs[k] = { ...v, ...channel };

36+ nbs[flag] = { ...v, ...channel };

33 }

37 }

34 });

38 });

@@ -46,29 +50,38 @@ export const useNotebooks = () => {

46export const usePosts = (ship: string, name: string, type: PostType, tags: string[]) => {

50export const usePosts = (ship: string, name: string, type: PostType, tags: string[]) => {

47 const flag = `${ship}/${name}`;

51 const flag = `${ship}/${name}`;

48 const { notebooks, loading } = useNotebooks();

52 const { notebooks, loading } = useNotebooks();

49− const { data, isLoading } = useQuery(notesKey(flag), () => api.scry<DiaryOutlines>({

53+ const { data, isLoading } = useQuery(notesKey(flag), () => api.scry<PagedChannelPosts>({

50− app: 'diary',

54+ app: 'channels',

51− path: `/diary/${flag}/notes/newest/9.999.999/outline`

55+ path: `/v1/${DIARY_PREFIX}${flag}/posts/newest/9.999.999/outline`

52 }));

56 }));

57+ // every listing we have, ours or a mutual's, whatever its tags or type

58+ // (%sphinx refuses to publish a listing it already has)

53 const { data: d, isLoading: postsLoading } = useQuery(POST_LISTINGS_KEY, () => api.scry<Search>({

59 const { data: d, isLoading: postsLoading } = useQuery(POST_LISTINGS_KEY, () => api.scry<Search>({

54 app: 'sphinx',

60 app: 'sphinx',

55− path: '/lookup/tag/0/9.999/~~post'

61+ path: '/lookup/all/0/9.999.999'

56 }));

62 }));

57−

63+

58− const items = data ? Object.entries(data)

64+ const items = data ? Object.entries(data.posts)

59− .map(([date, outline]) => {

65+ .flatMap(([id, post]) => {

60− return { key: date.toString(), post: {

66+ if (!post) return []; // deleted post

67+ const diary = post.essay['kind-data']?.diary;

68+ return [{ key: id, post: {

61 type,

69 type,

62− title: outline.title,

70+ title: truncateBytes(diary?.title || '', MAX_TITLE_BYTES),

63− link: getPermalink(flag, date),

71+ link: getPermalink(flag, id),

64− image: outline.image,

72+ image: listingImage(diary?.image),

65 color: '',

73 color: '',

66− description: getSnippet(outline.content),

74+ description: getSnippet(post.essay.content),

67 tags

75 tags

68− }}

76+ }}];

69 }) : [];

77 }) : [];

79+ // listings store refs; older ones may still be web+urbitgraph links

80+ const listed = useMemo(

81+ () => new Set((d?.listings || []).map(l => normalizeLink(l.post.link))),

82+ [d]

83+ );

71− const posts = items.filter(p => !d || d.listings.length === 0 || !d.listings.find(l => l.post.link === p.post.link));

84+ const posts = items.filter(p => !listed.has(p.post.link));

73 return {

86 return {

74 notebook: notebooks[flag],

87 notebook: notebooks[flag],

@@ -77,21 +90,19 @@ export const usePosts = (ship: string, name: string, type: PostType, tags: strin

77 }

90 }

78}

91}

80−function getPermalink(flag: string, time: string): string {

93+function getPermalink(flag: string, id: string): string {

81− return `/1/chan/diary/${flag}/note/${udToDec(time)}`;

94+ return `/1/chan/${DIARY_PREFIX}${flag}/note/${udToDec(id)}`;

82}

95}

97+// the first paragraph with any text, as plain text

84function getSnippet(content: NoteContent): string {

98function getSnippet(content: NoteContent): string {

85− const inlines = content.filter(c => 'inlines' in c) as VerseInline[];

99+ const inlines = content.filter(c => 'inline' in c) as VerseInline[];

86− if (inlines.length === 0) return '';

100+ for (const verse of inlines) {

87−

88− const text = inlines[0].inlines.map(inlineToString).join(' ');

101+ const text = verse.inline.map(inlineToString).join('').replace(/\s+/g, ' ').trim();

89− const end = text.length > 256 ? 253 : text.length;

102+ if (text) {

90− let start = text.substring(0, end);

103+ return truncateBytes(text, MAX_DESCRIPTION_BYTES);

91− const length = new Blob([start]).size;

104+ }

92− if (length > end) {

93− start = start.substring(0, end - (length - end))

94 }

105 }

95−

106+

96− return start === text ? start : `${start}...`;

107+ return '';

97}

108}

ui/src/types/index.ts+92−34

@@ -34,11 +34,14 @@ export interface Groups {

34 [flag: string]: Group;

35}

37+// %groups /v1/channels/<kind>/<ship>/<name>/preview (mark channel-preview-1).

38+// Previews built from our own groups only fill in flag and meta.

37export interface GroupPreview {

39export interface GroupPreview {

38 flag: string;

40 flag: string;

39 meta: GroupMeta;

41 meta: GroupMeta;

40 time?: number;

42 time?: number;

41− secret: boolean;

43+ 'member-count'?: number;

44+ privacy?: 'public' | 'private' | 'secret';

42}

45}

44export interface ChannelPreview {

47export interface ChannelPreview {

@@ -100,6 +103,18 @@ export interface Link {

100 };

103 };

101}

104}

102

105

106+export interface Task {

107+ task: {

108+ checked: boolean;

109+ content: Inline[];

110+ };

111+}

112+

113+// a role mention

114+export interface Sect {

115+ sect: string | null;

116+}

117+

103export type Inline =

118export type Inline =

104 | string

119 | string

105 | Bold

120 | Bold

@@ -112,7 +127,9 @@ export type Inline =

112 | Blockquote

127 | Blockquote

113 | BlockReference

128 | BlockReference

114 | Tag

129 | Tag

115− | Link;

130+ | Link

131+ | Task

132+ | Sect;

116

133

117export type InlineKey =

134export type InlineKey =

118 | 'italics'

135 | 'italics'

@@ -162,85 +179,126 @@ export function isShip(item: unknown): item is Ship {

162 return typeof item === 'object' && item !== null && 'ship' in item;

179 return typeof item === 'object' && item !== null && 'ship' in item;

163}

180}

164

181

182+export function isTag(item: unknown): item is Tag {

183+ return typeof item === 'object' && item !== null && 'tag' in item;

184+}

185+

186+export function isTask(item: unknown): item is Task {

187+ return typeof item === 'object' && item !== null && 'task' in item;

188+}

189+

190+// plain text of an inline; text runs carry their own whitespace

165−export function inlineToString(inline: Inline): any {

191+export function inlineToString(inline: Inline): string {

166 if (typeof inline === 'string') {

192 if (typeof inline === 'string') {

167 return inline;

193 return inline;

168 }

194 }

169

195

170 if (isBold(inline)) {

196 if (isBold(inline)) {

171− return inline.bold.map((i: Inline) => inlineToString(i)).join(' ');

197+ return inline.bold.map(inlineToString).join('');

172 }

198 }

173

199

174 if (isItalics(inline)) {

200 if (isItalics(inline)) {

175− return inline.italics.map((i: Inline) => inlineToString(i));

201+ return inline.italics.map(inlineToString).join('');

176 }

202 }

177

203

178 if (isStrikethrough(inline)) {

204 if (isStrikethrough(inline)) {

179− return inline.strike.map((i: Inline) => inlineToString(i));

205+ return inline.strike.map(inlineToString).join('');

180 }

206 }

181

207

182 if (isLink(inline)) {

208 if (isLink(inline)) {

183− return inline.link.content;

209+ return inline.link.content || inline.link.href;

184 }

210 }

185

211

186 if (isBlockquote(inline)) {

212 if (isBlockquote(inline)) {

187− return Array.isArray(inline.blockquote)

188− ? inline.blockquote.map((i) => inlineToString(i)).join(' ')

213+ return inline.blockquote.map(inlineToString).join('');

189− : inline.blockquote;

190 }

214 }

191

215

192 if (isInlineCode(inline)) {

216 if (isInlineCode(inline)) {

193− return typeof inline['inline-code'] === 'object'

217+ return inline['inline-code'];

194− ? inlineToString(inline['inline-code'])

218+ }

195− : inline['inline-code'];

219+

220+ if (isBlockCode(inline)) {

221+ return inline.code;

222+ }

223+

224+ if (isTag(inline)) {

225+ return inline.tag;

226+ }

227+

228+ if (isTask(inline)) {

229+ return inline.task.content.map(inlineToString).join('');

196 }

230 }

197

231

198 if (isShip(inline)) {

232 if (isShip(inline)) {

199 return inline.ship;

233 return inline.ship;

200 }

234 }

201

235

236+ if (isBreak(inline)) {

237+ return ' ';

238+ }

239+

202 return '';

240 return '';

203}

241}

204

242

243+// story verses (lib/story-json): {inline: [...]} or {block: {...}}

205export interface VerseInline {

244export interface VerseInline {

206− inlines: Inline[];

245+ inline: Inline[];

207}

246}

208

247

209export interface VerseBlock {

248export interface VerseBlock {

210 block: any;

249 block: any;

211−}

250+}

212

251

213export type Verse = VerseInline | VerseBlock;

252export type Verse = VerseInline | VerseBlock;

214

253

215export type NoteContent = Verse[];

254export type NoteContent = Verse[];

216

255

217−export interface NoteEssay {

256+export interface DiaryPerm {

218− title: string;

219− image: string;

257+ writers: string[];

220− content: NoteContent;

221− author: string;

258+ group: string;

222− sent: number;

223}

259}

224

260

225−export interface DiaryOutline extends NoteEssay {

261+export interface Diary {

226− type: 'outline';

262+ perms: DiaryPerm;

227− quipCount: number;

228− quippers: string[];

229}

263}

230

264

265+// %channels /v1/channels (mark %channels): keyed by nest "<kind>/~ship/name";

266+// posts are always empty here

231−export interface DiaryOutlines {

267+export interface ChannelSummary extends Diary {

232− [time: string]: DiaryOutline;

268+ posts: Record<string, unknown>;

269+ order: string[];

270+ view: string;

271+ sort: string;

233}

272}

234

273

235−export interface DiaryPerm {

274+export interface ChannelsResponse {

236− writers: string[];

275+ [nest: string]: ChannelSummary;

237− group: string;

238}

276}

239

277

278+// %channels /v1/<kind>/~ship/name/posts/newest/<count>/outline

279+// (mark %channel-posts)

280+export interface ChannelEssay {

281+ content: NoteContent;

282+ author: string;

283+ sent: number;

284+ 'kind-data': {

285+ diary?: { title: string; image: string };

286+ heap?: string | null;

287+ chat?: { notice: null } | null;

288+ };

289+}

290+

240−export interface Diary {

291+export interface ChannelPost {

241− perms: DiaryPerm;

292+ seal: { id: string };

293+ revision: string;

294+ essay: ChannelEssay;

295+ type: 'post';

242}

296}

243

297

244−export interface Shelf {

298+export interface PagedChannelPosts {

245− [key: string]: Diary;

299+ // keyed by @ud post id ("170.141..."); null for a deleted post

300+ posts: { [id: string]: ChannelPost | null };

301+ newer: string | null;

302+ older: string | null;

303+ total: number;

246}

304}

ui/src/utils.ts+113−2

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

1import { stringToTa, uxToHex } from "@urbit/api";

2import { parseToRgba } from "color2k";

3+import { isValidPatp } from "urbit-ob";

4export function encodeLookup(value: string | undefined) {

5export function encodeLookup(value: string | undefined) {

5 if (!value) {

6 if (!value) {

@@ -56,7 +57,22 @@ export function normalizeLink(link: string): string {

56 return `/1/chan/diary/${parts[4]}/${parts[5]}/note/${parts[6]}`

57 return `/1/chan/diary/${parts[4]}/${parts[5]}/note/${parts[6]}`

57}

58}

60+// Tlon web routes (tlon-apps packages/app/navigation/linking.ts):

61+// /apps/groups/group/:groupId[/channel/:channelId], ids URI-encoded.

62+export function groupURL(flag: string): string {

63+ return `/apps/groups/group/${encodeURIComponent(flag)}`;

64+}

65+

66+export function channelURL(flag: string, nest: string): string {

67+ return `${groupURL(flag)}/channel/${encodeURIComponent(nest)}`;

68+}

69+

59export function refToURL(cite: string): string | { nest: string, where: string } {

70export function refToURL(cite: string): string | { nest: string, where: string } {

71+ // plain web links (e.g. manual listings) are used as they are

72+ if (/^https?:\/\//i.test(cite)) {

73+ return cite;

74+ }

75+

60 const parts = cite.slice(1).split('/');

76 const parts = cite.slice(1).split('/');

61 if (parts[0] !== '1') {

77 if (parts[0] !== '1') {

62 return '';

78 return '';

@@ -66,13 +82,13 @@ export function refToURL(cite: string): string | { nest: string, where: string }

66 if (type === 'desk') {

82 if (type === 'desk') {

67 const ship = parts[2];

83 const ship = parts[2];

68 const desk = parts[3];

84 const desk = parts[3];

69− return `/apps/grid/search/${ship}/apps/${ship}/${desk}`;

85+ return `/apps/landscape/search/${ship}/apps/${ship}/${desk}`;

70 }

86 }

72 if (type === 'group') {

88 if (type === 'group') {

73 const ship = parts[2];

89 const ship = parts[2];

74 const name = parts[3];

90 const name = parts[3];

75− return `/apps/groups/find/${ship}/${name}`;

91+ return groupURL(`${ship}/${name}`);

76 }

92 }

78 const chanType = parts[2];

94 const chanType = parts[2];

@@ -83,3 +99,98 @@ export function refToURL(cite: string): string | { nest: string, where: string }

83 where: parts.slice(5).join('/'),

99 where: parts.slice(5).join('/'),

84 }

100 }

85}

101}

102+

103+// a number as Hoon prints @ud: `slav %ud` reads 1.000 but not 1000

104+// (@urbit/api's decToUd turns 0 into '')

105+export function formatUd(n: number): string {

106+ return String(n).replace(/\B(?=(\d{3})+$)/g, '.');

107+}

108+

109+const encoder = new TextEncoder();

110+

111+// lib/sphinx +lengths-valid limits, in UTF-8 bytes

112+export const MAX_TITLE_BYTES = 77;

113+export const MAX_DESCRIPTION_BYTES = 256;

114+export const MAX_URL_BYTES = 1024;

115+export const MAX_TAGS = 8;

116+// the longest tag +catalog indexes

117+export const MAX_TAG_BYTES = 64;

118+

119+export function byteLength(text: string): number {

120+ return encoder.encode(text).length;

121+}

122+

123+// lib/validate-url (de-purl:html in zuse) as regular expressions: an optional

124+// scheme://host[:port] (host a DNS name or IPv4, or a ~ship without a port),

125+// then an optional /path and ?key=value&key=value query. No #fragment, no

126+// spaces or non-ASCII, none of | [ ] { } ^ ` \ and no '=' inside a value.

127+// %sphinx silently drops a listing whose image or link fails this.

128+const QUERY_CHAR = "(?:[A-Za-z0-9_.!~*'()+/?:,-]|%[0-9A-Fa-f]{2})";

129+const PATH_CHAR = "(?:[A-Za-z0-9_.!~*'()$&+,;=:@/-]|%[0-9A-Fa-f]{2})";

130+const PAIR = `${QUERY_CHAR}+(?:=${QUERY_CHAR}*)?`;

131+const PATH_QUERY = `(?:/${PATH_CHAR}*)?(?:[?](?:${PAIR}(?:[&;]${PAIR})*)?)?`;

132+const SCHEME = '[A-Za-z][A-Za-z0-9+.-]*://';

133+const LABEL = '[A-Za-z0-9](?:[A-Za-z0-9-]*[A-Za-z0-9])?';

134+const LAST_LABEL = '[A-Za-z](?:[A-Za-z0-9-]*[A-Za-z0-9])?';

135+const OCTET = '(?:0|[1-9][0-9]{0,2})';

136+const HOST = `(?:(?:${LABEL}[.])*${LAST_LABEL}|${OCTET}(?:[.]${OCTET}){3})(?::(?:0|[1-9][0-9]*))?`;

137+// the shape of a @p; isListingLink checks the syllables with isValidPatp

138+const SHIP = '~[a-z]{3}(?:[a-z]{3})?(?:--?[a-z]{6})*';

139+const IMAGE_RE = new RegExp(`^${SCHEME}${HOST}${PATH_QUERY}$`);

140+const LINK_RE = new RegExp(`^(?:${SCHEME}(?:${HOST}|(${SHIP})))?${PATH_QUERY}$`);

141+

142+export function isListingImage(image: string): boolean {

143+ return !image || (byteLength(image) <= MAX_URL_BYTES && IMAGE_RE.test(image));

144+}

145+

146+export function isListingLink(link: string): boolean {

147+ if (byteLength(link) > MAX_URL_BYTES) {

148+ return false;

149+ }

150+

151+ const match = LINK_RE.exec(link);

152+ return !!match && (!match[1] || isValidPatp(match[1]));

153+}

154+

155+// A listing image %sphinx accepts, or '' (so the listing goes out without

156+// one): http(s) URLs are percent-encoded by URL and lose their #fragment;

157+// anything else, data: URIs included (docket images may be one), is dropped.

158+export function listingImage(image: string | null | undefined): string {

159+ if (!image) {

160+ return '';

161+ }

162+

163+ try {

164+ const url = new URL(image);

165+ if (url.protocol !== 'http:' && url.protocol !== 'https:') {

166+ return '';

167+ }

168+

169+ url.hash = '';

170+ return isListingImage(url.href) ? url.href : '';

171+ } catch (e) {

172+ return '';

173+ }

174+}

175+

176+// %sphinx measures listing fields in UTF-8 bytes (lib/sphinx +lengths-valid)

177+// and silently drops listings that are too long, so cut text to at most `max`

178+// bytes on a code point boundary, marking the cut with an ellipsis.

179+export function truncateBytes(text: string, max: number): string {

180+ if (encoder.encode(text).length <= max) {

181+ return text;

182+ }

183+

184+ const ellipsis = '...';

185+ let out = '';

186+ let size = 0;

187+ for (const char of text) {

188+ size += encoder.encode(char).length;

189+ if (size > max - ellipsis.length) {

190+ break;

191+ }

192+ out += char;

193+ }

194+

195+ return `${out.trimEnd()}${ellipsis}`;

196+}

ui/vite.config.ts+7−1

@@ -9,6 +9,12 @@ export default ({ mode }) => {

9 console.log(SHIP_URL);

11 return defineConfig({

12− plugins: [urbitPlugin({ base: 'sphinx', target: SHIP_URL, changeOrigin: true, secure: false }), reactRefresh()]

12+ plugins: [urbitPlugin({ base: 'sphinx', target: SHIP_URL, changeOrigin: true, secure: false }), reactRefresh()],

13+ // The entry chunk has no import or export, so esbuild 0.14 minifies it as

14+ // a sloppy-mode script and hoists the block-level functions in

15+ // @radix-ui/react-focus-scope and react-use-body-pointer-events in random

16+ // order: rebuilds would give a different bundle and glob hash. Browsers

17+ // run the bundle as a module, which is strict anyway.

18+ build: { rollupOptions: { output: { banner: '"use strict";' } } }

13 });

19 });

14};

20};