@pluv/io 0.21.1 → 0.23.0

package/dist/index.mjs

@@ -353,10 +353,10 @@ var PING_TIMEOUT_MS = 3e4;
 // src/IORoom.ts
 var IORoom = class {
   constructor(id, config) {
-    this._sessions = /* @__PURE__ */ new Map();
-    this._uninitialize = null;
     this._authorize = null;
-    const { authorize: authorize2, context, crdt = noop, debug, onDestroy, platform, router } = config;
+    this._uninitialize = null;
+    this._sessions = /* @__PURE__ */ new Map();
+    const { authorize: authorize2, context, crdt = noop, debug, onDestroy, onMessage, platform, router } = config;
     this._context = context;
     this._debug = debug;
     this._docFactory = crdt.doc(() => ({}));
@@ -365,7 +365,8 @@ var IORoom = class {
     this._platform = platform.initialize({ context });
     this.id = id;
     this._listeners = {
-      onDestroy: (event) => onDestroy == null ? void 0 : onDestroy(event)
+      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();
@@ -582,9 +583,25 @@ var IORoom = class {
         this.id,
         (_a) => __async(this, null, function* () {
           var _b = _a, { options = {} } = _b, message = __objRest(_b, ["options"]);
-          const sessionId = message.connectionId;
-          const user = message.user;
-          yield this._sendMessage(message, { sessionId, user }, options);
+          const sender = {
+            sessionId: message.connectionId,
+            user: message.user
+          };
+          switch (options.type) {
+            case "self": {
+              yield this._sendSelfMessage(message, sender);
+              return;
+            }
+            case "sync": {
+              yield this._sendSyncMessage(message, sender);
+              return;
+            }
+            case "broadcast":
+            default: {
+              const sessionIds = options.sessionIds;
+              yield this._sendBroadcastMessage(message, sender, sessionIds);
+            }
+          }
         })
       );
       this._uninitialize = () => __async(this, null, function* () {
@@ -592,10 +609,11 @@ var IORoom = class {
         const encodedState = this._doc.getEncodedState();
         this._doc.destroy();
         this._doc = this._docFactory.getEmpty();
-        this._listeners.onDestroy(__spreadProps(__spreadValues({}, this._context), {
+        this._listeners.onDestroy({
+          context: this._context,
           encodedState,
           room: this.id
-        }));
+        });
         this._uninitialize = null;
       });
     });
@@ -713,23 +731,17 @@ var IORoom = class {
       return null;
     }
   }
-  _sendMessage(_0, _1) {
-    return __async(this, arguments, function* (message, sender, options = {}) {
-      switch (options.type) {
-        case "self": {
-          yield this._sendSelfMessage(message, sender);
-          return;
-        }
-        case "sync": {
-          yield this._sendSyncMessage(message, sender);
-          return;
-        }
-        case "broadcast":
-        default: {
-          const sessionIds = options.sessionIds;
-          yield this._sendBroadcastMessage(message, sender, sessionIds);
-        }
-      }
+  _sendMessage(pluvWs, message) {
+    return __async(this, null, function* () {
+      const { data, type } = message;
+      this._listeners.onMessage({
+        context: this._context,
+        encodedState: this._doc.getEncodedState(),
+        message: { data, type },
+        room: this.id,
+        user: message.user
+      });
+      yield Promise.resolve(pluvWs.sendMessage(message));
     });
   }
   _sendBroadcastMessage(message, sender, sessionIds) {
@@ -746,7 +758,7 @@ var IORoom = class {
         var _a2;
         const session = yield pluvWs.getSession();
         const user = (_a2 = session.user) != null ? _a2 : null;
-        pluvWs.sendMessage({ connectionId, data, room, type, user });
+        this._sendMessage(pluvWs, { connectionId, data, room, type, user });
       }));
       yield Promise.all(promises);
     });
@@ -761,7 +773,7 @@ var IORoom = class {
       if (message.type === "$PONG") yield this._emitQuitters();
       const session = yield pluvWs.getSession();
       const user = (_b = session.user) != null ? _b : null;
-      pluvWs.sendMessage(__spreadValues({
+      this._sendMessage(pluvWs, __spreadValues({
         connectionId: senderId,
         room: this.id,
         user
@@ -807,114 +819,15 @@ var IORoom = class {
 };
 
 // src/version.generated.ts
-var version = "0.21.1";
+var version = "0.23.0";
 
 // src/PluvServer.ts
 var PluvServer = class {
   constructor(options) {
-    this._rooms = /* @__PURE__ */ new Map();
+    this.version = version;
     this._authorize = null;
-    this._context = {};
-    this._version = version;
-    const {
-      authorize: authorize2,
-      context,
-      crdt = noop2,
-      debug = false,
-      onRoomDeleted,
-      onStorageUpdated,
-      platform,
-      router = new PluvRouter({})
-    } = options;
-    this._crdt = crdt;
-    this._debug = debug;
-    this._platform = platform;
-    this._router = router != null ? router : null;
-    if (authorize2) this._authorize = authorize2;
-    if (context) this._context = context;
-    this._listeners = {
-      onRoomDeleted: (event) => onRoomDeleted == null ? void 0 : onRoomDeleted(event),
-      onStorageUpdated: (event) => onStorageUpdated == null ? void 0 : onStorageUpdated(event)
-    };
-  }
-  get _events() {
-    return this._router._events;
-  }
-  get _registrationMode() {
-    return this._platform._registrationMode;
-  }
-  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) {
-    var _a, _c;
-    const _b = (_a = options[0]) != null ? _a : {}, { debug } = _b, platformRoomContext = __objRest(_b, ["debug"]);
-    this._purgeEmptyRooms();
-    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,
-      context: roomContext,
-      crdt: this._crdt,
-      debug: debug != null ? debug : this._debug,
-      onDestroy: (_0) => __async(this, [_0], function* ({ encodedState, room: room2 }) {
-        this._logDebug(`${colors2.blue("Deleting empty room:")} ${room2}`);
-        const roomContext2 = __spreadValues({
-          room: room2,
-          encodedState
-        }, platformRoomContext);
-        this._rooms.delete(room2);
-        yield Promise.resolve(this._listeners.onRoomDeleted(roomContext2));
-        yield this._platform.persistance.deleteStorageState(room2);
-        if (this._debug) {
-          const rooms = Array.from(this._rooms.keys());
-          this._logDebug(`${colors2.blue("Deleted room:")} ${room2}`);
-          this._logDebug(`${colors2.blue("Rooms available:")} ${rooms.join(", ")}`);
-        }
-      }),
-      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(", ")}`);
-    }
-    return newRoom;
-  }
-  _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/PluvIO.ts
-var PluvIO = class {
-  constructor(options) {
-    this._router = new PluvRouter({
-      $GET_OTHERS: this.procedure.sync((data, { room, session, sessions }) => {
+    this._baseRouter = new PluvRouter({
+      $GET_OTHERS: this._procedure.sync((data, { room, session, sessions }) => {
         const currentTime = (/* @__PURE__ */ new Date()).getTime();
         const others = sessions.filter((wsSession) => {
           if (wsSession.id === (session == null ? void 0 : session.id)) return false;
@@ -934,7 +847,7 @@ var PluvIO = class {
         );
         return { $OTHERS_RECEIVED: { others } };
       }),
-      $INITIALIZE_SESSION: this.procedure.broadcast((data, { session }) => {
+      $INITIALIZE_SESSION: this._procedure.broadcast((data, { session }) => {
         const presence = data == null ? void 0 : data.presence;
         if (!session) return {};
         session.presence = presence;
@@ -958,25 +871,30 @@ var PluvIO = class {
         if (updates.some((_update) => !!_update)) {
           const encodedState = doc.batchApplyEncodedState(updates).getEncodedState();
           yield this._platform.persistance.setStorageState(room, encodedState);
-          this._listeners.onStorageUpdated(__spreadProps(__spreadValues({}, context), { encodedState, room }));
+          this._listeners.onStorageUpdated({ context, encodedState, room });
         }
         const state = (_b = yield this._platform.persistance.getStorageState(room)) != null ? _b : doc.getEncodedState();
         return { $STORAGE_RECEIVED: { state } };
       })),
-      $PING: this.procedure.self((data, { session }) => {
+      $PING: this._procedure.self((data, { session }) => {
         if (!session) return {};
         const currentTime = (/* @__PURE__ */ new Date()).getTime();
-        session.timers.ping = currentTime;
+        const prevState = session.webSocket.state;
+        session.webSocket.state = __spreadProps(__spreadValues({}, prevState), {
+          timers: __spreadProps(__spreadValues({}, prevState.timers), {
+            ping: currentTime
+          })
+        });
         return { $PONG: {} };
       }),
-      $UPDATE_PRESENCE: this.procedure.broadcast((data, { session }) => {
+      $UPDATE_PRESENCE: this._procedure.broadcast((data, { session }) => {
         const presence = data == null ? void 0 : data.presence;
         if (!session) return {};
         const updated = Object.assign(/* @__PURE__ */ Object.create(null), session.presence, presence);
         session.webSocket.presence = updated;
         return { $PRESENCE_UPDATED: { presence: updated } };
       }),
-      $UPDATE_STORAGE: this.procedure.broadcast((data, { context, doc, room }) => {
+      $UPDATE_STORAGE: this._procedure.broadcast((data, { context, doc, room }) => {
         var _a;
         const origin = data == null ? void 0 : data.origin;
         const update = (_a = data == null ? void 0 : data.update) != null ? _a : null;
@@ -986,36 +904,40 @@ var PluvIO = class {
         const updated = update === null ? doc : doc.applyEncodedState({ update });
         const encodedState = updated.getEncodedState();
         this._platform.persistance.setStorageState(room, encodedState).then(() => {
-          this._listeners.onStorageUpdated(__spreadProps(__spreadValues({}, context), {
+          this._listeners.onStorageUpdated({
+            context,
             encodedState,
             room
-          }));
+          });
         });
         return { $STORAGE_UPDATED: { state: encodedState } };
       })
     });
-    this._authorize = null;
     this._context = {};
     this._getInitialStorage = null;
-    this._version = version;
+    this._rooms = /* @__PURE__ */ new Map();
     const {
       authorize: authorize2,
       context,
-      crdt = noop3,
+      crdt = noop2,
       debug = false,
       getInitialStorage,
       onRoomDeleted,
+      onRoomMessage,
       onStorageUpdated,
-      platform
+      platform,
+      router = new PluvRouter({})
     } = options;
     this._crdt = crdt;
     this._debug = debug;
     this._platform = platform;
+    this._router = router ? this._baseRouter : PluvRouter.merge(this._baseRouter, router);
     if (authorize2) this._authorize = authorize2;
     if (context) this._context = context;
     if (getInitialStorage) this._getInitialStorage = getInitialStorage;
     this._listeners = {
       onRoomDeleted: (event) => onRoomDeleted == null ? void 0 : onRoomDeleted(event),
+      onRoomMessage: (event) => onRoomMessage == null ? void 0 : onRoomMessage(event),
       onStorageUpdated: (event) => onStorageUpdated == null ? void 0 : onStorageUpdated(event)
     };
   }
@@ -1025,6 +947,88 @@ var PluvIO = class {
   get _registrationMode() {
     return this._platform._registrationMode;
   }
+  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) {
+    var _a, _c;
+    const _b = (_a = options[0]) != null ? _a : {}, { debug } = _b, platformRoomContext = __objRest(_b, ["debug"]);
+    this._purgeEmptyRooms();
+    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,
+      context: roomContext,
+      crdt: this._crdt,
+      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(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(", ")}`);
+        }
+      }),
+      onMessage: (event) => __async(this, null, function* () {
+        yield Promise.resolve(this._listeners.onRoomMessage(event));
+      }),
+      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(", ")}`);
+    }
+    return newRoom;
+  }
+  _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
+var PluvIO = class {
+  constructor(options) {
+    this.version = version;
+    this._authorize = null;
+    this._context = {};
+    const { authorize: authorize2, context, crdt = noop3, debug = false, platform } = options;
+    this._crdt = crdt;
+    this._debug = debug;
+    this._platform = platform;
+    if (authorize2) this._authorize = authorize2;
+    if (context) this._context = context;
+  }
   get procedure() {
     return new PluvProcedure();
   }
@@ -1047,29 +1051,24 @@ var PluvIO = class {
   }
   server(config = {}) {
     var _a;
-    const router = config.router ? this.mergeRouters(this._router, config.router) : this._router;
-    return new PluvServer(__spreadProps(__spreadValues({}, this._listeners), {
+    return new PluvServer(__spreadProps(__spreadValues({}, config), {
       authorize: (_a = this._authorize) != null ? _a : void 0,
       context: this._context,
       crdt: this._crdt,
       debug: this._debug,
-      platform: this._platform,
-      router
+      platform: this._platform
     }));
   }
 };
 
 // src/createIO.ts
 var createIO = (params) => {
-  const { authorize: authorize2, context, crdt, debug, getInitialStorage, onRoomDeleted, onStorageUpdated, platform } = params;
+  const { authorize: authorize2, context, crdt, debug, platform } = params;
   return new PluvIO({
     authorize: authorize2,
     context,
     crdt,
     debug,
-    getInitialStorage,
-    onRoomDeleted,
-    onStorageUpdated,
     platform
   });
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pluv/io",
-  "version": "0.21.1",
+  "version": "0.23.0",
   "description": "@pluv/io server-side websocket manager",
   "author": "leedavidcs",
   "license": "MIT",
@@ -21,16 +21,16 @@
     "jose": "^5.6.3",
     "kleur": "^4.1.5",
     "wonka": "^6.3.4",
-    "@pluv/crdt": "^0.21.1",
-    "@pluv/types": "^0.21.1"
+    "@pluv/crdt": "^0.23.0",
+    "@pluv/types": "^0.23.0"
   },
   "devDependencies": {
     "eslint": "^8.57.0",
     "genversion": "^3.2.0",
     "tsup": "^8.2.4",
     "typescript": "^5.5.4",
-    "@pluv/tsconfig": "^0.21.1",
-    "eslint-config-pluv": "^0.21.1"
+    "@pluv/tsconfig": "^0.23.0",
+    "eslint-config-pluv": "^0.23.0"
   },
   "scripts": {
     "build": "pnpm run version && tsup src/index.ts --format esm,cjs --dts",

package/src/AbstractPlatform.ts

@@ -39,16 +39,16 @@ export abstract class AbstractPlatform<
     TPlatformContext extends Record<string, any> = {},
     TRoomContext extends Record<string, any> = {},
 > {
-    private _initialized: boolean = false;
-
-    readonly _ioContext: TPlatformContext | undefined;
-    readonly _roomContext: TRoomContext | undefined;
+    protected readonly _ioContext: TPlatformContext | undefined;
+    protected readonly _roomContext: TRoomContext | undefined;
 
-    abstract readonly _registrationMode: WebSocketRegistrationMode;
+    private _initialized: boolean = false;
 
     public persistance: AbstractPersistance;
     public pubSub: AbstractPubSub;
 
+    public abstract readonly _registrationMode: WebSocketRegistrationMode;
+
     constructor(config: AbstractPlatformConfig<TPlatformContext, TRoomContext> = {}) {
         const { context, persistance, pubSub } = config;
 
@@ -68,7 +68,7 @@ export abstract class AbstractPlatform<
 
     public abstract getLastPing(webSocket: AbstractWebSocket): number | null;
 
-    public abstract getSerializedState(webSocket: AbstractWebSocket): WebSocketSerializedState | null;
+    public abstract getSerializedState(webSocket: InferWebSocketSource<TWebSocket>): WebSocketSerializedState | null;
 
     public abstract getSessionId(webSocket: InferWebSocketSource<TWebSocket>): string | null;
 

package/src/AbstractWebSocket.ts

@@ -72,6 +72,7 @@ export abstract class AbstractWebSocket<TWebSocket = any> {
     public abstract get readyState(): 0 | 1 | 2 | 3;
     public abstract get sessionId(): string;
     public abstract get state(): WebSocketSerializedState;
+    public abstract set state(state: WebSocketSerializedState);
 
     constructor(webSocket: TWebSocket, config: AbstractWebSocketConfig) {
         const { persistance, room } = config;