@revojs/cloudflare 0.1.57 → 0.2.1

package/dist/index.d.ts

@@ -1,6 +1,6 @@
-import { Module } from "revojs";
-
-//#region src/index.d.ts
-declare function cloudflare(): Module;
-//#endregion
-export { cloudflare };
+import { type ScheduledEvent } from "@cloudflare/workers-types";
+declare const _default: {
+    fetch(request: Request, variables: Cloudflare.Env): Promise<Response | undefined>;
+    scheduled(event: ScheduledEvent, variables: Cloudflare.Env): Promise<void>;
+};
+export default _default;

package/dist/index.js

@@ -1,26 +1,70 @@
-import { CLOSE_HOOK, SERVER_CONTEXT, useServer } from "revojs";
-import { addTypes, useKit } from "revojs/kit";
-import { getPlatformProxy } from "wrangler";
+import "@cloudflare/workers-types";
+import { SCHEDULE_CONTEXT, SERVER_CONTEXT, isResponse, isWebSocket, sendResponse } from "@revojs/server";
+import { VARIABLE_CONTEXT, createScope } from "revojs";
 //#region src/index.ts
-let proxy;
-function cloudflare() {
-	return { setup(app) {
-		const { fromModule } = useKit(import.meta.url);
-		app.config.server = fromModule("./runtime/server.js");
-		app.config.development.middleware.push({ async fetch(scope, next) {
-			const { request, response } = useServer(scope);
-			proxy ??= await getPlatformProxy();
-			scope.setContext(SERVER_CONTEXT, {
+var src_default = {
+	async fetch(request, variables) {
+		const server = await import("#server").then((module) => module.default);
+		const scope = await createScope({ context: {
+			[VARIABLE_CONTEXT]: variables,
+			[SERVER_CONTEXT]: {
 				states: {},
 				request,
-				response,
-				variables: proxy.env
-			});
-			return next?.();
+				response: { headers: new Headers() }
+			}
 		} });
-		app.registerHook(CLOSE_HOOK, () => proxy?.dispose());
-		addTypes(app, "cloudflare", () => `import "@cloudflare/workers-types"`);
-	} };
-}
+		const result = await server.fetch(scope);
+		if (isResponse(result)) return result;
+		if (isWebSocket(result)) {
+			const [clientSocket, serverSocket] = new WebSocketPair();
+			const connection = {
+				async send(message) {
+					serverSocket.send(message);
+				},
+				async close(code, reason) {
+					serverSocket.close(code, reason);
+				}
+			};
+			serverSocket.addEventListener("open", async () => {
+				try {
+					await result.open(connection);
+				} catch (error) {
+					if (error instanceof Error) await result.error(connection, error);
+					else throw error;
+				}
+			});
+			serverSocket.addEventListener("message", async (event) => {
+				try {
+					await result.message(connection, event.data);
+				} catch (error) {
+					if (error instanceof Error) await result.error(connection, error);
+					else throw error;
+				}
+			});
+			serverSocket.addEventListener("error", async (event) => {
+				await result.error(connection, event.error);
+			});
+			serverSocket.addEventListener("close", async (event) => {
+				try {
+					await result.close(connection, event.code, event.reason);
+				} catch (error) {
+					if (error instanceof Error) await result.error(connection, error);
+					else throw error;
+				}
+			});
+			serverSocket.accept();
+			return sendResponse(scope, null, {
+				status: 101,
+				webSocket: clientSocket
+			});
+		}
+	},
+	async scheduled(event, variables) {
+		await (await import("#server").then((module) => module.default)).schedule(await createScope({ context: {
+			[VARIABLE_CONTEXT]: variables,
+			[SCHEDULE_CONTEXT]: { when: event.cron }
+		} }));
+	}
+};
 //#endregion
-export { cloudflare };
+export { src_default as default };

package/dist/module/index.d.ts

@@ -0,0 +1,4 @@
+import { type PluginConfig } from "@cloudflare/vite-plugin";
+export type CloudflareConfig = PluginConfig;
+declare const _default: import("revojs/module").Module<"cloudflare", PluginConfig, readonly [import("revojs/module").Module<"server", Record<string, never>, []>]>;
+export default _default;

package/dist/module/index.js

@@ -0,0 +1,35 @@
+import { cloudflare } from "@cloudflare/vite-plugin";
+import server, { SERVER } from "@revojs/server/module";
+import { readFileSync } from "fs";
+import { addTypes, defineModule, resolvePaths, useModule } from "revojs/module";
+import { mergeObjects, scheduleAliases } from "revojs/shared";
+//#region src/module/index.ts
+var module_default = defineModule({
+	name: "cloudflare",
+	modules: [server],
+	config: () => ({ viteEnvironment: { name: SERVER } }),
+	async setup(config) {
+		const { fromModule } = useModule(import.meta.url);
+		const crons = /* @__PURE__ */ new Set();
+		for (const path of resolvePaths(["./schedules/**/*.{js,ts}", "!./schedules/**/*.d.ts"])) {
+			const content = readFileSync(path, "utf8");
+			for (const match of content.matchAll(SCHEDULE_WHEN_MATCH)) crons.add(scheduleAliases[match[1].trim().toLowerCase()] ?? match[1].trim());
+		}
+		addTypes(config, "cloudflare", () => `import "@cloudflare/workers-types"`);
+		const options = mergeObjects(config.cloudflare, {
+			viteEnvironment: { name: SERVER },
+			config: {
+				main: fromModule("../index.js"),
+				assets: { run_worker_first: ["/"] },
+				triggers: { crons: [...crons] }
+			}
+		});
+		return { vite: {
+			server: { watch: { ignored: ["**/.wrangler/**"] } },
+			plugins: [cloudflare(options)]
+		} };
+	}
+});
+var SCHEDULE_WHEN_MATCH = /when\s*:\s*["'`]([^"'`\n]+)["'`]/g;
+//#endregion
+export { module_default as default };

package/package.json

@@ -1,28 +1,31 @@
 {
     "name": "@revojs/cloudflare",
-    "version": "0.1.57",
+    "version": "0.2.1",
     "license": "MIT",
-    "repository": "tellua/revojs",
+    "repository": {
+        "type": "git",
+        "url": "git+https://github.com/tellua/revojs.git"
+    },
     "files": [
         "dist"
     ],
     "type": "module",
-    "main": "./dist/index.js",
-    "module": "./dist/index.js",
-    "types": "./dist/index.d.ts",
     "exports": {
-        ".": {
-            "types": "./dist/index.d.ts",
-            "import": "./dist/index.js"
+        "./module": {
+            "types": "./dist/module/index.d.ts",
+            "import": "./dist/module/index.js"
         }
     },
     "scripts": {
-        "build": "revojs module build"
+        "build": "vite build",
+        "watch": "vite build --watch"
     },
     "dependencies": {
-        "@cloudflare/workers-types": "^4.20260414.1",
+        "@cloudflare/vite-plugin": "^1.54.8",
+        "@cloudflare/workers-types": "^5.20260911.1",
+        "@revojs/server": "*",
         "revojs": "*",
-        "wrangler": "^4.82.2"
+        "wrangler": "^4.131.1"
     },
     "devDependencies": {
         "@revojs/tsconfig": "*"

package/dist/runtime/server.d.ts

@@ -1,8 +0,0 @@
-import { Context } from "revojs";
-
-//#region src/runtime/server.d.ts
-declare const _default: {
-  fetch(request: Request, variables: Context): Promise<void | Response>;
-};
-//#endregion
-export { _default as default };

package/dist/runtime/server.js

@@ -1,15 +0,0 @@
-import { SERVER_CONTEXT, Scope } from "revojs";
-//#region src/runtime/server.ts
-var server_default = { async fetch(request, variables) {
-	const server = await import("#server").then((module) => module.default);
-	const scope = new Scope();
-	scope.setContext(SERVER_CONTEXT, {
-		states: {},
-		request,
-		response: { headers: new Headers() },
-		variables
-	});
-	return await server.fetch(scope);
-} };
-//#endregion
-export { server_default as default };