@opendatalabs/personal-server-ts-server 1.35.4 → 1.36.0

package/dist/storage/import-operations.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"import-operations.d.ts","sourceRoot":"","sources":["../../src/storage/import-operations.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,QAAQ,MAAM,gBAAgB,CAAC;AAC3C,OAAO,KAAK,EAGV,aAAa,EACb,mBAAmB,EACpB,MAAM,6CAA6C,CAAC;AACrD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qDAAqD,CAAC;AACxF,OAAO,EAEL,KAAK,uBAAuB,EAC7B,MAAM,yDAAyD,CAAC;AAajE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6CAA6C,CAAC;AAmBhF,wBAAgB,sBAAsB,CACpC,EAAE,EAAE,QAAQ,CAAC,QAAQ,EACrB,KAAK,EAAE,YAAY,EACnB,OAAO,EAAE,uBAAuB;6BA6IrB,aAAa,KACrB,OAAO,CAAC,mBAAmB,CAAC;uBAiIV,MAAM,GAAG,MAAM;IAuBlC;;;;;;OAMG;+BAEM,MAAM,eACA,MAAM,SACZ,YAAY,GAClB,OAAO;IAkBV;;;;;OAKG;wCAEM,MAAM,eACA,MAAM,SACZ,YAAY,GAClB,OAAO;yBAyBD,MAAM,eACA,MAAM,gBACL,MAAM,GACnB,OAAO;4BAqBc,MAAM,GAAG,OAAO;EAS3C"}
+{"version":3,"file":"import-operations.d.ts","sourceRoot":"","sources":["../../src/storage/import-operations.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,QAAQ,MAAM,gBAAgB,CAAC;AAC3C,OAAO,KAAK,EAGV,aAAa,EACb,mBAAmB,EACpB,MAAM,6CAA6C,CAAC;AACrD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qDAAqD,CAAC;AACxF,OAAO,EAEL,KAAK,uBAAuB,EAC7B,MAAM,yDAAyD,CAAC;AAajE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6CAA6C,CAAC;AAmBhF,wBAAgB,sBAAsB,CACpC,EAAE,EAAE,QAAQ,CAAC,QAAQ,EACrB,KAAK,EAAE,YAAY,EACnB,OAAO,EAAE,uBAAuB;6BAyJrB,aAAa,KACrB,OAAO,CAAC,mBAAmB,CAAC;uBA8IV,MAAM,GAAG,MAAM;IAqClC;;;;;;OAMG;+BAEM,MAAM,eACA,MAAM,SACZ,YAAY,GAClB,OAAO;IAkBV;;;;;OAKG;wCAEM,MAAM,eACA,MAAM,SACZ,YAAY,GAClB,OAAO;yBAyBD,MAAM,eACA,MAAM,gBACL,MAAM,GACnB,OAAO;4BAqBc,MAAM,GAAG,OAAO;EAS3C"}

package/dist/storage/import-operations.js

@@ -3,7 +3,7 @@ import { buildDataFilePath, } from "@opendatalabs/personal-server-ts-core/storag
 import { ProtocolError } from "@opendatalabs/personal-server-ts-core/errors";
 import { IngestPersistedError } from "@opendatalabs/personal-server-ts-core/contracts";
 import { deleteDataFileSync, deleteFirstSeenLedgerSync, deleteScopeFilesSync, publishDataFile, PublishedDataFileError, snapshotScopeFiles, } from "./hierarchy.js";
-import { relative } from "node:path";
+import { relative, resolve } from "node:path";
 const keyWhere = "authority = @authority AND owner = @owner AND scope = @scope AND operation = @operation";
 export function createImportOperations(db, index, options) {
     const immediate = (run) => db.transaction(run).immediate();
@@ -27,51 +27,66 @@ export function createImportOperations(db, index, options) {
                 : undefined);
         }
     }
-    function recover() {
+    function recover(own, replicaPath) {
         const rows = db
             .prepare("SELECT * FROM owner_import_operations WHERE state = 'prepared' OR (state IN ('deleted', 'cancelled') AND metadata_json IS NOT NULL) ORDER BY rowid")
             .all();
         for (const row of rows) {
-            if (row.state !== "prepared") {
-                deleteDataFileSync(options, row.scope, row.collected_at, row.operation);
-                index.deleteByPath(row.path);
-                db.prepare(`UPDATE owner_import_operations SET envelope_bytes = NULL, metadata_json = NULL WHERE ${keyWhere}`).run(row);
-                continue;
+            try {
+                recoverRow(row);
             }
-            const bytes = row.envelope_bytes;
-            const envelope = JSON.parse(bytes.toString("utf8"));
-            const metadata = JSON.parse(row.metadata_json);
-            const written = publishDataFile(options, envelope, bytes, row.operation);
-            let entry = index.findByPath(row.path);
-            if (!entry) {
-                const inserted = index.insertIfCurrent({
-                    fileId: null,
-                    schemaId: null,
-                    path: row.path,
-                    scope: row.scope,
-                    collectedAt: row.collected_at,
-                    sizeBytes: metadata.sizeBytes ?? written.sizeBytes,
-                    afterTombstoneVersion: metadata.afterTombstoneVersion ?? null,
-                });
-                if (!inserted.ok) {
-                    // The index closed this scope for writes (history unknown). Fail
-                    // closed like an ordinary write: drop the unacknowledged operation
-                    // so the caller can retry once the scope is repaired.
-                    deleteDataFileSync(options, row.scope, row.collected_at, row.operation);
-                    db.prepare(`DELETE FROM owner_import_operations WHERE ${keyWhere}`).run(row);
-                    continue;
+            catch (error) {
+                if (row.path === replicaPath ||
+                    (own &&
+                        row.scope === own.scope &&
+                        row.authority === own.authority &&
+                        row.owner === own.owner &&
+                        row.operation === own.operation)) {
+                    throw error;
                 }
-                entry = inserted.entry;
             }
-            const receipt = {
-                operation: row.operation,
-                bodySha256: row.body_sha256,
+        }
+    }
+    function recoverRow(row) {
+        if (row.state !== "prepared") {
+            deleteDataFileSync(options, row.scope, row.collected_at, row.operation);
+            index.deleteByPath(row.path);
+            db.prepare(`UPDATE owner_import_operations SET envelope_bytes = NULL, metadata_json = NULL WHERE ${keyWhere}`).run(row);
+            return;
+        }
+        const bytes = row.envelope_bytes;
+        const envelope = JSON.parse(bytes.toString("utf8"));
+        const metadata = JSON.parse(row.metadata_json);
+        const written = publishDataFile(options, envelope, bytes, row.operation);
+        let entry = index.findByPath(row.path);
+        if (!entry) {
+            const inserted = index.insertIfCurrent({
+                fileId: null,
+                schemaId: null,
+                path: row.path,
                 scope: row.scope,
-                collectedAt: entry.collectedAt,
-                acceptedAt: new Date().toISOString(),
-            };
-            db.prepare(`UPDATE owner_import_operations SET state = 'accepted', receipt_json = @receipt, envelope_bytes = NULL, metadata_json = NULL WHERE ${keyWhere}`).run({ ...row, receipt: JSON.stringify(receipt) });
+                collectedAt: row.collected_at,
+                sizeBytes: metadata.sizeBytes ?? written.sizeBytes,
+                afterTombstoneVersion: metadata.afterTombstoneVersion ?? null,
+            });
+            if (!inserted.ok) {
+                // The index closed this scope for writes (history unknown). Fail
+                // closed like an ordinary write: drop the unacknowledged operation
+                // so the caller can retry once the scope is repaired.
+                deleteDataFileSync(options, row.scope, row.collected_at, row.operation);
+                db.prepare(`DELETE FROM owner_import_operations WHERE ${keyWhere}`).run(row);
+                return;
+            }
+            entry = inserted.entry;
         }
+        const receipt = {
+            operation: row.operation,
+            bodySha256: row.body_sha256,
+            scope: row.scope,
+            collectedAt: entry.collectedAt,
+            acceptedAt: new Date().toISOString(),
+        };
+        db.prepare(`UPDATE owner_import_operations SET state = 'accepted', receipt_json = @receipt, envelope_bytes = NULL, metadata_json = NULL WHERE ${keyWhere}`).run({ ...row, receipt: JSON.stringify(receipt) });
     }
     function reserve(envelope) {
         // Ordinary writes keep a scope's collectedAt strictly increasing (see
@@ -102,7 +117,7 @@ export function createImportOperations(db, index, options) {
             const admitted = immediate(() => {
                 const prior = find(command.envelope.scope, intent);
                 check(prior, intent);
-                recover();
+                recover(key(command.envelope.scope, intent));
                 if (prior)
                     return false;
                 const envelope = reserve(command.envelope);
@@ -119,7 +134,7 @@ export function createImportOperations(db, index, options) {
                 return true;
             });
             const published = immediate(() => {
-                recover();
+                recover(key(command.envelope.scope, intent));
                 const row = find(command.envelope.scope, intent);
                 // recover() dropped the operation: the scope is closed for writes.
                 // Report it after the drop commits; a throw here would roll it back.
@@ -154,7 +169,10 @@ export function createImportOperations(db, index, options) {
         let publishedPath;
         try {
             return immediate(() => {
-                recover();
+                // A replica cannot reuse a path still owned by failed import cleanup.
+                recover(undefined, command.kind === "replica"
+                    ? relative(options.dataDir, buildDataFilePath(options.dataDir, command.envelope.scope, command.envelope.collectedAt))
+                    : undefined);
                 const envelope = command.kind === "append"
                     ? reserve(command.envelope)
                     : command.envelope;
@@ -219,7 +237,17 @@ export function createImportOperations(db, index, options) {
             });
             return immediate(() => {
                 recover();
-                deleteScopeFilesSync(snapshot.files);
+                // A replica can reuse a captured path between these transactions.
+                const captured = new Set(snapshot.entries.map(({ id }) => id));
+                const later = new Set(db
+                    .prepare("SELECT id, path FROM data_files WHERE scope = ?")
+                    .all(scope)
+                    .filter(({ id }) => !captured.has(id))
+                    .map(({ path }) => resolve(options.dataDir, path)));
+                deleteScopeFilesSync({
+                    ...snapshot.files,
+                    files: snapshot.files.files.filter((file) => !later.has(file)),
+                });
                 const remove = db.prepare("DELETE FROM data_files WHERE id = @id AND path = @path");
                 for (const entry of snapshot.entries)
                     remove.run(entry);

package/dist/storage/import-operations.js.map

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

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

@@ -123780,14 +123780,14 @@ function parsePayload(value) {
     grantId: payload["grantId"]
   };
 }
-function parseWeb3SignedHeader(headerValue) {
-  if (!headerValue) {
+function parseWeb3SignedHeader(headerValue2) {
+  if (!headerValue2) {
     throw new MissingAuthError();
   }
-  if (!headerValue.startsWith(WEB3_SIGNED_PREFIX)) {
+  if (!headerValue2.startsWith(WEB3_SIGNED_PREFIX)) {
     throw new InvalidSignatureError2({ reason: "Missing Web3Signed prefix" });
   }
-  const value = headerValue.slice(WEB3_SIGNED_PREFIX.length);
+  const value = headerValue2.slice(WEB3_SIGNED_PREFIX.length);
   const dotIndex = value.indexOf(".");
   if (dotIndex === -1 || dotIndex === 0 || dotIndex === value.length - 1) {
     throw new InvalidSignatureError2({ reason: "Invalid header format" });
@@ -146023,8 +146023,8 @@ function canonicalJsonBytes(value) {
 // ../core/dist/auth/proof-id.js
 var MAX_PROOF_LIFETIME_SEC = 15 * 60;
 var PROOF_CLOCK_SKEW_SEC = 60;
-async function web3SignedProofId(headerValue, signer) {
-  const { payloadBase64 } = parseWeb3SignedHeader(headerValue);
+async function web3SignedProofId(headerValue2, signer) {
+  const { payloadBase64 } = parseWeb3SignedHeader(headerValue2);
   const bytes2 = new TextEncoder().encode(`${signer.toLowerCase()}
 ${payloadBase64}`);
   const digest6 = await crypto.subtle.digest("SHA-256", bytes2);
@@ -146113,8 +146113,8 @@ async function signedBytesFor(request2, bodyBytes) {
   });
 }
 async function verifyWriterAttribution(input) {
-  const headerValue = input.request.headers.get(WRITE_SIGNATURE_HEADER) ?? void 0;
-  if (!headerValue) {
+  const headerValue2 = input.request.headers.get(WRITE_SIGNATURE_HEADER) ?? void 0;
+  if (!headerValue2) {
     throw new ProtocolError(401, "WRITE_ATTRIBUTION_REQUIRED", `Session writes must carry a builder-signed payload proof in ${WRITE_SIGNATURE_HEADER}`);
   }
   const url2 = new URL(input.request.url);
@@ -146122,7 +146122,7 @@ async function verifyWriterAttribution(input) {
   const expectedUri = canonicalSignedUri(url2.pathname, url2.search);
   let expectedPath = expectedUri;
   try {
-    const claimedUri = parseWeb3SignedHeader(headerValue).payload.uri;
+    const claimedUri = parseWeb3SignedHeader(headerValue2).payload.uri;
     if (canonicalizeSignedUri(claimedUri) === expectedUri) {
       expectedPath = claimedUri;
     }
@@ -146131,7 +146131,7 @@ async function verifyWriterAttribution(input) {
   let verified;
   try {
     verified = await verifyWeb3Signed({
-      headerValue,
+      headerValue: headerValue2,
       expectedOrigin: resolveOrigin(input.serverOrigin),
       expectedMethod: input.request.method,
       expectedPath,
@@ -146147,7 +146147,7 @@ async function verifyWriterAttribution(input) {
     throw new ProtocolError(401, "WRITE_ATTRIBUTION_GRANT_MISMATCH", "Payload proof must carry the write session's grantId as a signed claim", { expected: input.grantId, actual: verified.payload.grantId ?? null });
   }
   const expiresAtMs = boundedProofExpiry(verified.payload, "WRITE_ATTRIBUTION_LIFETIME");
-  const { payloadBase64, signature } = parseWeb3SignedHeader(headerValue);
+  const { payloadBase64, signature } = parseWeb3SignedHeader(headerValue2);
   const nonce = signedNonce(payloadBase64);
   if (!isBodylessMethod(input.request.method) && bodyBytes.byteLength > 0 && isJsonContentType(input.request)) {
     assertCanonicalJsonBody(bodyBytes);
@@ -146155,7 +146155,7 @@ async function verifyWriterAttribution(input) {
   let releaseProof;
   if (input.replayStore) {
     const store = input.replayStore;
-    const proofId = nonce === void 0 ? await web3SignedProofId(headerValue, verified.signer) : await hashConnectionToken(`nonce:${input.builderAddress.toLowerCase()}:${nonce}`);
+    const proofId = nonce === void 0 ? await web3SignedProofId(headerValue2, verified.signer) : await hashConnectionToken(`nonce:${input.builderAddress.toLowerCase()}:${nonce}`);
     const replayed = await store.consume(proofId, expiresAtMs);
     if (replayed) {
       throw new ProtocolError(401, "WRITE_ATTRIBUTION_REPLAY", nonce === void 0 ? "Payload proof already used; sign a fresh proof for each call (or add a unique nonce claim so repeated reads stay distinct)" : "Payload proof nonce already used; each nonce is single use");
@@ -147395,10 +147395,10 @@ function decodeBase64(input) {
   }
   throw new Error("Base64 decoding is not available in this runtime");
 }
-function parseOAuthBasicAuth(headerValue) {
-  if (!headerValue?.startsWith("Basic "))
+function parseOAuthBasicAuth(headerValue2) {
+  if (!headerValue2?.startsWith("Basic "))
     return null;
-  const decoded = decodeBase64(headerValue.slice(6));
+  const decoded = decodeBase64(headerValue2.slice(6));
   const separatorIndex = decoded.indexOf(":");
   if (separatorIndex === -1)
     return null;
@@ -149826,12 +149826,12 @@ function base64decode(input) {
   const bytes2 = Uint8Array.from(binString, (c10) => c10.codePointAt(0) ?? 0);
   return new TextDecoder().decode(bytes2);
 }
-function parsePaymentHeader(headerValue) {
-  if (!headerValue)
+function parsePaymentHeader(headerValue2) {
+  if (!headerValue2)
     return null;
   let decoded;
   try {
-    decoded = base64decode(headerValue.trim());
+    decoded = base64decode(headerValue2.trim());
   } catch {
     return null;
   }
@@ -150274,8 +150274,8 @@ async function handleX402Cycle(input) {
       now: deps.now
     });
   }
-  const headerValue = input.request.headers.get("x-payment");
-  const parsed = parsePaymentHeader(headerValue);
+  const headerValue2 = input.request.headers.get("x-payment");
+  const parsed = parsePaymentHeader(headerValue2);
   if (!parsed) {
     return { kind: "challenge", body: await buildFreshChallenge() };
   }
@@ -150792,6 +150792,37 @@ async function handlePersonalServerScopeUploadAppend(request2, deps, batch) {
     return handleScopeUploadRequest(request2, deps, parts, batch);
   });
 }
+var READ_GRANTEE_OBSERVER = /* @__PURE__ */ Symbol.for("@opendatalabs/personal-server-ts-core/read-grantee-observer");
+function attachPersonalServerReadGranteeObserver(request2, observer) {
+  Object.defineProperty(request2, READ_GRANTEE_OBSERVER, {
+    value: observer,
+    configurable: true
+  });
+}
+function readGranteeObserverOf(request2) {
+  const observer = request2[READ_GRANTEE_OBSERVER];
+  return typeof observer === "function" ? observer : void 0;
+}
+async function granteeRefFor(authResult) {
+  if (authResult?.grantId === "owner" || authResult?.grantId === "policy-bypass") {
+    return "owner";
+  }
+  const builder = authResult?.builder;
+  if (typeof builder !== "string" || !/^0x[0-9a-fA-F]{40}$/.test(builder)) {
+    return void 0;
+  }
+  const digest6 = await sha256Hex(new TextEncoder().encode(builder.toLowerCase()));
+  return digest6.slice(2, 14);
+}
+function notifyReadGrantee(request2, authResult) {
+  const observer = readGranteeObserverOf(request2);
+  if (!observer)
+    return;
+  try {
+    observer(granteeRefFor(authResult).catch(() => void 0));
+  } catch {
+  }
+}
 async function handlePersonalServerDataRequest(request2, deps, options = {}) {
   const logContext = {
     logger: deps.logger,
@@ -151029,6 +151060,7 @@ async function handlePersonalServerDataRequest(request2, deps, options = {}) {
         fileId: fileIdParam ?? selectedEntry?.fileId ?? void 0,
         at: atParam
       });
+      notifyReadGrantee(request2, authResult);
       const latest = fileIdParam === void 0 && atParam === void 0 && view === null ? await deps.legacyScopeView?.readLatest(scopeResult.scope) : void 0;
       const canonicalOwned = latest !== void 0 && deletionHistoryOf(latest) === "canonical";
       await assertScopeNotDeleted(deps, scopeResult.scope, canonicalOwned ? void 0 : selectedEntry, canonicalOwned ? "canonical" : "file");
@@ -151808,10 +151840,10 @@ function safeCompare(a10, b10) {
   }
   return diff === 0;
 }
-function getBearerToken(headerValue) {
-  if (!headerValue?.startsWith("Bearer "))
+function getBearerToken(headerValue2) {
+  if (!headerValue2?.startsWith("Bearer "))
     return null;
-  return headerValue.slice(7);
+  return headerValue2.slice(7);
 }
 async function cacheRequestBodyBytes(request2, maxBytes = DEFAULT_SIGNED_BODY_MAX_BYTES, consumeBody = false) {
   if (request2.method === "GET" || request2.method === "HEAD")
@@ -173915,6 +173947,9 @@ function buildRequest2(origin, bridgeRequest) {
 }
 async function handlePsLiteBridgeRequest(runtime, bridgeRequest, options = {}) {
   const request2 = buildRequest2(options.origin ?? "https://ps-lite.local", bridgeRequest);
+  if (options.onReadGrantee) {
+    attachPersonalServerReadGranteeObserver(request2, options.onReadGrantee);
+  }
   const response = await runtime.fetch(request2);
   const bytes2 = new Uint8Array(await response.arrayBuffer());
   return {
@@ -174562,8 +174597,9 @@ var DEFAULT_PUBLIC_SUFFIX2 = "34.16.49.200.sslip.io";
 var DEFAULT_ORIGIN = "https://ps-lite.local";
 var RELAY_CLOSE_SESSION_REPLACED = 1012;
 var HEARTBEAT_LATE_FIRE_FACTOR = 2;
-function psLiteRelayControlUrl(sessionId, controlUrl = DEFAULT_CONTROL_URL) {
-  return `${controlUrl.replace(/\/+$/, "")}/browser/${sessionId}`;
+function psLiteRelayControlUrl(sessionId, controlUrl = DEFAULT_CONTROL_URL, connTag) {
+  const base2 = `${controlUrl.replace(/\/+$/, "")}/browser/${sessionId}`;
+  return connTag ? `${base2}?tag=${encodeURIComponent(connTag)}` : base2;
 }
 function psLiteRelayPublicUrl(sessionId, publicSuffix = DEFAULT_PUBLIC_SUFFIX2) {
   return `https://${sessionId}.${publicSuffix.replace(/^\./, "")}`;
@@ -174603,7 +174639,146 @@ function startPsLiteRelayClient(options) {
   let unansweredPingSentAt;
   let lastHeartbeatCheckAt = 0;
   let heartbeatGraceUsed = false;
+  let connTag = randomConnTag();
   const log = (line) => options.logger?.(line);
+  const emitStatus = (status2, detail) => options.onStatus?.(status2, { ...detail, connTag });
+  const logHookError = (error51) => log(`relay read event hook failed: ${error51 instanceof Error ? error51.message : String(error51)}`);
+  const readQueue = [];
+  let readFlushTimer;
+  let droppedReadEvents = 0;
+  const flushReadEvents = () => {
+    readFlushTimer = void 0;
+    const batch = readQueue.splice(0);
+    const hook = options.onReadEvent;
+    if (closed || !hook)
+      return;
+    if (droppedReadEvents > 0) {
+      log(`relay read events dropped (queue full): ${droppedReadEvents}`);
+      droppedReadEvents = 0;
+    }
+    for (const produce of batch) {
+      void Promise.resolve().then(produce).then((event) => closed ? void 0 : hook(event)).catch(logHookError);
+    }
+  };
+  const dispatchReadEvent = (produce) => {
+    if (closed || !options.onReadEvent)
+      return;
+    if (readQueue.length >= MAX_QUEUED_READ_EVENTS) {
+      readQueue.shift();
+      droppedReadEvents += 1;
+    }
+    readQueue.push(produce);
+    readFlushTimer ??= setTimeout(flushReadEvents, 0);
+  };
+  const stopReadEvents = () => {
+    readQueue.length = 0;
+    if (readFlushTimer !== void 0) {
+      clearTimeout(readFlushTimer);
+      readFlushTimer = void 0;
+    }
+  };
+  const appVisibility = () => {
+    try {
+      const state = options.appVisibility ? options.appVisibility() : documentVisibility();
+      return state === "visible" || state === "hidden" ? state : "unknown";
+    } catch {
+      return "unknown";
+    }
+  };
+  const sampleHidden = (tracker) => {
+    const visibility = appVisibility();
+    if (visibility === "hidden")
+      tracker.hiddenDuring = true;
+    else if (visibility === "visible")
+      tracker.hiddenDuring ??= false;
+    return visibility;
+  };
+  const beginRead = (stream, request2) => {
+    const seq = stream.requestSeq;
+    stream.requestSeq += 1;
+    const scope = relayReadScope(request2);
+    if (scope === void 0)
+      return void 0;
+    const tracker = {
+      ids: {
+        readRef: `${stream.streamRef ?? crypto.randomUUID()}:${seq}`,
+        ...stream.streamRef ? { streamRef: stream.streamRef } : {},
+        connTag: stream.connTag,
+        scope,
+        method: request2.method.toUpperCase()
+      },
+      startedAt: Date.now(),
+      hiddenDuring: void 0,
+      done: false
+    };
+    const visibility = sampleHidden(tracker);
+    stream.activeRead = tracker;
+    const received = {
+      type: "ps_read_received",
+      at: tracker.startedAt,
+      ...tracker.ids,
+      appVisibility: visibility
+    };
+    dispatchReadEvent(() => received);
+    return tracker;
+  };
+  const finishRead = (tracker, result) => {
+    if (!tracker || tracker.done)
+      return;
+    tracker.done = true;
+    sampleHidden(tracker);
+    const finishedAt = Date.now();
+    const durationMs = Math.max(0, finishedAt - tracker.startedAt);
+    const hiddenDuring = tracker.hiddenDuring;
+    const emptyCheckBody = result.body && result.body.length <= EMPTY_CHECK_MAX_BYTES ? result.body : void 0;
+    const { status: status2, contentType, granteeRef: granteeRefPromise } = result;
+    const outcomeOrClassify = result.outcome;
+    const bytesOut = result.bytesOut ?? 0;
+    const gzip = result.gzip ?? false;
+    dispatchReadEvent(async () => {
+      const outcome = outcomeOrClassify === "classify" ? classifyReadOutcome(status2 ?? 0, emptyCheckBody, contentType) : outcomeOrClassify;
+      const granteeRef = validGranteeRef(granteeRefPromise ? await withTimeout3(granteeRefPromise, GRANTEE_REF_WAIT_MS) : void 0);
+      return {
+        type: "ps_read_finished",
+        at: finishedAt,
+        ...tracker.ids,
+        ...granteeRef ? { granteeRef } : {},
+        ...status2 !== void 0 ? { status: status2 } : {},
+        outcome,
+        bytesOut,
+        gzip,
+        durationMs,
+        ...hiddenDuring !== void 0 ? { hiddenDuring } : {}
+      };
+    });
+  };
+  const visibilityDocument = options.appVisibility ? void 0 : readVisibilityDocument();
+  const onVisibilityChange = () => {
+    if (visibilityDocument?.visibilityState !== "hidden")
+      return;
+    for (const stream of streams.values()) {
+      if (stream.activeRead && !stream.activeRead.done) {
+        stream.activeRead.hiddenDuring = true;
+      }
+    }
+  };
+  let visibilityListening = false;
+  if (visibilityDocument) {
+    try {
+      visibilityDocument.addEventListener("visibilitychange", onVisibilityChange);
+      visibilityListening = true;
+    } catch {
+    }
+  }
+  const stopVisibilityListener = () => {
+    if (!visibilityListening || !visibilityDocument)
+      return;
+    visibilityListening = false;
+    try {
+      visibilityDocument.removeEventListener("visibilitychange", onVisibilityChange);
+    } catch {
+    }
+  };
   const isLive = (stream) => !closed && !stream.closed && stream.socket === socket && socket.readyState === socket.OPEN && streams.get(stream.streamId) === stream;
   const sendText = (message, target = socket) => {
     if (!closed && target === socket && target.readyState === target.OPEN) {
@@ -174619,6 +174794,7 @@ function startPsLiteRelayClient(options) {
     if (stream.closed)
       return;
     stream.closed = true;
+    finishRead(stream.activeRead, { outcome: "stream_closed" });
     if (streams.get(stream.streamId) === stream) {
       streams.delete(stream.streamId);
       pendingStreamData.delete(stream.streamId);
@@ -174640,17 +174816,17 @@ function startPsLiteRelayClient(options) {
   };
   const writePlaintextResponse = (stream, responseBytes) => {
     if (!isLive(stream))
-      return;
+      return false;
     if (!stream.tls) {
       for (const chunk of chunks(responseBytes, RESPONSE_CHUNK_BYTES)) {
         sendData(stream, chunk);
       }
-      return;
+      return isLive(stream);
     }
     const responseChunks = chunks(responseBytes, RESPONSE_CHUNK_BYTES);
     for (let index2 = 0; index2 < responseChunks.length; index2 += 1) {
       if (!isLive(stream))
-        return;
+        return false;
       const step = stream.tls.writePlaintext(responseChunks[index2], index2 === responseChunks.length - 1);
       for (const chunk of chunks(step.tls, RESPONSE_CHUNK_BYTES)) {
         if (chunk.length > 0) {
@@ -174658,6 +174834,7 @@ function startPsLiteRelayClient(options) {
         }
       }
     }
+    return isLive(stream);
   };
   const drainHttpRequests = async (stream) => {
     while (isLive(stream)) {
@@ -174666,10 +174843,38 @@ function startPsLiteRelayClient(options) {
         return;
       }
       stream.plaintext = stream.plaintext.slice(parsed.consumedBytes);
-      const response = await handleRelayHttpRequest(options.runtime, parsed.request, origin);
-      if (!isLive(stream))
+      const read = beginRead(stream, parsed.request);
+      let relayed;
+      try {
+        relayed = await handleRelayHttpRequest(options.runtime, parsed.request, origin, Boolean(read));
+      } catch (error51) {
+        finishRead(read, { outcome: "handler_error" });
+        throw error51;
+      }
+      const { response } = relayed;
+      const finish = (outcome) => ({
+        outcome,
+        status: relayed.status,
+        granteeRef: relayed.granteeRef,
+        bytesOut: response.length,
+        gzip: relayed.gzip
+      });
+      if (!isLive(stream)) {
+        finishRead(read, { ...finish("stream_closed"), bytesOut: 0 });
         return;
-      writePlaintextResponse(stream, binaryToBytes(response));
+      }
+      let written;
+      try {
+        written = writePlaintextResponse(stream, binaryToBytes(response));
+      } catch (error51) {
+        finishRead(read, { ...finish("tls_error"), bytesOut: 0 });
+        throw error51;
+      }
+      finishRead(read, written ? {
+        ...finish("classify"),
+        body: relayed.plainBody,
+        contentType: relayed.contentType
+      } : finish("stream_closed"));
       closeStream(stream, "http_response_sent");
       return;
     }
@@ -174707,7 +174912,7 @@ function startPsLiteRelayClient(options) {
       closeStream(stream, "tls_error");
     }
   };
-  const openStream = async (streamId) => {
+  const openStream = async (streamId, streamRef) => {
     const previous = streams.get(streamId);
     if (previous)
       disposeStream(previous);
@@ -174717,7 +174922,10 @@ function startPsLiteRelayClient(options) {
       socket,
       closed: false,
       ready: !tls,
-      handling: false
+      handling: false,
+      ...streamRef ? { streamRef } : {},
+      connTag,
+      requestSeq: 0
     };
     streams.set(streamId, stream);
     try {
@@ -174750,7 +174958,7 @@ function startPsLiteRelayClient(options) {
   const handleControl = (message) => {
     if (message.type === "session.ready") {
       issueToken = message.issueToken;
-      options.onStatus?.("connected");
+      emitStatus("connected");
       if (tls && tls.prepare) {
         void tls.prepare({
           sessionId: options.sessionId,
@@ -174765,7 +174973,7 @@ function startPsLiteRelayClient(options) {
       return;
     }
     if (message.type === "stream.open" && typeof message.streamId === "number") {
-      void openStream(message.streamId);
+      void openStream(message.streamId, parseStreamRef(message.streamRef));
       return;
     }
     if (message.type === "stream.close" && typeof message.streamId === "number") {
@@ -174847,18 +175055,19 @@ function startPsLiteRelayClient(options) {
       return;
     }
     issueToken = void 0;
-    socket = createSocket(options.webSocketFactory, controlUrl);
+    connTag = randomConnTag();
+    socket = createSocket(options.webSocketFactory, psLiteRelayControlUrl(options.sessionId, baseControlUrl, connTag));
     const currentSocket = socket;
     const isCurrent = () => !closed && socket === currentSocket;
     const acceptsFrames = () => isCurrent() && currentSocket.readyState === currentSocket.OPEN;
     socket.binaryType = "arraybuffer";
-    options.onStatus?.("connecting");
+    emitStatus("connecting");
     socket.onopen = () => {
       if (!acceptsFrames())
         return;
       reconnectAttempts = 0;
       startHeartbeat();
-      options.onStatus?.("connected");
+      emitStatus("connected");
     };
     socket.onmessage = (event) => {
       if (!acceptsFrames())
@@ -174878,27 +175087,31 @@ function startPsLiteRelayClient(options) {
       issueToken = void 0;
       const detail = { code: event?.code, reason: event?.reason };
       if (closed) {
-        options.onStatus?.("closed", detail);
+        stopVisibilityListener();
+        stopReadEvents();
+        emitStatus("closed", detail);
         return;
       }
       if (event?.code === RELAY_CLOSE_SESSION_REPLACED) {
         closed = true;
+        stopVisibilityListener();
+        stopReadEvents();
         if (reconnectTimer !== void 0) {
           clearTimeout(reconnectTimer);
           reconnectTimer = void 0;
         }
         log("relay session replaced by another connection \u2014 not reconnecting");
-        options.onStatus?.("replaced", detail);
+        emitStatus("replaced", detail);
         return;
       }
-      options.onStatus?.("disconnected", detail);
+      emitStatus("disconnected", detail);
       scheduleReconnect();
     };
     socket.onerror = () => {
       if (!isCurrent() || currentSocket.readyState > currentSocket.OPEN) {
         return;
       }
-      options.onStatus?.("error");
+      emitStatus("error");
     };
   }
   connect();
@@ -174925,6 +175138,8 @@ function startPsLiteRelayClient(options) {
         return;
       closed = true;
       stopHeartbeat();
+      stopVisibilityListener();
+      stopReadEvents();
       if (reconnectTimer !== void 0) {
         clearTimeout(reconnectTimer);
         reconnectTimer = void 0;
@@ -174934,7 +175149,7 @@ function startPsLiteRelayClient(options) {
     }
   };
 }
-async function handleRelayHttpRequest(runtime, request2, origin) {
+async function handleRelayHttpRequest(runtime, request2, origin, isRead) {
   const bridgeRequest = {
     requestId: crypto.randomUUID(),
     method: request2.method,
@@ -174943,20 +175158,164 @@ async function handleRelayHttpRequest(runtime, request2, origin) {
     headers: request2.headers,
     body: encodeBase642(request2.body)
   };
+  let granteeRef;
   const bridgeResponse = await handlePsLiteBridgeRequest(runtime, bridgeRequest, {
-    origin
+    origin,
+    ...isRead ? {
+      onReadGrantee: (ref) => {
+        granteeRef = ref;
+      }
+    } : {}
   });
+  const contentType = headerValue(bridgeResponse.headers, "content-type");
   const bodyBytes = decodeBase643(bridgeResponse.body);
   const acceptsGzip = (request2.headers["accept-encoding"] ?? "").includes("gzip");
   const alreadyEncoded = Boolean(bridgeResponse.headers?.["content-encoding"]);
+  const base2 = {
+    status: bridgeResponse.status,
+    plainBody: bodyBytes,
+    ...contentType !== void 0 ? { contentType } : {},
+    ...granteeRef ? { granteeRef } : {}
+  };
   if (acceptsGzip && !alreadyEncoded && bodyBytes.length >= GZIP_MIN_BYTES && typeof CompressionStream !== "undefined") {
     const gzipped = await gzipBytes(bodyBytes);
-    return buildHttpResponse(bridgeResponse, {
-      bodyOverride: gzipped,
-      contentEncoding: "gzip"
-    });
+    return {
+      ...base2,
+      gzip: true,
+      response: buildHttpResponse(bridgeResponse, {
+        bodyOverride: gzipped,
+        contentEncoding: "gzip"
+      })
+    };
+  }
+  return {
+    ...base2,
+    gzip: false,
+    response: buildHttpResponse(bridgeResponse, { bodyOverride: bodyBytes })
+  };
+}
+function headerValue(headers, name) {
+  for (const [key, value] of Object.entries(headers)) {
+    if (key.toLowerCase() === name)
+      return value;
+  }
+  return void 0;
+}
+var DATA_PATH_PREFIX = "/v1/data/";
+function relayReadScope(request2) {
+  const method = request2.method.toUpperCase();
+  if (method !== "GET")
+    return void 0;
+  if (!request2.path.startsWith(DATA_PATH_PREFIX))
+    return void 0;
+  const rest = request2.path.slice(DATA_PATH_PREFIX.length).split("?")[0];
+  if (!rest || rest.includes("/"))
+    return void 0;
+  const segment = rest;
+  let scope;
+  try {
+    scope = decodeURIComponent(segment);
+  } catch {
+    return INVALID_SCOPE;
   }
-  return buildHttpResponse(bridgeResponse, { bodyOverride: bodyBytes });
+  if (scope.length > MAX_SCOPE_LENGTH)
+    return INVALID_SCOPE;
+  const parsed = parseDataScopeContract(scope);
+  return parsed.ok ? parsed.scope : INVALID_SCOPE;
+}
+var INVALID_SCOPE = "invalid";
+var MAX_SCOPE_LENGTH = 128;
+var GRANTEE_REF_WAIT_MS = 1e3;
+var MAX_QUEUED_READ_EVENTS = 200;
+function validGranteeRef(value) {
+  return typeof value === "string" && /^(owner|[0-9a-f]{12})$/.test(value) ? value : void 0;
+}
+async function withTimeout3(promise2, ms3) {
+  let timer;
+  try {
+    return await Promise.race([
+      promise2.catch(() => void 0),
+      new Promise((resolve) => {
+        timer = setTimeout(() => resolve(void 0), ms3);
+      })
+    ]);
+  } finally {
+    if (timer !== void 0)
+      clearTimeout(timer);
+  }
+}
+var EMPTY_CHECK_MAX_BYTES = 64 * 1024;
+function classifyReadOutcome(status2, body, contentType) {
+  if (status2 === 401 || status2 === 403)
+    return "denied";
+  if (status2 === 402)
+    return "payment_required";
+  if (status2 === 404)
+    return "not_found";
+  if (status2 >= 400)
+    return "error";
+  if (status2 < 200 || status2 >= 300)
+    return "ok";
+  return body && isEmptyJsonBody(body, contentType) ? "empty" : "ok";
+}
+function isEmptyJsonBody(body, contentType) {
+  if (body.length === 0 || body.length > EMPTY_CHECK_MAX_BYTES)
+    return false;
+  if (contentType !== void 0 && !/json/i.test(contentType))
+    return false;
+  let value;
+  try {
+    value = JSON.parse(new TextDecoder().decode(body));
+  } catch {
+    return false;
+  }
+  if (isEmptyValue(value))
+    return true;
+  if (value && typeof value === "object" && !Array.isArray(value)) {
+    const record3 = value;
+    if (!("data" in record3))
+      return false;
+    const data = record3.data;
+    if (isEmptyValue(data))
+      return true;
+    if (data && typeof data === "object" && !Array.isArray(data)) {
+      const values = Object.values(data);
+      return values.length > 0 && values.every(isEmptyValue);
+    }
+  }
+  return false;
+}
+function isEmptyValue(value) {
+  if (value === null || value === void 0 || value === "")
+    return true;
+  if (Array.isArray(value))
+    return value.length === 0;
+  if (typeof value === "object") {
+    return Object.keys(value).length === 0;
+  }
+  return false;
+}
+function parseStreamRef(value) {
+  return typeof value === "string" && /^[A-Za-z0-9-]{1,64}$/.test(value) ? value : void 0;
+}
+function randomConnTag() {
+  const bytes2 = new Uint8Array(8);
+  crypto.getRandomValues(bytes2);
+  let hex4 = "";
+  for (const byte of bytes2)
+    hex4 += byte.toString(16).padStart(2, "0");
+  return hex4;
+}
+function readVisibilityDocument() {
+  const candidate = globalThis.document;
+  if (!candidate || typeof candidate.addEventListener !== "function" || typeof candidate.removeEventListener !== "function") {
+    return void 0;
+  }
+  return candidate;
+}
+function documentVisibility() {
+  const state = globalThis.document?.visibilityState;
+  return state === "visible" || state === "hidden" ? state : "unknown";
 }
 var GZIP_MIN_BYTES = 1024;
 async function gzipBytes(input) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opendatalabs/personal-server-ts-server",
-  "version": "1.35.4",
+  "version": "1.36.0",
   "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.35.4",
-    "@opendatalabs/personal-server-ts-lite": "1.35.4",
+    "@opendatalabs/personal-server-ts-core": "1.36.0",
+    "@opendatalabs/personal-server-ts-lite": "1.36.0",
     "@opendatalabs/vana-sdk": "3.23.0-pr.211.36da1d8",
     "ajv": "^8.20.0",
     "better-sqlite3": "^12.11.1",