@pluv/io 3.2.2 → 4.0.1

package/src/PluvRouter.ts

@@ -5,11 +5,8 @@ import type { PluvIOAuthorize } from "./types";
 
 export type PluvRouterEventConfig<
     TPlatform extends AbstractPlatform<any> = AbstractPlatform<any>,
-    TAuthorize extends PluvIOAuthorize<
-        TPlatform,
+    TAuthorize extends PluvIOAuthorize<TPlatform, any, InferInitContextType<TPlatform>> | null =
         any,
-        InferInitContextType<TPlatform>
-    > | null = any,
     TContext extends Record<string, any> = {},
 > = { [P: string]: Pick<PluvProcedure<TPlatform, TAuthorize, TContext, any, any>, "config"> };
 
@@ -28,15 +25,11 @@ export type MergedRouter<
 
 export class PluvRouter<
     TPlatform extends AbstractPlatform<any> = AbstractPlatform<any>,
-    TAuthorize extends PluvIOAuthorize<
-        TPlatform,
+    TAuthorize extends PluvIOAuthorize<TPlatform, any, InferInitContextType<TPlatform>> | null =
         any,
-        InferInitContextType<TPlatform>
-    > | null = any,
     TContext extends Record<string, any> = {},
     TEvents extends PluvRouterEventConfig<TPlatform, TAuthorize, TContext> = {},
-> implements IORouterLike<TEvents>
-{
+> implements IORouterLike<TEvents> {
     readonly _defs: { events: TEvents } = { events: {} as TEvents };
 
     constructor(events: TEvents) {

package/src/PluvServer.ts

@@ -1,6 +1,7 @@
 import type { AbstractCrdtDocFactory, CrdtLibraryType, NoopCrdtDocFactory } from "@pluv/crdt";
 import { noop } from "@pluv/crdt";
 import type {
+    AreAllOptional,
     IOLike,
     Id,
     InferIOAuthorize,
@@ -15,7 +16,6 @@ import type {
     InferInitContextType,
     InferRoomContextType,
 } from "./AbstractPlatform";
-import type { IORoomListeners } from "./IORoom";
 import { IORoom } from "./IORoom";
 import type { PluvIO } from "./PluvIO";
 import { PluvProcedure } from "./PluvProcedure";
@@ -47,11 +47,8 @@ export type InferIORoom<TServer extends PluvServer<any, any, any, any, any>> =
 
 export type PluvServerConfig<
     TPlatform extends AbstractPlatform<any, any> = AbstractPlatform<any, any>,
-    TAuthorize extends PluvIOAuthorize<
-        TPlatform,
+    TAuthorize extends PluvIOAuthorize<TPlatform, any, InferInitContextType<TPlatform>> | null =
         any,
-        InferInitContextType<TPlatform>
-    > | null = any,
     TContext extends Record<string, any> = {},
     TCrdt extends CrdtLibraryType<any> = CrdtLibraryType<any>,
     TEvents extends PluvRouterEventConfig<TPlatform, TAuthorize, TContext> = {},
@@ -73,7 +70,7 @@ type BaseCreateRoomOptions<
     TAuthorize extends PluvIOAuthorize<TPlatform, any, InferInitContextType<TPlatform>> | null,
     TContext extends Record<string, any>,
     TEvents extends PluvRouterEventConfig<TPlatform, TAuthorize, TContext>,
-> = Partial<IORoomListeners<TPlatform, TAuthorize, TContext, TEvents>> & {
+> = {
     debug?: boolean;
 };
 
@@ -82,7 +79,7 @@ export type CreateRoomOptions<
     TAuthorize extends PluvIOAuthorize<TPlatform, any, InferInitContextType<TPlatform>> | null,
     TContext extends Record<string, any>,
     TEvents extends PluvRouterEventConfig<TPlatform, TAuthorize, TContext>,
-> = keyof InferRoomContextType<TPlatform> extends never
+> = keyof Omit<InferRoomContextType<TPlatform>, "meta"> extends never
     ? [BaseCreateRoomOptions<TPlatform, TAuthorize, TContext, TEvents>] | []
     : [
           Id<
@@ -93,16 +90,12 @@ export type CreateRoomOptions<
 
 export class PluvServer<
     TPlatform extends AbstractPlatform<any, any> = AbstractPlatform<any, any>,
-    TAuthorize extends PluvIOAuthorize<
-        TPlatform,
+    TAuthorize extends PluvIOAuthorize<TPlatform, any, InferInitContextType<TPlatform>> | null =
         any,
-        InferInitContextType<TPlatform>
-    > | null = any,
     TContext extends Record<string, any> = {},
     TCrdt extends CrdtLibraryType<any> = CrdtLibraryType<any>,
     TEvents extends PluvRouterEventConfig<TPlatform, TAuthorize, TContext> = {},
-> implements IOLike<TAuthorize, TCrdt, TEvents>
-{
+> implements IOLike<TAuthorize, TCrdt, TEvents> {
     public readonly version: string = __PLUV_VERSION as any;
 
     private readonly _config: NonNilProps<
@@ -377,8 +370,9 @@ export class PluvServer<
         } as NonNilProps<PluvServerConfig<TPlatform, TAuthorize, TContext, TCrdt, TEvents>>;
 
         const {
-            onRoomDeleted,
+            onRoomDestroyed,
             onRoomMessage,
+            onStorageDestroyed,
             onStorageUpdated,
             onUserConnected,
             onUserDisconnected,
@@ -386,8 +380,9 @@ export class PluvServer<
 
         this._docFactory = this._config.crdt.doc(() => ({}));
         (this as any)._listeners = {
-            onRoomDeleted: (event) => onRoomDeleted?.(event),
+            onRoomDestroyed: (event) => onRoomDestroyed?.(event),
             onRoomMessage: (event) => onRoomMessage?.(event),
+            onStorageDestroyed: (event) => onStorageDestroyed?.(event),
             onStorageUpdated: (event) => onStorageUpdated?.(event),
             onUserConnected: (event) => onUserConnected?.(event),
             onUserDisconnected: (event) => onUserDisconnected?.(event),
@@ -398,8 +393,14 @@ export class PluvServer<
         room: string,
         ...options: CreateRoomOptions<TPlatform, TAuthorize, TContext, TEvents>
     ): IORoom<TPlatform, TAuthorize, TContext, TCrdt, TEvents> {
-        const { _meta, debug, onDestroy, onMessage, ...platformRoomContext } = (options[0] ??
-            {}) as CreateRoomOptions<TPlatform, TAuthorize, TContext, TEvents>[0] & { _meta?: any };
+        const { _meta, debug, ...platformRoomContext } = (options[0] ?? {}) as CreateRoomOptions<
+            TPlatform,
+            TAuthorize,
+            TContext,
+            TEvents
+        >[0] & {
+            _meta?: any;
+        };
 
         const platform = this._config.platform();
 
@@ -423,17 +424,25 @@ export class PluvServer<
             crdt: this._config.crdt,
             debug: debug ?? this._config.debug,
             getInitialStorage: this._getInitialStorage,
-            async onDestroy(event) {
+            async onRoomDestroyed(event) {
                 logDebug(`${colors.blue("Deleting empty room:")} ${room}`);
 
-                await Promise.resolve(onDestroy?.(event));
-                await Promise.resolve(listeners.onRoomDeleted(event));
-                await event.platform.persistence.deleteStorageState(room);
+                // Always fire server-level onRoomDestroyed
+                await Promise.resolve(listeners.onRoomDestroyed(event));
 
                 logDebug(`${colors.blue("Deleted room:")} ${room}`);
             },
+            async onStorageDestroyed(event) {
+                logDebug(`${colors.blue("Destroying storage for room:")} ${room}`);
+
+                // Always fire server-level onStorageDestroyed
+                await Promise.resolve(listeners.onStorageDestroyed(event));
+
+                await event.platform.persistence.deleteStorageState(room);
+
+                logDebug(`${colors.blue("Destroyed storage for room:")} ${room}`);
+            },
             async onMessage(event) {
-                await Promise.resolve(onMessage?.(event));
                 await Promise.resolve(listeners.onRoomMessage(event));
             },
             async onUserConnected(event) {

package/src/index.ts

@@ -38,6 +38,7 @@ export type { CreateRoomOptions, InferIORoom, PluvServerConfig } from "./PluvSer
 export type {
     GetInitialStorageFn,
     HandleMode,
+    IORoomDestroyedEvent,
     IORoomListenerEvent,
     IORoomMessageEvent,
     IOStorageUpdatedEvent,

package/src/types.ts

@@ -120,8 +120,9 @@ export interface PlatformConfig {
     handleMode: HandleMode;
     registrationMode: WebSocketRegistrationMode;
     listeners: {
-        onRoomDeleted?: boolean;
+        onRoomDestroyed?: boolean;
         onRoomMessage?: boolean;
+        onStorageDestroyed?: boolean;
         onStorageUpdated?: boolean;
         onUserConnected?: boolean;
         onUserDisconnected?: boolean;
@@ -172,8 +173,9 @@ export type BasePluvIOListeners<
     TContext extends Record<string, any>,
     TEvents extends PluvRouterEventConfig<TPlatform, TAuthorize, TContext>,
 > = {
-    onRoomDeleted: (event: IORoomListenerEvent<TPlatform, TContext>) => void;
+    onRoomDestroyed: (event: IORoomDestroyedEvent<TPlatform, TContext>) => void;
     onRoomMessage: (event: IORoomMessageEvent<TPlatform, TAuthorize, TContext, TEvents>) => void;
+    onStorageDestroyed: (event: IORoomListenerEvent<TPlatform, TContext>) => void;
     onStorageUpdated: (event: IOStorageUpdatedEvent<TPlatform, TAuthorize, TContext>) => void;
     onUserConnected: (event: IOUserConnectedEvent<TPlatform, TAuthorize, TContext>) => void;
     onUserDisconnected: (event: IOUserDisconnectedEvent<TPlatform, TAuthorize, TContext>) => void;
@@ -236,6 +238,15 @@ export type IORoomListenerEvent<
     room: string;
 };
 
+export type IORoomDestroyedEvent<
+    TPlatform extends AbstractPlatform<any, any, any, any>,
+    TContext extends Record<string, any>,
+> = {
+    context: TContext;
+    platform: TPlatform;
+    room: string;
+};
+
 export type IORoomMessageEvent<
     TPlatform extends AbstractPlatform<any>,
     TAuthorize extends PluvIOAuthorize<TPlatform, any, InferInitContextType<TPlatform>> | null,

package/src/version.generated.ts

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

package/tsdown.config.ts

@@ -0,0 +1,14 @@
+import { defineConfig } from "tsdown";
+
+export default defineConfig({
+    format: ["esm"],
+    dts: true,
+    outDir: "dist",
+    entry: "src/index.ts",
+    target: "esnext",
+    sourcemap: true,
+    clean: true,
+    exports: {
+        all: true,
+    },
+});