@spooky-sync/core 0.0.1-canary.160 → 0.0.1-canary.161

package/dist/index.js

@@ -3912,7 +3912,7 @@ var UpQueue = class {
 			Category: "sp00ky-client::UpQueue::discardUnreplayable"
 		}, "Discarding an unsendable pending mutation");
 		try {
-			await this.local.query(`DELETE $mutation_id`, { mutation_id: parseRecordIdString(mutationId) });
+			await this.local.query(`DELETE $mutation_id`, { mutation_id: parseStoredRecordId(mutationId) });
 		} catch (error) {
 			this.logger.error({
 				error,
@@ -4090,6 +4090,24 @@ var UpQueue = class {
 function encodeUpEventId(event) {
 	return encodeRecordId(event.mutation_id);
 }
+/**
+* Parse a record id READ BACK FROM THE STORE, stripping SurrealDB's `⟨⟩`
+* escaping.
+*
+* Outbox ids contain `_` and `-`, so the store hands them back in escaped
+* display form (`_00_pending_mutations:⟨1785…_0005_c960…⟩`). `parseRecordIdString`
+* keeps that verbatim, and re-encoding then escapes the brackets AGAIN, so a
+* `DELETE $mutation_id` built from a stored id targets
+* `_00_pending_mutations:⟨⟨1785…\⟩⟩` and matches nothing. Every mutation
+* replayed from the store was therefore un-deletable: its row survived a
+* SUCCESSFUL push and got re-sent on the next boot.
+*/
+function parseStoredRecordId(id) {
+	const [table, ...rest] = id.split(":");
+	let raw = rest.join(":");
+	if (raw.startsWith("⟨") && raw.endsWith("⟩")) raw = raw.slice(1, -1);
+	return new RecordId(table, raw);
+}
 /** Materialize one `_00_pending_mutations` row into an UpEvent. */
 function rowToUpEvent(r, logger) {
 	switch (r.mutationType) {
@@ -4097,21 +4115,21 @@ function rowToUpEvent(r, logger) {
 			if (r.data === void 0 || r.data === null) return null;
 			return {
 				type: "create",
-				mutation_id: parseRecordIdString(r.id),
+				mutation_id: parseStoredRecordId(r.id),
 				record_id: parseRecordIdString(r.recordId),
 				data: r.data,
 				tableName: extractTablePart(r.recordId)
 			};
 		case "update": return {
 			type: "update",
-			mutation_id: parseRecordIdString(r.id),
+			mutation_id: parseStoredRecordId(r.id),
 			record_id: parseRecordIdString(r.recordId),
 			data: r.data,
 			beforeRecord: r.beforeRecord
 		};
 		case "delete": return {
 			type: "delete",
-			mutation_id: parseRecordIdString(r.id),
+			mutation_id: parseStoredRecordId(r.id),
 			record_id: parseRecordIdString(r.recordId)
 		};
 		default:
@@ -5800,8 +5818,8 @@ async function walkOpfs(maxEntries = 2e3, maxDepth = 8) {
 
 //#endregion
 //#region src/modules/devtools/index.ts
-const CORE_VERSION = "0.0.1-canary.160";
-const WASM_VERSION = "0.0.1-canary.160";
+const CORE_VERSION = "0.0.1-canary.161";
+const WASM_VERSION = "0.0.1-canary.161";
 const SURREAL_VERSION = "3.0.3";
 var DevToolsService = class DevToolsService {
 	eventsHistory = [];
@@ -9045,7 +9063,7 @@ var Sp00kyClient = class {
 		return new TabsCoordinator({
 			tabId,
 			fingerprint: computeTabsFingerprint({
-				coreVersion: "0.0.1-canary.160",
+				coreVersion: "0.0.1-canary.161",
 				schemaHash: hash53(this.config.schemaSurql),
 				endpoint: this.config.database.endpoint ?? "",
 				namespace: this.config.database.namespace,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@spooky-sync/core",
-  "version": "0.0.1-canary.160",
+  "version": "0.0.1-canary.161",
   "type": "module",
   "sideEffects": false,
   "main": "./dist/index.js",
@@ -60,8 +60,8 @@
     }
   },
   "dependencies": {
-    "@spooky-sync/query-builder": "0.0.1-canary.160",
-    "@spooky-sync/ssp-wasm": "0.0.1-canary.160",
+    "@spooky-sync/query-builder": "0.0.1-canary.161",
+    "@spooky-sync/ssp-wasm": "0.0.1-canary.161",
     "@sqlite.org/sqlite-wasm": "3.53.0-build1",
     "@surrealdb/wasm": "^3.0.3",
     "fast-json-patch": "^3.1.1",

package/src/modules/sync/queue/queue-up.forwarded.test.ts

@@ -114,6 +114,33 @@ describe('UpQueue.enqueueFromDatabase', () => {
     expect(stmt).toContain('data = $data');
   });
 
+  it('deletes the row using the STORED id, not its escaped display form', async () => {
+    // Outbox ids contain `_` and `-`, so the store returns them escaped:
+    // `_00_pending_mutations:⟨1785…_0005_c960…⟩`. Parsing that verbatim and
+    // re-encoding escapes the brackets AGAIN, so the DELETE targeted
+    // `⟨⟨…\⟩⟩` and matched nothing: a mutation replayed from the store could
+    // never have its row removed, even after a SUCCESSFUL push, so it was
+    // re-sent on every boot.
+    const storedId = '_00_pending_mutations:⟨1785540216679_0005_c960958c-d6ed⟩';
+    const deletes: any[] = [];
+    const query = vi.fn(async (sql: string, vars?: Record<string, unknown>) => {
+      if (sql.startsWith('DELETE')) {
+        deletes.push(vars?.mutation_id);
+        return [[]];
+      }
+      return [[{ id: storedId, mutationType: 'create', recordId: 'comment:c1' }]];
+    });
+    const queue = new UpQueue({ query } as any, makeLogger(), () => {});
+
+    await queue.enqueueFromDatabase(storedId);
+
+    expect(deletes).toHaveLength(1);
+    const rid: any = deletes[0];
+    expect(String(rid.table)).toBe('_00_pending_mutations');
+    expect(rid.id).toBe('1785540216679_0005_c960958c-d6ed');
+    expect(String(rid.id)).not.toContain('⟨');
+  });
+
   it('a push timeout classifies as network, so it retries instead of rolling back', () => {
     const err = new Error('Mutation push timed out after 30000ms (create)');
     expect(classifySyncError(err)).toBe('network');

package/src/modules/sync/queue/queue-up.ts

@@ -1,4 +1,4 @@
-import type { RecordId } from 'surrealdb';
+import { RecordId } from 'surrealdb';
 import type { LocalStore } from '../../../services/database/index';
 import type { SyncQueueEventSystem } from '../events/index';
 import { createSyncQueueEventSystem, SyncQueueEventTypes } from '../events/index';
@@ -100,7 +100,7 @@ export class UpQueue {
     );
     try {
       await this.local.query(`DELETE $mutation_id`, {
-        mutation_id: parseRecordIdString(mutationId),
+        mutation_id: parseStoredRecordId(mutationId),
       });
     } catch (error) {
       this.logger.error(
@@ -319,6 +319,25 @@ function encodeUpEventId(event: UpEvent): string {
   return encodeRecordId(event.mutation_id);
 }
 
+/**
+ * Parse a record id READ BACK FROM THE STORE, stripping SurrealDB's `⟨⟩`
+ * escaping.
+ *
+ * Outbox ids contain `_` and `-`, so the store hands them back in escaped
+ * display form (`_00_pending_mutations:⟨1785…_0005_c960…⟩`). `parseRecordIdString`
+ * keeps that verbatim, and re-encoding then escapes the brackets AGAIN, so a
+ * `DELETE $mutation_id` built from a stored id targets
+ * `_00_pending_mutations:⟨⟨1785…\⟩⟩` and matches nothing. Every mutation
+ * replayed from the store was therefore un-deletable: its row survived a
+ * SUCCESSFUL push and got re-sent on the next boot.
+ */
+function parseStoredRecordId(id: string): RecordId<string> {
+  const [table, ...rest] = id.split(':');
+  let raw = rest.join(':');
+  if (raw.startsWith('⟨') && raw.endsWith('⟩')) raw = raw.slice(1, -1);
+  return new RecordId(table, raw);
+}
+
 /** Materialize one `_00_pending_mutations` row into an UpEvent. */
 function rowToUpEvent(r: any, logger: Logger): UpEvent | null {
   switch (r.mutationType) {
@@ -331,7 +350,7 @@ function rowToUpEvent(r: any, logger: Logger): UpEvent | null {
       if (r.data === undefined || r.data === null) return null;
       return {
         type: 'create',
-        mutation_id: parseRecordIdString(r.id),
+        mutation_id: parseStoredRecordId(r.id),
         record_id: parseRecordIdString(r.recordId),
         data: r.data,
         tableName: extractTablePart(r.recordId),
@@ -339,7 +358,7 @@ function rowToUpEvent(r: any, logger: Logger): UpEvent | null {
     case 'update':
       return {
         type: 'update',
-        mutation_id: parseRecordIdString(r.id),
+        mutation_id: parseStoredRecordId(r.id),
         record_id: parseRecordIdString(r.recordId),
         data: r.data,
         beforeRecord: r.beforeRecord,
@@ -347,7 +366,7 @@ function rowToUpEvent(r: any, logger: Logger): UpEvent | null {
     case 'delete':
       return {
         type: 'delete',
-        mutation_id: parseRecordIdString(r.id),
+        mutation_id: parseStoredRecordId(r.id),
         record_id: parseRecordIdString(r.recordId),
       };
     default: