@edgeone/opennextjs-pages 0.2.2 → 0.2.3

package/dist/build/functions/middleware/compiler.js

@@ -2935,6 +2935,43 @@ function getExternalMock(id) {
     return result;
   }
   
+  // shared-cache-controls mock - must be matched before the general incremental-cache mock
+  // Next.js 16+ uses SharedCacheControls from this module in IncrementalCache constructor
+  if (id.includes('shared-cache-controls')) {
+    class SharedCacheControls {
+      constructor(prerenderManifest) {
+        this.prerenderManifest = prerenderManifest;
+        this.controls = new Map();
+      }
+      get(key) { return this.controls.get(key); }
+      set(key, value) { this.controls.set(key, value); }
+    }
+    const result = {
+      SharedCacheControls,
+      default: { SharedCacheControls }
+    };
+    Object.defineProperty(result, '__esModule', { value: true });
+    return result;
+  }
+
+  // shared-revalidate-timings mock - similarly used by IncrementalCache in older versions
+  if (id.includes('shared-revalidate-timings')) {
+    class SharedRevalidateTimings {
+      constructor(prerenderManifest) {
+        this.prerenderManifest = prerenderManifest;
+        this.timings = new Map();
+      }
+      get(key) { return this.timings.get(key); }
+      set(key, value) { this.timings.set(key, value); }
+    }
+    const result = {
+      SharedRevalidateTimings,
+      default: { SharedRevalidateTimings }
+    };
+    Object.defineProperty(result, '__esModule', { value: true });
+    return result;
+  }
+
   // incremental-cache/tags-manifest mock
   if (id.includes('incremental-cache') || id.includes('tags-manifest')) {
     const result = {

package/dist/run/handlers/cache.cjs

@@ -141,21 +141,32 @@ var EdgeoneCacheHandler = class {
         const prerenderManifest = await this.getPrerenderManifest(this.options.serverDistDir);
         if (typeof cacheControl !== "undefined") {
           try {
-            const { SharedCacheControls } = await import(
+            const sharedCacheControlsModule = await import(
               // @ts-expect-error supporting multiple next version, this module is not resolvable with currently used dev dependency
               // eslint-disable-next-line import/no-unresolved, n/no-missing-import
               "next/dist/server/lib/incremental-cache/shared-cache-controls.external.js"
             );
+            const SharedCacheControls = sharedCacheControlsModule.SharedCacheControls || sharedCacheControlsModule.default?.SharedCacheControls || sharedCacheControlsModule.default;
+            if (typeof SharedCacheControls !== "function") {
+              throw new Error("SharedCacheControls is not a constructor in .external.js module");
+            }
             const sharedCacheControls = new SharedCacheControls(prerenderManifest);
             sharedCacheControls.set(key, cacheControl);
           } catch {
-            const { SharedCacheControls } = await import(
-              // @ts-expect-error supporting multiple next version, this module is not resolvable with currently used dev dependency
-              // eslint-disable-next-line import/no-unresolved, n/no-missing-import
-              "next/dist/server/lib/incremental-cache/shared-cache-controls.js"
-            );
-            const sharedCacheControls = new SharedCacheControls(prerenderManifest);
-            sharedCacheControls.set(key, cacheControl);
+            try {
+              const sharedCacheControlsModule = await import(
+                // @ts-expect-error supporting multiple next version, this module is not resolvable with currently used dev dependency
+                // eslint-disable-next-line import/no-unresolved, n/no-missing-import
+                "next/dist/server/lib/incremental-cache/shared-cache-controls.js"
+              );
+              const SharedCacheControls = sharedCacheControlsModule.SharedCacheControls || sharedCacheControlsModule.default?.SharedCacheControls || sharedCacheControlsModule.default;
+              if (typeof SharedCacheControls !== "function") {
+                throw new Error("SharedCacheControls is not a constructor in .js module");
+              }
+              const sharedCacheControls = new SharedCacheControls(prerenderManifest);
+              sharedCacheControls.set(key, cacheControl);
+            } catch {
+            }
           }
         } else if (typeof revalidate === "number" || revalidate === false) {
           try {

package/dist/run/handlers/server.js

@@ -3124,6 +3124,18 @@ var disableFaultyTransferEncodingHandling = (res) => {
     return originalStoreHeader.call(this, firstLine, headers);
   };
 };
+function getRealHostInfo(headers) {
+  const get = (key) => {
+    if (typeof headers.get === "function") {
+      return headers.get(key) || "";
+    }
+    return headers[key] || "";
+  };
+  const host = get("eo-pages-host") || get("host") || "localhost";
+  const protocol = get("x-forwarded-proto") || "https";
+  return { host, protocol };
+}
+var NEXT_REQUEST_META = Symbol.for("NextInternalRequestMeta");
 var server_default = async (request, _context, topLevelSpan, requestContext) => {
   const tracer = getTracer();
   if (!nextHandler) {
@@ -3139,9 +3151,14 @@ var server_default = async (request, _context, topLevelSpan, requestContext) =>
     });
   }
   return await tracer.withActiveSpan("generate response", async (span) => {
+    const { host: realHost, protocol: realProtocol } = getRealHostInfo(request.headers);
     const headersList = [];
     for (var key in request.headers) {
-      headersList.push([key, request.headers[key]]);
+      if (key === "host") {
+        headersList.push([key, realHost]);
+      } else {
+        headersList.push([key, request.headers[key]]);
+      }
     }
     let bodyStream = request.body;
     if (typeof bodyStream === "undefined" && request.method !== "GET" && request.method !== "HEAD") {
@@ -3166,7 +3183,7 @@ var server_default = async (request, _context, topLevelSpan, requestContext) =>
     const { req, res } = toReqRes({
       ...request,
       body: bodyStream,
-      url: "http://localhost:9000" + request.url,
+      url: `${realProtocol}://${realHost}${request.url}`,
       headers: headersList
     });
     Object.defineProperty(req, "connection", {
@@ -3180,6 +3197,21 @@ var server_default = async (request, _context, topLevelSpan, requestContext) =>
       }
     });
     disableFaultyTransferEncodingHandling(res);
+    const realOrigin = `${realProtocol}://${realHost}`;
+    const metaProxy = new Proxy({}, {
+      set(target, prop, value) {
+        if (prop === "initURL" && typeof value === "string") {
+          target[prop] = value.replace(/^https?:\/\/localhost(:\d+)?/, realOrigin);
+        } else {
+          target[prop] = value;
+        }
+        return true;
+      },
+      get(target, prop) {
+        return target[prop];
+      }
+    });
+    req[NEXT_REQUEST_META] = metaProxy;
     const resProxy = nextResponseProxy(res, requestContext);
     const nextHandlerPromise = nextHandler(req, resProxy).catch((error) => {
       getLogger().withError(error).error("next handler error");

package/dist/run/handlers/tags-handler.cjs

@@ -28,7 +28,7 @@ module.exports = __toCommonJS(tags_handler_exports);
 
 // package.json
 var name = "@edgeone/opennextjs-pages";
-var version = "0.2.2";
+var version = "0.2.3";
 
 // src/run/handlers/tags-handler.cts
 var import_request_context = require("./request-context.cjs");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@edgeone/opennextjs-pages",
-  "version": "0.2.2",
+  "version": "0.2.3",
   "description": "",
   "main": "./dist/index.js",
   "type": "module",