capnweb-experimental-hibernation 0.6.4 → 0.6.6

package/dist/index-workers.cjs

@@ -2853,15 +2853,16 @@ var RpcSessionImpl = class {
   }
   sendCall(id, path, args) {
     if (this.abortReason) throw this.abortReason;
-    let entry = new ImportTableEntry(this, this.imports.length, false);
-    this.imports.push(entry);
     let value = ["pipeline", id, path];
     if (args) {
       let devalue = Devaluator.devaluate(args.value, void 0, this, args);
       value.push(devalue[0]);
     }
-    this.send(["push", entry.importId, value]);
-    this.trace("sendCall", { importId: entry.importId, targetImportId: id, pathLength: path.length, hasArgs: !!args });
+    const importId = this.imports.length;
+    this.send(["push", importId, value]);
+    const entry = new ImportTableEntry(this, importId, false);
+    this.imports.push(entry);
+    this.trace("sendCall", { importId, targetImportId: id, pathLength: path.length, hasArgs: !!args });
     return new RpcImportHook(
       /*isPromise=*/
       true,
@@ -2870,7 +2871,11 @@ var RpcSessionImpl = class {
   }
   sendStream(id, path, args) {
     if (this.abortReason) throw this.abortReason;
-    let importId = this.imports.length;
+    let value = ["pipeline", id, path];
+    let devalue = Devaluator.devaluate(args.value, void 0, this, args);
+    value.push(devalue[0]);
+    const importId = this.imports.length;
+    let size = this.send(["stream", importId, value]);
     let entry = new ImportTableEntry(
       this,
       importId,
@@ -2880,10 +2885,6 @@ var RpcSessionImpl = class {
     entry.remoteRefcount = 0;
     entry.localRefcount = 1;
     this.imports.push(entry);
-    let value = ["pipeline", id, path];
-    let devalue = Devaluator.devaluate(args.value, void 0, this, args);
-    value.push(devalue[0]);
-    let size = this.send(["stream", importId, value]);
     this.trace("sendStream", { importId, targetImportId: id, pathLength: path.length, size });
     let promise = entry.awaitResolution().then(
       (p) => {
@@ -2905,18 +2906,19 @@ var RpcSessionImpl = class {
       throw this.abortReason;
     }
     let devaluedCaptures = captures.map((hook) => {
-      let importId = this.getImport(hook);
-      if (importId !== void 0) {
-        return ["import", importId];
+      let importId2 = this.getImport(hook);
+      if (importId2 !== void 0) {
+        return ["import", importId2];
       } else {
         return ["export", this.exportStub(hook)];
       }
     });
     let value = ["remap", id, path, devaluedCaptures, instructions];
-    let entry = new ImportTableEntry(this, this.imports.length, false);
+    const importId = this.imports.length;
+    this.send(["push", importId, value]);
+    const entry = new ImportTableEntry(this, importId, false);
     this.imports.push(entry);
-    this.send(["push", entry.importId, value]);
-    this.trace("sendMap", { importId: entry.importId, targetImportId: id, pathLength: path.length, captureCount: captures.length });
+    this.trace("sendMap", { importId, targetImportId: id, pathLength: path.length, captureCount: captures.length });
     return new RpcImportHook(
       /*isPromise=*/
       true,
@@ -2989,8 +2991,9 @@ var RpcSessionImpl = class {
           case "push":
             if (msg.length > 2 && typeof msg[1] === "number") {
               let exportId = msg[1];
+              let sourceExpr = cloneRpcExpr(msg[2]);
               if (containsImportedCapabilityReference(msg[2])) {
-                this.importReplays.push({ expr: cloneRpcExpr(msg[2]) });
+                this.importReplays.push({ expr: sourceExpr });
                 this.trace("readLoop.push.recordImportReplay", {
                   exportId,
                   replayCount: this.importReplays.length
@@ -3002,7 +3005,7 @@ var RpcSessionImpl = class {
               this.replacePositiveExport(exportId, {
                 hook,
                 refcount: 1,
-                sourceExpr: cloneRpcExpr(msg[2])
+                sourceExpr
               });
               this.trace("readLoop.push", { exportId, hookType: hook.constructor?.name ?? null });
               continue;
@@ -3011,13 +3014,14 @@ var RpcSessionImpl = class {
           case "stream": {
             if (msg.length > 2 && typeof msg[1] === "number") {
               let exportId = msg[1];
+              let sourceExpr = cloneRpcExpr(msg[2]);
               let payload = this.evaluateWithCurrentProvenance(msg[2]);
               let hook = new PayloadStubHook(payload);
               hook.ignoreUnhandledRejections();
               this.replacePositiveExport(exportId, {
                 hook,
                 refcount: 1,
-                sourceExpr: cloneRpcExpr(msg[2]),
+                sourceExpr,
                 autoRelease: true
               });
               this.trace("readLoop.stream", { exportId, hookType: hook.constructor?.name ?? null });
@@ -3413,6 +3417,11 @@ async function __experimental_newHibernatableWebSocketRpcSession(webSocket, loca
     },
     handleClose(code, reason, wasClean) {
       transport.notifyClosed(code, reason, wasClean);
+      if (options.sessionStore) {
+        options.sessionStore.delete(sessionId).catch((err) => {
+          console.error(`[capnweb] Failed to delete session ${sessionId} from store:`, err);
+        });
+      }
     },
     handleError(error) {
       transport.notifyError(error);
@@ -3421,24 +3430,38 @@ async function __experimental_newHibernatableWebSocketRpcSession(webSocket, loca
   async function persistSnapshot() {
     try {
       let snap = rpc.__experimental_snapshot();
-      webSocket.serializeAttachment?.({
-        sessionId,
-        version: 1,
-        snapshot: snap
-      });
       if (options.sessionStore) {
         await options.sessionStore.save(sessionId, snap);
       }
+      let capnwebData = options.sessionStore ? { sessionId, version: 1 } : { sessionId, version: 1, snapshot: snap };
+      let existing = webSocket.deserializeAttachment() ?? {};
+      if (typeof existing !== "object" || existing === null) existing = {};
+      webSocket.serializeAttachment({ ...existing, __capnweb: capnwebData });
     } catch (err) {
       transport.abort?.(err);
     }
   }
 }
+async function __experimental_cleanupOrphanedSessions(webSockets, sessionStore) {
+  if (!sessionStore.deleteOrphans) return 0;
+  const liveIds = /* @__PURE__ */ new Set();
+  for (const ws of webSockets) {
+    const attachment = getAttachment(ws);
+    if (attachment?.sessionId) {
+      liveIds.add(attachment.sessionId);
+    }
+  }
+  return sessionStore.deleteOrphans(liveIds);
+}
 async function __experimental_resumeHibernatableWebSocketRpcSession(webSocket, localMain, options) {
   return __experimental_newHibernatableWebSocketRpcSession(webSocket, localMain, options);
 }
+function __experimental_hibernatableWebSocketSessionId(webSocket) {
+  return getAttachment(webSocket)?.sessionId;
+}
 function getAttachment(webSocket) {
-  let attachment = webSocket.deserializeAttachment?.();
+  let raw = webSocket.deserializeAttachment();
+  let attachment = raw?.__capnweb ?? raw;
   if (attachment?.version === 1 && typeof attachment.sessionId === "string") {
     return attachment;
   }
@@ -3517,7 +3540,11 @@ var WebSocketTransport = class {
     if (reason instanceof Error) {
       message = reason.message;
     } else {
-      message = `${reason}`;
+      try {
+        message = JSON.stringify(reason);
+      } catch {
+        message = `${reason}`;
+      }
     }
     this.#webSocket.close(3e3, message);
     if (!this.#error) {
@@ -3602,7 +3629,11 @@ var HibernatableWebSocketTransport = class {
     if (reason instanceof Error) {
       message = reason.message;
     } else {
-      message = `${reason}`;
+      try {
+        message = JSON.stringify(reason);
+      } catch {
+        message = `${reason}`;
+      }
     }
     try {
       this.webSocket.close(3e3, message);
@@ -4194,6 +4225,21 @@ function __experimental_newDurableObjectSessionStore(storage, prefix = "capnweb:
     },
     async delete(sessionId) {
       await storage.delete(`${prefix}${sessionId}`);
+    },
+    async deleteOrphans(liveSessionIds) {
+      if (!storage.list) return 0;
+      const stored = await storage.list({ prefix });
+      const orphanKeys = [];
+      for (const key of stored.keys()) {
+        const sessionId = key.slice(prefix.length);
+        if (!liveSessionIds.has(sessionId)) {
+          orphanKeys.push(key);
+        }
+      }
+      if (orphanKeys.length > 0) {
+        await storage.delete(orphanKeys);
+      }
+      return orphanKeys.length;
     }
   };
 }
@@ -4206,6 +4252,8 @@ var newHttpBatchRpcSession2 = newHttpBatchRpcSession;
 var newMessagePortRpcSession2 = newMessagePortRpcSession;
 var __experimental_newHibernatableWebSocketRpcSession2 = __experimental_newHibernatableWebSocketRpcSession;
 var __experimental_resumeHibernatableWebSocketRpcSession2 = __experimental_resumeHibernatableWebSocketRpcSession;
+var __experimental_cleanupOrphanedSessions2 = __experimental_cleanupOrphanedSessions;
+var __experimental_hibernatableWebSocketSessionId2 = __experimental_hibernatableWebSocketSessionId;
 var __experimental_debugRpcReference2 = __experimental_debugRpcReference;
 async function newWorkersRpcResponse(request, localMain) {
   if (request.method === "POST") {
@@ -4223,7 +4271,9 @@ exports.RpcPromise = RpcPromise2;
 exports.RpcSession = RpcSession2;
 exports.RpcStub = RpcStub2;
 exports.RpcTarget = RpcTarget4;
+exports.__experimental_cleanupOrphanedSessions = __experimental_cleanupOrphanedSessions2;
 exports.__experimental_debugRpcReference = __experimental_debugRpcReference2;
+exports.__experimental_hibernatableWebSocketSessionId = __experimental_hibernatableWebSocketSessionId2;
 exports.__experimental_newDurableObjectSessionStore = __experimental_newDurableObjectSessionStore;
 exports.__experimental_newHibernatableWebSocketRpcSession = __experimental_newHibernatableWebSocketRpcSession2;
 exports.__experimental_resumeHibernatableWebSocketRpcSession = __experimental_resumeHibernatableWebSocketRpcSession2;