jazz-run 0.8.7 → 0.8.11

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # jazz-run
 
+## 0.8.11
+
+### Patch Changes
+
+-   1ed4ab5: Improve the jazz-run create command by subscribing to the peer sync state
+-   Updated dependencies [1ed4ab5]
+    -   cojson@0.8.11
+    -   cojson-storage-sqlite@0.8.11
+    -   cojson-transport-ws@0.8.11
+    -   jazz-tools@0.8.11
+
+## 0.8.10
+
+### Patch Changes
+
+-   a818462: Temporary fix for account create
+
 ## 0.8.7
 
 ### Patch Changes

package/dist/accountCreate.js

@@ -0,0 +1,88 @@
+import { Command, Options } from "@effect/cli";
+import { Console, Effect } from "effect";
+import { createWebSocketPeer } from "cojson-transport-ws";
+import { WebSocket } from "ws";
+import { Account, WasmCrypto, createJazzContext, isControlledAccount, } from "jazz-tools";
+import { fixedCredentialsAuth, randomSessionProvider } from "jazz-tools";
+const name = Options.text("name").pipe(Options.withAlias("n"));
+const peer = Options.text("peer")
+    .pipe(Options.withAlias("p"))
+    .pipe(Options.withDefault("wss://cloud.jazz.tools"));
+const accountCreate = Command.make("create", { name, peer }, ({ name, peer: peerAddr }) => {
+    return Effect.gen(function* () {
+        const crypto = yield* Effect.promise(() => WasmCrypto.create());
+        const peer = createWebSocketPeer({
+            id: "upstream",
+            websocket: new WebSocket(peerAddr),
+            role: "server",
+        });
+        const account = yield* Effect.promise(async () => Account.create({
+            creationProps: { name },
+            peersToLoadFrom: [peer],
+            crypto,
+        }));
+        if (!isControlledAccount(account)) {
+            throw new Error("account is not a controlled account");
+        }
+        const accountCoValue = account._raw.core;
+        const accountProfileCoValue = account.profile._raw.core;
+        const syncManager = account._raw.core.node.syncManager;
+        yield* Effect.promise(() => syncManager.syncCoValue(accountCoValue));
+        yield* Effect.promise(() => syncManager.syncCoValue(accountProfileCoValue));
+        yield* Effect.promise(() => Promise.all([
+            waitForSync(account, peer, accountCoValue),
+            waitForSync(account, peer, accountProfileCoValue),
+        ]));
+        // Spawn a second peer to double check that the account is fully synced
+        const peer2 = createWebSocketPeer({
+            id: "upstream2",
+            websocket: new WebSocket(peerAddr),
+            role: "server",
+        });
+        yield* Effect.promise(async () => createJazzContext({
+            auth: fixedCredentialsAuth({
+                accountID: account.id,
+                secret: account._raw.agentSecret,
+            }),
+            sessionProvider: randomSessionProvider,
+            peersToLoadFrom: [peer2],
+            crypto,
+        }));
+        yield* Console.log(`# Credentials for Jazz account "${name}":
+JAZZ_WORKER_ACCOUNT=${account.id}
+JAZZ_WORKER_SECRET=${account._raw.agentSecret}
+`);
+    });
+});
+const accountBase = Command.make("account");
+export const account = accountBase.pipe(Command.withSubcommands([accountCreate]));
+function waitForSync(account, peer, coValue) {
+    const syncManager = account._raw.core.node.syncManager;
+    const peerState = syncManager.peers[peer.id];
+    return new Promise((resolve) => {
+        const unsubscribe = peerState?.optimisticKnownStates.subscribe((id, peerKnownState) => {
+            if (id !== coValue.id)
+                return;
+            const knownState = coValue.knownState();
+            const synced = isEqualSession(knownState.sessions, peerKnownState.sessions);
+            if (synced) {
+                resolve(true);
+                unsubscribe?.();
+            }
+        });
+    });
+}
+function isEqualSession(a, b) {
+    const keysA = Object.keys(a);
+    const keysB = Object.keys(b);
+    if (keysA.length !== keysB.length) {
+        return false;
+    }
+    for (const sessionId of keysA) {
+        if (a[sessionId] !== b[sessionId]) {
+            return false;
+        }
+    }
+    return true;
+}
+//# sourceMappingURL=accountCreate.js.map

package/dist/accountCreate.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"accountCreate.js","sourceRoot":"","sources":["../src/accountCreate.ts"],"names":[],"mappings":"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"}

package/dist/index.js

@@ -1,60 +1,11 @@
 #!/usr/bin/env node
 /* istanbul ignore file -- @preserve */
-import { Command, Options } from "@effect/cli";
+import { Command } from "@effect/cli";
 import { NodeContext, NodeRuntime } from "@effect/platform-node";
-import { Console, Effect } from "effect";
-import { createWebSocketPeer } from "cojson-transport-ws";
-import { WebSocket } from "ws";
-import { Account, WasmCrypto, createJazzContext, isControlledAccount, } from "jazz-tools";
-import { fixedCredentialsAuth, randomSessionProvider } from "jazz-tools";
+import { Effect } from "effect";
+import { account } from "./accountCreate.js";
 import { startSync } from "./startSync.js";
 const jazzTools = Command.make("jazz-tools");
-const name = Options.text("name").pipe(Options.withAlias("n"));
-const peer = Options.text("peer")
-    .pipe(Options.withAlias("p"))
-    .pipe(Options.withDefault("wss://mesh.jazz.tools"));
-const accountCreate = Command.make("create", { name, peer }, ({ name, peer: peerAddr }) => {
-    return Effect.gen(function* () {
-        const crypto = yield* Effect.promise(() => WasmCrypto.create());
-        const peer = createWebSocketPeer({
-            id: "upstream",
-            websocket: new WebSocket(peerAddr),
-            role: "server",
-        });
-        const account = yield* Effect.promise(async () => Account.create({
-            creationProps: { name },
-            peersToLoadFrom: [peer],
-            crypto,
-        }));
-        if (!isControlledAccount(account)) {
-            throw new Error("account is not a controlled account");
-        }
-        yield* Effect.promise(() => account._raw.core.node.syncManager.syncCoValue(account._raw.core));
-        yield* Effect.promise(() => account._raw.core.node.syncManager.syncCoValue(account.profile._raw.core));
-        // TODO: remove this once we have a better way to wait for the sync
-        yield* Effect.sleep(500);
-        const peer2 = createWebSocketPeer({
-            id: "upstream2",
-            websocket: new WebSocket(peerAddr),
-            role: "server",
-        });
-        yield* Effect.promise(async () => createJazzContext({
-            auth: fixedCredentialsAuth({
-                accountID: account.id,
-                secret: account._raw.agentSecret,
-            }),
-            sessionProvider: randomSessionProvider,
-            peersToLoadFrom: [peer2],
-            crypto,
-        }));
-        yield* Console.log(`# Credentials for Jazz account "${name}":
-JAZZ_WORKER_ACCOUNT=${account.id}
-JAZZ_WORKER_SECRET=${account._raw.agentSecret}
-`);
-    });
-});
-const accountBase = Command.make("account");
-const account = accountBase.pipe(Command.withSubcommands([accountCreate]));
 const command = jazzTools.pipe(Command.withSubcommands([account, startSync]));
 const cli = Command.run(command, {
     name: "Jazz CLI Tools",

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AACA,uCAAuC;AACvC,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AACtC,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACjE,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAC7C,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAE3C,MAAM,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;AAE7C,MAAM,OAAO,GAAG,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC;AAE9E,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,OAAO,EAAE;IAC7B,IAAI,EAAE,gBAAgB;IACtB,OAAO,EAAE,QAAQ;CACpB,CAAC,CAAC;AAEH,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CACxC,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,KAAK,CAAC,EACjC,WAAW,CAAC,OAAO,CACtB,CAAC"}

package/package.json

@@ -3,7 +3,7 @@
   "bin": "./dist/index.js",
   "type": "module",
   "license": "MIT",
-  "version": "0.8.7",
+  "version": "0.8.11",
   "dependencies": {
     "@effect/cli": "^0.41.2",
     "@effect/platform-node": "^0.57.2",
@@ -11,11 +11,11 @@
     "@effect/printer-ansi": "^0.34.5",
     "@effect/schema": "^0.71.1",
     "@effect/typeclass": "^0.25.5",
-    "cojson": "0.8.5",
-    "cojson-storage-sqlite": "0.8.5",
-    "cojson-transport-ws": "0.8.7",
+    "cojson": "0.8.11",
+    "cojson-storage-sqlite": "0.8.11",
+    "cojson-transport-ws": "0.8.11",
     "effect": "^3.6.5",
-    "jazz-tools": "0.8.5",
+    "jazz-tools": "0.8.11",
     "ws": "^8.14.2"
   },
   "devDependencies": {

package/src/accountCreate.ts

@@ -0,0 +1,125 @@
+import { Command, Options } from "@effect/cli";
+import { Console, Effect } from "effect";
+import { createWebSocketPeer } from "cojson-transport-ws";
+import { WebSocket } from "ws";
+import {
+    Account,
+    Peer,
+    WasmCrypto,
+    createJazzContext,
+    isControlledAccount,
+} from "jazz-tools";
+import { fixedCredentialsAuth, randomSessionProvider } from "jazz-tools";
+import { CoValueCore } from "cojson";
+
+const name = Options.text("name").pipe(Options.withAlias("n"));
+const peer = Options.text("peer")
+    .pipe(Options.withAlias("p"))
+    .pipe(Options.withDefault("wss://cloud.jazz.tools"));
+
+const accountCreate = Command.make(
+    "create",
+    { name, peer },
+    ({ name, peer: peerAddr }) => {
+        return Effect.gen(function* () {
+            const crypto = yield* Effect.promise(() => WasmCrypto.create());
+
+            const peer = createWebSocketPeer({
+                id: "upstream",
+                websocket: new WebSocket(peerAddr),
+                role: "server",
+            });
+
+            const account: Account = yield* Effect.promise(async () =>
+                Account.create({
+                    creationProps: { name },
+                    peersToLoadFrom: [peer],
+                    crypto,
+                }),
+            );
+            if (!isControlledAccount(account)) {
+                throw new Error("account is not a controlled account");
+            }
+
+            const accountCoValue = account._raw.core;
+            const accountProfileCoValue = account.profile!._raw.core;
+            const syncManager = account._raw.core.node.syncManager;
+
+            yield* Effect.promise(() =>
+                syncManager.syncCoValue(accountCoValue),
+            );
+            yield* Effect.promise(() =>
+                syncManager.syncCoValue(accountProfileCoValue),
+            );
+
+            yield* Effect.promise(() => Promise.all([
+                waitForSync(account, peer, accountCoValue),
+                waitForSync(account, peer, accountProfileCoValue),
+            ]));
+
+            // Spawn a second peer to double check that the account is fully synced
+            const peer2 = createWebSocketPeer({
+                id: "upstream2",
+                websocket: new WebSocket(peerAddr),
+                role: "server",
+            });
+
+            yield* Effect.promise(async () =>
+                createJazzContext({
+                    auth: fixedCredentialsAuth({
+                        accountID: account.id,
+                        secret: account._raw.agentSecret,
+                    }),
+                    sessionProvider: randomSessionProvider,
+                    peersToLoadFrom: [peer2],
+                    crypto,
+                }),
+            );
+
+            yield* Console.log(`# Credentials for Jazz account "${name}":
+JAZZ_WORKER_ACCOUNT=${account.id}
+JAZZ_WORKER_SECRET=${account._raw.agentSecret}
+`);
+        });
+    },
+);
+
+const accountBase = Command.make("account");
+
+export const account = accountBase.pipe(Command.withSubcommands([accountCreate]));
+
+function waitForSync(account: Account, peer: Peer, coValue: CoValueCore) {
+    const syncManager = account._raw.core.node.syncManager;
+    const peerState = syncManager.peers[peer.id];
+
+    return new Promise((resolve) => {
+        const unsubscribe = peerState?.optimisticKnownStates.subscribe((id, peerKnownState) => {
+            if (id !== coValue.id) return;
+
+            const knownState = coValue.knownState();
+
+            const synced = isEqualSession(knownState.sessions, peerKnownState.sessions);
+            if (synced) {
+                resolve(true);
+                unsubscribe?.();
+            }
+        });
+    });
+}
+
+function isEqualSession(a: Record<string, number>, b: Record<string, number>) {
+    const keysA = Object.keys(a);
+    const keysB = Object.keys(b);
+
+    if (keysA.length !== keysB.length) {
+        return false;
+    }
+
+    for (const sessionId of keysA) {
+        if (a[sessionId] !== b[sessionId]) {
+            return false;
+        }
+    }
+
+    return true;
+}

package/src/index.ts

@@ -1,93 +1,13 @@
 #!/usr/bin/env node
 /* istanbul ignore file -- @preserve */
-import { Command, Options } from "@effect/cli";
+import { Command } from "@effect/cli";
 import { NodeContext, NodeRuntime } from "@effect/platform-node";
-import { Console, Effect } from "effect";
-import { createWebSocketPeer } from "cojson-transport-ws";
-import { WebSocket } from "ws";
-import {
-    Account,
-    WasmCrypto,
-    createJazzContext,
-    isControlledAccount,
-} from "jazz-tools";
-import { fixedCredentialsAuth, randomSessionProvider } from "jazz-tools";
+import { Effect } from "effect";
+import { account } from "./accountCreate.js";
 import { startSync } from "./startSync.js";
 
 const jazzTools = Command.make("jazz-tools");
 
-const name = Options.text("name").pipe(Options.withAlias("n"));
-const peer = Options.text("peer")
-    .pipe(Options.withAlias("p"))
-    .pipe(Options.withDefault("wss://mesh.jazz.tools"));
-const accountCreate = Command.make(
-    "create",
-    { name, peer },
-    ({ name, peer: peerAddr }) => {
-        return Effect.gen(function* () {
-            const crypto = yield* Effect.promise(() => WasmCrypto.create());
-
-            const peer = createWebSocketPeer({
-                id: "upstream",
-                websocket: new WebSocket(peerAddr),
-                role: "server",
-            });
-
-            const account: Account = yield* Effect.promise(async () =>
-                Account.create({
-                    creationProps: { name },
-                    peersToLoadFrom: [peer],
-                    crypto,
-                }),
-            );
-            if (!isControlledAccount(account)) {
-                throw new Error("account is not a controlled account");
-            }
-
-            yield* Effect.promise(() =>
-                account._raw.core.node.syncManager.syncCoValue(
-                    account._raw.core,
-                ),
-            );
-            yield* Effect.promise(() =>
-                account._raw.core.node.syncManager.syncCoValue(
-                    account.profile!._raw.core,
-                ),
-            );
-
-            // TODO: remove this once we have a better way to wait for the sync
-            yield* Effect.sleep(500);
-
-            const peer2 = createWebSocketPeer({
-                id: "upstream2",
-                websocket: new WebSocket(peerAddr),
-                role: "server",
-            });
-
-            yield* Effect.promise(async () =>
-                createJazzContext({
-                    auth: fixedCredentialsAuth({
-                        accountID: account.id,
-                        secret: account._raw.agentSecret,
-                    }),
-                    sessionProvider: randomSessionProvider,
-                    peersToLoadFrom: [peer2],
-                    crypto,
-                }),
-            );
-
-            yield* Console.log(`# Credentials for Jazz account "${name}":
-JAZZ_WORKER_ACCOUNT=${account.id}
-JAZZ_WORKER_SECRET=${account._raw.agentSecret}
-`);
-        });
-    },
-);
-
-const accountBase = Command.make("account");
-
-const account = accountBase.pipe(Command.withSubcommands([accountCreate]));
-
 const command = jazzTools.pipe(Command.withSubcommands([account, startSync]));
 
 const cli = Command.run(command, {

package/.turbo/turbo-build.log

@@ -1,8 +0,0 @@
-
-> jazz-run@0.8.5 build /Users/anselm/jazz/jazz/packages/jazz-run
-> npm run lint && rm -rf ./dist && tsc --sourceMap --outDir dist
-
-
-> jazz-run@0.8.5 lint
-> eslint . --ext ts,tsx
-

package/.turbo/turbo-lint.log

@@ -1,4 +0,0 @@
-
-> jazz-run@0.7.35-guest-auth.5 lint /Users/anselm/jazz/jazz/packages/jazz-run
-> eslint . --ext ts,tsx
-

package/.turbo/turbo-test.log

@@ -1,13 +0,0 @@
-
-> jazz-run@0.7.0-alpha.37 test /Users/anselm/jazz/jazz/packages/jazz-run
-> vitest
-
-
- DEV  v0.34.6 /Users/anselm/jazz/jazz/packages/jazz-run
-
-include: **/*.{test,spec}.?(c|m)[jt]s?(x)
-exclude:  **/node_modules/**, **/dist/**, **/cypress/**, **/.{idea,git,cache,output,temp}/**, **/{karma,rollup,webpack,vite,vitest,jest,ava,babel,nyc,cypress,tsup,build}.config.*
-watch exclude:  **/node_modules/**, **/dist/**
-
-No test files found, exiting with code 1
- ELIFECYCLE  Test failed. See above for more details.