@pluv/io 0.37.4 → 0.37.6

package/.turbo/turbo-build.log

@@ -1,9 +1,9 @@
 
-> @pluv/io@0.37.4 build /home/runner/work/pluv/pluv/packages/io
+> @pluv/io@0.37.6 build /home/runner/work/pluv/pluv/packages/io
 > pnpm run version && tsup src/index.ts --format esm,cjs --dts
 
 
-> @pluv/io@0.37.4 version /home/runner/work/pluv/pluv/packages/io
+> @pluv/io@0.37.6 version /home/runner/work/pluv/pluv/packages/io
 > genversion ./src/version.generated.ts --esm
 
 CLI Building entry: src/index.ts
@@ -12,11 +12,11 @@
 CLI Target: es6
 ESM Build start
 CJS Build start
-ESM dist/index.mjs 43.58 KB
-ESM ⚡️ Build success in 130ms
-CJS dist/index.js 45.76 KB
-CJS ⚡️ Build success in 131ms
+CJS dist/index.js 45.90 KB
+CJS ⚡️ Build success in 145ms
+ESM dist/index.mjs 43.72 KB
+ESM ⚡️ Build success in 146ms
 DTS Build start
-DTS ⚡️ Build success in 2811ms
-DTS dist/index.d.mts 30.77 KB
-DTS dist/index.d.ts  30.77 KB
+DTS ⚡️ Build success in 2521ms
+DTS dist/index.d.mts 30.92 KB
+DTS dist/index.d.ts  30.92 KB

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @pluv/io
 
+## 0.37.6
+
+### Patch Changes
+
+- 3a874f1: Now logs errors to the console when errors on encountered on the `onUserConnected` and `onUserDisconnected` events.
+  - @pluv/crdt@0.37.6
+  - @pluv/types@0.37.6
+
+## 0.37.5
+
+### Patch Changes
+
+- 9a9ecee: Fixed an issue where hibernated Cloudflare Worker websockets were not updating their last ping timer and causing them to be disconnected after some time.
+  - @pluv/crdt@0.37.5
+  - @pluv/types@0.37.5
+
 ## 0.37.4
 
 ### Patch Changes

package/dist/index.d.mts

@@ -42,6 +42,7 @@ type AbstractListener<TType extends keyof AbstractEventMap> = (event: AbstractEv
 type InferWebSocketSource<TAbstractWebSocket extends AbstractWebSocket> = TAbstractWebSocket extends AbstractWebSocket<infer IWebSocket> ? IWebSocket : never;
 interface AbstractWebSocketConfig {
     persistence: AbstractPersistence;
+    platform: AbstractPlatform<any>;
     room: string;
 }
 declare abstract class AbstractWebSocket<TWebSocket = any> {
@@ -57,6 +58,7 @@ declare abstract class AbstractWebSocket<TWebSocket = any> {
     readonly room: string;
     readonly webSocket: TWebSocket;
     private _user;
+    protected readonly _platform: AbstractPlatform<this>;
     abstract set presence(presence: JsonObject | null);
     abstract get readyState(): 0 | 1 | 2 | 3;
     abstract get sessionId(): string;
@@ -119,6 +121,7 @@ declare class PluvRouter<TPlatform extends AbstractPlatform<any> = AbstractPlatf
 
 declare global {
     var console: {
+        error: (...data: any[]) => void;
         log: (...data: any[]) => void;
     };
 }
@@ -301,7 +304,7 @@ declare abstract class AbstractPlatform<TWebSocket extends AbstractWebSocket = A
     abstract initialize(config: AbstractPlatformConfig<TRoomContext>): this;
     abstract parseData(data: string | ArrayBuffer): Record<string, any>;
     abstract randomUUID(): string;
-    abstract setSerializedState(webSocket: AbstractWebSocket, state: WebSocketSerializedState): void;
+    abstract setSerializedState(webSocket: AbstractWebSocket, state: WebSocketSerializedState): WebSocketSerializedState;
     validateConfig(config: any): void;
     protected _initialize(): this;
 }

package/dist/index.d.ts

@@ -42,6 +42,7 @@ type AbstractListener<TType extends keyof AbstractEventMap> = (event: AbstractEv
 type InferWebSocketSource<TAbstractWebSocket extends AbstractWebSocket> = TAbstractWebSocket extends AbstractWebSocket<infer IWebSocket> ? IWebSocket : never;
 interface AbstractWebSocketConfig {
     persistence: AbstractPersistence;
+    platform: AbstractPlatform<any>;
     room: string;
 }
 declare abstract class AbstractWebSocket<TWebSocket = any> {
@@ -57,6 +58,7 @@ declare abstract class AbstractWebSocket<TWebSocket = any> {
     readonly room: string;
     readonly webSocket: TWebSocket;
     private _user;
+    protected readonly _platform: AbstractPlatform<this>;
     abstract set presence(presence: JsonObject | null);
     abstract get readyState(): 0 | 1 | 2 | 3;
     abstract get sessionId(): string;
@@ -119,6 +121,7 @@ declare class PluvRouter<TPlatform extends AbstractPlatform<any> = AbstractPlatf
 
 declare global {
     var console: {
+        error: (...data: any[]) => void;
         log: (...data: any[]) => void;
     };
 }
@@ -301,7 +304,7 @@ declare abstract class AbstractPlatform<TWebSocket extends AbstractWebSocket = A
     abstract initialize(config: AbstractPlatformConfig<TRoomContext>): this;
     abstract parseData(data: string | ArrayBuffer): Record<string, any>;
     abstract randomUUID(): string;
-    abstract setSerializedState(webSocket: AbstractWebSocket, state: WebSocketSerializedState): void;
+    abstract setSerializedState(webSocket: AbstractWebSocket, state: WebSocketSerializedState): WebSocketSerializedState;
     validateConfig(config: any): void;
     protected _initialize(): this;
 }

package/dist/index.js

@@ -245,8 +245,9 @@ var AbstractWebSocket = class {
     /** The connection is closed. */
     this.CLOSED = 3;
     this._user = null;
-    const { persistence, room } = config;
+    const { persistence, platform, room } = config;
     this.persistence = persistence;
+    this._platform = platform;
     this.room = room;
     this.webSocket = webSocket;
   }
@@ -617,7 +618,8 @@ var IORoom = class {
             webSocket: pluvWs.webSocket
           })
         );
-      } catch (e) {
+      } catch (err) {
+        console.error(err);
       }
     });
   }
@@ -646,7 +648,8 @@ var IORoom = class {
             user: session.user
           })
         );
-      } catch (e) {
+      } catch (err) {
+        console.error(err);
       }
     });
   }
@@ -700,9 +703,7 @@ var IORoom = class {
     });
   }
   _getIOAuthorize(options) {
-    if (typeof this._authorize === "function") {
-      return this._authorize(options);
-    }
+    if (typeof this._authorize === "function") return this._authorize(options);
     return this._authorize;
   }
   _getProcedure(message) {
@@ -731,7 +732,7 @@ var IORoom = class {
   }
   _initialize() {
     const promise = (() => __async(this, null, function* () {
-      this._logDebug(`${import_kleur.default.blue(`Initializing room ${this.id}:`)}`);
+      this._logDebug(`${import_kleur.default.blue(`Initializing room: ${this.id}`)}`);
       if (!!this._uninitialize) {
         const uninitialize2 = (yield this._uninitialize).bind(this);
         yield uninitialize2();
@@ -741,6 +742,7 @@ var IORoom = class {
         this.id,
         (_a) => __async(this, null, function* () {
           var _b = _a, { options = {} } = _b, message = __objRest(_b, ["options"]);
+          yield promise;
           const sender = {
             sessionId: message.connectionId,
             user: message.user
@@ -998,7 +1000,7 @@ var IORoom = class {
 };
 
 // src/version.generated.ts
-var version = "0.37.4";
+var version = "0.37.6";
 
 // src/PluvServer.ts
 var PluvServer = class {
@@ -1063,11 +1065,11 @@ var PluvServer = class {
         if (!session) return {};
         const currentTime = (/* @__PURE__ */ new Date()).getTime();
         const prevState = session.webSocket.state;
-        session.webSocket.state = __spreadProps(__spreadValues({}, prevState), {
+        this._platform.setSerializedState(session.webSocket, __spreadProps(__spreadValues({}, prevState), {
           timers: __spreadProps(__spreadValues({}, prevState.timers), {
             ping: currentTime
           })
-        });
+        }));
         return { $PONG: {} };
       }),
       $UPDATE_PRESENCE: this._procedure.broadcast((data, { session }) => {
@@ -1148,7 +1150,7 @@ var PluvServer = class {
     var _a, _c;
     const _b = (_a = options[0]) != null ? _a : {}, { _meta, debug, onDestroy, onMessage } = _b, platformRoomContext = __objRest(_b, ["_meta", "debug", "onDestroy", "onMessage"]);
     if (this._platform._config.handleMode !== "io") {
-      throw new Error(`\`createRoom' is unsupported for \`${this._platform._name}\``);
+      throw new Error(`\`createRoom\` is unsupported for \`${this._platform._name}\``);
     }
     if (!/^[a-z0-9]+[a-z0-9\-_]+[a-z0-9]+$/i.test(room)) throw new Error("Unsupported room name");
     const roomContext = platformRoomContext;

package/dist/index.mjs

@@ -203,8 +203,9 @@ var AbstractWebSocket = class {
     /** The connection is closed. */
     this.CLOSED = 3;
     this._user = null;
-    const { persistence, room } = config;
+    const { persistence, platform, room } = config;
     this.persistence = persistence;
+    this._platform = platform;
     this.room = room;
     this.webSocket = webSocket;
   }
@@ -575,7 +576,8 @@ var IORoom = class {
             webSocket: pluvWs.webSocket
           })
         );
-      } catch (e) {
+      } catch (err) {
+        console.error(err);
       }
     });
   }
@@ -604,7 +606,8 @@ var IORoom = class {
             user: session.user
           })
         );
-      } catch (e) {
+      } catch (err) {
+        console.error(err);
       }
     });
   }
@@ -658,9 +661,7 @@ var IORoom = class {
     });
   }
   _getIOAuthorize(options) {
-    if (typeof this._authorize === "function") {
-      return this._authorize(options);
-    }
+    if (typeof this._authorize === "function") return this._authorize(options);
     return this._authorize;
   }
   _getProcedure(message) {
@@ -689,7 +690,7 @@ var IORoom = class {
   }
   _initialize() {
     const promise = (() => __async(this, null, function* () {
-      this._logDebug(`${colors.blue(`Initializing room ${this.id}:`)}`);
+      this._logDebug(`${colors.blue(`Initializing room: ${this.id}`)}`);
       if (!!this._uninitialize) {
         const uninitialize2 = (yield this._uninitialize).bind(this);
         yield uninitialize2();
@@ -699,6 +700,7 @@ var IORoom = class {
         this.id,
         (_a) => __async(this, null, function* () {
           var _b = _a, { options = {} } = _b, message = __objRest(_b, ["options"]);
+          yield promise;
           const sender = {
             sessionId: message.connectionId,
             user: message.user
@@ -956,7 +958,7 @@ var IORoom = class {
 };
 
 // src/version.generated.ts
-var version = "0.37.4";
+var version = "0.37.6";
 
 // src/PluvServer.ts
 var PluvServer = class {
@@ -1021,11 +1023,11 @@ var PluvServer = class {
         if (!session) return {};
         const currentTime = (/* @__PURE__ */ new Date()).getTime();
         const prevState = session.webSocket.state;
-        session.webSocket.state = __spreadProps(__spreadValues({}, prevState), {
+        this._platform.setSerializedState(session.webSocket, __spreadProps(__spreadValues({}, prevState), {
           timers: __spreadProps(__spreadValues({}, prevState.timers), {
             ping: currentTime
           })
-        });
+        }));
         return { $PONG: {} };
       }),
       $UPDATE_PRESENCE: this._procedure.broadcast((data, { session }) => {
@@ -1106,7 +1108,7 @@ var PluvServer = class {
     var _a, _c;
     const _b = (_a = options[0]) != null ? _a : {}, { _meta, debug, onDestroy, onMessage } = _b, platformRoomContext = __objRest(_b, ["_meta", "debug", "onDestroy", "onMessage"]);
     if (this._platform._config.handleMode !== "io") {
-      throw new Error(`\`createRoom' is unsupported for \`${this._platform._name}\``);
+      throw new Error(`\`createRoom\` is unsupported for \`${this._platform._name}\``);
     }
     if (!/^[a-z0-9]+[a-z0-9\-_]+[a-z0-9]+$/i.test(room)) throw new Error("Unsupported room name");
     const roomContext = platformRoomContext;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pluv/io",
-  "version": "0.37.4",
+  "version": "0.37.6",
   "description": "@pluv/io server-side websocket manager",
   "author": "leedavidcs",
   "license": "MIT",
@@ -21,16 +21,16 @@
     "jose": "^5.10.0",
     "kleur": "^4.1.5",
     "wonka": "^6.3.5",
-    "@pluv/crdt": "^0.37.4",
-    "@pluv/types": "^0.37.4"
+    "@pluv/crdt": "^0.37.6",
+    "@pluv/types": "^0.37.6"
   },
   "devDependencies": {
     "eslint": "^8.57.1",
     "genversion": "^3.2.0",
     "tsup": "^8.4.0",
     "typescript": "^5.8.2",
-    "@pluv/tsconfig": "^0.37.4",
-    "eslint-config-pluv": "^0.37.4"
+    "@pluv/tsconfig": "^0.37.6",
+    "eslint-config-pluv": "^0.37.6"
   },
   "scripts": {
     "build": "pnpm run version && tsup src/index.ts --format esm,cjs --dts",

package/src/AbstractPlatform.ts

@@ -78,7 +78,10 @@ export abstract class AbstractPlatform<
 
     public abstract randomUUID(): string;
 
-    public abstract setSerializedState(webSocket: AbstractWebSocket, state: WebSocketSerializedState): void;
+    public abstract setSerializedState(
+        webSocket: AbstractWebSocket,
+        state: WebSocketSerializedState,
+    ): WebSocketSerializedState;
 
     public validateConfig(config: any): void {}
 

package/src/AbstractWebSocket.ts

@@ -7,6 +7,7 @@ import type {
     MaybePromise,
 } from "@pluv/types";
 import type { AbstractPersistence } from "./AbstractPersistence";
+import type { AbstractPlatform } from "./AbstractPlatform";
 import type { WebSocketSerializedState, WebSocketSession } from "./types";
 
 export type AbstractEvent = {};
@@ -49,6 +50,7 @@ export type InferWebSocketSource<TAbstractWebSocket extends AbstractWebSocket> =
 
 export interface AbstractWebSocketConfig {
     persistence: AbstractPersistence;
+    platform: AbstractPlatform<any>;
     room: string;
 }
 
@@ -68,6 +70,8 @@ export abstract class AbstractWebSocket<TWebSocket = any> {
 
     private _user: BaseUser | null = null;
 
+    protected readonly _platform: AbstractPlatform<this>;
+
     public abstract set presence(presence: JsonObject | null);
     public abstract get readyState(): 0 | 1 | 2 | 3;
     public abstract get sessionId(): string;
@@ -75,9 +79,10 @@ export abstract class AbstractWebSocket<TWebSocket = any> {
     public abstract set state(state: WebSocketSerializedState);
 
     constructor(webSocket: TWebSocket, config: AbstractWebSocketConfig) {
-        const { persistence, room } = config;
+        const { persistence, platform, room } = config;
 
         this.persistence = persistence;
+        this._platform = platform;
         this.room = room;
         this.webSocket = webSocket;
     }

package/src/IORoom.ts

@@ -398,7 +398,9 @@ export class IORoom<
                     webSocket: pluvWs.webSocket,
                 }),
             );
-        } catch {}
+        } catch (err) {
+            console.error(err);
+        }
     }
 
     private _ensureDetached(): void {
@@ -430,7 +432,9 @@ export class IORoom<
                     user: session.user,
                 }),
             );
-        } catch {}
+        } catch (err) {
+            console.error(err);
+        }
     }
 
     private _getAbstractWs(webSocket: WebSocketType<TPlatform>): AbstractWebSocket | null {
@@ -499,9 +503,7 @@ export class IORoom<
     }
 
     private _getIOAuthorize(options: WebsocketRegisterConfig<TPlatform>): ResolvedPluvIOAuthorize<any, any> | null {
-        if (typeof this._authorize === "function") {
-            return this._authorize(options);
-        }
+        if (typeof this._authorize === "function") return this._authorize(options);
 
         return this._authorize as ResolvedPluvIOAuthorize<any, any> | null;
     }
@@ -536,7 +538,7 @@ export class IORoom<
 
     private _initialize() {
         const promise = (async () => {
-            this._logDebug(`${colors.blue(`Initializing room ${this.id}:`)}`);
+            this._logDebug(`${colors.blue(`Initializing room: ${this.id}`)}`);
 
             if (!!this._uninitialize) {
                 const uninitialize = (await this._uninitialize).bind(this);
@@ -548,6 +550,8 @@ export class IORoom<
             const pubSubId = await this._platform.pubSub.subscribe(
                 this.id,
                 async ({ options = {}, ...message }): Promise<void> => {
+                    await promise;
+
                     const sender: SendMessageSender = {
                         sessionId: message.connectionId,
                         user: message.user,

package/src/PluvServer.ts

@@ -151,13 +151,13 @@ export class PluvServer<
             const currentTime = new Date().getTime();
             const prevState = session.webSocket.state;
 
-            session.webSocket.state = {
+            this._platform.setSerializedState(session.webSocket, {
                 ...prevState,
                 timers: {
                     ...prevState.timers,
                     ping: currentTime,
                 },
-            };
+            });
 
             return { $PONG: {} };
         }),
@@ -237,7 +237,6 @@ export class PluvServer<
             crdt = noop,
             debug = false,
             getInitialStorage,
-
             platform,
             router = new PluvRouter<TPlatform, TAuthorize, TContext, TEvents>({} as TEvents),
         } = options;
@@ -282,7 +281,7 @@ export class PluvServer<
         >[0] & { _meta?: any };
 
         if (this._platform._config.handleMode !== "io") {
-            throw new Error(`\`createRoom\' is unsupported for \`${this._platform._name}\``);
+            throw new Error(`\`createRoom\` is unsupported for \`${this._platform._name}\``);
         }
 
         if (!/^[a-z0-9]+[a-z0-9\-_]+[a-z0-9]+$/i.test(room)) throw new Error("Unsupported room name");

package/src/types.ts

@@ -25,6 +25,7 @@ import type { PluvRouter, PluvRouterEventConfig } from "./PluvRouter";
 
 declare global {
     var console: {
+        error: (...data: any[]) => void;
         log: (...data: any[]) => void;
     };
 }

package/src/version.generated.ts

@@ -1,2 +1,2 @@
 // Generated by genversion.
-export const version = '0.37.4'
+export const version = '0.37.6'

package/tsconfig.json

@@ -1,5 +1,5 @@
 {
 	"extends": "@pluv/tsconfig/library.json",
-	"include": ["next-env.d.ts", "**/*.ts", "**/*.tsx"],
+	"include": ["next-env.d.ts", "src/*.ts"],
 	"exclude": ["node_modules"]
 }