@opennextjs/cloudflare 0.0.0-88fe982 → 0.0.0-9a03245

package/dist/{templates → cli/templates}/worker.ts

@@ -1,46 +1,64 @@
+import { AsyncLocalStorage } from "node:async_hooks";
 import Stream from "node:stream";
 import type { NextConfig } from "next";
 import { NodeNextRequest, NodeNextResponse } from "next/dist/server/base-http/node";
 import { MockedResponse } from "next/dist/server/lib/mock-request";
 import NextNodeServer, { NodeRequestHandler } from "next/dist/server/next-server";
 import type { IncomingMessage } from "node:http";
+import { type CloudflareContext } from "../../api";
 
 const NON_BODY_RESPONSES = new Set([101, 204, 205, 304]);
 
+const cloudflareContextALS = new AsyncLocalStorage<CloudflareContext>();
+
+// Note: this symbol needs to be kept in sync with the one defined in `src/api/get-cloudflare-context.ts`
+(globalThis as any)[Symbol.for("__cloudflare-context__")] = new Proxy(
+  {},
+  {
+    ownKeys: () => Reflect.ownKeys(cloudflareContextALS.getStore()!),
+    getOwnPropertyDescriptor: (_, ...args) =>
+      Reflect.getOwnPropertyDescriptor(cloudflareContextALS.getStore()!, ...args),
+    get: (_, property) => Reflect.get(cloudflareContextALS.getStore()!, property),
+    set: (_, property, value) => Reflect.set(cloudflareContextALS.getStore()!, property, value),
+  }
+);
+
 // Injected at build time
 const nextConfig: NextConfig = JSON.parse(process.env.__NEXT_PRIVATE_STANDALONE_CONFIG ?? "{}");
 
 let requestHandler: NodeRequestHandler | null = null;
 
 export default {
-  async fetch(request: Request, env: any, ctx: any) {
-    if (requestHandler == null) {
-      globalThis.process.env = { ...globalThis.process.env, ...env };
-      requestHandler = new NextNodeServer({
-        conf: { ...nextConfig, env },
-        customServer: false,
-        dev: false,
-        dir: "",
-        minimalMode: false,
-      }).getRequestHandler();
-    }
-
-    const url = new URL(request.url);
-
-    if (url.pathname === "/_next/image") {
-      let imageUrl =
-        url.searchParams.get("url") ?? "https://developers.cloudflare.com/_astro/logo.BU9hiExz.svg";
-      if (imageUrl.startsWith("/")) {
-        return env.ASSETS.fetch(new URL(imageUrl, request.url));
+  async fetch(request: Request & { cf: IncomingRequestCfProperties }, env: any, ctx: any) {
+    return cloudflareContextALS.run({ env, ctx, cf: request.cf }, async () => {
+      if (requestHandler == null) {
+        globalThis.process.env = { ...globalThis.process.env, ...env };
+        requestHandler = new NextNodeServer({
+          conf: { ...nextConfig, env },
+          customServer: false,
+          dev: false,
+          dir: "",
+          minimalMode: false,
+        }).getRequestHandler();
+      }
+
+      const url = new URL(request.url);
+
+      if (url.pathname === "/_next/image") {
+        let imageUrl =
+          url.searchParams.get("url") ?? "https://developers.cloudflare.com/_astro/logo.BU9hiExz.svg";
+        if (imageUrl.startsWith("/")) {
+          return env.ASSETS.fetch(new URL(imageUrl, request.url));
+        }
+        return fetch(imageUrl, { cf: { cacheEverything: true } } as any);
       }
-      return fetch(imageUrl, { cf: { cacheEverything: true } } as any);
-    }
 
-    const { req, res, webResponse } = getWrappedStreams(request, ctx);
+      const { req, res, webResponse } = getWrappedStreams(request, ctx);
 
-    ctx.waitUntil(requestHandler(new NodeNextRequest(req), new NodeNextResponse(res)));
+      ctx.waitUntil(requestHandler(new NodeNextRequest(req), new NodeNextResponse(res)));
 
-    return await webResponse();
+      return await webResponse();
+    });
   },
 };
 
@@ -102,7 +120,6 @@ function getWrappedStreams(request: Request, ctx: any) {
     },
     set: function (val) {
       if (this.finished || this.headersSent) {
-        console.error("headers already sent");
         return;
       }
       statusCode = val;

package/package.json

@@ -1,16 +1,24 @@
 {
   "name": "@opennextjs/cloudflare",
   "description": "Cloudflare builder for next apps",
-  "version": "0.0.0-88fe982",
-  "bin": "dist/index.mjs",
+  "version": "0.0.0-9a03245",
+  "bin": "dist/cli/index.mjs",
+  "main": "./dist/api/index.mjs",
+  "types": "./dist/api/index.d.mts",
+  "exports": {
+    ".": {
+      "import": "./dist/api/index.mjs",
+      "types": "./dist/api/index.d.mts"
+    }
+  },
   "files": [
     "README.md",
     "dist"
   ],
   "repository": {
     "type": "git",
-    "url": "https://github.com/flarelabs-net/poc-next.git",
-    "directory": "builder"
+    "url": "https://github.com/opennextjs/opennextjs-cloudflare.git",
+    "directory": "packages/cloudflare"
   },
   "keywords": [
     "cloudflare",
@@ -19,13 +27,15 @@
   ],
   "license": "MIT",
   "bugs": {
-    "url": "https://github.com/flarelabs-net/poc-next/issues"
+    "url": "https://github.com/opennextjs/opennextjs-cloudflare/issues"
   },
-  "homepage": "https://github.com/flarelabs-net/poc-next",
+  "homepage": "https://github.com/opennextjs/opennextjs-cloudflare",
   "devDependencies": {
+    "@cloudflare/workers-types": "^4.20240919.0",
     "@types/node": "^22.2.0",
     "esbuild": "^0.23.0",
     "glob": "^11.0.0",
+    "next": "14.2.11",
     "tsup": "^8.2.4",
     "typescript": "^5.5.4",
     "vitest": "^2.1.1"
@@ -33,6 +43,9 @@
   "dependencies": {
     "ts-morph": "^23.0.0"
   },
+  "peerDependencies": {
+    "wrangler": "^3.78.6"
+  },
   "scripts": {
     "build": "tsup",
     "build:watch": "tsup --watch src",