@pluv/platform-cloudflare 2.3.1 → 3.0.0

package/.turbo/turbo-build.log

@@ -1,5 +1,5 @@
 
-> @pluv/platform-cloudflare@2.3.1 build /home/runner/work/pluv/pluv/packages/platform-cloudflare
+> @pluv/platform-cloudflare@3.0.0 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 14.09 KB
-ESM ⚡️ Build success in 52ms
+ESM dist/index.mjs 8.92 KB
+ESM ⚡️ Build success in 53ms
 DTS Build start
-DTS ⚡️ Build success in 1224ms
-DTS dist/index.d.mts 7.33 KB
+DTS ⚡️ Build success in 1244ms
+DTS dist/index.d.mts 5.28 KB

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @pluv/platform-cloudflare
 
+## 3.0.0
+
+### Major Changes
+
+- bc1ae91: **BREAKING** Removed deprecated `createPluvHandler`.
+
+### Patch Changes
+
+- @pluv/io@3.0.0
+- @pluv/persistence-cloudflare-transactional-storage@3.0.0
+- @pluv/types@3.0.0
+
 ## 2.3.1
 
 ### Patch Changes

package/dist/index.d.mts

@@ -1,6 +1,5 @@
-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';
+import { AbstractWebSocket, WebSocketSession, WebSocketSerializedState, AbstractWebSocketConfig, AbstractEventMap, AbstractListener, AbstractPlatform, WebSocketRegistrationMode, AbstractPlatformConfig, ConvertWebSocketConfig, CreateIOParams, PluvIOAuthorize, InferInitContextType, PluvContext } from '@pluv/io';
+import { IOAuthorize, JsonObject, InferIOAuthorizeUser, Json, BaseUser, Id } from '@pluv/types';
 
 type CloudflareWebSocketConfig = AbstractWebSocketConfig;
 declare class CloudflareWebSocket<TAuthorize extends IOAuthorize<any, any> | null = null> extends AbstractWebSocket<WebSocket, TAuthorize> {
@@ -80,35 +79,6 @@ declare class CloudflarePlatform<TAuthorize extends IOAuthorize<any, any> | null
     private _getDetachedState;
 }
 
-type AuthorizeFunctionContext<TPluvServer extends PluvServer<any, any, any, any>> = {
-    room: string;
-} & InferInitContextType<TPluvServer extends PluvServer<infer IPlatform, any, any, any> ? IPlatform : never>;
-type AuthorizeFunction<TPluvServer extends PluvServer<any, any, any, any>> = (ctx: AuthorizeFunctionContext<TPluvServer>) => MaybePromise<Maybe<InferIOAuthorizeUser<InferIOAuthorize<TPluvServer>>>>;
-type CreatePluvHandlerConfig<TPluvServer extends PluvServer<any, any, any, any>, TEnv extends Record<string, any>> = {
-    binding: string;
-    endpoint?: string;
-    modify?: (request: Request, response: Response, env: TEnv) => MaybePromise<Response>;
-    io: TPluvServer;
-} & (InferIOAuthorizeUser<InferIOAuthorize<TPluvServer>> extends BaseUser ? {
-    authorize: AuthorizeFunction<TPluvServer>;
-} : {
-    authorize?: undefined;
-});
-type PluvHandlerFetch<TEnv extends Record<string, any> = {}> = (request: Request, env: TEnv) => Promise<Response | null>;
-interface CreatePluvHandlerResult<TEnv extends Record<string, any> = {}> {
-    DurableObject: {
-        new (state: DurableObjectState, env: TEnv): DurableObject<TEnv>;
-    };
-    fetch: PluvHandlerFetch<TEnv>;
-    handler: ExportedHandler<TEnv>;
-}
-type InferCloudflarePluvHandlerEnv<TPluvServer extends PluvServer<CloudflarePlatform<any, any>, any, any, any>> = TPluvServer extends PluvServer<CloudflarePlatform<any, infer IEnv>, any, any, any> ? IEnv : {};
-/**
- * @deprecated Instructions will be provided on https://pluv.io on how to host this yourself instead.
- * @date April 27, 2025
- */
-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;
 
 type InferCallback<TEnv extends Record<string, any> = {}, TMeta extends Record<string, Json> = {}> = (i: typeof identity) => {
@@ -124,4 +94,4 @@ type PlatformCloudflareCreateIOParams<TEnv extends Record<string, any> = {}, TMe
 }>;
 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 };
+export { CloudflarePlatform, type CloudflarePlatformConfig, type InferCallback, type PlatformCloudflareCreateIOParams, infer, platformCloudflare };

package/dist/index.mjs

@@ -38,147 +38,6 @@ 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 {
-    constructor(state, env) {
-      super(state, env);
-      this._room = io.createRoom(state.id.toString(), { env, state });
-    }
-    webSocketClose(ws, code, reason, wasClean) {
-      return __async(this, null, function* () {
-        if (io._defs.platform._config.registrationMode !== "detached") return;
-        const onCloseHandler = this._room.onClose(ws);
-        yield onCloseHandler({ code, reason });
-      });
-    }
-    webSocketError(ws, error) {
-      return __async(this, null, function* () {
-        if (io._defs.platform._config.registrationMode !== "detached") return;
-        const onErrorHandler = this._room.onError(ws);
-        const eventError = error instanceof Error ? error : new Error("Internal Error");
-        yield onErrorHandler({ error: eventError, message: eventError.message });
-      });
-    }
-    webSocketMessage(ws, message) {
-      return __async(this, null, function* () {
-        if (io._defs.platform._config.registrationMode !== "detached") return;
-        const onMessageHandler = this._room.onMessage(ws);
-        yield onMessageHandler({ data: message });
-      });
-    }
-    fetch(request) {
-      return __async(this, null, function* () {
-        const isWSRequest = request.headers.get("Upgrade") === "websocket";
-        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];
-    if (!namespace) {
-      throw new Error(`Could not find DurableObject binding: ${binding}`);
-    }
-    return namespace;
-  };
-  const authHandler = (request, env) => __async(null, null, function* () {
-    if (!authorize) return null;
-    const { pathname, searchParams } = new URL(request.url);
-    const matcher = match(`${endpoint}/authorize`);
-    const matched = matcher(pathname);
-    if (!matched) return null;
-    const room = searchParams.get("room");
-    if (!room) {
-      return new Response("Not found", {
-        headers: { "Content-Type": "text/plain" },
-        status: 404
-      });
-    }
-    try {
-      const user = yield authorize({
-        env,
-        request,
-        room
-      });
-      if (!user) throw new Error();
-      const namespace = getDurableObjectNamespace(env);
-      const durableObjectId = namespace.idFromName(room);
-      const token = yield io.createToken({
-        env,
-        room: durableObjectId.toString(),
-        user,
-        request
-      });
-      return new Response(token, {
-        headers: { "Content-Type": "text/plain" },
-        status: 200
-      });
-    } catch (err) {
-      return new Response(err instanceof Error ? err.message : "Unauthorized", {
-        headers: { "Content-Type": "text/plain" },
-        status: 403
-      });
-    }
-  });
-  const roomHandler = (request, env) => __async(null, null, function* () {
-    const { pathname } = new URL(request.url);
-    const matcher = match(`${endpoint}/room/:roomId`);
-    const matched = matcher(pathname);
-    if (!matched) return null;
-    const { roomId } = matched.params;
-    if (!roomId) {
-      return new Response("Not found", {
-        headers: { "Content-Type": "text/plain" },
-        status: 404
-      });
-    }
-    const namespace = getDurableObjectNamespace(env);
-    const durableObjectId = namespace.idFromName(roomId);
-    const room = namespace.get(durableObjectId);
-    return room.fetch(request);
-  });
-  const handlerFetch = (request, env) => __async(null, null, function* () {
-    return [authHandler, roomHandler].reduce((promise, current) => __async(null, null, function* () {
-      return yield promise.then((value) => __async(null, null, function* () {
-        return value != null ? value : yield current(request, env);
-      }));
-    }), Promise.resolve(null));
-  });
-  const handler = {
-    fetch: (request, env) => __async(null, null, function* () {
-      var _a, _b;
-      const response = (_a = yield handlerFetch(request, env)) != null ? _a : new Response("Not Found", {
-        headers: { "Content-Type": "text/plain" },
-        status: 404
-      });
-      return (_b = modify == null ? void 0 : modify(request, response, env)) != null ? _b : response;
-    })
-  };
-  return { fetch: handlerFetch, DurableObject, handler };
-};
-
 // src/infer.ts
 var infer = (callback) => callback;
 
@@ -277,6 +136,9 @@ var CloudflareWebSocket = class extends AbstractWebSocket {
   }
 };
 
+// src/constants.ts
+var DEFAULT_REGISTRATION_MODE = "detached";
+
 // src/CloudflarePlatform.ts
 var CloudflarePlatform = class _CloudflarePlatform extends AbstractPlatform {
   constructor(config) {
@@ -406,7 +268,6 @@ var platformCloudflare = (config = {}) => {
   };
 };
 export {
-  createPluvHandler,
   infer,
   platformCloudflare
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pluv/platform-cloudflare",
-  "version": "2.3.1",
+  "version": "3.0.0",
   "description": "@pluv/io adapter for cloudflare workers",
   "author": "leedavidcs",
   "license": "MIT",
@@ -17,17 +17,17 @@
   },
   "dependencies": {
     "path-to-regexp": "^8.2.0",
-    "@pluv/io": "^2.3.1",
-    "@pluv/persistence-cloudflare-transactional-storage": "^2.3.1",
-    "@pluv/types": "^2.3.1"
+    "@pluv/io": "^3.0.0",
+    "@pluv/persistence-cloudflare-transactional-storage": "^3.0.0",
+    "@pluv/types": "^3.0.0"
   },
   "devDependencies": {
     "@cloudflare/workers-types": "^4.20250521.0",
     "eslint": "^9.27.0",
     "tsup": "^8.5.0",
     "typescript": "^5.8.3",
-    "@pluv/tsconfig": "^2.3.1",
-    "eslint-config-pluv": "^2.3.1"
+    "eslint-config-pluv": "^3.0.0",
+    "@pluv/tsconfig": "^3.0.0"
   },
   "scripts": {
     "build": "tsup src/index.ts",

package/src/index.ts

@@ -1,12 +1,4 @@
 export type { CloudflarePlatform, CloudflarePlatformConfig } from "./CloudflarePlatform";
-export { createPluvHandler } from "./createPluvHandler";
-export type {
-    AuthorizeFunction,
-    AuthorizeFunctionContext,
-    CreatePluvHandlerConfig,
-    CreatePluvHandlerResult,
-    PluvHandlerFetch,
-} from "./createPluvHandler";
 export { infer } from "./infer";
 export type { InferCallback } from "./infer";
 export { platformCloudflare } from "./platformCloudflare";

package/src/createPluvHandler.ts

@@ -1,244 +0,0 @@
-import type { InferInitContextType, IORoom, PluvServer } from "@pluv/io";
-import type {
-    BaseUser,
-    Id,
-    InferIOAuthorize,
-    InferIOAuthorizeUser,
-    Maybe,
-    MaybePromise,
-} from "@pluv/types";
-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;
-} & InferInitContextType<
-    TPluvServer extends PluvServer<infer IPlatform, any, any, any> ? IPlatform : never
->;
-export type AuthorizeFunction<TPluvServer extends PluvServer<any, any, any, any>> = (
-    ctx: AuthorizeFunctionContext<TPluvServer>,
-) => MaybePromise<Maybe<InferIOAuthorizeUser<InferIOAuthorize<TPluvServer>>>>;
-
-export type CreatePluvHandlerConfig<
-    TPluvServer extends PluvServer<any, any, any, any>,
-    TEnv extends Record<string, any>,
-> = {
-    binding: string;
-    endpoint?: string;
-    modify?: (request: Request, response: Response, env: TEnv) => MaybePromise<Response>;
-    io: TPluvServer;
-} & (InferIOAuthorizeUser<InferIOAuthorize<TPluvServer>> extends BaseUser
-    ? { authorize: AuthorizeFunction<TPluvServer> }
-    : { authorize?: undefined });
-
-export type PluvHandlerFetch<TEnv extends Record<string, any> = {}> = (
-    request: Request,
-    env: TEnv,
-) => Promise<Response | null>;
-
-export interface CreatePluvHandlerResult<TEnv extends Record<string, any> = {}> {
-    DurableObject: {
-        new (state: DurableObjectState, env: TEnv): BaseDurableObject<TEnv>;
-    };
-    fetch: PluvHandlerFetch<TEnv>;
-    handler: ExportedHandler<TEnv>;
-}
-
-type InferCloudflarePluvHandlerEnv<
-    TPluvServer extends PluvServer<CloudflarePlatform<any, any>, any, any, any>,
-> = TPluvServer extends PluvServer<CloudflarePlatform<any, infer IEnv>, any, any, any> ? IEnv : {};
-
-/**
- * @deprecated Instructions will be provided on https://pluv.io on how to host this yourself instead.
- * @date April 27, 2025
- */
-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<any, any>>;
-
-        constructor(
-            state: DurableObjectState,
-            env: Id<InferCloudflarePluvHandlerEnv<TPluvServer>>,
-        ) {
-            super(state, env);
-
-            this._room = io.createRoom(state.id.toString(), { env, state });
-        }
-
-        public async webSocketClose(
-            ws: WebSocket,
-            code: number,
-            reason: string,
-            wasClean: boolean,
-        ): Promise<void> {
-            if (io._defs.platform._config.registrationMode !== "detached") return;
-
-            const onCloseHandler = this._room.onClose(ws);
-
-            await onCloseHandler({ code, reason });
-        }
-
-        public async webSocketError(ws: WebSocket, error: unknown): Promise<void> {
-            if (io._defs.platform._config.registrationMode !== "detached") return;
-
-            const onErrorHandler = this._room.onError(ws);
-            const eventError = error instanceof Error ? error : new Error("Internal Error");
-
-            await onErrorHandler({ error: eventError, message: eventError.message });
-        }
-
-        public async webSocketMessage(ws: WebSocket, message: string | ArrayBuffer): Promise<void> {
-            if (io._defs.platform._config.registrationMode !== "detached") return;
-
-            const onMessageHandler = this._room.onMessage(ws);
-
-            await onMessageHandler({ data: message });
-        }
-
-        async fetch(request: Request<any, CfProperties<any>>): Promise<Response> {
-            const isWSRequest = request.headers.get("Upgrade") === "websocket";
-
-            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 = 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 => {
-        const namespace = env[binding as keyof typeof env] as DurableObjectNamespace;
-
-        if (!namespace) {
-            throw new Error(`Could not find DurableObject binding: ${binding}`);
-        }
-
-        return namespace;
-    };
-
-    const authHandler: PluvHandlerFetch<Id<InferCloudflarePluvHandlerEnv<TPluvServer>>> = async (
-        request,
-        env,
-    ) => {
-        if (!authorize) return null;
-
-        const { pathname, searchParams } = new URL(request.url);
-        const matcher = match<{}>(`${endpoint}/authorize`);
-        const matched = matcher(pathname);
-
-        if (!matched) return null;
-
-        const room = searchParams.get("room");
-
-        if (!room) {
-            return new Response("Not found", {
-                headers: { "Content-Type": "text/plain" },
-                status: 404,
-            });
-        }
-
-        try {
-            const user = await authorize({
-                env,
-                request,
-                room,
-            } as AuthorizeFunctionContext<TPluvServer>);
-
-            if (!user) throw new Error();
-
-            const namespace = getDurableObjectNamespace(env);
-            const durableObjectId = namespace.idFromName(room);
-
-            const token = await io.createToken({
-                env,
-                room: durableObjectId.toString(),
-                user: user as any,
-                request,
-            });
-
-            return new Response(token, {
-                headers: { "Content-Type": "text/plain" },
-                status: 200,
-            });
-        } catch (err) {
-            return new Response(err instanceof Error ? err.message : "Unauthorized", {
-                headers: { "Content-Type": "text/plain" },
-                status: 403,
-            });
-        }
-    };
-
-    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);
-
-        if (!matched) return null;
-
-        const { roomId } = matched.params;
-
-        if (!roomId) {
-            return new Response("Not found", {
-                headers: { "Content-Type": "text/plain" },
-                status: 404,
-            });
-        }
-
-        const namespace = getDurableObjectNamespace(env);
-        const durableObjectId = namespace.idFromName(roomId);
-        const room = namespace.get(durableObjectId);
-
-        return room.fetch(request);
-    };
-
-    const handlerFetch: PluvHandlerFetch<Id<InferCloudflarePluvHandlerEnv<TPluvServer>>> = async (
-        request,
-        env,
-    ) => {
-        return [authHandler, roomHandler].reduce(async (promise, current) => {
-            return await promise.then(async (value) => value ?? (await current(request, env)));
-        }, Promise.resolve<Response | null>(null));
-    };
-
-    const handler: ExportedHandler<Id<InferCloudflarePluvHandlerEnv<TPluvServer>>> = {
-        fetch: async (request, env) => {
-            const response =
-                (await handlerFetch(request, env)) ??
-                new Response("Not Found", {
-                    headers: { "Content-Type": "text/plain" },
-                    status: 404,
-                });
-
-            return modify?.(request, response, env) ?? response;
-        },
-    };
-
-    return { fetch: handlerFetch, DurableObject, handler };
-};