@opennextjs/cloudflare 0.0.0-88fe982 → 0.0.0-953d0b1

package/dist/{templates → cli/templates}/shims/node-fs.ts

@@ -17,7 +17,7 @@ function existsSync(path: string) {
   return FILES.has(path);
 }
 
-async function readFile(path: string, options: unknown): Promise<any> {
+async function readFile(path: string, options: unknown): Promise<unknown> {
   console.log(
     "readFile",
     { path, options }

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

@@ -1,55 +1,76 @@
-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 { NodeNextRequest, NodeNextResponse } from "next/dist/server/base-http/node";
+import { AsyncLocalStorage } from "node:async_hooks";
+import { type CloudflareContext } from "../../api";
 import type { IncomingMessage } from "node:http";
+import { MockedResponse } from "next/dist/server/lib/mock-request";
+import type { NextConfig } from "next";
+import Stream from "node:stream";
 
 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`
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+(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));
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  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") {
+        const 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));
+        }
+        // @ts-ignore
+        return fetch(imageUrl, { cf: { cacheEverything: true } } as unknown);
       }
-      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();
+    });
   },
 };
 
-function getWrappedStreams(request: Request, ctx: any) {
+function getWrappedStreams(request: Request, ctx: ExecutionContext) {
   const url = new URL(request.url);
 
-  const req = (
-    request.body ? Stream.Readable.fromWeb(request.body as any) : Stream.Readable.from([])
-  ) as IncomingMessage;
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  const reqBody = request.body && Stream.Readable.fromWeb(request.body as any);
+  const req = (reqBody ?? Stream.Readable.from([])) as IncomingMessage;
   req.httpVersion = "1.0";
   req.httpVersionMajor = 1;
   req.httpVersionMinor = 0;
@@ -76,7 +97,7 @@ function getWrappedStreams(request: Request, ctx: any) {
 
   const res = new MockedResponse({
     resWriter: (chunk) => {
-      resBodyWriter.write(typeof chunk === "string" ? Buffer.from(chunk) : chunk).catch((err: any) => {
+      resBodyWriter.write(typeof chunk === "string" ? Buffer.from(chunk) : chunk).catch((err) => {
         if (
           err.message.includes("WritableStream has been closed") ||
           err.message.includes("Network connection lost")
@@ -92,6 +113,7 @@ function getWrappedStreams(request: Request, ctx: any) {
   });
 
   // It's implemented as a no-op, but really it should mark the headers as done
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   res.flushHeaders = () => (res as any).headPromiseResolve();
 
   // Only allow statusCode to be modified if not sent
@@ -102,7 +124,6 @@ function getWrappedStreams(request: Request, ctx: any) {
     },
     set: function (val) {
       if (this.finished || this.headersSent) {
-        console.error("headers already sent");
         return;
       }
       statusCode = val;
@@ -110,6 +131,7 @@ function getWrappedStreams(request: Request, ctx: any) {
   });
 
   // Make sure the writer is eventually closed
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   ctx.waitUntil((res as any).hasStreamed.finally(() => resBodyWriter.close().catch(() => {})));
 
   return {
@@ -121,6 +143,7 @@ function getWrappedStreams(request: Request, ctx: any) {
       res.setHeader("content-encoding", "identity");
       return new Response(NON_BODY_RESPONSES.has(res.statusCode) ? null : readable, {
         status: res.statusCode,
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
         headers: (res as any).headers,
       });
     },

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-953d0b1",
+  "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,23 +27,35 @@
   ],
   "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.20240925.0",
+    "@eslint/js": "^9.11.1",
     "@types/node": "^22.2.0",
     "esbuild": "^0.23.0",
+    "eslint": "^9.11.1",
+    "eslint-plugin-unicorn": "^55.0.0",
     "glob": "^11.0.0",
+    "globals": "^15.9.0",
+    "next": "14.2.11",
     "tsup": "^8.2.4",
     "typescript": "^5.5.4",
+    "typescript-eslint": "^8.7.0",
     "vitest": "^2.1.1"
   },
   "dependencies": {
     "ts-morph": "^23.0.0"
   },
+  "peerDependencies": {
+    "wrangler": "^3.78.10"
+  },
   "scripts": {
     "build": "tsup",
     "build:watch": "tsup --watch src",
+    "lint:check": "eslint",
+    "lint:fix": "eslint --fix",
     "test": "vitest --run",
     "test:watch": "vitest"
   }