@opennextjs/cloudflare 1.0.0 → 1.0.2

package/dist/api/config.js

@@ -26,6 +26,17 @@ export function defineCloudflareConfig(config = {}) {
         dangerous: {
             enableCacheInterception,
         },
+        middleware: {
+            external: true,
+            override: {
+                wrapper: "cloudflare-edge",
+                converter: "edge",
+                proxyExternalRequest: "fetch",
+                incrementalCache: resolveIncrementalCache(incrementalCache),
+                tagCache: resolveTagCache(tagCache),
+                queue: resolveQueue(queue),
+            },
+        },
     };
 }
 function resolveIncrementalCache(value = "dummy") {

package/dist/cli/build/utils/ensure-cf-config.js

@@ -6,6 +6,7 @@ import logger from "@opennextjs/aws/logger.js";
  */
 export function ensureCloudflareConfig(config) {
     const requirements = {
+        // Check for the default function
         dftUseCloudflareWrapper: config.default?.override?.wrapper === "cloudflare-node",
         dftUseEdgeConverter: config.default?.override?.converter === "edge",
         dftUseFetchProxy: config.default?.override?.proxyExternalRequest === "fetch",
@@ -16,7 +17,11 @@ export function ensureCloudflareConfig(config) {
         dftMaybeUseQueue: config.default?.override?.queue === "dummy" ||
             config.default?.override?.queue === "direct" ||
             typeof config.default?.override?.queue === "function",
-        mwIsMiddlewareIntegrated: config.middleware === undefined,
+        // Check for the middleware function
+        mwIsMiddlewareExternal: config.middleware?.external === true,
+        mwUseCloudflareWrapper: config.middleware?.override?.wrapper === "cloudflare-edge",
+        mwUseEdgeConverter: config.middleware?.override?.converter === "edge",
+        mwUseFetchProxy: config.middleware?.override?.proxyExternalRequest === "fetch",
         hasCryptoExternal: config.edgeExternals?.includes("node:crypto"),
     };
     if (config.default?.override?.queue === "direct") {
@@ -31,11 +36,22 @@ export function ensureCloudflareConfig(config) {
               converter: "edge",
               proxyExternalRequest: "fetch",
               incrementalCache: "dummy" | function,
-              tagCache: "dummy",
+              tagCache: "dummy" | function,
               queue: "dummy" | "direct" | function,
             },
           },
           edgeExternals: ["node:crypto"],
+          middleware: {
+            external: true,
+            override: {
+              wrapper: "cloudflare-edge",
+              converter: "edge",
+              proxyExternalRequest: "fetch",
+              incrementalCache: "dummy" | function,
+              tagCache: "dummy" | function,
+              queue: "dummy" | "direct" | function,
+            },
+          },
         }\n\n`.replace(/^ {8}/gm, ""));
     }
 }

package/dist/cli/commands/populate-cache.js

@@ -49,10 +49,15 @@ export function getCacheAssets(opts) {
     }
     return assets;
 }
+async function getPlatformProxyEnv(options, key) {
+    const proxy = await getPlatformProxy(options);
+    const prefix = proxy.env[key];
+    await proxy.dispose();
+    return prefix;
+}
 async function populateR2IncrementalCache(options, populateCacheOptions) {
     logger.info("\nPopulating R2 incremental cache...");
     const config = unstable_readConfig({ env: populateCacheOptions.environment });
-    const proxy = await getPlatformProxy(populateCacheOptions);
     const binding = config.r2_buckets.find(({ binding }) => binding === R2_CACHE_BINDING_NAME);
     if (!binding) {
         throw new Error(`No R2 binding ${JSON.stringify(R2_CACHE_BINDING_NAME)} found!`);
@@ -61,10 +66,11 @@ async function populateR2IncrementalCache(options, populateCacheOptions) {
     if (!bucket) {
         throw new Error(`R2 binding ${JSON.stringify(R2_CACHE_BINDING_NAME)} should have a 'bucket_name'`);
     }
+    const prefix = await getPlatformProxyEnv(populateCacheOptions, R2_CACHE_PREFIX_ENV_NAME);
     const assets = getCacheAssets(options);
     for (const { fullPath, key, buildId, isFetch } of tqdm(assets)) {
         const cacheKey = computeCacheKey(key, {
-            prefix: proxy.env[R2_CACHE_PREFIX_ENV_NAME],
+            prefix,
             buildId,
             cacheType: isFetch ? "fetch" : "cache",
         });
@@ -78,11 +84,11 @@ async function populateR2IncrementalCache(options, populateCacheOptions) {
 async function populateKVIncrementalCache(options, populateCacheOptions) {
     logger.info("\nPopulating KV incremental cache...");
     const config = unstable_readConfig({ env: populateCacheOptions.environment });
-    const proxy = await getPlatformProxy(populateCacheOptions);
     const binding = config.kv_namespaces.find(({ binding }) => binding === KV_CACHE_BINDING_NAME);
     if (!binding) {
         throw new Error(`No KV binding ${JSON.stringify(KV_CACHE_BINDING_NAME)} found!`);
     }
+    const prefix = await getPlatformProxyEnv(populateCacheOptions, KV_CACHE_PREFIX_ENV_NAME);
     const assets = getCacheAssets(options);
     const chunkSize = Math.max(1, populateCacheOptions.cacheChunkSize ?? 25);
     const totalChunks = Math.ceil(assets.length / chunkSize);
@@ -93,7 +99,7 @@ async function populateKVIncrementalCache(options, populateCacheOptions) {
             .slice(i * chunkSize, (i + 1) * chunkSize)
             .map(({ fullPath, key, buildId, isFetch }) => ({
             key: computeCacheKey(key, {
-                prefix: proxy.env[KV_CACHE_PREFIX_ENV_NAME],
+                prefix,
                 buildId,
                 cacheType: isFetch ? "fetch" : "cache",
             }),

package/dist/cli/templates/init.js

@@ -75,6 +75,10 @@ function initRuntime() {
         Request: CustomRequest,
         __BUILD_TIMESTAMP_MS__: __BUILD_TIMESTAMP_MS__,
         __NEXT_BASE_PATH__: __NEXT_BASE_PATH__,
+        // The external middleware will use the convertTo function of the `edge` converter
+        // by default it will try to fetch the request, but since we are running everything in the same worker
+        // we need to use the request as is.
+        __dangerous_ON_edge_converter_returns_request: true,
     });
 }
 /**

package/dist/cli/templates/worker.js

@@ -1,5 +1,7 @@
 //@ts-expect-error: Will be resolved by wrangler build
 import { runWithCloudflareRequestContext } from "./cloudflare/init.js";
+// @ts-expect-error: Will be resolved by wrangler build
+import { handler as middlewareHandler } from "./middleware/handler.mjs";
 //@ts-expect-error: Will be resolved by wrangler build
 export { DOQueueHandler } from "./.build/durable-objects/queue.js";
 //@ts-expect-error: Will be resolved by wrangler build
@@ -27,9 +29,14 @@ export default {
                     ? env.ASSETS?.fetch(`http://assets.local${imageUrl}`)
                     : fetch(imageUrl, { cf: { cacheEverything: true } });
             }
+            // - `Request`s are handled by the Next server
+            const reqOrResp = await middlewareHandler(request, env, ctx);
+            if (reqOrResp instanceof Response) {
+                return reqOrResp;
+            }
             // @ts-expect-error: resolved by wrangler build
             const { handler } = await import("./server-functions/default/handler.mjs");
-            return handler(request, env, ctx);
+            return handler(reqOrResp, env, ctx);
         });
     },
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@opennextjs/cloudflare",
   "description": "Cloudflare builder for next apps",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "type": "module",
   "bin": {
     "opennextjs-cloudflare": "dist/cli/index.js"
@@ -43,7 +43,7 @@
   "homepage": "https://github.com/opennextjs/opennextjs-cloudflare",
   "dependencies": {
     "@dotenvx/dotenvx": "1.31.0",
-    "@opennextjs/aws": "~3.6.0",
+    "@opennextjs/aws": "^3.6.1",
     "enquirer": "^2.4.1",
     "glob": "^11.0.0",
     "ts-tqdm": "^0.8.6"

package/templates/wrangler.jsonc

@@ -13,9 +13,10 @@
     // See https://opennext.js.org/cloudflare/caching
     {
       "binding": "NEXT_INC_CACHE_R2_BUCKET",
-      // Create a bucket before deploying
+      // Create the bucket before deploying
+      // You can change the bucket name if you want
       // See https://developers.cloudflare.com/workers/wrangler/commands/#r2-bucket-create
-      "bucket_name": "<BUCKET_NAME>"
+      "bucket_name": "cache"
     }
   ]
 }