@b9g/platform-cloudflare 0.1.5 → 0.1.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@b9g/platform-cloudflare",
-  "version": "0.1.5",
+  "version": "0.1.6",
   "description": "Cloudflare Workers platform adapter for Shovel - already ServiceWorker-based!",
   "keywords": [
     "shovel",
@@ -11,9 +11,9 @@
     "serviceworker"
   ],
   "dependencies": {
-    "@b9g/assets": "^0.1.5",
+    "@b9g/assets": "^0.1.12",
     "@b9g/cache": "^0.1.4",
-    "@b9g/platform": "^0.1.5",
+    "@b9g/platform": "^0.1.9",
     "@cloudflare/workers-types": "^4.20241218.0",
     "miniflare": "^4.20251118.1"
   },

package/src/filesystem-assets.js

@@ -1,11 +1,12 @@
 /// <reference types="./filesystem-assets.d.ts" />
 // src/filesystem-assets.ts
 var CFAssetsDirectoryHandle = class _CFAssetsDirectoryHandle {
-  kind = "directory";
+  kind;
   name;
   #assets;
   #basePath;
   constructor(assets, basePath = "/") {
+    this.kind = "directory";
     this.#assets = assets;
     this.#basePath = basePath.endsWith("/") ? basePath : basePath + "/";
     this.name = basePath.split("/").filter(Boolean).pop() || "assets";
@@ -32,18 +33,21 @@ var CFAssetsDirectoryHandle = class _CFAssetsDirectoryHandle {
   async resolve(_possibleDescendant) {
     return null;
   }
+  // eslint-disable-next-line require-yield
   async *entries() {
     throw new DOMException(
       "Directory listing not supported for ASSETS binding. Use an asset manifest for enumeration.",
       "NotSupportedError"
     );
   }
+  // eslint-disable-next-line require-yield
   async *keys() {
     throw new DOMException(
       "Directory listing not supported for ASSETS binding",
       "NotSupportedError"
     );
   }
+  // eslint-disable-next-line require-yield
   async *values() {
     throw new DOMException(
       "Directory listing not supported for ASSETS binding",
@@ -60,11 +64,12 @@ var CFAssetsDirectoryHandle = class _CFAssetsDirectoryHandle {
   }
 };
 var CFAssetsFileHandle = class _CFAssetsFileHandle {
-  kind = "file";
+  kind;
   name;
   #assets;
   #path;
   constructor(assets, path, name) {
+    this.kind = "file";
     this.#assets = assets;
     this.#path = path;
     this.name = name;

package/src/index.d.ts

@@ -65,7 +65,7 @@ export declare const cloudflareWorkerBanner = "// Cloudflare Worker ES Module wr
 /**
  * Generate footer code for ServiceWorker → ES Module conversion
  */
-export declare const cloudflareWorkerFooter = "\n// Export ES Module for Cloudflare Workers\nexport default {\n\tasync fetch(request, env, ctx) {\n\t\ttry {\n\t\t\t// Set up ServiceWorker-like dirs API for bundled deployment\n\t\t\tif (!globalThis.self.dirs) {\n\t\t\t\t// For bundled deployment, assets are served via static middleware\n\t\t\t\t// not through the dirs API\n\t\t\t\tglobalThis.self.dirs = {\n\t\t\t\t\tasync open(directoryName) {\n\t\t\t\t\t\tif (directoryName === 'assets') {\n\t\t\t\t\t\t\t// Return a minimal interface that indicates no files available\n\t\t\t\t\t\t\t// The assets middleware will fall back to dev mode behavior\n\t\t\t\t\t\t\treturn {\n\t\t\t\t\t\t\t\tasync getFileHandle(fileName) {\n\t\t\t\t\t\t\t\t\tthrow new Error(`NotFoundError: ${fileName} not found in bundled assets`);\n\t\t\t\t\t\t\t\t}\n\t\t\t\t\t\t\t};\n\t\t\t\t\t\t}\n\t\t\t\t\t\tthrow new Error(`Directory ${directoryName} not available in bundled deployment`);\n\t\t\t\t\t}\n\t\t\t\t};\n\t\t\t}\n\t\t\t\n\t\t\t// Set up caches API\n\t\t\tif (!globalThis.self.caches) {\n\t\t\t\tglobalThis.self.caches = globalThis.caches;\n\t\t\t}\n\t\t\t\n\t\t\t// Ensure request.url is a string\n\t\t\tif (typeof request.url !== 'string') {\n\t\t\t\treturn new Response('Invalid request URL: ' + typeof request.url, { status: 500 });\n\t\t\t}\n\t\t\t\n\t\t\t// Create proper FetchEvent-like object\n\t\t\tlet responseReceived = null;\n\t\t\tconst event = { \n\t\t\t\trequest, \n\t\t\t\trespondWith: (response) => { responseReceived = response; }\n\t\t\t};\n\t\t\t\n\t\t\t// Dispatch to ServiceWorker fetch handlers\n\t\t\tfor (const handler of fetchHandlers) {\n\t\t\t\ttry {\n\t\t\t\t\tlogger.debug(\"Calling handler\", {url: request.url});\n\t\t\t\t\tawait handler(event);\n\t\t\t\t\tlogger.debug(\"Handler completed\", {hasResponse: !!responseReceived});\n\t\t\t\t\tif (responseReceived) {\n\t\t\t\t\t\treturn responseReceived;\n\t\t\t\t\t}\n\t\t\t\t} catch (error) {\n\t\t\t\t\tlogger.error(\"Handler error\", {error});\n\t\t\t\t\tlogger.error(\"Error stack\", {stack: error.stack});\n\t\t\t\t\t// Return detailed error in response body for debugging\n\t\t\t\t\treturn new Response(JSON.stringify({\n\t\t\t\t\t\terror: error.message,\n\t\t\t\t\t\tstack: error.stack,\n\t\t\t\t\t\tname: error.name,\n\t\t\t\t\t\turl: request.url\n\t\t\t\t\t}, null, 2), { \n\t\t\t\t\t\tstatus: 500,\n\t\t\t\t\t\theaders: { 'Content-Type': 'application/json' }\n\t\t\t\t\t});\n\t\t\t\t}\n\t\t\t}\n\t\t\t\n\t\t\treturn new Response('No ServiceWorker handler', { status: 404 });\n\t\t} catch (topLevelError) {\n\t\t\tlogger.error(\"Top-level error\", {error: topLevelError});\n\t\t\treturn new Response(JSON.stringify({\n\t\t\t\terror: 'Top-level wrapper error: ' + topLevelError.message,\n\t\t\t\tstack: topLevelError.stack,\n\t\t\t\tname: topLevelError.name,\n\t\t\t\turl: request?.url || 'unknown'\n\t\t\t}, null, 2), { \n\t\t\t\tstatus: 500,\n\t\t\t\theaders: { 'Content-Type': 'application/json' }\n\t\t\t});\n\t\t}\n\t}\n};";
+export declare const cloudflareWorkerFooter = "\n// Export ES Module for Cloudflare Workers\nexport default {\n\tasync fetch(request, env, ctx) {\n\t\ttry {\n\t\t\t// Set up ServiceWorker-like dirs API for bundled deployment\n\t\t\tif (!globalThis.self.dirs) {\n\t\t\t\t// For bundled deployment, assets are served via static middleware\n\t\t\t\t// not through the dirs API\n\t\t\t\tglobalThis.self.dirs = {\n\t\t\t\t\tasync open(directoryName) {\n\t\t\t\t\t\tif (directoryName === 'assets') {\n\t\t\t\t\t\t\t// Return a minimal interface that indicates no files available\n\t\t\t\t\t\t\t// The assets middleware will fall back to dev mode behavior\n\t\t\t\t\t\t\treturn {\n\t\t\t\t\t\t\t\tasync getFileHandle(fileName) {\n\t\t\t\t\t\t\t\t\tthrow new Error(`NotFoundError: ${fileName} not found in bundled assets`);\n\t\t\t\t\t\t\t\t}\n\t\t\t\t\t\t\t};\n\t\t\t\t\t\t}\n\t\t\t\t\t\tthrow new Error(`Directory ${directoryName} not available in bundled deployment`);\n\t\t\t\t\t}\n\t\t\t\t};\n\t\t\t}\n\t\t\t\n\t\t\t// Set up caches API\n\t\t\tif (!globalThis.self.caches) {\n\t\t\t\tglobalThis.self.caches = globalThis.caches;\n\t\t\t}\n\t\t\t\n\t\t\t// Ensure request.url is a string\n\t\t\tif (typeof request.url !== 'string') {\n\t\t\t\treturn new Response('Invalid request URL: ' + typeof request.url, { status: 500 });\n\t\t\t}\n\t\t\t\n\t\t\t// Create proper FetchEvent-like object\n\t\t\tlet responseReceived = null;\n\t\t\tconst event = { \n\t\t\t\trequest, \n\t\t\t\trespondWith: (response) => { responseReceived = response; }\n\t\t\t};\n\t\t\t\n\t\t\t// Helper for error responses\n\t\t\tconst createErrorResponse = (err) => {\n\t\t\t\tconst isDev = typeof import.meta !== \"undefined\" && import.meta.env?.MODE !== \"production\";\n\t\t\t\tif (isDev) {\n\t\t\t\t\tconst escapeHtml = (str) => str.replace(/&/g, \"&amp;\").replace(/</g, \"&lt;\").replace(/>/g, \"&gt;\").replace(/\"/g, \"&quot;\");\n\t\t\t\t\treturn new Response(`<!DOCTYPE html>\n<html>\n<head>\n  <title>500 Internal Server Error</title>\n  <style>\n    body { font-family: system-ui, sans-serif; padding: 2rem; max-width: 800px; margin: 0 auto; }\n    h1 { color: #c00; }\n    .message { font-size: 1.2em; color: #333; }\n    pre { background: #f5f5f5; padding: 1rem; overflow-x: auto; border-radius: 4px; }\n  </style>\n</head>\n<body>\n  <h1>500 Internal Server Error</h1>\n  <p class=\"message\">${escapeHtml(err.message)}</p>\n  <pre>${escapeHtml(err.stack || \"No stack trace available\")}</pre>\n</body>\n</html>`, { status: 500, headers: { \"Content-Type\": \"text/html; charset=utf-8\" } });\n\t\t\t\t} else {\n\t\t\t\t\treturn new Response(\"Internal Server Error\", { status: 500, headers: { \"Content-Type\": \"text/plain\" } });\n\t\t\t\t}\n\t\t\t};\n\n\t\t\t// Dispatch to ServiceWorker fetch handlers\n\t\t\tfor (const handler of fetchHandlers) {\n\t\t\t\ttry {\n\t\t\t\t\tlogger.debug(\"Calling handler\", {url: request.url});\n\t\t\t\t\tawait handler(event);\n\t\t\t\t\tlogger.debug(\"Handler completed\", {hasResponse: !!responseReceived});\n\t\t\t\t\tif (responseReceived) {\n\t\t\t\t\t\treturn responseReceived;\n\t\t\t\t\t}\n\t\t\t\t} catch (error) {\n\t\t\t\t\tlogger.error(\"Handler error\", {error});\n\t\t\t\t\tlogger.error(\"Error stack\", {stack: error.stack});\n\t\t\t\t\treturn createErrorResponse(error);\n\t\t\t\t}\n\t\t\t}\n\n\t\t\treturn new Response('No ServiceWorker handler', { status: 404 });\n\t\t} catch (topLevelError) {\n\t\t\tlogger.error(\"Top-level error\", {error: topLevelError});\n\t\t\tconst isDev = typeof import.meta !== \"undefined\" && import.meta.env?.MODE !== \"production\";\n\t\t\tif (isDev) {\n\t\t\t\tconst escapeHtml = (str) => String(str).replace(/&/g, \"&amp;\").replace(/</g, \"&lt;\").replace(/>/g, \"&gt;\").replace(/\"/g, \"&quot;\");\n\t\t\t\treturn new Response(`<!DOCTYPE html>\n<html>\n<head>\n  <title>500 Internal Server Error</title>\n  <style>\n    body { font-family: system-ui, sans-serif; padding: 2rem; max-width: 800px; margin: 0 auto; }\n    h1 { color: #c00; }\n    .message { font-size: 1.2em; color: #333; }\n    pre { background: #f5f5f5; padding: 1rem; overflow-x: auto; border-radius: 4px; }\n  </style>\n</head>\n<body>\n  <h1>500 Internal Server Error</h1>\n  <p class=\"message\">${escapeHtml(topLevelError.message)}</p>\n  <pre>${escapeHtml(topLevelError.stack || \"No stack trace available\")}</pre>\n</body>\n</html>`, { status: 500, headers: { \"Content-Type\": \"text/html; charset=utf-8\" } });\n\t\t\t} else {\n\t\t\t\treturn new Response(\"Internal Server Error\", { status: 500, headers: { \"Content-Type\": \"text/plain\" } });\n\t\t\t}\n\t\t}\n\t}\n};";
 /**
  * Default export for easy importing
  */

package/src/index.js

@@ -8,12 +8,15 @@ var logger = getLogger(["platform-cloudflare"]);
 var CloudflarePlatform = class extends BasePlatform {
   name;
   #options;
-  #miniflare = null;
-  #assetsMiniflare = null;
+  #miniflare;
+  #assetsMiniflare;
   // Separate instance for ASSETS binding
-  #assetsBinding = null;
+  #assetsBinding;
   constructor(options = {}) {
     super(options);
+    this.#miniflare = null;
+    this.#assetsMiniflare = null;
+    this.#assetsBinding = null;
     this.name = "cloudflare";
     this.#options = {
       environment: "production",
@@ -115,7 +118,17 @@ var CloudflarePlatform = class extends BasePlatform {
     const instance = {
       runtime: mf,
       handleRequest: async (request) => {
-        return mf.dispatchFetch(request);
+        const cfResponse = await mf.dispatchFetch(request.url, {
+          method: request.method,
+          headers: request.headers,
+          body: request.body,
+          duplex: request.body ? "half" : void 0
+        });
+        return new Response(cfResponse.body, {
+          status: cfResponse.status,
+          statusText: cfResponse.statusText,
+          headers: cfResponse.headers
+        });
       },
       install: () => Promise.resolve(),
       activate: () => Promise.resolve(),
@@ -315,6 +328,33 @@ export default {
 				respondWith: (response) => { responseReceived = response; }
 			};
 			
+			// Helper for error responses
+			const createErrorResponse = (err) => {
+				const isDev = typeof import.meta !== "undefined" && import.meta.env?.MODE !== "production";
+				if (isDev) {
+					const escapeHtml = (str) => str.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;");
+					return new Response(\`<!DOCTYPE html>
+<html>
+<head>
+  <title>500 Internal Server Error</title>
+  <style>
+    body { font-family: system-ui, sans-serif; padding: 2rem; max-width: 800px; margin: 0 auto; }
+    h1 { color: #c00; }
+    .message { font-size: 1.2em; color: #333; }
+    pre { background: #f5f5f5; padding: 1rem; overflow-x: auto; border-radius: 4px; }
+  </style>
+</head>
+<body>
+  <h1>500 Internal Server Error</h1>
+  <p class="message">\${escapeHtml(err.message)}</p>
+  <pre>\${escapeHtml(err.stack || "No stack trace available")}</pre>
+</body>
+</html>\`, { status: 500, headers: { "Content-Type": "text/html; charset=utf-8" } });
+				} else {
+					return new Response("Internal Server Error", { status: 500, headers: { "Content-Type": "text/plain" } });
+				}
+			};
+
 			// Dispatch to ServiceWorker fetch handlers
 			for (const handler of fetchHandlers) {
 				try {
@@ -327,31 +367,36 @@ export default {
 				} catch (error) {
 					logger.error("Handler error", {error});
 					logger.error("Error stack", {stack: error.stack});
-					// Return detailed error in response body for debugging
-					return new Response(JSON.stringify({
-						error: error.message,
-						stack: error.stack,
-						name: error.name,
-						url: request.url
-					}, null, 2), { 
-						status: 500,
-						headers: { 'Content-Type': 'application/json' }
-					});
+					return createErrorResponse(error);
 				}
 			}
-			
+
 			return new Response('No ServiceWorker handler', { status: 404 });
 		} catch (topLevelError) {
 			logger.error("Top-level error", {error: topLevelError});
-			return new Response(JSON.stringify({
-				error: 'Top-level wrapper error: ' + topLevelError.message,
-				stack: topLevelError.stack,
-				name: topLevelError.name,
-				url: request?.url || 'unknown'
-			}, null, 2), { 
-				status: 500,
-				headers: { 'Content-Type': 'application/json' }
-			});
+			const isDev = typeof import.meta !== "undefined" && import.meta.env?.MODE !== "production";
+			if (isDev) {
+				const escapeHtml = (str) => String(str).replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;");
+				return new Response(\`<!DOCTYPE html>
+<html>
+<head>
+  <title>500 Internal Server Error</title>
+  <style>
+    body { font-family: system-ui, sans-serif; padding: 2rem; max-width: 800px; margin: 0 auto; }
+    h1 { color: #c00; }
+    .message { font-size: 1.2em; color: #333; }
+    pre { background: #f5f5f5; padding: 1rem; overflow-x: auto; border-radius: 4px; }
+  </style>
+</head>
+<body>
+  <h1>500 Internal Server Error</h1>
+  <p class="message">\${escapeHtml(topLevelError.message)}</p>
+  <pre>\${escapeHtml(topLevelError.stack || "No stack trace available")}</pre>
+</body>
+</html>\`, { status: 500, headers: { "Content-Type": "text/html; charset=utf-8" } });
+			} else {
+				return new Response("Internal Server Error", { status: 500, headers: { "Content-Type": "text/plain" } });
+			}
 		}
 	}
 };`;