@pluv/platform-cloudflare 0.17.3 → 0.19.0

package/.turbo/turbo-build.log

@@ -1,18 +1,18 @@
 
-> @pluv/platform-cloudflare@0.17.3 build /home/runner/work/pluv/pluv/packages/platform-cloudflare
+> @pluv/platform-cloudflare@0.19.0 build /home/runner/work/pluv/pluv/packages/platform-cloudflare
 > tsup src/index.ts --format esm,cjs --dts
 
-CLI Building entry: src/index.ts
-CLI Using tsconfig: tsconfig.json
-CLI tsup v8.0.2
-CLI Target: es6
-ESM Build start
-CJS Build start
-ESM dist/index.mjs 5.81 KB
-ESM ⚡️ Build success in 92ms
-CJS dist/index.js 6.94 KB
-CJS ⚡️ Build success in 91ms
-DTS Build start
-DTS ⚡️ Build success in 3182ms
-DTS dist/index.d.mts 2.94 KB
-DTS dist/index.d.ts  2.94 KB
+CLI Building entry: src/index.ts
+CLI Using tsconfig: tsconfig.json
+CLI tsup v8.1.0
+CLI Target: es6
+ESM Build start
+CJS Build start
+CJS dist/index.js 6.86 KB
+CJS ⚡️ Build success in 91ms
+ESM dist/index.mjs 5.73 KB
+ESM ⚡️ Build success in 92ms
+DTS Build start
+DTS ⚡️ Build success in 2530ms
+DTS dist/index.d.mts 3.02 KB
+DTS dist/index.d.ts  3.02 KB

package/CHANGELOG.md

@@ -1,5 +1,116 @@
 # @pluv/platform-cloudflare
 
+## 0.19.0
+
+### Patch Changes
+
+- @pluv/io@0.19.0
+- @pluv/types@0.19.0
+
+## 0.18.0
+
+### Minor Changes
+
+- 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:
+
+  ```ts
+  // backend/io.ts
+
+  import { createIO } from "@pluv/io";
+  import { createPluvHandler, platformNode } from "@pluv/platform-node";
+  import { z } from "zod";
+
+  export const io = createIO({
+    platform: platformNode(),
+  })
+    .event("SEND_MESSAGE", {
+      input: z.object({ message: z.string() }),
+      resolver: ({ message }) => ({ RECEIVE_MESSAGE: { message } }),
+    })
+    .event("DOUBLE_VALUE", {
+      input: z.object({ value: z.number() }),
+      resolver: ({ value }) => ({ VALUE_DOUBLED: { value: value * 2 } }),
+    });
+
+  const Pluv = createPluvHandler({
+    io,
+    /* ... */
+  });
+  ```
+
+  ```ts
+  // frontend/pluv.ts
+
+  import { createClient } from "@pluv/react";
+  import type { io } from "../backend/io";
+
+  const client = createClient<typeof io>({
+    /* ... */
+  });
+  ```
+
+  ### Now:
+
+  ```ts
+  import { createIO } from "@pluv/io";
+  import { createPluvHandler, platformNode } from "@pluv/platform-node";
+  import { z } from "zod";
+
+  const io = createIO({
+    platform: platformNode(),
+  });
+
+  const router = io.router({
+    SEND_MESSAGE: io.procedure
+      .input(z.object({ message: z.string() }))
+      .broadcast(({ message }) => ({
+        RECEIVE_MESSAGE: { message },
+      })),
+    DOUBLE_VALUE: io.procedure
+      .input(z.object({ value: z.number() }))
+      .broadcast(({ value }) => ({
+        VALUE_DOUBLED: { value: value * 2 },
+      })),
+  });
+
+  export const ioServer = io.server({ router });
+
+  const Pluv = createPluvHandler({
+    io: ioServer, // <- This uses the PluvServer now
+    /* ... */
+  });
+  ```
+
+  ```ts
+  // frontend/pluv.ts
+
+  import { createClient } from "@pluv/react";
+  import type { ioServer } from "../backend/io";
+
+  // This users the PluvServer type now
+  const client = createClient<typeof ioServer>({
+    /* ... */
+  });
+  ```
+
+  - `PluvRouter` instances can also be merged via the `mergeRouters` method, which effectively performs an `Object.assign` of the events object and returns a new `PluvRouter` with the correct types:
+
+  ```ts
+  const router = io.mergeRouters(router1, router2);
+  ```
+
+### Patch Changes
+
+- Updated dependencies [428c21c]
+- Updated dependencies [329dbcd]
+- Updated dependencies [99b5ca9]
+  - @pluv/io@0.18.0
+  - @pluv/types@0.18.0
+
 ## 0.17.3
 
 ### Patch Changes

package/README.md

@@ -50,14 +50,15 @@ pnpm add @pluv/platform-cloudflare
 import { createIO } from "@pluv/io";
 import { platformCloudflare } from "@pluv/platform-cloudflare";
 
-export const io = createIO({
-    platform: platformCloudflare(),
-});
+export const io = createIO({ platform: platformCloudflare() });
+export const ioServer = io.server();
 
 /* Somewhere in a Cloudflare worker durable object */
 const { 0: client, 1: server } = new WebSocketPair();
 
-await io.register(server);
+const room = ioServer.getRoom(state.id.toString(), { env });
+
+await room.register(server);
 
 return new Response(null, { status: 101, webSocket: client });
 ```

package/dist/index.d.mts

@@ -1,4 +1,4 @@
-import { AbstractWebSocket, AbstractEventMap, AbstractListener, AbstractWebSocketConfig, AbstractPlatform, ConvertWebSocketConfig, PluvIO } from '@pluv/io';
+import { AbstractWebSocket, AbstractEventMap, AbstractListener, AbstractWebSocketConfig, AbstractPlatform, ConvertWebSocketConfig, PluvServer } from '@pluv/io';
 import { MaybePromise, Maybe, InferIOAuthorizeUser, InferIOAuthorize, InferIOAuthorizeRequired, Id } from '@pluv/types';
 
 type CloudflareWebSocketConfig = AbstractWebSocketConfig;
@@ -27,14 +27,14 @@ interface AuthorizeFunctionContext {
     request: Request<any, CfProperties<any>>;
     roomId: string;
 }
-type AuthorizeFunction<TPluv extends PluvIO<CloudflarePlatform>> = (ctx: AuthorizeFunctionContext) => MaybePromise<Maybe<InferIOAuthorizeUser<InferIOAuthorize<TPluv>>>>;
-type CreatePluvHandlerConfig<TPluv extends PluvIO<CloudflarePlatform>, TEnv extends Record<string, any>> = {
+type AuthorizeFunction<TPluvServer extends PluvServer<CloudflarePlatform, any, any, any>> = (ctx: AuthorizeFunctionContext) => MaybePromise<Maybe<InferIOAuthorizeUser<InferIOAuthorize<TPluvServer>>>>;
+type CreatePluvHandlerConfig<TPluvServer extends PluvServer<CloudflarePlatform, any, any, any>, TEnv extends Record<string, any>> = {
     binding: string;
     endpoint?: string;
     modify?: (request: Request, response: Response, env: TEnv) => MaybePromise<Response>;
-    io: TPluv;
-} & (InferIOAuthorizeRequired<InferIOAuthorize<TPluv>> extends true ? {
-    authorize: AuthorizeFunction<TPluv>;
+    io: TPluvServer;
+} & (InferIOAuthorizeRequired<InferIOAuthorize<TPluvServer>> extends true ? {
+    authorize: AuthorizeFunction<TPluvServer>;
 } : {
     authorize?: undefined;
 });
@@ -46,8 +46,8 @@ interface CreatePluvHandlerResult<TEnv extends Record<string, any> = {}> {
     fetch: PluvHandlerFetch<TEnv>;
     handler: ExportedHandler<TEnv>;
 }
-type InferCloudflarePluvHandlerEnv<TPluv extends PluvIO<CloudflarePlatform, any, any, any, any, any, any>> = TPluv extends PluvIO<CloudflarePlatform<infer IEnv>, any, any, any, any, any, any> ? IEnv : {};
-declare const createPluvHandler: <TPluv extends PluvIO<CloudflarePlatform<{}>, any, any, any, any, any, any>>(config: CreatePluvHandlerConfig<TPluv, Id<InferCloudflarePluvHandlerEnv<TPluv>>>) => CreatePluvHandlerResult<Id<InferCloudflarePluvHandlerEnv<TPluv>>>;
+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>>>;
 
 declare const platformCloudflare: <TEnv extends Record<string, any> = {}>() => CloudflarePlatform<TEnv>;
 

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { AbstractWebSocket, AbstractEventMap, AbstractListener, AbstractWebSocketConfig, AbstractPlatform, ConvertWebSocketConfig, PluvIO } from '@pluv/io';
+import { AbstractWebSocket, AbstractEventMap, AbstractListener, AbstractWebSocketConfig, AbstractPlatform, ConvertWebSocketConfig, PluvServer } from '@pluv/io';
 import { MaybePromise, Maybe, InferIOAuthorizeUser, InferIOAuthorize, InferIOAuthorizeRequired, Id } from '@pluv/types';
 
 type CloudflareWebSocketConfig = AbstractWebSocketConfig;
@@ -27,14 +27,14 @@ interface AuthorizeFunctionContext {
     request: Request<any, CfProperties<any>>;
     roomId: string;
 }
-type AuthorizeFunction<TPluv extends PluvIO<CloudflarePlatform>> = (ctx: AuthorizeFunctionContext) => MaybePromise<Maybe<InferIOAuthorizeUser<InferIOAuthorize<TPluv>>>>;
-type CreatePluvHandlerConfig<TPluv extends PluvIO<CloudflarePlatform>, TEnv extends Record<string, any>> = {
+type AuthorizeFunction<TPluvServer extends PluvServer<CloudflarePlatform, any, any, any>> = (ctx: AuthorizeFunctionContext) => MaybePromise<Maybe<InferIOAuthorizeUser<InferIOAuthorize<TPluvServer>>>>;
+type CreatePluvHandlerConfig<TPluvServer extends PluvServer<CloudflarePlatform, any, any, any>, TEnv extends Record<string, any>> = {
     binding: string;
     endpoint?: string;
     modify?: (request: Request, response: Response, env: TEnv) => MaybePromise<Response>;
-    io: TPluv;
-} & (InferIOAuthorizeRequired<InferIOAuthorize<TPluv>> extends true ? {
-    authorize: AuthorizeFunction<TPluv>;
+    io: TPluvServer;
+} & (InferIOAuthorizeRequired<InferIOAuthorize<TPluvServer>> extends true ? {
+    authorize: AuthorizeFunction<TPluvServer>;
 } : {
     authorize?: undefined;
 });
@@ -46,8 +46,8 @@ interface CreatePluvHandlerResult<TEnv extends Record<string, any> = {}> {
     fetch: PluvHandlerFetch<TEnv>;
     handler: ExportedHandler<TEnv>;
 }
-type InferCloudflarePluvHandlerEnv<TPluv extends PluvIO<CloudflarePlatform, any, any, any, any, any, any>> = TPluv extends PluvIO<CloudflarePlatform<infer IEnv>, any, any, any, any, any, any> ? IEnv : {};
-declare const createPluvHandler: <TPluv extends PluvIO<CloudflarePlatform<{}>, any, any, any, any, any, any>>(config: CreatePluvHandlerConfig<TPluv, Id<InferCloudflarePluvHandlerEnv<TPluv>>>) => CreatePluvHandlerResult<Id<InferCloudflarePluvHandlerEnv<TPluv>>>;
+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>>>;
 
 declare const platformCloudflare: <TEnv extends Record<string, any> = {}>() => CloudflarePlatform<TEnv>;
 

package/dist/index.js

@@ -85,13 +85,11 @@ var createPluvHandler = (config) => {
     return namespace;
   };
   const authHandler = (request, env) => __async(void 0, null, function* () {
-    if (!authorize)
-      return null;
+    if (!authorize) return null;
     const { pathname, searchParams } = new URL(request.url);
     const matcher = (0, import_path_to_regexp.match)(`${endpoint}/authorize`);
     const matched = matcher(pathname);
-    if (!matched)
-      return null;
+    if (!matched) return null;
     const roomId = searchParams.get("room");
     if (!roomId) {
       return new Response("Not found", {
@@ -101,8 +99,7 @@ var createPluvHandler = (config) => {
     }
     try {
       const user = yield authorize({ request, roomId });
-      if (!user)
-        throw new Error();
+      if (!user) throw new Error();
       const namespace = getDurableObjectNamespace(env);
       const durableObjectId = namespace.idFromName(roomId);
       const token = yield io.createToken({
@@ -115,21 +112,17 @@ var createPluvHandler = (config) => {
         status: 200
       });
     } catch (err) {
-      return new Response(
-        err instanceof Error ? err.message : "Unauthorized",
-        {
-          headers: { "Content-Type": "text/plain" },
-          status: 403
-        }
-      );
+      return new Response(err instanceof Error ? err.message : "Unauthorized", {
+        headers: { "Content-Type": "text/plain" },
+        status: 403
+      });
     }
   });
   const roomHandler = (request, env) => __async(void 0, null, function* () {
     const { pathname } = new URL(request.url);
     const matcher = (0, import_path_to_regexp.match)(`${endpoint}/room/:roomId`);
     const matched = matcher(pathname);
-    if (!matched)
-      return null;
+    if (!matched) return null;
     const { roomId } = matched.params;
     if (!roomId) {
       return new Response("Not found", {
@@ -178,11 +171,8 @@ var CloudflareWebSocket = class extends import_io.AbstractWebSocket {
     this.webSocket.addEventListener(type, handler);
   }
   close(code, reason) {
-    const canClose = [this.CONNECTING, this.OPEN].some(
-      (readyState) => readyState === this.readyState
-    );
-    if (!canClose)
-      return;
+    const canClose = [this.CONNECTING, this.OPEN].some((readyState) => readyState === this.readyState);
+    if (!canClose) return;
     this.webSocket.close(code, reason);
   }
   initialize() {
@@ -190,8 +180,7 @@ var CloudflareWebSocket = class extends import_io.AbstractWebSocket {
     return Promise.resolve(() => void 0);
   }
   send(message) {
-    if (this.readyState !== this.OPEN)
-      return;
+    if (this.readyState !== this.OPEN) return;
     this.webSocket.send(message);
   }
   terminate() {
@@ -205,8 +194,7 @@ var CloudflarePlatform = class extends import_io2.AbstractPlatform {
     return new CloudflareWebSocket(webSocket, config);
   }
   parseData(data) {
-    if (typeof data === "string")
-      return JSON.parse(data);
+    if (typeof data === "string") return JSON.parse(data);
     const decoder = new TextDecoder("utf8");
     return JSON.parse(decoder.decode(data));
   }

package/dist/index.mjs

@@ -59,13 +59,11 @@ var createPluvHandler = (config) => {
     return namespace;
   };
   const authHandler = (request, env) => __async(void 0, null, function* () {
-    if (!authorize)
-      return null;
+    if (!authorize) return null;
     const { pathname, searchParams } = new URL(request.url);
     const matcher = match(`${endpoint}/authorize`);
     const matched = matcher(pathname);
-    if (!matched)
-      return null;
+    if (!matched) return null;
     const roomId = searchParams.get("room");
     if (!roomId) {
       return new Response("Not found", {
@@ -75,8 +73,7 @@ var createPluvHandler = (config) => {
     }
     try {
       const user = yield authorize({ request, roomId });
-      if (!user)
-        throw new Error();
+      if (!user) throw new Error();
       const namespace = getDurableObjectNamespace(env);
       const durableObjectId = namespace.idFromName(roomId);
       const token = yield io.createToken({
@@ -89,21 +86,17 @@ var createPluvHandler = (config) => {
         status: 200
       });
     } catch (err) {
-      return new Response(
-        err instanceof Error ? err.message : "Unauthorized",
-        {
-          headers: { "Content-Type": "text/plain" },
-          status: 403
-        }
-      );
+      return new Response(err instanceof Error ? err.message : "Unauthorized", {
+        headers: { "Content-Type": "text/plain" },
+        status: 403
+      });
     }
   });
   const roomHandler = (request, env) => __async(void 0, null, function* () {
     const { pathname } = new URL(request.url);
     const matcher = match(`${endpoint}/room/:roomId`);
     const matched = matcher(pathname);
-    if (!matched)
-      return null;
+    if (!matched) return null;
     const { roomId } = matched.params;
     if (!roomId) {
       return new Response("Not found", {
@@ -138,9 +131,7 @@ var createPluvHandler = (config) => {
 import { AbstractPlatform } from "@pluv/io";
 
 // src/CloudflareWebSocket.ts
-import {
-  AbstractWebSocket
-} from "@pluv/io";
+import { AbstractWebSocket } from "@pluv/io";
 var CloudflareWebSocket = class extends AbstractWebSocket {
   get readyState() {
     return this.webSocket.readyState;
@@ -154,11 +145,8 @@ var CloudflareWebSocket = class extends AbstractWebSocket {
     this.webSocket.addEventListener(type, handler);
   }
   close(code, reason) {
-    const canClose = [this.CONNECTING, this.OPEN].some(
-      (readyState) => readyState === this.readyState
-    );
-    if (!canClose)
-      return;
+    const canClose = [this.CONNECTING, this.OPEN].some((readyState) => readyState === this.readyState);
+    if (!canClose) return;
     this.webSocket.close(code, reason);
   }
   initialize() {
@@ -166,8 +154,7 @@ var CloudflareWebSocket = class extends AbstractWebSocket {
     return Promise.resolve(() => void 0);
   }
   send(message) {
-    if (this.readyState !== this.OPEN)
-      return;
+    if (this.readyState !== this.OPEN) return;
     this.webSocket.send(message);
   }
   terminate() {
@@ -181,8 +168,7 @@ var CloudflarePlatform = class extends AbstractPlatform {
     return new CloudflareWebSocket(webSocket, config);
   }
   parseData(data) {
-    if (typeof data === "string")
-      return JSON.parse(data);
+    if (typeof data === "string") return JSON.parse(data);
     const decoder = new TextDecoder("utf8");
     return JSON.parse(decoder.decode(data));
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pluv/platform-cloudflare",
-  "version": "0.17.3",
+  "version": "0.19.0",
   "description": "@pluv/io adapter for cloudflare workers",
   "author": "leedavidcs",
   "license": "MIT",
@@ -17,17 +17,17 @@
     "access": "public"
   },
   "dependencies": {
-    "path-to-regexp": "^6.2.2",
-    "@pluv/io": "^0.17.3",
-    "@pluv/types": "^0.17.3"
+    "path-to-regexp": "^7.0.0",
+    "@pluv/io": "^0.19.0",
+    "@pluv/types": "^0.19.0"
   },
   "devDependencies": {
-    "@cloudflare/workers-types": "^4.20240405.0",
+    "@cloudflare/workers-types": "^4.20240620.0",
     "eslint": "^8.57.0",
-    "tsup": "^8.0.2",
+    "tsup": "^8.1.0",
     "typescript": "^5.4.5",
-    "@pluv/tsconfig": "^0.17.3",
-    "eslint-config-pluv": "^0.17.3"
+    "@pluv/tsconfig": "^0.19.0",
+    "eslint-config-pluv": "^0.19.0"
   },
   "scripts": {
     "build": "tsup src/index.ts --format esm,cjs --dts",

package/src/CloudflarePlatform.ts

@@ -2,13 +2,12 @@ import type { ConvertWebSocketConfig } from "@pluv/io";
 import { AbstractPlatform } from "@pluv/io";
 import { CloudflareWebSocket } from "./CloudflareWebSocket";
 
-export class CloudflarePlatform<
-    TEnv extends Record<string, any> = {},
-> extends AbstractPlatform<WebSocket, { env: TEnv }, { request: Request }> {
-    public convertWebSocket(
-        webSocket: WebSocket,
-        config: ConvertWebSocketConfig,
-    ): CloudflareWebSocket {
+export class CloudflarePlatform<TEnv extends Record<string, any> = {}> extends AbstractPlatform<
+    WebSocket,
+    { env: TEnv },
+    { request: Request }
+> {
+    public convertWebSocket(webSocket: WebSocket, config: ConvertWebSocketConfig): CloudflareWebSocket {
         return new CloudflareWebSocket(webSocket, config);
     }
 

package/src/CloudflareWebSocket.ts

@@ -1,9 +1,4 @@
-import {
-    AbstractEventMap,
-    AbstractListener,
-    AbstractWebSocket,
-    AbstractWebSocketConfig,
-} from "@pluv/io";
+import { AbstractEventMap, AbstractListener, AbstractWebSocket, AbstractWebSocketConfig } from "@pluv/io";
 
 export interface CloudflareWebSocketEventMap {
     close: CloseEvent;
@@ -29,17 +24,12 @@ export class CloudflareWebSocket extends AbstractWebSocket {
         this.webSocket = webSocket;
     }
 
-    public addEventListener<TType extends keyof AbstractEventMap>(
-        type: TType,
-        handler: AbstractListener<TType>,
-    ) {
+    public addEventListener<TType extends keyof AbstractEventMap>(type: TType, handler: AbstractListener<TType>) {
         this.webSocket.addEventListener(type, handler as any);
     }
 
     public close(code?: number | undefined, reason?: string | undefined): void {
-        const canClose = [this.CONNECTING, this.OPEN].some(
-            (readyState) => readyState === this.readyState,
-        );
+        const canClose = [this.CONNECTING, this.OPEN].some((readyState) => readyState === this.readyState);
 
         if (!canClose) return;
 

package/src/createPluvHandler.ts

@@ -1,5 +1,5 @@
-import { IORoom, PluvIO } from "@pluv/io";
-import {
+import type { IORoom, PluvServer } from "@pluv/io";
+import type {
     Id,
     InferIOAuthorize,
     InferIOAuthorizeRequired,
@@ -14,24 +14,20 @@ export interface AuthorizeFunctionContext {
     request: Request<any, CfProperties<any>>;
     roomId: string;
 }
-export type AuthorizeFunction<TPluv extends PluvIO<CloudflarePlatform>> = (
+export type AuthorizeFunction<TPluvServer extends PluvServer<CloudflarePlatform, any, any, any>> = (
     ctx: AuthorizeFunctionContext,
-) => MaybePromise<Maybe<InferIOAuthorizeUser<InferIOAuthorize<TPluv>>>>;
+) => MaybePromise<Maybe<InferIOAuthorizeUser<InferIOAuthorize<TPluvServer>>>>;
 
 export type CreatePluvHandlerConfig<
-    TPluv extends PluvIO<CloudflarePlatform>,
+    TPluvServer extends PluvServer<CloudflarePlatform, any, any, any>,
     TEnv extends Record<string, any>,
 > = {
     binding: string;
     endpoint?: string;
-    modify?: (
-        request: Request,
-        response: Response,
-        env: TEnv,
-    ) => MaybePromise<Response>;
-    io: TPluv;
-} & (InferIOAuthorizeRequired<InferIOAuthorize<TPluv>> extends true
-    ? { authorize: AuthorizeFunction<TPluv> }
+    modify?: (request: Request, response: Response, env: TEnv) => MaybePromise<Response>;
+    io: TPluvServer;
+} & (InferIOAuthorizeRequired<InferIOAuthorize<TPluvServer>> extends true
+    ? { authorize: AuthorizeFunction<TPluvServer> }
     : { authorize?: undefined });
 
 export type PluvHandlerFetch<TEnv extends Record<string, any> = {}> = (
@@ -39,9 +35,7 @@ export type PluvHandlerFetch<TEnv extends Record<string, any> = {}> = (
     env: TEnv,
 ) => Promise<Response | null>;
 
-export interface CreatePluvHandlerResult<
-    TEnv extends Record<string, any> = {},
-> {
+export interface CreatePluvHandlerResult<TEnv extends Record<string, any> = {}> {
     DurableObject: {
         new (state: DurableObjectState, env: TEnv): DurableObject;
     };
@@ -49,60 +43,30 @@ export interface CreatePluvHandlerResult<
     handler: ExportedHandler<TEnv>;
 }
 
-type InferCloudflarePluvHandlerEnv<
-    TPluv extends PluvIO<CloudflarePlatform, any, any, any, any, any, any>,
-> =
-    TPluv extends PluvIO<
-        CloudflarePlatform<infer IEnv>,
-        any,
-        any,
-        any,
-        any,
-        any,
-        any
-    >
-        ? IEnv
-        : {};
-
-export const createPluvHandler = <
-    TPluv extends PluvIO<CloudflarePlatform, any, any, any, any, any, any>,
->(
-    config: CreatePluvHandlerConfig<
-        TPluv,
-        Id<InferCloudflarePluvHandlerEnv<TPluv>>
-    >,
-): CreatePluvHandlerResult<Id<InferCloudflarePluvHandlerEnv<TPluv>>> => {
+type InferCloudflarePluvHandlerEnv<TPluvServer extends PluvServer<CloudflarePlatform, any, any, any>> =
+    TPluvServer extends PluvServer<CloudflarePlatform<infer IEnv>, any, any, any> ? IEnv : {};
+
+export const createPluvHandler = <TPluvServer extends PluvServer<CloudflarePlatform, 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 implements DurableObject {
-        private _env: Id<InferCloudflarePluvHandlerEnv<TPluv>>;
+        private _env: Id<InferCloudflarePluvHandlerEnv<TPluvServer>>;
         private _io: IORoom<CloudflarePlatform>;
 
-        constructor(
-            state: DurableObjectState,
-            env: Id<InferCloudflarePluvHandlerEnv<TPluv>>,
-        ) {
+        constructor(state: DurableObjectState, env: Id<InferCloudflarePluvHandlerEnv<TPluvServer>>) {
             this._env = env;
             this._io = io.getRoom(state.id.toString(), { env });
         }
 
-        webSocketClose(
-            ws: WebSocket,
-            code: number,
-            reason: string,
-            wasClean: boolean,
-        ): void | Promise<void> {}
+        webSocketClose(ws: WebSocket, code: number, reason: string, wasClean: boolean): void | Promise<void> {}
 
         webSocketError(ws: WebSocket, error: unknown): void | Promise<void> {}
 
-        webSocketMessage(
-            ws: WebSocket,
-            message: string | ArrayBuffer,
-        ): void | Promise<void> {}
+        webSocketMessage(ws: WebSocket, message: string | ArrayBuffer): void | Promise<void> {}
 
-        async fetch(
-            request: Request<any, CfProperties<any>>,
-        ): Promise<Response> {
+        async fetch(request: Request<any, CfProperties<any>>): Promise<Response> {
             const isWSRequest = request.headers.get("Upgrade") === "websocket";
 
             if (!isWSRequest) {
@@ -123,12 +87,8 @@ export const createPluvHandler = <
         }
     };
 
-    const getDurableObjectNamespace = (
-        env: Id<InferCloudflarePluvHandlerEnv<TPluv>>,
-    ): DurableObjectNamespace => {
-        const namespace = env[
-            binding as keyof typeof env
-        ] as DurableObjectNamespace;
+    const getDurableObjectNamespace = (env: Id<InferCloudflarePluvHandlerEnv<TPluvServer>>): DurableObjectNamespace => {
+        const namespace = env[binding as keyof typeof env] as DurableObjectNamespace;
 
         if (!namespace) {
             throw new Error(`Could not find DurableObject binding: ${binding}`);
@@ -137,9 +97,7 @@ export const createPluvHandler = <
         return namespace;
     };
 
-    const authHandler: PluvHandlerFetch<
-        Id<InferCloudflarePluvHandlerEnv<TPluv>>
-    > = async (request, env) => {
+    const authHandler: PluvHandlerFetch<Id<InferCloudflarePluvHandlerEnv<TPluvServer>>> = async (request, env) => {
         if (!authorize) return null;
 
         const { pathname, searchParams } = new URL(request.url);
@@ -176,19 +134,14 @@ export const createPluvHandler = <
                 status: 200,
             });
         } catch (err) {
-            return new Response(
-                err instanceof Error ? err.message : "Unauthorized",
-                {
-                    headers: { "Content-Type": "text/plain" },
-                    status: 403,
-                },
-            );
+            return new Response(err instanceof Error ? err.message : "Unauthorized", {
+                headers: { "Content-Type": "text/plain" },
+                status: 403,
+            });
         }
     };
 
-    const roomHandler: PluvHandlerFetch<
-        Id<InferCloudflarePluvHandlerEnv<TPluv>>
-    > = async (request, env) => {
+    const roomHandler: PluvHandlerFetch<Id<InferCloudflarePluvHandlerEnv<TPluvServer>>> = async (request, env) => {
         const { pathname } = new URL(request.url);
         const matcher = match<{ roomId: string }>(`${endpoint}/room/:roomId`);
         const matched = matcher(pathname);
@@ -211,15 +164,13 @@ export const createPluvHandler = <
         return room.fetch(request);
     };
 
-    const fetch: PluvHandlerFetch<
-        Id<InferCloudflarePluvHandlerEnv<TPluv>>
-    > = async (request, env) => {
+    const fetch: PluvHandlerFetch<Id<InferCloudflarePluvHandlerEnv<TPluvServer>>> = async (request, env) => {
         return [authHandler, roomHandler].reduce((promise, current) => {
             return promise.then((value) => value ?? current(request, env));
         }, Promise.resolve<Response | null>(null));
     };
 
-    const handler: ExportedHandler<Id<InferCloudflarePluvHandlerEnv<TPluv>>> = {
+    const handler: ExportedHandler<Id<InferCloudflarePluvHandlerEnv<TPluvServer>>> = {
         fetch: async (request, env) => {
             const response =
                 (await fetch(request, env)) ??

package/src/platformCloudflare.ts

@@ -1,7 +1,5 @@
 import { CloudflarePlatform } from "./CloudflarePlatform";
 
-export const platformCloudflare = <
-    TEnv extends Record<string, any> = {},
->(): CloudflarePlatform<TEnv> => {
+export const platformCloudflare = <TEnv extends Record<string, any> = {}>(): CloudflarePlatform<TEnv> => {
     return new CloudflarePlatform<TEnv>();
 };