@pluv/io 3.1.7 → 3.2.1

package/.turbo/turbo-build.log

@@ -1,9 +1,9 @@
 
-> @pluv/io@3.1.7 build /home/runner/work/pluv/pluv/packages/io
+> @pluv/io@3.2.1 build /home/runner/work/pluv/pluv/packages/io
 > pnpm run version && tsup src/index.ts --format esm,cjs --dts
 
 
-> @pluv/io@3.1.7 version /home/runner/work/pluv/pluv/packages/io
+> @pluv/io@3.2.1 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
-CJS dist/index.js 55.74 KB
-CJS ⚡️ Build success in 106ms
-ESM dist/index.mjs 53.56 KB
-ESM ⚡️ Build success in 110ms
+CJS dist/index.js 55.81 KB
+CJS ⚡️ Build success in 103ms
+ESM dist/index.mjs 53.63 KB
+ESM ⚡️ Build success in 105ms
 DTS Build start
-DTS ⚡️ Build success in 4281ms
-DTS dist/index.d.mts 34.07 KB
-DTS dist/index.d.ts  34.07 KB
+DTS ⚡️ Build success in 4322ms
+DTS dist/index.d.mts 34.23 KB
+DTS dist/index.d.ts  34.23 KB

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @pluv/io
 
+## 3.2.1
+
+### Patch Changes
+
+- @pluv/crdt@3.2.1
+- @pluv/types@3.2.1
+
+## 3.2.0
+
+### Minor Changes
+
+- 6d2b257: Support async `context` parameter in `createIO`.
+
+### Patch Changes
+
+- @pluv/crdt@3.2.0
+- @pluv/types@3.2.0
+
 ## 3.1.7
 
 ### Patch Changes
@@ -1124,11 +1142,9 @@
 ### Minor Changes
 
 - 6ac8a46: \* Fixed errors thrown when using Cloudflare's websocket hibernation API caused by rooms being re-used between different instances of DurableObjects.
-
     - Add configurable `onDelete` and `onMessage` event listeners that can be set when rooms are created.
 
     **BREAKING**
-
     - Changed `PluvServer.getRoom` to `PluvServer.createRoom`. This means `PluvServer` only handles room creation. Room management must now be handled manually. This mainly affects manually creating rooms with `@pluv/platform-node`, and will likely not affect you if you are either using `createPluvHandler` on any platform, or if you are using `@pluv/platform-cloudflare`.
 
     ```ts
@@ -1441,7 +1457,6 @@
 
 - 329dbcd: Narrowed types for `user` within the session object of an event resolver.
 - 99b5ca9: ## Breaking Changes
-
     - `@pluv/io` has been updated to introduce `PluvProcedure`, `PluvRouter` and `PluvServer`. This change is intended to improve the ergonomics of declaring events and simplifying inferences of event types.
 
     ### Before:
@@ -1644,7 +1659,6 @@
 ### Minor Changes
 
 - 4280220: ## Breaking Changes
-
     - Storage types are now kept on the root of the document.
         - Previously, `@pluv/crdt-yjs` kept all shared-types on a hidden Yjs Map called `storage` on the root of the Yjs Doc. Now all shared-types are kept on the root of the Yjs Doc instead. This behavior should be more in-line with how shared-types are documented to be used from Yjs.
     - `@pluv/client` and `@pluv/react` no-longer re-export `@pluv/crdt-yjs`. This package will now need to be installed separately.

package/dist/index.d.mts

@@ -121,7 +121,7 @@ declare class PluvRouter<TPlatform extends AbstractPlatform<any> = AbstractPlatf
     private _isValidEventName;
 }
 
-type PluvContext<TPlatform extends AbstractPlatform, TContext extends Record<string, any>> = TContext | ((params: InferRoomContextType<TPlatform>) => TContext);
+type PluvContext<TPlatform extends AbstractPlatform, TContext extends Record<string, any>> = MaybePromise<TContext> | ((params: InferRoomContextType<TPlatform>) => MaybePromise<TContext>);
 type EventResolverKind = "broadcast" | "self" | "sync";
 type EventResolver<TKind extends EventResolverKind = EventResolverKind, TPlatform extends AbstractPlatform = AbstractPlatform, TAuthorize extends IOAuthorize<any, InferInitContextType<TPlatform>> | null = null, TContext extends Record<string, any> = {}, TInput extends JsonObject = {}, TOutput extends EventRecord<string, any> = {}> = (data: TInput, context: EventResolverContext<TKind, TPlatform, TAuthorize, TContext>) => MaybePromise<TOutput | void>;
 interface EventResolverContext<TKind extends EventResolverKind = EventResolverKind, TPlatform extends AbstractPlatform = AbstractPlatform, TAuthorize extends IOAuthorize<any, InferInitContextType<TPlatform>> | null = null, TContext extends Record<string, any> = {}> {
@@ -339,7 +339,7 @@ type BroadcastProxy<TIO extends IORoom<any, any, any, any, any>> = (<TEvent exte
 };
 type IORoomConfig<TPlatform extends AbstractPlatform<any> = AbstractPlatform<any>, TAuthorize extends PluvIOAuthorize<TPlatform, any, InferInitContextType<TPlatform>> | null = any, TContext extends Record<string, any> = {}, TEvents extends PluvRouterEventConfig<TPlatform, TAuthorize, TContext> = {}> = Partial<IORoomListeners<TPlatform, TAuthorize, TContext, TEvents>> & {
     authorize?: TAuthorize;
-    context: TContext;
+    context: PluvContext<TPlatform, TContext>;
     crdt?: {
         doc: (value: any) => AbstractCrdtDocFactory<any, any>;
     };
@@ -365,6 +365,7 @@ declare class IORoom<TPlatform extends AbstractPlatform<any> = AbstractPlatform<
     private readonly _getInitialStorage;
     private readonly _listeners;
     private readonly _platform;
+    private readonly _roomContext;
     private readonly _router;
     private readonly _sessions;
     private readonly _userSessionss;
@@ -414,6 +415,7 @@ declare class IORoom<TPlatform extends AbstractPlatform<any> = AbstractPlatform<
     private _ensureDetached;
     private _getAbstractWs;
     private _getAuthorizedUser;
+    private _getContext;
     private _getInitialDoc;
     private _getIOAuthorize;
     private _getLatestPresence;
@@ -460,6 +462,7 @@ type CreateRoomOptions<TPlatform extends AbstractPlatform<any, any>, TAuthorize
 declare class PluvServer<TPlatform extends AbstractPlatform<any, any> = AbstractPlatform<any, any>, TAuthorize extends PluvIOAuthorize<TPlatform, any, InferInitContextType<TPlatform>> | null = any, TContext extends Record<string, any> = {}, TCrdt extends CrdtLibraryType$1<any> = CrdtLibraryType$1<any>, TEvents extends PluvRouterEventConfig<TPlatform, TAuthorize, TContext> = {}> implements IOLike<TAuthorize, TCrdt, TEvents> {
     readonly version: string;
     private readonly _config;
+    private readonly _docFactory;
     get fetch(): (...args: any[]) => Promise<any>;
     /**
      * @ignore
@@ -468,7 +471,7 @@ declare class PluvServer<TPlatform extends AbstractPlatform<any, any> = Abstract
      */
     get _defs(): {
         authorize: TAuthorize;
-        context: TContext;
+        context: PluvContext<TPlatform, TContext>;
         crdt: TCrdt;
         events: TEvents;
         platform: TPlatform;

package/dist/index.d.ts

@@ -121,7 +121,7 @@ declare class PluvRouter<TPlatform extends AbstractPlatform<any> = AbstractPlatf
     private _isValidEventName;
 }
 
-type PluvContext<TPlatform extends AbstractPlatform, TContext extends Record<string, any>> = TContext | ((params: InferRoomContextType<TPlatform>) => TContext);
+type PluvContext<TPlatform extends AbstractPlatform, TContext extends Record<string, any>> = MaybePromise<TContext> | ((params: InferRoomContextType<TPlatform>) => MaybePromise<TContext>);
 type EventResolverKind = "broadcast" | "self" | "sync";
 type EventResolver<TKind extends EventResolverKind = EventResolverKind, TPlatform extends AbstractPlatform = AbstractPlatform, TAuthorize extends IOAuthorize<any, InferInitContextType<TPlatform>> | null = null, TContext extends Record<string, any> = {}, TInput extends JsonObject = {}, TOutput extends EventRecord<string, any> = {}> = (data: TInput, context: EventResolverContext<TKind, TPlatform, TAuthorize, TContext>) => MaybePromise<TOutput | void>;
 interface EventResolverContext<TKind extends EventResolverKind = EventResolverKind, TPlatform extends AbstractPlatform = AbstractPlatform, TAuthorize extends IOAuthorize<any, InferInitContextType<TPlatform>> | null = null, TContext extends Record<string, any> = {}> {
@@ -339,7 +339,7 @@ type BroadcastProxy<TIO extends IORoom<any, any, any, any, any>> = (<TEvent exte
 };
 type IORoomConfig<TPlatform extends AbstractPlatform<any> = AbstractPlatform<any>, TAuthorize extends PluvIOAuthorize<TPlatform, any, InferInitContextType<TPlatform>> | null = any, TContext extends Record<string, any> = {}, TEvents extends PluvRouterEventConfig<TPlatform, TAuthorize, TContext> = {}> = Partial<IORoomListeners<TPlatform, TAuthorize, TContext, TEvents>> & {
     authorize?: TAuthorize;
-    context: TContext;
+    context: PluvContext<TPlatform, TContext>;
     crdt?: {
         doc: (value: any) => AbstractCrdtDocFactory<any, any>;
     };
@@ -365,6 +365,7 @@ declare class IORoom<TPlatform extends AbstractPlatform<any> = AbstractPlatform<
     private readonly _getInitialStorage;
     private readonly _listeners;
     private readonly _platform;
+    private readonly _roomContext;
     private readonly _router;
     private readonly _sessions;
     private readonly _userSessionss;
@@ -414,6 +415,7 @@ declare class IORoom<TPlatform extends AbstractPlatform<any> = AbstractPlatform<
     private _ensureDetached;
     private _getAbstractWs;
     private _getAuthorizedUser;
+    private _getContext;
     private _getInitialDoc;
     private _getIOAuthorize;
     private _getLatestPresence;
@@ -460,6 +462,7 @@ type CreateRoomOptions<TPlatform extends AbstractPlatform<any, any>, TAuthorize
 declare class PluvServer<TPlatform extends AbstractPlatform<any, any> = AbstractPlatform<any, any>, TAuthorize extends PluvIOAuthorize<TPlatform, any, InferInitContextType<TPlatform>> | null = any, TContext extends Record<string, any> = {}, TCrdt extends CrdtLibraryType$1<any> = CrdtLibraryType$1<any>, TEvents extends PluvRouterEventConfig<TPlatform, TAuthorize, TContext> = {}> implements IOLike<TAuthorize, TCrdt, TEvents> {
     readonly version: string;
     private readonly _config;
+    private readonly _docFactory;
     get fetch(): (...args: any[]) => Promise<any>;
     /**
      * @ignore
@@ -468,7 +471,7 @@ declare class PluvServer<TPlatform extends AbstractPlatform<any, any> = Abstract
      */
     get _defs(): {
         authorize: TAuthorize;
-        context: TContext;
+        context: PluvContext<TPlatform, TContext>;
         crdt: TCrdt;
         events: TEvents;
         platform: TPlatform;

package/dist/index.js

@@ -455,6 +455,7 @@ var IORoom = class {
     this._debug = debug;
     this._docFactory = crdt.doc(() => ({}));
     this._getInitialStorage = getInitialStorage;
+    this._roomContext = roomContext;
     this._router = router;
     this._platform = platform.initialize(__spreadProps(__spreadValues({}, !!_meta ? { _meta } : {}), { roomContext }));
     this._listeners = {
@@ -671,11 +672,11 @@ var IORoom = class {
         const user = session.user;
         if (!!user) this._removeUserSession(user.id, sessionId);
         try {
-          const doc = yield this._doc;
+          const [doc, context] = yield Promise.all([this._doc, this._getContext()]);
           const encodedState = doc.getEncodedState();
           yield Promise.resolve(
             this._listeners.onUserDisconnected({
-              context: this._context,
+              context,
               encodedState,
               platform: this._platform,
               room: this.id,
@@ -716,7 +717,7 @@ var IORoom = class {
       const sessionId = session.id;
       const presence = session.presence;
       const user = session.user;
-      const doc = yield this._doc;
+      const [doc, context] = yield Promise.all([this._doc, this._getContext()]);
       const encodedState = doc.isEmpty() ? null : doc.getEncodedState();
       yield this._sendSelfMessage(
         {
@@ -733,7 +734,7 @@ var IORoom = class {
       try {
         yield Promise.resolve(
           this._listeners.onUserConnected({
-            context: this._context,
+            context,
             encodedState,
             platform: this._platform,
             room: this.id,
@@ -803,20 +804,25 @@ var IORoom = class {
       }
     });
   }
+  _getContext() {
+    return __async(this, null, function* () {
+      return typeof this._context === "function" ? yield Promise.resolve(this._context(this._roomContext)) : yield Promise.resolve(this._context);
+    });
+  }
   _getInitialDoc() {
     return __async(this, null, function* () {
       const doc = this._docFactory.getEmpty();
-      const encodedState = yield this._platform.persistence.getStorageState(this.id);
+      const [encodedState, context] = yield Promise.all([
+        this._platform.persistence.getStorageState(this.id),
+        this._getContext()
+      ]);
       if (!encodedState) {
         const loadedState = yield this._getInitialStorage({
-          context: this._context,
+          context,
           room: this.id
         });
-        const checkDoc = this._crdt.doc(() => ({})).getEmpty().applyEncodedState({ update: loadedState });
-        const isEmpty = checkDoc.isEmpty();
-        checkDoc.destroy();
-        if (!!loadedState && !isEmpty) {
-          doc.applyEncodedState({ update: loadedState }).getEncodedState();
+        if (!!loadedState && !this._docFactory.isEmpty(loadedState)) {
+          doc.applyEncodedState({ update: loadedState });
         }
       }
       if (typeof encodedState === "string") doc.applyEncodedState({ update: encodedState });
@@ -903,13 +909,13 @@ var IORoom = class {
       const doc = yield this._getInitialDoc();
       const uninitialize = () => __async(this, null, function* () {
         this._platform.pubSub.unsubscribe(pubSubId);
-        const doc2 = yield this._doc;
+        const [doc2, context] = yield Promise.all([this._doc, this._getContext()]);
         const encodedState = doc2.getEncodedState();
         doc2.destroy();
         this._doc = Promise.resolve(this._docFactory.getEmpty());
         yield Promise.resolve(
           this._listeners.onDestroy(__spreadProps(__spreadValues({}, "_meta" in this._platform && !!this._platform._meta ? { _meta: this._platform._meta } : {}), {
-            context: this._context,
+            context,
             encodedState,
             platform: this._platform,
             room: this.id
@@ -943,9 +949,9 @@ var IORoom = class {
       const setPresence = (params) => {
         this._setPresence.bind(this)(params);
       };
-      const doc = yield this._doc;
+      const [doc, context] = yield Promise.all([this._doc, this._getContext()]);
       const eventContext = {
-        context: this._context,
+        context,
         doc,
         garbageCollect: () => __async(this, null, function* () {
           yield this.garbageCollect();
@@ -974,7 +980,7 @@ var IORoom = class {
       if (!message) return;
       const procedure = this._getProcedure(message);
       this._listeners.onMessage(__spreadProps(__spreadValues({}, "_meta" in this._platform && !!this._platform._meta ? { _meta: this._platform._meta } : {}), {
-        context: this._context,
+        context,
         encodedState: doc.getEncodedState(),
         message,
         platform: this._platform,
@@ -1137,9 +1143,9 @@ var IORoom = class {
       if (!sender) return;
       const connectionId = sender.sessionId;
       if (typeof connectionId !== "string") return;
-      const doc = yield this._doc;
-      const context = {
-        context: this._context,
+      const [doc, context] = yield Promise.all([this._doc, this._getContext()]);
+      const resolverCtx = {
+        context,
         doc,
         garbageCollect: () => __async(this, null, function* () {
           yield this.garbageCollect();
@@ -1164,7 +1170,7 @@ var IORoom = class {
       } catch (e) {
         return;
       }
-      Promise.resolve(resolver(inputs, context)).then((output) => {
+      Promise.resolve(resolver(inputs, resolverCtx)).then((output) => {
         if (!output) return;
         Object.keys(output).forEach((type) => {
           var _a2, _b;
@@ -1184,7 +1190,7 @@ var IORoom = class {
 };
 
 // src/version.generated.ts
-var version = "3.1.7";
+var version = "3.2.1";
 
 // src/PluvServer.ts
 var PluvServer = class {
@@ -1207,6 +1213,7 @@ var PluvServer = class {
       onUserConnected,
       onUserDisconnected
     } = options;
+    this._docFactory = this._config.crdt.doc(() => ({}));
     this._listeners = {
       onRoomDeleted: (event) => onRoomDeleted == null ? void 0 : onRoomDeleted(event),
       onRoomMessage: (event) => onRoomMessage == null ? void 0 : onRoomMessage(event),
@@ -1281,11 +1288,8 @@ var PluvServer = class {
         const update = data == null ? void 0 : data.update;
         if (!oldState) {
           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();
+          if (!!loadedState && !this._docFactory.isEmpty(loadedState)) {
+            doc.applyEncodedState({ update: loadedState });
           }
         }
         if (!doc.isEmpty()) {
@@ -1398,12 +1402,11 @@ var PluvServer = class {
     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._config.context === "function" ? this._config.context(roomContext) : this._config.context;
     const listeners = this._getListeners();
     const logDebug = this._logDebug.bind(this);
     const newRoom = new IORoom(room, __spreadProps(__spreadValues({}, !!_meta ? { _meta } : {}), {
       authorize: (_c = this._config.authorize) != null ? _c : void 0,
-      context,
+      context: this._config.context,
       crdt: this._config.crdt,
       debug: debug != null ? debug : this._config.debug,
       getInitialStorage: this._getInitialStorage,

package/dist/index.mjs

@@ -413,6 +413,7 @@ var IORoom = class {
     this._debug = debug;
     this._docFactory = crdt.doc(() => ({}));
     this._getInitialStorage = getInitialStorage;
+    this._roomContext = roomContext;
     this._router = router;
     this._platform = platform.initialize(__spreadProps(__spreadValues({}, !!_meta ? { _meta } : {}), { roomContext }));
     this._listeners = {
@@ -629,11 +630,11 @@ var IORoom = class {
         const user = session.user;
         if (!!user) this._removeUserSession(user.id, sessionId);
         try {
-          const doc = yield this._doc;
+          const [doc, context] = yield Promise.all([this._doc, this._getContext()]);
           const encodedState = doc.getEncodedState();
           yield Promise.resolve(
             this._listeners.onUserDisconnected({
-              context: this._context,
+              context,
               encodedState,
               platform: this._platform,
               room: this.id,
@@ -674,7 +675,7 @@ var IORoom = class {
       const sessionId = session.id;
       const presence = session.presence;
       const user = session.user;
-      const doc = yield this._doc;
+      const [doc, context] = yield Promise.all([this._doc, this._getContext()]);
       const encodedState = doc.isEmpty() ? null : doc.getEncodedState();
       yield this._sendSelfMessage(
         {
@@ -691,7 +692,7 @@ var IORoom = class {
       try {
         yield Promise.resolve(
           this._listeners.onUserConnected({
-            context: this._context,
+            context,
             encodedState,
             platform: this._platform,
             room: this.id,
@@ -761,20 +762,25 @@ var IORoom = class {
       }
     });
   }
+  _getContext() {
+    return __async(this, null, function* () {
+      return typeof this._context === "function" ? yield Promise.resolve(this._context(this._roomContext)) : yield Promise.resolve(this._context);
+    });
+  }
   _getInitialDoc() {
     return __async(this, null, function* () {
       const doc = this._docFactory.getEmpty();
-      const encodedState = yield this._platform.persistence.getStorageState(this.id);
+      const [encodedState, context] = yield Promise.all([
+        this._platform.persistence.getStorageState(this.id),
+        this._getContext()
+      ]);
       if (!encodedState) {
         const loadedState = yield this._getInitialStorage({
-          context: this._context,
+          context,
           room: this.id
         });
-        const checkDoc = this._crdt.doc(() => ({})).getEmpty().applyEncodedState({ update: loadedState });
-        const isEmpty = checkDoc.isEmpty();
-        checkDoc.destroy();
-        if (!!loadedState && !isEmpty) {
-          doc.applyEncodedState({ update: loadedState }).getEncodedState();
+        if (!!loadedState && !this._docFactory.isEmpty(loadedState)) {
+          doc.applyEncodedState({ update: loadedState });
         }
       }
       if (typeof encodedState === "string") doc.applyEncodedState({ update: encodedState });
@@ -861,13 +867,13 @@ var IORoom = class {
       const doc = yield this._getInitialDoc();
       const uninitialize = () => __async(this, null, function* () {
         this._platform.pubSub.unsubscribe(pubSubId);
-        const doc2 = yield this._doc;
+        const [doc2, context] = yield Promise.all([this._doc, this._getContext()]);
         const encodedState = doc2.getEncodedState();
         doc2.destroy();
         this._doc = Promise.resolve(this._docFactory.getEmpty());
         yield Promise.resolve(
           this._listeners.onDestroy(__spreadProps(__spreadValues({}, "_meta" in this._platform && !!this._platform._meta ? { _meta: this._platform._meta } : {}), {
-            context: this._context,
+            context,
             encodedState,
             platform: this._platform,
             room: this.id
@@ -901,9 +907,9 @@ var IORoom = class {
       const setPresence = (params) => {
         this._setPresence.bind(this)(params);
       };
-      const doc = yield this._doc;
+      const [doc, context] = yield Promise.all([this._doc, this._getContext()]);
       const eventContext = {
-        context: this._context,
+        context,
         doc,
         garbageCollect: () => __async(this, null, function* () {
           yield this.garbageCollect();
@@ -932,7 +938,7 @@ var IORoom = class {
       if (!message) return;
       const procedure = this._getProcedure(message);
       this._listeners.onMessage(__spreadProps(__spreadValues({}, "_meta" in this._platform && !!this._platform._meta ? { _meta: this._platform._meta } : {}), {
-        context: this._context,
+        context,
         encodedState: doc.getEncodedState(),
         message,
         platform: this._platform,
@@ -1095,9 +1101,9 @@ var IORoom = class {
       if (!sender) return;
       const connectionId = sender.sessionId;
       if (typeof connectionId !== "string") return;
-      const doc = yield this._doc;
-      const context = {
-        context: this._context,
+      const [doc, context] = yield Promise.all([this._doc, this._getContext()]);
+      const resolverCtx = {
+        context,
         doc,
         garbageCollect: () => __async(this, null, function* () {
           yield this.garbageCollect();
@@ -1122,7 +1128,7 @@ var IORoom = class {
       } catch (e) {
         return;
       }
-      Promise.resolve(resolver(inputs, context)).then((output) => {
+      Promise.resolve(resolver(inputs, resolverCtx)).then((output) => {
         if (!output) return;
         Object.keys(output).forEach((type) => {
           var _a2, _b;
@@ -1142,7 +1148,7 @@ var IORoom = class {
 };
 
 // src/version.generated.ts
-var version = "3.1.7";
+var version = "3.2.1";
 
 // src/PluvServer.ts
 var PluvServer = class {
@@ -1165,6 +1171,7 @@ var PluvServer = class {
       onUserConnected,
       onUserDisconnected
     } = options;
+    this._docFactory = this._config.crdt.doc(() => ({}));
     this._listeners = {
       onRoomDeleted: (event) => onRoomDeleted == null ? void 0 : onRoomDeleted(event),
       onRoomMessage: (event) => onRoomMessage == null ? void 0 : onRoomMessage(event),
@@ -1239,11 +1246,8 @@ var PluvServer = class {
         const update = data == null ? void 0 : data.update;
         if (!oldState) {
           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();
+          if (!!loadedState && !this._docFactory.isEmpty(loadedState)) {
+            doc.applyEncodedState({ update: loadedState });
           }
         }
         if (!doc.isEmpty()) {
@@ -1356,12 +1360,11 @@ var PluvServer = class {
     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._config.context === "function" ? this._config.context(roomContext) : this._config.context;
     const listeners = this._getListeners();
     const logDebug = this._logDebug.bind(this);
     const newRoom = new IORoom(room, __spreadProps(__spreadValues({}, !!_meta ? { _meta } : {}), {
       authorize: (_c = this._config.authorize) != null ? _c : void 0,
-      context,
+      context: this._config.context,
       crdt: this._config.crdt,
       debug: debug != null ? debug : this._config.debug,
       getInitialStorage: this._getInitialStorage,

package/package.json

@@ -1,8 +1,12 @@
 {
   "name": "@pluv/io",
-  "version": "3.1.7",
+  "version": "3.2.1",
   "description": "@pluv/io server-side websocket manager",
-  "author": "leedavidcs",
+  "author": {
+    "email": "david@pluv.io",
+    "name": "i3dly",
+    "url": "https://github.com/i3dly"
+  },
   "license": "MIT",
   "homepage": "https://github.com/pluv-io/pluv",
   "repository": {
@@ -21,16 +25,16 @@
     "jose": "^5.10.0",
     "kleur": "^4.1.5",
     "wonka": "^6.3.5",
-    "@pluv/crdt": "^3.1.7",
-    "@pluv/types": "^3.1.7"
+    "@pluv/crdt": "^3.2.1",
+    "@pluv/types": "^3.2.1"
   },
   "devDependencies": {
-    "eslint": "^9.27.0",
+    "eslint": "^9.31.0",
     "genversion": "^3.2.0",
     "tsup": "^8.5.0",
     "typescript": "^5.8.3",
-    "@pluv/tsconfig": "^3.1.7",
-    "eslint-config-pluv": "^3.1.7"
+    "@pluv/tsconfig": "^3.2.1",
+    "eslint-config-pluv": "^3.2.1"
   },
   "scripts": {
     "build": "pnpm run version && tsup src/index.ts --format esm,cjs --dts",

package/src/IORoom.ts

@@ -41,6 +41,7 @@ import type {
     IORoomMessageEvent,
     IOUserConnectedEvent,
     IOUserDisconnectedEvent,
+    PluvContext,
     PluvIOAuthorize,
     ResolvedPluvIOAuthorize,
     WebSocketSession,
@@ -89,7 +90,7 @@ export type IORoomConfig<
     TEvents extends PluvRouterEventConfig<TPlatform, TAuthorize, TContext> = {},
 > = Partial<IORoomListeners<TPlatform, TAuthorize, TContext, TEvents>> & {
     authorize?: TAuthorize;
-    context: TContext;
+    context: PluvContext<TPlatform, TContext>;
     crdt?: { doc: (value: any) => AbstractCrdtDocFactory<any, any> };
     debug: boolean;
     getInitialStorage: GetInitialStorageFn<TContext>;
@@ -134,13 +135,14 @@ export class IORoom<
     private _uninitialize: Promise<() => Promise<void>> | null = null;
 
     private readonly _authorize: TAuthorize = null as TAuthorize;
-    private readonly _context: TContext;
+    private readonly _context: PluvContext<TPlatform, TContext>;
     private readonly _crdt: TCrdt;
     private readonly _debug: boolean;
     private readonly _docFactory: AbstractCrdtDocFactory<any, any>;
     private readonly _getInitialStorage: GetInitialStorageFn<TContext>;
     private readonly _listeners: IORoomListeners<TPlatform, TAuthorize, TContext, TEvents>;
     private readonly _platform: TPlatform;
+    private readonly _roomContext: InferRoomContextType<TPlatform>;
     private readonly _router: PluvRouter<TPlatform, TAuthorize, TContext, TEvents>;
     private readonly _sessions = new Map<
         [sessionId: string][0],
@@ -214,6 +216,7 @@ export class IORoom<
         this._debug = debug;
         this._docFactory = crdt.doc(() => ({}));
         this._getInitialStorage = getInitialStorage;
+        this._roomContext = roomContext;
         this._router = router;
         this._platform = platform.initialize({ ...(!!_meta ? { _meta } : {}), roomContext });
 
@@ -478,12 +481,12 @@ export class IORoom<
             if (!!user) this._removeUserSession(user.id, sessionId);
 
             try {
-                const doc = await this._doc;
+                const [doc, context] = await Promise.all([this._doc, this._getContext()]);
                 const encodedState = doc.getEncodedState();
 
                 await Promise.resolve(
                     this._listeners.onUserDisconnected({
-                        context: this._context,
+                        context,
                         encodedState,
                         platform: this._platform,
                         room: this.id,
@@ -531,7 +534,7 @@ export class IORoom<
         const presence = session.presence;
         const user = session.user;
 
-        const doc = await this._doc;
+        const [doc, context] = await Promise.all([this._doc, this._getContext()]);
         const encodedState = doc.isEmpty() ? null : doc.getEncodedState();
 
         await this._sendSelfMessage(
@@ -550,7 +553,7 @@ export class IORoom<
         try {
             await Promise.resolve(
                 this._listeners.onUserConnected({
-                    context: this._context,
+                    context,
                     encodedState,
                     platform: this._platform,
                     room: this.id,
@@ -641,25 +644,28 @@ export class IORoom<
         }
     }
 
+    private async _getContext(): Promise<TContext> {
+        return typeof this._context === "function"
+            ? await Promise.resolve(this._context(this._roomContext))
+            : await Promise.resolve(this._context);
+    }
+
     private async _getInitialDoc(): Promise<CrdtDocLike<any, any>> {
         const doc = this._docFactory.getEmpty();
-        const encodedState = await this._platform.persistence.getStorageState(this.id);
+
+        const [encodedState, context] = await Promise.all([
+            this._platform.persistence.getStorageState(this.id),
+            this._getContext(),
+        ]);
 
         if (!encodedState) {
             const loadedState = await this._getInitialStorage({
-                context: this._context,
+                context,
                 room: this.id,
             });
 
-            const checkDoc = this._crdt
-                .doc(() => ({}))
-                .getEmpty()
-                .applyEncodedState({ update: loadedState });
-            const isEmpty = checkDoc.isEmpty();
-            checkDoc.destroy();
-
-            if (!!loadedState && !isEmpty) {
-                doc.applyEncodedState({ update: loadedState }).getEncodedState();
+            if (!!loadedState && !this._docFactory.isEmpty(loadedState)) {
+                doc.applyEncodedState({ update: loadedState });
             }
         }
 
@@ -789,7 +795,7 @@ export class IORoom<
             const uninitialize = async () => {
                 this._platform.pubSub.unsubscribe(pubSubId);
 
-                const doc = await this._doc;
+                const [doc, context] = await Promise.all([this._doc, this._getContext()]);
                 const encodedState = doc.getEncodedState();
 
                 doc.destroy();
@@ -800,7 +806,7 @@ export class IORoom<
                         ...("_meta" in this._platform && !!this._platform._meta
                             ? { _meta: this._platform._meta }
                             : {}),
-                        context: this._context,
+                        context,
                         encodedState,
                         platform: this._platform,
                         room: this.id,
@@ -847,14 +853,14 @@ export class IORoom<
                 this._setPresence.bind(this)(params);
             };
 
-            const doc = await this._doc;
+            const [doc, context] = await Promise.all([this._doc, this._getContext()]);
             const eventContext: EventResolverContext<
                 EventResolverKind,
                 TPlatform,
                 TAuthorize,
                 TContext
             > = {
-                context: this._context,
+                context,
                 doc,
                 garbageCollect: async () => {
                     await this.garbageCollect();
@@ -893,7 +899,7 @@ export class IORoom<
                 ...("_meta" in this._platform && !!this._platform._meta
                     ? { _meta: this._platform._meta }
                     : {}),
-                context: this._context,
+                context,
                 encodedState: doc.getEncodedState(),
                 message: message as InferEventMessage<
                     InferEventsOutput<TEvents>,
@@ -1134,9 +1140,9 @@ export class IORoom<
 
         if (typeof connectionId !== "string") return;
 
-        const doc = await this._doc;
-        const context: EventResolverContext<"sync", TPlatform, TAuthorize, TContext> = {
-            context: this._context,
+        const [doc, context] = await Promise.all([this._doc, this._getContext()]);
+        const resolverCtx: EventResolverContext<"sync", TPlatform, TAuthorize, TContext> = {
+            context,
             doc,
             garbageCollect: async () => {
                 await this.garbageCollect();
@@ -1166,7 +1172,7 @@ export class IORoom<
             return;
         }
 
-        Promise.resolve(resolver(inputs, context)).then((output) => {
+        Promise.resolve(resolver(inputs, resolverCtx)).then((output) => {
             if (!output) return;
 
             Object.keys(output).forEach((type: string) => {

package/src/PluvServer.ts

@@ -108,6 +108,7 @@ export class PluvServer<
     private readonly _config: NonNilProps<
         PluvServerConfig<TPlatform, TAuthorize, TContext, TCrdt, TEvents>
     >;
+    private readonly _docFactory: AbstractCrdtDocFactory<any, any>;
 
     public get fetch(): (...args: any[]) => Promise<any> {
         return (...args: any[]): Promise<any> => {
@@ -136,7 +137,7 @@ export class PluvServer<
             platform: this._config.platform(),
         } as {
             authorize: TAuthorize;
-            context: TContext;
+            context: PluvContext<TPlatform, TContext>;
             crdt: TCrdt;
             events: TEvents;
             platform: TPlatform;
@@ -211,15 +212,8 @@ export class PluvServer<
                     if (!oldState) {
                         const loadedState = await 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();
+                        if (!!loadedState && !this._docFactory.isEmpty(loadedState)) {
+                            doc.applyEncodedState({ update: loadedState });
                         }
                     }
 
@@ -390,6 +384,7 @@ export class PluvServer<
             onUserDisconnected,
         } = options as Partial<BasePluvIOListeners<TPlatform, TAuthorize, TContext, TEvents>>;
 
+        this._docFactory = this._config.crdt.doc(() => ({}));
         (this as any)._listeners = {
             onRoomDeleted: (event) => onRoomDeleted?.(event),
             onRoomMessage: (event) => onRoomMessage?.(event),
@@ -418,17 +413,13 @@ export class PluvServer<
             throw new Error("Unsupported room name");
 
         const roomContext = platformRoomContext as InferRoomContextType<TPlatform>;
-        const context: TContext =
-            typeof this._config.context === "function"
-                ? this._config.context(roomContext)
-                : this._config.context;
         const listeners = this._getListeners();
         const logDebug = this._logDebug.bind(this);
 
         const newRoom = new IORoom<TPlatform, TAuthorize, TContext, TCrdt, TEvents>(room, {
             ...(!!_meta ? { _meta } : {}),
             authorize: this._config.authorize ?? undefined,
-            context,
+            context: this._config.context,
             crdt: this._config.crdt,
             debug: debug ?? this._config.debug,
             getInitialStorage: this._getInitialStorage,

package/src/types.ts

@@ -25,8 +25,8 @@ import type { AbstractWebSocket } from "./AbstractWebSocket";
 import type { PluvRouter, PluvRouterEventConfig } from "./PluvRouter";
 
 export type PluvContext<TPlatform extends AbstractPlatform, TContext extends Record<string, any>> =
-    | TContext
-    | ((params: InferRoomContextType<TPlatform>) => TContext);
+    | MaybePromise<TContext>
+    | ((params: InferRoomContextType<TPlatform>) => MaybePromise<TContext>);
 
 export type EventResolverKind = "broadcast" | "self" | "sync";
 

package/src/version.generated.ts

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