@syncular/client 0.30.10 → 0.30.11

package/dist/worker-host.js

@@ -437,7 +437,29 @@ async function startWorkerCore(options) {
     const worker = config.worker();
     const pending = new Map();
     const nextId = { value: 1 };
+    let terminated = false;
+    let rejectReady;
+    const closedError = new ClientSyncError(WORKER_FAILED_CODE, 'the handle was closed');
+    const terminate = () => {
+        if (terminated)
+            return;
+        terminated = true;
+        globalThis.removeEventListener?.('pagehide', terminate);
+        bridge?.close();
+        worker.terminate();
+        rejectReady?.(closedError);
+        for (const entry of pending.values())
+            entry.reject(closedError);
+        pending.clear();
+        void lease.release();
+    };
+    // Installed before bootstrap starts: pagehide must also terminate a worker
+    // whose first open/import is still pending. Termination closes its SAHs and
+    // releases its physical Web Lock; the next document waits for that lock.
+    globalThis.addEventListener?.('pagehide', terminate);
     const invoke = (method, args) => {
+        if (terminated)
+            return Promise.reject(closedError);
         const id = nextId.value++;
         return new Promise((resolve, reject) => {
             pending.set(id, { resolve, reject });
@@ -451,6 +473,7 @@ async function startWorkerCore(options) {
     };
     let bridge;
     const ready = new Promise((resolve, reject) => {
+        rejectReady = reject;
         const onMessage = (event) => {
             const message = event.data;
             switch (message.t) {
@@ -507,27 +530,30 @@ async function startWorkerCore(options) {
             invoke,
             bridge,
             lease,
-            close: async (terminate) => {
+            close: async (terminateWorker) => {
+                if (terminated)
+                    return;
                 bridge?.close();
                 try {
                     await invoke('close', []);
                 }
                 catch {
-                    // Closing a wedged worker still terminates it below.
+                    // A terminated or failed worker has no further close RPC to service.
+                }
+                if (terminateWorker)
+                    terminate();
+                else {
+                    globalThis.removeEventListener?.('pagehide', terminate);
+                    for (const entry of pending.values())
+                        entry.reject(closedError);
+                    pending.clear();
+                    await lease.release();
                 }
-                if (terminate)
-                    worker.terminate();
-                const closedError = new ClientSyncError(WORKER_FAILED_CODE, 'the handle was closed');
-                for (const entry of pending.values())
-                    entry.reject(closedError);
-                pending.clear();
-                await lease.release();
             },
         };
     }
     catch (error) {
-        worker.terminate();
-        await lease.release();
+        terminate();
         throw error;
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@syncular/client",
-  "version": "0.30.10",
+  "version": "0.30.11",
   "description": "Syncular TypeScript client core — offline-first sync over SQLite (WASM/OPFS, Bun, Node)",
   "license": "Apache-2.0",
   "author": "Benjamin Kniffler",
@@ -89,10 +89,10 @@
   },
   "dependencies": {
     "@sqlite.org/sqlite-wasm": "^3.53.0-build1",
-    "@syncular/core": "0.30.10"
+    "@syncular/core": "0.30.11"
   },
   "devDependencies": {
-    "@syncular/server": "0.30.10",
+    "@syncular/server": "0.30.11",
     "playwright": "1.63.0",
     "@electric-sql/pglite": "^0.5.4"
   }

package/src/apply.ts

@@ -1,4 +1,4 @@
-import { retainedBaseWrite } from './failed-overlay';
+import { retainedBaseWrite, restoreFailedBases } from './failed-overlay';
 /**
  * Local application of server data: `COMMIT` frames (§4.5), rows segments
  * (§5.2, §5.6), and the scope-matched delete shared by the §3.3 purge
@@ -37,8 +37,7 @@ function upsertSql(table: CompiledClientTable): string {
     .filter((name) => name !== quoteIdent(table.primaryKey))
     .map((name) => `${name}=excluded.${name}`)
     .join(', ');
-  return `INSERT INTO ${quoteIdent(table.name)} (${names.join(', ')}) VALUES (${placeholders})
-    ON CONFLICT (${quoteIdent(table.primaryKey)}) DO UPDATE SET ${updates}`;
+  return `INSERT INTO ${quoteIdent(table.name)}(${names.join(', ')})VALUES(${placeholders})ON CONFLICT(${quoteIdent(table.primaryKey)})DO UPDATE SET ${updates}`;
 }
 
 export function upsertLocalRow(
@@ -48,10 +47,11 @@ export function upsertLocalRow(
   syncVersion: number,
   serverWrite = true,
 ): void {
+  db.exec(upsertSql(table), [...values.map(toSqlValue), syncVersion]);
   if (serverWrite)
     retainedBaseWrite(
       db,
-      table.name,
+      table,
       String(values[table.primaryKeyIndex]),
       Object.fromEntries(
         table.columns.map((column, index) => [
@@ -61,7 +61,6 @@ export function upsertLocalRow(
       ),
       syncVersion,
     );
-  db.exec(upsertSql(table), [...values.map(toSqlValue), syncVersion]);
 }
 
 export function deleteLocalRow(
@@ -70,9 +69,9 @@ export function deleteLocalRow(
   rowId: string,
   serverWrite = true,
 ): void {
-  if (serverWrite) retainedBaseWrite(db, table.name, rowId);
+  if (serverWrite) retainedBaseWrite(db, table, rowId);
   db.exec(
-    `DELETE FROM ${quoteIdent(table.name)} WHERE ${quoteIdent(table.primaryKey)} = ?`,
+    `DELETE FROM ${quoteIdent(table.name)} WHERE ${quoteIdent(table.primaryKey)}=?`,
     [rowId],
   );
 }
@@ -139,6 +138,7 @@ export async function applyCommitFrame(
     });
   }
   transaction(() => {
+    restoreFailedBases(db, schema);
     for (const change of resolved) {
       if (change.op === 'delete') {
         deleteLocalRow(db, change.table, change.rowId);
@@ -222,7 +222,7 @@ export function deleteScopedRows(
     `SELECT ${quoteIdent(table.primaryKey)} AS id FROM ${quoteIdent(table.name)} WHERE ${clauses.join(' AND ')}`,
     params,
   )) {
-    retainedBaseWrite(db, table.name, String(row.id));
+    retainedBaseWrite(db, table, String(row.id));
   }
   db.exec(
     `DELETE FROM ${quoteIdent(table.name)} WHERE ${clauses.join(' AND ')}`,
@@ -273,9 +273,7 @@ export function evictScopedRows(
   }
   const target = quoteIdent(table.name);
   db.exec(
-    `DELETE FROM ${target} WHERE ${pk} IN (
-      SELECT ${pk} FROM ${target} WHERE ${clauses.join(' AND ')}${pinnedClause} LIMIT 1024
-    )`,
+    `DELETE FROM ${target} WHERE ${pk} IN(SELECT ${pk} FROM ${target} WHERE ${clauses.join(' AND ')}${pinnedClause} LIMIT 1024)`,
     params,
   );
   const remaining =
@@ -343,10 +341,7 @@ export async function applySqliteSegment(
     let meta: ReturnType<ClientDatabase['query']>;
     try {
       meta = db.query(
-        `SELECT format, "table" AS tbl, "schemaVersion" AS sv,
-                "asOfCommitSeq" AS pin, "scopeDigest" AS sd,
-                "rowCount" AS rc
-         FROM ${IMAGE_ALIAS}."_syncular_segment"`,
+        `SELECT format,"table" AS tbl,"schemaVersion" AS sv,"asOfCommitSeq" AS pin,"scopeDigest" AS sd,"rowCount" AS rc FROM ${IMAGE_ALIAS}."_syncular_segment"`,
       );
     } catch {
       imageInvalid('bytes are not a SQLite image with _syncular_segment');
@@ -396,7 +391,7 @@ export async function applySqliteSegment(
     if (primaryKeys.length !== 1 || primaryKeys[0]?.name !== table.primaryKey)
       imageInvalid('image primary key does not match generated schema');
     const source = `${IMAGE_ALIAS}.${quoteIdent(table.name)}`;
-    const count = Number(db.query(`SELECT count(*) AS n FROM ${source}`)[0]?.n);
+    const count = Number(db.query(`SELECT count(*)AS n FROM ${source}`)[0]?.n);
     if (count !== descriptor.rowCount)
       imageInvalid('image row count does not match descriptor');
     const names = table.columns.map((column) => quoteIdent(column.name));
@@ -411,9 +406,7 @@ export async function applySqliteSegment(
     for (;;) {
       if (options.isCurrent?.() === false) return applied;
       const boundary = db.query(
-        `SELECT ${primaryKey} AS boundary FROM ${source}
-         ${after === undefined ? '' : `WHERE ${primaryKey} > ?`}
-         ORDER BY ${primaryKey} LIMIT 1 OFFSET 1023`,
+        `SELECT ${primaryKey} AS boundary FROM ${source} ${after === undefined ? '' : `WHERE ${primaryKey} > ?`} ORDER BY ${primaryKey} LIMIT 1 OFFSET 1023`,
         after === undefined ? [] : [after],
       )[0]?.boundary;
       if (boundary === null) imageInvalid('image primary key must not be null');
@@ -428,23 +421,21 @@ export async function applySqliteSegment(
         params.push(boundary);
       }
       (options.transaction ?? ((fn) => db.transaction(fn)))(() => {
+        restoreFailedBases(db, schema);
         if (after === undefined && options.clearFirst)
           deleteScopedRows(db, table, options.effective);
         db.exec(
-          `INSERT INTO ${quoteIdent(table.name)} (${insertNames.join(', ')})
-           SELECT ${[...names, quoteIdent('_syncular_version')].join(', ')}
-           FROM ${source} WHERE ${predicates.join(' AND ') || 'true'}
-           ON CONFLICT (${primaryKey}) DO UPDATE SET ${updates}`,
+          `INSERT INTO ${quoteIdent(table.name)}(${insertNames.join(', ')})SELECT ${[...names, quoteIdent('_syncular_version')].join(', ')} FROM ${source} WHERE ${predicates.join(' AND ') || 'true'} ON CONFLICT(${primaryKey})DO UPDATE SET ${updates}`,
           params,
         );
-        applied += Number(db.query('SELECT changes() AS n')[0]?.n ?? 0);
+        applied += Number(db.query('SELECT changes()AS n')[0]?.n ?? 0);
         for (const row of db.query(
           `SELECT * FROM ${source} WHERE ${predicates.join(' AND ') || 'true'}`,
           params,
         )) {
           retainedBaseWrite(
             db,
-            table.name,
+            table,
             String(row[table.primaryKey]),
             Object.fromEntries(
               table.columns.map((column) => [
@@ -515,6 +506,7 @@ export async function applyRowsSegment(
     first = false;
     if (!clearThisBlock && rows.length === 0) continue;
     (options.transaction ?? ((fn) => db.transaction(fn)))(() => {
+      restoreFailedBases(db, schema);
       if (clearThisBlock) {
         deleteScopedRows(db, table, options.effective);
       }

package/src/blob.ts

@@ -105,7 +105,7 @@ export async function computeBlobId(bytes: Uint8Array): Promise<string> {
 
 export function ensureBlobSchema(db: ClientDatabase): void {
   const existing = db.query(
-    "SELECT 1 FROM sqlite_master WHERE type = 'table' AND name = '_syncular_blobs'",
+    "SELECT 1 FROM sqlite_master WHERE type='table' AND name='_syncular_blobs'",
   );
   if (existing.length > 0) {
     const columns = db
@@ -129,15 +129,13 @@ export function ensureBlobSchema(db: ClientDatabase): void {
       );
     }
   } else {
-    db.exec(`CREATE TABLE _syncular_blobs(
-      blob_id TEXT PRIMARY KEY,
-      bytes BLOB NOT NULL,
-      byte_length INTEGER NOT NULL,
-      media_type TEXT,
-      created_at_ms INTEGER NOT NULL)`);
+    db.exec(
+      'CREATE TABLE _syncular_blobs(blob_id TEXT PRIMARY KEY,bytes BLOB NOT NULL,byte_length INTEGER NOT NULL,media_type TEXT,created_at_ms INTEGER NOT NULL)',
+    );
   }
-  db.exec(`CREATE TABLE IF NOT EXISTS _syncular_blob_uploads(
-    blob_id TEXT PRIMARY KEY, media_type TEXT, created_at_ms INTEGER NOT NULL)`);
+  db.exec(
+    'CREATE TABLE IF NOT EXISTS _syncular_blob_uploads(blob_id TEXT PRIMARY KEY,media_type TEXT,created_at_ms INTEGER NOT NULL)',
+  );
 }
 
 /** Put bytes into the content-addressed cache without rewriting an existing body. */
@@ -149,9 +147,7 @@ export function putCachedBlob(
   mediaType?: string,
 ): void {
   db.exec(
-    `INSERT INTO _syncular_blobs(
-       blob_id, bytes, byte_length, media_type, created_at_ms)
-     VALUES (?,?,?,?,?) ON CONFLICT(blob_id) DO NOTHING`,
+    'INSERT INTO _syncular_blobs(blob_id,bytes,byte_length,media_type,created_at_ms)VALUES(?,?,?,?,?)ON CONFLICT(blob_id)DO NOTHING',
     [blobId, bytes, bytes.length, mediaType ?? null, nowMs],
   );
 }
@@ -161,7 +157,7 @@ export function getCachedBlob(
   blobId: string,
 ): CachedBlob | undefined {
   const rows = db.query(
-    'SELECT bytes, byte_length, media_type FROM _syncular_blobs WHERE blob_id = ?',
+    'SELECT bytes,byte_length,media_type FROM _syncular_blobs WHERE blob_id=?',
     [blobId],
   );
   const row = rows[0];
@@ -185,24 +181,20 @@ export function enforceBlobCacheCap(
   maxBytes: number,
 ): string[] {
   const totalRow = db.query(
-    'SELECT COALESCE(SUM(byte_length), 0) AS total FROM _syncular_blobs',
+    'SELECT COALESCE(SUM(byte_length),0)AS total FROM _syncular_blobs',
   )[0];
   let total = Number(totalRow?.total ?? 0);
   if (total <= maxBytes) return [];
   // Oldest eligible body first, with blob ID as a stable tie.
   const candidates = db.query(
-    `SELECT blob_id, byte_length FROM _syncular_blobs
-     WHERE blob_id NOT IN (SELECT blob_id FROM _syncular_blob_uploads)
-       AND blob_id NOT IN (SELECT blob_id FROM _syncular_blob_commit_refs)
-       AND blob_id NOT IN (${visibleBlobIdsSql(schema)})
-     ORDER BY created_at_ms ASC, blob_id ASC`,
+    `SELECT blob_id,byte_length FROM _syncular_blobs WHERE blob_id NOT IN(SELECT blob_id FROM _syncular_blob_uploads)AND blob_id NOT IN(SELECT blob_id FROM _syncular_blob_commit_refs)AND blob_id NOT IN(${visibleBlobIdsSql(schema)})ORDER BY created_at_ms ASC,blob_id ASC`,
   );
   const evicted: string[] = [];
   db.transaction(() => {
     for (const row of candidates) {
       if (total <= maxBytes) break;
       const blobId = row.blob_id as string;
-      db.exec('DELETE FROM _syncular_blobs WHERE blob_id = ?', [blobId]);
+      db.exec('DELETE FROM _syncular_blobs WHERE blob_id=?', [blobId]);
       total -= Number(row.byte_length);
       evicted.push(blobId);
     }
@@ -215,13 +207,7 @@ export function listPendingUploads(
 ): { blobId: string; mediaType?: string }[] {
   return db
     .query(
-      `SELECT blob_id, media_type FROM (
-        SELECT blob_id, media_type, created_at_ms FROM _syncular_blob_uploads
-        UNION ALL
-        SELECT DISTINCT r.blob_id, b.media_type, 9223372036854775807 AS created_at_ms
-        FROM _syncular_blob_commit_refs r LEFT JOIN _syncular_blobs b ON b.blob_id = r.blob_id
-        WHERE NOT EXISTS (SELECT 1 FROM _syncular_blob_uploads u WHERE u.blob_id = r.blob_id)
-      ) ORDER BY created_at_ms, blob_id`,
+      'SELECT blob_id,media_type FROM(SELECT blob_id,media_type,created_at_ms FROM _syncular_blob_uploads UNION ALL SELECT DISTINCT r.blob_id,b.media_type,9223372036854775807 AS created_at_ms FROM _syncular_blob_commit_refs r LEFT JOIN _syncular_blobs b ON b.blob_id=r.blob_id WHERE NOT EXISTS(SELECT 1 FROM _syncular_blob_uploads u WHERE u.blob_id=r.blob_id))ORDER BY created_at_ms,blob_id',
     )
     .map((row) => {
       if (
@@ -247,14 +233,13 @@ export function recordPendingUpload(
   mediaType?: string,
 ): void {
   db.exec(
-    `INSERT OR IGNORE INTO _syncular_blob_uploads(blob_id, media_type, created_at_ms)
-     VALUES (?,?,?)`,
+    'INSERT OR IGNORE INTO _syncular_blob_uploads(blob_id,media_type,created_at_ms)VALUES(?,?,?)',
     [blobId, mediaType ?? null, nowMs],
   );
 }
 
 export function clearPendingUpload(db: ClientDatabase, blobId: string): void {
-  db.exec('DELETE FROM _syncular_blob_uploads WHERE blob_id = ?', [blobId]);
+  db.exec('DELETE FROM _syncular_blob_uploads WHERE blob_id=?', [blobId]);
 }
 
 /**
@@ -286,11 +271,7 @@ function visibleBlobIdsSql(schema: CompiledClientSchema): string {
     for (const column of columns) {
       const identifier = quoteIdent(column);
       selects.push(
-        `SELECT json_extract(${identifier}, '$.blobId') AS blob_id
-         FROM ${quoteIdent(tableName)}
-         WHERE typeof(${identifier}) = 'text'
-           AND json_valid(${identifier})
-           AND json_type(${identifier}, '$.blobId') = 'text'`,
+        `SELECT json_extract(${identifier},'$.blobId')AS blob_id FROM ${quoteIdent(tableName)} WHERE typeof(${identifier})='text' AND json_valid(${identifier})AND json_type(${identifier},'$.blobId')='text'`,
       );
     }
   }
@@ -304,10 +285,7 @@ export function deleteUnreferencedCachedBlobs(
   schema: CompiledClientSchema,
 ): void {
   db.exec(
-    `DELETE FROM _syncular_blobs
-     WHERE blob_id NOT IN (SELECT blob_id FROM _syncular_blob_uploads)
-       AND blob_id NOT IN (SELECT blob_id FROM _syncular_blob_commit_refs)
-       AND blob_id NOT IN (${visibleBlobIdsSql(schema)})`,
+    `DELETE FROM _syncular_blobs WHERE blob_id NOT IN(SELECT blob_id FROM _syncular_blob_uploads)AND blob_id NOT IN(SELECT blob_id FROM _syncular_blob_commit_refs)AND blob_id NOT IN(${visibleBlobIdsSql(schema)})`,
   );
 }