added typings and adjusted some return vars

packages/integrations/cloudflare/package.json

@@ -19,7 +19,10 @@
   "homepage": "https://docs.astro.build/en/guides/integrations-guide/cloudflare/",
   "exports": {
     ".": "./dist/index.js",
-    "./runtime": "./dist/runtime.js",
+    "./runtime": {
+      "import": "./dist/runtime.js",
+      "types": "./dist/runtime.d.ts"
+    },
     "./server.advanced.js": "./dist/server.advanced.js",
     "./server.directory.js": "./dist/server.directory.js",
     "./package.json": "./package.json"

packages/integrations/cloudflare/src/runtime.ts

@@ -1,7 +1,20 @@
+export type WorkerRuntime<T> = {
+	name: 'cloudflare';
+	env: T;
+	waitUntil(promise: Promise<any>): void;
+	passThroughOnException(): void;
+};
 
-export function getRuntime(request: Request): any {
-  return Reflect.get(
-    request,
-    Symbol.for('runtime')
-  );
-}
+export type PagesRuntime<T, U> = {
+	name: 'cloudflare';
+	env: T;
+	functionPath: string;
+	params: Record<string, string>;
+	data: U;
+	waitUntil(promise: Promise<any>): void;
+	next(request: Request): void;
+};
+
+export function getRuntime<T, U>(request: Request): WorkerRuntime<T> | PagesRuntime<T, U> {
+	return Reflect.get(request, Symbol.for('runtime'));
+}

packages/integrations/cloudflare/src/server.advanced.ts

@@ -5,16 +5,14 @@ import { App } from 'astro/app';
 
 type Env = {
 	ASSETS: { fetch: (req: Request) => Promise<Response> };
-  name: string;
+	name: string;
 };
 
 export function createExports(manifest: SSRManifest) {
 	const app = new App(manifest, false);
 
 	const fetch = async (request: Request, env: Env, context: any) => {
-
 		const { origin, pathname } = new URL(request.url);
-    env.name = "cloudflare";
 
 		// static assets
 		if (manifest.assets.has(pathname)) {
@@ -29,11 +27,7 @@ export function createExports(manifest: SSRManifest) {
 				Symbol.for('astro.clientAddress'),
 				request.headers.get('cf-connecting-ip')
 			);
-      Reflect.set(
-        request,
-        Symbol.for('runtime'),
-        { env, ...context }
-      );
+			Reflect.set(request, Symbol.for('runtime'), { env, name: 'cloudflare', ...context });
 			let response = await app.render(request, routeData);
 
 			if (app.setCookieHeaders) {

packages/integrations/cloudflare/src/server.directory.ts

@@ -9,14 +9,12 @@ export function createExports(manifest: SSRManifest) {
 	const onRequest = async ({
 		request,
 		next,
-    ...runtimeEnv
+		...runtimeEnv
 	}: {
 		request: Request;
 		next: (request: Request) => void;
 	} & Record<string, unknown>) => {
 		const { origin, pathname } = new URL(request.url);
-    runtimeEnv.name = "cloudflare";
-
 		// static assets
 		if (manifest.assets.has(pathname)) {
 			const assetRequest = new Request(`${origin}/static${pathname}`, request);
@@ -30,11 +28,11 @@ export function createExports(manifest: SSRManifest) {
 				Symbol.for('astro.clientAddress'),
 				request.headers.get('cf-connecting-ip')
 			);
-      Reflect.set(
-        request,
-        Symbol.for('runtime'),
-        runtimeEnv
-      );
+			Reflect.set(request, Symbol.for('runtime'), {
+				...runtimeEnv,
+				name: 'cloudflare',
+				next,
+			});
 			let response = await app.render(request, routeData);
 
 			if (app.setCookieHeaders) {