@pluv/platform-cloudflare 0.40.2 → 0.41.1

package/.turbo/turbo-build.log

@@ -1,5 +1,5 @@
 
-> @pluv/platform-cloudflare@0.40.2 build /home/runner/work/pluv/pluv/packages/platform-cloudflare
+> @pluv/platform-cloudflare@0.41.1 build /home/runner/work/pluv/pluv/packages/platform-cloudflare
 > tsup src/index.ts
 
 CLI Building entry: src/index.ts
@@ -8,8 +8,8 @@
 CLI Using tsup config: /home/runner/work/pluv/pluv/packages/platform-cloudflare/tsup.config.ts
 CLI Target: es6
 ESM Build start
-ESM dist/index.mjs 12.93 KB
-ESM ⚡️ Build success in 66ms
+ESM dist/index.mjs 13.90 KB
+ESM ⚡️ Build success in 52ms
 DTS Build start
-DTS ⚡️ Build success in 1180ms
-DTS dist/index.d.mts 6.70 KB
+DTS ⚡️ Build success in 1140ms
+DTS dist/index.d.mts 7.18 KB

package/CHANGELOG.md

@@ -1,5 +1,30 @@
 # @pluv/platform-cloudflare
 
+## 0.41.1
+
+### Patch Changes
+
+- 9e61e10: Fix inferred context type.
+  - @pluv/io@0.41.1
+  - @pluv/persistence-cloudflare-transactional-storage@0.41.1
+  - @pluv/types@0.41.1
+
+## 0.41.0
+
+### Patch Changes
+
+- d07cf2b: Update `createPluvHandler` to automatically garbage collect the dead websockets in the `IORoom` every 60 seconds.
+- Updated dependencies [73adf21]
+- Updated dependencies [f02a430]
+- Updated dependencies [0b908b3]
+- Updated dependencies [6422f3b]
+- Updated dependencies [555b88d]
+- Updated dependencies [a663c65]
+- Updated dependencies [555b88d]
+  - @pluv/io@0.41.0
+  - @pluv/persistence-cloudflare-transactional-storage@0.41.0
+  - @pluv/types@0.41.0
+
 ## 0.40.2
 
 ### Patch Changes

package/dist/index.d.mts

@@ -1,14 +1,16 @@
-import { AbstractWebSocket, WebSocketSerializedState, AbstractWebSocketConfig, AbstractEventMap, AbstractListener, AbstractPlatform, WebSocketRegistrationMode, AbstractPlatformConfig, ConvertWebSocketConfig, PluvServer, InferInitContextType, CreateIOParams, PluvIOAuthorize, PluvContext } from '@pluv/io';
-import { JsonObject, Json, MaybePromise, InferIOAuthorizeUser, InferIOAuthorize, BaseUser, Maybe, Id } from '@pluv/types';
+import { AbstractWebSocket, WebSocketSession, WebSocketSerializedState, AbstractWebSocketConfig, AbstractEventMap, AbstractListener, AbstractPlatform, WebSocketRegistrationMode, AbstractPlatformConfig, ConvertWebSocketConfig, PluvServer, InferInitContextType, CreateIOParams, PluvIOAuthorize, PluvContext } from '@pluv/io';
+import { IOAuthorize, JsonObject, InferIOAuthorizeUser, Json, MaybePromise, InferIOAuthorize, BaseUser, Maybe, Id } from '@pluv/types';
 import { DurableObject } from 'cloudflare:workers';
 
 type CloudflareWebSocketConfig = AbstractWebSocketConfig;
-declare class CloudflareWebSocket extends AbstractWebSocket<WebSocket> {
+declare class CloudflareWebSocket<TAuthorize extends IOAuthorize<any, any> | null = null> extends AbstractWebSocket<WebSocket, TAuthorize> {
     set presence(presence: JsonObject | null);
     get readyState(): 0 | 1 | 2 | 3;
+    get session(): WebSocketSession<TAuthorize>;
     get sessionId(): string;
     get state(): WebSocketSerializedState;
     set state(state: WebSocketSerializedState);
+    set user(user: InferIOAuthorizeUser<TAuthorize>);
     constructor(webSocket: WebSocket, config: CloudflareWebSocketConfig);
     addEventListener<TType extends keyof AbstractEventMap>(type: TType, handler: AbstractListener<TType>): void;
     close(code?: number | undefined, reason?: string | undefined): void;
@@ -27,7 +29,7 @@ type CloudflarePlatformRoomContext<TEnv extends Record<string, any>, TMeta exten
 type CloudflarePlatformConfig<TEnv extends Record<string, any> = {}, TMeta extends Record<string, Json> = {}> = AbstractPlatformConfig<CloudflarePlatformRoomContext<TEnv, TMeta>> & {
     mode?: WebSocketRegistrationMode;
 };
-declare class CloudflarePlatform<TEnv extends Record<string, any> = {}, TMeta extends Record<string, Json> = {}> extends AbstractPlatform<CloudflareWebSocket, {
+declare class CloudflarePlatform<TAuthorize extends IOAuthorize<any, any> | null = null, TEnv extends Record<string, any> = {}, TMeta extends Record<string, Json> = {}> extends AbstractPlatform<CloudflareWebSocket<TAuthorize>, {
     env: TEnv;
     request: Request;
 }, CloudflarePlatformRoomContext<TEnv, TMeta>, {
@@ -64,16 +66,16 @@ declare class CloudflarePlatform<TEnv extends Record<string, any> = {}, TMeta ex
     };
     readonly _name = "platformCloudflare";
     constructor(config: CloudflarePlatformConfig<TEnv, TMeta>);
-    acceptWebSocket(webSocket: CloudflareWebSocket): Promise<void>;
-    convertWebSocket(webSocket: WebSocket, config: ConvertWebSocketConfig): CloudflareWebSocket;
-    getLastPing(webSocket: CloudflareWebSocket): number | null;
+    acceptWebSocket(webSocket: CloudflareWebSocket<TAuthorize>): Promise<void>;
+    convertWebSocket(webSocket: WebSocket, config: ConvertWebSocketConfig): CloudflareWebSocket<TAuthorize>;
+    getLastPing(webSocket: CloudflareWebSocket<TAuthorize>): number | null;
     getSerializedState(webSocket: WebSocket): WebSocketSerializedState | null;
     getSessionId(webSocket: WebSocket): string | null;
     getWebSockets(): readonly WebSocket[];
     initialize(config: AbstractPlatformConfig<CloudflarePlatformRoomContext<TEnv, TMeta>>): this;
     parseData(data: string | ArrayBuffer): Record<string, any>;
     randomUUID(): string;
-    setSerializedState(webSocket: CloudflareWebSocket, state: WebSocketSerializedState): WebSocketSerializedState;
+    setSerializedState(webSocket: CloudflareWebSocket<TAuthorize>, state: WebSocketSerializedState): WebSocketSerializedState;
     private _getDetachedState;
 }
 
@@ -99,8 +101,8 @@ interface CreatePluvHandlerResult<TEnv extends Record<string, any> = {}> {
     fetch: PluvHandlerFetch<TEnv>;
     handler: ExportedHandler<TEnv>;
 }
-type InferCloudflarePluvHandlerEnv<TPluvServer extends PluvServer<CloudflarePlatform, any, any, any>> = TPluvServer extends PluvServer<CloudflarePlatform<infer IEnv>, any, any, any> ? IEnv : {};
-declare const createPluvHandler: <TPluvServer extends PluvServer<CloudflarePlatform, any, any, any>>(config: CreatePluvHandlerConfig<TPluvServer, Id<InferCloudflarePluvHandlerEnv<TPluvServer>>>) => CreatePluvHandlerResult<Id<InferCloudflarePluvHandlerEnv<TPluvServer>>>;
+type InferCloudflarePluvHandlerEnv<TPluvServer extends PluvServer<CloudflarePlatform<any, any>, any, any, any>> = TPluvServer extends PluvServer<CloudflarePlatform<any, infer IEnv>, any, any, any> ? IEnv : {};
+declare const createPluvHandler: <TPluvServer extends PluvServer<CloudflarePlatform<any, any>, any, any, any>>(config: CreatePluvHandlerConfig<TPluvServer, Id<InferCloudflarePluvHandlerEnv<TPluvServer>>>) => CreatePluvHandlerResult<Id<InferCloudflarePluvHandlerEnv<TPluvServer>>>;
 
 declare const identity: <T extends unknown>(x: T) => T;
 
@@ -110,11 +112,11 @@ type InferCallback<TEnv extends Record<string, any> = {}, TMeta extends Record<s
 };
 declare const infer: <TEnv extends Record<string, any> = {}, TMeta extends Record<string, Json> = {}>(callback: InferCallback<TEnv, TMeta>) => InferCallback<TEnv, TMeta>;
 
-type PlatformCloudflareCreateIOParams<TEnv extends Record<string, any> = {}, TMeta extends Record<string, Json> = {}, TContext extends Record<string, any> = {}, TUser extends BaseUser | null = null> = Id<CloudflarePlatformConfig<TEnv, TMeta> & Omit<CreateIOParams<CloudflarePlatform<TEnv, TMeta>, TContext, TUser>, "authorize" | "context" | "platform"> & {
-    authorize?: PluvIOAuthorize<CloudflarePlatform<TEnv, TMeta>, TUser, InferInitContextType<CloudflarePlatform<TEnv, TMeta>>>;
-    context?: PluvContext<CloudflarePlatform<TEnv, TMeta>, TContext>;
+type PlatformCloudflareCreateIOParams<TEnv extends Record<string, any> = {}, TMeta extends Record<string, Json> = {}, TContext extends Record<string, any> = {}, TUser extends BaseUser | null = null> = Id<CloudflarePlatformConfig<TEnv, TMeta> & Omit<CreateIOParams<CloudflarePlatform<IOAuthorize<TUser, TContext>, TEnv, TMeta>, TContext, TUser>, "authorize" | "context" | "platform"> & {
+    authorize?: PluvIOAuthorize<CloudflarePlatform<IOAuthorize<TUser, TContext>, TEnv, TMeta>, TUser, InferInitContextType<CloudflarePlatform<IOAuthorize<TUser, TContext>, TEnv, TMeta>>>;
+    context?: PluvContext<CloudflarePlatform<IOAuthorize<TUser, any>, TEnv, TMeta>, TContext>;
     types?: InferCallback<TEnv, TMeta>;
 }>;
-declare const platformCloudflare: <TEnv extends Record<string, any> = {}, TMeta extends Record<string, Json> = {}, TContext extends Record<string, any> = {}, TUser extends BaseUser | null = null>(config?: PlatformCloudflareCreateIOParams<TEnv, TMeta, TContext, TUser>) => CreateIOParams<CloudflarePlatform<TEnv, TMeta>, TContext, TUser>;
+declare const platformCloudflare: <TEnv extends Record<string, any> = {}, TMeta extends Record<string, Json> = {}, TContext extends Record<string, any> = {}, TUser extends BaseUser | null = null>(config?: PlatformCloudflareCreateIOParams<TEnv, TMeta, TContext, TUser>) => CreateIOParams<CloudflarePlatform<IOAuthorize<TUser, TContext>, TEnv, TMeta>, TContext, TUser>;
 
 export { type AuthorizeFunction, type AuthorizeFunctionContext, CloudflarePlatform, type CloudflarePlatformConfig, type CreatePluvHandlerConfig, type CreatePluvHandlerResult, type InferCallback, type PlatformCloudflareCreateIOParams, type PluvHandlerFetch, createPluvHandler, infer, platformCloudflare };

package/dist/index.mjs

@@ -41,6 +41,12 @@ var __async = (__this, __arguments, generator) => {
 // src/createPluvHandler.ts
 import { DurableObject as BaseDurableObject } from "cloudflare:workers";
 import { match } from "path-to-regexp";
+
+// src/constants.ts
+var DEFAULT_REGISTRATION_MODE = "detached";
+var GARBAGE_COLLECT_INTERVAL_MS = 6e4;
+
+// src/createPluvHandler.ts
 var createPluvHandler = (config) => {
   const { authorize, binding, endpoint = "/api/pluv", modify, io } = config;
   const DurableObject = class extends BaseDurableObject {
@@ -76,10 +82,18 @@ var createPluvHandler = (config) => {
         if (!isWSRequest) return new Response("Expected websocket", { status: 400 });
         const { 0: client, 1: server } = new WebSocketPair();
         const token = new URL(request.url).searchParams.get("token");
+        const alarm = yield this.ctx.storage.getAlarm();
+        if (alarm !== null) yield this.ctx.storage.setAlarm(Date.now() + GARBAGE_COLLECT_INTERVAL_MS);
         yield this._room.register(server, { env: this.env, request, token });
         return new Response(null, { status: 101, webSocket: client });
       });
     }
+    alarm(alarmInfo) {
+      return __async(this, null, function* () {
+        yield this._room.garbageCollect();
+        yield this.ctx.storage.setAlarm(Date.now() + GARBAGE_COLLECT_INTERVAL_MS);
+      });
+    }
   };
   const getDurableObjectNamespace = (env) => {
     const namespace = env[binding];
@@ -180,10 +194,22 @@ var CloudflareWebSocket = class extends AbstractWebSocket {
   get readyState() {
     return this.webSocket.readyState;
   }
+  get session() {
+    var _a;
+    const deserialized = this.webSocket.deserializeAttachment();
+    const sessionId = deserialized.sessionId;
+    const state = this.state;
+    const user = (_a = deserialized.user) != null ? _a : null;
+    return __spreadProps(__spreadValues({}, state), {
+      id: sessionId,
+      user,
+      webSocket: this
+    });
+  }
   get sessionId() {
     var _a, _b;
     const deserialized = (_a = this.webSocket.deserializeAttachment()) != null ? _a : {};
-    const sessionId = (_b = deserialized.sessionId) != null ? _b : crypto.randomUUID();
+    const sessionId = (_b = deserialized.sessionId) != null ? _b : `p_${crypto.randomUUID()}`;
     if (typeof deserialized.sessionId !== "string") {
       this.webSocket.serializeAttachment(__spreadProps(__spreadValues({}, deserialized), { sessionId }));
     }
@@ -207,6 +233,10 @@ var CloudflareWebSocket = class extends AbstractWebSocket {
     const deserialized = this.webSocket.deserializeAttachment();
     this.webSocket.serializeAttachment(__spreadProps(__spreadValues({}, deserialized), { state }));
   }
+  set user(user) {
+    const deserialized = this.webSocket.deserializeAttachment();
+    this.webSocket.serializeAttachment(__spreadProps(__spreadValues({}, deserialized), { user }));
+  }
   constructor(webSocket, config) {
     const { room } = config;
     super(webSocket, config);
@@ -214,10 +244,12 @@ var CloudflareWebSocket = class extends AbstractWebSocket {
       presence: null,
       quit: false,
       room,
-      timers: { ping: (/* @__PURE__ */ new Date()).getTime() }
+      timers: {
+        ping: (/* @__PURE__ */ new Date()).getTime(),
+        presence: null
+      }
     };
     webSocket.serializeAttachment(__spreadValues({
-      sessionId: this.sessionId,
       state
     }, webSocket.deserializeAttachment()));
   }
@@ -238,9 +270,6 @@ var CloudflareWebSocket = class extends AbstractWebSocket {
   }
 };
 
-// src/constants.ts
-var DEFAULT_REGISTRATION_MODE = "detached";
-
 // src/CloudflarePlatform.ts
 var CloudflarePlatform = class _CloudflarePlatform extends AbstractPlatform {
   constructor(config) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pluv/platform-cloudflare",
-  "version": "0.40.2",
+  "version": "0.41.1",
   "description": "@pluv/io adapter for cloudflare workers",
   "author": "leedavidcs",
   "license": "MIT",
@@ -17,22 +17,22 @@
   },
   "dependencies": {
     "path-to-regexp": "^8.2.0",
-    "@pluv/io": "^0.40.2",
-    "@pluv/persistence-cloudflare-transactional-storage": "^0.40.2",
-    "@pluv/types": "^0.40.2"
+    "@pluv/io": "^0.41.1",
+    "@pluv/persistence-cloudflare-transactional-storage": "^0.41.1",
+    "@pluv/types": "^0.41.1"
   },
   "devDependencies": {
-    "@cloudflare/workers-types": "^4.20250414.0",
-    "eslint": "^9.24.0",
+    "@cloudflare/workers-types": "^4.20250418.0",
+    "eslint": "^9.25.0",
     "tsup": "^8.4.0",
     "typescript": "^5.8.3",
-    "@pluv/tsconfig": "^0.40.2",
-    "eslint-config-pluv": "^0.40.2"
+    "@pluv/tsconfig": "^0.41.1",
+    "eslint-config-pluv": "^0.41.1"
   },
   "scripts": {
     "build": "tsup src/index.ts",
     "dev": "tsup src/index.ts --format esm,cjs --watch --dts",
-    "lint": "eslint src/**/*.ts* --fix --max-warnings 0",
+    "lint": "eslint \"src/**/*.ts*\" --fix --max-warnings 0",
     "clean": "rm -rf .turbo && rm -rf node_modules && rm -rf dist"
   }
 }

package/src/CloudflarePlatform.ts

@@ -6,7 +6,7 @@ import type {
 } from "@pluv/io";
 import { AbstractPlatform } from "@pluv/io";
 import { PersistenceCloudflareTransactionalStorage } from "@pluv/persistence-cloudflare-transactional-storage";
-import type { Json } from "@pluv/types";
+import type { IOAuthorize, Json } from "@pluv/types";
 import { CloudflareWebSocket } from "./CloudflareWebSocket";
 import { DEFAULT_REGISTRATION_MODE } from "./constants";
 
@@ -21,10 +21,11 @@ export type CloudflarePlatformConfig<
 > = AbstractPlatformConfig<CloudflarePlatformRoomContext<TEnv, TMeta>> & { mode?: WebSocketRegistrationMode };
 
 export class CloudflarePlatform<
+    TAuthorize extends IOAuthorize<any, any> | null = null,
     TEnv extends Record<string, any> = {},
     TMeta extends Record<string, Json> = {},
 > extends AbstractPlatform<
-    CloudflareWebSocket,
+    CloudflareWebSocket<TAuthorize>,
     { env: TEnv; request: Request },
     CloudflarePlatformRoomContext<TEnv, TMeta>,
     {
@@ -81,7 +82,7 @@ export class CloudflarePlatform<
         );
     }
 
-    public async acceptWebSocket(webSocket: CloudflareWebSocket): Promise<void> {
+    public async acceptWebSocket(webSocket: CloudflareWebSocket<TAuthorize>): Promise<void> {
         const detachedState = this._getDetachedState();
 
         if (!detachedState) {
@@ -93,13 +94,13 @@ export class CloudflarePlatform<
         detachedState.acceptWebSocket(webSocket.webSocket);
     }
 
-    public convertWebSocket(webSocket: WebSocket, config: ConvertWebSocketConfig): CloudflareWebSocket {
+    public convertWebSocket(webSocket: WebSocket, config: ConvertWebSocketConfig): CloudflareWebSocket<TAuthorize> {
         const { room } = config;
 
-        return new CloudflareWebSocket(webSocket, { persistence: this.persistence, platform: this, room });
+        return new CloudflareWebSocket<TAuthorize>(webSocket, { persistence: this.persistence, platform: this, room });
     }
 
-    public getLastPing(webSocket: CloudflareWebSocket): number | null {
+    public getLastPing(webSocket: CloudflareWebSocket<TAuthorize>): number | null {
         const detachedState = this._getDetachedState();
 
         if (!detachedState) return null;
@@ -139,7 +140,7 @@ export class CloudflarePlatform<
 
         if (!roomContext.env || !roomContext.state) throw new Error("Could not derive platform roomContext");
 
-        return new CloudflarePlatform<TEnv, TMeta>({
+        return new CloudflarePlatform<TAuthorize, TEnv, TMeta>({
             roomContext: {
                 env: roomContext.env,
                 meta: roomContext.meta,
@@ -164,7 +165,7 @@ export class CloudflarePlatform<
     }
 
     public setSerializedState(
-        webSocket: CloudflareWebSocket,
+        webSocket: CloudflareWebSocket<TAuthorize>,
         state: WebSocketSerializedState,
     ): WebSocketSerializedState {
         const deserialized = webSocket.webSocket.deserializeAttachment() ?? {};

package/src/CloudflareWebSocket.ts

@@ -1,6 +1,12 @@
-import type { AbstractEventMap, AbstractListener, AbstractWebSocketConfig, WebSocketSerializedState } from "@pluv/io";
+import type {
+    AbstractEventMap,
+    AbstractListener,
+    AbstractWebSocketConfig,
+    WebSocketSerializedState,
+    WebSocketSession,
+} from "@pluv/io";
 import { AbstractWebSocket } from "@pluv/io";
-import type { JsonObject } from "@pluv/types";
+import type { InferIOAuthorizeUser, IOAuthorize, JsonObject } from "@pluv/types";
 
 export interface CloudflareWebSocketEventMap {
     close: CloseEvent;
@@ -11,7 +17,10 @@ export interface CloudflareWebSocketEventMap {
 
 export type CloudflareWebSocketConfig = AbstractWebSocketConfig;
 
-export class CloudflareWebSocket extends AbstractWebSocket<WebSocket> {
+export class CloudflareWebSocket<TAuthorize extends IOAuthorize<any, any> | null = null> extends AbstractWebSocket<
+    WebSocket,
+    TAuthorize
+> {
     public set presence(presence: JsonObject | null) {
         const deserialized = this.webSocket.deserializeAttachment();
         const state = deserialized.state;
@@ -26,9 +35,23 @@ export class CloudflareWebSocket extends AbstractWebSocket<WebSocket> {
         return this.webSocket.readyState as 0 | 1 | 2 | 3;
     }
 
+    public get session(): WebSocketSession<TAuthorize> {
+        const deserialized = this.webSocket.deserializeAttachment();
+        const sessionId = deserialized.sessionId as string;
+        const state = this.state;
+        const user = (deserialized.user ?? null) as InferIOAuthorizeUser<TAuthorize>;
+
+        return {
+            ...state,
+            id: sessionId,
+            user,
+            webSocket: this,
+        };
+    }
+
     public get sessionId(): string {
         const deserialized = this.webSocket.deserializeAttachment() ?? {};
-        const sessionId = deserialized.sessionId ?? crypto.randomUUID();
+        const sessionId = deserialized.sessionId ?? `p_${crypto.randomUUID()}`;
 
         if (typeof deserialized.sessionId !== "string") {
             this.webSocket.serializeAttachment({ ...deserialized, sessionId });
@@ -63,6 +86,12 @@ export class CloudflareWebSocket extends AbstractWebSocket<WebSocket> {
         this.webSocket.serializeAttachment({ ...deserialized, state });
     }
 
+    public set user(user: InferIOAuthorizeUser<TAuthorize>) {
+        const deserialized = this.webSocket.deserializeAttachment();
+
+        this.webSocket.serializeAttachment({ ...deserialized, user });
+    }
+
     constructor(webSocket: WebSocket, config: CloudflareWebSocketConfig) {
         const { room } = config;
 
@@ -72,11 +101,13 @@ export class CloudflareWebSocket extends AbstractWebSocket<WebSocket> {
             presence: null,
             quit: false,
             room,
-            timers: { ping: new Date().getTime() },
+            timers: {
+                ping: new Date().getTime(),
+                presence: null,
+            },
         };
 
         webSocket.serializeAttachment({
-            sessionId: this.sessionId,
             state,
             ...webSocket.deserializeAttachment(),
         });

package/src/constants.ts

@@ -1,3 +1,4 @@
 import type { WebSocketRegistrationMode } from "@pluv/io";
 
 export const DEFAULT_REGISTRATION_MODE: WebSocketRegistrationMode = "detached";
+export const GARBAGE_COLLECT_INTERVAL_MS = 60_000;

package/src/createPluvHandler.ts

@@ -3,6 +3,7 @@ import type { BaseUser, Id, InferIOAuthorize, InferIOAuthorizeUser, Maybe, Maybe
 import { DurableObject as BaseDurableObject } from "cloudflare:workers";
 import { match } from "path-to-regexp";
 import { CloudflarePlatform } from "./CloudflarePlatform";
+import { GARBAGE_COLLECT_INTERVAL_MS } from "./constants";
 
 export type AuthorizeFunctionContext<TPluvServer extends PluvServer<any, any, any, any>> = {
     room: string;
@@ -36,16 +37,16 @@ export interface CreatePluvHandlerResult<TEnv extends Record<string, any> = {}>
     handler: ExportedHandler<TEnv>;
 }
 
-type InferCloudflarePluvHandlerEnv<TPluvServer extends PluvServer<CloudflarePlatform, any, any, any>> =
-    TPluvServer extends PluvServer<CloudflarePlatform<infer IEnv>, any, any, any> ? IEnv : {};
+type InferCloudflarePluvHandlerEnv<TPluvServer extends PluvServer<CloudflarePlatform<any, any>, any, any, any>> =
+    TPluvServer extends PluvServer<CloudflarePlatform<any, infer IEnv>, any, any, any> ? IEnv : {};
 
-export const createPluvHandler = <TPluvServer extends PluvServer<CloudflarePlatform, any, any, any>>(
+export const createPluvHandler = <TPluvServer extends PluvServer<CloudflarePlatform<any, any>, any, any, any>>(
     config: CreatePluvHandlerConfig<TPluvServer, Id<InferCloudflarePluvHandlerEnv<TPluvServer>>>,
 ): CreatePluvHandlerResult<Id<InferCloudflarePluvHandlerEnv<TPluvServer>>> => {
     const { authorize, binding, endpoint = "/api/pluv", modify, io } = config;
 
     const DurableObject = class extends BaseDurableObject<Id<InferCloudflarePluvHandlerEnv<TPluvServer>>> {
-        private _room: IORoom<CloudflarePlatform>;
+        private _room: IORoom<CloudflarePlatform<any, any>>;
 
         constructor(state: DurableObjectState, env: Id<InferCloudflarePluvHandlerEnv<TPluvServer>>) {
             super(state, env);
@@ -86,10 +87,18 @@ export const createPluvHandler = <TPluvServer extends PluvServer<CloudflarePlatf
             const { 0: client, 1: server } = new WebSocketPair();
             const token = new URL(request.url).searchParams.get("token");
 
+            const alarm = await this.ctx.storage.getAlarm();
+            if (alarm !== null) await this.ctx.storage.setAlarm(Date.now() + GARBAGE_COLLECT_INTERVAL_MS);
+
             await this._room.register(server, { env: this.env, request, token });
 
             return new Response(null, { status: 101, webSocket: client });
         }
+
+        public async alarm(alarmInfo?: AlarmInvocationInfo): Promise<void> {
+            await this._room.garbageCollect();
+            await this.ctx.storage.setAlarm(Date.now() + GARBAGE_COLLECT_INTERVAL_MS);
+        }
     };
 
     const getDurableObjectNamespace = (env: Id<InferCloudflarePluvHandlerEnv<TPluvServer>>): DurableObjectNamespace => {

package/src/platformCloudflare.ts

@@ -1,5 +1,5 @@
 import type { CreateIOParams, InferInitContextType, PluvContext, PluvIOAuthorize } from "@pluv/io";
-import type { BaseUser, Id, Json } from "@pluv/types";
+import type { BaseUser, Id, IOAuthorize, Json } from "@pluv/types";
 import type { CloudflarePlatformConfig } from "./CloudflarePlatform";
 import { CloudflarePlatform } from "./CloudflarePlatform";
 import type { InferCallback } from "./infer";
@@ -11,13 +11,16 @@ export type PlatformCloudflareCreateIOParams<
     TUser extends BaseUser | null = null,
 > = Id<
     CloudflarePlatformConfig<TEnv, TMeta> &
-        Omit<CreateIOParams<CloudflarePlatform<TEnv, TMeta>, TContext, TUser>, "authorize" | "context" | "platform"> & {
+        Omit<
+            CreateIOParams<CloudflarePlatform<IOAuthorize<TUser, TContext>, TEnv, TMeta>, TContext, TUser>,
+            "authorize" | "context" | "platform"
+        > & {
             authorize?: PluvIOAuthorize<
-                CloudflarePlatform<TEnv, TMeta>,
+                CloudflarePlatform<IOAuthorize<TUser, TContext>, TEnv, TMeta>,
                 TUser,
-                InferInitContextType<CloudflarePlatform<TEnv, TMeta>>
+                InferInitContextType<CloudflarePlatform<IOAuthorize<TUser, TContext>, TEnv, TMeta>>
             >;
-            context?: PluvContext<CloudflarePlatform<TEnv, TMeta>, TContext>;
+            context?: PluvContext<CloudflarePlatform<IOAuthorize<TUser, any>, TEnv, TMeta>, TContext>;
             types?: InferCallback<TEnv, TMeta>;
         }
 >;
@@ -29,7 +32,7 @@ export const platformCloudflare = <
     TUser extends BaseUser | null = null,
 >(
     config: PlatformCloudflareCreateIOParams<TEnv, TMeta, TContext, TUser> = {},
-): CreateIOParams<CloudflarePlatform<TEnv, TMeta>, TContext, TUser> => {
+): CreateIOParams<CloudflarePlatform<IOAuthorize<TUser, TContext>, TEnv, TMeta>, TContext, TUser> => {
     const { authorize, context, crdt, debug } = config;
 
     return {
@@ -37,6 +40,6 @@ export const platformCloudflare = <
         context,
         crdt,
         debug,
-        platform: new CloudflarePlatform<TEnv, TMeta>(config),
+        platform: new CloudflarePlatform<IOAuthorize<TUser, TContext>, TEnv, TMeta>(config),
     };
 };