Hotifx release

Make sure errors in storage peer completely crash jazz context instead of failing silently

.changeset/bright-dingos-boil.md

@@ -0,0 +1,5 @@
+---
+"cojson": patch
+---
+
+Stop using tryAddTransactionsAsync

.changeset/config.json

@@ -12,7 +12,7 @@
             "jazz-react",
             "jazz-nodejs",
             "jazz-run",
-            "cojson-transport-nodejs-ws",
+            "cojson-transport-ws",
             "cojson-storage-indexeddb",
             "cojson-storage-sqlite"
         ]

.changeset/cyan-panthers-fry.md

@@ -0,0 +1,5 @@
+---
+"jazz-run": patch
+---
+
+Hack to make jazz-run account create work

.changeset/early-files-lick.md

@@ -0,0 +1,5 @@
+---
+"cojson": patch
+---
+
+Start introducing neverthrow, make tryAddNewTransactionsAsync and handleNewContent less throwy

.changeset/mighty-cameras-tickle.md

@@ -0,0 +1,5 @@
+---
+"cojson": patch
+---
+
+Only one async transaction per CoValue at a time again

.changeset/neat-tools-call.md

@@ -0,0 +1,6 @@
+---
+"jazz-run": patch
+"cojson": patch
+---
+
+Use fork of queueable

.changeset/pre.json

@@ -0,0 +1,33 @@
+{
+  "mode": "pre",
+  "tag": "neverthrow",
+  "initialVersions": {
+    "jazz-example-chat": "0.0.80",
+    "jazz-inspector": "0.0.58",
+    "jazz-example-pets": "0.0.98",
+    "jazz-example-todo": "0.0.97",
+    "cojson": "0.7.33",
+    "cojson-storage-indexeddb": "0.7.33",
+    "cojson-storage-sqlite": "0.7.33",
+    "cojson-transport-ws": "0.7.33",
+    "hash-slash": "0.2.0",
+    "jazz-browser": "0.7.33",
+    "jazz-browser-media-images": "0.7.33",
+    "jazz-nodejs": "0.7.33",
+    "jazz-react": "0.7.33",
+    "jazz-run": "0.7.33",
+    "jazz-tools": "0.7.33"
+  },
+  "changesets": [
+    "bright-dingos-boil",
+    "cyan-panthers-fry",
+    "early-files-lick",
+    "mighty-cameras-tickle",
+    "neat-tools-call",
+    "real-ravens-refuse",
+    "rich-tigers-cross",
+    "rotten-pens-drive",
+    "rude-cheetahs-ring",
+    "tidy-rice-speak"
+  ]
+}

.changeset/real-ravens-refuse.md

@@ -0,0 +1,5 @@
+---
+"jazz-run": patch
+---
+
+Fix deps even more

.changeset/rich-tigers-cross.md

@@ -0,0 +1,5 @@
+---
+"cojson-transport-ws": patch
+---
+
+Remove WS buffer filling log message

.changeset/rotten-pens-drive.md

@@ -0,0 +1,5 @@
+---
+"jazz-run": patch
+---
+
+Fix peer deps

.changeset/rude-cheetahs-ring.md

@@ -0,0 +1,6 @@
+---
+"jazz-run": patch
+"cojson": patch
+---
+
+Use queueable fork

.changeset/tidy-rice-speak.md

@@ -0,0 +1,5 @@
+---
+"cojson": patch
+---
+
+Better log message for failed transactions

.github/workflows/build-and-deploy.yaml

@@ -3,15 +3,13 @@ name: Build and Deploy
 on:
   push:
     branches: [ "main" ]
-  pull_request:
-    branches: [ "main" ]
 
 jobs:
   build-examples:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        example: ["chat", "pets", "todo"]
+        example: ["chat", "pets", "todo", "inspector"]
         # example: ["twit", "chat", "counter-js-auth0", "pets", "twit", "file-drop", "inspector"]
 
     steps:
@@ -53,59 +51,12 @@ jobs:
         cache-from: type=gha
         cache-to: type=gha,mode=max
 
-  build-homepage:
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v3
-      with:
-        submodules: true
-
-    - uses: pnpm/action-setup@v2
-      with:
-        version: 8
-
-    - uses: actions/setup-node@v3
-      with:
-        node-version: 16
-        cache: 'pnpm'
-
-    - name: Set up Docker Buildx
-      uses: docker/setup-buildx-action@v2
-
-    - name: Login to GitHub Container Registry
-      uses: docker/login-action@v2
-      with:
-        registry: ghcr.io
-        username: gardencmp
-        password: ${{ secrets.GITHUB_TOKEN }}
-
-    - name: Pnpm Install (root)
-      run: |
-        pnpm install
-      working-directory: .
-
-    - name: Pnpm Install & Build (homepage)
-      run: |
-        pnpm install
-        pnpm build;
-      working-directory: ./homepage/homepage
-
-    - name: Docker Build & Push
-      uses: docker/build-push-action@v4
-      with:
-        context: ./homepage
-        push: true
-        tags: ghcr.io/gardencmp/${{github.event.repository.name}}-homepage-jazz:${{github.head_ref || github.ref_name}}-${{github.sha}}-${{github.run_number}}-${{github.run_attempt}}
-        cache-from: type=gha
-        cache-to: type=gha,mode=max
-
   deploy-examples:
     runs-on: ubuntu-latest
     needs: build-examples
     strategy:
       matrix:
-        example: ["chat", "pets", "todo"]
+        example: ["chat", "pets", "todo", "inspector"]
         # example: ["twit", "chat", "counter-js-auth0", "pets", "twit", "file-drop", "inspector"]
 
     steps:
@@ -135,37 +86,4 @@ jobs:
         envsubst '${DOCKER_USER} ${DOCKER_PASSWORD} ${DOCKER_TAG} ${BRANCH_SUFFIX} ${BRANCH_SUBDOMAIN}' < job-template.nomad > job-instance.nomad;
         cat job-instance.nomad;
         NOMAD_ADDR=${{ secrets.NOMAD_ADDR }} nomad job run job-instance.nomad;
-      working-directory: ./examples/${{ matrix.example }}
-
-  deploy-homepage:
-    runs-on: ubuntu-latest
-    needs: build-homepage
-
-    steps:
-    - uses: actions/checkout@v3
-      with:
-        submodules: true
-    - uses: gacts/install-nomad@v1
-    - name: Tailscale
-      uses: tailscale/github-action@v1
-      with:
-        authkey: ${{ secrets.TAILSCALE_AUTHKEY }}
-
-    - name: Deploy on Nomad
-      run: |
-        if [ "${{github.ref_name}}" == "main" ]; then
-          export BRANCH_SUFFIX="";
-          export BRANCH_SUBDOMAIN="";
-        else
-          export BRANCH_SUFFIX=-${{github.head_ref || github.ref_name}};
-          export BRANCH_SUBDOMAIN=${{github.head_ref || github.ref_name}}.;
-        fi
-
-        export DOCKER_USER=gardencmp;
-        export DOCKER_PASSWORD=${{ secrets.DOCKER_PULL_PAT }};
-        export DOCKER_TAG=ghcr.io/gardencmp/${{github.event.repository.name}}-homepage-jazz:${{github.head_ref || github.ref_name}}-${{github.sha}}-${{github.run_number}}-${{github.run_attempt}};
-
-        envsubst '${DOCKER_USER} ${DOCKER_PASSWORD} ${DOCKER_TAG} ${BRANCH_SUFFIX} ${BRANCH_SUBDOMAIN}' < job-template.nomad > job-instance.nomad;
-        cat job-instance.nomad;
-        NOMAD_ADDR=${{ secrets.NOMAD_ADDR }} nomad job run job-instance.nomad;
-      working-directory: ./homepage
+      working-directory: ./examples/${{ matrix.example }}

.husky/pre-commit

@@ -1,2 +0,0 @@
-#!/usr/bin/env sh
-. "$(dirname "$0")/_/husky.sh"

examples/chat/CHANGELOG.md

@@ -1,5 +1,336 @@
 # jazz-example-chat
 
+## 0.0.81-neverthrow.6
+
+### Patch Changes
+
+- Updated dependencies
+  - cojson@0.7.34-neverthrow.8
+  - jazz-react@0.7.34-neverthrow.8
+  - jazz-tools@0.7.34-neverthrow.8
+
+## 0.0.81-neverthrow.5
+
+### Patch Changes
+
+- Updated dependencies
+  - cojson@0.7.34-neverthrow.7
+  - jazz-react@0.7.34-neverthrow.7
+  - jazz-tools@0.7.34-neverthrow.7
+
+## 0.0.81-neverthrow.4
+
+### Patch Changes
+
+- Updated dependencies
+  - cojson@0.7.34-neverthrow.4
+  - jazz-react@0.7.34-neverthrow.4
+  - jazz-tools@0.7.34-neverthrow.4
+
+## 0.0.81-neverthrow.3
+
+### Patch Changes
+
+- Updated dependencies
+  - cojson@0.7.34-neverthrow.3
+  - jazz-react@0.7.34-neverthrow.3
+  - jazz-tools@0.7.34-neverthrow.3
+
+## 0.0.81-neverthrow.2
+
+### Patch Changes
+
+- jazz-react@0.7.34-neverthrow.2
+
+## 0.0.81-neverthrow.1
+
+### Patch Changes
+
+- Updated dependencies
+  - cojson@0.7.34-neverthrow.1
+  - jazz-react@0.7.34-neverthrow.1
+  - jazz-tools@0.7.34-neverthrow.1
+
+## 0.0.81-neverthrow.0
+
+### Patch Changes
+
+- Updated dependencies
+  - cojson@0.7.34-neverthrow.0
+  - jazz-react@0.7.34-neverthrow.0
+  - jazz-tools@0.7.34-neverthrow.0
+
+## 0.0.80
+
+### Patch Changes
+
+- Updated dependencies [b297c93]
+- Updated dependencies [3bf5127]
+- Updated dependencies [a8b74ff]
+- Updated dependencies [db53161]
+  - cojson@0.7.33
+  - jazz-react@0.7.33
+  - jazz-tools@0.7.33
+
+## 0.0.80-hotfixes.5
+
+### Patch Changes
+
+- Updated dependencies
+  - cojson@0.7.33-hotfixes.5
+  - jazz-react@0.7.33-hotfixes.5
+  - jazz-tools@0.7.33-hotfixes.5
+
+## 0.0.80-hotfixes.4
+
+### Patch Changes
+
+- Updated dependencies
+  - cojson@0.7.33-hotfixes.4
+  - jazz-react@0.7.33-hotfixes.4
+  - jazz-tools@0.7.33-hotfixes.4
+
+## 0.0.80-hotfixes.3
+
+### Patch Changes
+
+- Updated dependencies
+  - cojson@0.7.33-hotfixes.3
+  - jazz-react@0.7.33-hotfixes.3
+  - jazz-tools@0.7.33-hotfixes.3
+
+## 0.0.80-hotfixes.2
+
+### Patch Changes
+
+- jazz-react@0.7.33-hotfixes.2
+
+## 0.0.80-hotfixes.1
+
+### Patch Changes
+
+- jazz-react@0.7.33-hotfixes.1
+
+## 0.0.80-hotfixes.0
+
+### Patch Changes
+
+- Updated dependencies
+  - cojson@0.7.33-hotfixes.0
+  - jazz-react@0.7.33-hotfixes.0
+  - jazz-tools@0.7.33-hotfixes.0
+
+## 0.0.79
+
+### Patch Changes
+
+- Updated dependencies
+  - jazz-tools@0.7.32
+  - jazz-react@0.7.32
+
+## 0.0.78
+
+### Patch Changes
+
+- Updated dependencies
+  - cojson@0.7.31
+  - jazz-react@0.7.31
+  - jazz-tools@0.7.31
+
+## 0.0.77
+
+### Patch Changes
+
+- jazz-react@0.7.30
+
+## 0.0.76
+
+### Patch Changes
+
+- Updated dependencies
+  - cojson@0.7.29
+  - jazz-react@0.7.29
+  - jazz-tools@0.7.29
+
+## 0.0.75
+
+### Patch Changes
+
+- Updated dependencies
+  - cojson@0.7.28
+  - jazz-react@0.7.28
+  - jazz-tools@0.7.28
+
+## 0.0.74
+
+### Patch Changes
+
+- jazz-react@0.7.27
+
+## 0.0.73
+
+### Patch Changes
+
+- Updated dependencies
+  - cojson@0.7.26
+  - jazz-react@0.7.26
+  - jazz-tools@0.7.26
+
+## 0.0.72
+
+### Patch Changes
+
+- Updated dependencies
+  - jazz-tools@0.7.25
+  - jazz-react@0.7.25
+
+## 0.0.71
+
+### Patch Changes
+
+- Updated dependencies
+  - jazz-tools@0.7.24
+  - jazz-react@0.7.24
+
+## 0.0.70
+
+### Patch Changes
+
+- Updated dependencies
+  - cojson@0.7.23
+  - jazz-react@0.7.23
+  - jazz-tools@0.7.23
+
+## 0.0.69
+
+### Patch Changes
+
+- jazz-react@0.7.22
+
+## 0.0.68
+
+### Patch Changes
+
+- Updated dependencies
+  - jazz-tools@0.7.21
+  - jazz-react@0.7.21
+
+## 0.0.67
+
+### Patch Changes
+
+- Updated dependencies
+  - jazz-tools@0.7.20
+  - jazz-react@0.7.20
+
+## 0.0.66
+
+### Patch Changes
+
+- Updated dependencies
+  - jazz-tools@0.7.19
+  - jazz-react@0.7.19
+
+## 0.0.65
+
+### Patch Changes
+
+- Updated dependencies
+  - cojson@0.7.18
+  - jazz-react@0.7.18
+  - jazz-tools@0.7.18
+
+## 0.0.64
+
+### Patch Changes
+
+- Updated dependencies
+  - cojson@0.7.17
+  - jazz-react@0.7.17
+  - jazz-tools@0.7.17
+
+## 0.0.63
+
+### Patch Changes
+
+- Updated dependencies
+  - jazz-tools@0.7.16
+  - jazz-react@0.7.16
+
+## 0.0.62
+
+### Patch Changes
+
+- Updated dependencies
+  - jazz-react@0.7.15
+
+## 0.0.61
+
+### Patch Changes
+
+- Updated dependencies
+  - cojson@0.7.14
+  - jazz-tools@0.7.14
+  - jazz-react@0.7.14
+
+## 0.0.60
+
+### Patch Changes
+
+- Updated dependencies
+  - jazz-tools@0.7.13
+  - jazz-react@0.7.13
+
+## 0.0.59
+
+### Patch Changes
+
+- Updated dependencies
+  - jazz-tools@0.7.12
+  - jazz-react@0.7.12
+
+## 0.0.58
+
+### Patch Changes
+
+- Updated dependencies
+  - cojson@0.7.11
+  - jazz-react@0.7.11
+  - jazz-tools@0.7.11
+
+## 0.0.57
+
+### Patch Changes
+
+- Updated dependencies
+  - cojson@0.7.10
+  - jazz-react@0.7.10
+  - jazz-tools@0.7.10
+
+## 0.0.56
+
+### Patch Changes
+
+- Updated dependencies
+  - cojson@0.7.9
+  - jazz-react@0.7.9
+  - jazz-tools@0.7.9
+
+## 0.0.55
+
+### Patch Changes
+
+- Updated dependencies
+  - jazz-tools@0.7.8
+  - jazz-react@0.7.8
+
+## 0.0.54
+
+### Patch Changes
+
+- Updated dependencies [9fdc91c]
+  - jazz-react@0.7.7
+
 ## 0.0.53
 
 ### Patch Changes

examples/chat/README.md

@@ -1,12 +1,13 @@
 # Jazz Chat Example
 
-Live version: https://example-chat.jazz.tools
+Live version: [https://chat.jazz.tools](https://chat.jazz.tools)
 
 ## Installing & running the example locally
 
 (this requires `pnpm` to be installed, see [https://pnpm.io/installation](https://pnpm.io/installation))
 
 Start by checking out `jazz`
+
 ```bash
 git clone https://github.com/gardencmp/jazz.git
 cd jazz/examples/chat
@@ -34,7 +35,6 @@ pnpm dev
 
 If you have feedback, let us know on [Discord](https://discord.gg/utDMjHYg42) or open an issue or PR to fix something that seems wrong.
 
-
 ## Configuration: sync server
 
 By default, the example app uses [Jazz Global Mesh](https://jazz.tools/mesh) (`wss://sync.jazz.tools`) - so cross-device use, invites and collaboration should just work.

examples/chat/package.json

@@ -1,7 +1,7 @@
 {
   "name": "jazz-example-chat",
   "private": true,
-  "version": "0.0.53",
+  "version": "0.0.81-neverthrow.6",
   "type": "module",
   "scripts": {
     "dev": "vite",

examples/chat/src/app.tsx

@@ -3,6 +3,7 @@ import { createJazzReactContext, DemoAuth } from "jazz-react";
 import { createRoot } from "react-dom/client";
 import { useIframeHashRouter } from "hash-slash";
 import { ChatScreen } from "./chatScreen.tsx";
+import { StrictMode } from "react";
 
 export class Message extends CoMap {
   text = co.string;
@@ -39,4 +40,4 @@ function App() {
 }
 
 createRoot(document.getElementById("root")!)
-  .render(<Jazz.Provider><App/></Jazz.Provider>);
+  .render(<StrictMode><Jazz.Provider><App/></Jazz.Provider></StrictMode>);

examples/inspector/CHANGELOG.md

@@ -0,0 +1,210 @@
+# jazz-example-chat
+
+## 0.0.59-neverthrow.6
+
+### Patch Changes
+
+- Updated dependencies
+  - cojson@0.7.34-neverthrow.8
+  - cojson-transport-ws@0.7.34-neverthrow.8
+
+## 0.0.59-neverthrow.5
+
+### Patch Changes
+
+- Updated dependencies
+  - cojson@0.7.34-neverthrow.7
+  - cojson-transport-ws@0.7.34-neverthrow.7
+
+## 0.0.59-neverthrow.4
+
+### Patch Changes
+
+- Updated dependencies
+  - cojson@0.7.34-neverthrow.4
+  - cojson-transport-ws@0.7.34-neverthrow.4
+
+## 0.0.59-neverthrow.3
+
+### Patch Changes
+
+- Updated dependencies
+  - cojson@0.7.34-neverthrow.3
+  - cojson-transport-ws@0.7.34-neverthrow.3
+
+## 0.0.59-neverthrow.2
+
+### Patch Changes
+
+- Updated dependencies
+  - cojson-transport-ws@0.7.34-neverthrow.2
+
+## 0.0.59-neverthrow.1
+
+### Patch Changes
+
+- Updated dependencies
+  - cojson@0.7.34-neverthrow.1
+  - cojson-transport-ws@0.7.34-neverthrow.1
+
+## 0.0.59-neverthrow.0
+
+### Patch Changes
+
+- Updated dependencies
+  - cojson@0.7.34-neverthrow.0
+  - cojson-transport-ws@0.7.34-neverthrow.0
+
+## 0.0.58
+
+### Patch Changes
+
+- Updated dependencies [fdde8db]
+- Updated dependencies [b297c93]
+- Updated dependencies [07fe2b9]
+- Updated dependencies [3bf5127]
+- Updated dependencies [a8b74ff]
+- Updated dependencies [db53161]
+  - cojson-transport-ws@0.7.33
+  - cojson@0.7.33
+
+## 0.0.58-hotfixes.5
+
+### Patch Changes
+
+- Updated dependencies
+  - cojson@0.7.33-hotfixes.5
+  - cojson-transport-ws@0.7.33-hotfixes.5
+
+## 0.0.58-hotfixes.4
+
+### Patch Changes
+
+- Updated dependencies
+  - cojson@0.7.33-hotfixes.4
+  - cojson-transport-ws@0.7.33-hotfixes.4
+
+## 0.0.58-hotfixes.3
+
+### Patch Changes
+
+- Updated dependencies
+  - cojson-transport-ws@0.7.33-hotfixes.3
+  - cojson@0.7.33-hotfixes.3
+
+## 0.0.58-hotfixes.2
+
+### Patch Changes
+
+- Updated dependencies
+  - cojson-transport-ws@0.7.33-hotfixes.2
+
+## 0.0.58-hotfixes.1
+
+### Patch Changes
+
+- Updated dependencies
+  - cojson-transport-ws@0.7.33-hotfixes.1
+
+## 0.0.58-hotfixes.0
+
+### Patch Changes
+
+- Updated dependencies
+  - cojson@0.7.33-hotfixes.0
+  - cojson-transport-ws@0.7.33-hotfixes.0
+
+## 0.0.57
+
+### Patch Changes
+
+- Updated dependencies
+- Updated dependencies
+  - cojson-transport-ws@0.7.31
+  - cojson@0.7.31
+
+## 0.0.56
+
+### Patch Changes
+
+- Updated dependencies
+  - cojson-transport-ws@0.7.30
+
+## 0.0.55
+
+### Patch Changes
+
+- Updated dependencies
+  - cojson@0.7.29
+  - cojson-transport-ws@0.7.29
+
+## 0.0.54
+
+### Patch Changes
+
+- Updated dependencies
+  - cojson@0.7.28
+  - cojson-transport-ws@0.7.28
+
+## 0.0.53
+
+### Patch Changes
+
+- Updated dependencies
+  - cojson-transport-ws@0.7.27
+
+## 0.0.52
+
+### Patch Changes
+
+- Updated dependencies
+  - cojson@0.7.26
+  - cojson-transport-ws@0.7.26
+
+## 0.0.51
+
+### Patch Changes
+
+- Updated dependencies
+  - cojson@0.7.23
+  - cojson-transport-ws@0.7.23
+
+## 0.0.50
+
+### Patch Changes
+
+- Updated dependencies
+  - cojson-transport-ws@0.7.22
+
+## 0.0.49
+
+### Patch Changes
+
+- Updated dependencies
+  - cojson@0.7.18
+  - cojson-transport-ws@0.7.18
+
+## 0.0.48
+
+### Patch Changes
+
+- Updated dependencies
+  - cojson@0.7.17
+  - cojson-transport-ws@0.7.17
+
+## 0.0.47
+
+### Patch Changes
+
+- Updated dependencies
+  - cojson@0.6.7
+  - jazz-react@0.5.5
+  - jazz-react-auth-local@0.4.18
+
+## 0.0.46
+
+### Patch Changes
+
+- Updated dependencies
+  - jazz-react@0.5.0
+  - jazz-react-auth-local@0.4.16

examples/inspector/index.html

@@ -0,0 +1,17 @@
+<!doctype html>
+<html lang="en">
+
+<head>
+  <meta charset="UTF-8" />
+  <link rel="icon" type="image/png" href="/jazz-logo.png" />
+  <link rel="stylesheet" href="/src/index.css" />
+  <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+  <title>Jazz Inspector</title>
+</head>
+
+<body>
+  <div id="root"></div>
+  <script type="module" src="/src/app.tsx"></script>
+</body>
+
+</html>

examples/inspector/package.json

@@ -1,7 +1,7 @@
 {
-  "name": "inspector",
+  "name": "jazz-inspector",
   "private": true,
-  "version": "0.0.47",
+  "version": "0.0.59-neverthrow.6",
   "type": "module",
   "scripts": {
     "dev": "vite",
@@ -17,9 +17,8 @@
     "class-variance-authority": "^0.7.0",
     "clsx": "^2.0.0",
     "hash-slash": "workspace:*",
-    "jazz-react": "workspace:*",
-    "jazz-react-auth-local": "workspace:*",
     "cojson": "workspace:*",
+    "cojson-transport-ws": "workspace:*",
     "lucide-react": "^0.274.0",
     "qrcode": "^1.5.3",
     "react": "^18.2.0",

examples/inspector/src/app.tsx

@@ -0,0 +1,4 @@
+import ReactDOM from "react-dom/client";
+import App from "./viewer/new-app";
+
+ReactDOM.createRoot(document.getElementById("root")!).render(<App />);

examples/inspector/src/index.css

@@ -0,0 +1,92 @@
+@tailwind base;
+@tailwind components;
+@tailwind utilities;
+
+@layer base {
+    :root {
+        --background: 0 0% 100%;
+        --foreground: 20 14.3% 4.1%;
+
+        --card: 0 0% 100%;
+        --card-foreground: 20 14.3% 4.1%;
+
+        --popover: 0 0% 100%;
+        --popover-foreground: 20 14.3% 4.1%;
+
+        --primary: 24 9.8% 10%;
+        --primary-foreground: 60 9.1% 97.8%;
+
+        --secondary: 60 4.8% 95.9%;
+        --secondary-foreground: 24 9.8% 10%;
+
+        --muted: 60 4.8% 95.9%;
+        --muted-foreground: 25 5.3% 44.7%;
+
+        --accent: 60 4.8% 95.9%;
+        --accent-foreground: 24 9.8% 10%;
+
+        --destructive: 0 84.2% 60.2%;
+        --destructive-foreground: 60 9.1% 97.8%;
+
+        --border: 20 5.9% 90%;
+        --input: 20 5.9% 90%;
+        --ring: 20 14.3% 4.1%;
+
+        --radius: 0.5rem;
+    }
+
+    .dark {
+        --background: 20 14.3% 4.1%;
+        --foreground: 60 9.1% 97.8%;
+
+        --card: 20 14.3% 4.1%;
+        --card-foreground: 60 9.1% 97.8%;
+
+        --popover: 20 14.3% 4.1%;
+        --popover-foreground: 60 9.1% 97.8%;
+
+        --primary: 60 9.1% 97.8%;
+        --primary-foreground: 24 9.8% 10%;
+
+        --secondary: 12 6.5% 15.1%;
+        --secondary-foreground: 60 9.1% 97.8%;
+
+        --muted: 12 6.5% 15.1%;
+        --muted-foreground: 24 5.4% 63.9%;
+
+        --accent: 12 6.5% 15.1%;
+        --accent-foreground: 60 9.1% 97.8%;
+
+        --destructive: 0 62.8% 30.6%;
+        --destructive-foreground: 60 9.1% 97.8%;
+
+        --border: 12 6.5% 15.1%;
+        --input: 12 6.5% 15.1%;
+        --ring: 24 5.7% 82.9%;
+    }
+}
+
+@layer base {
+    * {
+        @apply border-border;
+    }
+    body {
+        @apply bg-background text-foreground;
+        margin: 0;
+        padding: 0;
+    }
+}
+
+.animate-in {
+    animation: slideIn 0.3s ease-out;
+}
+@keyframes slideIn {
+    from {
+        transform: translateZ(400px) translateY(30px) scale(1.05);
+        opacity: 0.4;
+    }
+    to {
+        transform: translateZ(0) scale(1);
+        opacity: 1;
+    }
+}

examples/inspector/src/link-icon.tsx

@@ -0,0 +1,18 @@
+export function LinkIcon() {
+    return (
+        <svg
+            xmlns="http://www.w3.org/2000/svg"
+            fill="none"
+            viewBox="0 0 24 24"
+            strokeWidth={1.5}
+            stroke="currentColor"
+            className="w-3 h-3"
+        >
+            <path
+                strokeLinecap="round"
+                strokeLinejoin="round"
+                d="M13.19 8.688a4.5 4.5 0 0 1 1.242 7.244l-4.5 4.5a4.5 4.5 0 0 1-6.364-6.364l1.757-1.757m13.35-.622 1.757-1.757a4.5 4.5 0 0 0-6.364-6.364l-4.5 4.5a4.5 4.5 0 0 0 1.242 7.244"
+            />
+        </svg>
+    );
+}

examples/inspector/src/viewer/breadcrumbs.tsx

@@ -0,0 +1,42 @@
+import React from "react";
+import { PageInfo } from "./types";
+
+interface BreadcrumbsProps {
+    path: PageInfo[];
+    onBreadcrumbClick: (index: number) => void;
+}
+
+export const Breadcrumbs: React.FC<BreadcrumbsProps> = ({
+    path,
+    onBreadcrumbClick,
+}) => {
+    return (
+        <div className="z-20 relative bg-indigo-400/10 backdrop-blur-sm rounded-lg inline-flex px-2 py-1 whitespace-pre transition-all items-center space-x-1 min-h-10">
+            <button
+                onClick={() => onBreadcrumbClick(-1)}
+                className="flex items-center justify-center p-1 rounded-sm hover:bg-indigo-500/10 transition-colors"
+                aria-label="Go to home"
+            >
+                <img src="jazz-logo.png" alt="Jazz Logo" className="size-5" />
+            </button>
+            {path.map((page, index) => {
+                return (
+                    <span
+                        key={index}
+                        className="inline-block first:pl-1 last:pr-1"
+                    >
+                        {index === 0 ? null : (
+                            <span className="text-indigo-500/30">{" / "}</span>
+                        )}
+                        <button
+                            onClick={() => onBreadcrumbClick(index)}
+                            className="text-indigo-700 hover:underline"
+                        >
+                            {index === 0 ? page.name || "Root" : page.name}
+                        </button>
+                    </span>
+                );
+            })}
+        </div>
+    );
+};

examples/inspector/src/viewer/co-stream-view.tsx

@@ -0,0 +1,353 @@
+import {
+    CoID,
+    LocalNode,
+    RawBinaryCoStream,
+    RawCoStream,
+    RawCoValue,
+} from "cojson";
+import { JsonObject, JsonValue } from "cojson/src/jsonValue";
+import { PageInfo } from "./types";
+import { base64URLtoBytes } from "cojson/src/base64url";
+import { useEffect, useState } from "react";
+import { ArrowDownToLine } from "lucide-react";
+import {
+    BinaryStreamItem,
+    BinaryStreamStart,
+    CoStreamItem,
+} from "cojson/src/coValues/coStream";
+import { AccountOrGroupPreview } from "./value-renderer";
+
+// typeguard for BinaryStreamStart
+function isBinaryStreamStart(item: unknown): item is BinaryStreamStart {
+    return (
+        typeof item === "object" &&
+        item !== null &&
+        "type" in item &&
+        item.type === "start"
+    );
+}
+
+function detectCoStreamType(value: RawCoStream | RawBinaryCoStream) {
+    const firstKey = Object.keys(value.items)[0];
+    if (!firstKey)
+        return {
+            type: "unknown",
+        };
+
+    const items = value.items[firstKey as never]?.map((v) => v.value);
+
+    if (!items)
+        return {
+            type: "unknown",
+        };
+    const firstItem = items[0];
+    if (!firstItem)
+        return {
+            type: "unknown",
+        };
+    // This is a binary stream
+    if (isBinaryStreamStart(firstItem)) {
+        return {
+            type: "binary",
+            items: items as BinaryStreamItem[],
+        };
+    } else {
+        return {
+            type: "coStream",
+        };
+    }
+}
+
+async function getBlobFromCoStream({
+    items,
+    onlyFirstChunk = false,
+}: {
+    items: BinaryStreamItem[];
+    onlyFirstChunk?: boolean;
+}) {
+    if (onlyFirstChunk && items.length > 1) {
+        items = items.slice(0, 2);
+    }
+
+    const chunks: Uint8Array[] = [];
+
+    const binary_U_prefixLength = 8;
+
+    let lastProgressUpdate = Date.now();
+
+    for (const item of items.slice(1)) {
+        if (item.type === "end") {
+            break;
+        }
+
+        if (item.type !== "chunk") {
+            console.error("Invalid binary stream chunk", item);
+            return undefined;
+        }
+
+        const chunk = base64URLtoBytes(item.chunk.slice(binary_U_prefixLength));
+        // totalLength += chunk.length;
+        chunks.push(chunk);
+
+        if (Date.now() - lastProgressUpdate > 100) {
+            lastProgressUpdate = Date.now();
+        }
+    }
+    const defaultMime = "mimeType" in items[0] ? items[0].mimeType : null;
+
+    const blob = new Blob(chunks, defaultMime ? { type: defaultMime } : {});
+
+    const mimeType =
+        defaultMime === "" ? await detectPDFMimeType(blob) : defaultMime;
+
+    return {
+        blob,
+        mimeType: mimeType as string,
+        unfinishedChunks: items.length > 1,
+        totalSize:
+            "totalSizeBytes" in items[0]
+                ? (items[0].totalSizeBytes as number)
+                : undefined,
+    };
+}
+
+const detectPDFMimeType = async (blob: Blob): Promise<string> => {
+    const arrayBuffer = await blob.slice(0, 4).arrayBuffer();
+    const uint8Array = new Uint8Array(arrayBuffer);
+    const header = uint8Array.reduce(
+        (acc, byte) => acc + String.fromCharCode(byte),
+        "",
+    );
+
+    if (header === "%PDF") {
+        return "application/pdf";
+    }
+    return "application/octet-stream";
+};
+
+const BinaryDownloadButton = ({
+    pdfBlob,
+    fileName = "document",
+    label,
+    mimeType,
+}: {
+    pdfBlob: Blob;
+    mimeType?: string;
+    fileName?: string;
+    label: string;
+}) => {
+    const downloadFile = () => {
+        const url = URL.createObjectURL(
+            new Blob([pdfBlob], mimeType ? { type: mimeType } : {}),
+        );
+        const link = document.createElement("a");
+        link.href = url;
+        link.download =
+            mimeType === "application/pdf" ? `${fileName}.pdf` : fileName;
+        document.body.appendChild(link);
+        link.click();
+        document.body.removeChild(link);
+        URL.revokeObjectURL(url);
+    };
+
+    return (
+        <button
+            className="flex items-center gap-2 px-2 py-1 text-gray-900 border border-gray-900/10 bg-clip-border shadow-sm transition-colors rounded bg-gray-50 text-sm"
+            onClick={downloadFile}
+        >
+            <ArrowDownToLine size={16} />
+            {label}
+            {/* Download {mimeType === "application/pdf" ? "PDF" : "File"} */}
+        </button>
+    );
+};
+
+const LabelContentPair = ({
+    label,
+    content,
+}: {
+    label: string;
+    content: React.ReactNode;
+}) => {
+    return (
+        <div className="flex flex-col gap-1.5 ">
+            <span className="uppercase text-xs font-medium text-gray-600 tracking-wide">
+                {label}
+            </span>
+            <span>{content}</span>
+        </div>
+    );
+};
+
+function RenderCoBinaryStream({
+    value,
+    items,
+}: {
+    items: BinaryStreamItem[];
+    value: RawBinaryCoStream;
+}) {
+    const [file, setFile] = useState<
+        | {
+              blob: Blob;
+              mimeType: string;
+              unfinishedChunks: boolean;
+              totalSize: number | undefined;
+          }
+        | undefined
+        | null
+    >(null);
+    const [isLoading, setIsLoading] = useState(true);
+
+    useEffect(() => {
+        // load only the first chunk to get the mime type and size
+        getBlobFromCoStream({
+            items,
+            onlyFirstChunk: true,
+        })
+            .then((v) => {
+                if (v) {
+                    setFile(v);
+                    if (v.mimeType.includes("image")) {
+                        // If it's an image, load the full blob
+                        getBlobFromCoStream({
+                            items,
+                        }).then((s) => {
+                            if (s) setFile(s);
+                        });
+                    }
+                }
+            })
+            .finally(() => setIsLoading(false));
+    }, [items]);
+
+    if (!isLoading && !file) return <div>No blob</div>;
+
+    if (isLoading) return <div>Loading...</div>;
+    if (!file) return <div>No blob</div>;
+
+    const { blob, mimeType } = file;
+
+    const sizeInKB = (file.totalSize || 0) / 1024;
+
+    return (
+        <div className="space-y-8 mt-4">
+            <div className="grid grid-cols-3 gap-2 max-w-3xl">
+                <LabelContentPair
+                    label="Mime Type"
+                    content={
+                        <span className="font-mono bg-gray-100 rounded px-2 py-1 text-sm">
+                            {mimeType || "No mime type"}
+                        </span>
+                    }
+                />
+                <LabelContentPair
+                    label="Size"
+                    content={<span>{sizeInKB.toFixed(2)} KB</span>}
+                />
+                <LabelContentPair
+                    label="Download"
+                    content={
+                        <BinaryDownloadButton
+                            fileName={value.id.toString()}
+                            pdfBlob={blob}
+                            mimeType={mimeType}
+                            label={
+                                mimeType === "application/pdf"
+                                    ? "Download PDF"
+                                    : "Download File"
+                            }
+                        />
+                    }
+                />
+            </div>
+            {mimeType === "image/png" || mimeType === "image/jpeg" ? (
+                <LabelContentPair
+                    label="Preview"
+                    content={
+                        <div className="bg-gray-50 p-3 rounded-sm">
+                            <RenderBlobImage blob={blob} />
+                        </div>
+                    }
+                />
+            ) : null}
+        </div>
+    );
+}
+
+function RenderCoStream({
+    value,
+    node,
+}: {
+    value: RawCoStream;
+    node: LocalNode;
+}) {
+    const streamPerUser = Object.keys(value.items);
+    const userCoIds = streamPerUser.map(
+        (stream) => stream.split("_session")[0],
+    );
+
+    return (
+        <div className="grid grid-cols-3 gap-2">
+            {userCoIds.map((id, idx) => (
+                <div
+                    className="bg-gray-100 p-3 rounded-lg transition-colors overflow-hidden bg-white border hover:bg-gray-100/5 cursor-pointer shadow-sm"
+                    key={id}
+                >
+                    <AccountOrGroupPreview
+                        coId={id as CoID<RawCoValue>}
+                        node={node}
+                    />
+                    {/* @ts-expect-error - TODO: fix types */}
+                    {value.items[streamPerUser[idx]]?.map(
+                        (item: CoStreamItem<JsonValue>) => (
+                            <div>
+                                {new Date(item.madeAt).toLocaleString()}{" "}
+                                {JSON.stringify(item.value)}
+                            </div>
+                        ),
+                    )}
+                </div>
+            ))}
+        </div>
+    );
+}
+
+export function CoStreamView({
+    value,
+    node,
+}: {
+    data: JsonObject;
+    onNavigate: (pages: PageInfo[]) => void;
+    node: LocalNode;
+    value: RawCoStream;
+}) {
+    // if (!value) return <div>No value</div>;
+
+    const streamType = detectCoStreamType(value);
+
+    if (streamType.type === "binary") {
+        if (streamType.items === undefined) {
+            return <div>No binary stream</div>;
+        }
+
+        return (
+            <RenderCoBinaryStream
+                value={value as RawBinaryCoStream}
+                items={streamType.items}
+            />
+        );
+    }
+
+    if (streamType.type === "coStream") {
+        return <RenderCoStream value={value} node={node} />;
+    }
+
+    if (streamType.type === "unknown") return <div>Unknown stream type</div>;
+
+    return <div>Unknown stream type</div>;
+}
+
+function RenderBlobImage({ blob }: { blob: Blob }) {
+    const urlCreator = window.URL || window.webkitURL;
+    return <img src={urlCreator.createObjectURL(blob)} />;
+}

examples/inspector/src/viewer/grid-view.tsx

@@ -0,0 +1,73 @@
+import { CoID, LocalNode, RawCoValue } from "cojson";
+import { JsonObject } from "cojson/src/jsonValue";
+import { CoMapPreview, ValueRenderer } from "./value-renderer";
+import clsx from "clsx";
+import { PageInfo, isCoId } from "./types";
+import { ResolveIcon } from "./type-icon";
+
+export function GridView({
+    data,
+    onNavigate,
+    node,
+}: {
+    data: JsonObject;
+    onNavigate: (pages: PageInfo[]) => void;
+    node: LocalNode;
+}) {
+    const entries = Object.entries(data);
+
+    return (
+        <div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-4 p-2">
+            {entries.map(([key, child], childIndex) => (
+                <div
+                    key={childIndex}
+                    className={clsx(
+                        "bg-gray-100 p-3 rounded-lg transition-colors overflow-hidden",
+                        isCoId(child)
+                            ? "bg-white border hover:bg-gray-100/5 cursor-pointer shadow-sm"
+                            : "bg-gray-50",
+                    )}
+                    onClick={() =>
+                        isCoId(child) &&
+                        onNavigate([
+                            { coId: child as CoID<RawCoValue>, name: key },
+                        ])
+                    }
+                >
+                    <h3 className="truncate">
+                        {isCoId(child) ? (
+                            <span className="font-medium flex justify-between">
+                                {key}
+
+                                <div className="px-2 py-1 text-xs bg-gray-100 rounded">
+                                    <ResolveIcon
+                                        coId={child as CoID<RawCoValue>}
+                                        node={node}
+                                    />
+                                </div>
+                            </span>
+                        ) : (
+                            <span>{key}</span>
+                        )}
+                    </h3>
+                    <div className="mt-2 text-sm">
+                        {isCoId(child) ? (
+                            <CoMapPreview
+                                coId={child as CoID<RawCoValue>}
+                                node={node}
+                            />
+                        ) : (
+                            <ValueRenderer
+                                json={child}
+                                onCoIDClick={(coId) => {
+                                    onNavigate([{ coId, name: key }]);
+                                }}
+                                compact
+                            />
+                        )}
+                    </div>
+                </div>
+            ))}
+        </div>
+    );
+}

examples/inspector/src/viewer/index.tsx

@@ -0,0 +1,27 @@
+import { LocalNode } from "cojson";
+import { Breadcrumbs } from "./breadcrumbs";
+import { usePagePath } from "./use-page-path";
+import { PageInfo } from "./types";
+import { PageStack } from "./page-stack";
+
+export default function CoJsonViewer({
+    defaultPath,
+    node,
+}: {
+    defaultPath?: PageInfo[];
+    node: LocalNode;
+}) {
+    const { path, addPages, goToIndex, goBack } = usePagePath(defaultPath);
+
+    return (
+        <div className="w-full h-screen bg-gray-100 p-4 overflow-hidden">
+            <Breadcrumbs path={path} onBreadcrumbClick={goToIndex} />
+            <PageStack
+                path={path}
+                node={node}
+                goBack={goBack}
+                addPages={addPages}
+            />
+        </div>
+    );
+}

examples/inspector/src/viewer/new-app.tsx

@@ -0,0 +1,310 @@
+import React, { useState, useEffect } from "react";
+import {
+    LocalNode,
+    CoID,
+    RawCoValue,
+    RawAccount,
+    AgentSecret,
+    AccountID,
+    cojsonInternals,
+    WasmCrypto,
+} from "cojson";
+import { createWebSocketPeer } from "cojson-transport-ws";
+import { Trash2 } from "lucide-react";
+import { Breadcrumbs } from "./breadcrumbs";
+import { usePagePath } from "./use-page-path";
+import { PageStack } from "./page-stack";
+import { resolveCoValue, useResolvedCoValue } from "./use-resolve-covalue";
+import clsx from "clsx";
+
+interface Account {
+    id: CoID<RawAccount>;
+    secret: AgentSecret;
+}
+
+export default function CoJsonViewerApp() {
+    const [accounts, setAccounts] = useState<Account[]>(() => {
+        const storedAccounts = localStorage.getItem("inspectorAccounts");
+        return storedAccounts ? JSON.parse(storedAccounts) : [];
+    });
+    const [currentAccount, setCurrentAccount] = useState<Account | null>(() => {
+        const lastSelectedId = localStorage.getItem("lastSelectedAccountId");
+        if (lastSelectedId) {
+            const lastAccount = accounts.find(
+                (account) => account.id === lastSelectedId,
+            );
+            return lastAccount || null;
+        }
+        return null;
+    });
+    const [localNode, setLocalNode] = useState<LocalNode | null>(null);
+    const [coValueId, setCoValueId] = useState<CoID<RawCoValue> | "">("");
+    const { path, addPages, goToIndex, goBack, setPage } = usePagePath();
+
+    useEffect(() => {
+        localStorage.setItem("inspectorAccounts", JSON.stringify(accounts));
+    }, [accounts]);
+
+    useEffect(() => {
+        if (currentAccount) {
+            localStorage.setItem("lastSelectedAccountId", currentAccount.id);
+        } else {
+            localStorage.removeItem("lastSelectedAccountId");
+        }
+    }, [currentAccount]);
+
+    useEffect(() => {
+        if (!currentAccount) {
+            setLocalNode(null);
+            goToIndex(-1);
+            return;
+        }
+
+        WasmCrypto.create().then(async (crypto) => {
+            const wsPeer = createWebSocketPeer({
+                id: "mesh",
+                websocket: new WebSocket("wss://mesh.jazz.tools"),
+                role: "server",
+            });
+            const node = await LocalNode.withLoadedAccount({
+                accountID: currentAccount.id,
+                accountSecret: currentAccount.secret,
+                sessionID: cojsonInternals.newRandomSessionID(
+                    currentAccount.id,
+                ),
+                peersToLoadFrom: [wsPeer],
+                crypto,
+                migration: async () => {
+                    console.log("Not running any migration in inspector");
+                },
+            });
+            setLocalNode(node);
+        });
+    }, [currentAccount, goToIndex]);
+
+    const addAccount = (id: AccountID, secret: AgentSecret) => {
+        const newAccount = { id, secret };
+        setAccounts([...accounts, newAccount]);
+        setCurrentAccount(newAccount);
+    };
+
+    const deleteCurrentAccount = () => {
+        if (currentAccount) {
+            const updatedAccounts = accounts.filter(
+                (account) => account.id !== currentAccount.id,
+            );
+            setAccounts(updatedAccounts);
+            setCurrentAccount(
+                updatedAccounts.length > 0 ? updatedAccounts[0] : null,
+            );
+        }
+    };
+
+    const handleCoValueIdSubmit = (e: React.FormEvent) => {
+        e.preventDefault();
+        if (coValueId) {
+            setPage(coValueId);
+        }
+    };
+
+    return (
+        <div className="w-full h-screen bg-gray-100 p-4 overflow-hidden flex flex-col">
+            <div className="flex justify-between items-center mb-4">
+                <Breadcrumbs path={path} onBreadcrumbClick={goToIndex} />
+                <AccountSwitcher
+                    accounts={accounts}
+                    currentAccount={currentAccount}
+                    setCurrentAccount={setCurrentAccount}
+                    deleteCurrentAccount={deleteCurrentAccount}
+                    localNode={localNode}
+                />
+            </div>
+
+            <PageStack
+                path={path}
+                node={localNode}
+                goBack={goBack}
+                addPages={addPages}
+            >
+                {!currentAccount ? (
+                    <AddAccountForm addAccount={addAccount} />
+                ) : (
+                    <form
+                        onSubmit={handleCoValueIdSubmit}
+                        aria-hidden={path.length !== 0}
+                        className={clsx(
+                            "flex flex-col justify-center items-center gap-2 h-full w-full mb-20 ",
+                            "transition-all duration-150",
+                            path.length > 0
+                                ? "opacity-0 -translate-y-2 scale-95"
+                                : "opacity-100",
+                        )}
+                    >
+                        <fieldset className="flex flex-col gap-2 text-sm">
+                            <h2 className="text-3xl font-medium text-gray-950 text-center mb-4">
+                                Jazz CoValue Inspector
+                            </h2>
+                            <input
+                                className="border p-4 rounded-lg min-w-[21rem] font-mono"
+                                placeholder="co_z1234567890abcdef123456789"
+                                value={coValueId}
+                                onChange={(e) =>
+                                    setCoValueId(
+                                        e.target.value as CoID<RawCoValue>,
+                                    )
+                                }
+                            />
+                            <button
+                                type="submit"
+                                className="bg-indigo-500 hover:bg-indigo-500/80 text-white px-4 py-2 rounded-md"
+                            >
+                                Inspect
+                            </button>
+                            <hr />
+                            <button
+                                type="button"
+                                className="border inline-block px-2 py-1.5 text-black rounded"
+                                onClick={() => {
+                                    setCoValueId(currentAccount.id);
+                                    setPage(currentAccount.id);
+                                }}
+                            >
+                                Inspect My Account
+                            </button>
+                        </fieldset>
+                    </form>
+                )}
+            </PageStack>
+        </div>
+    );
+}
+
+function AccountSwitcher({
+    accounts,
+    currentAccount,
+    setCurrentAccount,
+    deleteCurrentAccount,
+    localNode,
+}: {
+    accounts: Account[];
+    currentAccount: Account | null;
+    setCurrentAccount: (account: Account | null) => void;
+    deleteCurrentAccount: () => void;
+    localNode: LocalNode | null;
+}) {
+    return (
+        <div className="relative flex items-center gap-1">
+            <select
+                value={currentAccount?.id || "add-account"}
+                onChange={(e) => {
+                    if (e.target.value === "add-account") {
+                        setCurrentAccount(null);
+                    } else {
+                        const account = accounts.find(
+                            (a) => a.id === e.target.value,
+                        );
+                        setCurrentAccount(account || null);
+                    }
+                }}
+                className="p-2 px-4 bg-gray-100/50 border border-indigo-500/10 backdrop-blur-sm rounded-md text-indigo-700 appearance-none"
+            >
+                {accounts.map((account) => (
+                    <option key={account.id} value={account.id}>
+                        {localNode ? (
+                            <AccountNameDisplay
+                                accountId={account.id}
+                                node={localNode}
+                            />
+                        ) : (
+                            account.id
+                        )}
+                    </option>
+                ))}
+                <option value="add-account">Add account</option>
+            </select>
+            {currentAccount && (
+                <button
+                    onClick={deleteCurrentAccount}
+                    className="p-3 rounded hover:bg-gray-200 transition-colors"
+                    title="Delete Account"
+                >
+                    <Trash2 size={16} className="text-gray-500" />
+                </button>
+            )}
+        </div>
+    );
+}
+
+function AddAccountForm({
+    addAccount,
+}: {
+    addAccount: (id: AccountID, secret: AgentSecret) => void;
+}) {
+    const [id, setId] = useState("");
+    const [secret, setSecret] = useState("");
+
+    const handleSubmit = (e: React.FormEvent) => {
+        e.preventDefault();
+        addAccount(id as AccountID, secret as AgentSecret);
+        setId("");
+        setSecret("");
+    };
+
+    return (
+        <form
+            onSubmit={handleSubmit}
+            className="flex flex-col gap-2 max-w-md mx-auto h-full justify-center"
+        >
+            <h2 className="text-2xl font-medium text-gray-900 mb-3">
+                Add an Account to Inspect
+            </h2>
+            <input
+                className="border py-2 px-3 rounded-md"
+                placeholder="Account ID"
+                value={id}
+                onChange={(e) => setId(e.target.value)}
+            />
+            <input
+                type="password"
+                className="border py-2 px-3 rounded-md"
+                placeholder="Account Secret"
+                value={secret}
+                onChange={(e) => setSecret(e.target.value)}
+            />
+            <button
+                type="submit"
+                className="bg-indigo-500 text-white px-4 py-2 rounded-md"
+            >
+                Add Account
+            </button>
+        </form>
+    );
+}
+
+function AccountNameDisplay({
+    accountId,
+    node,
+}: {
+    accountId: CoID<RawAccount>;
+    node: LocalNode;
+}) {
+    const { snapshot } = useResolvedCoValue(accountId, node);
+    const [name, setName] = useState<string | null>(null);
+
+    useEffect(() => {
+        if (snapshot && typeof snapshot === "object" && "profile" in snapshot) {
+            const profileId = snapshot.profile as CoID<RawCoValue>;
+            resolveCoValue(profileId, node).then((profileResult) => {
+                if (
+                    profileResult.snapshot &&
+                    typeof profileResult.snapshot === "object" &&
+                    "name" in profileResult.snapshot
+                ) {
+                    setName(profileResult.snapshot.name as string);
+                }
+            });
+        }
+    }, [snapshot, node]);
+
+    return name ? `${name} <${accountId}>` : accountId;
+}

examples/inspector/src/viewer/page-stack.tsx

@@ -0,0 +1,55 @@
+import { Page } from "./page"; // Assuming you have a Page component
+import { CoID, LocalNode, RawCoValue } from "cojson";
+
+// Define the structure of a page in the path
+interface PageInfo {
+    coId: CoID<RawCoValue>;
+    name?: string;
+}
+
+// Props for the PageStack component
+interface PageStackProps {
+    path: PageInfo[];
+    node?: LocalNode | null;
+    goBack: () => void;
+    addPages: (pages: PageInfo[]) => void;
+    children?: React.ReactNode;
+}
+
+export function PageStack({
+    path,
+    node,
+    goBack,
+    addPages,
+    children,
+}: PageStackProps) {
+    return (
+        <div className="relative mt-4 h-[calc(100vh-6rem)]">
+            {children && (
+                <div className="absolute inset-0 pb-20">{children}</div>
+            )}
+            {node &&
+                path.map((page, index) => (
+                    <Page
+                        key={`${page.coId}-${index}`}
+                        coId={page.coId}
+                        node={node}
+                        name={page.name || page.coId}
+                        onHeaderClick={goBack}
+                        onNavigate={addPages}
+                        isTopLevel={index === path.length - 1}
+                        style={{
+                            transform: `translateZ(${(index - path.length + 1) * 200}px) scale(${
+                                1 - (path.length - index - 1) * 0.05
+                            }) translateY(${-(index - path.length + 1) * -4}%)`,
+                            opacity: 1 - (path.length - index - 1) * 0.05,
+                            zIndex: index,
+                            transitionProperty: "transform, opacity",
+                            transitionDuration: "0.3s",
+                            transitionTimingFunction: "ease-out",
+                        }}
+                    />
+                ))}
+        </div>
+    );
+}

examples/inspector/src/viewer/page.tsx

@@ -0,0 +1,154 @@
+import clsx from "clsx";
+import { CoID, LocalNode, RawCoStream, RawCoValue } from "cojson";
+import { useEffect, useState } from "react";
+import { useResolvedCoValue } from "./use-resolve-covalue";
+import { GridView } from "./grid-view";
+import { PageInfo } from "./types";
+import { TableView } from "./table-viewer";
+import { TypeIcon } from "./type-icon";
+import { CoStreamView } from "./co-stream-view";
+import { AccountOrGroupPreview } from "./value-renderer";
+
+type PageProps = {
+    coId: CoID<RawCoValue>;
+    node: LocalNode;
+    name: string;
+    onNavigate: (newPages: PageInfo[]) => void;
+    onHeaderClick?: () => void;
+    isTopLevel?: boolean;
+    style: React.CSSProperties;
+};
+
+export function Page({
+    coId,
+    node,
+    name,
+    onNavigate,
+    onHeaderClick,
+    style,
+    isTopLevel,
+}: PageProps) {
+    const { value, snapshot, type, extendedType } = useResolvedCoValue(
+        coId,
+        node,
+    );
+    const [viewMode, setViewMode] = useState<"grid" | "table">("grid");
+
+    const supportsTableView = type === "colist" || extendedType === "record";
+
+    // Automatically switch to table view if the page is a CoMap record
+    useEffect(() => {
+        if (supportsTableView) {
+            setViewMode("table");
+        }
+    }, [supportsTableView]);
+
+    if (snapshot === "unavailable") {
+        return <div style={style}>Data unavailable</div>;
+    }
+
+    if (!snapshot) {
+        return <div style={style}></div>;
+    }
+
+    return (
+        <div
+            style={style}
+            className={clsx(
+                "absolute inset-0 border border-gray-900/5 bg-clip-padding bg-white rounded-xl shadow-lg p-6 animate-in",
+            )}
+        >
+            {!isTopLevel && (
+                <div
+                    className="absolute inset-x-0 top-0 h-10"
+                    aria-label="Back"
+                    onClick={() => {
+                        onHeaderClick?.();
+                    }}
+                    aria-hidden="true"
+                ></div>
+            )}
+            <div className="flex justify-between items-center mb-4">
+                <div className="flex flex-col gap-2">
+                    <h2 className="text-2xl font-bold flex items-start flex-col gap-1">
+                        <span>
+                            {name}
+                            {typeof snapshot === "object" &&
+                            "name" in snapshot ? (
+                                <span className="text-gray-600 font-medium">
+                                    {" "}
+                                    {
+                                        (
+                                            snapshot as {
+                                                name: string;
+                                            }
+                                        ).name
+                                    }
+                                </span>
+                            ) : null}
+                        </span>
+                    </h2>
+                    <div className="flex items-center gap-2">
+                        <span className="text-xs text-gray-700 font-medium py-0.5 px-1 -ml-0.5 rounded bg-gray-700/5 inline-block font-mono">
+                            {type && (
+                                <TypeIcon
+                                    type={type}
+                                    extendedType={extendedType}
+                                />
+                            )}
+                        </span>
+                        <span className="text-xs text-gray-700 font-medium py-0.5 px-1 -ml-0.5 rounded bg-gray-700/5 inline-block font-mono">
+                            {coId}
+                        </span>
+                    </div>
+                </div>
+                {/* {supportsTableView && (
+          <button
+            onClick={toggleViewMode}
+            className="px-4 py-2 bg-blue-500 text-white rounded hover:bg-blue-600 transition-colors"
+          >
+            {viewMode === "grid" ? "Table View" : "Grid View"}
+          </button>
+        )} */}
+            </div>
+            <div className="overflow-auto max-h-[calc(100%-4rem)]">
+                {type === "costream" ? (
+                    <CoStreamView
+                        data={snapshot}
+                        onNavigate={onNavigate}
+                        node={node}
+                        value={value as RawCoStream}
+                    />
+                ) : viewMode === "grid" ? (
+                    <GridView
+                        data={snapshot}
+                        onNavigate={onNavigate}
+                        node={node}
+                    />
+                ) : (
+                    <TableView
+                        data={snapshot}
+                        node={node}
+                        onNavigate={onNavigate}
+                    />
+                )}
+                {/* --- */}
+                {extendedType !== "account" && extendedType !== "group" && (
+                    <div className="text-xs text-gray-500 mt-4">
+                        Owned by{" "}
+                        <AccountOrGroupPreview
+                            coId={value.group.id}
+                            node={node}
+                            showId
+                            onClick={() => {
+                                onNavigate([
+                                    { coId: value.group.id, name: "owner" },
+                                ]);
+                            }}
+                        />
+                    </div>
+                )}
+            </div>
+        </div>
+    );
+}

examples/inspector/src/viewer/table-viewer.tsx

@@ -0,0 +1,142 @@
+import { CoID, LocalNode, RawCoValue } from "cojson";
+import { JsonObject } from "cojson/src/jsonValue";
+import { PageInfo } from "./types";
+import { useMemo, useState } from "react";
+import { ValueRenderer } from "./value-renderer";
+import { LinkIcon } from "../link-icon";
+import { useResolvedCoValues } from "./use-resolve-covalue";
+
+export function TableView({
+    data,
+    node,
+    onNavigate,
+}: {
+    data: JsonObject;
+    node: LocalNode;
+    onNavigate: (pages: PageInfo[]) => void;
+}) {
+    const [visibleRowsCount, setVisibleRowsCount] = useState(10);
+    const [coIdArray, visibleRows] = useMemo(() => {
+        const coIdArray = Array.isArray(data)
+            ? data
+            : Object.values(data).every(
+                    (k) => typeof k === "string" && k.startsWith("co_"),
+                )
+              ? Object.values(data).map((k) => k as CoID<RawCoValue>)
+              : [];
+
+        const visibleRows = coIdArray.slice(0, visibleRowsCount);
+
+        return [coIdArray, visibleRows];
+    }, [data, visibleRowsCount]);
+    const resolvedRows = useResolvedCoValues(visibleRows, node);
+
+    const hasMore = visibleRowsCount < coIdArray.length;
+
+    if (!coIdArray.length) {
+        return <div>No data to display</div>;
+    }
+
+    if (resolvedRows.length === 0) {
+        return <div>Loading...</div>;
+    }
+
+    const keys = Array.from(
+        new Set(
+            resolvedRows.flatMap((item) => Object.keys(item.snapshot || {})),
+        ),
+    );
+
+    const loadMore = () => {
+        setVisibleRowsCount((prevVisibleRows) => prevVisibleRows + 10);
+    };
+
+    return (
+        <div>
+            <table className="min-w-full divide-y divide-gray-200">
+                <thead className="sticky top-0 border-b">
+                    <tr>
+                        {["", ...keys].map((key) => (
+                            <th
+                                key={key}
+                                className="px-4 py-3 bg-gray-50 text-left text-xs font-medium text-gray-500 rounded"
+                            >
+                                {key}
+                            </th>
+                        ))}
+                    </tr>
+                </thead>
+                <tbody className="bg-white divide-y divide-gray-200">
+                    {resolvedRows
+                        .slice(0, visibleRowsCount)
+                        .map((item, index) => (
+                            <tr key={index}>
+                                <td className="px-1 py-0">
+                                    <button
+                                        onClick={() =>
+                                            onNavigate([
+                                                {
+                                                    coId: item.value!.id,
+                                                    name: index.toString(),
+                                                },
+                                            ])
+                                        }
+                                        className="px-4 py-4 whitespace-nowrap text-sm text-gray-500 hover:text-blue-500 hover:bg-gray-100 rounded"
+                                    >
+                                        <LinkIcon />
+                                    </button>
+                                </td>
+                                {keys.map((key) => (
+                                    <td
+                                        key={key}
+                                        className="px-4 py-4 whitespace-nowrap text-sm text-gray-500"
+                                    >
+                                        <ValueRenderer
+                                            json={
+                                                (item.snapshot as JsonObject)[
+                                                    key
+                                                ]
+                                            }
+                                            onCoIDClick={(coId) => {
+                                                async function handleClick() {
+                                                    onNavigate([
+                                                        {
+                                                            coId: item.value!
+                                                                .id,
+                                                            name: index.toString(),
+                                                        },
+                                                        {
+                                                            coId: coId,
+                                                            name: key,
+                                                        },
+                                                    ]);
+                                                }
+
+                                                handleClick();
+                                            }}
+                                        />
+                                    </td>
+                                ))}
+                            </tr>
+                        ))}
+                </tbody>
+            </table>
+            <div className="py-4 text-gray-500 flex items-center justify-between gap-2">
+                <span>
+                    Showing {Math.min(visibleRowsCount, coIdArray.length)} of{" "}
+                    {coIdArray.length}
+                </span>
+                {hasMore && (
+                    <div className="text-center">
+                        <button
+                            onClick={loadMore}
+                            className="px-4 py-2 bg-blue-500 text-white rounded hover:bg-blue-600"
+                        >
+                            Load More
+                        </button>
+                    </div>
+                )}
+            </div>
+        </div>
+    );
+}

examples/inspector/src/viewer/type-icon.tsx

@@ -0,0 +1,47 @@
+import { CoID, LocalNode, RawCoValue } from "cojson";
+import {
+    CoJsonType,
+    ExtendedCoJsonType,
+    useResolvedCoValue,
+} from "./use-resolve-covalue";
+
+export const TypeIcon = ({
+    type,
+    extendedType,
+}: {
+    type: CoJsonType;
+    extendedType?: ExtendedCoJsonType;
+}) => {
+    const iconMap: Record<ExtendedCoJsonType | CoJsonType, string> = {
+        record: "{} Record",
+        image: "🖼️ Image",
+        comap: "{} CoMap",
+        costream: "≋ CoStream",
+        colist: "☰ CoList",
+        account: "👤 Account",
+        group: "👥 Group",
+    };
+
+    const iconKey = extendedType || type;
+    const icon = iconMap[iconKey as keyof typeof iconMap];
+
+    return icon ? <span className="font-mono">{icon}</span> : null;
+};
+
+export const ResolveIcon = ({
+    coId,
+    node,
+}: {
+    coId: CoID<RawCoValue>;
+    node: LocalNode;
+}) => {
+    const { type, extendedType, snapshot } = useResolvedCoValue(coId, node);
+
+    if (snapshot === "unavailable" && !type) {
+        return <div className="text-gray-600 font-medium">Unavailable</div>;
+    }
+
+    if (!type) return <div className="whitespace-pre w-14 font-mono"> </div>;
+
+    return <TypeIcon type={type} extendedType={extendedType} />;
+};

examples/inspector/src/viewer/types.ts

@@ -0,0 +1,9 @@
+import { CoID, RawCoValue } from "cojson";
+
+export type PageInfo = {
+    coId: CoID<RawCoValue>;
+    name?: string;
+};
+
+export const isCoId = (coId: unknown): coId is CoID<RawCoValue> =>
+    typeof coId === "string" && coId.startsWith("co_");

examples/inspector/src/viewer/use-page-path.ts

@@ -0,0 +1,107 @@
+import { useState, useEffect, useCallback } from "react";
+import { PageInfo } from "./types";
+import { CoID, RawCoValue } from "cojson";
+
+export function usePagePath(defaultPath?: PageInfo[]) {
+    const [path, setPath] = useState<PageInfo[]>(() => {
+        const hash = window.location.hash.slice(2); // Remove '#/'
+        if (hash) {
+            try {
+                return decodePathFromHash(hash);
+            } catch (e) {
+                console.error("Failed to parse hash:", e);
+            }
+        }
+        return defaultPath || [];
+    });
+
+    const updatePath = useCallback((newPath: PageInfo[]) => {
+        setPath(newPath);
+        const hash = encodePathToHash(newPath);
+        window.location.hash = `#/${hash}`;
+    }, []);
+
+    useEffect(() => {
+        const handleHashChange = () => {
+            const hash = window.location.hash.slice(2);
+            if (hash) {
+                try {
+                    const newPath = decodePathFromHash(hash);
+                    setPath(newPath);
+                } catch (e) {
+                    console.error("Failed to parse hash:", e);
+                }
+            } else if (defaultPath) {
+                setPath(defaultPath);
+            }
+        };
+
+        window.addEventListener("hashchange", handleHashChange);
+        return () => window.removeEventListener("hashchange", handleHashChange);
+    }, [defaultPath]);
+
+    useEffect(() => {
+        if (
+            defaultPath &&
+            JSON.stringify(path) !== JSON.stringify(defaultPath)
+        ) {
+            updatePath(defaultPath);
+        }
+    }, [defaultPath, path, updatePath]);
+
+    const addPages = useCallback(
+        (newPages: PageInfo[]) => {
+            updatePath([...path, ...newPages]);
+        },
+        [path, updatePath],
+    );
+
+    const goToIndex = useCallback(
+        (index: number) => {
+            updatePath(path.slice(0, index + 1));
+        },
+        [path, updatePath],
+    );
+
+    const setPage = useCallback(
+        (coId: CoID<RawCoValue>) => {
+            updatePath([{ coId, name: "Root" }]);
+        },
+        [updatePath],
+    );
+
+    const goBack = useCallback(() => {
+        if (path.length > 1) {
+            updatePath(path.slice(0, path.length - 1));
+        }
+    }, [path, updatePath]);
+
+    return {
+        path,
+        setPage,
+        addPages,
+        goToIndex,
+        goBack,
+    };
+}
+
+function encodePathToHash(path: PageInfo[]): string {
+    return path
+        .map((page) => {
+            if (page.name && page.name !== "Root") {
+                return `${page.coId}:${encodeURIComponent(page.name)}`;
+            }
+            return page.coId;
+        })
+        .join("/");
+}
+
+function decodePathFromHash(hash: string): PageInfo[] {
+    return hash.split("/").map((segment) => {
+        const [coId, encodedName] = segment.split(":");
+        return {
+            coId,
+            name: encodedName ? decodeURIComponent(encodedName) : undefined,
+        } as PageInfo;
+    });
+}

examples/inspector/src/viewer/use-resolve-covalue.ts

@@ -0,0 +1,152 @@
+import { CoID, LocalNode, RawBinaryCoStream, RawCoValue } from "cojson";
+import { useEffect, useState } from "react";
+
+export type CoJsonType = "comap" | "costream" | "colist";
+export type ExtendedCoJsonType = "image" | "record" | "account" | "group";
+
+type JSON = string | number | boolean | null | JSON[] | { [key: string]: JSON };
+type JSONObject = { [key: string]: JSON };
+
+type ResolvedImageDefinition = {
+    originalSize: [number, number];
+    placeholderDataURL?: string;
+    [res: `${number}x${number}`]: RawBinaryCoStream["id"];
+};
+
+// Type guard for browser image
+export const isBrowserImage = (
+    coValue: JSONObject,
+): coValue is ResolvedImageDefinition => {
+    return "originalSize" in coValue && "placeholderDataURL" in coValue;
+};
+
+export type ResolvedGroup = {
+    readKey: string;
+    [key: string]: JSON;
+};
+
+export const isGroup = (coValue: JSONObject): coValue is ResolvedGroup => {
+    return "readKey" in coValue;
+};
+
+export type ResolvedAccount = {
+    profile: {
+        name: string;
+    };
+    [key: string]: JSON;
+};
+
+export const isAccount = (coValue: JSONObject): coValue is ResolvedAccount => {
+    return isGroup(coValue) && "profile" in coValue;
+};
+
+export async function resolveCoValue(
+    coValueId: CoID<RawCoValue>,
+    node: LocalNode,
+): Promise<
+    | {
+          value: RawCoValue;
+          snapshot: JSONObject;
+          type: CoJsonType | null;
+          extendedType: ExtendedCoJsonType | undefined;
+      }
+    | {
+          value: undefined;
+          snapshot: "unavailable";
+          type: null;
+          extendedType: undefined;
+      }
+> {
+    const value = await node.load(coValueId);
+
+    if (value === "unavailable") {
+        return {
+            value: undefined,
+            snapshot: "unavailable",
+            type: null,
+            extendedType: undefined,
+        };
+    }
+
+    const snapshot = value.toJSON() as JSONObject;
+    const type = value.type as CoJsonType;
+
+    // Determine extended type
+    let extendedType: ExtendedCoJsonType | undefined;
+
+    if (type === "comap") {
+        if (isBrowserImage(snapshot)) {
+            extendedType = "image";
+        } else if (isAccount(snapshot)) {
+            extendedType = "account";
+        } else if (isGroup(snapshot)) {
+            extendedType = "group";
+        } else {
+            // This check is a bit of a hack
+            // There might be a better way to do this
+            const children = Object.values(snapshot).slice(0, 10);
+            if (
+                children.every(
+                    (c) => typeof c === "string" && c.startsWith("co_"),
+                ) &&
+                children.length > 3
+            ) {
+                extendedType = "record";
+            }
+        }
+    }
+
+    return {
+        value,
+        snapshot,
+        type,
+        extendedType,
+    };
+}
+
+export function useResolvedCoValue(
+    coValueId: CoID<RawCoValue>,
+    node: LocalNode,
+) {
+    const [result, setResult] =
+        useState<Awaited<ReturnType<typeof resolveCoValue>>>();
+
+    useEffect(() => {
+        resolveCoValue(coValueId, node).then(setResult);
+    }, [coValueId, node]);
+
+    return (
+        result || {
+            value: undefined,
+            snapshot: undefined,
+            type: undefined,
+            extendedType: undefined,
+        }
+    );
+}
+
+export function useResolvedCoValues(
+    coValueIds: CoID<RawCoValue>[],
+    node: LocalNode,
+) {
+    const [results, setResults] = useState<
+        Awaited<ReturnType<typeof resolveCoValue>>[]
+    >([]);
+
+    useEffect(() => {
+        console.log("RETECHING", coValueIds);
+        const fetchResults = async () => {
+            if (coValueIds.length === 0) return;
+            const resolvedValues = await Promise.all(
+                coValueIds.map((coValueId) => resolveCoValue(coValueId, node)),
+            );
+
+            console.log({ resolvedValues });
+            setResults(resolvedValues);
+        };
+
+        fetchResults();
+    }, [coValueIds, node]);
+
+    return results;
+}

examples/inspector/src/viewer/value-renderer.tsx

@@ -0,0 +1,248 @@
+import clsx from "clsx";
+import { CoID, JsonValue, LocalNode, RawCoValue } from "cojson";
+import { LinkIcon } from "../link-icon";
+import {
+    isBrowserImage,
+    resolveCoValue,
+    useResolvedCoValue,
+} from "./use-resolve-covalue";
+import React, { useEffect, useState } from "react";
+
+// Is there a chance we can pass the actual CoValue here?
+export function ValueRenderer({
+    json,
+    compact,
+    onCoIDClick,
+}: {
+    json: JsonValue | undefined;
+    compact?: boolean;
+    onCoIDClick?: (childNode: CoID<RawCoValue>) => void;
+}) {
+    if (typeof json === "undefined" || json === undefined) {
+        return <span className="text-gray-400">undefined</span>;
+    }
+
+    if (json === null) {
+        return <span className="text-gray-400">null</span>;
+    }
+
+    if (typeof json === "string" && json.startsWith("co_")) {
+        return (
+            <span
+                className={clsx(
+                    "inline-flex gap-1 items-center",
+                    onCoIDClick &&
+                        "text-blue-500 cursor-pointer hover:underline",
+                )}
+                onClick={() => {
+                    onCoIDClick?.(json as CoID<RawCoValue>);
+                }}
+            >
+                {json}
+                {onCoIDClick && <LinkIcon />}
+            </span>
+        );
+    }
+
+    if (typeof json === "string") {
+        return (
+            <span className="text-green-900 font-mono">
+                {/* <span className="select-none opacity-70">{'"'}</span> */}
+                {json}
+                {/* <span className="select-none opacity-70">{'"'}</span> */}
+            </span>
+        );
+    }
+
+    if (typeof json === "number") {
+        return <span className="text-purple-500">{json}</span>;
+    }
+
+    if (typeof json === "boolean") {
+        return (
+            <span
+                className={clsx(
+                    json
+                        ? "text-green-700 bg-green-700/5"
+                        : "text-amber-700 bg-amber-500/5",
+                    "font-mono",
+                    "inline-block px-1 py-0.5 rounded",
+                )}
+            >
+                {json.toString()}
+            </span>
+        );
+    }
+
+    if (Array.isArray(json)) {
+        return (
+            <span title={JSON.stringify(json)}>
+                Array <span className="text-gray-500">({json.length})</span>
+            </span>
+        );
+    }
+
+    if (typeof json === "object") {
+        return (
+            <span
+                title={JSON.stringify(json, null, 2)}
+                className="inline-block max-w-64 truncate"
+            >
+                {compact ? (
+                    <span>
+                        Object{" "}
+                        <span className="text-gray-500">
+                            ({Object.keys(json).length})
+                        </span>
+                    </span>
+                ) : (
+                    JSON.stringify(json, null, 2)
+                )}
+            </span>
+        );
+    }
+
+    return <span>{String(json)}</span>;
+}
+
+export const CoMapPreview = ({
+    coId,
+    node,
+    limit = 6,
+}: {
+    coId: CoID<RawCoValue>;
+    node: LocalNode;
+    limit?: number;
+}) => {
+    const { value, snapshot, type, extendedType } = useResolvedCoValue(
+        coId,
+        node,
+    );
+
+    if (!snapshot) {
+        return (
+            <div className="rounded bg-gray-100 animate-pulse whitespace-pre w-24">
+                {" "}
+            </div>
+        );
+    }
+
+    if (snapshot === "unavailable" && !value) {
+        return <div className="text-gray-500">Unavailable</div>;
+    }
+
+    if (extendedType === "image" && isBrowserImage(snapshot)) {
+        return (
+            <div>
+                <img
+                    src={snapshot.placeholderDataURL}
+                    className="size-8 border-2 border-white drop-shadow-md my-2"
+                />
+                <span className="text-gray-500 text-sm">
+                    {snapshot.originalSize[0]} x {snapshot.originalSize[1]}
+                </span>
+
+                {/* <CoMapPreview coId={value[]} node={node} /> */}
+                {/* <ProgressiveImg image={value}>
+                    {({ src }) => <img src={src} className={clsx("w-full")} />}
+                </ProgressiveImg> */}
+            </div>
+        );
+    }
+
+    if (extendedType === "record") {
+        return (
+            <div>
+                Record{" "}
+                <span className="text-gray-500">
+                    ({Object.keys(snapshot).length})
+                </span>
+            </div>
+        );
+    }
+
+    if (type === "colist") {
+        return (
+            <div>
+                List{" "}
+                <span className="text-gray-500">
+                    ({(snapshot as unknown as []).length})
+                </span>
+            </div>
+        );
+    }
+
+    return (
+        <div className="text-sm flex flex-col gap-2 items-start">
+            <div className="grid grid-cols-[auto_1fr] gap-2">
+                {Object.entries(snapshot)
+                    .slice(0, limit)
+                    .map(([key, value]) => (
+                        <React.Fragment key={key}>
+                            <span className="font-medium">{key}: </span>
+                            <span>
+                                <ValueRenderer json={value} />
+                            </span>
+                        </React.Fragment>
+                    ))}
+            </div>
+            {Object.entries(snapshot).length > limit && (
+                <div className="text-left text-xs text-gray-500 mt-2">
+                    {Object.entries(snapshot).length - limit} more
+                </div>
+            )}
+        </div>
+    );
+};
+
+export function AccountOrGroupPreview({
+    coId,
+    node,
+    showId = false,
+    onClick,
+}: {
+    coId: CoID<RawCoValue>;
+    node: LocalNode;
+    showId?: boolean;
+    onClick?: (name?: string) => void;
+}) {
+    const { snapshot, extendedType } = useResolvedCoValue(coId, node);
+    const [name, setName] = useState<string | null>(null);
+
+    useEffect(() => {
+        if (extendedType === "account") {
+            resolveCoValue(
+                (snapshot as unknown as { profile: CoID<RawCoValue> }).profile,
+                node,
+            ).then(({ snapshot }) => {
+                if (
+                    typeof snapshot === "object" &&
+                    "name" in snapshot &&
+                    typeof snapshot.name === "string"
+                ) {
+                    setName(snapshot.name);
+                }
+            });
+        }
+    }, [snapshot, node, extendedType]);
+
+    if (!snapshot) return <span>Loading...</span>;
+    if (extendedType !== "account" && extendedType !== "group") {
+        return <span>CoID is not an account or group</span>;
+    }
+
+    const displayName =
+        extendedType === "account" ? name || "Account" : "Group";
+    const displayText = showId ? `${displayName} (${coId})` : displayName;
+
+    const props = onClick
+        ? {
+              onClick: () => onClick(displayName),
+              className: "text-blue-500 cursor-pointer hover:underline",
+          }
+        : {
+              className: "text-gray-500",
+          };
+
+    return <span {...props}>{displayText}</span>;
+}

examples/pets/CHANGELOG.md

@@ -1,5 +1,330 @@
 # jazz-example-pets
 
+## 0.0.99-neverthrow.6
+
+### Patch Changes
+
+-   jazz-react@0.7.34-neverthrow.8
+-   jazz-tools@0.7.34-neverthrow.8
+-   jazz-browser-media-images@0.7.34-neverthrow.8
+
+## 0.0.99-neverthrow.5
+
+### Patch Changes
+
+-   jazz-react@0.7.34-neverthrow.7
+-   jazz-tools@0.7.34-neverthrow.7
+-   jazz-browser-media-images@0.7.34-neverthrow.7
+
+## 0.0.99-neverthrow.4
+
+### Patch Changes
+
+-   jazz-react@0.7.34-neverthrow.4
+-   jazz-tools@0.7.34-neverthrow.4
+-   jazz-browser-media-images@0.7.34-neverthrow.4
+
+## 0.0.99-neverthrow.3
+
+### Patch Changes
+
+-   jazz-react@0.7.34-neverthrow.3
+-   jazz-tools@0.7.34-neverthrow.3
+-   jazz-browser-media-images@0.7.34-neverthrow.3
+
+## 0.0.99-neverthrow.2
+
+### Patch Changes
+
+-   jazz-browser-media-images@0.7.34-neverthrow.2
+-   jazz-react@0.7.34-neverthrow.2
+
+## 0.0.99-neverthrow.1
+
+### Patch Changes
+
+-   jazz-react@0.7.34-neverthrow.1
+-   jazz-tools@0.7.34-neverthrow.1
+-   jazz-browser-media-images@0.7.34-neverthrow.1
+
+## 0.0.99-neverthrow.0
+
+### Patch Changes
+
+-   jazz-react@0.7.34-neverthrow.0
+-   jazz-tools@0.7.34-neverthrow.0
+-   jazz-browser-media-images@0.7.34-neverthrow.0
+
+## 0.0.98
+
+### Patch Changes
+
+-   jazz-react@0.7.33
+-   jazz-tools@0.7.33
+-   jazz-browser-media-images@0.7.33
+
+## 0.0.98-hotfixes.5
+
+### Patch Changes
+
+-   jazz-react@0.7.33-hotfixes.5
+-   jazz-tools@0.7.33-hotfixes.5
+-   jazz-browser-media-images@0.7.33-hotfixes.5
+
+## 0.0.98-hotfixes.4
+
+### Patch Changes
+
+-   jazz-react@0.7.33-hotfixes.4
+-   jazz-tools@0.7.33-hotfixes.4
+-   jazz-browser-media-images@0.7.33-hotfixes.4
+
+## 0.0.98-hotfixes.3
+
+### Patch Changes
+
+-   jazz-react@0.7.33-hotfixes.3
+-   jazz-tools@0.7.33-hotfixes.3
+-   jazz-browser-media-images@0.7.33-hotfixes.3
+
+## 0.0.98-hotfixes.2
+
+### Patch Changes
+
+-   jazz-browser-media-images@0.7.33-hotfixes.2
+-   jazz-react@0.7.33-hotfixes.2
+
+## 0.0.98-hotfixes.1
+
+### Patch Changes
+
+-   jazz-browser-media-images@0.7.33-hotfixes.1
+-   jazz-react@0.7.33-hotfixes.1
+
+## 0.0.98-hotfixes.0
+
+### Patch Changes
+
+-   jazz-react@0.7.33-hotfixes.0
+-   jazz-tools@0.7.33-hotfixes.0
+-   jazz-browser-media-images@0.7.33-hotfixes.0
+
+## 0.0.97
+
+### Patch Changes
+
+-   Updated dependencies
+    -   jazz-tools@0.7.32
+    -   jazz-browser-media-images@0.7.32
+    -   jazz-react@0.7.32
+
+## 0.0.96
+
+### Patch Changes
+
+-   jazz-react@0.7.31
+-   jazz-tools@0.7.31
+-   jazz-browser-media-images@0.7.31
+
+## 0.0.95
+
+### Patch Changes
+
+-   jazz-browser-media-images@0.7.30
+-   jazz-react@0.7.30
+
+## 0.0.94
+
+### Patch Changes
+
+-   jazz-react@0.7.29
+-   jazz-tools@0.7.29
+-   jazz-browser-media-images@0.7.29
+
+## 0.0.93
+
+### Patch Changes
+
+-   jazz-react@0.7.28
+-   jazz-tools@0.7.28
+-   jazz-browser-media-images@0.7.28
+
+## 0.0.92
+
+### Patch Changes
+
+-   jazz-browser-media-images@0.7.27
+-   jazz-react@0.7.27
+
+## 0.0.91
+
+### Patch Changes
+
+-   Updated dependencies
+    -   jazz-react@0.7.26
+    -   jazz-tools@0.7.26
+    -   jazz-browser-media-images@0.7.26
+
+## 0.0.90
+
+### Patch Changes
+
+-   Updated dependencies
+    -   jazz-tools@0.7.25
+    -   jazz-browser-media-images@0.7.25
+    -   jazz-react@0.7.25
+
+## 0.0.89
+
+### Patch Changes
+
+-   Updated dependencies
+    -   jazz-tools@0.7.24
+    -   jazz-browser-media-images@0.7.24
+    -   jazz-react@0.7.24
+
+## 0.0.88
+
+### Patch Changes
+
+-   Updated dependencies
+    -   jazz-react@0.7.23
+    -   jazz-tools@0.7.23
+    -   jazz-browser-media-images@0.7.23
+
+## 0.0.87
+
+### Patch Changes
+
+-   jazz-browser-media-images@0.7.22
+-   jazz-react@0.7.22
+
+## 0.0.86
+
+### Patch Changes
+
+-   Updated dependencies
+    -   jazz-tools@0.7.21
+    -   jazz-browser-media-images@0.7.21
+    -   jazz-react@0.7.21
+
+## 0.0.85
+
+### Patch Changes
+
+-   Updated dependencies
+    -   jazz-tools@0.7.20
+    -   jazz-browser-media-images@0.7.20
+    -   jazz-react@0.7.20
+
+## 0.0.84
+
+### Patch Changes
+
+-   Updated dependencies
+    -   jazz-tools@0.7.19
+    -   jazz-browser-media-images@0.7.19
+    -   jazz-react@0.7.19
+
+## 0.0.83
+
+### Patch Changes
+
+-   jazz-react@0.7.18
+-   jazz-tools@0.7.18
+-   jazz-browser-media-images@0.7.18
+
+## 0.0.82
+
+### Patch Changes
+
+-   jazz-react@0.7.17
+-   jazz-tools@0.7.17
+-   jazz-browser-media-images@0.7.17
+
+## 0.0.81
+
+### Patch Changes
+
+-   Updated dependencies
+    -   jazz-tools@0.7.16
+    -   jazz-browser-media-images@0.7.16
+    -   jazz-react@0.7.16
+
+## 0.0.80
+
+### Patch Changes
+
+-   Updated dependencies
+    -   jazz-react@0.7.15
+
+## 0.0.79
+
+### Patch Changes
+
+-   Updated dependencies
+    -   jazz-tools@0.7.14
+    -   jazz-react@0.7.14
+    -   jazz-browser-media-images@0.7.14
+
+## 0.0.78
+
+### Patch Changes
+
+-   Updated dependencies
+    -   jazz-tools@0.7.13
+    -   jazz-browser-media-images@0.7.13
+    -   jazz-react@0.7.13
+
+## 0.0.77
+
+### Patch Changes
+
+-   Updated dependencies
+    -   jazz-tools@0.7.12
+    -   jazz-browser-media-images@0.7.12
+    -   jazz-react@0.7.12
+
+## 0.0.76
+
+### Patch Changes
+
+-   jazz-react@0.7.11
+-   jazz-tools@0.7.11
+-   jazz-browser-media-images@0.7.11
+
+## 0.0.75
+
+### Patch Changes
+
+-   jazz-react@0.7.10
+-   jazz-tools@0.7.10
+-   jazz-browser-media-images@0.7.10
+
+## 0.0.74
+
+### Patch Changes
+
+-   jazz-react@0.7.9
+-   jazz-tools@0.7.9
+-   jazz-browser-media-images@0.7.9
+
+## 0.0.73
+
+### Patch Changes
+
+-   Updated dependencies
+    -   jazz-tools@0.7.8
+    -   jazz-browser-media-images@0.7.8
+    -   jazz-react@0.7.8
+
+## 0.0.72
+
+### Patch Changes
+
+-   Updated dependencies [9fdc91c]
+    -   jazz-react@0.7.7
+
 ## 0.0.71
 
 ### Patch Changes

examples/pets/package.json

@@ -1,7 +1,7 @@
 {
   "name": "jazz-example-pets",
   "private": true,
-  "version": "0.0.71",
+  "version": "0.0.99-neverthrow.6",
   "type": "module",
   "scripts": {
     "dev": "vite",

examples/todo/CHANGELOG.md

@@ -1,5 +1,292 @@
 # jazz-example-todo
 
+## 0.0.98-neverthrow.6
+
+### Patch Changes
+
+-   jazz-react@0.7.34-neverthrow.8
+-   jazz-tools@0.7.34-neverthrow.8
+
+## 0.0.98-neverthrow.5
+
+### Patch Changes
+
+-   jazz-react@0.7.34-neverthrow.7
+-   jazz-tools@0.7.34-neverthrow.7
+
+## 0.0.98-neverthrow.4
+
+### Patch Changes
+
+-   jazz-react@0.7.34-neverthrow.4
+-   jazz-tools@0.7.34-neverthrow.4
+
+## 0.0.98-neverthrow.3
+
+### Patch Changes
+
+-   jazz-react@0.7.34-neverthrow.3
+-   jazz-tools@0.7.34-neverthrow.3
+
+## 0.0.98-neverthrow.2
+
+### Patch Changes
+
+-   jazz-react@0.7.34-neverthrow.2
+
+## 0.0.98-neverthrow.1
+
+### Patch Changes
+
+-   jazz-react@0.7.34-neverthrow.1
+-   jazz-tools@0.7.34-neverthrow.1
+
+## 0.0.98-neverthrow.0
+
+### Patch Changes
+
+-   jazz-react@0.7.34-neverthrow.0
+-   jazz-tools@0.7.34-neverthrow.0
+
+## 0.0.97
+
+### Patch Changes
+
+-   jazz-react@0.7.33
+-   jazz-tools@0.7.33
+
+## 0.0.97-hotfixes.5
+
+### Patch Changes
+
+-   jazz-react@0.7.33-hotfixes.5
+-   jazz-tools@0.7.33-hotfixes.5
+
+## 0.0.97-hotfixes.4
+
+### Patch Changes
+
+-   jazz-react@0.7.33-hotfixes.4
+-   jazz-tools@0.7.33-hotfixes.4
+
+## 0.0.97-hotfixes.3
+
+### Patch Changes
+
+-   jazz-react@0.7.33-hotfixes.3
+-   jazz-tools@0.7.33-hotfixes.3
+
+## 0.0.97-hotfixes.2
+
+### Patch Changes
+
+-   jazz-react@0.7.33-hotfixes.2
+
+## 0.0.97-hotfixes.1
+
+### Patch Changes
+
+-   jazz-react@0.7.33-hotfixes.1
+
+## 0.0.97-hotfixes.0
+
+### Patch Changes
+
+-   jazz-react@0.7.33-hotfixes.0
+-   jazz-tools@0.7.33-hotfixes.0
+
+## 0.0.96
+
+### Patch Changes
+
+-   Updated dependencies
+    -   jazz-tools@0.7.32
+    -   jazz-react@0.7.32
+
+## 0.0.95
+
+### Patch Changes
+
+-   jazz-react@0.7.31
+-   jazz-tools@0.7.31
+
+## 0.0.94
+
+### Patch Changes
+
+-   jazz-react@0.7.30
+
+## 0.0.93
+
+### Patch Changes
+
+-   jazz-react@0.7.29
+-   jazz-tools@0.7.29
+
+## 0.0.92
+
+### Patch Changes
+
+-   jazz-react@0.7.28
+-   jazz-tools@0.7.28
+
+## 0.0.91
+
+### Patch Changes
+
+-   jazz-react@0.7.27
+
+## 0.0.90
+
+### Patch Changes
+
+-   Updated dependencies
+    -   jazz-react@0.7.26
+    -   jazz-tools@0.7.26
+
+## 0.0.89
+
+### Patch Changes
+
+-   Updated dependencies
+    -   jazz-tools@0.7.25
+    -   jazz-react@0.7.25
+
+## 0.0.88
+
+### Patch Changes
+
+-   Updated dependencies
+    -   jazz-tools@0.7.24
+    -   jazz-react@0.7.24
+
+## 0.0.87
+
+### Patch Changes
+
+-   Updated dependencies
+    -   jazz-react@0.7.23
+    -   jazz-tools@0.7.23
+
+## 0.0.86
+
+### Patch Changes
+
+-   jazz-react@0.7.22
+
+## 0.0.85
+
+### Patch Changes
+
+-   Updated dependencies
+    -   jazz-tools@0.7.21
+    -   jazz-react@0.7.21
+
+## 0.0.84
+
+### Patch Changes
+
+-   Updated dependencies
+    -   jazz-tools@0.7.20
+    -   jazz-react@0.7.20
+
+## 0.0.83
+
+### Patch Changes
+
+-   Updated dependencies
+    -   jazz-tools@0.7.19
+    -   jazz-react@0.7.19
+
+## 0.0.82
+
+### Patch Changes
+
+-   jazz-react@0.7.18
+-   jazz-tools@0.7.18
+
+## 0.0.81
+
+### Patch Changes
+
+-   jazz-react@0.7.17
+-   jazz-tools@0.7.17
+
+## 0.0.80
+
+### Patch Changes
+
+-   Updated dependencies
+    -   jazz-tools@0.7.16
+    -   jazz-react@0.7.16
+
+## 0.0.79
+
+### Patch Changes
+
+-   Updated dependencies
+    -   jazz-react@0.7.15
+
+## 0.0.78
+
+### Patch Changes
+
+-   Updated dependencies
+    -   jazz-tools@0.7.14
+    -   jazz-react@0.7.14
+
+## 0.0.77
+
+### Patch Changes
+
+-   Updated dependencies
+    -   jazz-tools@0.7.13
+    -   jazz-react@0.7.13
+
+## 0.0.76
+
+### Patch Changes
+
+-   Updated dependencies
+    -   jazz-tools@0.7.12
+    -   jazz-react@0.7.12
+
+## 0.0.75
+
+### Patch Changes
+
+-   jazz-react@0.7.11
+-   jazz-tools@0.7.11
+
+## 0.0.74
+
+### Patch Changes
+
+-   jazz-react@0.7.10
+-   jazz-tools@0.7.10
+
+## 0.0.73
+
+### Patch Changes
+
+-   jazz-react@0.7.9
+-   jazz-tools@0.7.9
+
+## 0.0.72
+
+### Patch Changes
+
+-   Updated dependencies
+    -   jazz-tools@0.7.8
+    -   jazz-react@0.7.8
+
+## 0.0.71
+
+### Patch Changes
+
+-   Updated dependencies [9fdc91c]
+    -   jazz-react@0.7.7
+
 ## 0.0.70
 
 ### Patch Changes

examples/todo/package.json

@@ -1,7 +1,7 @@
 {
   "name": "jazz-example-todo",
   "private": true,
-  "version": "0.0.70",
+  "version": "0.0.98-neverthrow.6",
   "type": "module",
   "scripts": {
     "dev": "vite",

homepage/homepage/app/docs/guide.mdx

@@ -178,7 +178,7 @@ function App() {// old
     if (issue) {// old
         return <IssueComponent issue={issue} />; // old
     } else { // old
-        return <button onClick={createIssue}>Create Issue</button>; // old
+        return <button onClick={createIssue}>Create Issue</button>;
     } // old
 } // old
 // old

homepage/homepage/app/docs/page.tsx

@@ -49,11 +49,11 @@ export default function Page() {
                     </Prose>
 
                     <div className="text-stone-800 dark:text-stone-200">
-                    <PackageDocs package="jazz-tools" />
-                    <PackageDocs package="jazz-react" />
-                    <PackageDocs package="jazz-browser" />
-                    <PackageDocs package="jazz-browser-media-images" />
-                    <PackageDocs package="jazz-nodejs" />
+                        <PackageDocs package="jazz-tools" />
+                        <PackageDocs package="jazz-react" />
+                        <PackageDocs package="jazz-browser" />
+                        <PackageDocs package="jazz-browser-media-images" />
+                        <PackageDocs package="jazz-nodejs" />
                     </div>
                 </div>
             </div>

homepage/homepage/app/layout.tsx

@@ -9,9 +9,11 @@ import localFont from "next/font/local";
 import { GcmpLogo, JazzLogo } from "@/components/logos";
 import { SiGithub, SiDiscord, SiTwitter } from "@icons-pack/react-simple-icons";
 import { Nav, NavLink, Newsletter, NewsletterButton } from "@/components/nav";
-import { MailIcon } from "lucide-react";
 import { DocNav } from "@/components/docs/nav";
 
+import { SpeedInsights } from "@vercel/speed-insights/next";
+import { Analytics } from "@vercel/analytics/react";
+
 // If loading a variable font, you don't need to specify the font weight
 const manrope = Manrope({
     subsets: ["latin"],
@@ -48,6 +50,8 @@ export default function RootLayout({
                     "flex flex-col items-center bg-stone-50 dark:bg-stone-950 overflow-x-hidden",
                 ].join(" ")}
             >
+                <SpeedInsights />
+                <Analytics />
                 <ThemeProvider
                     attribute="class"
                     defaultTheme="system"
@@ -108,7 +112,7 @@ export default function RootLayout({
                             <div className="col-span-full md:col-span-1 sm:row-start-4 md:row-start-auto lg:col-span-2 md:row-span-2 md:flex-1 flex flex-row md:flex-col max-sm:mt-4 justify-between max-sm:items-start gap-2 text-sm min-w-[10rem]">
                                 <GcmpLogo monochrome className="w-32" />
                                 <p className="max-sm:text-right">
-                                    © 2023
+                                    © {new Date().getFullYear()}
                                     <br />
                                     Garden Computing, Inc.
                                 </p>
@@ -192,12 +196,6 @@ export default function RootLayout({
                         </div>
                     </footer>
                 </ThemeProvider>
-                <script
-                    defer
-                    data-api="/api/event"
-                    data-domain="jazz.tools"
-                    src="/js/script.js"
-                ></script>
             </body>
         </html>
     );

homepage/homepage/app/page.mdx

@@ -28,12 +28,6 @@ import Link from "next/link";
 
 <Prose>
 
-<a href="https://app.localfirstconf.com/schedule/conference/every-app-secretly-wants-to-be-local-first" className="-mt-8 md:-mt-20 float-right top-[5rem] right-4 border border-stone-700 dark:border-stone-300 rounded flex gap-3 items-center px-4 py-2 mb-4 rotate-2 md:rotate-6 no-underline hover:scale-105 transition-transform">
-<div className="text-sm font-bold uppercase">See you in Berlin<br/>May 30-31!</div>
-<LocalFirstConfLogo className="w-24"/>
-</a>
-
-
 # Instant sync.
 
 <Slogan>A new way to build apps with distributed state.</Slogan>
@@ -274,11 +268,7 @@ Jazz Mesh is currently free &mdash; and it's set up as the default sync & storag
 
 ## Get Started
 
--   <Link href="/docs" target="_blank">
-        Read the docs
-    </Link>
--   <Link href="https://discord.gg/utDMjHYg42" target="_blank">
-        Join our Discord
-    </Link>
+-   <Link href="/docs" target="_blank">Read the docs</Link>
+-   <Link href="https://discord.gg/utDMjHYg42" target="_blank">Join our Discord</Link>
 
 </Prose>

homepage/homepage/components/docs/packageDocs.tsx

@@ -213,10 +213,14 @@ function RenderClassOrInterface({
 function renderSummary(commentSummary: CommentDisplayPart[] | undefined) {
     return commentSummary?.map((part, idx) =>
         part.kind === "text" ? (
-            <span key={idx}>{part.text.split("\n").map((line, i, lines) => <>
-                {line}
-                {i !== lines.length - 1 && <br />}
-            </>)}</span>
+            <span key={idx}>
+                {part.text.split("\n").map((line, i, lines) => (
+                    <>
+                        {line}
+                        {i !== lines.length - 1 && <br />}
+                    </>
+                ))}
+            </span>
         ) : part.kind === "inline-tag" ? (
             <code key={idx}>
                 {part.tag} {part.text}

homepage/homepage/components/forMdx.tsx

@@ -1,4 +1,4 @@
-export function Prose(props: { children: ReactNode, className?: string }) {
+export function Prose(props: { children: ReactNode; className?: string }) {
     return (
         <div
             className={[
@@ -11,7 +11,7 @@ export function Prose(props: { children: ReactNode, className?: string }) {
                 "prose-code:font-normal prose-code:leading-tight prose-code:before:content-none prose-code:after:content-none prose-code:bg-stone-100 prose-code:dark:bg-stone-900 prose-code:p-1 prose-code:rounded",
                 "prose-pre:text-black dark:prose-pre:text-white prose-pre:max-w-3xl prose-pre:text-[0.8em] prose-pre:leading-[1.3] prose-pre:-mt-2 prose-pre:my-4 prose-pre:px-10 prose-pre:py-2 prose-pre:-mx-10 prose-pre:bg-transparent",
                 "[&_pre_.line]:relative [&_pre_.line]:min-h-[1.3em] [&_pre_.lineNo]:text-[0.75em] [&_pre_.lineNo]:text-stone-300 [&_pre_.lineNo]:dark:text-stone-700 [&_pre_.lineNo]:absolute [&_pre_.lineNo]:text-right [&_pre_.lineNo]:w-8 [&_pre_.lineNo]:-left-10 [&_pre_.lineNo]:top-[0.3em] [&_pre_.lineNo]:select-none",
-                props.className || "prose lg:prose-lg"
+                props.className || "prose lg:prose-lg",
             ].join(" ")}
         >
             {props.children}

homepage/homepage/package.json

@@ -14,6 +14,7 @@
         "*.{ts,tsx}": "eslint --fix",
         "*.{js,jsx,mdx,json}": "prettier --write"
     },
+    "packageManager": "pnpm@9.1.4",
     "dependencies": {
         "@evilmartians/harmony": "^1.0.0",
         "@icons-pack/react-simple-icons": "^9.1.0",
@@ -21,6 +22,8 @@
         "@mdx-js/react": "^2.3.0",
         "@next/mdx": "^13.5.4",
         "@types/mdx": "^2.0.8",
+        "@vercel/analytics": "^1.3.1",
+        "@vercel/speed-insights": "^1.0.12",
         "class-variance-authority": "^0.7.0",
         "clsx": "^2.0.0",
         "lucide-react": "^0.284.0",

homepage/homepage/tailwind.config.ts

@@ -92,9 +92,6 @@ const config: Config = {
             },
         },
     },
-    plugins: [
-        tailwindCSSAnimate,
-        typography(),
-    ],
+    plugins: [tailwindCSSAnimate, typography()],
 };
 export default config;

oldExamples/inspector/CHANGELOG.md

@@ -1,18 +0,0 @@
-# jazz-example-chat
-
-## 0.0.47
-
-### Patch Changes
-
-- Updated dependencies
-  - cojson@0.6.7
-  - jazz-react@0.5.5
-  - jazz-react-auth-local@0.4.18
-
-## 0.0.46
-
-### Patch Changes
-
-- Updated dependencies
-  - jazz-react@0.5.0
-  - jazz-react-auth-local@0.4.16

oldExamples/inspector/index.html

@@ -1,14 +0,0 @@
-<!doctype html>
-<html lang="en">
-  <head>
-    <meta charset="UTF-8" />
-    <link rel="icon" type="image/png" href="/jazz-logo.png" />
-    <link rel="stylesheet" href="/src/index.css" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>Jazz Chat Example</title>
-  </head>
-  <body>
-    <div id="root"></div>
-    <script type="module" src="/src/app.tsx"></script>
-  </body>
-</html>

oldExamples/inspector/src/app.tsx

@@ -1,243 +0,0 @@
-import {
-  WithJazz,
-  useJazz,
-  DemoAuth,
-  useAutoSub,
-  useBinaryStream,
-} from "jazz-react";
-import ReactDOM from "react-dom/client";
-import { HashRoute } from "hash-slash";
-import { Account, CoID, CoValue, SessionID } from "cojson";
-import { clsx } from "clsx";
-import { ImageDefinition } from "cojson/src/media";
-import { CoJsonTree } from "./cojson-tree";
-
-ReactDOM.createRoot(document.getElementById("root")!).render(
-  <WithJazz
-    auth={DemoAuth({ appName: "Jazz Chat Example" })}
-    apiKey="api_z9d034j3t34ht034ir"
-  >
-    <App />
-  </WithJazz>
-);
-
-function App() {
-  return (
-    <div className="flex flex-col items-center justify-between w-screen h-screen p-2 ">
-      <button
-        onClick={useJazz().logOut}
-        className="rounded mb-5 px-2 py-1 bg-stone-200 dark:bg-stone-800 dark:text-white self-end"
-      >
-        Log Out
-      </button>
-      {HashRoute(
-        {
-          "/": <Home />,
-          "/:id": (id) => <Inspect coValueId={id as CoID<CoValue>} />,
-        },
-        { reportToParentFrame: true }
-      )}
-    </div>
-  );
-}
-
-function Home() {
-  return (
-    <form
-      className="mb-auto"
-      onSubmit={(event) => {
-        const coValueId = (event.target as any).coValueId
-          .value as CoID<CoValue>;
-        location.hash = "/" + coValueId;
-        event.preventDefault();
-      }}
-    >
-      <input name="coValueId" className="border" />
-      <button>Inspect</button>
-    </form>
-  );
-}
-
-function Tag({ children, href }: { children: React.ReactNode; href?: string }) {
-  if (href) {
-    return (
-      <a
-        href={href}
-        className="border text-xs px-2 py-0.5 rounded hover:underline"
-      >
-        {children}
-      </a>
-    );
-  }
-  return <span className="border text-xs px-2 py-0.5 rounded">{children}</span>;
-}
-
-function ImageCoValue({ value }: { value: ImageDefinition["_shape"] }) {
-  const keys = Object.keys(value);
-  const keyIncludingRes = keys.find((key) => key.includes("x"));
-  const idToResolve = keyIncludingRes
-    ? value[keyIncludingRes as `${number}x${number}`]
-    : null;
-
-  if (!idToResolve) return <div>Can't find image</div>;
-
-  const image = useBinaryStream(idToResolve);
-
-  return (
-    <img src={image?.blobURL || value.placeholderDataURL} alt="placeholder" />
-  );
-}
-
-function Inspect({ coValueId }: { coValueId: CoID<CoValue> }) {
-  const coValue = useAutoSub(coValueId);
-
-  const values = coValue?.meta.coValue.toJSON() || {};
-  const isImage = "placeholderDataURL" in values;
-  const isGroup = coValue?.meta.group.id === coValueId;
-
-  const entires = Object.entries(values as any) as [string, string][];
-  const onlyCoValues = entires.filter(([key]) => key.startsWith("co_"));
-
-  let title = "";
-  if (isImage) {
-    title = "Image";
-  } else if (isGroup) {
-    title = "Group";
-  }
-
-  return (
-    <div className="mb-auto">
-      <h1 className="text-xl font-bold mb-2">
-        Inspecting {title}{" "}
-        <span className="text-gray-500 text-sm">{coValueId}</span>
-      </h1>
-
-      {isGroup ? (
-        <p>
-          {onlyCoValues.length > 0 ? <h3>Permissions</h3> : ""}
-          <div className="flex gap-2 flex-col">
-            {onlyCoValues?.map(([key, value]) => (
-              <div className="flex gap-1 items-center">
-                <span className="bg-gray-200 text-xs px-2 py-0.5 rounded">
-                  {value}
-                </span>
-                <AccountInfo accountID={key as CoID<Account>} />
-              </div>
-            ))}
-          </div>
-        </p>
-      ) : (
-        <span className="">
-          Group{" "}
-          <Tag href={`#/${coValue?.meta.group.id}`}>
-            {coValue?.meta.group.id}
-          </Tag>
-        </span>
-      )}
-      {isImage ? (
-        <div className="my-2">
-          <ImageCoValue value={values as any} />
-        </div>
-      ) : null}
-      <pre className="max-w-[80vw] overflow-scroll text-sm mt-4">
-        <CoJsonTree coValueId={coValueId} />
-      </pre>
-      <h2 className="text-lg font-semibold mt-10 mb-4">Sessions</h2>
-      {coValue && <Sessions coValue={coValue.meta.coValue} />}
-    </div>
-  );
-}
-
-function Sessions({ coValue }: { coValue: CoValue }) {
-  const validTx = coValue.core.getValidSortedTransactions();
-  return (
-    <div className="max-w-[80vw] border rounded">
-      {[...coValue.core.sessionLogs.entries()].map(([sessionID, session]) => (
-        <div
-          key={sessionID}
-          className="mv-10 flex gap-2 border-b p-5 flex-wrap  flex-col"
-        >
-          <div className="flex gap-2 flex-row">
-            <SessionInfo
-              sessionID={sessionID}
-              transactionCount={session.transactions.length}
-            />
-          </div>
-          <div className="flex gap-1 flex-wrap max-h-64 overflow-y-auto p-1 bg-gray-50 rounded">
-            {session.transactions.map((tx, txIdx) => {
-              const correspondingValidTx = validTx.find(
-                (validTx) =>
-                  validTx.txID.sessionID === sessionID &&
-                  validTx.txID.txIndex == txIdx
-              );
-              return (
-                <div
-                  key={txIdx}
-                  className={clsx(
-                    "text-xs flex-1 p-2 border rounded min-w-36 max-w-40 overflow-scroll bg-white",
-                    !correspondingValidTx && "bg-red-50 border-red-100"
-                  )}
-                >
-                  <div>{new Date(tx.madeAt).toLocaleString()}</div>
-                  <div>{tx.privacy}</div>
-                  <pre>
-                    {correspondingValidTx
-                      ? JSON.stringify(
-                          correspondingValidTx.changes,
-                          undefined,
-                          2
-                        )
-                      : "invalid/undecryptable"}
-                  </pre>
-                </div>
-              );
-            })}
-          </div>
-          <div className="text-xs">
-            {session.lastHash} / {session.lastSignature}{" "}
-          </div>
-        </div>
-      ))}
-    </div>
-  );
-}
-
-function SessionInfo({
-  sessionID,
-  transactionCount,
-}: {
-  sessionID: SessionID;
-  transactionCount: number;
-}) {
-  let Prefix = sessionID.startsWith("co_") ? (
-    <AccountInfo accountID={sessionID.split("_session_")[0] as CoID<Account>} />
-  ) : (
-    <pre className="text-xs">{sessionID.split("_session_")[0]}</pre>
-  );
-
-  return (
-    <div>
-      {Prefix}
-      <div>
-        <span className="text-xs">
-          Session {sessionID.split("_session_")[1]}
-        </span>
-        <span className="text-xs text-gray-600 font-medium">
-          {" "}
-          - {transactionCount} txs
-        </span>
-      </div>
-    </div>
-  );
-}
-
-function AccountInfo({ accountID }: { accountID: CoID<Account> }) {
-  const account = useAutoSub(accountID);
-  return (
-    <div className="flex items-center gap-2">
-      <h1>{account?.profile?.name}</h1>
-
-      <Tag href={`#/${accountID}`}>{account?.id}</Tag>
-    </div>
-  );
-}

oldExamples/inspector/src/cojson-tree.tsx

@@ -1,151 +0,0 @@
-import clsx from "clsx";
-import { CoID, CoValue } from "cojson";
-import { useAutoSub } from "jazz-react";
-import { useState } from "react";
-import { LinkIcon } from "./link-icon";
-
-export function CoJsonTree({ coValueId }: { coValueId: CoID<CoValue> }) {
-  const coValue = useAutoSub(coValueId);
-
-  const values = coValue?.meta.coValue.toJSON() || {};
-
-  return <RenderCoValueJSON json={values} />;
-}
-
-function RenderObject({ json }: { json: Record<string, any> }) {
-  const [limit, setLimit] = useState(10);
-  const hasMore = Object.keys(json).length > limit;
-
-  const entries = Object.entries(json).slice(0, limit);
-  return (
-    <div className="flex gap-x-1 flex-col font-mono text-xs overflow-auto">
-      {entries.map(([key, value]) => {
-        return <RenderObjectValue property={key} value={value} />;
-      })}
-      {hasMore ? (
-        <div
-          className="text-gray-500 cursor-pointer"
-          onClick={() => setLimit((l) => l + 10)}
-        >
-          ... {Object.keys(json).length - limit} more
-        </div>
-      ) : null}
-    </div>
-  );
-}
-
-function RenderObjectValue({
-  property,
-  value,
-}: {
-  property: string;
-  value: any;
-}) {
-  const [shouldLoad, setShouldLoad] = useState(false);
-
-  const isCoValue =
-    typeof value === "string" ? value?.startsWith("co_") : false;
-
-  return (
-    <div className={clsx(`flex group`)}>
-      <span className="text-gray-500 flex">
-        <RenderCoValueJSON json={property} />:{" "}
-      </span>
-
-      {isCoValue ? (
-        <div className={clsx(shouldLoad && "pb-2")}>
-          <div className="flex items-center ">
-            <div onClick={() => setShouldLoad((s) => !s)}>
-              <div className="w-8 text-center text-gray-700 font-mono px-1 text-xs rounded hover:bg-gray-300 cursor-pointer">
-                {shouldLoad ? `-` : `...`}
-              </div>
-            </div>
-            <a href={`#/${value}`} className="ml-2 group-hover:block hidden">
-              <LinkIcon />
-            </a>
-          </div>
-          <span>{shouldLoad ? <CoJsonTree coValueId={value} /> : null}</span>
-        </div>
-      ) : (
-        <div className="">
-          <RenderCoValueJSON json={value} />
-        </div>
-      )}
-    </div>
-  );
-}
-
-function RenderCoValueArray({ json }: { json: any[] }) {
-  const [limit, setLimit] = useState(10);
-  const hasMore = json.length > limit;
-
-  const entries = json.slice(0, limit);
-  return (
-    <div className="flex gap-x-1 flex-col font-mono text-xs overflow-auto">
-      {entries.map((value, idx) => {
-        return (
-          <div key={idx} className="flex gap-x-1">
-            <RenderCoValueJSON json={value} />
-          </div>
-        );
-      })}
-      {hasMore ? (
-        <div
-          className="text-gray-500 cursor-pointer"
-          onClick={() => setLimit((l) => l + 10)}
-        >
-          ... {json.length - limit} more
-        </div>
-      ) : null}
-    </div>
-  );
-}
-
-function RenderCoValueJSON({
-  json,
-}: {
-  json:
-    | Record<string, any>
-    | any[]
-    | string
-    | null
-    | number
-    | boolean
-    | undefined;
-}) {
-  if (typeof json === "undefined") {
-    return <>"undefined"</>;
-  } else if (Array.isArray(json)) {
-    return (
-      <div className="">
-        <span className="text-gray-500">[</span>
-        <div className="ml-2">
-          <RenderCoValueArray json={json} />
-        </div>
-        <span className="text-gray-500">]</span>
-      </div>
-    );
-  } else if (
-    typeof json === "object" &&
-    json &&
-    Object.getPrototypeOf(json) === Object.prototype
-  ) {
-    return <RenderObject json={json} />;
-  } else if (typeof json === "string") {
-    if (json?.startsWith("co_")) {
-      return (
-        <>
-          <a className="underline" href={`#/${json}`}>
-            {'"'}
-            {json}
-            {'"'}
-          </a>
-        </>
-      );
-    } else {
-      return <div className="truncate max-w-64 ml-1">{json}</div>;
-    }
-  } else {
-    return <div className="truncate max-w-64">{JSON.stringify(json)}</div>;
-  }
-}

oldExamples/inspector/src/index.css

@@ -1,78 +0,0 @@
-@tailwind base;
-@tailwind components;
-@tailwind utilities;
-
-@layer base {
-  :root {
-    --background: 0 0% 100%;
-    --foreground: 20 14.3% 4.1%;
-
-    --card: 0 0% 100%;
-    --card-foreground: 20 14.3% 4.1%;
-
-    --popover: 0 0% 100%;
-    --popover-foreground: 20 14.3% 4.1%;
-
-    --primary: 24 9.8% 10%;
-    --primary-foreground: 60 9.1% 97.8%;
-
-    --secondary: 60 4.8% 95.9%;
-    --secondary-foreground: 24 9.8% 10%;
-
-    --muted: 60 4.8% 95.9%;
-    --muted-foreground: 25 5.3% 44.7%;
-
-    --accent: 60 4.8% 95.9%;
-    --accent-foreground: 24 9.8% 10%;
-
-    --destructive: 0 84.2% 60.2%;
-    --destructive-foreground: 60 9.1% 97.8%;
-
-    --border: 20 5.9% 90%;
-    --input: 20 5.9% 90%;
-    --ring: 20 14.3% 4.1%;
-
-    --radius: 0.5rem;
-  }
-
-  .dark {
-    --background: 20 14.3% 4.1%;
-    --foreground: 60 9.1% 97.8%;
-
-    --card: 20 14.3% 4.1%;
-    --card-foreground: 60 9.1% 97.8%;
-
-    --popover: 20 14.3% 4.1%;
-    --popover-foreground: 60 9.1% 97.8%;
-
-    --primary: 60 9.1% 97.8%;
-    --primary-foreground: 24 9.8% 10%;
-
-    --secondary: 12 6.5% 15.1%;
-    --secondary-foreground: 60 9.1% 97.8%;
-
-    --muted: 12 6.5% 15.1%;
-    --muted-foreground: 24 5.4% 63.9%;
-
-    --accent: 12 6.5% 15.1%;
-    --accent-foreground: 60 9.1% 97.8%;
-
-    --destructive: 0 62.8% 30.6%;
-    --destructive-foreground: 60 9.1% 97.8%;
-
-    --border: 12 6.5% 15.1%;
-    --input: 12 6.5% 15.1%;
-    --ring: 24 5.7% 82.9%;
-  }
-}
-
-@layer base {
-  * {
-    @apply border-border;
-  }
-  body {
-    @apply bg-background text-foreground;
-    margin: 0;
-    padding: 0;
-  }
-}

oldExamples/inspector/src/link-icon.tsx

@@ -1,18 +0,0 @@
-export function LinkIcon() {
-  return (
-    <svg
-      xmlns="http://www.w3.org/2000/svg"
-      fill="none"
-      viewBox="0 0 24 24"
-      strokeWidth={1.5}
-      stroke="currentColor"
-      className="w-3 h-3"
-    >
-      <path
-        strokeLinecap="round"
-        strokeLinejoin="round"
-        d="M13.19 8.688a4.5 4.5 0 0 1 1.242 7.244l-4.5 4.5a4.5 4.5 0 0 1-6.364-6.364l1.757-1.757m13.35-.622 1.757-1.757a4.5 4.5 0 0 0-6.364-6.364l-4.5 4.5a4.5 4.5 0 0 0 1.242 7.244"
-      />
-    </svg>
-  );
-}

package.json

@@ -6,10 +6,9 @@
     "packages/*",
     "examples/*"
   ],
+  "packageManager": "pnpm@9.1.4",
   "devDependencies": {
     "@changesets/cli": "^2.27.3",
-    "husky": "^9.0.11",
-    "lint-staged": "^15.2.2",
     "prettier": "^3.1.1",
     "ts-node": "^10.9.1",
     "turbo": "^1.11.2",
@@ -24,8 +23,7 @@
     "format": "pnpm run -r format && cd homepage/homepage && pnpm run format",
     "changeset": "changeset",
     "changeset-version": "changeset version",
-    "release": "pnpm changeset publish && git push --follow-tags",
-    "prepare": "husky"
+    "release": "pnpm changeset publish && git push --follow-tags"
   },
   "lint-staged": {},
   "version": "0.0.0"

packages/cojson-storage-indexeddb/CHANGELOG.md

@@ -1,198 +1,358 @@
 # cojson-storage-indexeddb
 
+## 0.7.34-neverthrow.8
+
+### Patch Changes
+
+-   Updated dependencies
+    -   cojson@0.7.34-neverthrow.8
+
+## 0.7.34-neverthrow.7
+
+### Patch Changes
+
+-   Updated dependencies
+    -   cojson@0.7.34-neverthrow.7
+
+## 0.7.34-neverthrow.4
+
+### Patch Changes
+
+-   Updated dependencies
+    -   cojson@0.7.34-neverthrow.4
+
+## 0.7.34-neverthrow.3
+
+### Patch Changes
+
+-   Updated dependencies
+    -   cojson@0.7.34-neverthrow.3
+
+## 0.7.34-neverthrow.1
+
+### Patch Changes
+
+-   Updated dependencies
+    -   cojson@0.7.34-neverthrow.1
+
+## 0.7.34-neverthrow.0
+
+### Patch Changes
+
+-   Updated dependencies
+    -   cojson@0.7.34-neverthrow.0
+
+## 0.7.33
+
+### Patch Changes
+
+-   3bf5127: Allow crashing whole node on peer errors
+-   Updated dependencies [b297c93]
+-   Updated dependencies [3bf5127]
+-   Updated dependencies [a8b74ff]
+-   Updated dependencies [db53161]
+    -   cojson@0.7.33
+
+## 0.7.33-hotfixes.5
+
+### Patch Changes
+
+-   Updated dependencies
+    -   cojson@0.7.33-hotfixes.5
+
+## 0.7.33-hotfixes.4
+
+### Patch Changes
+
+-   Updated dependencies
+    -   cojson@0.7.33-hotfixes.4
+
+## 0.7.33-hotfixes.3
+
+### Patch Changes
+
+-   Allow crashing whole node on peer errors
+-   Updated dependencies
+    -   cojson@0.7.33-hotfixes.3
+
+## 0.7.33-hotfixes.0
+
+### Patch Changes
+
+-   Updated dependencies
+    -   cojson@0.7.33-hotfixes.0
+
+## 0.7.31
+
+### Patch Changes
+
+-   Updated dependencies
+    -   cojson@0.7.31
+
+## 0.7.29
+
+### Patch Changes
+
+-   Updated dependencies
+    -   cojson@0.7.29
+
+## 0.7.28
+
+### Patch Changes
+
+-   Updated dependencies
+    -   cojson@0.7.28
+
+## 0.7.26
+
+### Patch Changes
+
+-   Remove Effect from jazz/cojson internals
+-   Updated dependencies
+    -   cojson@0.7.26
+
+## 0.7.23
+
+### Patch Changes
+
+-   Updated dependencies
+    -   cojson@0.7.23
+
+## 0.7.18
+
+### Patch Changes
+
+-   Updated dependencies
+    -   cojson@0.7.18
+
+## 0.7.17
+
+### Patch Changes
+
+-   Updated dependencies
+    -   cojson@0.7.17
+
+## 0.7.14
+
+### Patch Changes
+
+-   Updated dependencies
+    -   cojson@0.7.14
+
+## 0.7.11
+
+### Patch Changes
+
+-   Updated dependencies
+    -   cojson@0.7.11
+
+## 0.7.10
+
+### Patch Changes
+
+-   Updated dependencies
+    -   cojson@0.7.10
+
+## 0.7.9
+
+### Patch Changes
+
+-   Updated dependencies
+    -   cojson@0.7.9
+
 ## 0.7.0
 
 ### Patch Changes
 
-- c4151fc: Support stricter TS lint rules
-- 952982e: Consistent proxy based API
-- 21771c4: Reintroduce changes from main
-- 69ac514: Use effect schema much less
-- f0f6f1b: Clean up API more & re-add jazz-nodejs
-- 1a44f87: Refactoring
-- 627d895: Get rid of Co namespace
-- Updated dependencies [1a35307]
-- Updated dependencies [96c494f]
-- Updated dependencies [19f52b7]
-- Updated dependencies [d8fe2b1]
-- Updated dependencies [1200aae]
-- Updated dependencies [52675c9]
-- Updated dependencies [1a35307]
-- Updated dependencies [e299c3e]
-- Updated dependencies [bf0f8ec]
-- Updated dependencies [c4151fc]
-- Updated dependencies [8636319]
-- Updated dependencies [952982e]
-- Updated dependencies [21771c4]
-- Updated dependencies [69ac514]
-- Updated dependencies [f0f6f1b]
-- Updated dependencies [1a44f87]
-- Updated dependencies [63374cc]
-  - cojson@0.7.0
+-   c4151fc: Support stricter TS lint rules
+-   952982e: Consistent proxy based API
+-   21771c4: Reintroduce changes from main
+-   69ac514: Use effect schema much less
+-   f0f6f1b: Clean up API more & re-add jazz-nodejs
+-   1a44f87: Refactoring
+-   627d895: Get rid of Co namespace
+-   Updated dependencies [1a35307]
+-   Updated dependencies [96c494f]
+-   Updated dependencies [19f52b7]
+-   Updated dependencies [d8fe2b1]
+-   Updated dependencies [1200aae]
+-   Updated dependencies [52675c9]
+-   Updated dependencies [1a35307]
+-   Updated dependencies [e299c3e]
+-   Updated dependencies [bf0f8ec]
+-   Updated dependencies [c4151fc]
+-   Updated dependencies [8636319]
+-   Updated dependencies [952982e]
+-   Updated dependencies [21771c4]
+-   Updated dependencies [69ac514]
+-   Updated dependencies [f0f6f1b]
+-   Updated dependencies [1a44f87]
+-   Updated dependencies [63374cc]
+    -   cojson@0.7.0
 
 ## 0.7.0-alpha.42
 
 ### Patch Changes
 
-- Updated dependencies
-  - cojson@0.7.0-alpha.42
+-   Updated dependencies
+    -   cojson@0.7.0-alpha.42
 
 ## 0.7.0-alpha.39
 
 ### Patch Changes
 
-- Updated dependencies
-  - cojson@0.7.0-alpha.39
+-   Updated dependencies
+    -   cojson@0.7.0-alpha.39
 
 ## 0.7.0-alpha.38
 
 ### Patch Changes
 
-- Updated dependencies
-  - cojson@0.7.0-alpha.38
+-   Updated dependencies
+    -   cojson@0.7.0-alpha.38
 
 ## 0.7.0-alpha.37
 
 ### Patch Changes
 
-- Updated dependencies
-  - cojson@0.7.0-alpha.37
+-   Updated dependencies
+    -   cojson@0.7.0-alpha.37
 
 ## 0.7.0-alpha.36
 
 ### Patch Changes
 
-- Updated dependencies [1a35307]
-- Updated dependencies [1a35307]
-  - cojson@0.7.0-alpha.36
+-   Updated dependencies [1a35307]
+-   Updated dependencies [1a35307]
+    -   cojson@0.7.0-alpha.36
 
 ## 0.7.0-alpha.35
 
 ### Patch Changes
 
-- Updated dependencies
-  - cojson@0.7.0-alpha.35
+-   Updated dependencies
+    -   cojson@0.7.0-alpha.35
 
 ## 0.7.0-alpha.29
 
 ### Patch Changes
 
-- Reintroduce changes from main
-- Updated dependencies
-  - cojson@0.7.0-alpha.29
+-   Reintroduce changes from main
+-   Updated dependencies
+    -   cojson@0.7.0-alpha.29
 
 ## 0.7.0-alpha.28
 
 ### Patch Changes
 
-- Updated dependencies
-  - cojson@0.7.0-alpha.28
+-   Updated dependencies
+    -   cojson@0.7.0-alpha.28
 
 ## 0.7.0-alpha.27
 
 ### Patch Changes
 
-- Updated dependencies
-  - cojson@0.7.0-alpha.27
+-   Updated dependencies
+    -   cojson@0.7.0-alpha.27
 
 ## 0.7.0-alpha.24
 
 ### Patch Changes
 
-- Updated dependencies
-  - cojson@0.7.0-alpha.24
+-   Updated dependencies
+    -   cojson@0.7.0-alpha.24
 
 ## 0.7.0-alpha.11
 
 ### Patch Changes
 
-- Support stricter TS lint rules
-- Updated dependencies
-  - cojson@0.7.0-alpha.11
+-   Support stricter TS lint rules
+-   Updated dependencies
+    -   cojson@0.7.0-alpha.11
 
 ## 0.7.0-alpha.10
 
 ### Patch Changes
 
-- Clean up API more & re-add jazz-nodejs
-- Updated dependencies
-  - cojson@0.7.0-alpha.10
+-   Clean up API more & re-add jazz-nodejs
+-   Updated dependencies
+    -   cojson@0.7.0-alpha.10
 
 ## 0.6.4-alpha.4
 
 ### Patch Changes
 
-- Consistent proxy based API
-- Updated dependencies
-  - cojson@0.7.0-alpha.7
+-   Consistent proxy based API
+-   Updated dependencies
+    -   cojson@0.7.0-alpha.7
 
 ## 0.6.4-alpha.3
 
 ### Patch Changes
 
-- Refactoring
-- Updated dependencies
-  - cojson@0.7.0-alpha.5
+-   Refactoring
+-   Updated dependencies
+    -   cojson@0.7.0-alpha.5
 
 ## 0.6.4-alpha.2
 
 ### Patch Changes
 
-- Get rid of Co namespace
+-   Get rid of Co namespace
 
 ## 0.6.4-alpha.1
 
 ### Patch Changes
 
-- Use effect schema much less
-- Updated dependencies
-  - cojson@0.7.0-alpha.1
+-   Use effect schema much less
+-   Updated dependencies
+    -   cojson@0.7.0-alpha.1
 
 ## 0.6.4-alpha.0
 
 ### Patch Changes
 
-- Updated dependencies
-  - cojson@0.7.0-alpha.0
+-   Updated dependencies
+    -   cojson@0.7.0-alpha.0
 
 ## 0.6.3
 
 ### Patch Changes
 
-- Fix ordering bugs with indexeddb
+-   Fix ordering bugs with indexeddb
 
 ## 0.6.2
 
 ### Patch Changes
 
-- Fix TypeScript lint
+-   Fix TypeScript lint
 
 ## 0.6.1
 
 ### Patch Changes
 
-- IndexedDB & timer perf improvements
-- Updated dependencies
-  - cojson@0.6.4
+-   IndexedDB & timer perf improvements
+-   Updated dependencies
+    -   cojson@0.6.4
 
 ## 0.6.0
 
 ### Minor Changes
 
-- Make addMember and removeMember take loaded Accounts instead of just IDs
+-   Make addMember and removeMember take loaded Accounts instead of just IDs
 
 ### Patch Changes
 
-- Updated dependencies
-  - cojson@0.6.0
+-   Updated dependencies
+    -   cojson@0.6.0
 
 ## 0.5.0
 
 ### Minor Changes
 
-- Adding a lot of performance improvements to cojson, add a stresstest for the twit example and make that run smoother in a lot of ways.
+-   Adding a lot of performance improvements to cojson, add a stresstest for the twit example and make that run smoother in a lot of ways.
 
 ### Patch Changes
 
-- Updated dependencies
-  - cojson@0.5.0
+-   Updated dependencies
+    -   cojson@0.5.0

packages/cojson-storage-indexeddb/package.json

@@ -1,14 +1,13 @@
 {
   "name": "cojson-storage-indexeddb",
-  "version": "0.7.0",
+  "version": "0.7.34-neverthrow.8",
   "main": "dist/index.js",
   "type": "module",
   "types": "src/index.ts",
   "license": "MIT",
   "dependencies": {
     "cojson": "workspace:*",
-    "typescript": "^5.1.6",
-    "isomorphic-streams": "https://github.com/sgwilym/isomorphic-streams.git#aa9394781bfc92f8d7c981be7daf8af4b4cd4fae"
+    "typescript": "^5.1.6"
   },
   "devDependencies": {
     "@vitest/browser": "^0.34.1",

packages/cojson-storage-indexeddb/src/index.ts

@@ -6,13 +6,9 @@ import {
     CojsonInternalTypes,
     MAX_RECOMMENDED_TX_SIZE,
     AccountID,
+    IncomingSyncStream,
+    OutgoingSyncQueue,
 } from "cojson";
-import {
-    ReadableStream,
-    WritableStream,
-    ReadableStreamDefaultReader,
-    WritableStreamDefaultWriter,
-} from "isomorphic-streams";
 import { SyncPromise } from "./syncPromises.js";
 
 type CoValueRow = {
@@ -46,39 +42,43 @@ type SignatureAfterRow = {
 
 export class IDBStorage {
     db: IDBDatabase;
-    fromLocalNode!: ReadableStreamDefaultReader<SyncMessage>;
-    toLocalNode: WritableStreamDefaultWriter<SyncMessage>;
+    toLocalNode: OutgoingSyncQueue;
 
     constructor(
         db: IDBDatabase,
-        fromLocalNode: ReadableStream<SyncMessage>,
-        toLocalNode: WritableStream<SyncMessage>,
+        fromLocalNode: IncomingSyncStream,
+        toLocalNode: OutgoingSyncQueue,
     ) {
         this.db = db;
-        this.fromLocalNode = fromLocalNode.getReader();
-        this.toLocalNode = toLocalNode.getWriter();
+        this.toLocalNode = toLocalNode;
 
-        void (async () => {
-            let done = false;
-            while (!done) {
-                const result = await this.fromLocalNode.read();
-                done = result.done;
-
-                if (result.value) {
-                    // console.log(
-                    //     "IDB: handling msg",
-                    //     result.value.id,
-                    //     result.value.action
-                    // );
-                    await this.handleSyncMessage(result.value);
-                    // console.log(
-                    //     "IDB: handled msg",
-                    //     result.value.id,
-                    //     result.value.action
-                    // );
+        const processMessages = async () => {
+            for await (const msg of fromLocalNode) {
+                try {
+                    if (msg === "Disconnected" || msg === "PingTimeout") {
+                        throw new Error("Unexpected Disconnected message");
+                    }
+                    await this.handleSyncMessage(msg);
+                } catch (e) {
+                    console.error(
+                        new Error(
+                            `Error reading from localNode, handling msg\n\n${JSON.stringify(
+                                msg,
+                                (k, v) =>
+                                    k === "changes" || k === "encryptedChanges"
+                                        ? v.slice(0, 20) + "..."
+                                        : v,
+                            )}`,
+                            { cause: e },
+                        ),
+                    );
                 }
             }
-        })();
+        };
+
+        processMessages().catch((e) =>
+            console.error("Error in processMessages in IndexedDB", e),
+        );
     }
 
     static async asPeer(
@@ -92,7 +92,7 @@ export class IDBStorage {
         const [localNodeAsPeer, storageAsPeer] = cojsonInternals.connectedPeers(
             localNodeName,
             "storage",
-            { peer1role: "client", peer2role: "server", trace },
+            { peer1role: "client", peer2role: "server", trace, crashOnClose: true },
         );
 
         await IDBStorage.open(
@@ -104,8 +104,8 @@ export class IDBStorage {
     }
 
     static async open(
-        fromLocalNode: ReadableStream<SyncMessage>,
-        toLocalNode: WritableStream<SyncMessage>,
+        fromLocalNode: IncomingSyncStream,
+        toLocalNode: OutgoingSyncQueue,
     ) {
         const dbPromise = new Promise<IDBDatabase>((resolve, reject) => {
             const request = indexedDB.open("jazz-storage", 4);
@@ -150,23 +150,6 @@ export class IDBStorage {
                         keyPath: ["ses", "idx"],
                     });
                 }
-                // if (ev.oldVersion !== 0 && ev.oldVersion <= 3) {
-                //     // fix embarrassing off-by-one error for transaction indices
-                //     console.log("Migration: fixing off-by-one error");
-                //     const transaction = (
-                //         ev.target as unknown as { transaction: IDBTransaction }
-                //     ).transaction;
-
-                //     const txsStore = transaction.objectStore("transactions");
-                //     const txs = await promised(txsStore.getAll());
-
-                //     for (const tx of txs) {
-                //         await promised(txsStore.delete([tx.ses, tx.idx]));
-                //         tx.idx -= 1;
-                //         await promised(txsStore.add(tx));
-                //     }
-                //     console.log("Migration: fixing off-by-one error - done");
-                // }
             };
         });
 
@@ -409,12 +392,19 @@ export class IDBStorage {
                             ),
                         ).then(() => {
                             // we're done with IndexedDB stuff here so can use native Promises again
-                            setTimeout(async () => {
-                                await this.toLocalNode.write({
-                                    action: "known",
-                                    ...ourKnown,
-                                    asDependencyOf,
-                                });
+                            setTimeout(() => {
+                                this.toLocalNode
+                                    .push({
+                                        action: "known",
+                                        ...ourKnown,
+                                        asDependencyOf,
+                                    })
+                                    .catch((e) =>
+                                        console.error(
+                                            "Error sending known state",
+                                            e,
+                                        ),
+                                    );
 
                                 const nonEmptyNewContentPieces =
                                     newContentPieces.filter(
@@ -426,12 +416,16 @@ export class IDBStorage {
                                 // console.log(theirKnown.id, nonEmptyNewContentPieces);
 
                                 for (const piece of nonEmptyNewContentPieces) {
-                                    await this.toLocalNode.write(piece);
-                                    await new Promise((resolve) =>
-                                        setTimeout(resolve, 0),
-                                    );
+                                    this.toLocalNode
+                                        .push(piece)
+                                        .catch((e) =>
+                                            console.error(
+                                                "Error sending new content piece",
+                                                e,
+                                            ),
+                                        );
                                 }
-                            }, 0);
+                            });
 
                             return Promise.resolve();
                         });
@@ -456,14 +450,18 @@ export class IDBStorage {
                     const header = msg.header;
                     if (!header) {
                         console.error("Expected to be sent header first");
-                        void this.toLocalNode.write({
-                            action: "known",
-                            id: msg.id,
-                            header: false,
-                            sessions: {},
-                            isCorrection: true,
-                        });
-                        throw new Error("Expected to be sent header first");
+                        this.toLocalNode
+                            .push({
+                                action: "known",
+                                id: msg.id,
+                                header: false,
+                                sessions: {},
+                                isCorrection: true,
+                            })
+                            .catch((e) =>
+                                console.error("Error sending known state", e),
+                            );
+                        return SyncPromise.resolve();
                     }
 
                     return this.makeRequest<IDBValidKey>(({ coValues }) =>
@@ -524,11 +522,18 @@ export class IDBStorage {
                         ),
                     ).then(() => {
                         if (invalidAssumptions) {
-                            void this.toLocalNode.write({
-                                action: "known",
-                                ...ourKnown,
-                                isCorrection: invalidAssumptions,
-                            });
+                            this.toLocalNode
+                                .push({
+                                    action: "known",
+                                    ...ourKnown,
+                                    isCorrection: invalidAssumptions,
+                                })
+                                .catch((e) =>
+                                    console.error(
+                                        "Error sending known state",
+                                        e,
+                                    ),
+                                );
                         }
                     });
                 });

packages/cojson-storage-sqlite/CHANGELOG.md

@@ -1,155 +1,322 @@
 # cojson-storage-sqlite
 
+## 0.7.34-neverthrow.8
+
+### Patch Changes
+
+-   Updated dependencies
+    -   cojson@0.7.34-neverthrow.8
+
+## 0.7.34-neverthrow.7
+
+### Patch Changes
+
+-   Updated dependencies
+    -   cojson@0.7.34-neverthrow.7
+
+## 0.7.34-neverthrow.4
+
+### Patch Changes
+
+-   Updated dependencies
+    -   cojson@0.7.34-neverthrow.4
+
+## 0.7.34-neverthrow.3
+
+### Patch Changes
+
+-   Updated dependencies
+    -   cojson@0.7.34-neverthrow.3
+
+## 0.7.34-neverthrow.1
+
+### Patch Changes
+
+-   Updated dependencies
+    -   cojson@0.7.34-neverthrow.1
+
+## 0.7.34-neverthrow.0
+
+### Patch Changes
+
+-   Updated dependencies
+    -   cojson@0.7.34-neverthrow.0
+
+## 0.7.33
+
+### Patch Changes
+
+-   3bf5127: Allow crashing whole node on peer errors
+-   Updated dependencies [b297c93]
+-   Updated dependencies [3bf5127]
+-   Updated dependencies [a8b74ff]
+-   Updated dependencies [db53161]
+    -   cojson@0.7.33
+
+## 0.7.33-hotfixes.6
+
+### Patch Changes
+
+-   Get rid of simulated errors
+
+## 0.7.33-hotfixes.5
+
+### Patch Changes
+
+-   Make simulated errors even more likely
+-   Updated dependencies
+    -   cojson@0.7.33-hotfixes.5
+
+## 0.7.33-hotfixes.4
+
+### Patch Changes
+
+-   Updated dependencies
+    -   cojson@0.7.33-hotfixes.4
+
+## 0.7.33-hotfixes.3
+
+### Patch Changes
+
+-   Allow crashing whole node on peer errors
+-   Updated dependencies
+    -   cojson@0.7.33-hotfixes.3
+
+## 0.7.33-hotfixes.0
+
+### Patch Changes
+
+-   Updated dependencies
+    -   cojson@0.7.33-hotfixes.0
+
+## 0.7.31
+
+### Patch Changes
+
+-   Updated dependencies
+    -   cojson@0.7.31
+
+## 0.7.29
+
+### Patch Changes
+
+-   Updated dependencies
+    -   cojson@0.7.29
+
+## 0.7.28
+
+### Patch Changes
+
+-   Updated dependencies
+    -   cojson@0.7.28
+
+## 0.7.26
+
+### Patch Changes
+
+-   Remove Effect from jazz/cojson internals
+-   Updated dependencies
+    -   cojson@0.7.26
+
+## 0.7.23
+
+### Patch Changes
+
+-   Updated dependencies
+    -   cojson@0.7.23
+
+## 0.7.18
+
+### Patch Changes
+
+-   Updated dependencies
+    -   cojson@0.7.18
+
+## 0.7.17
+
+### Patch Changes
+
+-   Updated dependencies
+    -   cojson@0.7.17
+
+## 0.7.14
+
+### Patch Changes
+
+-   Updated dependencies
+    -   cojson@0.7.14
+
+## 0.7.11
+
+### Patch Changes
+
+-   Updated dependencies
+    -   cojson@0.7.11
+
+## 0.7.10
+
+### Patch Changes
+
+-   Updated dependencies
+    -   cojson@0.7.10
+
+## 0.7.9
+
+### Patch Changes
+
+-   Updated dependencies
+    -   cojson@0.7.9
+
 ## 0.7.0
 
 ### Patch Changes
 
-- c4151fc: Support stricter TS lint rules
-- 21771c4: Reintroduce changes from main
-- 69ac514: Use effect schema much less
-- f0f6f1b: Clean up API more & re-add jazz-nodejs
-- Updated dependencies [1a35307]
-- Updated dependencies [96c494f]
-- Updated dependencies [19f52b7]
-- Updated dependencies [d8fe2b1]
-- Updated dependencies [1200aae]
-- Updated dependencies [52675c9]
-- Updated dependencies [1a35307]
-- Updated dependencies [e299c3e]
-- Updated dependencies [bf0f8ec]
-- Updated dependencies [c4151fc]
-- Updated dependencies [8636319]
-- Updated dependencies [952982e]
-- Updated dependencies [21771c4]
-- Updated dependencies [69ac514]
-- Updated dependencies [f0f6f1b]
-- Updated dependencies [1a44f87]
-- Updated dependencies [63374cc]
-  - cojson@0.7.0
+-   c4151fc: Support stricter TS lint rules
+-   21771c4: Reintroduce changes from main
+-   69ac514: Use effect schema much less
+-   f0f6f1b: Clean up API more & re-add jazz-nodejs
+-   Updated dependencies [1a35307]
+-   Updated dependencies [96c494f]
+-   Updated dependencies [19f52b7]
+-   Updated dependencies [d8fe2b1]
+-   Updated dependencies [1200aae]
+-   Updated dependencies [52675c9]
+-   Updated dependencies [1a35307]
+-   Updated dependencies [e299c3e]
+-   Updated dependencies [bf0f8ec]
+-   Updated dependencies [c4151fc]
+-   Updated dependencies [8636319]
+-   Updated dependencies [952982e]
+-   Updated dependencies [21771c4]
+-   Updated dependencies [69ac514]
+-   Updated dependencies [f0f6f1b]
+-   Updated dependencies [1a44f87]
+-   Updated dependencies [63374cc]
+    -   cojson@0.7.0
 
 ## 0.7.0-alpha.42
 
 ### Patch Changes
 
-- Updated dependencies
-  - cojson@0.7.0-alpha.42
+-   Updated dependencies
+    -   cojson@0.7.0-alpha.42
 
 ## 0.7.0-alpha.39
 
 ### Patch Changes
 
-- Updated dependencies
-  - cojson@0.7.0-alpha.39
+-   Updated dependencies
+    -   cojson@0.7.0-alpha.39
 
 ## 0.7.0-alpha.38
 
 ### Patch Changes
 
-- Updated dependencies
-  - cojson@0.7.0-alpha.38
+-   Updated dependencies
+    -   cojson@0.7.0-alpha.38
 
 ## 0.7.0-alpha.37
 
 ### Patch Changes
 
-- Updated dependencies
-  - cojson@0.7.0-alpha.37
+-   Updated dependencies
+    -   cojson@0.7.0-alpha.37
 
 ## 0.7.0-alpha.36
 
 ### Patch Changes
 
-- Updated dependencies [1a35307]
-- Updated dependencies [1a35307]
-  - cojson@0.7.0-alpha.36
+-   Updated dependencies [1a35307]
+-   Updated dependencies [1a35307]
+    -   cojson@0.7.0-alpha.36
 
 ## 0.7.0-alpha.35
 
 ### Patch Changes
 
-- Updated dependencies
-  - cojson@0.7.0-alpha.35
+-   Updated dependencies
+    -   cojson@0.7.0-alpha.35
 
 ## 0.7.0-alpha.29
 
 ### Patch Changes
 
-- Reintroduce changes from main
-- Updated dependencies
-  - cojson@0.7.0-alpha.29
+-   Reintroduce changes from main
+-   Updated dependencies
+    -   cojson@0.7.0-alpha.29
 
 ## 0.7.0-alpha.28
 
 ### Patch Changes
 
-- Updated dependencies
-  - cojson@0.7.0-alpha.28
+-   Updated dependencies
+    -   cojson@0.7.0-alpha.28
 
 ## 0.7.0-alpha.27
 
 ### Patch Changes
 
-- Updated dependencies
-  - cojson@0.7.0-alpha.27
+-   Updated dependencies
+    -   cojson@0.7.0-alpha.27
 
 ## 0.7.0-alpha.24
 
 ### Patch Changes
 
-- Updated dependencies
-  - cojson@0.7.0-alpha.24
+-   Updated dependencies
+    -   cojson@0.7.0-alpha.24
 
 ## 0.7.0-alpha.11
 
 ### Patch Changes
 
-- Support stricter TS lint rules
-- Updated dependencies
-  - cojson@0.7.0-alpha.11
+-   Support stricter TS lint rules
+-   Updated dependencies
+    -   cojson@0.7.0-alpha.11
 
 ## 0.7.0-alpha.10
 
 ### Patch Changes
 
-- Clean up API more & re-add jazz-nodejs
-- Updated dependencies
-  - cojson@0.7.0-alpha.10
+-   Clean up API more & re-add jazz-nodejs
+-   Updated dependencies
+    -   cojson@0.7.0-alpha.10
 
 ## 0.5.3-alpha.1
 
 ### Patch Changes
 
-- Use effect schema much less
-- Updated dependencies
-  - cojson@0.7.0-alpha.1
+-   Use effect schema much less
+-   Updated dependencies
+    -   cojson@0.7.0-alpha.1
 
 ## 0.5.3-alpha.0
 
 ### Patch Changes
 
-- Updated dependencies
-  - cojson@0.7.0-alpha.0
+-   Updated dependencies
+    -   cojson@0.7.0-alpha.0
 
 ## 0.5.2
 
 ### Patch Changes
 
-- Updated dependencies
-  - cojson@0.6.0
+-   Updated dependencies
+    -   cojson@0.6.0
 
 ## 0.5.1
 
 ### Patch Changes
 
-- Make typedefs for better-sqlite3 a normal dependency
+-   Make typedefs for better-sqlite3 a normal dependency
 
 ## 0.5.0
 
 ### Minor Changes
 
-- Adding a lot of performance improvements to cojson, add a stresstest for the twit example and make that run smoother in a lot of ways.
+-   Adding a lot of performance improvements to cojson, add a stresstest for the twit example and make that run smoother in a lot of ways.
 
 ### Patch Changes
 
-- Updated dependencies
-  - cojson@0.5.0
+-   Updated dependencies
+    -   cojson@0.5.0

packages/cojson-storage-sqlite/package.json

@@ -1,15 +1,14 @@
 {
   "name": "cojson-storage-sqlite",
   "type": "module",
-  "version": "0.7.0",
+  "version": "0.7.34-neverthrow.8",
   "main": "dist/index.js",
   "types": "src/index.ts",
   "license": "MIT",
   "dependencies": {
     "better-sqlite3": "^8.5.2",
     "cojson": "workspace:*",
-    "typescript": "^5.1.6",
-    "isomorphic-streams": "https://github.com/sgwilym/isomorphic-streams.git#aa9394781bfc92f8d7c981be7daf8af4b4cd4fae"
+    "typescript": "^5.1.6"
   },
   "devDependencies": {
     "@types/better-sqlite3": "^7.6.4"

packages/cojson-storage-sqlite/src/index.ts

@@ -6,13 +6,9 @@ import {
     SessionID,
     MAX_RECOMMENDED_TX_SIZE,
     AccountID,
+    IncomingSyncStream,
+    OutgoingSyncQueue,
 } from "cojson";
-import {
-    ReadableStream,
-    WritableStream,
-    ReadableStreamDefaultReader,
-    WritableStreamDefaultWriter,
-} from "isomorphic-streams";
 
 import Database, { Database as DatabaseT } from "better-sqlite3";
 
@@ -46,30 +42,44 @@ type SignatureAfterRow = {
 };
 
 export class SQLiteStorage {
-    fromLocalNode!: ReadableStreamDefaultReader<SyncMessage>;
-    toLocalNode: WritableStreamDefaultWriter<SyncMessage>;
+    toLocalNode: OutgoingSyncQueue;
     db: DatabaseT;
 
     constructor(
         db: DatabaseT,
-        fromLocalNode: ReadableStream<SyncMessage>,
-        toLocalNode: WritableStream<SyncMessage>,
+        fromLocalNode: IncomingSyncStream,
+        toLocalNode: OutgoingSyncQueue,
     ) {
         this.db = db;
-        this.fromLocalNode = fromLocalNode.getReader();
-        this.toLocalNode = toLocalNode.getWriter();
+        this.toLocalNode = toLocalNode;
 
-        void (async () => {
-            let done = false;
-            while (!done) {
-                const result = await this.fromLocalNode.read();
-                done = result.done;
-
-                if (result.value) {
-                    await this.handleSyncMessage(result.value);
+        const processMessages = async () => {
+            for await (const msg of fromLocalNode) {
+                try {
+                    if (msg === "Disconnected" || msg === "PingTimeout") {
+                        throw new Error("Unexpected Disconnected message");
+                    }
+                    await this.handleSyncMessage(msg);
+                } catch (e) {
+                    console.error(
+                        new Error(
+                            `Error reading from localNode, handling msg\n\n${JSON.stringify(
+                                msg,
+                                (k, v) =>
+                                    k === "changes" || k === "encryptedChanges"
+                                        ? v.slice(0, 20) + "..."
+                                        : v,
+                            )}`,
+                            { cause: e },
+                        ),
+                    );
                 }
             }
-        })();
+        };
+
+        processMessages().catch((e) =>
+            console.error("Error in processMessages in sqlite", e),
+        );
     }
 
     static async asPeer({
@@ -84,7 +94,7 @@ export class SQLiteStorage {
         const [localNodeAsPeer, storageAsPeer] = cojsonInternals.connectedPeers(
             localNodeName,
             "storage",
-            { peer1role: "client", peer2role: "server", trace },
+            { peer1role: "client", peer2role: "server", trace, crashOnClose: true },
         );
 
         await SQLiteStorage.open(
@@ -98,8 +108,8 @@ export class SQLiteStorage {
 
     static async open(
         filename: string,
-        fromLocalNode: ReadableStream<SyncMessage>,
-        toLocalNode: WritableStream<SyncMessage>,
+        fromLocalNode: IncomingSyncStream,
+        toLocalNode: OutgoingSyncQueue,
     ) {
         const db = Database(filename);
         db.pragma("journal_mode = WAL");
@@ -431,11 +441,13 @@ export class SQLiteStorage {
             );
         }
 
-        await this.toLocalNode.write({
-            action: "known",
-            ...ourKnown,
-            asDependencyOf,
-        });
+        this.toLocalNode
+            .push({
+                action: "known",
+                ...ourKnown,
+                asDependencyOf,
+            })
+            .catch((e) => console.error("Error while pushing known", e));
 
         const nonEmptyNewContentPieces = newContentPieces.filter(
             (piece) => piece.header || Object.keys(piece.new).length > 0,
@@ -444,7 +456,11 @@ export class SQLiteStorage {
         // console.log(theirKnown.id, nonEmptyNewContentPieces);
 
         for (const piece of nonEmptyNewContentPieces) {
-            await this.toLocalNode.write(piece);
+            this.toLocalNode
+                .push(piece)
+                .catch((e) =>
+                    console.error("Error while pushing content piece", e),
+                );
             await new Promise((resolve) => setTimeout(resolve, 0));
         }
     }
@@ -466,13 +482,17 @@ export class SQLiteStorage {
             const header = msg.header;
             if (!header) {
                 console.error("Expected to be sent header first");
-                await this.toLocalNode.write({
-                    action: "known",
-                    id: msg.id,
-                    header: false,
-                    sessions: {},
-                    isCorrection: true,
-                });
+                this.toLocalNode
+                    .push({
+                        action: "known",
+                        id: msg.id,
+                        header: false,
+                        sessions: {},
+                        isCorrection: true,
+                    })
+                    .catch((e) =>
+                        console.error("Error while pushing known", e),
+                    );
                 return;
             }
 
@@ -604,11 +624,13 @@ export class SQLiteStorage {
         })();
 
         if (invalidAssumptions) {
-            await this.toLocalNode.write({
-                action: "known",
-                ...ourKnown,
-                isCorrection: invalidAssumptions,
-            });
+            this.toLocalNode
+                .push({
+                    action: "known",
+                    ...ourKnown,
+                    isCorrection: invalidAssumptions,
+                })
+                .catch((e) => console.error("Error while pushing known", e));
         }
     }
 

packages/cojson-transport-nodejs-ws/CHANGELOG.md

@@ -1,161 +0,0 @@
-# cojson-transport-nodejs-ws
-
-## 0.7.0
-
-### Patch Changes
-
-- c4151fc: Support stricter TS lint rules
-- 21771c4: Reintroduce changes from main
-- f0f6f1b: Clean up API more & re-add jazz-nodejs
-- 627d895: Get rid of Co namespace
-- a423eee: ignore error on ws close, fixing "Invalid state: Controller is already closed"
-- Updated dependencies [1a35307]
-- Updated dependencies [96c494f]
-- Updated dependencies [19f52b7]
-- Updated dependencies [d8fe2b1]
-- Updated dependencies [1200aae]
-- Updated dependencies [52675c9]
-- Updated dependencies [1a35307]
-- Updated dependencies [e299c3e]
-- Updated dependencies [bf0f8ec]
-- Updated dependencies [c4151fc]
-- Updated dependencies [8636319]
-- Updated dependencies [952982e]
-- Updated dependencies [21771c4]
-- Updated dependencies [69ac514]
-- Updated dependencies [f0f6f1b]
-- Updated dependencies [1a44f87]
-- Updated dependencies [63374cc]
-  - cojson@0.7.0
-
-## 0.7.0-alpha.42
-
-### Patch Changes
-
-- Updated dependencies
-  - cojson@0.7.0-alpha.42
-
-## 0.7.0-alpha.41
-
-### Patch Changes
-
-- ignore error on ws close, fixing "Invalid state: Controller is already closed"
-
-## 0.7.0-alpha.39
-
-### Patch Changes
-
-- Updated dependencies
-  - cojson@0.7.0-alpha.39
-
-## 0.7.0-alpha.38
-
-### Patch Changes
-
-- Updated dependencies
-  - cojson@0.7.0-alpha.38
-
-## 0.7.0-alpha.37
-
-### Patch Changes
-
-- Updated dependencies
-  - cojson@0.7.0-alpha.37
-
-## 0.7.0-alpha.36
-
-### Patch Changes
-
-- Updated dependencies [1a35307]
-- Updated dependencies [1a35307]
-  - cojson@0.7.0-alpha.36
-
-## 0.7.0-alpha.35
-
-### Patch Changes
-
-- Updated dependencies
-  - cojson@0.7.0-alpha.35
-
-## 0.7.0-alpha.29
-
-### Patch Changes
-
-- Reintroduce changes from main
-- Updated dependencies
-  - cojson@0.7.0-alpha.29
-
-## 0.7.0-alpha.28
-
-### Patch Changes
-
-- Updated dependencies
-  - cojson@0.7.0-alpha.28
-
-## 0.7.0-alpha.27
-
-### Patch Changes
-
-- Updated dependencies
-  - cojson@0.7.0-alpha.27
-
-## 0.7.0-alpha.24
-
-### Patch Changes
-
-- Updated dependencies
-  - cojson@0.7.0-alpha.24
-
-## 0.7.0-alpha.11
-
-### Patch Changes
-
-- Support stricter TS lint rules
-- Updated dependencies
-  - cojson@0.7.0-alpha.11
-
-## 0.7.0-alpha.10
-
-### Patch Changes
-
-- Clean up API more & re-add jazz-nodejs
-- Updated dependencies
-  - cojson@0.7.0-alpha.10
-
-## 0.5.2-alpha.2
-
-### Patch Changes
-
-- Get rid of Co namespace
-
-## 0.5.2-alpha.1
-
-### Patch Changes
-
-- Updated dependencies
-  - cojson@0.7.0-alpha.1
-
-## 0.5.2-alpha.0
-
-### Patch Changes
-
-- Updated dependencies
-  - cojson@0.7.0-alpha.0
-
-## 0.5.1
-
-### Patch Changes
-
-- Updated dependencies
-  - cojson@0.6.0
-
-## 0.5.0
-
-### Minor Changes
-
-- Adding a lot of performance improvements to cojson, add a stresstest for the twit example and make that run smoother in a lot of ways.
-
-### Patch Changes
-
-- Updated dependencies
-  - cojson@0.5.0

packages/cojson-transport-nodejs-ws/src/index.ts

@@ -1,94 +0,0 @@
-import { WebSocket } from "ws";
-import { WritableStream, ReadableStream } from "isomorphic-streams";
-
-export function websocketReadableStream<T>(ws: WebSocket) {
-    ws.binaryType = "arraybuffer";
-
-    return new ReadableStream<T>({
-        start(controller) {
-            ws.addEventListener("message", (event) => {
-                if (typeof event.data !== "string")
-                    return console.warn(
-                        "Got non-string message from client",
-                        event.data,
-                    );
-                const msg = JSON.parse(event.data);
-                if (msg.type === "ping") {
-                    // console.debug(
-                    //     "Got ping from",
-                    //     msg.dc,
-                    //     "latency",
-                    //     Date.now() - msg.time,
-                    //     "ms"
-                    // );
-                    return;
-                }
-                controller.enqueue(msg);
-            });
-            ws.addEventListener("close", () => {
-                try {
-                    controller.close();
-                } catch (ignore) {
-                    // will throw if already closed, with no way to check before-hand
-                }
-            });
-            ws.addEventListener("error", () =>
-                controller.error(new Error("The WebSocket errored!")),
-            );
-        },
-
-        cancel() {
-            ws.close();
-        },
-    });
-}
-
-export function websocketWritableStream<T>(ws: WebSocket) {
-    return new WritableStream<T>({
-        start(controller) {
-            ws.addEventListener("close", () =>
-                controller.error(
-                    new Error("The WebSocket closed unexpectedly!"),
-                ),
-            );
-            ws.addEventListener("error", () =>
-                controller.error(new Error("The WebSocket errored!")),
-            );
-
-            if (ws.readyState === WebSocket.OPEN) {
-                return;
-            }
-
-            return new Promise((resolve) =>
-                ws.addEventListener("open", resolve, { once: true }),
-            );
-        },
-
-        write(chunk) {
-            ws.send(JSON.stringify(chunk));
-            // Return immediately, since the web socket gives us no easy way to tell
-            // when the write completes.
-        },
-
-        close() {
-            return closeWS(1000);
-        },
-
-        abort(reason) {
-            return closeWS(4000, reason && reason.message);
-        },
-    });
-
-    function closeWS(code: number, reasonString?: string) {
-        return new Promise<void>((resolve, reject) => {
-            ws.onclose = (e) => {
-                if (e.wasClean) {
-                    resolve();
-                } else {
-                    reject(new Error("The connection was not closed cleanly"));
-                }
-            };
-            ws.close(code, reasonString);
-        });
-    }
-}

packages/cojson-transport-ws/CHANGELOG.md

@@ -0,0 +1,360 @@
+# cojson-transport-nodejs-ws
+
+## 0.7.34-neverthrow.8
+
+### Patch Changes
+
+-   Updated dependencies
+    -   cojson@0.7.34-neverthrow.8
+
+## 0.7.34-neverthrow.7
+
+### Patch Changes
+
+-   Updated dependencies
+    -   cojson@0.7.34-neverthrow.7
+
+## 0.7.34-neverthrow.4
+
+### Patch Changes
+
+-   Updated dependencies
+    -   cojson@0.7.34-neverthrow.4
+
+## 0.7.34-neverthrow.3
+
+### Patch Changes
+
+-   Updated dependencies
+    -   cojson@0.7.34-neverthrow.3
+
+## 0.7.34-neverthrow.2
+
+### Patch Changes
+
+-   Remove WS buffer filling log message
+
+## 0.7.34-neverthrow.1
+
+### Patch Changes
+
+-   Updated dependencies
+    -   cojson@0.7.34-neverthrow.1
+
+## 0.7.34-neverthrow.0
+
+### Patch Changes
+
+-   Updated dependencies
+    -   cojson@0.7.34-neverthrow.0
+
+## 0.7.33
+
+### Patch Changes
+
+-   fdde8db: Handle ws closing while buffering
+-   07fe2b9: Wait if WS buffer is full
+-   3bf5127: Allow crashing whole node on peer errors
+-   Updated dependencies [b297c93]
+-   Updated dependencies [3bf5127]
+-   Updated dependencies [a8b74ff]
+-   Updated dependencies [db53161]
+    -   cojson@0.7.33
+
+## 0.7.33-hotfixes.5
+
+### Patch Changes
+
+-   Updated dependencies
+    -   cojson@0.7.33-hotfixes.5
+
+## 0.7.33-hotfixes.4
+
+### Patch Changes
+
+-   Updated dependencies
+    -   cojson@0.7.33-hotfixes.4
+
+## 0.7.33-hotfixes.3
+
+### Patch Changes
+
+-   Allow crashing whole node on peer errors
+-   Updated dependencies
+    -   cojson@0.7.33-hotfixes.3
+
+## 0.7.33-hotfixes.2
+
+### Patch Changes
+
+-   Handle ws closing while buffering
+
+## 0.7.33-hotfixes.1
+
+### Patch Changes
+
+-   Wait if WS buffer is full
+
+## 0.7.33-hotfixes.0
+
+### Patch Changes
+
+-   Updated dependencies
+    -   cojson@0.7.33-hotfixes.0
+
+## 0.7.31
+
+### Patch Changes
+
+-   Properly close connecting websockets
+-   Updated dependencies
+    -   cojson@0.7.31
+
+## 0.7.30
+
+### Patch Changes
+
+-   Immediately resolve an already-open websocket
+
+## 0.7.29
+
+### Patch Changes
+
+-   Updated dependencies
+    -   cojson@0.7.29
+
+## 0.7.28
+
+### Patch Changes
+
+-   Updated dependencies
+    -   cojson@0.7.28
+
+## 0.7.27
+
+### Patch Changes
+
+-   Option to not expect pings
+
+## 0.7.26
+
+### Patch Changes
+
+-   Remove Effect from jazz/cojson internals
+-   Updated dependencies
+    -   cojson@0.7.26
+
+## 0.7.23
+
+### Patch Changes
+
+-   Updated dependencies
+    -   cojson@0.7.23
+
+## 0.7.22
+
+### Patch Changes
+
+-   Increase disconnect timeout for now
+
+## 0.7.18
+
+### Patch Changes
+
+-   Updated dependencies
+    -   cojson@0.7.18
+
+## 0.7.17
+
+### Patch Changes
+
+-   Updated dependencies
+    -   cojson@0.7.17
+
+## 0.7.14
+
+### Patch Changes
+
+-   Updated dependencies
+    -   cojson@0.7.14
+
+## 0.7.11
+
+### Patch Changes
+
+-   Updated dependencies
+    -   cojson@0.7.11
+
+## 0.7.10
+
+### Patch Changes
+
+-   Updated dependencies
+    -   cojson@0.7.10
+
+## 0.7.9
+
+### Patch Changes
+
+-   Updated dependencies
+    -   cojson@0.7.9
+
+## 0.7.0
+
+### Patch Changes
+
+-   c4151fc: Support stricter TS lint rules
+-   21771c4: Reintroduce changes from main
+-   f0f6f1b: Clean up API more & re-add jazz-nodejs
+-   627d895: Get rid of Co namespace
+-   a423eee: ignore error on ws close, fixing "Invalid state: Controller is already closed"
+-   Updated dependencies [1a35307]
+-   Updated dependencies [96c494f]
+-   Updated dependencies [19f52b7]
+-   Updated dependencies [d8fe2b1]
+-   Updated dependencies [1200aae]
+-   Updated dependencies [52675c9]
+-   Updated dependencies [1a35307]
+-   Updated dependencies [e299c3e]
+-   Updated dependencies [bf0f8ec]
+-   Updated dependencies [c4151fc]
+-   Updated dependencies [8636319]
+-   Updated dependencies [952982e]
+-   Updated dependencies [21771c4]
+-   Updated dependencies [69ac514]
+-   Updated dependencies [f0f6f1b]
+-   Updated dependencies [1a44f87]
+-   Updated dependencies [63374cc]
+    -   cojson@0.7.0
+
+## 0.7.0-alpha.42
+
+### Patch Changes
+
+-   Updated dependencies
+    -   cojson@0.7.0-alpha.42
+
+## 0.7.0-alpha.41
+
+### Patch Changes
+
+-   ignore error on ws close, fixing "Invalid state: Controller is already closed"
+
+## 0.7.0-alpha.39
+
+### Patch Changes
+
+-   Updated dependencies
+    -   cojson@0.7.0-alpha.39
+
+## 0.7.0-alpha.38
+
+### Patch Changes
+
+-   Updated dependencies
+    -   cojson@0.7.0-alpha.38
+
+## 0.7.0-alpha.37
+
+### Patch Changes
+
+-   Updated dependencies
+    -   cojson@0.7.0-alpha.37
+
+## 0.7.0-alpha.36
+
+### Patch Changes
+
+-   Updated dependencies [1a35307]
+-   Updated dependencies [1a35307]
+    -   cojson@0.7.0-alpha.36
+
+## 0.7.0-alpha.35
+
+### Patch Changes
+
+-   Updated dependencies
+    -   cojson@0.7.0-alpha.35
+
+## 0.7.0-alpha.29
+
+### Patch Changes
+
+-   Reintroduce changes from main
+-   Updated dependencies
+    -   cojson@0.7.0-alpha.29
+
+## 0.7.0-alpha.28
+
+### Patch Changes
+
+-   Updated dependencies
+    -   cojson@0.7.0-alpha.28
+
+## 0.7.0-alpha.27
+
+### Patch Changes
+
+-   Updated dependencies
+    -   cojson@0.7.0-alpha.27
+
+## 0.7.0-alpha.24
+
+### Patch Changes
+
+-   Updated dependencies
+    -   cojson@0.7.0-alpha.24
+
+## 0.7.0-alpha.11
+
+### Patch Changes
+
+-   Support stricter TS lint rules
+-   Updated dependencies
+    -   cojson@0.7.0-alpha.11
+
+## 0.7.0-alpha.10
+
+### Patch Changes
+
+-   Clean up API more & re-add jazz-nodejs
+-   Updated dependencies
+    -   cojson@0.7.0-alpha.10
+
+## 0.5.2-alpha.2
+
+### Patch Changes
+
+-   Get rid of Co namespace
+
+## 0.5.2-alpha.1
+
+### Patch Changes
+
+-   Updated dependencies
+    -   cojson@0.7.0-alpha.1
+
+## 0.5.2-alpha.0
+
+### Patch Changes
+
+-   Updated dependencies
+    -   cojson@0.7.0-alpha.0
+
+## 0.5.1
+
+### Patch Changes
+
+-   Updated dependencies
+    -   cojson@0.6.0
+
+## 0.5.0
+
+### Minor Changes
+
+-   Adding a lot of performance improvements to cojson, add a stresstest for the twit example and make that run smoother in a lot of ways.
+
+### Patch Changes
+
+-   Updated dependencies
+    -   cojson@0.5.0

packages/cojson-transport-ws/package.json

@@ -1,15 +1,13 @@
 {
-  "name": "cojson-transport-nodejs-ws",
+  "name": "cojson-transport-ws",
   "type": "module",
-  "version": "0.7.0",
+  "version": "0.7.34-neverthrow.8",
   "main": "dist/index.js",
   "types": "src/index.ts",
   "license": "MIT",
   "dependencies": {
     "cojson": "workspace:*",
-    "typescript": "^5.1.6",
-    "ws": "^8.14.2",
-    "isomorphic-streams": "https://github.com/sgwilym/isomorphic-streams.git#aa9394781bfc92f8d7c981be7daf8af4b4cd4fae"
+    "typescript": "^5.1.6"
   },
   "scripts": {
     "dev": "tsc --watch --sourceMap --outDir dist",

packages/cojson-transport-ws/src/index.ts

@@ -0,0 +1,138 @@
+import {
+    DisconnectedError,
+    Peer,
+    PingTimeoutError,
+    SyncMessage,
+    cojsonInternals,
+} from "cojson";
+
+interface WebsocketEvents {
+    close: { code: number; reason: string };
+    message: { data: unknown };
+    open: void;
+}
+interface PingMsg {
+    time: number;
+    dc: string;
+}
+
+interface AnyWebSocket {
+    addEventListener<K extends keyof WebsocketEvents>(
+        type: K,
+        listener: (event: WebsocketEvents[K]) => void,
+        options?: { once: boolean },
+    ): void;
+    removeEventListener<K extends keyof WebsocketEvents>(
+        type: K,
+        listener: (event: WebsocketEvents[K]) => void,
+    ): void;
+    close(): void;
+    send(data: string): void;
+    readyState: number;
+    bufferedAmount: number;
+}
+
+const g: typeof globalThis & {
+    jazzPings?: {
+        received: number;
+        sent: number;
+        dc: string;
+    }[];
+} = globalThis;
+
+export function createWebSocketPeer({
+    id,
+    websocket,
+    role,
+    expectPings = true,
+}: {
+    id: string;
+    websocket: AnyWebSocket;
+    role: Peer["role"];
+    expectPings?: boolean;
+}): Peer {
+    const incoming = new cojsonInternals.Channel<
+        SyncMessage | DisconnectedError | PingTimeoutError
+    >();
+
+    websocket.addEventListener("close", function handleClose() {
+        incoming
+            .push("Disconnected")
+            .catch((e) =>
+                console.error("Error while pushing disconnect msg", e),
+            );
+    });
+
+    let pingTimeout: ReturnType<typeof setTimeout> | null = null;
+
+    websocket.addEventListener("message", function handleIncomingMsg(event) {
+        const msg = JSON.parse(event.data as string);
+        pingTimeout && clearTimeout(pingTimeout);
+        if (msg?.type === "ping") {
+            const ping = msg as PingMsg;
+            g.jazzPings ||= [];
+            g.jazzPings.push({
+                received: Date.now(),
+                sent: ping.time,
+                dc: ping.dc,
+            });
+        } else {
+            incoming
+                .push(msg)
+                .catch((e) =>
+                    console.error("Error while pushing incoming msg", e),
+                );
+        }
+        if (expectPings) {
+            pingTimeout = setTimeout(() => {
+                incoming
+                    .push("PingTimeout")
+                    .catch((e) =>
+                        console.error("Error while pushing ping timeout", e),
+                    );
+            }, 10_000);
+        }
+    });
+
+    const websocketOpen = new Promise<void>((resolve) => {
+        if (websocket.readyState === 1) {
+            resolve();
+        } else {
+            websocket.addEventListener("open", resolve, { once: true });
+        }
+    });
+
+    return {
+        id,
+        incoming,
+        outgoing: {
+            async push(msg) {
+                await websocketOpen;
+                if (websocket.readyState === 1) {
+                    while (websocket.bufferedAmount > 1_000_000) {
+                        await new Promise((resolve) =>
+                            setTimeout(resolve, 100),
+                        );
+                        if (websocket.readyState !== 1) {
+                            console.log("WebSocket closed while buffering", id, websocket.bufferedAmount);
+                            return;
+                        }
+                    }
+                    websocket.send(JSON.stringify(msg));
+                }
+            },
+            close() {
+                console.log("Trying to close", id, websocket.readyState)
+                if (websocket.readyState === 0) {
+                    websocket.addEventListener("open", function handleClose() {
+                        websocket.close();
+                    }, { once: true });
+                } else if (websocket.readyState == 1) {
+                    websocket.close();
+                }
+            },
+        },
+        role,
+        crashOnClose: false,
+    };
+}

packages/cojson/.eslintrc.cjs

@@ -3,10 +3,10 @@ module.exports = {
         "eslint:recommended",
         "plugin:@typescript-eslint/recommended",
         "plugin:require-extensions/recommended",
-        "prettier"
+        "prettier",
     ],
     parser: "@typescript-eslint/parser",
-    plugins: ["@typescript-eslint", "require-extensions"],
+    plugins: ["@typescript-eslint", "require-extensions", "neverthrow"],
     parserOptions: {
         project: "./tsconfig.json",
         tsconfigRootDir: __dirname,
@@ -20,5 +20,6 @@ module.exports = {
             { argsIgnorePattern: "^_", varsIgnorePattern: "^_" },
         ],
         "@typescript-eslint/no-floating-promises": "error",
+        "neverthrow/must-use-result": "error",
     },
-}
+};

packages/cojson/CHANGELOG.md

@@ -1,183 +1,317 @@
 # cojson
 
+## 0.7.34-neverthrow.8
+
+### Patch Changes
+
+-   Use queueable fork
+
+## 0.7.34-neverthrow.7
+
+### Patch Changes
+
+-   Use fork of queueable
+
+## 0.7.34-neverthrow.4
+
+### Patch Changes
+
+-   Stop using tryAddTransactionsAsync
+
+## 0.7.34-neverthrow.3
+
+### Patch Changes
+
+-   Better log message for failed transactions
+
+## 0.7.34-neverthrow.1
+
+### Patch Changes
+
+-   Only one async transaction per CoValue at a time again
+
+## 0.7.34-neverthrow.0
+
+### Patch Changes
+
+-   Start introducing neverthrow, make tryAddNewTransactionsAsync and handleNewContent less throwy
+
+## 0.7.33
+
+### Patch Changes
+
+-   b297c93: Improve logging
+-   3bf5127: Allow crashing whole node on peer errors
+-   a8b74ff: Throw properly on peer that should crash on close
+
+## 0.7.33-hotfixes.5
+
+### Patch Changes
+
+-   Make simulated errors even more likely
+
+## 0.7.33-hotfixes.4
+
+### Patch Changes
+
+-   Throw properly on peer that should crash on close
+
+## 0.7.33-hotfixes.3
+
+### Patch Changes
+
+-   Allow crashing whole node on peer errors
+
+## 0.7.33-hotfixes.0
+
+### Patch Changes
+
+-   Improve logging
+
+## 0.7.31
+
+### Patch Changes
+
+-   Close both ends of the peer on gracefulShutdown
+
+## 0.7.29
+
+### Patch Changes
+
+-   Remove noisy log
+
+## 0.7.28
+
+### Patch Changes
+
+-   Fix ignoring server peers
+
+## 0.7.26
+
+### Patch Changes
+
+-   Remove Effect from jazz/cojson internals
+
+## 0.7.23
+
+### Patch Changes
+
+-   Mostly complete OPFS implementation (single-tab only)
+
+## 0.7.18
+
+### Patch Changes
+
+-   Update to Effect 3.5.2
+
+## 0.7.17
+
+### Patch Changes
+
+-   Fix bugs in new storage interface
+
+## 0.7.14
+
+### Patch Changes
+
+-   Use Effect Queues and Streams instead of custom queue implementation
+
+## 0.7.11
+
+### Patch Changes
+
+-   Fix webpack import of node:crypto module
+
+## 0.7.10
+
+### Patch Changes
+
+-   Also cache agent ID in RawControlledAccount
+
+## 0.7.9
+
+### Patch Changes
+
+-   Cache currentAgentID in RawAccount
+
 ## 0.7.0
 
 ### Minor Changes
 
-- e299c3e: New simplified API
+-   e299c3e: New simplified API
 
 ### Patch Changes
 
-- 1a35307: WIP working-ish version of LSM storage
-- 96c494f: Implement profile visibility based on groups & new migration signature
-- 19f52b7: Fixed bug with newRandomSessionID being called before crypto was ready
-- d8fe2b1: Expose experimental OPFS storage
-- 1200aae: CoJSON performance improvement
-- 52675c9: Fix CoList.splice / RawCoList.append
-- 1a35307: Optimizations for incoming sync messages
-- bf0f8ec: Fix noble curves dependency
-- c4151fc: Support stricter TS lint rules
-- 8636319: Factor out implementation of crypto provider and provide pure JS implementation
-- 952982e: Consistent proxy based API
-- 21771c4: Reintroduce changes from main
-- 69ac514: Use effect schema much less
-- f0f6f1b: Clean up API more & re-add jazz-nodejs
-- 1a44f87: Refactoring
-- 63374cc: Make sure delete on CoMaps deletes keys
+-   1a35307: WIP working-ish version of LSM storage
+-   96c494f: Implement profile visibility based on groups & new migration signature
+-   19f52b7: Fixed bug with newRandomSessionID being called before crypto was ready
+-   d8fe2b1: Expose experimental OPFS storage
+-   1200aae: CoJSON performance improvement
+-   52675c9: Fix CoList.splice / RawCoList.append
+-   1a35307: Optimizations for incoming sync messages
+-   bf0f8ec: Fix noble curves dependency
+-   c4151fc: Support stricter TS lint rules
+-   8636319: Factor out implementation of crypto provider and provide pure JS implementation
+-   952982e: Consistent proxy based API
+-   21771c4: Reintroduce changes from main
+-   69ac514: Use effect schema much less
+-   f0f6f1b: Clean up API more & re-add jazz-nodejs
+-   1a44f87: Refactoring
+-   63374cc: Make sure delete on CoMaps deletes keys
 
 ## 0.7.0-alpha.42
 
 ### Patch Changes
 
-- Fixed bug with newRandomSessionID being called before crypto was ready
+-   Fixed bug with newRandomSessionID being called before crypto was ready
 
 ## 0.7.0-alpha.39
 
 ### Patch Changes
 
-- Fix noble curves dependency
+-   Fix noble curves dependency
 
 ## 0.7.0-alpha.38
 
 ### Patch Changes
 
-- Factor out implementation of crypto provider and provide pure JS implementation
+-   Factor out implementation of crypto provider and provide pure JS implementation
 
 ## 0.7.0-alpha.37
 
 ### Patch Changes
 
-- Expose experimental OPFS storage
+-   Expose experimental OPFS storage
 
 ## 0.7.0-alpha.36
 
 ### Patch Changes
 
-- 1a35307: WIP working-ish version of LSM storage
-- 1a35307: Optimizations for incoming sync messages
+-   1a35307: WIP working-ish version of LSM storage
+-   1a35307: Optimizations for incoming sync messages
 
 ## 0.7.0-alpha.35
 
 ### Patch Changes
 
-- CoJSON performance improvement
+-   CoJSON performance improvement
 
 ## 0.7.0-alpha.29
 
 ### Patch Changes
 
-- Reintroduce changes from main
+-   Reintroduce changes from main
 
 ## 0.7.0-alpha.28
 
 ### Patch Changes
 
-- Implement profile visibility based on groups & new migration signature
+-   Implement profile visibility based on groups & new migration signature
 
 ## 0.7.0-alpha.27
 
 ### Patch Changes
 
-- Fix CoList.splice / RawCoList.append
+-   Fix CoList.splice / RawCoList.append
 
 ## 0.7.0-alpha.24
 
 ### Patch Changes
 
-- Make sure delete on CoMaps deletes keys
+-   Make sure delete on CoMaps deletes keys
 
 ## 0.7.0-alpha.11
 
 ### Patch Changes
 
-- Support stricter TS lint rules
+-   Support stricter TS lint rules
 
 ## 0.7.0-alpha.10
 
 ### Patch Changes
 
-- Clean up API more & re-add jazz-nodejs
+-   Clean up API more & re-add jazz-nodejs
 
 ## 0.7.0-alpha.7
 
 ### Patch Changes
 
-- Consistent proxy based API
+-   Consistent proxy based API
 
 ## 0.7.0-alpha.5
 
 ### Patch Changes
 
-- Refactoring
+-   Refactoring
 
 ## 0.7.0-alpha.1
 
 ### Patch Changes
 
-- Use effect schema much less
+-   Use effect schema much less
 
 ## 0.7.0-alpha.0
 
 ### Minor Changes
 
-- New simplified API
+-   New simplified API
 
 ## 0.6.6
 
 ### Patch Changes
 
-- Fix migration changes being lost on loaded account
+-   Fix migration changes being lost on loaded account
 
 ## 0.6.5
 
 ### Patch Changes
 
-- Fix loading of accounts
+-   Fix loading of accounts
 
 ## 0.6.4
 
 ### Patch Changes
 
-- IndexedDB & timer perf improvements
+-   IndexedDB & timer perf improvements
 
 ## 0.6.3
 
 ### Patch Changes
 
-- Implement passphrase based auth
+-   Implement passphrase based auth
 
 ## 0.6.2
 
 ### Patch Changes
 
-- Add peersToLoadFrom for node creation as well
+-   Add peersToLoadFrom for node creation as well
 
 ## 0.6.1
 
 ### Patch Changes
 
-- Provide localNode to AccountMigrations
+-   Provide localNode to AccountMigrations
 
 ## 0.6.0
 
 ### Minor Changes
 
-- Make addMember and removeMember take loaded Accounts instead of just IDs
+-   Make addMember and removeMember take loaded Accounts instead of just IDs
 
 ## 0.5.2
 
 ### Patch Changes
 
-- Allow account migrations to be async
+-   Allow account migrations to be async
 
 ## 0.5.1
 
 ### Patch Changes
 
-- Fix bug where accounts, profiles and data created in migrations isn't synced on account creation
+-   Fix bug where accounts, profiles and data created in migrations isn't synced on account creation
 
 ## 0.5.0
 
 ### Minor Changes
 
-- Adding a lot of performance improvements to cojson, add a stresstest for the twit example and make that run smoother in a lot of ways.
+-   Adding a lot of performance improvements to cojson, add a stresstest for the twit example and make that run smoother in a lot of ways.

packages/cojson/package.json

@@ -5,26 +5,27 @@
     "types": "src/index.ts",
     "type": "module",
     "license": "MIT",
-    "version": "0.7.0",
+    "version": "0.7.34-neverthrow.8",
     "devDependencies": {
         "@types/jest": "^29.5.3",
         "@typescript-eslint/eslint-plugin": "^6.2.1",
         "@typescript-eslint/parser": "^6.2.1",
         "eslint": "^8.46.0",
         "eslint-config-prettier": "^9.1.0",
+        "eslint-plugin-neverthrow": "^1.1.4",
         "eslint-plugin-require-extensions": "^0.1.3",
         "typescript": "5.0.2",
         "vitest": "^0.34.6"
     },
     "dependencies": {
         "@hazae41/berith": "^1.2.6",
-        "@noble/curves": "^1.3.0",
         "@noble/ciphers": "^0.1.3",
+        "@noble/curves": "^1.3.0",
         "@noble/hashes": "^1.4.0",
         "@scure/base": "^1.1.1",
-        "effect": "^3.1.5",
         "hash-wasm": "^4.9.0",
-        "isomorphic-streams": "https://github.com/sgwilym/isomorphic-streams.git#aa9394781bfc92f8d7c981be7daf8af4b4cd4fae"
+        "neverthrow": "^7.0.1",
+        "queueueue": "^4.1.2"
     },
     "scripts": {
         "dev": "tsc --watch --sourceMap --outDir dist",

packages/cojson/src/coValueCore.ts

@@ -7,6 +7,7 @@ import {
     StreamingHash,
     KeyID,
     CryptoProvider,
+    SignerID,
 } from "./crypto/crypto.js";
 import { JsonObject, JsonValue } from "./jsonValue.js";
 import { base58 } from "@scure/base";
@@ -16,7 +17,7 @@ import {
     isKeyForKeyField,
 } from "./permissions.js";
 import { RawGroup } from "./coValues/group.js";
-import { LocalNode } from "./localNode.js";
+import { LocalNode, ResolveAccountAgentError } from "./localNode.js";
 import { CoValueKnownState, NewContentMessage } from "./sync.js";
 import { AgentID, RawCoID, SessionID, TransactionID } from "./ids.js";
 import { AccountID, ControlledAccountOrAgent } from "./coValues/account.js";
@@ -25,7 +26,15 @@ import { coreToCoValue } from "./coreToCoValue.js";
 import { expectGroup } from "./typeUtils/expectGroup.js";
 import { isAccountID } from "./typeUtils/isAccountID.js";
 import { accountOrAgentIDfromSessionID } from "./typeUtils/accountOrAgentIDfromSessionID.js";
+import { err, ok, Result } from "neverthrow";
 
+/**
+    In order to not block other concurrently syncing CoValues we introduce a maximum size of transactions,
+    since they are the smallest unit of progress that can be synced within a CoValue.
+    This is particularly important for storing binary data in CoValues, since they are likely to be at least on the order of megabytes.
+    This also means that we want to keep signatures roughly after each MAX_RECOMMENDED_TX size chunk,
+    to be able to verify partially loaded CoValues or CoValues that are still being created (like a video live stream).
+**/
 export const MAX_RECOMMENDED_TX_SIZE = 100 * 1024;
 
 export type CoValueHeader = {
@@ -96,10 +105,10 @@ export class CoValueCore {
     _decryptionCache: {
         [key: Encrypted<JsonValue[], JsonValue>]: JsonValue[] | undefined;
     } = {};
-    currentlyAsyncApplyingTxDone?: Promise<void>;
     _cachedKnownState?: CoValueKnownState;
     _cachedDependentOn?: RawCoID[];
     _cachedNewContentSinceEmpty?: NewContentMessage[] | undefined;
+    _currentAsyncAddTransaction?: Promise<void>;
 
     constructor(
         header: CoValueHeader,
@@ -175,7 +184,9 @@ export class CoValueCore {
             this.header.meta?.type === "account"
                 ? (this.node.currentSessionID.replace(
                       this.node.account.id,
-                      this.node.account.currentAgentID(),
+                      this.node.account
+                          .currentAgentID()
+                          ._unsafeUnwrap({ withStackTrace: true }),
                   ) as SessionID)
                 : this.node.currentSessionID;
 
@@ -190,167 +201,198 @@ export class CoValueCore {
         newTransactions: Transaction[],
         givenExpectedNewHash: Hash | undefined,
         newSignature: Signature,
-    ): boolean {
-        const signerID = this.crypto.getAgentSignerID(
-            this.node.resolveAccountAgent(
+    ): Result<true, TryAddTransactionsError> {
+        return this.node
+            .resolveAccountAgent(
                 accountOrAgentIDfromSessionID(sessionID),
                 "Expected to know signer of transaction",
-            ),
-        );
+            )
+            .andThen((agent) => {
+                const signerID = this.crypto.getAgentSignerID(agent);
 
-        if (!signerID) {
-            console.warn(
-                "Unknown agent",
-                accountOrAgentIDfromSessionID(sessionID),
-            );
-            return false;
-        }
+                // const beforeHash = performance.now();
+                const { expectedNewHash, newStreamingHash } =
+                    this.expectedNewHashAfter(sessionID, newTransactions);
+                // const afterHash = performance.now();
+                // console.log(
+                //     "Hashing took",
+                //     afterHash - beforeHash
+                // );
 
-        // const beforeHash = performance.now();
-        const { expectedNewHash, newStreamingHash } = this.expectedNewHashAfter(
-            sessionID,
-            newTransactions,
-        );
-        // const afterHash = performance.now();
-        // console.log(
-        //     "Hashing took",
-        //     afterHash - beforeHash
-        // );
+                if (
+                    givenExpectedNewHash &&
+                    givenExpectedNewHash !== expectedNewHash
+                ) {
+                    return err({
+                        type: "InvalidHash",
+                        id: this.id,
+                        expectedNewHash,
+                        givenExpectedNewHash,
+                    } satisfies InvalidHashError);
+                }
 
-        if (givenExpectedNewHash && givenExpectedNewHash !== expectedNewHash) {
-            console.warn("Invalid hash", {
-                expectedNewHash,
-                givenExpectedNewHash,
+                // const beforeVerify = performance.now();
+                if (
+                    !this.crypto.verify(newSignature, expectedNewHash, signerID)
+                ) {
+                    return err({
+                        type: "InvalidSignature",
+                        id: this.id,
+                        newSignature,
+                        sessionID,
+                        signerID,
+                    } satisfies InvalidSignatureError);
+                }
+                // const afterVerify = performance.now();
+                // console.log(
+                //     "Verify took",
+                //     afterVerify - beforeVerify
+                // );
+
+                this.doAddTransactions(
+                    sessionID,
+                    newTransactions,
+                    newSignature,
+                    expectedNewHash,
+                    newStreamingHash,
+                    "immediate",
+                );
+
+                return ok(true as const);
             });
-            return false;
-        }
-
-        // const beforeVerify = performance.now();
-        if (!this.crypto.verify(newSignature, expectedNewHash, signerID)) {
-            console.warn(
-                "Invalid signature in",
-                this.id,
-                newSignature,
-                expectedNewHash,
-                signerID,
-            );
-            return false;
-        }
-        // const afterVerify = performance.now();
-        // console.log(
-        //     "Verify took",
-        //     afterVerify - beforeVerify
-        // );
-
-        this.doAddTransactions(
-            sessionID,
-            newTransactions,
-            newSignature,
-            expectedNewHash,
-            newStreamingHash,
-            "immediate",
-        );
-
-        return true;
     }
 
-    async tryAddTransactionsAsync(
+    /*tryAddTransactionsAsync(
         sessionID: SessionID,
         newTransactions: Transaction[],
         givenExpectedNewHash: Hash | undefined,
         newSignature: Signature,
-    ): Promise<boolean> {
-        if (this.currentlyAsyncApplyingTxDone) {
-            await this.currentlyAsyncApplyingTxDone;
-        }
-        let resolveDone!: () => void;
+    ): ResultAsync<true, TryAddTransactionsError> {
+        const currentAsyncAddTransaction = this._currentAsyncAddTransaction;
+        let maybeAwaitPrevious:
+            | ResultAsync<void, TryAddTransactionsError>
+            | undefined;
+        let thisDone = () => {};
 
-        this.currentlyAsyncApplyingTxDone = new Promise((resolve) => {
-            resolveDone = resolve;
-        });
-
-        const signerID = this.crypto.getAgentSignerID(
-            await this.node.resolveAccountAgentAsync(
-                accountOrAgentIDfromSessionID(sessionID),
-                "Expected to know signer of transaction",
-            ),
-        );
-
-        if (!signerID) {
-            console.warn(
-                "Unknown agent",
-                accountOrAgentIDfromSessionID(sessionID),
+        if (currentAsyncAddTransaction) {
+            // eslint-disable-next-line neverthrow/must-use-result
+            maybeAwaitPrevious = ResultAsync.fromSafePromise(
+                currentAsyncAddTransaction,
             );
-            resolveDone();
-            return false;
-        }
-
-        const nTxBefore =
-            this.sessionLogs.get(sessionID)?.transactions.length ?? 0;
-
-        // const beforeHash = performance.now();
-        const { expectedNewHash, newStreamingHash } =
-            await this.expectedNewHashAfterAsync(sessionID, newTransactions);
-        // const afterHash = performance.now();
-        // console.log(
-        //     "Hashing took",
-        //     afterHash - beforeHash
-        // );
-
-        const nTxAfter =
-            this.sessionLogs.get(sessionID)?.transactions.length ?? 0;
-
-        if (nTxAfter !== nTxBefore) {
-            const newTransactionLengthBefore = newTransactions.length;
-            newTransactions = newTransactions.slice(nTxAfter - nTxBefore);
-            console.warn("Transactions changed while async hashing", {
-                nTxBefore,
-                nTxAfter,
-                newTransactionLengthBefore,
-                remainingNewTransactions: newTransactions.length,
+        } else {
+            // eslint-disable-next-line neverthrow/must-use-result
+            maybeAwaitPrevious = ResultAsync.fromSafePromise(Promise.resolve());
+            this._currentAsyncAddTransaction = new Promise((resolve) => {
+                thisDone = resolve;
             });
         }
 
-        if (givenExpectedNewHash && givenExpectedNewHash !== expectedNewHash) {
-            console.warn("Invalid hash", {
-                expectedNewHash,
-                givenExpectedNewHash,
+        return maybeAwaitPrevious
+            .andThen((_previousDone) =>
+                this.node
+                    .resolveAccountAgentAsync(
+                        accountOrAgentIDfromSessionID(sessionID),
+                        "Expected to know signer of transaction",
+                    )
+                    .andThen((agent) => {
+                        const signerID = this.crypto.getAgentSignerID(agent);
+
+                        const nTxBefore =
+                            this.sessionLogs.get(sessionID)?.transactions
+                                .length ?? 0;
+
+                        // const beforeHash = performance.now();
+                        return ResultAsync.fromSafePromise(
+                            this.expectedNewHashAfterAsync(
+                                sessionID,
+                                newTransactions,
+                            ),
+                        ).andThen(({ expectedNewHash, newStreamingHash }) => {
+                            // const afterHash = performance.now();
+                            // console.log(
+                            //     "Hashing took",
+                            //     afterHash - beforeHash
+                            // );
+
+                            const nTxAfter =
+                                this.sessionLogs.get(sessionID)?.transactions
+                                    .length ?? 0;
+
+                            if (nTxAfter !== nTxBefore) {
+                                const newTransactionLengthBefore =
+                                    newTransactions.length;
+                                newTransactions = newTransactions.slice(
+                                    nTxAfter - nTxBefore,
+                                );
+                                console.warn(
+                                    "Transactions changed while async hashing",
+                                    {
+                                        nTxBefore,
+                                        nTxAfter,
+                                        newTransactionLengthBefore,
+                                        remainingNewTransactions:
+                                            newTransactions.length,
+                                    },
+                                );
+                            }
+
+                            if (
+                                givenExpectedNewHash &&
+                                givenExpectedNewHash !== expectedNewHash
+                            ) {
+                                return err({
+                                    type: "InvalidHash",
+                                    id: this.id,
+                                    expectedNewHash,
+                                    givenExpectedNewHash,
+                                } satisfies InvalidHashError);
+                            }
+
+                            performance.mark("verifyStart" + this.id);
+                            if (
+                                !this.crypto.verify(
+                                    newSignature,
+                                    expectedNewHash,
+                                    signerID,
+                                )
+                            ) {
+                                return err({
+                                    type: "InvalidSignature",
+                                    id: this.id,
+                                    newSignature,
+                                    sessionID,
+                                    signerID,
+                                } satisfies InvalidSignatureError);
+                            }
+                            performance.mark("verifyEnd" + this.id);
+                            performance.measure(
+                                "verify" + this.id,
+                                "verifyStart" + this.id,
+                                "verifyEnd" + this.id,
+                            );
+
+                            this.doAddTransactions(
+                                sessionID,
+                                newTransactions,
+                                newSignature,
+                                expectedNewHash,
+                                newStreamingHash,
+                                "deferred",
+                            );
+
+                            return ok(true as const);
+                        });
+                    }),
+            )
+            .map((trueResult) => {
+                thisDone();
+                return trueResult;
+            })
+            .mapErr((err) => {
+                thisDone();
+                return err;
             });
-            resolveDone();
-            return false;
-        }
-
-        performance.mark("verifyStart" + this.id);
-        if (!this.crypto.verify(newSignature, expectedNewHash, signerID)) {
-            console.warn(
-                "Invalid signature in",
-                this.id,
-                newSignature,
-                expectedNewHash,
-                signerID,
-            );
-            resolveDone();
-            return false;
-        }
-        performance.mark("verifyEnd" + this.id);
-        performance.measure(
-            "verify" + this.id,
-            "verifyStart" + this.id,
-            "verifyEnd" + this.id,
-        );
-
-        this.doAddTransactions(
-            sessionID,
-            newTransactions,
-            newSignature,
-            expectedNewHash,
-            newStreamingHash,
-            "deferred",
-        );
-
-        resolveDone();
-        return true;
-    }
+    }*/
 
     private doAddTransactions(
         sessionID: SessionID,
@@ -360,6 +402,9 @@ export class CoValueCore {
         newStreamingHash: StreamingHash,
         notifyMode: "immediate" | "deferred",
     ) {
+        if (this.node.crashed) {
+            throw new Error("Trying to add transactions after node is crashed");
+        }
         const transactions =
             this.sessionLogs.get(sessionID)?.transactions ?? [];
         transactions.push(...newTransactions);
@@ -383,7 +428,7 @@ export class CoValueCore {
                 0,
             );
 
-        if (sizeOfTxsSinceLastInbetweenSignature > 100 * 1024) {
+        if (sizeOfTxsSinceLastInbetweenSignature > MAX_RECOMMENDED_TX_SIZE) {
             // console.log(
             //     "Saving inbetween signature for tx ",
             //     sessionID,
@@ -535,7 +580,9 @@ export class CoValueCore {
             this.header.meta?.type === "account"
                 ? (this.node.currentSessionID.replace(
                       this.node.account.id,
-                      this.node.account.currentAgentID(),
+                      this.node.account
+                          .currentAgentID()
+                          ._unsafeUnwrap({ withStackTrace: true }),
                   ) as SessionID)
                 : this.node.currentSessionID;
 
@@ -553,7 +600,7 @@ export class CoValueCore {
             [transaction],
             expectedNewHash,
             signature,
-        );
+        )._unsafeUnwrap({ withStackTrace: true });
 
         if (success) {
             void this.node.syncManager.syncCoValue(this);
@@ -699,7 +746,9 @@ export class CoValueCore {
             // Try to find key revelation for us
             const lookupAccountOrAgentID =
                 this.header.meta?.type === "account"
-                    ? this.node.account.currentAgentID()
+                    ? this.node.account
+                          .currentAgentID()
+                          ._unsafeUnwrap({ withStackTrace: true })
                     : this.node.account.id;
 
             const lastReadyKeyEdit = content.lastEditAt(
@@ -708,10 +757,9 @@ export class CoValueCore {
 
             if (lastReadyKeyEdit?.value) {
                 const revealer = lastReadyKeyEdit.by;
-                const revealerAgent = this.node.resolveAccountAgent(
-                    revealer,
-                    "Expected to know revealer",
-                );
+                const revealerAgent = this.node
+                    .resolveAccountAgent(revealer, "Expected to know revealer")
+                    ._unsafeUnwrap({ withStackTrace: true });
 
                 const secret = this.crypto.unseal(
                     lastReadyKeyEdit.value,
@@ -976,3 +1024,23 @@ function getNextKnownSignatureIdx(
                 idx >= (sentStateForSessionID ?? knownStateForSessionID ?? -1),
         );
 }
+
+export type InvalidHashError = {
+    type: "InvalidHash";
+    id: RawCoID;
+    expectedNewHash: Hash;
+    givenExpectedNewHash: Hash;
+};
+
+export type InvalidSignatureError = {
+    type: "InvalidSignature";
+    id: RawCoID;
+    newSignature: Signature;
+    sessionID: SessionID;
+    signerID: SignerID;
+};
+
+export type TryAddTransactionsError =
+    | ResolveAccountAgentError
+    | InvalidHashError
+    | InvalidSignatureError;

packages/cojson/src/coValues/account.ts

@@ -13,6 +13,7 @@ import { RawCoMap } from "./coMap.js";
 import { RawGroup, InviteSecret } from "./group.js";
 import { LocalNode } from "../index.js";
 import { JsonObject } from "../jsonValue.js";
+import { err, ok, Result } from "neverthrow";
 
 export function accountHeaderForInitialAgentSecret(
     agentSecret: AgentSecret,
@@ -30,21 +31,34 @@ export function accountHeaderForInitialAgentSecret(
     };
 }
 
+export type InvalidAccountAgentIDError = {
+    type: "InvalidAccountAgentID";
+    reason: string;
+};
+
 export class RawAccount<
     Meta extends AccountMeta = AccountMeta,
 > extends RawGroup<Meta> {
-    currentAgentID(): AgentID {
+    _cachedCurrentAgentID: AgentID | undefined;
+
+    currentAgentID(): Result<AgentID, InvalidAccountAgentIDError> {
+        if (this._cachedCurrentAgentID) {
+            return ok(this._cachedCurrentAgentID);
+        }
         const agents = this.keys().filter((k): k is AgentID =>
             k.startsWith("sealer_"),
         );
 
         if (agents.length !== 1) {
-            throw new Error(
-                "Expected exactly one agent in account, got " + agents.length,
-            );
+            return err({
+                type: "InvalidAccountAgentID",
+                reason: "Account has " + agents.length + " agents",
+            });
         }
 
-        return agents[0]!;
+        this._cachedCurrentAgentID = agents[0];
+
+        return ok(agents[0]!);
     }
 }
 
@@ -52,10 +66,10 @@ export interface ControlledAccountOrAgent {
     id: AccountID | AgentID;
     agentSecret: AgentSecret;
 
-    currentAgentID: () => AgentID;
-    currentSignerID: () => SignerID;
+    currentAgentID: () => Result<AgentID, InvalidAccountAgentIDError>;
+    currentSignerID: () => Result<SignerID, InvalidAccountAgentIDError>;
     currentSignerSecret: () => SignerSecret;
-    currentSealerID: () => SealerID;
+    currentSealerID: () => Result<SealerID, InvalidAccountAgentIDError>;
     currentSealerSecret: () => SealerSecret;
 }
 
@@ -89,20 +103,29 @@ export class RawControlledAccount<Meta extends AccountMeta = AccountMeta>
         return this.core.node.acceptInvite(groupOrOwnedValueID, inviteSecret);
     }
 
-    currentAgentID(): AgentID {
-        return this.crypto.getAgentID(this.agentSecret);
+    currentAgentID(): Result<AgentID, InvalidAccountAgentIDError> {
+        if (this._cachedCurrentAgentID) {
+            return ok(this._cachedCurrentAgentID);
+        }
+        const agentID = this.crypto.getAgentID(this.agentSecret);
+        this._cachedCurrentAgentID = agentID;
+        return ok(agentID);
     }
 
-    currentSignerID(): SignerID {
-        return this.crypto.getAgentSignerID(this.currentAgentID());
+    currentSignerID() {
+        return this.currentAgentID().map((id) =>
+            this.crypto.getAgentSignerID(id),
+        );
     }
 
     currentSignerSecret(): SignerSecret {
         return this.crypto.getAgentSignerSecret(this.agentSecret);
     }
 
-    currentSealerID(): SealerID {
-        return this.crypto.getAgentSealerID(this.currentAgentID());
+    currentSealerID() {
+        return this.currentAgentID().map((id) =>
+            this.crypto.getAgentSealerID(id),
+        );
     }
 
     currentSealerSecret(): SealerSecret {
@@ -121,20 +144,24 @@ export class ControlledAgent implements ControlledAccountOrAgent {
         return this.crypto.getAgentID(this.agentSecret);
     }
 
-    currentAgentID(): AgentID {
-        return this.crypto.getAgentID(this.agentSecret);
+    currentAgentID() {
+        return ok(this.crypto.getAgentID(this.agentSecret));
     }
 
-    currentSignerID(): SignerID {
-        return this.crypto.getAgentSignerID(this.currentAgentID());
+    currentSignerID() {
+        return this.currentAgentID().map((id) =>
+            this.crypto.getAgentSignerID(id),
+        );
     }
 
     currentSignerSecret(): SignerSecret {
         return this.crypto.getAgentSignerSecret(this.agentSecret);
     }
 
-    currentSealerID(): SealerID {
-        return this.crypto.getAgentSealerID(this.currentAgentID());
+    currentSealerID() {
+        return this.currentAgentID().map((id) =>
+            this.crypto.getAgentSealerID(id),
+        );
     }
 
     currentSealerSecret(): SealerSecret {

packages/cojson/src/coValues/group.ts

@@ -120,7 +120,9 @@ export class RawGroup<
             const agent =
                 typeof account === "string"
                     ? account
-                    : account.currentAgentID();
+                    : account
+                          .currentAgentID()
+                          ._unsafeUnwrap({ withStackTrace: true });
             this.set(memberKey, role, "trusting");
 
             if (this.get(memberKey) !== role) {
@@ -175,7 +177,7 @@ export class RawGroup<
             const reader = this.core.node.resolveAccountAgent(
                 readerID,
                 "Expected to know currently permitted reader",
-            );
+            )._unsafeUnwrap({ withStackTrace: true });
 
             this.set(
                 `${newReadKey.id}_for_${readerID}`,

packages/cojson/src/crypto/WasmCrypto.ts

@@ -44,11 +44,13 @@ export class WasmCrypto extends CryptoProvider<Uint8Array> {
                 if ("crypto" in globalThis) {
                     resolve();
                 } else {
-                    return import("node:crypto").then(({ webcrypto }) => {
-                        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-                        (globalThis as any).crypto = webcrypto;
-                        resolve();
-                    });
+                    return import(/*webpackIgnore: true*/ "node:crypto").then(
+                        ({ webcrypto }) => {
+                            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                            (globalThis as any).crypto = webcrypto;
+                            resolve();
+                        },
+                    );
                 }
             }),
         ]).then(([blake3instance]) => new WasmCrypto(blake3instance));

packages/cojson/src/index.ts

@@ -18,7 +18,7 @@ import {
 } from "./crypto/crypto.js";
 import { WasmCrypto } from "./crypto/WasmCrypto.js";
 import { PureJSCrypto } from "./crypto/PureJSCrypto.js";
-import { connectedPeers } from "./streamUtils.js";
+import { connectedPeers, Channel } from "./streamUtils.js";
 import { ControlledAgent, RawControlledAccount } from "./coValues/account.js";
 import type { Role } from "./permissions.js";
 import { rawCoIDtoBytes, rawCoIDfromBytes, isRawCoID } from "./ids.js";
@@ -41,7 +41,13 @@ import type {
     BinaryCoStreamMeta,
 } from "./coValues/coStream.js";
 import type { JsonValue } from "./jsonValue.js";
-import type { SyncMessage, Peer } from "./sync.js";
+import type {
+    SyncMessage,
+    Peer,
+    IncomingSyncStream,
+    OutgoingSyncQueue,
+} from "./sync.js";
+import { DisconnectedError, PingTimeoutError } from "./sync.js";
 import type { AgentSecret } from "./crypto/crypto.js";
 import type {
     AccountID,
@@ -53,12 +59,7 @@ import type * as Media from "./media.js";
 
 type Value = JsonValue | AnyRawCoValue;
 
-import {
-    LSMStorage,
-    FSErr,
-    BlockFilename,
-    WalFilename,
-} from "./storage/index.js";
+import { LSMStorage, BlockFilename, WalFilename } from "./storage/index.js";
 import { FileSystem } from "./storage/FileSystem.js";
 
 /** @hidden */
@@ -78,6 +79,7 @@ export const cojsonInternals = {
     accountHeaderForInitialAgentSecret,
     idforHeader,
     StreamingHash,
+    Channel,
 };
 
 export {
@@ -119,7 +121,16 @@ export {
     LSMStorage,
 };
 
-export type { Value, FileSystem, FSErr, BlockFilename, WalFilename };
+export type {
+    Value,
+    FileSystem,
+    BlockFilename,
+    WalFilename,
+    IncomingSyncStream,
+    OutgoingSyncQueue,
+    DisconnectedError,
+    PingTimeoutError,
+};
 
 // eslint-disable-next-line @typescript-eslint/no-namespace
 export namespace CojsonInternalTypes {

packages/cojson/src/localNode.ts

@@ -22,9 +22,11 @@ import {
     AccountID,
     RawProfile,
     RawAccountMigration,
+    InvalidAccountAgentIDError,
 } from "./coValues/account.js";
 import { Profile, RawCoValue } from "./index.js";
 import { expectGroup } from "./typeUtils/expectGroup.js";
+import { err, ok, okAsync, Result, ResultAsync } from "neverthrow";
 
 /** A `LocalNode` represents a local view of a set of loaded `CoValue`s, from the perspective of a particular account (or primitive cryptographic agent).
 
@@ -49,6 +51,8 @@ export class LocalNode {
     /** @category 3. Low-level */
     syncManager = new SyncManager(this);
 
+    crashed: Error | undefined = undefined;
+
     /** @category 3. Low-level */
     constructor(
         account: ControlledAccountOrAgent,
@@ -240,6 +244,12 @@ export class LocalNode {
 
     /** @internal */
     createCoValue(header: CoValueHeader): CoValueCore {
+        if (this.crashed) {
+            throw new Error("Trying to create CoValue after node has crashed", {
+                cause: this.crashed,
+            });
+        }
+
         const coValue = new CoValueCore(header, this);
         this.coValues[coValue.id] = { state: "loaded", coValue: coValue };
 
@@ -257,6 +267,12 @@ export class LocalNode {
             onProgress?: (progress: number) => void;
         } = {},
     ): Promise<CoValueCore | "unavailable"> {
+        if (this.crashed) {
+            throw new Error("Trying to load CoValue after node has crashed", {
+                cause: this.crashed,
+            });
+        }
+
         let entry = this.coValues[id];
         if (!entry) {
             const peersToWaitFor = new Set(
@@ -519,9 +535,9 @@ export class LocalNode {
     resolveAccountAgent(
         id: AccountID | AgentID,
         expectation?: string,
-    ): AgentID {
+    ): Result<AgentID, ResolveAccountAgentError> {
         if (isAgentID(id)) {
-            return id;
+            return ok(id);
         }
 
         const coValue = this.expectCoValueLoaded(id, expectation);
@@ -533,49 +549,58 @@ export class LocalNode {
             !("type" in coValue.header.meta) ||
             coValue.header.meta.type !== "account"
         ) {
-            throw new Error(
-                `${
-                    expectation ? expectation + ": " : ""
-                }CoValue ${id} is not an account`,
-            );
+            return err({
+                type: "UnexpectedlyNotAccount",
+                expectation,
+                id,
+            } satisfies UnexpectedlyNotAccountError);
         }
 
         return (coValue.getCurrentContent() as RawAccount).currentAgentID();
     }
 
-    async resolveAccountAgentAsync(
+    resolveAccountAgentAsync(
         id: AccountID | AgentID,
         expectation?: string,
-    ): Promise<AgentID> {
+    ): ResultAsync<AgentID, ResolveAccountAgentError> {
         if (isAgentID(id)) {
-            return id;
+            return okAsync(id);
         }
 
-        const coValue = await this.loadCoValueCore(id);
+        return ResultAsync.fromPromise(
+            this.loadCoValueCore(id),
+            (e) =>
+                ({
+                    type: "ErrorLoadingCoValueCore",
+                    expectation,
+                    id,
+                    error: e,
+                }) satisfies LoadCoValueCoreError,
+        ).andThen((coValue) => {
+            if (coValue === "unavailable") {
+                return err({
+                    type: "AccountUnavailableFromAllPeers" as const,
+                    expectation,
+                    id,
+                } satisfies AccountUnavailableFromAllPeersError);
+            }
 
-        if (coValue === "unavailable") {
-            throw new Error(
-                `${
-                    expectation ? expectation + ": " : ""
-                }Account ${id} is unavailable from all peers`,
-            );
-        }
+            if (
+                coValue.header.type !== "comap" ||
+                coValue.header.ruleset.type !== "group" ||
+                !coValue.header.meta ||
+                !("type" in coValue.header.meta) ||
+                coValue.header.meta.type !== "account"
+            ) {
+                return err({
+                    type: "UnexpectedlyNotAccount" as const,
+                    expectation,
+                    id,
+                } satisfies UnexpectedlyNotAccountError);
+            }
 
-        if (
-            coValue.header.type !== "comap" ||
-            coValue.header.ruleset.type !== "group" ||
-            !coValue.header.meta ||
-            !("type" in coValue.header.meta) ||
-            coValue.header.meta.type !== "account"
-        ) {
-            throw new Error(
-                `${
-                    expectation ? expectation + ": " : ""
-                }CoValue ${id} is not an account`,
-            );
-        }
-
-        return (coValue.getCurrentContent() as RawAccount).currentAgentID();
+            return (coValue.getCurrentContent() as RawAccount).currentAgentID();
+        });
     }
 
     /**
@@ -600,7 +625,9 @@ export class LocalNode {
             this.crypto.seal({
                 message: readKey.secret,
                 from: this.account.currentSealerSecret(),
-                to: this.account.currentSealerID(),
+                to: this.account
+                    .currentSealerID()
+                    ._unsafeUnwrap({ withStackTrace: true }),
                 nOnceMaterial: {
                     in: groupCoValue.id,
                     tx: groupCoValue.nextTransactionID(),
@@ -670,6 +697,10 @@ export class LocalNode {
 
         return newNode;
     }
+
+    gracefulShutdown() {
+        this.syncManager.gracefulShutdown();
+    }
 }
 
 /** @internal */
@@ -696,6 +727,31 @@ type CoValueState =
           onProgress?: (progress: number) => void;
       };
 
+export type LoadCoValueCoreError = {
+    type: "ErrorLoadingCoValueCore";
+    error: unknown;
+    expectation?: string;
+    id: AccountID;
+};
+
+export type AccountUnavailableFromAllPeersError = {
+    type: "AccountUnavailableFromAllPeers";
+    expectation?: string;
+    id: AccountID;
+};
+
+export type UnexpectedlyNotAccountError = {
+    type: "UnexpectedlyNotAccount";
+    expectation?: string;
+    id: AccountID;
+};
+
+export type ResolveAccountAgentError =
+    | InvalidAccountAgentIDError
+    | LoadCoValueCoreError
+    | AccountUnavailableFromAllPeersError
+    | UnexpectedlyNotAccountError;
+
 /** @internal */
 export function newLoadingState(
     currentPeerIds: Set<PeerID>,

packages/cojson/src/permissions.ts

@@ -249,8 +249,22 @@ export function determineValidTransactions(
                         const effectiveTransactor =
                             transactor === groupContent.id &&
                             groupAtTime instanceof RawAccount
-                                ? groupAtTime.currentAgentID()
+                                ? groupAtTime.currentAgentID().match(
+                                      (agentID) => agentID,
+                                      (e) => {
+                                          console.error(
+                                              "Error while determining current agent ID in valid transactions",
+                                              e,
+                                          );
+                                          return undefined;
+                                      },
+                                  )
                                 : transactor;
+
+                        if (!effectiveTransactor) {
+                            return false;
+                        }
+
                         const transactorRoleAtTxTime =
                             groupAtTime.get(effectiveTransactor) ||
                             groupAtTime.get(EVERYONE);

packages/cojson/src/storage/FileSystem.ts

@@ -1,9 +1,8 @@
-import { Effect } from "effect";
 import { CoValueChunk } from "./index.js";
 import { RawCoID } from "../ids.js";
 import { CryptoProvider, StreamingHash } from "../crypto/crypto.js";
 
-export type BlockFilename = `${string}-L${number}-H${number}.jsonl`;
+export type BlockFilename = `L${number}-${string}-${string}-H${number}.jsonl`;
 
 export type BlockHeader = { id: RawCoID; start: number; length: number }[];
 
@@ -11,142 +10,124 @@ export type WalEntry = { id: RawCoID } & CoValueChunk;
 
 export type WalFilename = `wal-${number}.jsonl`;
 
-export type FSErr = {
-    type: "fileSystemError";
-    error: Error;
-};
-
 export interface FileSystem<WriteHandle, ReadHandle> {
     crypto: CryptoProvider;
-    createFile(filename: string): Effect.Effect<WriteHandle, FSErr>;
-    append(handle: WriteHandle, data: Uint8Array): Effect.Effect<void, FSErr>;
-    close(handle: ReadHandle | WriteHandle): Effect.Effect<void, FSErr>;
-    closeAndRename(
-        handle: WriteHandle,
-        filename: BlockFilename,
-    ): Effect.Effect<void, FSErr>;
-    openToRead(
-        filename: string,
-    ): Effect.Effect<{ handle: ReadHandle; size: number }, FSErr>;
+    createFile(filename: string): Promise<WriteHandle>;
+    append(handle: WriteHandle, data: Uint8Array): Promise<void>;
+    close(handle: ReadHandle | WriteHandle): Promise<void>;
+    closeAndRename(handle: WriteHandle, filename: BlockFilename): Promise<void>;
+    openToRead(filename: string): Promise<{ handle: ReadHandle; size: number }>;
     read(
         handle: ReadHandle,
         offset: number,
         length: number,
-    ): Effect.Effect<Uint8Array, FSErr>;
-    listFiles(): Effect.Effect<string[], FSErr>;
-    removeFile(
-        filename: BlockFilename | WalFilename,
-    ): Effect.Effect<void, FSErr>;
+    ): Promise<Uint8Array>;
+    listFiles(): Promise<string[]>;
+    removeFile(filename: BlockFilename | WalFilename): Promise<void>;
 }
 
 export const textEncoder = new TextEncoder();
 export const textDecoder = new TextDecoder();
 
-export function readChunk<RH, FS extends FileSystem<unknown, RH>>(
+export async function readChunk<RH, FS extends FileSystem<unknown, RH>>(
     handle: RH,
     header: { start: number; length: number },
     fs: FS,
-): Effect.Effect<CoValueChunk, FSErr> {
-    return Effect.gen(function* ($) {
-        const chunkBytes = yield* $(
-            fs.read(handle, header.start, header.length),
-        );
+): Promise<CoValueChunk> {
+    const chunkBytes = await fs.read(handle, header.start, header.length);
 
-        const chunk = JSON.parse(textDecoder.decode(chunkBytes));
-        return chunk;
-    });
+    const chunk = JSON.parse(textDecoder.decode(chunkBytes));
+    return chunk;
 }
 
-export function readHeader<RH, FS extends FileSystem<unknown, RH>>(
+export async function readHeader<RH, FS extends FileSystem<unknown, RH>>(
     filename: string,
     handle: RH,
     size: number,
     fs: FS,
-): Effect.Effect<BlockHeader, FSErr> {
-    return Effect.gen(function* ($) {
-        const headerLength = Number(filename.match(/-H(\d+)\.jsonl$/)![1]!);
+): Promise<BlockHeader> {
+    const headerLength = Number(filename.match(/-H(\d+)\.jsonl$/)![1]!);
 
-        const headerBytes = yield* $(
-            fs.read(handle, size - headerLength, headerLength),
-        );
+    const headerBytes = await fs.read(
+        handle,
+        size - headerLength,
+        headerLength,
+    );
 
-        const header = JSON.parse(textDecoder.decode(headerBytes));
-        return header;
-    });
+    const header = JSON.parse(textDecoder.decode(headerBytes));
+    return header;
 }
 
-export function writeBlock<WH, RH, FS extends FileSystem<WH, RH>>(
+export async function writeBlock<WH, RH, FS extends FileSystem<WH, RH>>(
     chunks: Map<RawCoID, CoValueChunk>,
     level: number,
+    blockNumber: number,
     fs: FS,
-): Effect.Effect<void, FSErr> {
+): Promise<BlockFilename> {
     if (chunks.size === 0) {
-        return Effect.die(new Error("No chunks to write"));
+        throw new Error("No chunks to write");
     }
 
-    return Effect.gen(function* ($) {
-        const blockHeader: BlockHeader = [];
+    const blockHeader: BlockHeader = [];
 
-        let offset = 0;
+    let offset = 0;
 
-        const file = yield* $(
-            fs.createFile(
-                "wipBlock" +
-                    Math.random().toString(36).substring(7) +
-                    ".tmp.jsonl",
-            ),
-        );
-        const hash = new StreamingHash(fs.crypto);
+    const file = await fs.createFile(
+        "wipBlock" + Math.random().toString(36).substring(7) + ".tmp.jsonl",
+    );
+    const hash = new StreamingHash(fs.crypto);
 
-        const chunksSortedById = Array.from(chunks).sort(([id1], [id2]) =>
-            id1.localeCompare(id2),
-        );
+    const chunksSortedById = Array.from(chunks).sort(([id1], [id2]) =>
+        id1.localeCompare(id2),
+    );
 
-        for (const [id, chunk] of chunksSortedById) {
-            const encodedBytes = hash.update(chunk);
-            const encodedBytesWithNewline = new Uint8Array(
-                encodedBytes.length + 1,
-            );
-            encodedBytesWithNewline.set(encodedBytes);
-            encodedBytesWithNewline[encodedBytes.length] = 10;
-            yield* $(fs.append(file, encodedBytesWithNewline));
-            const length = encodedBytesWithNewline.length;
-            blockHeader.push({ id, start: offset, length });
-            offset += length;
-        }
+    for (const [id, chunk] of chunksSortedById) {
+        const encodedBytes = hash.update(chunk);
+        const encodedBytesWithNewline = new Uint8Array(encodedBytes.length + 1);
+        encodedBytesWithNewline.set(encodedBytes);
+        encodedBytesWithNewline[encodedBytes.length] = 10;
+        await fs.append(file, encodedBytesWithNewline);
+        const length = encodedBytesWithNewline.length;
+        blockHeader.push({ id, start: offset, length });
+        offset += length;
+    }
 
-        const headerBytes = textEncoder.encode(JSON.stringify(blockHeader));
-        yield* $(fs.append(file, headerBytes));
+    const headerBytes = textEncoder.encode(JSON.stringify(blockHeader));
+    await fs.append(file, headerBytes);
 
-        console.log(
-            "full file",
-            yield* $(
-                fs.read(file as unknown as RH, 0, offset + headerBytes.length),
-            ),
-        );
+    // console.log(
+    //     "full file",
+    //     yield* $(
+    //         fs.read(file as unknown as RH, 0, offset + headerBytes.length),
+    //     ),
+    // );
 
-        const filename: BlockFilename = `${hash.digest()}-L${level}-H${
-            headerBytes.length
-        }.jsonl`;
-        console.log("renaming to" + filename);
-        yield* $(fs.closeAndRename(file, filename));
+    const filename: BlockFilename = `L${level}-${(blockNumber + "").padStart(
+        3,
+        "0",
+    )}-${hash.digest().replace("hash_", "").slice(0, 15)}-H${
+        headerBytes.length
+    }.jsonl`;
+    // console.log("renaming to" + filename);
+    await fs.closeAndRename(file, filename);
 
-        console.log("Wrote block", filename, blockHeader);
-    });
+    return filename;
+
+    // console.log("Wrote block", filename, blockHeader);
+    // console.log("IDs in block", blockHeader.map(e => e.id));
 }
 
-export function writeToWal<WH, RH, FS extends FileSystem<WH, RH>>(
+export async function writeToWal<WH, RH, FS extends FileSystem<WH, RH>>(
     handle: WH,
     fs: FS,
     id: RawCoID,
     chunk: CoValueChunk,
-): Effect.Effect<void, FSErr> {
-    return Effect.gen(function* ($) {
-        const walEntry: WalEntry = {
-            id,
-            ...chunk,
-        };
-        const bytes = textEncoder.encode(JSON.stringify(walEntry) + "\n");
-        yield* $(fs.append(handle, bytes));
-    });
+) {
+    const walEntry: WalEntry = {
+        id,
+        ...chunk,
+    };
+    const bytes = textEncoder.encode(JSON.stringify(walEntry) + "\n");
+    console.log("writing to WAL", handle, id, bytes.length);
+    return fs.append(handle, bytes);
 }

packages/cojson/src/storage/chunksAndKnownStates.ts

@@ -1,4 +1,3 @@
-import { Either } from "effect";
 import { RawCoID, SessionID } from "../ids.js";
 import { MAX_RECOMMENDED_TX_SIZE } from "../index.js";
 import { CoValueKnownState, NewContentMessage } from "../sync.js";
@@ -80,7 +79,7 @@ export function chunkToKnownState(id: RawCoID, chunk: CoValueChunk) {
 export function mergeChunks(
     chunkA: CoValueChunk,
     chunkB: CoValueChunk,
-): Either.Either<"nonContigous", CoValueChunk> {
+): "nonContigous" | CoValueChunk {
     const header = chunkA.header || chunkB.header;
 
     const newSessions = { ...chunkA.sessionEntries };
@@ -126,14 +125,16 @@ export function mergeChunks(
                 } else {
                     const lastNewEntry = newEntries[newEntries.length - 1]!;
                     lastNewEntry.transactions.push(...entry.transactions);
+                    lastNewEntry.lastSignature = entry.lastSignature;
 
                     bytesSinceLastSignature += entry.transactions.length;
                 }
             }
+            newSessions[sessionID] = newEntries;
         } else {
-            return Either.right("nonContigous" as const);
+            return "nonContigous" as const;
         }
     }
 
-    return Either.left({ header, sessionEntries: newSessions });
+    return { header, sessionEntries: newSessions };
 }