@pluv/io 0.23.0 → 0.24.1

package/dist/index.mjs

@@ -357,27 +357,29 @@ var IORoom = class {
     this._uninitialize = null;
     this._sessions = /* @__PURE__ */ new Map();
     const { authorize: authorize2, context, crdt = noop, debug, onDestroy, onMessage, platform, router } = config;
+    this.id = id;
     this._context = context;
     this._debug = debug;
     this._docFactory = crdt.doc(() => ({}));
-    this._doc = this._docFactory.getEmpty();
     this._router = router;
     this._platform = platform.initialize({ context });
-    this.id = id;
     this._listeners = {
       onDestroy: (event) => onDestroy == null ? void 0 : onDestroy(event),
       onMessage: (event) => onMessage == null ? void 0 : onMessage(event)
     };
     if (authorize2) this._authorize = authorize2;
     const webSockets = this._platform.getWebSockets();
-    if (!webSockets.length) return;
     webSockets.forEach((webSocket) => {
       const deserialized = this._platform.getSerializedState(webSocket);
       const sessionId = this._platform.getSessionId(webSocket);
       if (!deserialized) return;
       if (typeof sessionId !== "string") return;
-      this._sessions.set(sessionId, this._platform.convertWebSocket(webSocket, { room: this.id }));
+      const pluvWs = this._platform.convertWebSocket(webSocket, { room: this.id });
+      this._sessions.set(sessionId, pluvWs);
     });
+    const { doc, uninitialize } = this._initialize();
+    this._doc = doc;
+    this._uninitialize = uninitialize;
   }
   get _events() {
     return this._router._events;
@@ -393,6 +395,10 @@ var IORoom = class {
       }
     });
   }
+  get _initialized() {
+    var _a;
+    return Promise.resolve(!!((_a = this._uninitialize) == null ? void 0 : _a.then((result) => !!result)));
+  }
   getSize() {
     const currentTime = (/* @__PURE__ */ new Date()).getTime();
     return Array.from(this._sessions.values()).reduce((count, pluvWs) => {
@@ -405,25 +411,37 @@ var IORoom = class {
   onClose(webSocket) {
     this._ensureDetached();
     const wsSession = this._getAbstractWs(webSocket);
-    if (!wsSession) return () => void 0;
+    if (!wsSession) return () => __async(this, null, function* () {
+      return void 0;
+    });
     return this._onClose(wsSession);
   }
   onError(webSocket) {
     this._ensureDetached();
     const wsSession = this._getAbstractWs(webSocket);
-    if (!wsSession) return () => void 0;
+    if (!wsSession) return () => __async(this, null, function* () {
+      return void 0;
+    });
     return this._onClose(wsSession);
   }
   onMessage(webSocket) {
     this._ensureDetached();
     const wsSession = this._getAbstractWs(webSocket);
-    if (!wsSession) return () => void 0;
+    if (!wsSession) return () => __async(this, null, function* () {
+      return void 0;
+    });
     return this._onMessage(wsSession);
   }
   register(_0) {
     return __async(this, arguments, function* (webSocket, options = {}) {
       const { token } = options;
-      if (!this._uninitialize) yield this._initialize();
+      const sessionId = this._platform.getSessionId(webSocket);
+      const sessionExists = typeof sessionId === "string" && this._sessions.has(sessionId);
+      if (sessionExists) return;
+      if (!(yield this._initialized)) {
+        this._initialize();
+        yield this._initialized;
+      }
       const user = yield this._getAuthorizedUser(token);
       const ioAuthorize = this._getIOAuthorize();
       const isUnauthorized = !!(ioAuthorize == null ? void 0 : ioAuthorize.required) && !user;
@@ -431,7 +449,7 @@ var IORoom = class {
         var _a;
         return ((_a = session.user) == null ? void 0 : _a.id) === user.id;
       })));
-      const pluvWs = yield this._platform.convertWebSocket(webSocket, { room: this.id });
+      const pluvWs = this._platform.convertWebSocket(webSocket, { room: this.id });
       this._logDebug(`${colors.blue(`Registering connection for room ${this.id}:`)} ${pluvWs.sessionId}`);
       yield this._platform.acceptWebSocket(pluvWs);
       if (isUnauthorized || isTokenInUse) {
@@ -513,13 +531,6 @@ var IORoom = class {
     const sessions = Array.from(this._sessions.values());
     return (_b = sessions.find((pluvWs) => pluvWs.webSocket === webSocket)) != null ? _b : null;
   }
-  _getSession(webSocket) {
-    return __async(this, null, function* () {
-      const pluvWs = this._getAbstractWs(webSocket);
-      if (!pluvWs) throw new Error("Session could not be found");
-      return yield pluvWs.getSession();
-    });
-  }
   _getAuthorizedUser(token) {
     return __async(this, null, function* () {
       var _a;
@@ -549,6 +560,14 @@ var IORoom = class {
       }
     });
   }
+  _getInitialDoc() {
+    return __async(this, null, function* () {
+      const doc = this._docFactory.getEmpty();
+      const encodedState = yield this._platform.persistance.getStorageState(this.id);
+      if (typeof encodedState === "string") doc.applyEncodedState({ update: encodedState });
+      return doc;
+    });
+  }
   _getIOAuthorize() {
     if (typeof this._authorize === "function") {
       return this._authorize(this._context);
@@ -564,6 +583,13 @@ var IORoom = class {
     if (!procedure) return message.data;
     return procedure.config.input ? procedure.config.input.parse(message.data) : message.data;
   }
+  _getSession(webSocket) {
+    return __async(this, null, function* () {
+      const pluvWs = this._getAbstractWs(webSocket);
+      if (!pluvWs) throw new Error("Session could not be found");
+      return yield pluvWs.getSession();
+    });
+  }
   _getSessions() {
     return __async(this, null, function* () {
       const promises = Array.from(this._sessions.values()).map((pluvWs) => __async(this, null, function* () {
@@ -573,10 +599,11 @@ var IORoom = class {
     });
   }
   _initialize() {
-    return __async(this, null, function* () {
+    const promise = (() => __async(this, null, function* () {
       this._logDebug(`${colors.blue(`Initializing room ${this.id}:`)}`);
       if (!!this._uninitialize) {
-        yield this._uninitialize();
+        const uninitialize2 = (yield this._uninitialize).bind(this);
+        yield uninitialize2();
         this._uninitialize = null;
       }
       const pubSubId = yield this._platform.pubSub.subscribe(
@@ -604,11 +631,13 @@ var IORoom = class {
           }
         })
       );
-      this._uninitialize = () => __async(this, null, function* () {
+      const doc = yield this._getInitialDoc();
+      const uninitialize = () => __async(this, null, function* () {
         this._platform.pubSub.unsubscribe(pubSubId);
-        const encodedState = this._doc.getEncodedState();
-        this._doc.destroy();
-        this._doc = this._docFactory.getEmpty();
+        const doc2 = yield this._doc;
+        const encodedState = doc2.getEncodedState();
+        doc2.destroy();
+        this._doc = Promise.resolve(this._docFactory.getEmpty());
         this._listeners.onDestroy({
           context: this._context,
           encodedState,
@@ -616,19 +645,22 @@ var IORoom = class {
         });
         this._uninitialize = null;
       });
-    });
+      return { doc, uninitialize };
+    }))();
+    this._doc = promise.then((result) => result.doc);
+    this._uninitialize = promise.then((result) => result.uninitialize);
+    return { doc: this._doc, uninitialize: this._uninitialize };
   }
   _logDebug(...data) {
     this._debug && console.log(...data);
   }
   _onClose(webSocket) {
-    return () => {
-      if (!this._uninitialize) return;
-      webSocket.state.quit = true;
+    return () => __async(this, null, function* () {
+      if (!(yield this._initialized)) return;
+      webSocket.state = __spreadProps(__spreadValues({}, webSocket.state), { quit: true });
       this._logDebug(`${colors.blue(`Unregistering connection for room ${this.id}:`)} ${webSocket.sessionId}`);
       this._sessions.delete(webSocket.sessionId);
       this._platform.persistance.deleteUser(this.id, webSocket.sessionId).finally(() => __async(this, null, function* () {
-        var _a;
         yield this._broadcast({
           message: {
             type: "$EXIT",
@@ -640,27 +672,31 @@ var IORoom = class {
         this._logDebug(`${colors.blue(`Unregistered connection for room ${this.id}:`)} ${webSocket.sessionId}`);
         this._logDebug(`${colors.blue(`Room ${this.id} size:`)} ${size}`);
         if (size) return;
-        (_a = this._uninitialize) == null ? void 0 : _a.call(this);
+        if (this._uninitialize) {
+          const uninitialize = (yield this._uninitialize).bind(this);
+          yield uninitialize();
+        }
       }));
-    };
+    });
   }
   _onMessage(webSocket) {
     return (event) => __async(this, null, function* () {
       var _a, _b, _c, _d, _e, _f;
+      if (!(yield this._initialized)) return;
       const pluvWs = this._getAbstractWs(webSocket);
       if (!pluvWs) throw new Error("Could not get session");
       const [session, sessions] = yield Promise.all([
         this._getSession(pluvWs),
         this._getSessions()
       ]);
+      const doc = yield this._doc;
       const baseContext = {
         context: this._context,
-        doc: this._doc,
+        doc,
         room: this.id,
         session,
         sessions
       };
-      if (!this._uninitialize) return;
       if (pluvWs.state.quit) {
         pluvWs.close(1011, "WebSocket broken.");
         return;
@@ -682,30 +718,35 @@ var IORoom = class {
         return;
       }
       const extendedContext = __spreadProps(__spreadValues({}, baseContext), { context: __spreadValues({}, this._context) });
-      Promise.all([
+      yield Promise.all([
         (_b = (_a = procedure.config).broadcast) == null ? void 0 : _b.call(_a, inputs, extendedContext),
         (_d = (_c = procedure.config).self) == null ? void 0 : _d.call(_c, inputs, extendedContext),
         (_f = (_e = procedure.config).sync) == null ? void 0 : _f.call(_e, inputs, baseContext)
       ]).then((_0) => __async(this, [_0], function* ([broadcast, self, sync]) {
         const sessionId = session.id;
         const user = session.user;
-        if (broadcast) {
-          Object.entries(broadcast).forEach(([type, data]) => {
-            this._broadcast({
-              message: { data, type },
-              senderId: sessionId
-            });
-          });
-        }
-        if (self) {
+        const handleBroadcast = () => __async(this, null, function* () {
+          if (!broadcast) return;
+          yield Promise.all(
+            Object.entries(broadcast).map((_02) => __async(this, [_02], function* ([type, data]) {
+              yield this._broadcast({
+                message: { data, type },
+                senderId: sessionId
+              });
+            }))
+          );
+        });
+        const handleSelf = () => __async(this, null, function* () {
+          if (!self) return;
           yield Promise.all(
             Object.entries(self).map((_02) => __async(this, [_02], function* ([type, data]) {
               yield this._sendSelfMessage({ data, type }, { sessionId, user });
             }))
           );
-        }
-        if (sync) {
-          this._platform.pubSub.publish(this.id, __spreadValues({
+        });
+        const handleSync = () => __async(this, null, function* () {
+          if (!sync) return;
+          yield this._platform.pubSub.publish(this.id, __spreadValues({
             connectionId: session.id,
             options: { type: "sync" },
             room: this.id,
@@ -716,7 +757,8 @@ var IORoom = class {
               yield this._sendSelfMessage({ data, type }, { sessionId, user });
             }))
           );
-        }
+        });
+        yield Promise.all([handleBroadcast(), handleSelf(), handleSync()]);
       }));
     });
   }
@@ -734,9 +776,11 @@ var IORoom = class {
   _sendMessage(pluvWs, message) {
     return __async(this, null, function* () {
       const { data, type } = message;
+      if (!(yield this._initialized)) return;
+      const doc = yield this._doc;
       this._listeners.onMessage({
         context: this._context,
-        encodedState: this._doc.getEncodedState(),
+        encodedState: doc.getEncodedState(),
         message: { data, type },
         room: this.id,
         user: message.user
@@ -784,9 +828,10 @@ var IORoom = class {
     return __async(this, null, function* () {
       var _a;
       if (!sender) return;
+      const doc = yield this._doc;
       const context = {
         context: this._context,
-        doc: this._doc,
+        doc,
         room: this.id,
         session: null,
         sessions: yield this._getSessions()
@@ -819,7 +864,7 @@ var IORoom = class {
 };
 
 // src/version.generated.ts
-var version = "0.23.0";
+var version = "0.24.1";
 
 // src/PluvServer.ts
 var PluvServer = class {
@@ -863,9 +908,7 @@ var PluvServer = class {
         const oldState = yield this._platform.persistance.getStorageState(room);
         const update = data == null ? void 0 : data.update;
         const updates = [
-          oldState ? null : yield (_a = this._getInitialStorage) == null ? void 0 : _a.call(this, __spreadProps(__spreadValues({}, context), {
-            room
-          })),
+          oldState ? null : yield (_a = this._getInitialStorage) == null ? void 0 : _a.call(this, __spreadProps(__spreadValues({}, context), { room })),
           update
         ];
         if (updates.some((_update) => !!_update)) {
@@ -898,9 +941,7 @@ var PluvServer = class {
         var _a;
         const origin = data == null ? void 0 : data.origin;
         const update = (_a = data == null ? void 0 : data.update) != null ? _a : null;
-        if (origin === "$INITIALIZED" && Object.keys(doc.toJson()).length) {
-          return {};
-        }
+        if (origin === "$INITIALIZED" && Object.keys(doc.toJson()).length) return {};
         const updated = update === null ? doc : doc.applyEncodedState({ update });
         const encodedState = updated.getEncodedState();
         this._platform.persistance.setStorageState(room, encodedState).then(() => {
@@ -915,7 +956,6 @@ var PluvServer = class {
     });
     this._context = {};
     this._getInitialStorage = null;
-    this._rooms = /* @__PURE__ */ new Map();
     const {
       authorize: authorize2,
       context,
@@ -950,29 +990,12 @@ var PluvServer = class {
   get _procedure() {
     return new PluvProcedure();
   }
-  createToken(params) {
-    return __async(this, null, function* () {
-      if (!this._authorize) {
-        throw new Error("IO does not specify authorize during initialization.");
-      }
-      const ioAuthorize = typeof this._authorize === "function" ? this._authorize(params) : this._authorize;
-      const secret = ioAuthorize.secret;
-      return yield authorize({
-        platform: this._platform,
-        secret
-      }).encode(params);
-    });
-  }
-  getRoom(room, ...options) {
+  createRoom(room, ...options) {
     var _a, _c;
-    const _b = (_a = options[0]) != null ? _a : {}, { debug } = _b, platformRoomContext = __objRest(_b, ["debug"]);
-    this._purgeEmptyRooms();
+    const _b = (_a = options[0]) != null ? _a : {}, { debug, onDestroy, onMessage } = _b, platformRoomContext = __objRest(_b, ["debug", "onDestroy", "onMessage"]);
     if (!/^[a-z0-9]+[a-z0-9\-_]+[a-z0-9]+$/i.test(room)) {
       throw new Error("Unsupported room name");
     }
-    const platform = this._platform;
-    const oldRoom = this._rooms.get(room);
-    if (oldRoom) return oldRoom;
     const roomContext = __spreadValues(__spreadValues({}, this._context), platformRoomContext);
     const newRoom = new IORoom(room, {
       authorize: (_c = this._authorize) != null ? _c : void 0,
@@ -981,39 +1004,37 @@ var PluvServer = class {
       debug: debug != null ? debug : this._debug,
       onDestroy: (event) => __async(this, null, function* () {
         this._logDebug(`${colors2.blue("Deleting empty room:")} ${room}`);
-        this._rooms.delete(room);
+        yield Promise.resolve(onDestroy == null ? void 0 : onDestroy(event));
         yield Promise.resolve(this._listeners.onRoomDeleted(event));
         yield this._platform.persistance.deleteStorageState(room);
-        if (this._debug) {
-          const rooms = Array.from(this._rooms.keys());
-          this._logDebug(`${colors2.blue("Deleted room:")} ${room}`);
-          this._logDebug(`${colors2.blue("Rooms available:")} ${rooms.join(", ")}`);
-        }
+        this._logDebug(`${colors2.blue("Deleted room:")} ${room}`);
       }),
       onMessage: (event) => __async(this, null, function* () {
+        yield Promise.resolve(onMessage == null ? void 0 : onMessage(event));
         yield Promise.resolve(this._listeners.onRoomMessage(event));
       }),
-      platform,
+      platform: this._platform,
       router: this._router
     });
-    this._rooms.set(room, newRoom);
-    if (this._debug) {
-      const rooms = Array.from(this._rooms.keys());
-      this._logDebug(`${colors2.blue("Created room:")} ${room}`);
-      this._logDebug(`${colors2.blue("Rooms available:")} ${rooms.join(", ")}`);
-    }
+    this._logDebug(`${colors2.blue("Created room:")} ${room}`);
     return newRoom;
   }
+  createToken(params) {
+    return __async(this, null, function* () {
+      if (!this._authorize) {
+        throw new Error("IO does not specify authorize during initialization.");
+      }
+      const ioAuthorize = typeof this._authorize === "function" ? this._authorize(params) : this._authorize;
+      const secret = ioAuthorize.secret;
+      return yield authorize({
+        platform: this._platform,
+        secret
+      }).encode(params);
+    });
+  }
   _logDebug(...data) {
     this._debug && console.log(...data);
   }
-  _purgeEmptyRooms() {
-    const rooms = Array.from(this._rooms.entries());
-    rooms.forEach(([id, room]) => {
-      if (!!(room == null ? void 0 : room.getSize())) return;
-      this._rooms.delete(id);
-    });
-  }
 };
 
 // src/PluvIO.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pluv/io",
-  "version": "0.23.0",
+  "version": "0.24.1",
   "description": "@pluv/io server-side websocket manager",
   "author": "leedavidcs",
   "license": "MIT",
@@ -18,19 +18,19 @@
   },
   "dependencies": {
     "@panva/hkdf": "^1.2.1",
-    "jose": "^5.6.3",
+    "jose": "^5.7.0",
     "kleur": "^4.1.5",
     "wonka": "^6.3.4",
-    "@pluv/crdt": "^0.23.0",
-    "@pluv/types": "^0.23.0"
+    "@pluv/crdt": "^0.24.1",
+    "@pluv/types": "^0.24.1"
   },
   "devDependencies": {
     "eslint": "^8.57.0",
     "genversion": "^3.2.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": "pnpm run version && tsup src/index.ts --format esm,cjs --dts",