@pluv/io 3.1.0 → 3.1.2

package/.turbo/turbo-build.log

@@ -1,9 +1,9 @@
 
-> @pluv/io@3.1.0 build /home/runner/work/pluv/pluv/packages/io
+> @pluv/io@3.1.2 build /home/runner/work/pluv/pluv/packages/io
 > pnpm run version && tsup src/index.ts --format esm,cjs --dts
 
 
-> @pluv/io@3.1.0 version /home/runner/work/pluv/pluv/packages/io
+> @pluv/io@3.1.2 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.48 KB
-ESM ⚡️ Build success in 177ms
-CJS dist/index.js 54.65 KB
-CJS ⚡️ Build success in 177ms
+ESM dist/index.mjs 52.78 KB
+ESM ⚡️ Build success in 109ms
+CJS dist/index.js 54.96 KB
+CJS ⚡️ Build success in 109ms
 DTS Build start
-DTS ⚡️ Build success in 4363ms
-DTS dist/index.d.mts 33.31 KB
-DTS dist/index.d.ts  33.31 KB
+DTS ⚡️ Build success in 4267ms
+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.2
+
+### Patch Changes
+
+- 8f138aa: Fixed `getInitialStorage` not being applied.
+    - @pluv/crdt@3.1.2
+    - @pluv/types@3.1.2
+
+## 3.1.1
+
+### Patch Changes
+
+- 7b719bf: Fixed `PluvIO.server` not requiring input parameters (i.e. was optional) when `createIO` specified `crdt`.
+    - @pluv/crdt@3.1.1
+    - @pluv/types@3.1.1
+
 ## 3.1.0
 
 ### 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

@@ -1,6 +1,6 @@
 import { AbstractCrdtDocFactory, CrdtLibraryType as CrdtLibraryType$1, NoopCrdtDocFactory } from '@pluv/crdt';
 export { CrdtLibraryType } from '@pluv/crdt';
-import { JsonObject, IOAuthorize, InferIOAuthorizeUser, MaybePromise, IOEventMessage, EventRecord, ProcedureLike, InputZodLike, IORouterLike, BaseUser, UndefinedProps, CrdtDocLike, Id, InferEventMessage, InferEventsOutput, Maybe, IOLike, InferIOOutput, CrdtLibraryType, InferIOInput, InferIOAuthorize } from '@pluv/types';
+import { JsonObject, IOAuthorize, InferIOAuthorizeUser, MaybePromise, IOEventMessage, EventRecord, ProcedureLike, InputZodLike, IORouterLike, BaseUser, UndefinedProps, CrdtDocLike, Id, InferEventMessage, InferEventsOutput, Maybe, IOLike, InferIOOutput, CrdtLibraryType, InferIOInput, InferIOAuthorize, HasRequiredProperty } from '@pluv/types';
 export { BaseUser, EventMessage, EventRecord, IOEventMessage } from '@pluv/types';
 
 declare abstract class AbstractPersistence {
@@ -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;
 }
@@ -494,9 +495,10 @@ type ResolvedServerConfig<TPlatform extends AbstractPlatform<any> = AbstractPlat
 } : {
     getInitialStorage: GetInitialStorageFn<TContext>;
 });
-type ServerConfig<TPlatform extends AbstractPlatform<any> = AbstractPlatform<any>, TAuthorize extends PluvIOAuthorize<TPlatform, any, InferInitContextType<TPlatform>> | null = any, TContext extends Record<string, any> = {}, TCrdt extends CrdtLibraryType$1<any> = CrdtLibraryType$1<NoopCrdtDocFactory>, TEvents extends PluvRouterEventConfig<TPlatform, TAuthorize, TContext> = {}> = {
+type BaseServerConfig<TPlatform extends AbstractPlatform<any> = AbstractPlatform<any>, TAuthorize extends PluvIOAuthorize<TPlatform, any, InferInitContextType<TPlatform>> | null = any, TContext extends Record<string, any> = {}, TCrdt extends CrdtLibraryType$1<any> = CrdtLibraryType$1<NoopCrdtDocFactory>, TEvents extends PluvRouterEventConfig<TPlatform, TAuthorize, TContext> = {}> = {
     [P in keyof ResolvedServerConfig<TPlatform, TAuthorize, TContext, TCrdt, TEvents> as ResolvedServerConfig<TPlatform, TAuthorize, TContext, TCrdt, TEvents>[P] extends undefined ? never : P]: ResolvedServerConfig<TPlatform, TAuthorize, TContext, TCrdt, TEvents>[P];
 };
+type ServerConfig<TPlatform extends AbstractPlatform<any> = AbstractPlatform<any>, TAuthorize extends PluvIOAuthorize<TPlatform, any, InferInitContextType<TPlatform>> | null = any, TContext extends Record<string, any> = {}, TCrdt extends CrdtLibraryType$1<any> = CrdtLibraryType$1<NoopCrdtDocFactory>, TEvents extends PluvRouterEventConfig<TPlatform, TAuthorize, TContext> = {}> = HasRequiredProperty<BaseServerConfig<TPlatform, TAuthorize, TContext, TCrdt, TEvents>> extends true ? [BaseServerConfig<TPlatform, TAuthorize, TContext, TCrdt, TEvents>] : [BaseServerConfig<TPlatform, TAuthorize, TContext, TCrdt, TEvents>?];
 declare class PluvIO<TPlatform extends AbstractPlatform<any> = AbstractPlatform<any>, TAuthorize extends PluvIOAuthorize<TPlatform, any, InferInitContextType<TPlatform>> | null = any, TContext extends Record<string, any> = {}, TCrdt extends CrdtLibraryType$1<any> = CrdtLibraryType$1<any>> {
     readonly version: string;
     private readonly _authorize;
@@ -510,7 +512,7 @@ declare class PluvIO<TPlatform extends AbstractPlatform<any> = AbstractPlatform<
     createToken(params: JWTEncodeParams<InferIOAuthorizeUser<TAuthorize>, TPlatform>): Promise<string>;
     mergeRouters<TRouters extends PluvRouter<TPlatform, TAuthorize, TContext, any>[]>(...routers: TRouters): MergedRouter<TRouters>;
     router<TEvents extends PluvRouterEventConfig<TPlatform, TAuthorize, TContext>>(events: TEvents): PluvRouter<TPlatform, TAuthorize, TContext, TEvents>;
-    server<TEvents extends PluvRouterEventConfig<TPlatform, TAuthorize, TContext> = {}>(config?: ServerConfig<TPlatform, TAuthorize, TContext, TCrdt, TEvents>): PluvServer<TPlatform, TAuthorize, TContext, TCrdt, TEvents>;
+    server<TEvents extends PluvRouterEventConfig<TPlatform, TAuthorize, TContext> = {}>(...config: ServerConfig<TPlatform, TAuthorize, TContext, TCrdt, TEvents>): PluvServer<TPlatform, TAuthorize, TContext, TCrdt, TEvents>;
     private _getIOAuthorize;
 }
 

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 import { AbstractCrdtDocFactory, CrdtLibraryType as CrdtLibraryType$1, NoopCrdtDocFactory } from '@pluv/crdt';
 export { CrdtLibraryType } from '@pluv/crdt';
-import { JsonObject, IOAuthorize, InferIOAuthorizeUser, MaybePromise, IOEventMessage, EventRecord, ProcedureLike, InputZodLike, IORouterLike, BaseUser, UndefinedProps, CrdtDocLike, Id, InferEventMessage, InferEventsOutput, Maybe, IOLike, InferIOOutput, CrdtLibraryType, InferIOInput, InferIOAuthorize } from '@pluv/types';
+import { JsonObject, IOAuthorize, InferIOAuthorizeUser, MaybePromise, IOEventMessage, EventRecord, ProcedureLike, InputZodLike, IORouterLike, BaseUser, UndefinedProps, CrdtDocLike, Id, InferEventMessage, InferEventsOutput, Maybe, IOLike, InferIOOutput, CrdtLibraryType, InferIOInput, InferIOAuthorize, HasRequiredProperty } from '@pluv/types';
 export { BaseUser, EventMessage, EventRecord, IOEventMessage } from '@pluv/types';
 
 declare abstract class AbstractPersistence {
@@ -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;
 }
@@ -494,9 +495,10 @@ type ResolvedServerConfig<TPlatform extends AbstractPlatform<any> = AbstractPlat
 } : {
     getInitialStorage: GetInitialStorageFn<TContext>;
 });
-type ServerConfig<TPlatform extends AbstractPlatform<any> = AbstractPlatform<any>, TAuthorize extends PluvIOAuthorize<TPlatform, any, InferInitContextType<TPlatform>> | null = any, TContext extends Record<string, any> = {}, TCrdt extends CrdtLibraryType$1<any> = CrdtLibraryType$1<NoopCrdtDocFactory>, TEvents extends PluvRouterEventConfig<TPlatform, TAuthorize, TContext> = {}> = {
+type BaseServerConfig<TPlatform extends AbstractPlatform<any> = AbstractPlatform<any>, TAuthorize extends PluvIOAuthorize<TPlatform, any, InferInitContextType<TPlatform>> | null = any, TContext extends Record<string, any> = {}, TCrdt extends CrdtLibraryType$1<any> = CrdtLibraryType$1<NoopCrdtDocFactory>, TEvents extends PluvRouterEventConfig<TPlatform, TAuthorize, TContext> = {}> = {
     [P in keyof ResolvedServerConfig<TPlatform, TAuthorize, TContext, TCrdt, TEvents> as ResolvedServerConfig<TPlatform, TAuthorize, TContext, TCrdt, TEvents>[P] extends undefined ? never : P]: ResolvedServerConfig<TPlatform, TAuthorize, TContext, TCrdt, TEvents>[P];
 };
+type ServerConfig<TPlatform extends AbstractPlatform<any> = AbstractPlatform<any>, TAuthorize extends PluvIOAuthorize<TPlatform, any, InferInitContextType<TPlatform>> | null = any, TContext extends Record<string, any> = {}, TCrdt extends CrdtLibraryType$1<any> = CrdtLibraryType$1<NoopCrdtDocFactory>, TEvents extends PluvRouterEventConfig<TPlatform, TAuthorize, TContext> = {}> = HasRequiredProperty<BaseServerConfig<TPlatform, TAuthorize, TContext, TCrdt, TEvents>> extends true ? [BaseServerConfig<TPlatform, TAuthorize, TContext, TCrdt, TEvents>] : [BaseServerConfig<TPlatform, TAuthorize, TContext, TCrdt, TEvents>?];
 declare class PluvIO<TPlatform extends AbstractPlatform<any> = AbstractPlatform<any>, TAuthorize extends PluvIOAuthorize<TPlatform, any, InferInitContextType<TPlatform>> | null = any, TContext extends Record<string, any> = {}, TCrdt extends CrdtLibraryType$1<any> = CrdtLibraryType$1<any>> {
     readonly version: string;
     private readonly _authorize;
@@ -510,7 +512,7 @@ declare class PluvIO<TPlatform extends AbstractPlatform<any> = AbstractPlatform<
     createToken(params: JWTEncodeParams<InferIOAuthorizeUser<TAuthorize>, TPlatform>): Promise<string>;
     mergeRouters<TRouters extends PluvRouter<TPlatform, TAuthorize, TContext, any>[]>(...routers: TRouters): MergedRouter<TRouters>;
     router<TEvents extends PluvRouterEventConfig<TPlatform, TAuthorize, TContext>>(events: TEvents): PluvRouter<TPlatform, TAuthorize, TContext, TEvents>;
-    server<TEvents extends PluvRouterEventConfig<TPlatform, TAuthorize, TContext> = {}>(config?: ServerConfig<TPlatform, TAuthorize, TContext, TCrdt, TEvents>): PluvServer<TPlatform, TAuthorize, TContext, TCrdt, TEvents>;
+    server<TEvents extends PluvRouterEventConfig<TPlatform, TAuthorize, TContext> = {}>(...config: ServerConfig<TPlatform, TAuthorize, TContext, TCrdt, TEvents>): PluvServer<TPlatform, TAuthorize, TContext, TCrdt, TEvents>;
     private _getIOAuthorize;
 }
 

package/dist/index.js

@@ -1170,12 +1170,17 @@ var IORoom = class {
 };
 
 // src/version.generated.ts
-var version = "3.1.0";
+var version = "3.1.2";
 
 // 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,8 +1266,7 @@ 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 });
+          const loadedState = yield this._getInitialStorage({ context, room });
           if (!!loadedState) {
             doc.applyEncodedState({ update: loadedState }).getEncodedState();
           }
@@ -1462,15 +1466,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,14 +1495,17 @@ 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;
-    return new PluvServer(__spreadProps(__spreadValues({}, config), {
-      authorize: (_a = this._authorize) != null ? _a : void 0,
+  server(...config) {
+    var _a, _b;
+    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,
       debug: this._debug,

package/dist/index.mjs

@@ -1128,12 +1128,17 @@ var IORoom = class {
 };
 
 // src/version.generated.ts
-var version = "3.1.0";
+var version = "3.1.2";
 
 // 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,8 +1224,7 @@ 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 });
+          const loadedState = yield this._getInitialStorage({ context, room });
           if (!!loadedState) {
             doc.applyEncodedState({ update: loadedState }).getEncodedState();
           }
@@ -1420,15 +1424,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,14 +1453,17 @@ 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;
-    return new PluvServer(__spreadProps(__spreadValues({}, config), {
-      authorize: (_a = this._authorize) != null ? _a : void 0,
+  server(...config) {
+    var _a, _b;
+    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,
       debug: this._debug,

package/package.json

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

package/src/PluvIO.ts

@@ -1,6 +1,6 @@
 import type { AbstractCrdtDocFactory, CrdtLibraryType, NoopCrdtDocFactory } from "@pluv/crdt";
 import { noop } from "@pluv/crdt";
-import type { BaseUser, IOAuthorize, InferIOAuthorizeUser } from "@pluv/types";
+import type { BaseUser, HasRequiredProperty, IOAuthorize, InferIOAuthorizeUser } from "@pluv/types";
 import type { AbstractPlatform, InferInitContextType } from "./AbstractPlatform";
 import type { WebSocketRegisterConfig } from "./IORoom";
 import { PluvProcedure } from "./PluvProcedure";
@@ -24,6 +24,7 @@ import type {
     PluvIORouter,
     ResolvedPluvIOAuthorize,
 } from "./types";
+import { oneLine } from "./utils";
 import { __PLUV_VERSION } from "./version";
 
 export type PluvIOConfig<
@@ -56,7 +57,7 @@ type ResolvedServerConfig<
         ? { getInitialStorage?: "[ERROR]: Must specify crdt to use getInitialStorage" }
         : { getInitialStorage: GetInitialStorageFn<TContext> });
 
-export type ServerConfig<
+export type BaseServerConfig<
     TPlatform extends AbstractPlatform<any> = AbstractPlatform<any>,
     TAuthorize extends PluvIOAuthorize<
         TPlatform,
@@ -78,6 +79,23 @@ export type ServerConfig<
         : P]: ResolvedServerConfig<TPlatform, TAuthorize, TContext, TCrdt, TEvents>[P];
 };
 
+export type ServerConfig<
+    TPlatform extends AbstractPlatform<any> = AbstractPlatform<any>,
+    TAuthorize extends PluvIOAuthorize<
+        TPlatform,
+        any,
+        InferInitContextType<TPlatform>
+    > | null = any,
+    TContext extends Record<string, any> = {},
+    TCrdt extends CrdtLibraryType<any> = CrdtLibraryType<NoopCrdtDocFactory>,
+    TEvents extends PluvRouterEventConfig<TPlatform, TAuthorize, TContext> = {},
+> =
+    HasRequiredProperty<
+        BaseServerConfig<TPlatform, TAuthorize, TContext, TCrdt, TEvents>
+    > extends true
+        ? [BaseServerConfig<TPlatform, TAuthorize, TContext, TCrdt, TEvents>]
+        : [BaseServerConfig<TPlatform, TAuthorize, TContext, TCrdt, TEvents>?];
+
 export class PluvIO<
     TPlatform extends AbstractPlatform<any> = AbstractPlatform<any>,
     TAuthorize extends PluvIOAuthorize<
@@ -134,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();
@@ -180,31 +200,35 @@ 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);
     }
 
     public server<TEvents extends PluvRouterEventConfig<TPlatform, TAuthorize, TContext> = {}>(
-        config: ServerConfig<TPlatform, TAuthorize, TContext, TCrdt, TEvents> = {} as ServerConfig<
+        ...config: ServerConfig<TPlatform, TAuthorize, TContext, TCrdt, TEvents>
+    ): PluvServer<TPlatform, TAuthorize, TContext, TCrdt, TEvents> {
+        const serverConfig = (config[0] ?? {}) as PluvServerConfig<
             TPlatform,
             TAuthorize,
             TContext,
             TCrdt,
             TEvents
-        >,
-    ): PluvServer<TPlatform, TAuthorize, TContext, TCrdt, TEvents> {
+        >;
+
         return new PluvServer<TPlatform, TAuthorize, TContext, TCrdt, TEvents>({
-            ...config,
+            ...serverConfig,
             authorize: this._authorize ?? undefined,
             context: this._context,
             crdt: this._crdt,
             debug: this._debug,
-            io: this as PluvIO<TPlatform, TAuthorize, TContext>,
+            io: this as PluvIO<TPlatform, TAuthorize, TContext, TCrdt>,
             limits: this._limits,
             platform: this._platform,
-        } as PluvServerConfig<TPlatform, TAuthorize, TContext, TCrdt, TEvents>);
+        });
     }
 
     private _getIOAuthorize(

package/src/PluvServer.ts

@@ -209,11 +209,7 @@ 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) {
                             doc.applyEncodedState({ update: loadedState }).getEncodedState();
@@ -463,6 +459,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.0'
+export const version = '3.1.2'