@pluv/platform-cloudflare 0.23.0 → 0.24.1

package/.turbo/turbo-build.log

@@ -1,5 +1,5 @@
 
-> @pluv/platform-cloudflare@0.23.0 build /home/runner/work/pluv/pluv/packages/platform-cloudflare
+> @pluv/platform-cloudflare@0.24.1 build /home/runner/work/pluv/pluv/packages/platform-cloudflare
 > tsup src/index.ts --format esm,cjs --dts
 
 CLI Building entry: src/index.ts
@@ -8,11 +8,11 @@
 CLI Target: es6
 ESM Build start
 CJS Build start
-ESM dist/index.mjs 14.13 KB
-ESM ⚡️ Build success in 95ms
-CJS dist/index.js 15.18 KB
-CJS ⚡️ Build success in 96ms
+ESM dist/index.mjs 14.43 KB
+ESM ⚡️ Build success in 61ms
+CJS dist/index.js 15.47 KB
+CJS ⚡️ Build success in 64ms
 DTS Build start
-DTS ⚡️ Build success in 3590ms
+DTS ⚡️ Build success in 2870ms
 DTS dist/index.d.mts 4.15 KB
 DTS dist/index.d.ts  4.15 KB

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @pluv/platform-cloudflare
 
+## 0.24.1
+
+### Patch Changes
+
+- @pluv/io@0.24.1
+- @pluv/types@0.24.1
+
+## 0.24.0
+
+### Patch Changes
+
+- Updated dependencies [6ac8a46]
+- Updated dependencies [c26986d]
+  - @pluv/io@0.24.0
+  - @pluv/types@0.24.0
+
 ## 0.23.0
 
 ### Patch Changes

package/dist/index.js

@@ -68,23 +68,29 @@ var createPluvHandler = (config) => {
   const { authorize, binding, endpoint = "/api/pluv", modify, io } = config;
   const DurableObject = class {
     constructor(state, env) {
-      this._room = io.getRoom(state.id.toString(), { env, state });
+      this._room = io.createRoom(state.id.toString(), { env, state });
     }
     webSocketClose(ws, code, reason, wasClean) {
-      if (io._registrationMode !== "detached") return;
-      const handler2 = this._room.onClose(ws);
-      handler2({ code, reason });
+      return __async(this, null, function* () {
+        if (io._registrationMode !== "detached") return;
+        const handler2 = this._room.onClose(ws);
+        yield handler2({ code, reason });
+      });
     }
     webSocketError(ws, error) {
-      if (io._registrationMode !== "detached") return;
-      const handler2 = this._room.onError(ws);
-      const eventError = error instanceof Error ? error : new Error("Internal Error");
-      handler2({ error: eventError, message: eventError.message });
+      return __async(this, null, function* () {
+        if (io._registrationMode !== "detached") return;
+        const handler2 = this._room.onError(ws);
+        const eventError = error instanceof Error ? error : new Error("Internal Error");
+        yield handler2({ error: eventError, message: eventError.message });
+      });
     }
     webSocketMessage(ws, message) {
-      if (io._registrationMode !== "detached") return;
-      const handler2 = this._room.onMessage(ws);
-      handler2({ data: message });
+      return __async(this, null, function* () {
+        if (io._registrationMode !== "detached") return;
+        const handler2 = this._room.onMessage(ws);
+        yield handler2({ data: message });
+      });
     }
     fetch(request) {
       return __async(this, null, function* () {
@@ -158,9 +164,11 @@ var createPluvHandler = (config) => {
     return room.fetch(request);
   });
   const fetch = (request, env) => __async(void 0, null, function* () {
-    return [authHandler, roomHandler].reduce((promise, current) => {
-      return promise.then((value) => value != null ? value : current(request, env));
-    }, Promise.resolve(null));
+    return [authHandler, roomHandler].reduce((promise, current) => __async(void 0, null, function* () {
+      return yield promise.then((value) => __async(void 0, null, function* () {
+        return value != null ? value : yield current(request, env);
+      }));
+    }), Promise.resolve(null));
   });
   const handler = {
     fetch: (request, env) => __async(void 0, null, function* () {
@@ -203,7 +211,7 @@ var CloudflareWebSocket = class extends import_io.AbstractWebSocket {
   get state() {
     var _a;
     const deserialized = this.webSocket.deserializeAttachment();
-    const state = (_a = deserialized.state) != null ? _a : null;
+    const state = (_a = deserialized == null ? void 0 : deserialized.state) != null ? _a : null;
     if (!state) throw new Error("Could not get websocket state");
     return state;
   }
@@ -381,9 +389,7 @@ var CloudflarePlatform = class _CloudflarePlatform extends import_io3.AbstractPl
     var _a;
     const deserialized = (_a = webSocket.deserializeAttachment()) != null ? _a : {};
     const sessionId = deserialized.sessionId;
-    if (typeof sessionId !== "string") {
-      throw new Error("This websocket was not registered");
-    }
+    if (typeof sessionId !== "string") return null;
     return sessionId;
   }
   getWebSockets() {

package/dist/index.mjs

@@ -44,23 +44,29 @@ var createPluvHandler = (config) => {
   const { authorize, binding, endpoint = "/api/pluv", modify, io } = config;
   const DurableObject = class {
     constructor(state, env) {
-      this._room = io.getRoom(state.id.toString(), { env, state });
+      this._room = io.createRoom(state.id.toString(), { env, state });
     }
     webSocketClose(ws, code, reason, wasClean) {
-      if (io._registrationMode !== "detached") return;
-      const handler2 = this._room.onClose(ws);
-      handler2({ code, reason });
+      return __async(this, null, function* () {
+        if (io._registrationMode !== "detached") return;
+        const handler2 = this._room.onClose(ws);
+        yield handler2({ code, reason });
+      });
     }
     webSocketError(ws, error) {
-      if (io._registrationMode !== "detached") return;
-      const handler2 = this._room.onError(ws);
-      const eventError = error instanceof Error ? error : new Error("Internal Error");
-      handler2({ error: eventError, message: eventError.message });
+      return __async(this, null, function* () {
+        if (io._registrationMode !== "detached") return;
+        const handler2 = this._room.onError(ws);
+        const eventError = error instanceof Error ? error : new Error("Internal Error");
+        yield handler2({ error: eventError, message: eventError.message });
+      });
     }
     webSocketMessage(ws, message) {
-      if (io._registrationMode !== "detached") return;
-      const handler2 = this._room.onMessage(ws);
-      handler2({ data: message });
+      return __async(this, null, function* () {
+        if (io._registrationMode !== "detached") return;
+        const handler2 = this._room.onMessage(ws);
+        yield handler2({ data: message });
+      });
     }
     fetch(request) {
       return __async(this, null, function* () {
@@ -134,9 +140,11 @@ var createPluvHandler = (config) => {
     return room.fetch(request);
   });
   const fetch = (request, env) => __async(void 0, null, function* () {
-    return [authHandler, roomHandler].reduce((promise, current) => {
-      return promise.then((value) => value != null ? value : current(request, env));
-    }, Promise.resolve(null));
+    return [authHandler, roomHandler].reduce((promise, current) => __async(void 0, null, function* () {
+      return yield promise.then((value) => __async(void 0, null, function* () {
+        return value != null ? value : yield current(request, env);
+      }));
+    }), Promise.resolve(null));
   });
   const handler = {
     fetch: (request, env) => __async(void 0, null, function* () {
@@ -179,7 +187,7 @@ var CloudflareWebSocket = class extends AbstractWebSocket {
   get state() {
     var _a;
     const deserialized = this.webSocket.deserializeAttachment();
-    const state = (_a = deserialized.state) != null ? _a : null;
+    const state = (_a = deserialized == null ? void 0 : deserialized.state) != null ? _a : null;
     if (!state) throw new Error("Could not get websocket state");
     return state;
   }
@@ -357,9 +365,7 @@ var CloudflarePlatform = class _CloudflarePlatform extends AbstractPlatform {
     var _a;
     const deserialized = (_a = webSocket.deserializeAttachment()) != null ? _a : {};
     const sessionId = deserialized.sessionId;
-    if (typeof sessionId !== "string") {
-      throw new Error("This websocket was not registered");
-    }
+    if (typeof sessionId !== "string") return null;
     return sessionId;
   }
   getWebSockets() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pluv/platform-cloudflare",
-  "version": "0.23.0",
+  "version": "0.24.1",
   "description": "@pluv/io adapter for cloudflare workers",
   "author": "leedavidcs",
   "license": "MIT",
@@ -18,16 +18,16 @@
   },
   "dependencies": {
     "path-to-regexp": "^7.1.0",
-    "@pluv/io": "^0.23.0",
-    "@pluv/types": "^0.23.0"
+    "@pluv/io": "^0.24.1",
+    "@pluv/types": "^0.24.1"
   },
   "devDependencies": {
-    "@cloudflare/workers-types": "^4.20240815.0",
+    "@cloudflare/workers-types": "^4.20240821.1",
     "eslint": "^8.57.0",
     "tsup": "^8.2.4",
     "typescript": "^5.5.4",
-    "@pluv/tsconfig": "^0.23.0",
-    "eslint-config-pluv": "^0.23.0"
+    "@pluv/tsconfig": "^0.24.1",
+    "eslint-config-pluv": "^0.24.1"
   },
   "scripts": {
     "build": "tsup src/index.ts --format esm,cjs --dts",

package/src/CloudflarePlatform.ts

@@ -78,9 +78,7 @@ export class CloudflarePlatform<TEnv extends Record<string, any> = {}> extends A
         const deserialized = webSocket.deserializeAttachment() ?? {};
         const sessionId = deserialized.sessionId;
 
-        if (typeof sessionId !== "string") {
-            throw new Error("This websocket was not registered");
-        }
+        if (typeof sessionId !== "string") return null;
 
         return sessionId;
     }

package/src/CloudflareWebSocket.ts

@@ -39,7 +39,7 @@ export class CloudflareWebSocket extends AbstractWebSocket<WebSocket> {
 
     public get state(): WebSocketSerializedState {
         const deserialized = this.webSocket.deserializeAttachment();
-        const state = deserialized.state ?? null;
+        const state = deserialized?.state ?? null;
 
         if (!state) throw new Error("Could not get websocket state");
 

package/src/createPluvHandler.ts

@@ -55,32 +55,32 @@ export const createPluvHandler = <TPluvServer extends PluvServer<CloudflarePlatf
         private _room: IORoom<CloudflarePlatform>;
 
         constructor(state: DurableObjectState, env: Id<InferCloudflarePluvHandlerEnv<TPluvServer>>) {
-            this._room = io.getRoom(state.id.toString(), { env, state });
+            this._room = io.createRoom(state.id.toString(), { env, state });
         }
 
-        public webSocketClose(ws: WebSocket, code: number, reason: string, wasClean: boolean): void | Promise<void> {
+        public async webSocketClose(ws: WebSocket, code: number, reason: string, wasClean: boolean): Promise<void> {
             if (io._registrationMode !== "detached") return;
 
             const handler = this._room.onClose(ws);
 
-            handler({ code, reason });
+            await handler({ code, reason });
         }
 
-        public webSocketError(ws: WebSocket, error: unknown): void | Promise<void> {
+        public async webSocketError(ws: WebSocket, error: unknown): Promise<void> {
             if (io._registrationMode !== "detached") return;
 
             const handler = this._room.onError(ws);
             const eventError = error instanceof Error ? error : new Error("Internal Error");
 
-            handler({ error: eventError, message: eventError.message });
+            await handler({ error: eventError, message: eventError.message });
         }
 
-        public webSocketMessage(ws: WebSocket, message: string | ArrayBuffer): void | Promise<void> {
+        public async webSocketMessage(ws: WebSocket, message: string | ArrayBuffer): Promise<void> {
             if (io._registrationMode !== "detached") return;
 
             const handler = this._room.onMessage(ws);
 
-            handler({ data: message });
+            await handler({ data: message });
         }
 
         async fetch(request: Request<any, CfProperties<any>>): Promise<Response> {
@@ -177,8 +177,8 @@ export const createPluvHandler = <TPluvServer extends PluvServer<CloudflarePlatf
     };
 
     const fetch: PluvHandlerFetch<Id<InferCloudflarePluvHandlerEnv<TPluvServer>>> = async (request, env) => {
-        return [authHandler, roomHandler].reduce((promise, current) => {
-            return promise.then((value) => value ?? current(request, env));
+        return [authHandler, roomHandler].reduce(async (promise, current) => {
+            return await promise.then(async (value) => value ?? (await current(request, env)));
         }, Promise.resolve<Response | null>(null));
     };