@pluv/io 3.1.1 → 3.1.3

package/.turbo/turbo-build.log

@@ -1,9 +1,9 @@
 
-> @pluv/io@3.1.1 build /home/runner/work/pluv/pluv/packages/io
+> @pluv/io@3.1.3 build /home/runner/work/pluv/pluv/packages/io
 > pnpm run version && tsup src/index.ts --format esm,cjs --dts
 
 
-> @pluv/io@3.1.1 version /home/runner/work/pluv/pluv/packages/io
+> @pluv/io@3.1.3 version /home/runner/work/pluv/pluv/packages/io
 > genversion ./src/version.generated.ts --esm
 
 CLI Building entry: src/index.ts
@@ -12,11 +12,11 @@
 CLI Target: es6
 ESM Build start
 CJS Build start
-ESM dist/index.mjs 52.51 KB
-ESM ⚡️ Build success in 116ms
-CJS dist/index.js 54.68 KB
-CJS ⚡️ Build success in 119ms
+CJS dist/index.js 55.16 KB
+CJS ⚡️ Build success in 168ms
+ESM dist/index.mjs 52.98 KB
+ESM ⚡️ Build success in 169ms
 DTS Build start
-DTS ⚡️ Build success in 4316ms
-DTS dist/index.d.mts 33.94 KB
-DTS dist/index.d.ts  33.94 KB
+DTS ⚡️ Build success in 4308ms
+DTS dist/index.d.mts 33.98 KB
+DTS dist/index.d.ts  33.98 KB

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @pluv/io
 
+## 3.1.3
+
+### Patch Changes
+
+- 651a9f8: Fixed applying `getInitialStorage` if the initial storage state is empty.
+    - @pluv/crdt@3.1.3
+    - @pluv/types@3.1.3
+
+## 3.1.2
+
+### Patch Changes
+
+- 8f138aa: Fixed `getInitialStorage` not being applied.
+    - @pluv/crdt@3.1.2
+    - @pluv/types@3.1.2
+
 ## 3.1.1
 
 ### Patch Changes

package/README.md

@@ -38,9 +38,19 @@ Create your pluv.io backend
 
 ```ts
 // backend
-const io = createIO(platformNode({ crdt: yjs }));
+const io = createIO(
+  platformNode({
+    context: () => ({ db }),
+    crdt: yjs,
+  })
+);
 
 export const ioServer = io.server({
+  getInitialStorage: async ({ context: { db }, room }) => {
+    return await db.room
+      .findUnique({ where: { id: room } })
+      .then((result) => result?.encodedState ?? null);
+  },
   router: io.router({
     sendGreeting: io.procedure
       .input(z.object({ message: z.string() }))

package/dist/index.d.mts

@@ -477,6 +477,7 @@ declare class PluvServer<TPlatform extends AbstractPlatform<any, any> = Abstract
     constructor(options: PluvServerConfig<TPlatform, TAuthorize, TContext, TCrdt, TEvents>);
     createRoom(room: string, ...options: CreateRoomOptions<TPlatform, TAuthorize, TContext, TEvents>): IORoom<TPlatform, TAuthorize, TContext, TCrdt, TEvents>;
     createToken(params: JWTEncodeParams<InferIOAuthorizeUser<InferIOAuthorize<this>>, TPlatform>): Promise<string>;
+    private _getInitialStorage;
     private _getListeners;
     private _logDebug;
 }

package/dist/index.d.ts

@@ -477,6 +477,7 @@ declare class PluvServer<TPlatform extends AbstractPlatform<any, any> = Abstract
     constructor(options: PluvServerConfig<TPlatform, TAuthorize, TContext, TCrdt, TEvents>);
     createRoom(room: string, ...options: CreateRoomOptions<TPlatform, TAuthorize, TContext, TEvents>): IORoom<TPlatform, TAuthorize, TContext, TCrdt, TEvents>;
     createToken(params: JWTEncodeParams<InferIOAuthorizeUser<InferIOAuthorize<this>>, TPlatform>): Promise<string>;
+    private _getInitialStorage;
     private _getListeners;
     private _logDebug;
 }

package/dist/index.js

@@ -1170,12 +1170,17 @@ var IORoom = class {
 };
 
 // src/version.generated.ts
-var version = "3.1.1";
+var version = "3.1.3";
 
 // src/PluvServer.ts
 var PluvServer = class {
   constructor(options) {
     this.version = version;
+    this._getInitialStorage = (...args) => {
+      var _a;
+      const getInitialStorage = typeof this._config.getInitialStorage !== "string" ? (_a = this._config.getInitialStorage) != null ? _a : () => null : () => null;
+      return getInitialStorage(...args);
+    };
     this._config = __spreadValues({
       crdt: import_crdt2.noop,
       debug: false,
@@ -1261,9 +1266,11 @@ var PluvServer = class {
         const oldState = yield platform.persistence.getStorageState(room);
         const update = data == null ? void 0 : data.update;
         if (!oldState) {
-          const getInitialStorage = typeof this._config.getInitialStorage === "function" ? this._config.getInitialStorage : () => null;
-          const loadedState = yield getInitialStorage({ context, room });
-          if (!!loadedState) {
+          const loadedState = yield this._getInitialStorage({ context, room });
+          const checkDoc = this._config.crdt.doc(() => ({})).getEmpty().applyEncodedState({ update: loadedState });
+          const isEmpty = checkDoc.isEmpty();
+          checkDoc.destroy();
+          if (!!loadedState && !isEmpty) {
             doc.applyEncodedState({ update: loadedState }).getEncodedState();
           }
         }
@@ -1462,15 +1469,17 @@ var PluvIO = class {
       const user = params.user;
       const parsed = !!ioAuthorize ? ioAuthorize.user.parse(user) : user;
       if (!!this._limits.userIdMaxLength && user.id.length > this._limits.userIdMaxLength) {
-        throw new Error(
-          `createToken was called with a long user id. User ID must be at most 128 characters. Current length: ${user.id.length.toLocaleString()}`
-        );
+        throw new Error(oneLine`
+                createToken was called with a long user id. User ID must be at
+                most 128 characters. Current length: ${user.id.length.toLocaleString()}
+            `);
       }
       const bytes = new TextEncoder().encode(JSON.stringify(parsed)).length;
       if (!!this._limits.userMaxSize && bytes > this._limits.userMaxSize) {
-        throw new Error(
-          `createToken called with large payload. User must be at most 512 bytes. Current size: ${bytes.toLocaleString()}`
-        );
+        throw new Error(oneLine`
+                createToken called with large payload. User must be at most 512
+                bytes. Current size: ${bytes.toLocaleString()}
+            `);
       }
       const platform = this._platform();
       if (platform._createToken) {
@@ -1489,13 +1498,16 @@ var PluvIO = class {
   router(events) {
     const invalidName = Object.keys(events).find((name) => name.includes("$"));
     if (typeof invalidName === "string") {
-      throw new Error(`Invalid event name. Event names must not contain $: "${invalidName}"`);
+      throw new Error(oneLine`
+                Invalid event name. Event names must not contain $: "${invalidName}"
+            `);
     }
     return new PluvRouter(events);
   }
   server(...config) {
     var _a, _b;
-    return new PluvServer(__spreadProps(__spreadValues({}, (_a = config[0]) != null ? _a : {}), {
+    const serverConfig = (_a = config[0]) != null ? _a : {};
+    return new PluvServer(__spreadProps(__spreadValues({}, serverConfig), {
       authorize: (_b = this._authorize) != null ? _b : void 0,
       context: this._context,
       crdt: this._crdt,

package/dist/index.mjs

@@ -1128,12 +1128,17 @@ var IORoom = class {
 };
 
 // src/version.generated.ts
-var version = "3.1.1";
+var version = "3.1.3";
 
 // src/PluvServer.ts
 var PluvServer = class {
   constructor(options) {
     this.version = version;
+    this._getInitialStorage = (...args) => {
+      var _a;
+      const getInitialStorage = typeof this._config.getInitialStorage !== "string" ? (_a = this._config.getInitialStorage) != null ? _a : () => null : () => null;
+      return getInitialStorage(...args);
+    };
     this._config = __spreadValues({
       crdt: noop2,
       debug: false,
@@ -1219,9 +1224,11 @@ var PluvServer = class {
         const oldState = yield platform.persistence.getStorageState(room);
         const update = data == null ? void 0 : data.update;
         if (!oldState) {
-          const getInitialStorage = typeof this._config.getInitialStorage === "function" ? this._config.getInitialStorage : () => null;
-          const loadedState = yield getInitialStorage({ context, room });
-          if (!!loadedState) {
+          const loadedState = yield this._getInitialStorage({ context, room });
+          const checkDoc = this._config.crdt.doc(() => ({})).getEmpty().applyEncodedState({ update: loadedState });
+          const isEmpty = checkDoc.isEmpty();
+          checkDoc.destroy();
+          if (!!loadedState && !isEmpty) {
             doc.applyEncodedState({ update: loadedState }).getEncodedState();
           }
         }
@@ -1420,15 +1427,17 @@ var PluvIO = class {
       const user = params.user;
       const parsed = !!ioAuthorize ? ioAuthorize.user.parse(user) : user;
       if (!!this._limits.userIdMaxLength && user.id.length > this._limits.userIdMaxLength) {
-        throw new Error(
-          `createToken was called with a long user id. User ID must be at most 128 characters. Current length: ${user.id.length.toLocaleString()}`
-        );
+        throw new Error(oneLine`
+                createToken was called with a long user id. User ID must be at
+                most 128 characters. Current length: ${user.id.length.toLocaleString()}
+            `);
       }
       const bytes = new TextEncoder().encode(JSON.stringify(parsed)).length;
       if (!!this._limits.userMaxSize && bytes > this._limits.userMaxSize) {
-        throw new Error(
-          `createToken called with large payload. User must be at most 512 bytes. Current size: ${bytes.toLocaleString()}`
-        );
+        throw new Error(oneLine`
+                createToken called with large payload. User must be at most 512
+                bytes. Current size: ${bytes.toLocaleString()}
+            `);
       }
       const platform = this._platform();
       if (platform._createToken) {
@@ -1447,13 +1456,16 @@ var PluvIO = class {
   router(events) {
     const invalidName = Object.keys(events).find((name) => name.includes("$"));
     if (typeof invalidName === "string") {
-      throw new Error(`Invalid event name. Event names must not contain $: "${invalidName}"`);
+      throw new Error(oneLine`
+                Invalid event name. Event names must not contain $: "${invalidName}"
+            `);
     }
     return new PluvRouter(events);
   }
   server(...config) {
     var _a, _b;
-    return new PluvServer(__spreadProps(__spreadValues({}, (_a = config[0]) != null ? _a : {}), {
+    const serverConfig = (_a = config[0]) != null ? _a : {};
+    return new PluvServer(__spreadProps(__spreadValues({}, serverConfig), {
       authorize: (_b = this._authorize) != null ? _b : void 0,
       context: this._context,
       crdt: this._crdt,

package/package.json

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

package/src/PluvIO.ts

@@ -24,6 +24,7 @@ import type {
     PluvIORouter,
     ResolvedPluvIOAuthorize,
 } from "./types";
+import { oneLine } from "./utils";
 import { __PLUV_VERSION } from "./version";
 
 export type PluvIOConfig<
@@ -151,17 +152,19 @@ export class PluvIO<
         const parsed = !!ioAuthorize ? ioAuthorize.user.parse(user) : user;
 
         if (!!this._limits.userIdMaxLength && user.id.length > this._limits.userIdMaxLength) {
-            throw new Error(
-                `createToken was called with a long user id. User ID must be at most 128 characters. Current length: ${user.id.length.toLocaleString()}`,
-            );
+            throw new Error(oneLine`
+                createToken was called with a long user id. User ID must be at
+                most 128 characters. Current length: ${user.id.length.toLocaleString()}
+            `);
         }
 
         const bytes = new TextEncoder().encode(JSON.stringify(parsed)).length;
 
         if (!!this._limits.userMaxSize && bytes > this._limits.userMaxSize) {
-            throw new Error(
-                `createToken called with large payload. User must be at most 512 bytes. Current size: ${bytes.toLocaleString()}`,
-            );
+            throw new Error(oneLine`
+                createToken called with large payload. User must be at most 512
+                bytes. Current size: ${bytes.toLocaleString()}
+            `);
         }
 
         const platform = this._platform();
@@ -197,7 +200,9 @@ export class PluvIO<
         const invalidName = Object.keys(events).find((name) => name.includes("$"));
 
         if (typeof invalidName === "string") {
-            throw new Error(`Invalid event name. Event names must not contain $: "${invalidName}"`);
+            throw new Error(oneLine`
+                Invalid event name. Event names must not contain $: "${invalidName}"
+            `);
         }
 
         return new PluvRouter<TPlatform, TAuthorize, TContext, TEvents>(events);
@@ -206,14 +211,16 @@ export class PluvIO<
     public server<TEvents extends PluvRouterEventConfig<TPlatform, TAuthorize, TContext> = {}>(
         ...config: ServerConfig<TPlatform, TAuthorize, TContext, TCrdt, TEvents>
     ): PluvServer<TPlatform, TAuthorize, TContext, TCrdt, TEvents> {
+        const serverConfig = (config[0] ?? {}) as PluvServerConfig<
+            TPlatform,
+            TAuthorize,
+            TContext,
+            TCrdt,
+            TEvents
+        >;
+
         return new PluvServer<TPlatform, TAuthorize, TContext, TCrdt, TEvents>({
-            ...((config[0] ?? {}) as PluvServerConfig<
-                TPlatform,
-                TAuthorize,
-                TContext,
-                TCrdt,
-                TEvents
-            >),
+            ...serverConfig,
             authorize: this._authorize ?? undefined,
             context: this._context,
             crdt: this._crdt,

package/src/PluvServer.ts

@@ -209,13 +209,16 @@ export class PluvServer<
                     const update = (data as any)?.update as Maybe<string>;
 
                     if (!oldState) {
-                        const getInitialStorage: GetInitialStorageFn<TContext> =
-                            typeof this._config.getInitialStorage === "function"
-                                ? this._config.getInitialStorage
-                                : () => null;
-                        const loadedState = await getInitialStorage({ context, room });
+                        const loadedState = await this._getInitialStorage({ context, room });
 
-                        if (!!loadedState) {
+                        const checkDoc = this._config.crdt
+                            .doc(() => ({}))
+                            .getEmpty()
+                            .applyEncodedState({ update: loadedState });
+                        const isEmpty = checkDoc.isEmpty();
+                        checkDoc.destroy();
+
+                        if (!!loadedState && !isEmpty) {
                             doc.applyEncodedState({ update: loadedState }).getEncodedState();
                         }
                     }
@@ -463,6 +466,16 @@ export class PluvServer<
         return await this._config.io.createToken(params);
     }
 
+    private _getInitialStorage: GetInitialStorageFn<TContext> = (...args) => {
+        const getInitialStorage =
+            typeof this._config.getInitialStorage !== "string"
+                ? (this._config.getInitialStorage ??
+                  ((() => null) as GetInitialStorageFn<TContext>))
+                : ((() => null) as GetInitialStorageFn<TContext>);
+
+        return getInitialStorage(...args);
+    };
+
     private _getListeners(): BasePluvIOListeners<TPlatform, TAuthorize, TContext, TEvents> {
         return (this as any)._listeners;
     }

package/src/version.generated.ts

@@ -1,2 +1,2 @@
 // Generated by genversion.
-export const version = '3.1.1'
+export const version = '3.1.3'