@pluv/io 0.44.2 → 1.0.1

package/dist/index.mjs

@@ -301,7 +301,9 @@ var PluvProcedure = class _PluvProcedure {
     }));
   }
   input(input) {
-    return new _PluvProcedure({ input });
+    return new _PluvProcedure({
+      input
+    });
   }
   self(resolver) {
     const { self } = this.config;
@@ -338,7 +340,10 @@ var PluvRouter = class _PluvRouter {
     this._defs = { events };
   }
   static merge(...routers) {
-    const events = Object.assign(/* @__PURE__ */ Object.create(null), ...routers.map((router) => router._defs.events));
+    const events = Object.assign(
+      /* @__PURE__ */ Object.create(null),
+      ...routers.map((router) => router._defs.events)
+    );
     return new _PluvRouter(events);
   }
   _isValidEventName(name) {
@@ -541,7 +546,9 @@ var IORoom = class {
         }));
         this._addUserSession(user.id, pluvWs.sessionId);
       }
-      this._logDebug(`${colors.blue(`Registering connection for room ${this.id}:`)} ${pluvWs.sessionId}`);
+      this._logDebug(
+        `${colors.blue(`Registering connection for room ${this.id}:`)} ${pluvWs.sessionId}`
+      );
       yield this._platform.acceptWebSocket(pluvWs);
       this._sessions.set(pluvWs.sessionId, pluvWs);
       yield this._platform.persistence.addUser(this.id, pluvWs.sessionId, user != null ? user : {});
@@ -554,7 +561,9 @@ var IORoom = class {
       }
       yield this._emitRegistered(pluvWs);
       const size = this.getSize();
-      this._logDebug(`${colors.blue(`Registered connection for room ${this.id}:`)} ${pluvWs.sessionId}`);
+      this._logDebug(
+        `${colors.blue(`Registered connection for room ${this.id}:`)} ${pluvWs.sessionId}`
+      );
       this._logDebug(`${colors.blue(`Room ${this.id} size:`)} ${size}`);
     });
   }
@@ -585,7 +594,9 @@ var IORoom = class {
       const closeWebSocket = (webSocket) => __async(this, null, function* () {
         webSocket.state = __spreadProps(__spreadValues({}, webSocket.state), { quit: true });
         const sessionId = webSocket.sessionId;
-        this._logDebug(`${colors.blue(`Unregistering connection for room ${this.id}:`)} ${sessionId}`);
+        this._logDebug(
+          `${colors.blue(`Unregistering connection for room ${this.id}:`)} ${sessionId}`
+        );
         this._sessions.delete(sessionId);
         yield this._platform.persistence.deleteUser(this.id, sessionId).catch(() => null);
         yield this._broadcast({
@@ -609,7 +620,9 @@ var IORoom = class {
         } catch (error) {
           console.error(error);
         }
-        this._logDebug(`${colors.blue(`Unregistered connection for room ${this.id}:`)} ${webSocket.sessionId}`);
+        this._logDebug(
+          `${colors.blue(`Unregistered connection for room ${this.id}:`)} ${webSocket.sessionId}`
+        );
       });
       const promises = webSockets.map((webSocket) => __async(this, null, function* () {
         yield closeWebSocket(webSocket).catch(() => null);
@@ -626,9 +639,9 @@ var IORoom = class {
   _emitQuitters() {
     return __async(this, null, function* () {
       const currentTime = (/* @__PURE__ */ new Date()).getTime();
-      const quitters = Array.from(this._sessions.values()).filter(
-        (pluvWs) => pluvWs.state.quit || currentTime - pluvWs.state.timers.ping > PING_TIMEOUT_MS
-      );
+      const quitters = Array.from(this._sessions.values()).filter((pluvWs) => {
+        return pluvWs.state.quit || currentTime - pluvWs.state.timers.ping > PING_TIMEOUT_MS;
+      });
       this._closeWebSockets(quitters);
     });
   }
@@ -638,20 +651,21 @@ var IORoom = class {
       const sessionId = session.id;
       const presence = session.presence;
       const user = session.user;
+      const doc = yield this._doc;
+      const encodedState = doc.getEncodedState();
       yield this._sendSelfMessage(
         {
           type: "$registered",
           data: {
             presence,
             sessionId,
+            state: encodedState,
             timers: { presence: session.timers.presence }
           }
         },
         { sessionId, user }
       );
       try {
-        const doc = yield this._doc;
-        const encodedState = doc.getEncodedState();
         yield Promise.resolve(
           this._listeners.onUserConnected({
             context: this._context,
@@ -698,7 +712,8 @@ var IORoom = class {
       const ioAuthorize = this._getIOAuthorize(options);
       if (!ioAuthorize) return null;
       if (!token) return null;
-      if (!ioAuthorize.secret) throw new Error("`authorize` was specified without a valid secret");
+      if (!ioAuthorize.secret)
+        throw new Error("`authorize` was specified without a valid secret");
       const payload = yield authorize({
         platform: this._platform,
         secret: ioAuthorize.secret
@@ -1099,7 +1114,7 @@ var pickBy = (obj, by) => {
 };
 
 // src/version.generated.ts
-var version = "0.44.2";
+var version = "1.0.1";
 
 // src/PluvServer.ts
 var PluvServer = class {
@@ -1142,16 +1157,28 @@ var PluvServer = class {
           }
         };
       }).self((_0, _1) => __async(this, [_0, _1], function* (data, { context, doc, room, session }) {
-        var _a, _b;
+        var _a;
         const oldState = yield this._platform.persistence.getStorageState(room);
         const update = data == null ? void 0 : data.update;
-        const updates = [
-          oldState ? null : yield (_a = this._getInitialStorage) == null ? void 0 : _a.call(this, { context, room }),
-          update
-        ];
-        if (updates.some((_update) => !!_update)) {
-          const encodedState2 = doc.batchApplyEncodedState({ updates }).getEncodedState();
-          yield this._platform.persistence.setStorageState(room, encodedState2);
+        if (!oldState) {
+          const loadedState = yield (_a = this._getInitialStorage) == null ? void 0 : _a.call(this, { context, room });
+          if (!!loadedState) {
+            doc.applyEncodedState({ update: loadedState }).getEncodedState();
+          }
+        }
+        if (!doc.isEmpty()) {
+          const encodedState2 = doc.getEncodedState();
+          return { $storageReceived: { state: encodedState2 } };
+        }
+        if (!!update) {
+          const encodedState2 = doc.applyEncodedState({ update }).getEncodedState();
+          const storageSize = new TextEncoder().encode(encodedState2).length;
+          if (!!this._limits.storageMaxSize && storageSize > this._limits.storageMaxSize) {
+            throw new Error("Storage has exceeded the size limit");
+          }
+          yield this._platform.persistence.setStorageState(room, encodedState2).catch((error) => {
+            this._logDebug(error);
+          });
           this._getListeners().onStorageUpdated({
             context,
             encodedState: encodedState2,
@@ -1160,11 +1187,7 @@ var PluvServer = class {
             webSocket: session == null ? void 0 : session.webSocket.webSocket
           });
         }
-        const encodedState = (_b = yield this._platform.persistence.getStorageState(room)) != null ? _b : doc.getEncodedState();
-        const storageSize = new TextEncoder().encode(encodedState).length;
-        if (!!this._limits.storageMaxSize && storageSize > this._limits.storageMaxSize) {
-          throw new Error("Storage has exceeded the size limit");
-        }
+        const encodedState = doc.getEncodedState();
         return { $storageReceived: { state: encodedState } };
       })),
       $ping: this._procedure.self((data, { session }) => {
@@ -1232,7 +1255,13 @@ var PluvServer = class {
       platform,
       router = new PluvRouter({})
     } = options;
-    const { onRoomDeleted, onRoomMessage, onStorageUpdated, onUserConnected, onUserDisconnected } = options;
+    const {
+      onRoomDeleted,
+      onRoomMessage,
+      onStorageUpdated,
+      onUserConnected,
+      onUserDisconnected
+    } = options;
     platform.validateConfig(options);
     this._crdt = crdt;
     this._debug = debug;
@@ -1253,7 +1282,8 @@ var PluvServer = class {
   }
   get fetch() {
     return (...args) => {
-      if (!this._platform._fetch) throw new Error(`\`${this._platform._name}\` does not support \`fetch\``);
+      if (!this._platform._fetch)
+        throw new Error(`\`${this._platform._name}\` does not support \`fetch\``);
       return this._platform._fetch(...args);
     };
   }
@@ -1279,7 +1309,8 @@ var PluvServer = class {
     if (this._platform._config.handleMode !== "io") {
       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");
+    if (!/^[a-z0-9](?:[a-z0-9-_]*[a-z0-9])?$/i.test(room))
+      throw new Error("Unsupported room name");
     const roomContext = platformRoomContext;
     const context = typeof this._context === "function" ? this._context(roomContext) : this._context;
     const newRoom = new IORoom(room, __spreadProps(__spreadValues({}, !!_meta ? { _meta } : {}), {
@@ -1349,7 +1380,8 @@ var PluvIO = class {
   createToken(params) {
     return __async(this, null, function* () {
       var _a;
-      if (!this._authorize) throw new Error("IO does not specify authorize during initialization.");
+      if (!this._authorize)
+        throw new Error("IO does not specify authorize during initialization.");
       const ioAuthorize = this._getIOAuthorize(params);
       const user = params.user;
       const parsed = !!ioAuthorize ? ioAuthorize.user.parse(user) : user;
@@ -1367,7 +1399,9 @@ var PluvIO = class {
       if (this._platform._createToken) return yield this._platform._createToken(params);
       const secret = (_a = ioAuthorize == null ? void 0 : ioAuthorize.secret) != null ? _a : null;
       if (!secret) throw new Error("`authorize` was specified without a valid secret");
-      return yield authorize({ platform: this._platform, secret }).encode(params);
+      return yield authorize({ platform: this._platform, secret }).encode(
+        params
+      );
     });
   }
   mergeRouters(...routers) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pluv/io",
-  "version": "0.44.2",
+  "version": "1.0.1",
   "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.44.2",
-    "@pluv/types": "^0.44.2"
+    "@pluv/crdt": "^1.0.1",
+    "@pluv/types": "^1.0.1"
   },
   "devDependencies": {
     "eslint": "^9.25.1",
     "genversion": "^3.2.0",
     "tsup": "^8.4.0",
     "typescript": "^5.8.3",
-    "@pluv/tsconfig": "^0.44.2",
-    "eslint-config-pluv": "^0.44.2"
+    "@pluv/tsconfig": "^1.0.1",
+    "eslint-config-pluv": "^1.0.1"
   },
   "scripts": {
     "build": "pnpm run version && tsup src/index.ts --format esm,cjs --dts",

package/src/AbstractPersistence.ts

@@ -1,7 +1,11 @@
 import type { JsonObject } from "@pluv/types";
 
 export abstract class AbstractPersistence {
-    public abstract addUser(room: string, connectionId: string, user: JsonObject | null): Promise<void>;
+    public abstract addUser(
+        room: string,
+        connectionId: string,
+        user: JsonObject | null,
+    ): Promise<void>;
 
     public abstract deleteStorageState(room: string): Promise<void>;
 
@@ -13,7 +17,9 @@ export abstract class AbstractPersistence {
 
     public abstract getUser(room: string, connectionId: string): Promise<JsonObject | null>;
 
-    public abstract getUsers(room: string): Promise<Map<[connectionId: string][0], JsonObject | null>>;
+    public abstract getUsers(
+        room: string,
+    ): Promise<Map<[connectionId: string][0], JsonObject | null>>;
 
     public abstract getUsersSize(room: string): Promise<number>;
 

package/src/AbstractPlatform.ts

@@ -10,7 +10,9 @@ export type InferPlatformWebSocketType<TPlatform extends AbstractPlatform> =
     TPlatform extends AbstractPlatform<infer IAbstractWebSocket> ? IAbstractWebSocket : never;
 
 export type InferPlatformWebSocketSource<TPlatform> =
-    TPlatform extends AbstractPlatform<infer IAbstractWebSocket> ? InferWebSocketSource<IAbstractWebSocket> : never;
+    TPlatform extends AbstractPlatform<infer IAbstractWebSocket>
+        ? InferWebSocketSource<IAbstractWebSocket>
+        : never;
 
 export type InferInitContextType<TPlatform extends AbstractPlatform> =
     TPlatform extends AbstractPlatform<any, infer IInitContext> ? IInitContext : never;
@@ -66,7 +68,9 @@ export abstract class AbstractPlatform<
 
     public abstract getLastPing(webSocket: AbstractWebSocket<any, any>): number | null;
 
-    public abstract getSerializedState(webSocket: InferWebSocketSource<TWebSocket>): WebSocketSerializedState | null;
+    public abstract getSerializedState(
+        webSocket: InferWebSocketSource<TWebSocket>,
+    ): WebSocketSerializedState | null;
 
     public abstract getSessionId(webSocket: InferWebSocketSource<TWebSocket>): string | null;
 

package/src/AbstractWebSocket.ts

@@ -54,7 +54,10 @@ export interface AbstractWebSocketConfig {
     room: string;
 }
 
-export abstract class AbstractWebSocket<TWebSocket = any, TAuthorize extends IOAuthorize<any, any> | null = null> {
+export abstract class AbstractWebSocket<
+    TWebSocket = any,
+    TAuthorize extends IOAuthorize<any, any> | null = null,
+> {
     /** The connection is not yet open. */
     public readonly CONNECTING = 0;
     /** The connection is open and ready to communicate. */
@@ -96,7 +99,10 @@ export abstract class AbstractWebSocket<TWebSocket = any, TAuthorize extends IOA
      * result.
      * @date August 28, 2022
      */
-    public abstract addEventListener<TType extends EventType>(type: TType, handler: AbstractListener<TType>): void;
+    public abstract addEventListener<TType extends EventType>(
+        type: TType,
+        handler: AbstractListener<TType>,
+    ): void;
 
     public abstract close(code?: number | undefined, reason?: string | undefined): void;
 
@@ -120,7 +126,9 @@ export abstract class AbstractWebSocket<TWebSocket = any, TAuthorize extends IOA
         });
     }
 
-    public sendMessage<TMessage extends IOEventMessage<any> = IOEventMessage<any>>(data: TMessage): void {
+    public sendMessage<TMessage extends IOEventMessage<any> = IOEventMessage<any>>(
+        data: TMessage,
+    ): void {
         return this.send(JSON.stringify(data));
     }
 }