@opendatalabs/personal-server-ts-server 1.34.1 → 1.34.2

package/dist/ui/ps-lite-debug.js

@@ -93745,10 +93745,6 @@ function withLegacyProjection(raw, options = {}) {
       return view ? (await builtBlocks(scope, view)).manifest : rawManifest(scope, collectedAt);
     };
   }
-  if (raw.hasScopeBlocks) {
-    const rawHas = raw.hasScopeBlocks.bind(raw);
-    overrides.hasScopeBlocks = async (scope, collectedAt) => await rawHas(scope, collectedAt) || await projected(scope, collectedAt) !== null;
-  }
   if (raw.canReadScopeBlocks) {
     const rawCan = raw.canReadScopeBlocks.bind(raw);
     overrides.canReadScopeBlocks = async (scope, collectedAt) => await rawCan(scope, collectedAt) || await projected(scope, collectedAt) !== null;
@@ -117422,6 +117418,27 @@ function isTombstoneRecord(record2) {
 var DEFAULT_SCOPE_DELETION_MAX_STALENESS_MS = 12e4;
 var DEFAULT_SCOPE_DELETION_GATEWAY_RETRY_MS = 15e3;
 var DEFAULT_MAX_LIVE_ENTRIES = 1e4;
+var DeletionLookupTimeout = class extends Error {
+};
+async function beforeDeadline(request2, timeoutMs, onTimeout) {
+  if (timeoutMs === void 0)
+    return request2;
+  let timer;
+  try {
+    return await Promise.race([
+      request2,
+      new Promise((_11, reject) => {
+        timer = setTimeout(() => {
+          reject(new DeletionLookupTimeout("Deletion lookup deadline exceeded"));
+          onTimeout?.();
+        }, timeoutMs);
+      })
+    ]);
+  } finally {
+    if (timer !== void 0)
+      clearTimeout(timer);
+  }
+}
 function createScopeDeletionTracker(options = {}) {
   const maxStalenessMs = options.maxStalenessMs ?? DEFAULT_SCOPE_DELETION_MAX_STALENESS_MS;
   const gatewayRetryMs = options.gatewayRetryMs ?? DEFAULT_SCOPE_DELETION_GATEWAY_RETRY_MS;
@@ -117494,24 +117511,32 @@ function createScopeDeletionTracker(options = {}) {
     rememberLive(scope, nowMs2());
     return { deleted: false, source: "gateway", verified: true };
   }
-  async function lookup2(scope) {
+  async function lookup2(scope, timeoutMs) {
     const feed = options.feed;
     const owner = options.serverOwner;
-    if (!feed || !owner)
+    if (!feed || !owner || timeoutMs !== void 0 && timeoutMs <= 0)
       return null;
     if (lastGatewayFailureMs !== null && nowMs2() - lastGatewayFailureMs < gatewayRetryMs) {
       return null;
     }
     const pending = inflight.get(scope);
-    if (pending)
-      return pending;
+    if (pending) {
+      return beforeDeadline(pending, timeoutMs).catch((error51) => {
+        if (error51 instanceof DeletionLookupTimeout)
+          return null;
+        throw error51;
+      });
+    }
+    const deletionAtStart = deleted.get(scope);
     const request2 = (async () => {
       let record2;
+      const controller = timeoutMs === void 0 ? void 0 : new AbortController();
       try {
-        record2 = await feed.getDataPoint({
+        record2 = await beforeDeadline(feed.getDataPoint({
           ownerAddress: owner,
-          scope
-        });
+          scope,
+          ...controller ? { signal: controller.signal } : {}
+        }), timeoutMs, () => controller?.abort());
         lastGatewayFailureMs = null;
       } catch (err2) {
         lastGatewayFailureMs = nowMs2();
@@ -117522,11 +117547,23 @@ function createScopeDeletionTracker(options = {}) {
         }, "Could not check gateway deletion state; serving last known state");
         return null;
       }
+      if (deleted.get(scope) !== deletionAtStart)
+        return lastKnownVerdict(scope);
       return verdictFromRecord(scope, record2);
     })().finally(() => inflight.delete(scope));
     inflight.set(scope, request2);
     return request2;
   }
+  function lastKnownVerdict(scope) {
+    const known = deleted.get(scope);
+    return known ? {
+      deleted: true,
+      deletedAt: known.deletedAt,
+      version: known.version,
+      source: known.source,
+      verified: false
+    } : { deleted: false, source: "assumed-live", verified: false };
+  }
   return {
     maxStalenessMs,
     deletionHistory,
@@ -117565,16 +117602,10 @@ function createScopeDeletionTracker(options = {}) {
             verified: true
           };
         }
-        const rechecked = await lookup2(scope);
+        const rechecked = await lookup2(scope, resolveOptions?.gatewayTimeoutMs);
         if (rechecked !== null)
           return rechecked;
-        return {
-          deleted: true,
-          deletedAt: known.deletedAt,
-          version: known.version,
-          source: known.source,
-          verified: false
-        };
+        return lastKnownVerdict(scope);
       }
       if (isFresh(live.get(scope) ?? null)) {
         return { deleted: false, source: "gateway", verified: true };
@@ -117583,11 +117614,7 @@ function createScopeDeletionTracker(options = {}) {
       if (consult === "if-stale" && isFresh(lastFeedSyncMs)) {
         return { deleted: false, source: "feed", verified: true };
       }
-      return await lookup2(scope) ?? {
-        deleted: false,
-        source: "assumed-live",
-        verified: false
-      };
+      return await lookup2(scope, resolveOptions?.gatewayTimeoutMs) ?? lastKnownVerdict(scope);
     }
   };
 }
@@ -118655,11 +118682,12 @@ async function parseProducerProvenance(encoded, body) {
     return errorResponse(400, "INVALID_PROVENANCE", "Vana-Producer-Provenance is not base64url JSON");
   }
 }
-async function resolveReadDeletion(deps, scope, entry, body = "file") {
+async function resolveReadDeletion(deps, scope, entry, body = "file", gatewayTimeoutMs) {
   if (!deps.scopeDeletions)
     return null;
   const verdict = await deps.scopeDeletions.resolve(scope, {
-    consultGateway: entry ? "if-stale" : "always"
+    consultGateway: entry ? "if-stale" : "always",
+    ...gatewayTimeoutMs === void 0 ? {} : { gatewayTimeoutMs }
   });
   const tombstone = body === "canonical" ? deps.scopeDeletions.deletionHistory?.get(scope) ?? (verdict.deleted ? verdict : null) : verdict.deleted ? verdict : null;
   if (!tombstone)
@@ -118683,8 +118711,8 @@ function discoveryVisibility(deps) {
     return void 0;
   return async (scope, entry) => await resolveReadDeletion(deps, scope, entry) === null;
 }
-function listingVisibility(deps) {
-  const deletion = discoveryVisibility(deps);
+function listingVisibility(deps, deadlineAtMs) {
+  const deletion = deps.scopeDeletions ? async (scope, entry) => await resolveReadDeletion(deps, scope, entry, "file", Math.max(0, deadlineAtMs - Date.now())) === null : void 0;
   const view = deps.legacyScopeView;
   if (!view)
     return deletion;
@@ -118693,10 +118721,10 @@ function listingVisibility(deps) {
     if (listing.kind === "refused")
       return false;
     const canonicalOwned = view.ownsScope(scope);
-    return await resolveReadDeletion(deps, scope, canonicalOwned ? void 0 : entry, canonicalOwned ? "canonical" : "file") === null;
+    return await resolveReadDeletion(deps, scope, canonicalOwned ? void 0 : entry, canonicalOwned ? "canonical" : "file", Math.max(0, deadlineAtMs - Date.now())) === null;
   };
 }
-function canonicalOnlyScopes(deps) {
+function canonicalOnlyScopes(deps, deadlineAtMs) {
   const view = deps.legacyScopeView;
   if (!view)
     return void 0;
@@ -118705,7 +118733,7 @@ function canonicalOnlyScopes(deps) {
     for (const { scope, collectedAt } of view.listCanonicalScopes(scopePrefix)) {
       if (stored.has(scope))
         continue;
-      if (await resolveReadDeletion(deps, scope, void 0, "canonical") !== null) {
+      if (await resolveReadDeletion(deps, scope, void 0, "canonical", Math.max(0, deadlineAtMs - Date.now())) !== null) {
         continue;
       }
       listed.push({ scope, latestCollectedAt: collectedAt, versionCount: 0 });
@@ -118907,14 +118935,15 @@ async function handlePersonalServerDataRequest(request2, deps, options = {}) {
       const listAuth = await deps.auth.authorizeBuilderList(request2, {
         grantId: selectedGrantId(request2, url2)
       });
+      const deletionDeadlineAtMs = Date.now() + 250;
       const result = await listDataScopesContract({
         storage: deps.storage,
         scopePrefix: url2.searchParams.get("scopePrefix") ?? void 0,
         limit: normalizeLimit2(url2.searchParams.get("limit"), 20),
         offset: normalizeLimit2(url2.searchParams.get("offset"), 0),
-        isVisible: listingVisibility(deps),
+        isVisible: listingVisibility(deps, deletionDeadlineAtMs),
         isListable: (scope) => !isSystemScope(scope) && (!listAuth || listAuthCovers(listAuth, scope)),
-        extraScopes: canonicalOnlyScopes(deps)
+        extraScopes: canonicalOnlyScopes(deps, deletionDeadlineAtMs)
       });
       return jsonResponse({
         ...result.response,
@@ -120628,6 +120657,7 @@ function normalizeState(state) {
       schemaId: entry.schemaId ?? null
     })),
     envelopes: state.envelopes,
+    readyBlockManifests: state.readyBlockManifests ?? [],
     blockManifests: state.blockManifests ?? [],
     blockPayloads: state.blockPayloads ?? [],
     ...state.pendingLedgerDeletes?.length ? { pendingLedgerDeletes: state.pendingLedgerDeletes } : {}
@@ -120877,6 +120907,10 @@ async function createPersistentPsLiteStorage(adapter, persistence = createIndexe
     envelope
   ]));
   const fallbackBlockManifests = new Map((state.blockManifests ?? []).map(({ path, manifest }) => [path, manifest]));
+  const readyBlockManifests = /* @__PURE__ */ new Set([
+    ...state.readyBlockManifests ?? [],
+    ...fallbackBlockManifests.keys()
+  ]);
   const fallbackBlockPayloads = new Map((state.blockPayloads ?? []).map(({ path, block }) => [path, block]));
   const ledgerAux = (scope) => `first-seen:${scope}`;
   const firstSeenLedgers = /* @__PURE__ */ new Map();
@@ -120892,6 +120926,7 @@ async function createPersistentPsLiteStorage(adapter, persistence = createIndexe
   async function persist() {
     const snapshot = {
       ...state,
+      readyBlockManifests: Array.from(readyBlockManifests),
       envelopes: fileStore.kind === "indexeddb" ? Array.from(fallbackEnvelopes.values()) : [],
       blockManifests: Array.from(fallbackBlockManifests.entries()).map(([path, manifest]) => ({ path, manifest })),
       blockPayloads: Array.from(fallbackBlockPayloads.entries()).map(([path, block]) => ({ path, block })),
@@ -121054,7 +121089,7 @@ async function createPersistentPsLiteStorage(adapter, persistence = createIndexe
       return await fileStore.readBlockManifest?.(manifestPath) ?? (fileStore === fallbackStore ? null : await fallbackStore.readBlockManifest?.(manifestPath)) ?? null;
     },
     async hasScopeBlocks(scope, collectedAt) {
-      return Boolean(await storagePort.readBlockManifest?.(scope, collectedAt));
+      return readyBlockManifests.has(blockManifestPath(scope, collectedAt));
     },
     async canReadScopeBlocks(scope, collectedAt) {
       if (await storagePort.hasScopeBlocks?.(scope, collectedAt)) {
@@ -121068,6 +121103,8 @@ async function createPersistentPsLiteStorage(adapter, persistence = createIndexe
       return Boolean(envelope);
     },
     async writeBlockManifest(scope, collectedAt, manifest, blocks) {
+      readyBlockManifests.delete(blockManifestPath(scope, collectedAt));
+      await persist();
       const writeTree = async (store) => {
         if (!store.writeBlockManifest || !store.writeBlockPayload) {
           throw new Error("Block sidecar storage is not available");
@@ -121098,6 +121135,7 @@ async function createPersistentPsLiteStorage(adapter, persistence = createIndexe
       if (wrotePrimary && fileStore.kind !== "indexeddb") {
         await fallbackStore.deleteBlockTree?.(blockTreePath(scope, collectedAt));
       }
+      readyBlockManifests.add(blockManifestPath(scope, collectedAt));
       await persist();
     },
     async insertEntry(entry) {
@@ -121195,6 +121233,10 @@ async function createPersistentPsLiteStorage(adapter, persistence = createIndexe
     deleteScope(scope) {
       return withScopeLock(scope, async () => {
         await dropLedger(scope);
+        for (const entry of entriesForScope(scope)) {
+          readyBlockManifests.delete(blockManifestPath(scope, entry.collectedAt));
+        }
+        await persist();
         let deleted = 0;
         const deletedPaths = [];
         const deletedBlockTrees = [];
@@ -121266,6 +121308,8 @@ async function createPersistentPsLiteStorage(adapter, persistence = createIndexe
   }
   async function removeEntryLocked(entry) {
     const blobPath = envelopePath(entry.scope, entry.collectedAt);
+    readyBlockManifests.delete(blockManifestPath(entry.scope, entry.collectedAt));
+    await persist();
     await Promise.all([
       fileStore.deleteEnvelope(blobPath),
       fallbackStore.deleteEnvelope(blobPath),
@@ -140164,6 +140208,7 @@ function createGatewayDataPointFeed(options) {
       const url2 = `${base}${uri}?includeDeleted=true`;
       const ownerSigner = isSystemScope(input.scope) ? options.ownerRequestSigner : void 0;
       const res = ownerSigner ? await fetchImpl(url2, {
+        ...input.signal ? { signal: input.signal } : {},
         headers: {
           Authorization: await ownerSigner.signRequest({
             aud: new URL(base).origin,
@@ -140171,7 +140216,7 @@ function createGatewayDataPointFeed(options) {
             uri
           })
         }
-      }) : await fetchImpl(url2);
+      }) : input.signal ? await fetchImpl(url2, { signal: input.signal }) : await fetchImpl(url2);
       if (res.status === 404)
         return null;
       if (res.status === 410) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opendatalabs/personal-server-ts-server",
-  "version": "1.34.1",
+  "version": "1.34.2",
   "description": "Hono HTTP server for the Vana Personal Server — routes, middleware, composition root",
   "license": "MIT",
   "repository": {
@@ -55,8 +55,8 @@
   },
   "dependencies": {
     "@hono/node-server": "^1.19.17",
-    "@opendatalabs/personal-server-ts-core": "1.34.1",
-    "@opendatalabs/personal-server-ts-lite": "1.34.1",
+    "@opendatalabs/personal-server-ts-core": "1.34.2",
+    "@opendatalabs/personal-server-ts-lite": "1.34.2",
     "@opendatalabs/vana-sdk": "3.23.0-pr.211.36da1d8",
     "ajv": "^8.20.0",
     "better-sqlite3": "^12.11.1",