@pluv/io 0.4.0 → 0.4.2

package/.turbo/turbo-build.log

@@ -1,5 +1,5 @@
 
-> @pluv/io@0.4.0 build /home/runner/work/pluv/pluv/packages/io
+> @pluv/io@0.4.2 build /home/runner/work/pluv/pluv/packages/io
 > tsup src/index.ts --format esm,cjs --dts
 
 CLI Building entry: src/index.ts
@@ -8,10 +8,10 @@
 CLI Target: es6
 ESM Build start
 CJS Build start
-ESM dist/index.mjs 28.25 KB
-ESM ⚡️ Build success in 154ms
-CJS dist/index.js 30.31 KB
-CJS ⚡️ Build success in 155ms
+CJS dist/index.js 30.12 KB
+CJS ⚡️ Build success in 109ms
+ESM dist/index.mjs 28.06 KB
+ESM ⚡️ Build success in 112ms
 DTS Build start
-DTS ⚡️ Build success in 4082ms
-DTS dist/index.d.ts 14.78 KB
+DTS ⚡️ Build success in 3144ms
+DTS dist/index.d.ts 14.86 KB

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # @pluv/io
 
+## 0.4.2
+
+### Patch Changes
+
+- 8917309: fixed PluvIO listeners onRoomDeleted and onStorageUpdated not working when additional events were added
+
+## 0.4.1
+
+### Patch Changes
+
+- b85a232: bumped dependencies
+- Updated dependencies [b85a232]
+  - @pluv/crdt-yjs@0.3.8
+  - @pluv/types@0.2.0
+
 ## 0.4.0
 
 ### Minor Changes

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { JsonObject, MaybePromise, IOEventMessage, EventRecord, InputZodLike, Id, IOLike, InferIOOutput, BaseUser, IOAuthorize, BaseIOAuthorize, InferIOInput, Maybe, InferIOAuthorizeUser, InferIOAuthorize, Spread, InferIOOutputBroadcast, InferIOOutputSelf, InferIOOutputSync, BaseClientEventRecord, BaseIOEventRecord } from '@pluv/types';
+import { JsonObject, MaybePromise, IOEventMessage, EventRecord, InputZodLike, Id, IOLike, InferIOOutput, BaseUser, IOAuthorize, BaseIOAuthorize, InferIOInput, InferIOAuthorizeUser, InferIOAuthorize, Spread, InferIOOutputBroadcast, InferIOOutputSelf, InferIOOutputSync, Maybe, BaseClientEventRecord, BaseIOEventRecord } from '@pluv/types';
 export { BaseUser, EventMessage, EventRecord, IOEventMessage } from '@pluv/types';
 import { YjsDoc } from '@pluv/crdt-yjs';
 
@@ -188,18 +188,16 @@ type IORoomConfig<TPlatform extends AbstractPlatform<any> = AbstractPlatform<any
     context: TContext;
     debug: boolean;
     events: InferEventConfig<TContext, TInput, TOutputBroadcast, TOutputSelf, TOutputSync>;
-    initialStorage?: () => MaybePromise<Maybe<string>>;
     platform: TPlatform;
 };
 interface WebsocketRegisterOptions {
-    token?: string;
+    token?: string | null;
 }
 declare class IORoom<TPlatform extends AbstractPlatform<any> = AbstractPlatform<any>, TAuthorize extends IOAuthorize<any, any> = BaseIOAuthorize, TContext extends JsonObject = {}, TInput extends EventRecord<string, any> = {}, TOutputBroadcast extends EventRecord<string, any> = {}, TOutputSelf extends EventRecord<string, any> = {}, TOutputSync extends EventRecord<string, any> = {}> implements IOLike<TAuthorize, TInput, TOutputBroadcast, TOutputSelf, TOutputSync> {
     private readonly _context;
     private readonly _debug;
     private readonly _platform;
     private _doc;
-    private _initialStorage;
     private _listeners;
     private _sessions;
     private _uninitialize;
@@ -228,9 +226,9 @@ declare class IORoom<TPlatform extends AbstractPlatform<any> = AbstractPlatform<
     private _sendSyncMessage;
 }
 
-type InferIOContext<TIO extends PluvIO<any, any, any, any, any>> = TIO extends PluvIO<any, any, infer IContext, any, any> ? IContext : never;
-type InferIOPlatform<TIO extends PluvIO<any, any, any, any>> = TIO extends PluvIO<infer IPlatform, any, any, any, any> ? IPlatform : never;
-type InferIORoom<TIO extends PluvIO<any, any, any, any>> = TIO extends PluvIO<infer IPlatform, infer IAuthorize, infer IContext, infer IInput, infer IOutput> ? IORoom<IPlatform, IAuthorize, IContext, IInput, IOutput> : never;
+type InferIOContext<TIO extends PluvIO<any, any, any, any, any, any, any>> = TIO extends PluvIO<any, any, infer IContext, any, any, any, any> ? IContext : never;
+type InferIOPlatform<TIO extends PluvIO<any, any, any, any, any, any, any>> = TIO extends PluvIO<infer IPlatform, any, any, any, any, any, any> ? IPlatform : never;
+type InferIORoom<TIO extends PluvIO<any, any, any, any, any, any, any>> = TIO extends PluvIO<infer IPlatform, infer IAuthorize, infer IContext, infer IInput, infer IOutputBroadcast, infer IOutputSelf, infer IOutputSync> ? IORoom<IPlatform, IAuthorize, IContext, IInput, IOutputBroadcast, IOutputSelf, IOutputSync> : never;
 interface PluvIOListeners {
     onRoomDeleted: (room: string, encodedState: string) => void;
     onStorageUpdated: (room: string, encodedState: string) => void;
@@ -249,11 +247,11 @@ interface GetRoomOptions {
 declare class PluvIO<TPlatform extends AbstractPlatform<any> = AbstractPlatform<any>, TAuthorize extends IOAuthorize<any, any> = BaseIOAuthorize, TContext extends JsonObject = {}, TInput extends EventRecord<string, any> = {}, TOutputBroadcast extends EventRecord<string, any> = {}, TOutputSelf extends EventRecord<string, any> = {}, TOutputSync extends EventRecord<string, any> = {}> implements IOLike<TAuthorize, TInput, TOutputBroadcast, TOutputSelf, TOutputSync> {
     private _context;
     private _initialStorage;
-    private _listeners;
     private _rooms;
     readonly _authorize: TAuthorize | null;
     readonly _debug: boolean;
     readonly _events: InferEventConfig<TContext, TInput, TOutputBroadcast, TOutputSelf, TOutputSync>;
+    readonly _listeners: PluvIOListeners;
     readonly _platform: TPlatform;
     constructor(options: PluvIOConfig<TPlatform, TAuthorize, TContext, TInput, TOutputBroadcast, TOutputSelf, TOutputSync>);
     createToken(params: JWTEncodeParams<InferIOAuthorizeUser<InferIOAuthorize<this>>>): Promise<string>;

package/dist/index.js

@@ -306,19 +306,10 @@ var PING_TIMEOUT_MS = 3e4;
 var IORoom = class {
   constructor(id, config) {
     this._doc = (0, import_crdt_yjs.doc)();
-    this._initialStorage = null;
     this._sessions = /* @__PURE__ */ new Map();
     this._uninitialize = null;
     this._authorize = null;
-    const {
-      authorize: authorize2,
-      context,
-      debug,
-      events,
-      initialStorage,
-      onDestroy,
-      platform
-    } = config;
+    const { authorize: authorize2, context, debug, events, onDestroy, platform } = config;
     this._context = context;
     this._debug = debug;
     this._events = events;
@@ -331,8 +322,6 @@ var IORoom = class {
     };
     if (authorize2)
       this._authorize = authorize2;
-    if (initialStorage)
-      this._initialStorage = initialStorage;
   }
   broadcast(event, data) {
     const message = { type: event, data };
@@ -902,10 +891,6 @@ var PluvIO = class {
       context: this._context,
       debug: debug != null ? debug : this._debug,
       events: this._events,
-      initialStorage: () => {
-        var _a2;
-        return (_a2 = this._initialStorage) == null ? void 0 : _a2.call(this, room);
-      },
       onDestroy: (encodedState) => {
         this._logDebug(
           `${import_kleur2.default.blue("Deleting empty room:")} ${room}`
@@ -939,11 +924,14 @@ var PluvIO = class {
     const platform = first._platform;
     const events1 = first._events;
     const events2 = second._events;
+    const { onRoomDeleted, onStorageUpdated } = first._listeners;
     const events = Object.assign(/* @__PURE__ */ Object.create(null), events1, events2);
     return new PluvIO({
       authorize: authorize2,
       debug,
       events,
+      onRoomDeleted,
+      onStorageUpdated,
       platform
     });
   }

package/dist/index.mjs

@@ -269,19 +269,10 @@ var PING_TIMEOUT_MS = 3e4;
 var IORoom = class {
   constructor(id, config) {
     this._doc = doc();
-    this._initialStorage = null;
     this._sessions = /* @__PURE__ */ new Map();
     this._uninitialize = null;
     this._authorize = null;
-    const {
-      authorize: authorize2,
-      context,
-      debug,
-      events,
-      initialStorage,
-      onDestroy,
-      platform
-    } = config;
+    const { authorize: authorize2, context, debug, events, onDestroy, platform } = config;
     this._context = context;
     this._debug = debug;
     this._events = events;
@@ -294,8 +285,6 @@ var IORoom = class {
     };
     if (authorize2)
       this._authorize = authorize2;
-    if (initialStorage)
-      this._initialStorage = initialStorage;
   }
   broadcast(event, data) {
     const message = { type: event, data };
@@ -865,10 +854,6 @@ var PluvIO = class {
       context: this._context,
       debug: debug != null ? debug : this._debug,
       events: this._events,
-      initialStorage: () => {
-        var _a2;
-        return (_a2 = this._initialStorage) == null ? void 0 : _a2.call(this, room);
-      },
       onDestroy: (encodedState) => {
         this._logDebug(
           `${colors2.blue("Deleting empty room:")} ${room}`
@@ -902,11 +887,14 @@ var PluvIO = class {
     const platform = first._platform;
     const events1 = first._events;
     const events2 = second._events;
+    const { onRoomDeleted, onStorageUpdated } = first._listeners;
     const events = Object.assign(/* @__PURE__ */ Object.create(null), events1, events2);
     return new PluvIO({
       authorize: authorize2,
       debug,
       events,
+      onRoomDeleted,
+      onStorageUpdated,
       platform
     });
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pluv/io",
-  "version": "0.4.0",
+  "version": "0.4.2",
   "description": "@pluv/io server-side websocket manager",
   "author": "leedavidcs",
   "license": "MIT",
@@ -21,7 +21,7 @@
     "jose": "^4.14.4",
     "kleur": "^4.1.5",
     "wonka": "^6.3.2",
-    "@pluv/crdt-yjs": "^0.3.7",
+    "@pluv/crdt-yjs": "^0.3.8",
     "@pluv/types": "^0.2.0"
   },
   "peerDependencies": {
@@ -30,9 +30,9 @@
   "devDependencies": {
     "tsup": "^6.7.0",
     "typescript": "^5.0.4",
-    "yjs": "^13.6.0",
+    "yjs": "^13.6.1",
     "@pluv/tsconfig": "^0.1.6",
-    "eslint-config-pluv": "^0.1.11"
+    "eslint-config-pluv": "^0.1.12"
   },
   "scripts": {
     "build": "tsup src/index.ts --format esm,cjs --dts",

package/src/IORoom.ts

@@ -64,7 +64,6 @@ export type IORoomConfig<
         TOutputSelf,
         TOutputSync
     >;
-    initialStorage?: () => MaybePromise<Maybe<string>>;
     platform: TPlatform;
 };
 
@@ -74,7 +73,7 @@ interface SendMessageSender {
 }
 
 export interface WebsocketRegisterOptions {
-    token?: string;
+    token?: string | null;
 }
 
 export class IORoom<
@@ -93,7 +92,6 @@ export class IORoom<
     private readonly _platform: TPlatform;
 
     private _doc: YjsDoc<any> = doc();
-    private _initialStorage: (() => MaybePromise<Maybe<string>>) | null = null;
     private _listeners: IORoomListeners;
     private _sessions = new Map<string, WebSocketSession>();
     private _uninitialize: (() => Promise<void>) | null = null;
@@ -121,15 +119,8 @@ export class IORoom<
             TOutputSync
         >
     ) {
-        const {
-            authorize,
-            context,
-            debug,
-            events,
-            initialStorage,
-            onDestroy,
-            platform,
-        } = config;
+        const { authorize, context, debug, events, onDestroy, platform } =
+            config;
 
         this._context = context;
         this._debug = debug;
@@ -145,7 +136,6 @@ export class IORoom<
         };
 
         if (authorize) this._authorize = authorize;
-        if (initialStorage) this._initialStorage = initialStorage;
     }
 
     public broadcast<TEvent extends keyof InferIOInput<this>>(
@@ -308,7 +298,7 @@ export class IORoom<
     }
 
     private async _getAuthorizedUser(
-        token: string | undefined
+        token: Maybe<string>
     ): Promise<InferIOAuthorizeUser<InferIOAuthorize<this>> | null> {
         if (!this._authorize) return null;
         if (!token) return null;

package/src/PluvIO.ts

@@ -21,21 +21,37 @@ import type { JWTEncodeParams } from "./authorize";
 import { authorize } from "./authorize";
 import type { EventConfig, InferEventConfig } from "./types";
 
-export type InferIOContext<TIO extends PluvIO<any, any, any, any, any>> =
-    TIO extends PluvIO<any, any, infer IContext, any, any> ? IContext : never;
-
-export type InferIOPlatform<TIO extends PluvIO<any, any, any, any>> =
-    TIO extends PluvIO<infer IPlatform, any, any, any, any> ? IPlatform : never;
-
-export type InferIORoom<TIO extends PluvIO<any, any, any, any>> =
+export type InferIOContext<
+    TIO extends PluvIO<any, any, any, any, any, any, any>
+> = TIO extends PluvIO<any, any, infer IContext, any, any, any, any>
+    ? IContext
+    : never;
+
+export type InferIOPlatform<
+    TIO extends PluvIO<any, any, any, any, any, any, any>
+> = TIO extends PluvIO<infer IPlatform, any, any, any, any, any, any>
+    ? IPlatform
+    : never;
+
+export type InferIORoom<TIO extends PluvIO<any, any, any, any, any, any, any>> =
     TIO extends PluvIO<
         infer IPlatform,
         infer IAuthorize,
         infer IContext,
         infer IInput,
-        infer IOutput
+        infer IOutputBroadcast,
+        infer IOutputSelf,
+        infer IOutputSync
     >
-        ? IORoom<IPlatform, IAuthorize, IContext, IInput, IOutput>
+        ? IORoom<
+              IPlatform,
+              IAuthorize,
+              IContext,
+              IInput,
+              IOutputBroadcast,
+              IOutputSelf,
+              IOutputSync
+          >
         : never;
 
 export interface PluvIORegisterOptions {
@@ -89,7 +105,6 @@ export class PluvIO<
     private _initialStorage:
         | ((room: string) => MaybePromise<Maybe<string>>)
         | null = null;
-    private _listeners: PluvIOListeners;
     private _rooms = new Map<
         string,
         IORoom<
@@ -240,6 +255,7 @@ export class PluvIO<
         TOutputSelf,
         TOutputSync
     >;
+    readonly _listeners: PluvIOListeners;
     readonly _platform: TPlatform;
 
     constructor(
@@ -397,7 +413,6 @@ export class PluvIO<
             context: this._context,
             debug: debug ?? this._debug,
             events: this._events,
-            initialStorage: () => this._initialStorage?.(room),
             onDestroy: (encodedState) => {
                 this._logDebug(
                     `${colors.blue("Deleting empty room:")} ${room}`
@@ -452,12 +467,16 @@ export class PluvIO<
         const events1 = first._events;
         const events2 = second._events;
 
+        const { onRoomDeleted, onStorageUpdated } = first._listeners;
+
         const events = Object.assign(Object.create(null), events1, events2);
 
         return new PluvIO({
             authorize,
             debug,
             events,
+            onRoomDeleted,
+            onStorageUpdated,
             platform,
         });
     }