refactors runtime

packages/cloudflare/package.json

@@ -31,23 +31,19 @@
     "@astrojs/underscore-redirects": "^0.3.3",
     "@cloudflare/workers-types": "^4.20240320.1",
     "miniflare": "^3.20240314.0",
-    "@iarna/toml": "^2.2.5",
-    "dotenv": "^16.3.1",
     "esbuild": "^0.19.5",
-    "find-up": "^6.3.0",
-    "tiny-glob": "^0.2.9"
+    "tiny-glob": "^0.2.9",
+    "wrangler": "^3.36.0"
   },
   "peerDependencies": {
     "astro": "^4.2.0"
   },
   "devDependencies": {
     "execa": "^8.0.1",
     "fast-glob": "^3.3.2",
-    "@types/iarna__toml": "^2.0.2",
     "strip-ansi": "^7.1.0",
     "astro": "^4.5.8",
     "cheerio": "1.0.0-rc.12",
-    "wrangler": "^3.36.0",
     "@astrojs/test-utils": "workspace:*",
     "astro-scripts": "workspace:*"
   },

packages/cloudflare/src/index.ts

@@ -1,5 +1,4 @@
 import type { AstroConfig, AstroIntegration, RouteData } from 'astro';
-import type { LocalPagesRuntime, LocalWorkersRuntime, RUNTIME } from './utils/local-runtime.js';
 
 import * as fs from 'node:fs';
 import * as os from 'node:os';
@@ -12,11 +11,11 @@ import glob from 'tiny-glob';
 import { getAdapter } from './getAdapter.js';
 import { deduplicatePatterns } from './utils/deduplicatePatterns.js';
 import { prepareImageConfig } from './utils/image-config.js';
-import { getLocalRuntime, getRuntimeConfig } from './utils/local-runtime.js';
 import { prependForwardSlash } from './utils/prependForwardSlash.js';
 import { rewriteWasmImportPath } from './utils/rewriteWasmImportPath.js';
 import { patchSharpBundle } from './utils/sharpBundlePatch.js';
 import { wasmModuleLoader } from './utils/wasm-module-loader.js';
+import { getPlatformProxy } from 'wrangler';
 
 export type { AdvancedRuntime } from './entrypoints/server.advanced.js';
 
@@ -36,22 +35,18 @@ export type Options = {
 		exclude?: string[];
 	};
 	/**
-	 * { mode: 'off' }: current behaviour (wrangler is needed)
-	 * { mode: 'local', ... }: adds cf request object, locals bindings, env vars/secrets which are defined by the user to `astro.dev` with `Astro.locals.runtime` / `context.locals.runtime`
+	 * Proxy configuration for the platform.
 	 */
-	runtime?:
-		| { mode: 'off' }
-		| {
-				mode: Extract<RUNTIME, { type: 'pages' }>['mode'];
-				type: Extract<RUNTIME, { type: 'pages' }>['type'];
-				persistTo?: Extract<RUNTIME, { type: 'pages' }>['persistTo'];
-				bindings?: Extract<RUNTIME, { type: 'pages' }>['bindings'];
-		  }
-		| {
-				mode: Extract<RUNTIME, { type: 'workers' }>['mode'];
-				type: Extract<RUNTIME, { type: 'workers' }>['type'];
-				persistTo?: Extract<RUNTIME, { type: 'workers' }>['persistTo'];
-		  };
+	platformProxy?: {
+		/** Toggle the proxy. Default `undefined`, which equals to `false`. */
+		enabled?: boolean;
+		/** Path to the configuration file. Default `wrangler.toml`. */
+		configPath?: string;
+		/** Enable experimental support for JSON configuration. Default `false`. */
+		experimentalJsonConfig?: boolean;
+		/** Configuration persistence settings. Default '.wrangler/state/v3' */
+		persist?: boolean | { path: string };
+	};
 	wasmModuleImports?: boolean;
 };
 
@@ -66,12 +61,9 @@ interface BuildConfig {
 export default function createIntegration(args?: Options): AstroIntegration {
 	let _config: AstroConfig;
 	let _buildConfig: BuildConfig;
-	let _localRuntime: LocalPagesRuntime | LocalWorkersRuntime;
 
 	const SERVER_BUILD_FOLDER = '/$server_build/';
 
-	const runtimeMode = getRuntimeConfig(args?.runtime);
-
 	return {
 		name: '@astrojs/cloudflare',
 		hooks: {
@@ -112,41 +104,29 @@ export default function createIntegration(args?: Options): AstroIntegration {
 					);
 				}
 			},
-			'astro:server:setup': ({ server, logger }) => {
-				if (runtimeMode.mode === 'local') {
-					server.middlewares.use(async function middleware(req, res, next) {
-						_localRuntime = getLocalRuntime(_config, runtimeMode, logger);
+			'astro:server:setup': async ({ server, logger }) => {
+				if (args?.platformProxy?.enabled === true) {
+					const platformProxy = await getPlatformProxy({
+						configPath: args.platformProxy.configPath ?? 'wrangler.toml',
+						experimentalJsonConfig: args.platformProxy.experimentalJsonConfig ?? false,
+						persist: args.platformProxy.persist ?? true,
+					});
 
-						const bindings = await _localRuntime.getBindings();
-						const secrets = await _localRuntime.getSecrets();
-						const caches = await _localRuntime.getCaches();
-						const cf = await _localRuntime.getCF();
+					const clientLocalsSymbol = Symbol.for('astro.locals');
 
-						const clientLocalsSymbol = Symbol.for('astro.locals');
+					server.middlewares.use(async function middleware(req, res, next) {
 						Reflect.set(req, clientLocalsSymbol, {
 							runtime: {
-								env: {
-									CF_PAGES_URL: `http://${req.headers.host}`,
-									...bindings,
-									...secrets,
-								},
-								cf: cf,
-								caches: caches,
-								waitUntil: (_promise: Promise<any>) => {
-									return;
-								},
+								env: platformProxy.env,
+								cf: platformProxy.cf,
+								caches: platformProxy.caches,
+								ctx: platformProxy.ctx,
 							},
 						});
 						next();
 					});
 				}
 			},
-			'astro:server:done': async ({ logger }) => {
-				if (_localRuntime) {
-					logger.info('Cleaning up the local Cloudflare runtime.');
-					await _localRuntime.dispose();
-				}
-			},
 			'astro:build:setup': ({ vite, target }) => {
 				if (target === 'server') {
 					vite.resolve ||= {};