@pluv/io 0.3.9 → 0.4.0

package/dist/index.mjs

@@ -224,6 +224,10 @@ var AbstractWebSocket = class {
 // src/PluvIO.ts
 import colors2 from "kleur";
 
+// src/IORoom.ts
+import { doc } from "@pluv/crdt-yjs";
+import colors from "kleur";
+
 // src/authorize.ts
 import hkdf from "@panva/hkdf";
 import { EncryptJWT, jwtDecrypt } from "jose";
@@ -261,8 +265,6 @@ var authorize = (params) => {
 };
 
 // src/IORoom.ts
-import { doc } from "@pluv/crdt-yjs";
-import colors from "kleur";
 var PING_TIMEOUT_MS = 3e4;
 var IORoom = class {
   constructor(id, config) {
@@ -359,101 +361,12 @@ var IORoom = class {
         sessionId,
         user != null ? user : {}
       );
+      const onClose = this._onClose(session, uninitializeWs).bind(this);
+      const onMessage = this._onMessage(session).bind(this);
+      pluvWs.addEventListener("close", onClose);
+      pluvWs.addEventListener("error", onClose);
+      pluvWs.addEventListener("message", onMessage);
       this._emitRegistered(session);
-      this._emitStorageReceived(session);
-      this._emitUserJoined(session);
-      const context = {
-        context: this._context,
-        doc: this._doc,
-        room: this.id,
-        session,
-        sessions: this._sessions
-      };
-      pluvWs.addEventListener("message", (event) => {
-        if (!this._uninitialize)
-          return;
-        if (session.quit) {
-          session.webSocket.close(1011, "WebSocket broken.");
-          return;
-        }
-        const message = this._parseMessage(event);
-        if (!message)
-          return;
-        const eventConfig = this._getEventConfig(message);
-        if (!eventConfig)
-          return;
-        this._resolveMessage(message, context).then((output) => {
-          var _a2, _b;
-          if (!output)
-            return;
-          const eventType = (_b = (_a2 = eventConfig.options) == null ? void 0 : _a2.type) != null ? _b : "broadcast";
-          switch (eventType) {
-            case "self": {
-              Object.entries(output).forEach(([type, data]) => {
-                this._sendSelfMessage({ data, type }, session);
-              });
-              return;
-            }
-            case "sync": {
-              this._platform.pubSub.publish(this.id, __spreadValues({
-                connectionId: session.id,
-                options: eventConfig.options,
-                room: this.id,
-                user: session.user
-              }, message));
-              Object.entries(output).forEach(([type, data]) => {
-                this._sendSelfMessage({ data, type }, session);
-              });
-              return;
-            }
-            case "broadcast":
-            default: {
-              Object.entries(output).forEach(([type, data]) => {
-                this._broadcast({
-                  message: { data, type },
-                  senderId: session.id
-                });
-              });
-            }
-          }
-        });
-      });
-      const closeHandler = () => {
-        if (!this._uninitialize)
-          return;
-        session.quit = true;
-        this._logDebug(
-          `${colors.blue(
-            `(Unregistering connection for room ${this.id}:`
-          )} ${sessionId}`
-        );
-        this._sessions.delete(session.id);
-        this._platform.persistance.deleteUser(this.id, session.id).finally(() => {
-          var _a2;
-          this._broadcast({
-            message: {
-              type: "$EXIT",
-              data: { sessionId: session.id }
-            },
-            senderId: session.id
-          });
-          uninitializeWs();
-          const size2 = this.getSize();
-          this._logDebug(
-            `${colors.blue(
-              `Unregistered connection for room ${this.id}:`
-            )} ${sessionId}`
-          );
-          this._logDebug(
-            `${colors.blue(`Room ${this.id} size:`)} ${size2}`
-          );
-          if (size2)
-            return;
-          (_a2 = this._uninitialize) == null ? void 0 : _a2.call(this);
-        });
-      };
-      pluvWs.addEventListener("close", closeHandler);
-      pluvWs.addEventListener("error", closeHandler);
       this._logDebug(
         `${colors.blue(
           `Registered connection for room ${this.id}:`
@@ -501,34 +414,6 @@ var IORoom = class {
       session
     );
   }
-  _emitStorageReceived(session) {
-    this._platform.persistance.getStorageState(this.id).then((_state) => __async(this, null, function* () {
-      var _a, _b;
-      const state = (_b = _state != null ? _state : yield (_a = this._initialStorage) == null ? void 0 : _a.call(this)) != null ? _b : this._doc.encodeStateAsUpdate();
-      this._sendSelfMessage(
-        {
-          type: "$STORAGE_RECEIVED",
-          data: { state }
-        },
-        session
-      );
-    }));
-  }
-  _emitUserJoined(session) {
-    const user = session.user;
-    if (!user)
-      return;
-    this._broadcast({
-      message: {
-        type: "$USER_JOINED",
-        data: {
-          connectionId: session.id,
-          user
-        }
-      },
-      senderId: session.id
-    });
-  }
   _getAuthorizedUser(token) {
     return __async(this, null, function* () {
       var _a;
@@ -567,6 +452,19 @@ var IORoom = class {
     var _a;
     return (_a = this._events[message.type]) != null ? _a : null;
   }
+  _getEventInputs(message) {
+    const eventConfig = this._getEventConfig(message);
+    if (!eventConfig)
+      return message.data;
+    return eventConfig.input ? eventConfig.input.parse(message.data) : message.data;
+  }
+  _getEventResolverObject(message) {
+    const eventConfig = this._getEventConfig(message);
+    if (!eventConfig)
+      return {};
+    const resolver = eventConfig.resolver;
+    return typeof resolver === "function" ? { broadcast: resolver } : __spreadValues({}, resolver);
+  }
   _initialize() {
     return __async(this, null, function* () {
       this._logDebug(`${colors.blue(`Initializing room ${this.id}:`)}`);
@@ -598,6 +496,105 @@ var IORoom = class {
   _logDebug(...data) {
     this._debug && console.log(...data);
   }
+  _onClose(session, callback) {
+    return () => {
+      if (!this._uninitialize)
+        return;
+      session.quit = true;
+      this._logDebug(
+        `${colors.blue(
+          `(Unregistering connection for room ${this.id}:`
+        )} ${session.id}`
+      );
+      this._sessions.delete(session.id);
+      this._platform.persistance.deleteUser(this.id, session.id).finally(() => {
+        var _a;
+        this._broadcast({
+          message: {
+            type: "$EXIT",
+            data: { sessionId: session.id }
+          },
+          senderId: session.id
+        });
+        callback == null ? void 0 : callback();
+        const size = this.getSize();
+        this._logDebug(
+          `${colors.blue(
+            `Unregistered connection for room ${this.id}:`
+          )} ${session.id}`
+        );
+        this._logDebug(
+          `${colors.blue(`Room ${this.id} size:`)} ${size}`
+        );
+        if (size)
+          return;
+        (_a = this._uninitialize) == null ? void 0 : _a.call(this);
+      });
+    };
+  }
+  _onMessage(session) {
+    return (event) => {
+      var _a, _b, _c;
+      const context = {
+        context: this._context,
+        doc: this._doc,
+        room: this.id,
+        session,
+        sessions: this._sessions
+      };
+      if (!this._uninitialize)
+        return;
+      if (session.quit) {
+        session.webSocket.close(1011, "WebSocket broken.");
+        return;
+      }
+      const message = this._parseMessage(event);
+      if (!message)
+        return;
+      const resolver = this._getEventResolverObject(message);
+      let inputs;
+      try {
+        inputs = this._getEventInputs(message);
+      } catch (error) {
+        session == null ? void 0 : session.webSocket.handleError({
+          error,
+          message: "Invalid input",
+          session
+        });
+        return;
+      }
+      Promise.all([
+        (_a = resolver.broadcast) == null ? void 0 : _a.call(resolver, inputs, context),
+        (_b = resolver.self) == null ? void 0 : _b.call(resolver, inputs, context),
+        (_c = resolver.sync) == null ? void 0 : _c.call(resolver, inputs, context)
+      ]).then(([broadcast, self, sync]) => {
+        if (broadcast) {
+          Object.entries(broadcast).forEach(([type, data]) => {
+            this._broadcast({
+              message: { data, type },
+              senderId: session.id
+            });
+          });
+        }
+        if (self) {
+          Object.entries(self).forEach(([type, data]) => {
+            this._sendSelfMessage({ data, type }, session);
+          });
+        }
+        if (sync) {
+          this._platform.pubSub.publish(this.id, __spreadValues({
+            connectionId: session.id,
+            options: { type: "sync" },
+            room: this.id,
+            user: session.user
+          }, message));
+          Object.entries(sync).forEach(([type, data]) => {
+            this._sendSelfMessage({ data, type }, session);
+          });
+        }
+      });
+    };
+  }
   _parseMessage(message) {
     const parsed = this._platform.parseData(message.data);
     try {
@@ -612,29 +609,6 @@ var IORoom = class {
       return null;
     }
   }
-  _resolveMessage(message, context) {
-    return __async(this, null, function* () {
-      const { session } = context;
-      const eventConfig = this._getEventConfig(message);
-      if (!eventConfig)
-        return null;
-      let input;
-      try {
-        input = eventConfig.input ? eventConfig.input.parse(message.data) : message.data;
-      } catch (error) {
-        session == null ? void 0 : session.webSocket.handleError({
-          error,
-          message: "Invalid input",
-          session
-        });
-        return null;
-      }
-      const output = yield eventConfig.resolver(input, context);
-      if (!output)
-        return null;
-      return output;
-    });
-  }
   _sendMessage(message, sender, options = {}) {
     switch (options.type) {
       case "self": {
@@ -684,13 +658,23 @@ var IORoom = class {
     const senderId = sender == null ? void 0 : sender.id;
     if (!senderId)
       return;
-    this._resolveMessage(message, {
+    const context = {
       context: this._context,
       doc: this._doc,
       room: this.id,
       session: null,
       sessions: this._sessions
-    }).then((output) => {
+    };
+    const resolver = this._getEventResolverObject(message).sync;
+    if (!resolver)
+      return;
+    let inputs;
+    try {
+      inputs = this._getEventInputs(message);
+    } catch (e) {
+      return;
+    }
+    Promise.resolve(resolver(inputs, context)).then((output) => {
       if (!output)
         return;
       Object.keys(output).forEach((type) => {
@@ -717,32 +701,70 @@ var PluvIO = class {
     this._rooms = /* @__PURE__ */ new Map();
     this._authorize = null;
     this._events = {
-      $PING: {
-        resolver: (data, { session }) => {
-          if (!session)
-            return {};
-          const currentTime = (/* @__PURE__ */ new Date()).getTime();
-          session.timers.ping = currentTime;
-          return { $PONG: {} };
-        },
-        options: { type: "self" }
-      },
       $GET_OTHERS: {
-        resolver: (data, { room, session, sessions }) => {
-          const others = Array.from(sessions.entries()).filter(([, wsSession]) => wsSession.id !== (session == null ? void 0 : session.id)).reduce(
-            (acc, [connectionId, { presence, user }]) => __spreadProps(__spreadValues({}, acc), {
-              [connectionId]: {
-                connectionId,
-                presence,
-                room,
-                user
+        resolver: {
+          sync: (data, { room, session, sessions }) => {
+            const others = Array.from(sessions.entries()).filter(([, wsSession]) => wsSession.id !== (session == null ? void 0 : session.id)).reduce(
+              (acc, [connectionId, { presence, user }]) => __spreadProps(__spreadValues({}, acc), {
+                [connectionId]: {
+                  connectionId,
+                  presence,
+                  room,
+                  user
+                }
+              }),
+              {}
+            );
+            return { $OTHERS_RECEIVED: { others } };
+          }
+        }
+      },
+      $INITIALIZE_SESSION: {
+        resolver: {
+          broadcast: ({ presence }, { session }) => {
+            if (!session)
+              return {};
+            session.presence = presence;
+            return {
+              $USER_JOINED: {
+                connectionId: session.id,
+                user: session.user,
+                presence
               }
-            }),
-            {}
-          );
-          return { $OTHERS_RECEIVED: { others } };
-        },
-        options: { type: "sync" }
+            };
+          },
+          self: (_0, _1) => __async(this, [_0, _1], function* ({ update }, { doc: doc2, room }) {
+            var _a, _b;
+            const oldState = yield this._platform.persistance.getStorageState(room);
+            const updates = [
+              oldState ? null : yield (_a = this._initialStorage) == null ? void 0 : _a.call(this, room),
+              update
+            ];
+            if (updates.some((_update) => !!_update)) {
+              const state2 = updates.reduce((_doc, _up) => _doc.applyUpdate(_up), doc2).encodeStateAsUpdate();
+              yield this._platform.persistance.setStorageState(
+                room,
+                state2
+              );
+              this._listeners.onStorageUpdated(room, state2);
+            }
+            const state = (_b = yield this._platform.persistance.getStorageState(
+              room
+            )) != null ? _b : doc2.encodeStateAsUpdate();
+            return { $STORAGE_RECEIVED: { state } };
+          })
+        }
+      },
+      $PING: {
+        resolver: {
+          self: (data, { session }) => {
+            if (!session)
+              return {};
+            const currentTime = (/* @__PURE__ */ new Date()).getTime();
+            session.timers.ping = currentTime;
+            return { $PONG: {} };
+          }
+        }
       },
       $UPDATE_PRESENCE: {
         resolver: ({ presence }, { session }) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pluv/io",
-  "version": "0.3.9",
+  "version": "0.4.0",
   "description": "@pluv/io server-side websocket manager",
   "author": "leedavidcs",
   "license": "MIT",
@@ -17,12 +17,12 @@
     "access": "public"
   },
   "dependencies": {
-    "@panva/hkdf": "^1.0.4",
-    "jose": "^4.13.1",
+    "@panva/hkdf": "^1.1.1",
+    "jose": "^4.14.4",
     "kleur": "^4.1.5",
-    "wonka": "^6.3.1",
-    "@pluv/crdt-yjs": "^0.3.6",
-    "@pluv/types": "^0.1.6"
+    "wonka": "^6.3.2",
+    "@pluv/crdt-yjs": "^0.3.7",
+    "@pluv/types": "^0.2.0"
   },
   "peerDependencies": {
     "yjs": "^13.0.0"
@@ -30,9 +30,9 @@
   "devDependencies": {
     "tsup": "^6.7.0",
     "typescript": "^5.0.4",
-    "yjs": "^13.5.52",
-    "@pluv/tsconfig": "^0.1.5",
-    "eslint-config-pluv": "^0.1.10"
+    "yjs": "^13.6.0",
+    "@pluv/tsconfig": "^0.1.6",
+    "eslint-config-pluv": "^0.1.11"
   },
   "scripts": {
     "build": "tsup src/index.ts --format esm,cjs --dts",