Release fixes

fix: chat example URL

.changeset/bright-files-help.md

@@ -0,0 +1,5 @@
+---
+"cojson": patch
+---
+
+Improve logging

.changeset/pre.json

@@ -0,0 +1,24 @@
+{
+  "mode": "pre",
+  "tag": "hotfixes",
+  "initialVersions": {
+    "jazz-example-chat": "0.0.79",
+    "jazz-inspector": "0.0.57",
+    "jazz-example-pets": "0.0.97",
+    "jazz-example-todo": "0.0.96",
+    "cojson": "0.7.31",
+    "cojson-storage-indexeddb": "0.7.31",
+    "cojson-storage-sqlite": "0.7.31",
+    "cojson-transport-ws": "0.7.31",
+    "hash-slash": "0.2.0",
+    "jazz-browser": "0.7.32",
+    "jazz-browser-media-images": "0.7.32",
+    "jazz-nodejs": "0.7.32",
+    "jazz-react": "0.7.32",
+    "jazz-run": "0.7.32",
+    "jazz-tools": "0.7.32"
+  },
+  "changesets": [
+    "bright-files-help"
+  ]
+}

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

@@ -3,8 +3,6 @@ name: Build and Deploy
 on:
   push:
     branches: [ "main" ]
-  pull_request:
-    branches: [ "main" ]
 
 jobs:
   build-examples:

examples/chat/CHANGELOG.md

@@ -1,5 +1,37 @@
 # jazz-example-chat
 
+## 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

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.76",
+  "version": "0.0.80-hotfixes.0",
   "type": "module",
   "scripts": {
     "dev": "vite",

examples/inspector/CHANGELOG.md

@@ -1,5 +1,29 @@
 # jazz-example-chat
 
+## 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

examples/inspector/package.json

@@ -1,7 +1,7 @@
 {
   "name": "jazz-inspector",
   "private": true,
-  "version": "0.0.55",
+  "version": "0.0.58-hotfixes.0",
   "type": "module",
   "scripts": {
     "dev": "vite",

examples/pets/CHANGELOG.md

@@ -1,5 +1,37 @@
 # jazz-example-pets
 
+## 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

examples/pets/package.json

@@ -1,7 +1,7 @@
 {
   "name": "jazz-example-pets",
   "private": true,
-  "version": "0.0.94",
+  "version": "0.0.98-hotfixes.0",
   "type": "module",
   "scripts": {
     "dev": "vite",

examples/todo/CHANGELOG.md

@@ -1,5 +1,33 @@
 # jazz-example-todo
 
+## 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

examples/todo/package.json

@@ -1,7 +1,7 @@
 {
   "name": "jazz-example-todo",
   "private": true,
-  "version": "0.0.93",
+  "version": "0.0.97-hotfixes.0",
   "type": "module",
   "scripts": {
     "dev": "vite",

packages/cojson-storage-indexeddb/CHANGELOG.md

@@ -1,5 +1,19 @@
 # cojson-storage-indexeddb
 
+## 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

packages/cojson-storage-indexeddb/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cojson-storage-indexeddb",
-  "version": "0.7.29",
+  "version": "0.7.33-hotfixes.0",
   "main": "dist/index.js",
   "type": "module",
   "types": "src/index.ts",

packages/cojson-storage-sqlite/CHANGELOG.md

@@ -1,5 +1,19 @@
 # cojson-storage-sqlite
 
+## 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

packages/cojson-storage-sqlite/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cojson-storage-sqlite",
   "type": "module",
-  "version": "0.7.29",
+  "version": "0.7.33-hotfixes.0",
   "main": "dist/index.js",
   "types": "src/index.ts",
   "license": "MIT",

packages/cojson-transport-ws/CHANGELOG.md

@@ -1,5 +1,26 @@
 # cojson-transport-nodejs-ws
 
+## 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

packages/cojson-transport-ws/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cojson-transport-ws",
   "type": "module",
-  "version": "0.7.29",
+  "version": "0.7.33-hotfixes.0",
   "main": "dist/index.js",
   "types": "src/index.ts",
   "license": "MIT",

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

@@ -94,7 +94,11 @@ export function createWebSocketPeer({
     });
 
     const websocketOpen = new Promise<void>((resolve) => {
-        websocket.addEventListener("open", resolve, { once: true });
+        if (websocket.readyState === 1) {
+            resolve();
+        } else {
+            websocket.addEventListener("open", resolve, { once: true });
+        }
     });
 
     return {
@@ -108,7 +112,12 @@ export function createWebSocketPeer({
                 }
             },
             close() {
-                if (websocket.readyState === 1) {
+                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();
                 }
             },

packages/cojson/CHANGELOG.md

@@ -1,5 +1,17 @@
 # cojson
 
+## 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

packages/cojson/package.json

@@ -5,7 +5,7 @@
     "types": "src/index.ts",
     "type": "module",
     "license": "MIT",
-    "version": "0.7.29",
+    "version": "0.7.33-hotfixes.0",
     "devDependencies": {
         "@types/jest": "^29.5.3",
         "@typescript-eslint/eslint-plugin": "^6.2.1",

packages/cojson/src/sync.ts

@@ -394,6 +394,9 @@ export class SyncManager {
 
         processMessages().catch((e) => {
             console.error("Error processing messages from peer", peer.id, e);
+        }).finally(() => {
+            peer.outgoing.close();
+            delete this.peers[peer.id];
         });
     }
 
@@ -443,7 +446,7 @@ export class SyncManager {
         }
 
         if (entry.state === "loading") {
-            console.log(
+            console.debug(
                 "Waiting for loaded",
                 msg.id,
                 "after message from",
@@ -648,11 +651,9 @@ export class SyncManager {
                 console.error(
                     "Failed to add transactions",
                     msg.id,
-                    JSON.stringify(newTransactions, (k, v) =>
-                        k === "changes" || k === "encryptedChanges"
-                            ? v.slice(0, 20) + "..."
-                            : v,
-                    ),
+                    newTransactions.length + ' new transactions',
+                    'we have' + ourTotalnTxs,
+                    'they have' + theirTotalnTxs,
                 );
                 continue;
             }
@@ -747,7 +748,11 @@ export class SyncManager {
 
     gracefulShutdown() {
         for (const peer of Object.values(this.peers)) {
+            console.debug("Gracefully closing", peer.id);
             peer.outgoing.close();
+            peer.incoming = (async function* () {
+                yield "Disconnected" as const;
+            })();
         }
     }
 }

packages/jazz-browser-media-images/CHANGELOG.md

@@ -1,5 +1,33 @@
 # jazz-browser-media-images
 
+## 0.7.33-hotfixes.0
+
+### Patch Changes
+
+-   jazz-browser@0.7.33-hotfixes.0
+-   jazz-tools@0.7.33-hotfixes.0
+
+## 0.7.32
+
+### Patch Changes
+
+-   Updated dependencies
+    -   jazz-tools@0.7.32
+    -   jazz-browser@0.7.32
+
+## 0.7.31
+
+### Patch Changes
+
+-   jazz-browser@0.7.31
+-   jazz-tools@0.7.31
+
+## 0.7.30
+
+### Patch Changes
+
+-   jazz-browser@0.7.30
+
 ## 0.7.29
 
 ### Patch Changes

packages/jazz-browser-media-images/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jazz-browser-media-images",
-  "version": "0.7.29",
+  "version": "0.7.33-hotfixes.0",
   "type": "module",
   "main": "dist/index.js",
   "types": "src/index.ts",

packages/jazz-browser/CHANGELOG.md

@@ -1,5 +1,40 @@
 # jazz-browser
 
+## 0.7.33-hotfixes.0
+
+### Patch Changes
+
+-   Updated dependencies
+    -   cojson@0.7.33-hotfixes.0
+    -   cojson-storage-indexeddb@0.7.33-hotfixes.0
+    -   cojson-transport-ws@0.7.33-hotfixes.0
+    -   jazz-tools@0.7.33-hotfixes.0
+
+## 0.7.32
+
+### Patch Changes
+
+-   Updated dependencies
+    -   jazz-tools@0.7.32
+
+## 0.7.31
+
+### Patch Changes
+
+-   Updated dependencies
+-   Updated dependencies
+    -   cojson-transport-ws@0.7.31
+    -   cojson@0.7.31
+    -   cojson-storage-indexeddb@0.7.31
+    -   jazz-tools@0.7.31
+
+## 0.7.30
+
+### Patch Changes
+
+-   Updated dependencies
+    -   cojson-transport-ws@0.7.30
+
 ## 0.7.29
 
 ### Patch Changes

packages/jazz-browser/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jazz-browser",
-  "version": "0.7.29",
+  "version": "0.7.33-hotfixes.0",
   "type": "module",
   "main": "dist/index.js",
   "types": "src/index.ts",

packages/jazz-nodejs/CHANGELOG.md

@@ -1,5 +1,38 @@
 # jazz-autosub
 
+## 0.7.33-hotfixes.0
+
+### Patch Changes
+
+-   Updated dependencies
+    -   cojson@0.7.33-hotfixes.0
+    -   cojson-transport-ws@0.7.33-hotfixes.0
+    -   jazz-tools@0.7.33-hotfixes.0
+
+## 0.7.32
+
+### Patch Changes
+
+-   Updated dependencies
+    -   jazz-tools@0.7.32
+
+## 0.7.31
+
+### Patch Changes
+
+-   Updated dependencies
+-   Updated dependencies
+    -   cojson-transport-ws@0.7.31
+    -   cojson@0.7.31
+    -   jazz-tools@0.7.31
+
+## 0.7.30
+
+### Patch Changes
+
+-   Updated dependencies
+    -   cojson-transport-ws@0.7.30
+
 ## 0.7.29
 
 ### Patch Changes

packages/jazz-nodejs/package.json

@@ -5,7 +5,7 @@
     "types": "src/index.ts",
     "type": "module",
     "license": "MIT",
-    "version": "0.7.29",
+    "version": "0.7.33-hotfixes.0",
     "dependencies": {
         "cojson": "workspace:*",
         "cojson-transport-ws": "workspace:*",

packages/jazz-react/CHANGELOG.md

@@ -1,5 +1,37 @@
 # jazz-react
 
+## 0.7.33-hotfixes.0
+
+### Patch Changes
+
+-   Updated dependencies
+    -   cojson@0.7.33-hotfixes.0
+    -   jazz-browser@0.7.33-hotfixes.0
+    -   jazz-tools@0.7.33-hotfixes.0
+
+## 0.7.32
+
+### Patch Changes
+
+-   Updated dependencies
+    -   jazz-tools@0.7.32
+    -   jazz-browser@0.7.32
+
+## 0.7.31
+
+### Patch Changes
+
+-   Updated dependencies
+    -   cojson@0.7.31
+    -   jazz-browser@0.7.31
+    -   jazz-tools@0.7.31
+
+## 0.7.30
+
+### Patch Changes
+
+-   jazz-browser@0.7.30
+
 ## 0.7.29
 
 ### Patch Changes

packages/jazz-react/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jazz-react",
-  "version": "0.7.29",
+  "version": "0.7.33-hotfixes.0",
   "type": "module",
   "main": "dist/index.js",
   "types": "src/index.ts",

packages/jazz-run/CHANGELOG.md

@@ -1,5 +1,38 @@
 # jazz-autosub
 
+## 0.7.33-hotfixes.0
+
+### Patch Changes
+
+-   Updated dependencies
+    -   cojson@0.7.33-hotfixes.0
+    -   cojson-transport-ws@0.7.33-hotfixes.0
+    -   jazz-tools@0.7.33-hotfixes.0
+
+## 0.7.32
+
+### Patch Changes
+
+-   Updated dependencies
+    -   jazz-tools@0.7.32
+
+## 0.7.31
+
+### Patch Changes
+
+-   Updated dependencies
+-   Updated dependencies
+    -   cojson-transport-ws@0.7.31
+    -   cojson@0.7.31
+    -   jazz-tools@0.7.31
+
+## 0.7.30
+
+### Patch Changes
+
+-   Updated dependencies
+    -   cojson-transport-ws@0.7.30
+
 ## 0.7.29
 
 ### Patch Changes

packages/jazz-run/package.json

@@ -3,7 +3,7 @@
     "bin": "./dist/index.js",
     "type": "module",
     "license": "MIT",
-    "version": "0.7.29",
+    "version": "0.7.33-hotfixes.0",
     "scripts": {
         "lint": "eslint . --ext ts,tsx",
         "format": "prettier --write './src/**/*.{ts,tsx}'",

packages/jazz-tools/CHANGELOG.md

@@ -1,5 +1,25 @@
 # jazz-autosub
 
+## 0.7.33-hotfixes.0
+
+### Patch Changes
+
+-   Updated dependencies
+    -   cojson@0.7.33-hotfixes.0
+
+## 0.7.32
+
+### Patch Changes
+
+-   Adapt type of applyDiff to make CoMaps fully subclassable again
+
+## 0.7.31
+
+### Patch Changes
+
+-   Updated dependencies
+    -   cojson@0.7.31
+
 ## 0.7.29
 
 ### Patch Changes

packages/jazz-tools/package.json

@@ -5,7 +5,7 @@
     "types": "./src/index.ts",
     "type": "module",
     "license": "MIT",
-    "version": "0.7.29",
+    "version": "0.7.33-hotfixes.0",
     "dependencies": {
         "cojson": "workspace:*",
         "fast-check": "^3.17.2"

packages/jazz-tools/src/coValues/coMap.ts

@@ -457,7 +457,7 @@ export class CoMap extends CoValueBase implements CoValue {
         return subscribeToExistingCoValue(this, depth, listener);
     }
 
-    applyDiff(newValues: Partial<CoMapInit<this>>) {
+    applyDiff<N extends Partial<CoMapInit<this>>>(newValues: N) {
         for (const key in newValues) {
             if (Object.prototype.hasOwnProperty.call(newValues, key)) {
                 const tKey = key as keyof typeof newValues & keyof this;
@@ -466,7 +466,7 @@ export class CoMap extends CoValueBase implements CoValue {
 
                 if (tKey in this._schema) {
                     const newValue = newValues[tKey];
-                    const currentValue = this[tKey];
+                    const currentValue = (this as unknown as N)[tKey];
 
                     if (descriptor === "json" || "encoded" in descriptor) {
                         if (currentValue !== newValue) {