@opendatalabs/personal-server-ts-core 1.7.0 → 1.9.0

package/dist/sync/data-point-feed.js

@@ -0,0 +1,122 @@
+import { computeDataPointId } from "./data-point-id.js";
+import { TOMBSTONE_DATA_HASH, TOMBSTONE_METADATA_HASH } from "./tombstone.js";
+/**
+ * Deletion-aware gateway feed over the same REST endpoints the SDK client
+ * uses, plus the `includeDeleted=true` query the SDK does not expose:
+ *
+ *   GET {gateway}/v1/data?user={owner}&includeDeleted=true[&cursor=..][&since=..][&limit=..]
+ *   GET {gateway}/v1/data/{dataPointId}?includeDeleted=true
+ *
+ * Rows come back with `deletedAt` (null while live). A gateway that answers
+ * the single lookup of a tombstoned point with 410 instead of a row is
+ * normalised into a deleted record so callers never have to catch a 410.
+ */
+export function createGatewayDataPointFeed(options) {
+    const base = options.gatewayUrl.replace(/\/+$/, "");
+    const fetchImpl = options.fetch ?? globalThis.fetch;
+    const now = options.now ?? (() => new Date());
+    return {
+        async listDataPointsByOwner(owner, cursor, listOptions) {
+            const params = new URLSearchParams({ user: owner });
+            if (cursor !== null)
+                params.set("cursor", cursor);
+            if (listOptions?.since)
+                params.set("since", listOptions.since);
+            if (listOptions?.limit !== undefined) {
+                params.set("limit", String(listOptions.limit));
+            }
+            if (listOptions?.includeDeleted)
+                params.set("includeDeleted", "true");
+            const res = await fetchImpl(`${base}/v1/data?${params.toString()}`);
+            if (!res.ok) {
+                throw new Error(`Gateway error: ${res.status} ${res.statusText}`);
+            }
+            const envelope = (await res.json());
+            const nextCursor = envelope.pagination?.hasMore === false
+                ? null
+                : (envelope.pagination?.nextCursor ?? null);
+            const rows = envelope.data?.dataPoints ?? [];
+            return {
+                dataPoints: rows.map((row) => normalizeRecord(row)),
+                cursor: nextCursor,
+            };
+        },
+        async getDataPoint(input) {
+            const dataPointId = computeDataPointId(input.ownerAddress, input.scope);
+            const res = await fetchImpl(`${base}/v1/data/${dataPointId}?includeDeleted=true`);
+            if (res.status === 404)
+                return null;
+            if (res.status === 410) {
+                // Tombstoned. Prefer the row the gateway echoes in the 410 body;
+                // otherwise synthesise the minimum a caller needs to treat the point
+                // as deleted "at or before now".
+                const body = await res.json().catch(() => null);
+                const echoed = unwrap(body);
+                const deletedAt = stringField(echoed, "deletedAt") ?? now().toISOString();
+                return {
+                    id: dataPointId,
+                    ownerAddress: input.ownerAddress,
+                    scope: input.scope,
+                    dataHash: stringField(echoed, "dataHash") ?? TOMBSTONE_DATA_HASH,
+                    metadataHash: stringField(echoed, "metadataHash") ?? TOMBSTONE_METADATA_HASH,
+                    expectedVersion: stringField(echoed, "expectedVersion") ?? "0",
+                    addedAt: stringField(echoed, "addedAt") ?? deletedAt,
+                    deletedAt,
+                };
+            }
+            if (!res.ok) {
+                throw new Error(`Gateway error: ${res.status} ${res.statusText}`);
+            }
+            const body = await res.json();
+            return normalizeRecord(unwrap(body));
+        },
+    };
+}
+// The gateway wraps single-resource responses as `{ data: {...} }` (the SDK's
+// unwrapEnvelope); tolerate a bare object too.
+function unwrap(body) {
+    if (typeof body !== "object" || body === null)
+        return null;
+    const record = body;
+    if (typeof record.data === "object" && record.data !== null) {
+        return record.data;
+    }
+    return record;
+}
+function stringField(record, key) {
+    const value = record?.[key];
+    return typeof value === "string" ? value : undefined;
+}
+function normalizeRecord(row) {
+    const record = (row ?? {});
+    const deletedAt = record.deletedAt;
+    return {
+        ...record,
+        deletedAt: typeof deletedAt === "string" ? deletedAt : null,
+    };
+}
+/**
+ * Adapter from the SDK `GatewayClient` listing to the feed shape. Used when a
+ * host wires no dedicated feed: deletions are only visible if the gateway
+ * happens to include `deletedAt` without being asked, so this is a
+ * degraded mode. Prefer `createGatewayDataPointFeed`.
+ */
+export function feedFromGatewayClient(gateway) {
+    return {
+        async listDataPointsByOwner(owner, cursor, listOptions) {
+            const { includeDeleted: _includeDeleted, ...sdkOptions } = listOptions ?? {};
+            const result = Object.keys(sdkOptions).length > 0
+                ? await gateway.listDataPointsByOwner(owner, cursor, sdkOptions)
+                : await gateway.listDataPointsByOwner(owner, cursor);
+            return {
+                dataPoints: result.dataPoints.map((row) => normalizeRecord(row)),
+                cursor: result.cursor,
+            };
+        },
+        async getDataPoint(input) {
+            const row = await gateway.getDataPoint(computeDataPointId(input.ownerAddress, input.scope));
+            return row === null ? null : normalizeRecord(row);
+        },
+    };
+}
+//# sourceMappingURL=data-point-feed.js.map

package/dist/sync/data-point-feed.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"data-point-feed.js","sourceRoot":"","sources":["../../src/sync/data-point-feed.ts"],"names":[],"mappings":"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"}

package/dist/sync/delete-data-port.d.ts

@@ -0,0 +1,50 @@
+import type { DataPointFeedPort, DeleteDataPort } from "../ports/index.js";
+import type { ServerSigner } from "../signing/signer.js";
+export interface GatewayDeleteDataPortOptions {
+    /** Gateway base URL, e.g. https://dp-rpc.vana.org */
+    gatewayUrl: string;
+    /** Deletion-aware registry lookup (current version + deleted state). */
+    dataPointFeed: DataPointFeedPort;
+    /** Data owner the tombstone is registered on behalf of. */
+    serverOwner: `0x${string}`;
+    /**
+     * The same signer the upload worker uses for AddData: the personal server
+     * account, which the registry trusts for this owner. Reused as-is so a
+     * tombstone is signed exactly like a normal registration.
+     */
+    signer: Pick<ServerSigner, "signAddData">;
+    storage: {
+        /** vana-storage base URL, e.g. https://storage.vana.org */
+        endpoint: string;
+        /** Protocol chain id; blob paths are chain-scoped. */
+        chainId: number;
+        /**
+         * EIP-191 signer for the Web3Signed storage auth. The same account the
+         * storage provider uploads with (the server account), so the DELETE is
+         * authorised the way PUT is.
+         */
+        signMessage(message: string): Promise<`0x${string}`>;
+    };
+    /** Test seam; defaults to the global fetch. */
+    fetch?: typeof fetch;
+}
+/**
+ * Remote deletion against the DPv2 gateway + vana-storage.
+ *
+ * Gateway (durable fact):
+ *   DELETE {gateway}/v1/data/{dataPointId}
+ *   Authorization: Web3Signed {signature}
+ *   { ownerAddress, scope, expectedVersion, signature }
+ * where signature = EIP-712 AddData over
+ *   { ownerAddress, scope, dataHash: TOMBSTONE_DATA_HASH,
+ *     metadataHash: TOMBSTONE_METADATA_HASH, expectedVersion: current + 1 }
+ *
+ * Storage (one exact blob per version, never the scope prefix):
+ *   DELETE {storage}/v1/chains/{chainId}/blobs/{owner}/{scope}/{version}
+ *   authorization: Web3Signed (aud = storage endpoint, uri = that path)
+ * The path is the one the SDK's vana-storage provider uploads to: lowercased
+ * owner, every key segment URI-encoded; vana-storage resolves a three-segment
+ * path as a single-object delete and answers 404 when the object is absent.
+ */
+export declare function createGatewayDeleteDataPort(options: GatewayDeleteDataPortOptions): DeleteDataPort;
+//# sourceMappingURL=delete-data-port.d.ts.map

package/dist/sync/delete-data-port.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"delete-data-port.d.ts","sourceRoot":"","sources":["../../src/sync/delete-data-port.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,iBAAiB,EAEjB,cAAc,EAEf,MAAM,mBAAmB,CAAC;AAC3B,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAKzD,MAAM,WAAW,4BAA4B;IAC3C,qDAAqD;IACrD,UAAU,EAAE,MAAM,CAAC;IACnB,wEAAwE;IACxE,aAAa,EAAE,iBAAiB,CAAC;IACjC,2DAA2D;IAC3D,WAAW,EAAE,KAAK,MAAM,EAAE,CAAC;IAC3B;;;;OAIG;IACH,MAAM,EAAE,IAAI,CAAC,YAAY,EAAE,aAAa,CAAC,CAAC;IAC1C,OAAO,EAAE;QACP,2DAA2D;QAC3D,QAAQ,EAAE,MAAM,CAAC;QACjB,sDAAsD;QACtD,OAAO,EAAE,MAAM,CAAC;QAChB;;;;WAIG;QACH,WAAW,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,KAAK,MAAM,EAAE,CAAC,CAAC;KACtD,CAAC;IACF,+CAA+C;IAC/C,KAAK,CAAC,EAAE,OAAO,KAAK,CAAC;CACtB;AAED;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,2BAA2B,CACzC,OAAO,EAAE,4BAA4B,GACpC,cAAc,CA2LhB"}

package/dist/sync/delete-data-port.js

@@ -0,0 +1,244 @@
+import { buildWeb3SignedHeader } from "@opendatalabs/vana-sdk/browser";
+import { computeDataPointId } from "./data-point-id.js";
+import { parseGatewayNextVersion } from "./workers/upload.js";
+import { TOMBSTONE_DATA_HASH, TOMBSTONE_METADATA_HASH } from "./tombstone.js";
+/**
+ * Remote deletion against the DPv2 gateway + vana-storage.
+ *
+ * Gateway (durable fact):
+ *   DELETE {gateway}/v1/data/{dataPointId}
+ *   Authorization: Web3Signed {signature}
+ *   { ownerAddress, scope, expectedVersion, signature }
+ * where signature = EIP-712 AddData over
+ *   { ownerAddress, scope, dataHash: TOMBSTONE_DATA_HASH,
+ *     metadataHash: TOMBSTONE_METADATA_HASH, expectedVersion: current + 1 }
+ *
+ * Storage (one exact blob per version, never the scope prefix):
+ *   DELETE {storage}/v1/chains/{chainId}/blobs/{owner}/{scope}/{version}
+ *   authorization: Web3Signed (aud = storage endpoint, uri = that path)
+ * The path is the one the SDK's vana-storage provider uploads to: lowercased
+ * owner, every key segment URI-encoded; vana-storage resolves a three-segment
+ * path as a single-object delete and answers 404 when the object is absent.
+ */
+export function createGatewayDeleteDataPort(options) {
+    const gatewayBase = options.gatewayUrl.replace(/\/+$/, "");
+    const storageBase = options.storage.endpoint.replace(/\/+$/, "");
+    const fetchImpl = options.fetch ?? globalThis.fetch;
+    // The storage provider lowercases the owner in blob paths; match it or the
+    // exact DELETE keys would not be the ones PUT wrote.
+    const owner = options.serverOwner.toLowerCase();
+    async function sendTombstone(scope, dataPointId, version) {
+        const signature = await options.signer.signAddData({
+            ownerAddress: options.serverOwner,
+            scope,
+            dataHash: TOMBSTONE_DATA_HASH,
+            metadataHash: TOMBSTONE_METADATA_HASH,
+            expectedVersion: version,
+        });
+        return fetchImpl(`${gatewayBase}/v1/data/${dataPointId}`, {
+            method: "DELETE",
+            headers: {
+                "Content-Type": "application/json",
+                Authorization: `Web3Signed ${signature}`,
+            },
+            body: JSON.stringify({
+                ownerAddress: options.serverOwner,
+                scope,
+                expectedVersion: String(version),
+                signature,
+            }),
+        });
+    }
+    return {
+        async tombstone(scope) {
+            const dataPointId = computeDataPointId(options.serverOwner, scope);
+            const current = await options.dataPointFeed.getDataPoint({
+                ownerAddress: options.serverOwner,
+                scope,
+            });
+            if (current === null) {
+                return { status: "not-registered", dataPointId };
+            }
+            if (current.deletedAt !== null) {
+                return {
+                    status: "already-deleted",
+                    dataPointId,
+                    version: current.expectedVersion,
+                    deletedAt: current.deletedAt,
+                };
+            }
+            let version = BigInt(current.expectedVersion) + 1n;
+            let res = await sendTombstone(scope, dataPointId, version);
+            if (res.status === 409) {
+                // Another replica advanced the scope between our read and our
+                // write. The 409 body carries `currentExpectedVersion` (and the
+                // legacy message phrasing names the next valid version); re-sign
+                // once against it.
+                const body = await res.json().catch(() => null);
+                const conflict = unwrap(body);
+                // Gateway 409 body: `nextExpectedVersion` is the version to sign
+                // next; `currentExpectedVersion` is the version the gateway holds,
+                // so it needs +1. Prefer the explicit next, fall back to current+1,
+                // then to the legacy message phrasing.
+                const nextExplicit = integerField(conflict, "nextExpectedVersion") ??
+                    integerField(body, "nextExpectedVersion");
+                const currentExpected = integerField(conflict, "currentExpectedVersion") ??
+                    integerField(body, "currentExpectedVersion");
+                const legacyNext = parseGatewayNextVersion(detailFromBody(body, res.statusText));
+                const next = nextExplicit !== null
+                    ? nextExplicit
+                    : currentExpected !== null
+                        ? currentExpected + 1n
+                        : legacyNext !== null
+                            ? BigInt(legacyNext)
+                            : null;
+                if (next === null) {
+                    throw new Error(`Gateway error: 409 ${detailFromBody(body, res.statusText)}`);
+                }
+                version = next;
+                res = await sendTombstone(scope, dataPointId, version);
+            }
+            if (res.status === 404) {
+                // The registry lost the row between our read and our write (or the
+                // feed answered from a replica ahead of the writer): nothing to
+                // tombstone.
+                return { status: "not-registered", dataPointId };
+            }
+            if (res.status === 410) {
+                // Raced with a concurrent deletion: the point is already gone. The
+                // winning tombstone may sit above the version we attempted (another
+                // replica advanced the scope first), and its version bounds the
+                // ciphertext to delete, so take the gateway's word: the echoed row,
+                // else a re-read of the deletion-aware feed, else unknown.
+                const body = await res.json().catch(() => null);
+                const echoed = unwrap(body);
+                let winning = normalizeVersionString(stringField(echoed, "expectedVersion"));
+                let deletedAt = stringField(echoed, "deletedAt");
+                if (winning === null) {
+                    const reread = await options.dataPointFeed
+                        .getDataPoint({ ownerAddress: options.serverOwner, scope })
+                        .catch(() => null);
+                    if (reread && reread.deletedAt !== null) {
+                        winning = normalizeVersionString(reread.expectedVersion);
+                        deletedAt = deletedAt ?? reread.deletedAt;
+                    }
+                }
+                return {
+                    status: "already-deleted",
+                    dataPointId,
+                    version: winning,
+                    deletedAt,
+                };
+            }
+            if (!res.ok) {
+                throw new Error(`Gateway error: ${res.status} ${await errorDetail(res)}`);
+            }
+            const body = await res.json().catch(() => null);
+            const row = unwrap(body);
+            return {
+                status: "tombstoned",
+                dataPointId: stringField(row, "dataPointId") ?? dataPointId,
+                version: stringField(row, "expectedVersion") ?? String(version),
+                deletedAt: stringField(row, "deletedAt"),
+            };
+        },
+        async deleteBlobVersions(scope, versions) {
+            const outcome = {
+                deleted: [],
+                missing: [],
+                failed: [],
+            };
+            // Sequential on purpose: vana-storage rate-limits DELETE per owner
+            // and the caller already bounds the batch size per pass.
+            for (const version of versions) {
+                const path = `/v1/chains/${options.storage.chainId}/blobs/${owner}/${encodeURIComponent(scope)}/${encodeURIComponent(version)}`;
+                try {
+                    const authorization = await buildWeb3SignedHeader({
+                        signMessage: (message) => options.storage.signMessage(message),
+                        aud: storageBase,
+                        method: "DELETE",
+                        uri: path,
+                    });
+                    const res = await fetchImpl(`${storageBase}${path}`, {
+                        method: "DELETE",
+                        headers: { authorization },
+                    });
+                    if (res.status === 404) {
+                        // Idempotent: an absent object is a completed delete.
+                        outcome.missing.push(version);
+                    }
+                    else if (res.ok) {
+                        outcome.deleted.push(version);
+                    }
+                    else {
+                        outcome.failed.push({
+                            version,
+                            error: `vana-storage delete failed: ${res.status} ${res.statusText}`,
+                        });
+                    }
+                }
+                catch (err) {
+                    outcome.failed.push({
+                        version,
+                        error: err instanceof Error ? err.message : String(err),
+                    });
+                }
+            }
+            return outcome;
+        },
+    };
+}
+async function errorDetail(res) {
+    const body = await res.json().catch(() => null);
+    return detailFromBody(body, res.statusText);
+}
+function detailFromBody(body, fallback) {
+    if (typeof body === "object" && body !== null) {
+        const record = body;
+        if (typeof record.error === "string")
+            return record.error;
+        if (typeof record.message === "string")
+            return record.message;
+        if (typeof record.error === "object" && record.error !== null) {
+            const nested = record.error;
+            if (typeof nested.message === "string")
+                return nested.message;
+        }
+    }
+    return fallback;
+}
+// Versions are unbounded integers on the wire (decimal strings); parse them
+// as bigint so a value past Number.MAX_SAFE_INTEGER cannot round.
+// A registry version is a positive decimal integer; anything else (including
+// the "0" a body-less 410 can synthesise) is "unknown".
+function normalizeVersionString(value) {
+    if (value === null || !/^\d+$/.test(value))
+        return null;
+    const parsed = BigInt(value);
+    return parsed > 0n ? parsed.toString() : null;
+}
+function integerField(record, key) {
+    if (typeof record !== "object" || record === null)
+        return null;
+    const value = record[key];
+    if (typeof value === "number" && Number.isSafeInteger(value)) {
+        return BigInt(value);
+    }
+    if (typeof value === "string" && /^\d+$/.test(value))
+        return BigInt(value);
+    return null;
+}
+function unwrap(body) {
+    if (typeof body !== "object" || body === null)
+        return null;
+    const record = body;
+    if (typeof record.data === "object" && record.data !== null) {
+        return record.data;
+    }
+    return record;
+}
+function stringField(record, key) {
+    const value = record?.[key];
+    return typeof value === "string" ? value : null;
+}
+//# sourceMappingURL=delete-data-port.js.map

package/dist/sync/delete-data-port.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"delete-data-port.js","sourceRoot":"","sources":["../../src/sync/delete-data-port.ts"],"names":[],"mappings":"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"}

package/dist/sync/engine/sync-manager.d.ts

@@ -1,6 +1,8 @@
 import type { UploadWorkerDeps } from "../workers/upload.js";
 import type { DownloadWorkerDeps } from "../workers/download.js";
 import type { SyncStatus } from "../types.js";
+import { type DeleteScopeResult } from "../workers/delete.js";
+import type { DeleteDataPort, PendingBlobDeletionStore } from "../../ports/index.js";
 export interface SyncManagerOptions {
     /** Polling interval in milliseconds (default: 60_000 = 1 minute) */
     pollInterval?: number;
@@ -10,6 +12,13 @@ export interface SyncManagerOptions {
     notifyDebounceMs?: number;
     /** Optional runtime gate. Returning blocked skips upload/download without an error. */
     canSync?: () => Promise<SyncCanRunResult> | SyncCanRunResult;
+    /**
+     * Remote deletion (gateway tombstone + storage blobs). Without it
+     * `deleteScope` is local-only and reports `durable: false`.
+     */
+    deleteData?: DeleteDataPort | null;
+    /** Durable retry marker for blob deletions that failed after the tombstone. */
+    pendingBlobDeletions?: PendingBlobDeletionStore;
 }
 export type SyncCanRunResult = {
     ok: true;
@@ -30,11 +39,12 @@ export interface SyncManager {
     /** Signal that new data has been ingested (next cycle picks it up) */
     notifyNewData(): void;
     /**
-     * Propagate a scope deletion to the authoritative stores (R2 blobs + gateway file records).
-     * Call BEFORE deleting the scope locally — it reads the local index to find what to remove.
-     * Best-effort: resolves with a summary; per-file failures are logged, not thrown.
+     * Durable scope deletion: gateway tombstone, then storage blobs, then the
+     * local copy (see workers/delete.ts for why that order is the only safe
+     * one). Resolves with a per-step result; a gateway failure leaves the
+     * local copy in place and is reported as `steps.gateway.status = "failed"`.
      */
-    deleteScopeRemote(scope: string): Promise<void>;
+    deleteScope(scope: string): Promise<DeleteScopeResult>;
     /** Whether the sync manager is currently running */
     readonly running: boolean;
 }

package/dist/sync/engine/sync-manager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sync-manager.d.ts","sourceRoot":"","sources":["../../../src/sync/engine/sync-manager.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAC7D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AACjE,OAAO,KAAK,EAAE,UAAU,EAAgC,MAAM,aAAa,CAAC;AAM5E,MAAM,WAAW,kBAAkB;IACjC,oEAAoE;IACpE,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,oDAAoD;IACpD,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,sEAAsE;IACtE,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,uFAAuF;IACvF,OAAO,CAAC,EAAE,MAAM,OAAO,CAAC,gBAAgB,CAAC,GAAG,gBAAgB,CAAC;CAC9D;AAED,MAAM,MAAM,gBAAgB,GAC1B;IAAE,EAAE,EAAE,IAAI,CAAA;CAAE,GAAG;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC;AAEhE,MAAM,WAAW,WAAW;IAC1B,qCAAqC;IACrC,KAAK,IAAI,IAAI,CAAC;IAEd,+CAA+C;IAC/C,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAEtB,mDAAmD;IACnD,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAEzB,8BAA8B;IAC9B,SAAS,IAAI,UAAU,CAAC;IAExB,sEAAsE;IACtE,aAAa,IAAI,IAAI,CAAC;IAEtB;;;;OAIG;IACH,iBAAiB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAEhD,oDAAoD;IACpD,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;CAC3B;AAID,wBAAgB,iBAAiB,CAC/B,UAAU,EAAE,gBAAgB,EAC5B,YAAY,EAAE,kBAAkB,EAChC,OAAO,CAAC,EAAE,kBAAkB,GAC3B,WAAW,CA2Nb"}
+{"version":3,"file":"sync-manager.d.ts","sourceRoot":"","sources":["../../../src/sync/engine/sync-manager.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAC7D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AACjE,OAAO,KAAK,EAAE,UAAU,EAAgC,MAAM,aAAa,CAAC;AAG5E,OAAO,EAGL,KAAK,iBAAiB,EACvB,MAAM,sBAAsB,CAAC;AAE9B,OAAO,KAAK,EACV,cAAc,EACd,wBAAwB,EACzB,MAAM,sBAAsB,CAAC;AAE9B,MAAM,WAAW,kBAAkB;IACjC,oEAAoE;IACpE,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,oDAAoD;IACpD,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,sEAAsE;IACtE,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,uFAAuF;IACvF,OAAO,CAAC,EAAE,MAAM,OAAO,CAAC,gBAAgB,CAAC,GAAG,gBAAgB,CAAC;IAC7D;;;OAGG;IACH,UAAU,CAAC,EAAE,cAAc,GAAG,IAAI,CAAC;IACnC,+EAA+E;IAC/E,oBAAoB,CAAC,EAAE,wBAAwB,CAAC;CACjD;AAED,MAAM,MAAM,gBAAgB,GAC1B;IAAE,EAAE,EAAE,IAAI,CAAA;CAAE,GAAG;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC;AAEhE,MAAM,WAAW,WAAW;IAC1B,qCAAqC;IACrC,KAAK,IAAI,IAAI,CAAC;IAEd,+CAA+C;IAC/C,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAEtB,mDAAmD;IACnD,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAEzB,8BAA8B;IAC9B,SAAS,IAAI,UAAU,CAAC;IAExB,sEAAsE;IACtE,aAAa,IAAI,IAAI,CAAC;IAEtB;;;;;OAKG;IACH,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC;IAEvD,oDAAoD;IACpD,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;CAC3B;AAID,wBAAgB,iBAAiB,CAC/B,UAAU,EAAE,gBAAgB,EAC5B,YAAY,EAAE,kBAAkB,EAChC,OAAO,CAAC,EAAE,kBAAkB,GAC3B,WAAW,CAoRb"}

package/dist/sync/engine/sync-manager.js

@@ -1,6 +1,6 @@
 import { uploadAll } from "../workers/upload.js";
 import { downloadAll } from "../workers/download.js";
-import { deleteScopeRemote } from "../workers/delete.js";
+import { deleteScope, retryPendingBlobDeletions, } from "../workers/delete.js";
 import { createDownloadRetryMemory } from "../retry-memory.js";
 const MAX_ERRORS = 10;
 export function createSyncManager(uploadDeps, downloadDeps, options) {
@@ -21,13 +21,36 @@ export function createSyncManager(uploadDeps, downloadDeps, options) {
     // attempted once per session, not once per cycle; transient storage errors
     // back off exponentially instead of re-firing on every cycle.
     const downloadRetryMemory = createDownloadRetryMemory();
+    const dataPointFeed = downloadDeps.dataPointFeed ?? uploadDeps.dataPointFeed;
+    const scopeDeletions = uploadDeps.scopeDeletions ?? downloadDeps.scopeDeletions;
+    // The upload worker queues guarded cleanup for ciphertext it had to
+    // abandon mid-race; it shares the manager's marker store.
+    const workerUploadDeps = {
+        ...uploadDeps,
+        pendingBlobDeletions: uploadDeps.pendingBlobDeletions ?? options?.pendingBlobDeletions,
+    };
+    const workerDownloadDeps = {
+        ...downloadDeps,
+        pendingBlobDeletions: downloadDeps.pendingBlobDeletions ?? options?.pendingBlobDeletions,
+    };
+    // Sync cycles and durable deletes mutate the same local index and the same
+    // registry rows. Run them one at a time (FIFO): a delete cannot start while
+    // an upload of the same scope is between "blob uploaded" and "row marked
+    // synced", and a cycle cannot start until a delete has finished all three
+    // steps. A rejected operation never blocks the ones queued behind it.
+    let mutationQueue = Promise.resolve();
+    function exclusive(operation) {
+        const run = mutationQueue.then(operation, operation);
+        mutationQueue = run.catch(() => undefined);
+        return run;
+    }
     async function runCycle() {
         // Prevent concurrent cycles
         if (cycleInFlight) {
             rerunRequested = true;
             return cycleInFlight;
         }
-        cycleInFlight = (async () => {
+        cycleInFlight = exclusive(async () => {
             do {
                 rerunRequested = false;
                 const canRun = await (options?.canSync?.() ?? { ok: true });
@@ -37,9 +60,24 @@ export function createSyncManager(uploadDeps, downloadDeps, options) {
                     continue;
                 }
                 blocked = null;
+                // Finish blob deletions whose tombstone landed but whose storage
+                // DELETE did not. Cheap when nothing is pending; never blocks sync.
+                try {
+                    await retryPendingBlobDeletions({
+                        deleteData: options?.deleteData,
+                        pendingBlobDeletions: options?.pendingBlobDeletions,
+                        dataPointFeed,
+                        serverOwner: uploadDeps.serverOwner,
+                        storage: uploadDeps.storage,
+                        logger: uploadDeps.logger,
+                    });
+                }
+                catch (err) {
+                    uploadDeps.logger.warn({ error: err.message }, "Pending blob deletion retry failed");
+                }
                 try {
                     // Upload unsynced local files
-                    const uploadResults = await uploadAll(uploadDeps, {
+                    const uploadResults = await uploadAll(workerUploadDeps, {
                         batchSize: uploadBatchSize,
                         onError(entry, error) {
                             pushError({
@@ -65,7 +103,7 @@ export function createSyncManager(uploadDeps, downloadDeps, options) {
                 try {
                     // Download new remote files
                     const fullReconcile = needsFullReconcile;
-                    const downloadResults = await downloadAll(downloadDeps, {
+                    const downloadResults = await downloadAll(workerDownloadDeps, {
                         fullReconcile,
                         retryMemory: downloadRetryMemory,
                     });
@@ -91,7 +129,7 @@ export function createSyncManager(uploadDeps, downloadDeps, options) {
                 }
                 lastSync = new Date().toISOString();
             } while (rerunRequested && isRunning);
-        })();
+        });
         try {
             await cycleInFlight;
         }
@@ -187,9 +225,16 @@ export function createSyncManager(uploadDeps, downloadDeps, options) {
             uploadDeps.logger.debug("New data notification received");
             scheduleNotifiedCycle();
         },
-        async deleteScopeRemote(scope) {
-            // Reuses the upload worker's remote deps (gateway, storage adapter, signer, owner).
-            await deleteScopeRemote(uploadDeps, scope);
+        deleteScope(scope) {
+            return exclusive(() => deleteScope({
+                storage: uploadDeps.storage,
+                serverOwner: uploadDeps.serverOwner,
+                deleteData: options?.deleteData,
+                pendingBlobDeletions: options?.pendingBlobDeletions,
+                scopeDeletions,
+                dataPointFeed,
+                logger: uploadDeps.logger,
+            }, scope));
         },
     };
     return manager;

package/dist/sync/engine/sync-manager.js.map

@@ -1 +1 @@
-{"version":3,"file":"sync-manager.js","sourceRoot":"","sources":["../../../src/sync/engine/sync-manager.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"sync-manager.js","sourceRoot":"","sources":["../../../src/sync/engine/sync-manager.ts"],"names":[],"mappings":"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"}