@xnetjs/data 0.1.1 → 0.1.2

package/dist/{chunk-EI5CY2FZ.js → chunk-2UPMDBWD.js}

@@ -3413,6 +3413,7 @@ var DEFAULT_QUERY_VERIFICATION = {
   logFailures: true
 };
 var QUERY_TELEMETRY_FLUSH_THRESHOLD = 50;
+var CHANGE_ENVELOPE_KEY = "__xnetChangeEnvelopeV1";
 var COMPILED_QUERY_DIAGNOSTICS_MEMO_LIMIT = 512;
 var SQLITE_BIND_PARAMETER_BATCH_SIZE = 900;
 var SQLITE_HYDRATE_NODE_BATCH_SIZE = Math.floor(SQLITE_BIND_PARAMETER_BATCH_SIZE / 2);
@@ -3581,7 +3582,7 @@ var SQLiteNodeStorageAdapter = class {
     await this.enqueueWrite(() => this.appendChangeInternal(change));
   }
   async appendChangeInternal(change) {
-    const payload = this.serializePayload(change.payload);
+    const payload = this.serializeChangeRecord(change);
     await this.db.run(
       `INSERT OR IGNORE INTO changes
        (hash, node_id, payload, lamport_time, lamport_peer, wall_time, author, parent_hash, batch_id, signature)
@@ -3842,7 +3843,11 @@ var SQLiteNodeStorageAdapter = class {
            lamport_time = excluded.lamport_time,
            updated_by = excluded.updated_by,
            updated_at = excluded.updated_at
-         WHERE excluded.lamport_time > node_properties.lamport_time`,
+         WHERE excluded.lamport_time > node_properties.lamport_time
+            OR (excluded.lamport_time = node_properties.lamport_time
+                AND (excluded.updated_at > node_properties.updated_at
+                     OR (excluded.updated_at = node_properties.updated_at
+                         AND excluded.updated_by > node_properties.updated_by)))`,
         [
           node.id,
           key,
@@ -4335,7 +4340,7 @@ var SQLiteNodeStorageAdapter = class {
       changes: input.changes.map((change) => ({
         hash: change.hash,
         nodeId: change.payload.nodeId,
-        payload: this.serializePayload(change.payload),
+        payload: this.serializeChangeRecord(change),
         lamportTime: change.lamport,
         lamportPeer: change.authorDID,
         wallTime: change.wallTime,
@@ -4488,6 +4493,8 @@ var SQLiteNodeStorageAdapter = class {
       const timestamp = node.timestamps[key];
       if (!timestamp) continue;
       operations.push({
+        // Full LWW ordering triple — keep in lockstep with the setNode
+        // upsert above and `shouldReplace` in ./store.ts (0272).
         sql: `INSERT INTO node_properties
                 (node_id, property_key, value, lamport_time, updated_by, updated_at)
               VALUES (?, ?, ?, ?, ?, ?)
@@ -4496,7 +4503,11 @@ var SQLiteNodeStorageAdapter = class {
                 lamport_time = excluded.lamport_time,
                 updated_by = excluded.updated_by,
                 updated_at = excluded.updated_at
-              WHERE excluded.lamport_time > node_properties.lamport_time`,
+              WHERE excluded.lamport_time > node_properties.lamport_time
+                 OR (excluded.lamport_time = node_properties.lamport_time
+                     AND (excluded.updated_at > node_properties.updated_at
+                          OR (excluded.updated_at = node_properties.updated_at
+                              AND excluded.updated_by > node_properties.updated_by)))`,
         params: [
           node.id,
           key,
@@ -4529,7 +4540,7 @@ var SQLiteNodeStorageAdapter = class {
       params: [
         change.hash,
         change.payload.nodeId,
-        this.serializePayload(change.payload),
+        this.serializeChangeRecord(change),
         change.lamport,
         change.authorDID,
         change.wallTime,
@@ -6470,8 +6481,28 @@ WHERE schema_id = ${this.quoteSqlLiteral(schemaId)}
   serializePayload(payload) {
     return new TextEncoder().encode(JSON.stringify(payload));
   }
-  deserializePayload(data) {
-    return JSON.parse(new TextDecoder().decode(data));
+  /**
+   * Serialize a change for the `changes` table (exploration 0272).
+   *
+   * The table has no columns for `id`, `type`, `protocolVersion`,
+   * `batchIndex`, or `batchSize`, yet all of them are part of the signed
+   * content hash — a change re-read without them can never pass
+   * `verifyChangeHash`, so the reload-resync push (getChangesSince → hub)
+   * was structurally rejected as INVALID_HASH and tripped the 0224 breaker,
+   * stranding offline edits. The hub's own `node_changes` table persists
+   * every one of these fields; the client log now does too, by wrapping the
+   * payload BLOB in an envelope instead of a schema migration (applySchema
+   * re-runs idempotent DDL and never executes ALTERs, so new columns would
+   * not reach existing databases).
+   */
+  serializeChangeRecord(change) {
+    const meta = { id: change.id, type: change.type };
+    if (change.protocolVersion !== void 0) meta.protocolVersion = change.protocolVersion;
+    if (change.batchIndex !== void 0) meta.batchIndex = change.batchIndex;
+    if (change.batchSize !== void 0) meta.batchSize = change.batchSize;
+    return new TextEncoder().encode(
+      JSON.stringify({ [CHANGE_ENVELOPE_KEY]: meta, payload: change.payload })
+    );
   }
   serializeValue(value) {
     return new TextEncoder().encode(JSON.stringify(value));
@@ -6481,13 +6512,16 @@ WHERE schema_id = ${this.quoteSqlLiteral(schemaId)}
     return JSON.parse(new TextDecoder().decode(data));
   }
   deserializeChange(row) {
-    const payload = this.deserializePayload(row.payload);
-    return {
-      // Required Change<T> fields
-      id: row.hash,
-      // Use hash as ID since we don't store separate id
-      type: "node",
-      // All node changes have type 'node'
+    const parsed = JSON.parse(new TextDecoder().decode(row.payload));
+    const envelope = parsed !== null && typeof parsed === "object" && CHANGE_ENVELOPE_KEY in parsed ? parsed[CHANGE_ENVELOPE_KEY] : null;
+    const payload = envelope ? parsed.payload : parsed;
+    const change = {
+      // Envelope rows (exploration 0272) round-trip the hashed identity
+      // fields exactly, so verifyChangeHash holds after a re-read. Legacy
+      // rows predate the envelope: their id/type/protocolVersion are gone
+      // for good, so we keep the historical fabricated values.
+      id: envelope?.id ?? row.hash,
+      type: envelope?.type ?? "node",
       hash: row.hash,
       payload,
       lamport: row.lamport_time,
@@ -6497,6 +6531,10 @@ WHERE schema_id = ${this.quoteSqlLiteral(schemaId)}
       batchId: row.batch_id ?? void 0,
       signature: row.signature
     };
+    if (envelope?.protocolVersion !== void 0) change.protocolVersion = envelope.protocolVersion;
+    if (envelope?.batchIndex !== void 0) change.batchIndex = envelope.batchIndex;
+    if (envelope?.batchSize !== void 0) change.batchSize = envelope.batchSize;
+    return change;
   }
 };
 function chunkItems(items, size) {

package/dist/index.js

@@ -605,7 +605,7 @@ import {
   sum,
   validateQueryAST,
   validateSavedViewDescriptor
-} from "./chunk-EI5CY2FZ.js";
+} from "./chunk-2UPMDBWD.js";
 import {
   applyNodeQueryDescriptor,
   createNodeQueryDescriptor,

package/dist/store/index.d.ts

@@ -514,7 +514,21 @@ declare class SQLiteNodeStorageAdapter implements NodeStorageAdapter {
     private buildSqlOrderBy;
     private hasOnlySystemOrdering;
     private serializePayload;
-    private deserializePayload;
+    /**
+     * Serialize a change for the `changes` table (exploration 0272).
+     *
+     * The table has no columns for `id`, `type`, `protocolVersion`,
+     * `batchIndex`, or `batchSize`, yet all of them are part of the signed
+     * content hash — a change re-read without them can never pass
+     * `verifyChangeHash`, so the reload-resync push (getChangesSince → hub)
+     * was structurally rejected as INVALID_HASH and tripped the 0224 breaker,
+     * stranding offline edits. The hub's own `node_changes` table persists
+     * every one of these fields; the client log now does too, by wrapping the
+     * payload BLOB in an envelope instead of a schema migration (applySchema
+     * re-runs idempotent DDL and never executes ALTERs, so new columns would
+     * not reach existing databases).
+     */
+    private serializeChangeRecord;
     private serializeValue;
     private deserializeValue;
     private deserializeChange;

package/dist/store/index.js

@@ -49,7 +49,7 @@ import {
   sum,
   validateQueryAST,
   validateSavedViewDescriptor
-} from "../chunk-EI5CY2FZ.js";
+} from "../chunk-2UPMDBWD.js";
 import {
   applyNodeQueryDescriptor,
   createNodeQueryDescriptor,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xnetjs/data",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -57,12 +57,12 @@
     "nanoid": "^5.1.6",
     "y-protocols": "^1.0.6",
     "yjs": "^13.6.24",
-    "@xnetjs/core": "0.1.1",
-    "@xnetjs/crypto": "0.1.1",
-    "@xnetjs/identity": "0.1.1",
-    "@xnetjs/sqlite": "0.1.1",
-    "@xnetjs/storage": "0.1.1",
-    "@xnetjs/sync": "0.1.1"
+    "@xnetjs/core": "0.1.2",
+    "@xnetjs/crypto": "0.1.2",
+    "@xnetjs/identity": "0.1.2",
+    "@xnetjs/sqlite": "0.1.2",
+    "@xnetjs/storage": "0.1.2",
+    "@xnetjs/sync": "0.1.2"
   },
   "devDependencies": {
     "tsup": "^8.0.0",