@pluv/io 0.3.7 → 0.3.9

package/.turbo/turbo-build.log

@@ -1,5 +1,5 @@
 
-> @pluv/io@0.3.7 build /home/runner/work/pluv/pluv/packages/io
+> @pluv/io@0.3.9 build /home/runner/work/pluv/pluv/packages/io
 > tsup src/index.ts --format esm,cjs --dts
 
 CLI Building entry: src/index.ts
@@ -8,10 +8,10 @@
 CLI Target: es6
 ESM Build start
 CJS Build start
-CJS dist/index.js 29.32 KB
-CJS ⚡️ Build success in 63ms
-ESM dist/index.mjs 27.26 KB
-ESM ⚡️ Build success in 79ms
+CJS dist/index.js 29.45 KB
+CJS ⚡️ Build success in 105ms
+ESM dist/index.mjs 27.39 KB
+ESM ⚡️ Build success in 107ms
 DTS Build start
-DTS ⚡️ Build success in 2692ms
-DTS dist/index.d.ts 12.82 KB
+DTS ⚡️ Build success in 2633ms
+DTS dist/index.d.ts 12.84 KB

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @pluv/io
 
+## 0.3.9
+
+### Patch Changes
+
+- abb3622: fixed @pluv/io yjs doc becoming unresponsive when the last user leaves on a cloudflare worker
+
+## 0.3.8
+
+### Patch Changes
+
+- bcf1c3e: purge empty rooms before joining a new room
+
 ## 0.3.7
 
 ### Patch Changes

package/dist/index.d.ts

@@ -204,6 +204,7 @@ declare class IORoom<TPlatform extends AbstractPlatform<any> = AbstractPlatform<
     readonly id: string;
     constructor(id: string, config: IORoomConfig<TPlatform, TAuthorize, TContext, TInput, TOutput>);
     broadcast<TEvent extends keyof InferIOInput<this>>(event: TEvent, data: Id<InferIOInput<this>[TEvent]>): Promise<void>;
+    getSize(): number;
     register(webSocket: InferWebSocketType<TPlatform>, options?: WebsocketRegisterOptions): Promise<void>;
     private _broadcast;
     private _emitQuitters;
@@ -211,7 +212,6 @@ declare class IORoom<TPlatform extends AbstractPlatform<any> = AbstractPlatform<
     private _emitStorageReceived;
     private _emitUserJoined;
     private _getAuthorizedUser;
-    private _getSessionsSize;
     private _getEventConfig;
     private _initialize;
     private _logDebug;
@@ -256,6 +256,7 @@ declare class PluvIO<TPlatform extends AbstractPlatform<any> = AbstractPlatform<
     getRoom(room: string, options?: GetRoomOptions): IORoom<TPlatform, TAuthorize, TContext, TInput, TOutput>;
     static merge<TIO1 extends PluvIO, TIO2 extends PluvIO>(first: TIO1, second: TIO2): PluvIO<InferIOPlatform<TIO1>, InferIOAuthorize<TIO1>, InferIOContext<TIO1>, Spread<[InferIOInput<TIO1>, InferIOInput<TIO2>]>, Spread<[InferIOOutput<TIO1>, InferIOOutput<TIO2>]>>;
     private _logDebug;
+    private _purgeEmptyRooms;
 }
 
 type CreateIOParams<TPlatform extends AbstractPlatform<any> = AbstractPlatform<any>, TContext extends JsonObject = {}, TAuthorizeUser extends BaseUser = BaseUser, TAuthorizeRequired extends boolean = false> = Partial<PluvIOListeners> & {

package/dist/index.js

@@ -323,7 +323,9 @@ var IORoom = class {
     this._platform = platform;
     this.id = id;
     this._listeners = {
-      onDestroy: (encodedState) => onDestroy == null ? void 0 : onDestroy(encodedState)
+      onDestroy: (encodedState) => {
+        onDestroy == null ? void 0 : onDestroy(encodedState);
+      }
     };
     if (authorize2)
       this._authorize = authorize2;
@@ -334,6 +336,14 @@ var IORoom = class {
     const message = { type: event, data };
     return Promise.resolve(this._broadcast({ message }));
   }
+  getSize() {
+    const currentTime = (/* @__PURE__ */ new Date()).getTime();
+    return Array.from(this._sessions.values()).reduce((count, session) => {
+      if (session.quit)
+        return count;
+      return currentTime - session.timers.ping > PING_TIMEOUT_MS ? count : count + 1;
+    }, 0);
+  }
   register(webSocket, options) {
     return __async(this, null, function* () {
       var _a;
@@ -465,7 +475,7 @@ var IORoom = class {
             senderId: session.id
           });
           uninitializeWs();
-          const size2 = this._getSessionsSize();
+          const size2 = this.getSize();
           this._logDebug(
             `${import_kleur.default.blue(
               `Unregistered connection for room ${this.id}:`
@@ -486,7 +496,7 @@ var IORoom = class {
           `Registered connection for room ${this.id}:`
         )} ${sessionId}`
       );
-      const size = this._getSessionsSize();
+      const size = this.getSize();
       this._logDebug(`${import_kleur.default.blue(`Room ${this.id} size:`)} ${size}`);
     });
   }
@@ -590,14 +600,6 @@ var IORoom = class {
       }
     });
   }
-  _getSessionsSize() {
-    const currentTime = (/* @__PURE__ */ new Date()).getTime();
-    return Array.from(this._sessions.values()).reduce((count, session) => {
-      if (session.quit)
-        return count;
-      return currentTime - session.timers.ping > PING_TIMEOUT_MS ? count : count + 1;
-    }, 0);
-  }
   _getEventConfig(message) {
     var _a;
     return (_a = this._events[message.type]) != null ? _a : null;
@@ -626,6 +628,7 @@ var IORoom = class {
         this._doc.destroy();
         this._doc = (0, import_crdt_yjs.doc)();
         this._listeners.onDestroy(encodedState);
+        this._uninitialize = null;
       });
     });
   }
@@ -864,6 +867,7 @@ var PluvIO = class {
   getRoom(room, options = {}) {
     var _a;
     const { debug } = options;
+    this._purgeEmptyRooms();
     if (!/^[a-z0-9]+[a-z0-9\-_]+[a-z0-9]+$/i.test(room)) {
       throw new Error("Unsupported room name");
     }
@@ -885,6 +889,7 @@ var PluvIO = class {
           `${import_kleur2.default.blue("Deleting empty room:")} ${room}`
         );
         this._rooms.delete(room);
+        this._listeners.onRoomDeleted(room, encodedState);
         if (this._debug) {
           const rooms = Array.from(this._rooms.keys());
           this._logDebug(`${import_kleur2.default.blue("Deleted room:")} ${room}`);
@@ -892,11 +897,6 @@ var PluvIO = class {
             `${import_kleur2.default.blue("Rooms available:")} ${rooms.join(", ")}`
           );
         }
-        this._platform.persistance.getSize(room).then((size) => {
-          if (size)
-            return;
-          this._listeners.onRoomDeleted(room, encodedState);
-        });
       },
       platform
     });
@@ -928,6 +928,14 @@ var PluvIO = class {
   _logDebug(...data) {
     this._debug && console.log(...data);
   }
+  _purgeEmptyRooms() {
+    const rooms = Array.from(this._rooms.entries());
+    rooms.forEach(([id, room]) => {
+      if (room.getSize())
+        return;
+      this._rooms.delete(id);
+    });
+  }
 };
 
 // src/createIO.ts

package/dist/index.mjs

@@ -286,7 +286,9 @@ var IORoom = class {
     this._platform = platform;
     this.id = id;
     this._listeners = {
-      onDestroy: (encodedState) => onDestroy == null ? void 0 : onDestroy(encodedState)
+      onDestroy: (encodedState) => {
+        onDestroy == null ? void 0 : onDestroy(encodedState);
+      }
     };
     if (authorize2)
       this._authorize = authorize2;
@@ -297,6 +299,14 @@ var IORoom = class {
     const message = { type: event, data };
     return Promise.resolve(this._broadcast({ message }));
   }
+  getSize() {
+    const currentTime = (/* @__PURE__ */ new Date()).getTime();
+    return Array.from(this._sessions.values()).reduce((count, session) => {
+      if (session.quit)
+        return count;
+      return currentTime - session.timers.ping > PING_TIMEOUT_MS ? count : count + 1;
+    }, 0);
+  }
   register(webSocket, options) {
     return __async(this, null, function* () {
       var _a;
@@ -428,7 +438,7 @@ var IORoom = class {
             senderId: session.id
           });
           uninitializeWs();
-          const size2 = this._getSessionsSize();
+          const size2 = this.getSize();
           this._logDebug(
             `${colors.blue(
               `Unregistered connection for room ${this.id}:`
@@ -449,7 +459,7 @@ var IORoom = class {
           `Registered connection for room ${this.id}:`
         )} ${sessionId}`
       );
-      const size = this._getSessionsSize();
+      const size = this.getSize();
       this._logDebug(`${colors.blue(`Room ${this.id} size:`)} ${size}`);
     });
   }
@@ -553,14 +563,6 @@ var IORoom = class {
       }
     });
   }
-  _getSessionsSize() {
-    const currentTime = (/* @__PURE__ */ new Date()).getTime();
-    return Array.from(this._sessions.values()).reduce((count, session) => {
-      if (session.quit)
-        return count;
-      return currentTime - session.timers.ping > PING_TIMEOUT_MS ? count : count + 1;
-    }, 0);
-  }
   _getEventConfig(message) {
     var _a;
     return (_a = this._events[message.type]) != null ? _a : null;
@@ -589,6 +591,7 @@ var IORoom = class {
         this._doc.destroy();
         this._doc = doc();
         this._listeners.onDestroy(encodedState);
+        this._uninitialize = null;
       });
     });
   }
@@ -827,6 +830,7 @@ var PluvIO = class {
   getRoom(room, options = {}) {
     var _a;
     const { debug } = options;
+    this._purgeEmptyRooms();
     if (!/^[a-z0-9]+[a-z0-9\-_]+[a-z0-9]+$/i.test(room)) {
       throw new Error("Unsupported room name");
     }
@@ -848,6 +852,7 @@ var PluvIO = class {
           `${colors2.blue("Deleting empty room:")} ${room}`
         );
         this._rooms.delete(room);
+        this._listeners.onRoomDeleted(room, encodedState);
         if (this._debug) {
           const rooms = Array.from(this._rooms.keys());
           this._logDebug(`${colors2.blue("Deleted room:")} ${room}`);
@@ -855,11 +860,6 @@ var PluvIO = class {
             `${colors2.blue("Rooms available:")} ${rooms.join(", ")}`
           );
         }
-        this._platform.persistance.getSize(room).then((size) => {
-          if (size)
-            return;
-          this._listeners.onRoomDeleted(room, encodedState);
-        });
       },
       platform
     });
@@ -891,6 +891,14 @@ var PluvIO = class {
   _logDebug(...data) {
     this._debug && console.log(...data);
   }
+  _purgeEmptyRooms() {
+    const rooms = Array.from(this._rooms.entries());
+    rooms.forEach(([id, room]) => {
+      if (room.getSize())
+        return;
+      this._rooms.delete(id);
+    });
+  }
 };
 
 // src/createIO.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pluv/io",
-  "version": "0.3.7",
+  "version": "0.3.9",
   "description": "@pluv/io server-side websocket manager",
   "author": "leedavidcs",
   "license": "MIT",

package/src/IORoom.ts

@@ -110,7 +110,9 @@ export class IORoom<
         this.id = id;
 
         this._listeners = {
-            onDestroy: (encodedState) => onDestroy?.(encodedState),
+            onDestroy: (encodedState) => {
+                onDestroy?.(encodedState);
+            },
         };
 
         if (authorize) this._authorize = authorize;
@@ -126,6 +128,24 @@ export class IORoom<
         return Promise.resolve(this._broadcast({ message }));
     }
 
+    public getSize(): number {
+        const currentTime = new Date().getTime();
+
+        /**
+         * @description Doing this instead of .size because some sessions
+         * in the map can be considered as "omitted".
+         * @author leedavidcs
+         * @date December 21, 2022
+         */
+        return Array.from(this._sessions.values()).reduce((count, session) => {
+            if (session.quit) return count;
+
+            return currentTime - session.timers.ping > PING_TIMEOUT_MS
+                ? count
+                : count + 1;
+        }, 0);
+    }
+
     public async register(
         webSocket: InferWebSocketType<TPlatform>,
         options?: WebsocketRegisterOptions
@@ -285,7 +305,7 @@ export class IORoom<
 
                     uninitializeWs();
 
-                    const size = this._getSessionsSize();
+                    const size = this.getSize();
 
                     this._logDebug(
                         `${colors.blue(
@@ -311,7 +331,7 @@ export class IORoom<
             )} ${sessionId}`
         );
 
-        const size = this._getSessionsSize();
+        const size = this.getSize();
 
         this._logDebug(`${colors.blue(`Room ${this.id} size:`)} ${size}`);
     }
@@ -439,24 +459,6 @@ export class IORoom<
         }
     }
 
-    private _getSessionsSize(): number {
-        const currentTime = new Date().getTime();
-
-        /**
-         * @description Doing this instead of .size because some sessions
-         * in the map can be considered as "omitted".
-         * @author leedavidcs
-         * @date December 21, 2022
-         */
-        return Array.from(this._sessions.values()).reduce((count, session) => {
-            if (session.quit) return count;
-
-            return currentTime - session.timers.ping > PING_TIMEOUT_MS
-                ? count
-                : count + 1;
-        }, 0);
-    }
-
     private _getEventConfig(
         message: EventMessage<string, any>
     ): InferEventConfig<TContext, TInput, TOutput>[keyof TInput] | null {
@@ -493,6 +495,8 @@ export class IORoom<
             this._doc = doc();
 
             this._listeners.onDestroy(encodedState);
+
+            this._uninitialize = null;
         };
     }
 

package/src/PluvIO.ts

@@ -262,6 +262,8 @@ export class PluvIO<
     ): IORoom<TPlatform, TAuthorize, TContext, TInput, TOutput> {
         const { debug } = options;
 
+        this._purgeEmptyRooms();
+
         if (!/^[a-z0-9]+[a-z0-9\-_]+[a-z0-9]+$/i.test(room)) {
             throw new Error("Unsupported room name");
         }
@@ -289,6 +291,7 @@ export class PluvIO<
                 );
 
                 this._rooms.delete(room);
+                this._listeners.onRoomDeleted(room, encodedState);
 
                 if (this._debug) {
                     const rooms = Array.from(this._rooms.keys());
@@ -298,12 +301,6 @@ export class PluvIO<
                         `${colors.blue("Rooms available:")} ${rooms.join(", ")}`
                     );
                 }
-
-                this._platform.persistance.getSize(room).then((size) => {
-                    if (size) return;
-
-                    this._listeners.onRoomDeleted(room, encodedState);
-                });
             },
             platform,
         });
@@ -353,4 +350,14 @@ export class PluvIO<
     private _logDebug(...data: any[]): void {
         this._debug && console.log(...data);
     }
+
+    private _purgeEmptyRooms(): void {
+        const rooms = Array.from(this._rooms.entries());
+
+        rooms.forEach(([id, room]) => {
+            if (room.getSize()) return;
+
+            this._rooms.delete(id);
+        });
+    }
 }