Publish

- jazz-example-pets@0.0.7 - jazz-example-todo@0.0.32 - cojson@0.2.2 - cojson-simple-sync@0.2.4 - cojson-storage-sqlite@0.2.4 - jazz-browser@0.2.3 - jazz-browser-auth-local@0.2.3 - jazz-browser-media-images@0.2.3 - jazz-react@0.2.3 - jazz-react-auth-local@0.2.3 - jazz-react-media-images@0.2.3 - jazz-storage-indexeddb@0.2.3
Less verbose error output
2023-09-12 15:26:43 +01:00 · 2023-09-12 15:26:22 +01:00 · 2023-09-12 15:22:01 +01:00 · 2023-09-12 15:21:45 +01:00 · 2023-09-12 15:19:12 +01:00 · 2023-09-12 15:18:53 +01:00
14 changed files with 106 additions and 72 deletions
--- a/examples/pets/package.json
+++ b/examples/pets/package.json
@@ -1,7 +1,7 @@
 {
  "name": "jazz-example-pets",
  "private": true,
-  "version": "0.0.6",
+  "version": "0.0.7",
  "type": "module",
  "scripts": {
    "dev": "vite",
@@ -16,9 +16,9 @@
    "@types/qrcode": "^1.5.1",
    "class-variance-authority": "^0.7.0",
    "clsx": "^2.0.0",
-    "jazz-react": "^0.2.2",
-    "jazz-react-auth-local": "^0.2.2",
-    "jazz-react-media-images": "^0.2.2",
+    "jazz-react": "^0.2.3",
+    "jazz-react-auth-local": "^0.2.3",
+    "jazz-react-media-images": "^0.2.3",
    "lucide-react": "^0.274.0",
    "qrcode": "^1.5.3",
    "react": "^18.2.0",
--- a/examples/todo/package.json
+++ b/examples/todo/package.json
@@ -1,7 +1,7 @@
 {
  "name": "jazz-example-todo",
  "private": true,
-  "version": "0.0.31",
+  "version": "0.0.32",
  "type": "module",
  "scripts": {
    "dev": "vite",
@@ -16,8 +16,8 @@
    "@types/qrcode": "^1.5.1",
    "class-variance-authority": "^0.7.0",
    "clsx": "^2.0.0",
-    "jazz-react": "^0.2.2",
-    "jazz-react-auth-local": "^0.2.2",
+    "jazz-react": "^0.2.3",
+    "jazz-react-auth-local": "^0.2.3",
    "lucide-react": "^0.274.0",
    "qrcode": "^1.5.3",
    "react": "^18.2.0",
--- a/packages/cojson-simple-sync/package.json
+++ b/packages/cojson-simple-sync/package.json
@@ -4,7 +4,7 @@
    "types": "src/index.ts",
    "type": "module",
    "license": "MIT",
-    "version": "0.2.1",
+    "version": "0.2.4",
    "devDependencies": {
        "@types/jest": "^29.5.3",
        "@types/ws": "^8.5.5",
@@ -16,8 +16,8 @@
        "typescript": "5.0.2"
    },
    "dependencies": {
-        "cojson": "^0.2.1",
-        "cojson-storage-sqlite": "^0.2.1",
+        "cojson": "^0.2.2",
+        "cojson-storage-sqlite": "^0.2.4",
        "ws": "^8.13.0"
    },
    "scripts": {
--- a/packages/cojson-storage-sqlite/package.json
+++ b/packages/cojson-storage-sqlite/package.json
@@ -1,13 +1,13 @@
 {
  "name": "cojson-storage-sqlite",
  "type": "module",
-  "version": "0.2.1",
+  "version": "0.2.4",
  "main": "dist/index.js",
  "types": "dist/index.d.ts",
  "license": "MIT",
  "dependencies": {
    "better-sqlite3": "^8.5.2",
-    "cojson": "^0.2.1",
+    "cojson": "^0.2.2",
    "typescript": "^5.1.6"
  },
  "scripts": {
--- a/packages/cojson-storage-sqlite/src/index.ts
+++ b/packages/cojson-storage-sqlite/src/index.ts
@@ -98,41 +98,67 @@ export class SQLiteStorage {
        const db = Database(filename);
        db.pragma("journal_mode = WAL");

-        db.prepare(
-            `CREATE TABLE IF NOT EXISTS transactions (
-                ses INTEGER,
-                idx INTEGER,
-                tx TEXT NOT NULL ,
-                PRIMARY KEY (ses, idx)
-            ) WITHOUT ROWID;`
-        ).run();
+        const oldVersion = (db.pragma("user_version") as [{user_version: number}])[0].user_version as number;

-        db.prepare(
-            `CREATE TABLE IF NOT EXISTS sessions (
-                rowID INTEGER PRIMARY KEY,
-                coValue INTEGER NOT NULL,
-                sessionID TEXT NOT NULL,
-                lastIdx INTEGER,
-                lastSignature TEXT,
-                UNIQUE (sessionID, coValue)
-            );`
-        ).run();
+        console.log("DB version", oldVersion);

-        db.prepare(
-            `CREATE INDEX IF NOT EXISTS sessionsByCoValue ON sessions (coValue);`
-        ).run();
+        if (oldVersion === 0) {
+            console.log("Migration 0 -> 1: Basic schema");
+            db.prepare(
+                `CREATE TABLE IF NOT EXISTS transactions (
+                    ses INTEGER,
+                    idx INTEGER,
+                    tx TEXT NOT NULL ,
+                    PRIMARY KEY (ses, idx)
+                ) WITHOUT ROWID;`
+            ).run();

-        db.prepare(
-            `CREATE TABLE IF NOT EXISTS coValues (
-                rowID INTEGER PRIMARY KEY,
-                id TEXT NOT NULL UNIQUE,
-                header TEXT NOT NULL UNIQUE
-            );`
-        ).run();
+            db.prepare(
+                `CREATE TABLE IF NOT EXISTS sessions (
+                    rowID INTEGER PRIMARY KEY,
+                    coValue INTEGER NOT NULL,
+                    sessionID TEXT NOT NULL,
+                    lastIdx INTEGER,
+                    lastSignature TEXT,
+                    UNIQUE (sessionID, coValue)
+                );`
+            ).run();

-        db.prepare(
-            `CREATE INDEX IF NOT EXISTS coValuesByID ON coValues (id);`
-        ).run();
+            db.prepare(
+                `CREATE INDEX IF NOT EXISTS sessionsByCoValue ON sessions (coValue);`
+            ).run();
+
+            db.prepare(
+                `CREATE TABLE IF NOT EXISTS coValues (
+                    rowID INTEGER PRIMARY KEY,
+                    id TEXT NOT NULL UNIQUE,
+                    header TEXT NOT NULL UNIQUE
+                );`
+            ).run();
+
+            db.prepare(
+                `CREATE INDEX IF NOT EXISTS coValuesByID ON coValues (id);`
+            ).run();
+
+            db.pragma("user_version = 1");
+            console.log("Migration 0 -> 1: Basic schema - done");
+        }
+
+        if (oldVersion <= 1) {
+            // fix embarrassing off-by-one error for transaction indices
+            console.log("Migration 1 -> 2: Fix off-by-one error for transaction indices");
+
+            const txs = db.prepare(`SELECT * FROM transactions`).all() as TransactionRow[];
+
+            for (const tx of txs) {
+                db.prepare(`DELETE FROM transactions WHERE ses = ? AND idx = ?`).run(tx.ses, tx.idx);
+                tx.idx -= 1;
+                db.prepare(`INSERT INTO transactions (ses, idx, tx) VALUES (?, ?, ?)`).run(tx.ses, tx.idx, tx.tx);
+            }
+
+            db.pragma("user_version = 2");
+            console.log("Migration 1 -> 2: Fix off-by-one error for transaction indices - done");
+        }

        return new SQLiteStorage(db, fromLocalNode, toLocalNode);
    }
@@ -198,7 +224,7 @@ export class SQLiteStorage {

                const newTxInSession = this.db
                    .prepare<[number, number]>(
-                        `SELECT * FROM transactions WHERE ses = ? AND idx > ?`
+                        `SELECT * FROM transactions WHERE ses = ? AND idx >= ?`
                    )
                    .all(sessionRow.rowID, firstNewTxIdx) as TransactionRow[];

@@ -356,16 +382,16 @@ export class SQLiteStorage {
                    const sessionRowID = upsertedSession.rowID;

                    for (const newTransaction of actuallyNewTransactions) {
-                        nextIdx++;
                        this.db
-                            .prepare<[number, number, string]>(
-                                `INSERT INTO transactions (ses, idx, tx) VALUES (?, ?, ?)`
+                        .prepare<[number, number, string]>(
+                            `INSERT INTO transactions (ses, idx, tx) VALUES (?, ?, ?)`
                            )
                            .run(
                                sessionRowID,
                                nextIdx,
                                JSON.stringify(newTransaction)
-                            );
+                                );
+                        nextIdx++;
                    }
                }
            }
--- a/packages/cojson/package.json
+++ b/packages/cojson/package.json
@@ -5,7 +5,7 @@
    "types": "dist/index.d.ts",
    "type": "module",
    "license": "MIT",
-    "version": "0.2.1",
+    "version": "0.2.2",
    "devDependencies": {
        "@types/jest": "^29.5.3",
        "@typescript-eslint/eslint-plugin": "^6.2.1",
--- a/packages/cojson/src/sync.ts
+++ b/packages/cojson/src/sync.ts
@@ -285,7 +285,11 @@ export class SyncManager {
                    } catch (e) {
                        console.error(
                            `Error reading from peer ${peer.id}, handling msg`,
-                            JSON.stringify(msg),
+                            JSON.stringify(msg, (k, v) =>
+                                k === "changes" || k === "encryptedChanges"
+                                    ? v.slice(0, 20) + "..."
+                                    : v
+                            ),
                            e
                        );
                    }
@@ -498,7 +502,11 @@ export class SyncManager {
            }

            if (!success) {
-                console.error("Failed to add transactions", msg.id, newTransactions);
+                console.error(
+                    "Failed to add transactions",
+                    msg.id,
+                    newTransactions
+                );
                continue;
            }

--- a/packages/jazz-browser-auth-local/package.json
+++ b/packages/jazz-browser-auth-local/package.json
@@ -1,11 +1,11 @@
 {
    "name": "jazz-browser-auth-local",
-    "version": "0.2.2",
+    "version": "0.2.3",
    "main": "dist/index.js",
    "types": "dist/index.d.ts",
    "license": "MIT",
    "dependencies": {
-        "jazz-browser": "^0.2.2",
+        "jazz-browser": "^0.2.3",
        "typescript": "^5.1.6"
    },
    "scripts": {
--- a/packages/jazz-browser-media-images/package.json
+++ b/packages/jazz-browser-media-images/package.json
@@ -1,13 +1,13 @@
 {
  "name": "jazz-browser-media-images",
-  "version": "0.2.2",
+  "version": "0.2.3",
  "main": "dist/index.js",
  "types": "dist/index.d.ts",
  "license": "MIT",
  "dependencies": {
-    "cojson": "^0.2.1",
+    "cojson": "^0.2.2",
    "image-blob-reduce": "^4.1.0",
-    "jazz-browser": "^0.2.2",
+    "jazz-browser": "^0.2.3",
    "typescript": "^5.1.6"
  },
  "scripts": {
--- a/packages/jazz-browser/package.json
+++ b/packages/jazz-browser/package.json
@@ -1,12 +1,12 @@
 {
  "name": "jazz-browser",
-  "version": "0.2.2",
+  "version": "0.2.3",
  "main": "dist/index.js",
  "types": "dist/index.d.ts",
  "license": "MIT",
  "dependencies": {
-    "cojson": "^0.2.1",
-    "jazz-storage-indexeddb": "^0.2.2",
+    "cojson": "^0.2.2",
+    "jazz-storage-indexeddb": "^0.2.3",
    "typescript": "^5.1.6"
  },
  "scripts": {
--- a/packages/jazz-react-auth-local/package.json
+++ b/packages/jazz-react-auth-local/package.json
@@ -1,12 +1,12 @@
 {
    "name": "jazz-react-auth-local",
-    "version": "0.2.2",
+    "version": "0.2.3",
    "main": "dist/index.js",
    "types": "dist/index.d.ts",
    "license": "MIT",
    "dependencies": {
-        "jazz-browser-auth-local": "^0.2.2",
-        "jazz-react": "^0.2.2",
+        "jazz-browser-auth-local": "^0.2.3",
+        "jazz-react": "^0.2.3",
        "typescript": "^5.1.6"
    },
    "devDependencies": {
--- a/packages/jazz-react-media-images/package.json
+++ b/packages/jazz-react-media-images/package.json
@@ -1,14 +1,14 @@
 {
  "name": "jazz-react-media-images",
-  "version": "0.2.2",
+  "version": "0.2.3",
  "main": "dist/index.js",
  "types": "dist/index.d.ts",
  "license": "MIT",
  "dependencies": {
-    "cojson": "^0.2.1",
-    "jazz-browser": "^0.2.2",
-    "jazz-browser-media-images": "^0.2.2",
-    "jazz-react": "^0.2.2",
+    "cojson": "^0.2.2",
+    "jazz-browser": "^0.2.3",
+    "jazz-browser-media-images": "^0.2.3",
+    "jazz-react": "^0.2.3",
    "typescript": "^5.1.6"
  },
  "devDependencies": {
--- a/packages/jazz-react/package.json
+++ b/packages/jazz-react/package.json
@@ -1,12 +1,12 @@
 {
  "name": "jazz-react",
-  "version": "0.2.2",
+  "version": "0.2.3",
  "main": "dist/index.js",
  "types": "dist/index.d.ts",
  "license": "MIT",
  "dependencies": {
-    "cojson": "^0.2.1",
-    "jazz-browser": "^0.2.2",
+    "cojson": "^0.2.2",
+    "jazz-browser": "^0.2.3",
    "typescript": "^5.1.6"
  },
  "devDependencies": {
--- a/packages/jazz-storage-indexeddb/package.json
+++ b/packages/jazz-storage-indexeddb/package.json
@@ -1,11 +1,11 @@
 {
  "name": "jazz-storage-indexeddb",
-  "version": "0.2.2",
+  "version": "0.2.3",
  "main": "dist/index.js",
  "types": "dist/index.d.ts",
  "license": "MIT",
  "dependencies": {
-    "cojson": "^0.2.1",
+    "cojson": "^0.2.2",
    "typescript": "^5.1.6"
  },
  "devDependencies": {
Author	SHA1	Message	Date
Anselm	ee7e3ee5a7	Publish - jazz-example-pets@0.0.7 - jazz-example-todo@0.0.32 - cojson@0.2.2 - cojson-simple-sync@0.2.4 - cojson-storage-sqlite@0.2.4 - jazz-browser@0.2.3 - jazz-browser-auth-local@0.2.3 - jazz-browser-media-images@0.2.3 - jazz-react@0.2.3 - jazz-react-auth-local@0.2.3 - jazz-react-media-images@0.2.3 - jazz-storage-indexeddb@0.2.3	2023-09-12 15:26:43 +01:00
Anselm	ceeed88fa5	Less verbose error output	2023-09-12 15:26:22 +01:00
Anselm	79353a1d97	Publish - cojson-simple-sync@0.2.3 - cojson-storage-sqlite@0.2.3	2023-09-12 15:22:01 +01:00
Anselm	7fdc42c62f	Fix migration	2023-09-12 15:21:45 +01:00
Anselm	3a2e854a88	Publish - cojson-simple-sync@0.2.2 - cojson-storage-sqlite@0.2.2	2023-09-12 15:19:12 +01:00
Anselm	661a2d023a	Fixes #90 for SQLite	2023-09-12 15:18:53 +01:00