@delali/sirannon-db 0.3.5-next.72 → 0.3.5-next.74

package/dist/server/index.mjs

@@ -3895,6 +3895,17 @@ function createWSHandler(sirannon, options) {
 }
 
 // src/server/ws-route.ts
+function endWebSocket(ws, code, reason) {
+  const upgradeState = ws.getUserData().upgradeState;
+  if (upgradeState.upgrading) {
+    upgradeState.endAfterUpgrade ??= () => endWebSocket(ws, code, reason);
+    return;
+  }
+  try {
+    ws.end(code, reason);
+  } catch {
+  }
+}
 var UNSUPPORTED_SUBPROTOCOL_MESSAGE = `The upgrade offered no subprotocol this server supports. Offer '${SIRANNON_WS_SUBPROTOCOL}' alongside any credential-bearing value, or offer none at all.`;
 var UWS_SEND_BACKPRESSURE = 0;
 var UWS_SEND_DROPPED = 2;
@@ -3935,9 +3946,23 @@ function registerWebSocketRoute(options) {
       }
       const selectedWebSocketProtocol = negotiated.protocol;
       const upgrade = (userData) => {
-        endResponse(res, () => {
-          res.upgrade(userData, secWebSocketKey, selectedWebSocketProtocol, secWebSocketExtensions, context);
-        });
+        const upgradeState = { upgrading: true, endAfterUpgrade: void 0 };
+        try {
+          endResponse(res, () => {
+            res.upgrade(
+              { ...userData, upgradeState },
+              secWebSocketKey,
+              selectedWebSocketProtocol,
+              secWebSocketExtensions,
+              context
+            );
+          });
+        } finally {
+          const endAfterUpgrade = upgradeState.endAfterUpgrade;
+          upgradeState.upgrading = false;
+          upgradeState.endAfterUpgrade = void 0;
+          endAfterUpgrade?.();
+        }
       };
       if (!authenticateHook) {
         if (!abort.claim()) return;
@@ -3973,10 +3998,7 @@ function registerWebSocketRoute(options) {
       const userData = ws.getUserData();
       const refusal = userData.refusal;
       if (refusal) {
-        try {
-          ws.end(refusal.code, refusal.reason);
-        } catch {
-        }
+        endWebSocket(ws, refusal.code, refusal.reason);
         return;
       }
       let closing = false;
@@ -4012,10 +4034,7 @@ function registerWebSocketRoute(options) {
         },
         close(code, reason) {
           closing = true;
-          try {
-            ws.end(code, reason);
-          } catch {
-          }
+          endWebSocket(ws, code, reason);
         }
       };
       userData.conn = conn;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@delali/sirannon-db",
   "type": "module",
-  "version": "0.3.5-next.72",
+  "version": "0.3.5-next.74",
   "description": "A production-grade library that turns SQLite databases into a networked data layer with real-time subscriptions.",
   "author": "Delali (https://sondelali.com)",
   "license": "Apache-2.0",
@@ -149,7 +149,7 @@
   },
   "peerDependencies": {
     "@bufbuild/protobuf": ">=2.0.0",
-    "@delali/sirannon-sqlite": "0.3.5-next.72",
+    "@delali/sirannon-sqlite": "0.3.5-next.74",
     "@grpc/grpc-js": ">=1.10.0",
     "better-sqlite3": ">=12.0.0",
     "etcd3": ">=1.1.2",
@@ -193,7 +193,7 @@
   },
   "devDependencies": {
     "@bufbuild/protobuf": "2.11.0",
-    "@delali/sirannon-sqlite": "0.3.5-next.72",
+    "@delali/sirannon-sqlite": "0.3.5-next.74",
     "@grpc/grpc-js": "1.14.4",
     "@microsoft/api-extractor": "7.58.12",
     "@types/better-sqlite3": "7.6.13",
@@ -221,11 +221,11 @@
     "vitest": "4.0.18"
   },
   "optionalDependencies": {
-    "@delali/sirannon-vfs-darwin-arm64": "0.3.5-next.72",
-    "@delali/sirannon-vfs-darwin-x64": "0.3.5-next.72",
-    "@delali/sirannon-vfs-linux-arm64": "0.3.5-next.72",
-    "@delali/sirannon-vfs-linux-x64": "0.3.5-next.72",
-    "@delali/sirannon-vfs-win32-arm64": "0.3.5-next.72",
-    "@delali/sirannon-vfs-win32-x64": "0.3.5-next.72"
+    "@delali/sirannon-vfs-darwin-arm64": "0.3.5-next.74",
+    "@delali/sirannon-vfs-darwin-x64": "0.3.5-next.74",
+    "@delali/sirannon-vfs-linux-arm64": "0.3.5-next.74",
+    "@delali/sirannon-vfs-linux-x64": "0.3.5-next.74",
+    "@delali/sirannon-vfs-win32-arm64": "0.3.5-next.74",
+    "@delali/sirannon-vfs-win32-x64": "0.3.5-next.74"
   }
 }