@edgeone/opennextjs-pages 0.0.6 → 0.0.7

package/dist/build/content/server.js

@@ -191,6 +191,16 @@ var copyNextDependencies = async (ctx) => {
     );
   }
   await Promise.all(promises);
+  const packageJsonPath = join(ctx.serverHandlerDir, "package.json");
+  if (existsSync(packageJsonPath)) {
+    try {
+      const packageJsonContent = JSON.parse(await readFile(packageJsonPath, "utf-8"));
+      packageJsonContent.type = "module";
+      await writeFile(packageJsonPath, JSON.stringify(packageJsonContent, null, 2));
+    } catch (error) {
+      console.warn("Warning: Failed to update package.json with ES module type:", error);
+    }
+  }
   const serverHandlerRequire = createRequire(posixJoin(ctx.serverHandlerDir, ":internal:"));
   if (ctx.nextVersion) {
     await patchNextModules(ctx, ctx.nextVersion, serverHandlerRequire.resolve);

package/dist/build/functions/server.js

@@ -98,25 +98,20 @@ var getHandlerFile = async (ctx) => {
   const templateVariables = {
     "{{useRegionalBlobs}}": ctx.useRegionalBlobs.toString()
   };
-  let runtime_shim = "";
-  const getRuntimeShim = ctx.getRuntimeShim;
-  if (getRuntimeShim) {
-    runtime_shim = getRuntimeShim();
-  }
   if (ctx.relativeAppDir.length !== 0) {
     const template2 = await readFile(join(templatesDir, "handler-monorepo.tmpl.js"), "utf-8");
     console.log("ctx.lambdaWorkingDirectory", ctx.lambdaWorkingDirectory);
     console.log("ctx.nextServerHandler", ctx.nextServerHandler);
     templateVariables["{{cwd}}"] = posixJoin(ctx.lambdaWorkingDirectory);
     templateVariables["{{nextServerHandler}}"] = posixJoin(ctx.nextServerHandler);
-    return applyTemplateVariables(runtime_shim + template2, templateVariables);
+    return applyTemplateVariables(template2, templateVariables);
   }
   const template = await readFile(join(templatesDir, "handler.tmpl.js"), "utf-8");
-  return applyTemplateVariables(runtime_shim + template, templateVariables);
+  return applyTemplateVariables(template, templateVariables);
 };
 var writeHandlerFile = async (ctx) => {
   const handler = await getHandlerFile(ctx);
-  await writeFile(join(ctx.serverHandlerRootDir, `index.mjs`), handler);
+  await writeFile(join(ctx.serverHandlerRootDir, `handler.js`), handler);
 };
 var clearStaleServerHandlers = async (ctx) => {
   await rm(ctx.serverFunctionsDir, { recursive: true, force: true });

package/dist/build/routes.js

@@ -97,27 +97,17 @@ var createRouteMeta = async (ctx) => {
     path: path2,
     ...config
   }));
-  const edgeOneDir = path.join(process.cwd(), ".edgeone");
-  if (!fs.existsSync(edgeOneDir)) {
-    fs.mkdirSync(edgeOneDir, { recursive: true });
+  const serverHandlerDir = ctx.serverHandlerDir;
+  if (!fs.existsSync(serverHandlerDir)) {
+    fs.mkdirSync(serverHandlerDir, { recursive: true });
   }
-  const metaFilePath = path.join(edgeOneDir, "meta.json");
-  let existingMetaData = {};
-  if (fs.existsSync(metaFilePath)) {
-    try {
-      const existingContent = fs.readFileSync(metaFilePath, "utf-8");
-      existingMetaData = JSON.parse(existingContent);
-    } catch (error) {
-      console.warn("Failed to parse existing meta.json:", error);
-    }
-  }
-  const mergedMetaData = {
-    ...existingMetaData,
+  const metaFilePath = path.join(serverHandlerDir, "meta.json");
+  const metaData = {
     nextRoutes: routesArray
   };
   fs.writeFileSync(
     metaFilePath,
-    JSON.stringify(mergedMetaData, null, 2),
+    JSON.stringify(metaData, null, 2),
     "utf-8"
   );
 };

package/dist/build/templates/handler-monorepo.tmpl.js

@@ -1,4 +1,3 @@
-import { createServer } from 'http';
 import {
   createRequestContext,
   runWithRequestContext,
@@ -6,151 +5,19 @@ import {
 import { getTracer } from './{{cwd}}/.edgeone/dist/run/handlers/tracer.cjs'
 import * as serverHandler from './{{cwd}}/.edgeone/dist/run/handlers/server.js'
 
-
 process.chdir('./{{cwd}}')
 
 // Set feature flag for regional blobs
 process.env.USE_REGIONAL_BLOBS = '{{useRegionalBlobs}}'
 
-
-async function handleResponse(res, response, passHeaders = {}) {
-  const startTime = Date.now();
-  
-  // 没有响应 - 404 拦截
-  if (!response) {
-    const requestId = passHeaders['functions-request-id'] || '';
-    res.writeHead(404, {
-      'Functions-Request-Id': requestId,
-      'eo-pages-inner-scf-status': '404',
-      'eo-pages-inner-status-intercept': 'true'
-    });
-    res.end(JSON.stringify({
-      error: "Not Found",
-      message: "The requested path does not exist"
-    }));
-    const endTime = Date.now();
-    console.log(`Pages response status: 404`);
-    return;
-  }
-
-  try {
-    if (response instanceof Response) {
-      const requestId = passHeaders['functions-request-id'] || '';
-      const responseStatus = response.status;
-      
-      const headers = Object.fromEntries(response.headers);
-      Object.assign(headers, passHeaders);
-      
-      // 添加状态码区分的 headers
-      headers['Functions-Request-Id'] = requestId;
-      
-      // 如果 Response 中已经设置了，使用它的值；否则使用 responseStatus
-      if (!headers['eo-pages-inner-scf-status']) {
-        headers['eo-pages-inner-scf-status'] = String(responseStatus);
-      }
-      
-      // 如果 Response 中已经设置了，使用它的值；否则默认为 false
-      if (!headers['eo-pages-inner-status-intercept']) {
-        headers['eo-pages-inner-status-intercept'] = 'false';
-      }
-      
-      if (response.headers.get('eop-client-geo')) {
-        // 删除 eop-client-geo 头部
-        response.headers.delete('eop-client-geo');
-      }
-      // 处理 set-cookie 头部
-      if (response.headers.has('set-cookie')) {
-        const cookieArr = response.headers.getSetCookie();
-       
-        headers['set-cookie'] = cookieArr;
-      }
-      // 检查是否是流式响应
-      const isStream = response.body && (
-        response.headers.get('content-type')?.includes('text/event-stream') ||
-        response.headers.get('transfer-encoding')?.includes('chunked') ||
-        response.body instanceof ReadableStream ||
-        typeof response.body.pipe === 'function' ||
-        response.headers.get('x-content-type-stream') === 'true'
-      );
-
-      if (isStream) {
-        // 设置流式响应所需的头部
-        const streamHeaders = {
-          ...headers
-        };
-
-        if (response.headers.get('content-type')?.includes('text/event-stream')) {
-          streamHeaders['Content-Type'] = 'text/event-stream';
-        }
-
-        res.writeHead(response.status, streamHeaders);
-
-        if (typeof response.body.pipe === 'function') {
-          response.body.pipe(res);
-        } else {
-          const reader = response.body.getReader();
-          try {
-            while (true) {
-              const { done, value } = await reader.read();
-              if (done) break;
-              
-              if (value instanceof Uint8Array || Buffer.isBuffer(value)) {
-                res.write(value);
-              } else {
-                const chunk = new TextDecoder().decode(value);
-                res.write(chunk);
-              }
-            }
-          } finally {
-            reader.releaseLock();
-            res.end();
-          }
-        }
-      } else {
-        // 普通响应
-        res.writeHead(response.status, headers);
-        const body = await response.text();
-        res.end(body);
-      }
-    } else {
-      // 非 Response 对象，直接返回 JSON
-      const requestId = passHeaders['functions-request-id'] || '';
-      res.writeHead(200, {
-        'Content-Type': 'application/json',
-        'Functions-Request-Id': requestId,
-        'eo-pages-inner-scf-status': '200',
-        'eo-pages-inner-status-intercept': 'false'
-      });
-      res.end(JSON.stringify(response));
-    }
-  } catch (error) {
-    // 用户函数内部错误 内部502 - 拦截
-    const requestId = passHeaders['functions-request-id'] || '';
-    res.writeHead(502, {
-      'Functions-Request-Id': requestId,
-      'eo-pages-inner-scf-status': '502',
-      'eo-pages-inner-status-intercept': 'true'
-    });
-    res.end(JSON.stringify({
-      error: "Internal Server Error",
-      message: error.message
-    }));
-  } finally {
-    const endTime = Date.now();
-    console.log(`Pages response status: ${response?.status || 'unknown'}`);
-  }
-}
-
-
 let cachedHandler
-export default async function eoHandler (req, context) {
+export default async function handler(req, context = {}) {
   const requestContext = createRequestContext(req, context)
   const tracer = getTracer()
 
   const handlerResponse = await runWithRequestContext(requestContext, () => {
     return tracer.withActiveSpan('Next.js Server Handler', async (span) => {
       if (!cachedHandler) {
-        // const { default: handler } = await import('{{nextServerHandler}}')
         cachedHandler = serverHandler.default
       }
       const response = await cachedHandler(req, context, span, requestContext)
@@ -158,117 +25,14 @@ export default async function eoHandler (req, context) {
     })
   })
 
+  if (requestContext.serverTiming) {
+    handlerResponse.headers.set('server-timing', requestContext.serverTiming);
+  }
+
   return handlerResponse
 }
 
-
 export const config = {
   path: '/*',
   preferStatic: true,
-};
-
-const port = 9000;
-
-// 实时流转换函数
-function createReadableStreamFromRequest(req) {
-  return new ReadableStream({
-    start(controller) {
-      req.on('data', chunk => {
-        // 将Buffer转换为Uint8Array
-        const uint8Array = new Uint8Array(chunk);
-        controller.enqueue(uint8Array);
-      });
-      
-      req.on('end', () => {
-        controller.close();
-      });
-      
-      req.on('error', error => {
-        controller.error(error);
-      });
-    },
-    
-    cancel() {
-      // 清理资源
-      req.destroy();
-    }
-  });
-}
-
-const server = createServer(async (req, res) => {
-  try {
-    const requestStartTime = Date.now();
-  
-    // 构造 handler 需要的 req 对象（可根据需要扩展）
-    // 用 eo-pages-host 替换 host
-    const originalHost = req.headers['eo-pages-host'] || req.headers['host'];
-    const handlerReq = {
-      ...req,
-      headers: {
-        ...req.headers,
-        'accept-encoding': 'identity',
-        'host': originalHost,
-      },
-      method: req.method,
-      url: req.url,
-    };
-
-    // 读取 body（如果有）
-    // let body = [];
-    // req.on('data', chunk => body.push(chunk));
-    // await new Promise(resolve => req.on('end', resolve));
-    // if (body.length > 0) {
-    //   handlerReq.body = Buffer.concat(body);
-    // }
-
-    handlerReq.body = createReadableStreamFromRequest(req);
-
-    const response = await eoHandler(handlerReq, {});
-
-    // response.headers.set('functions-request-id', req.headers['x-scf-request-id'] || '');
-
-    const requestEndTime = Date.now();
-    const url = new URL(req.url, `http://${req.headers.host}`);
-    let pathname = url.pathname;
-
-    if (pathname !== '/' && pathname.endsWith('/')) {
-      pathname = pathname.slice(0, -1);
-    }
-
-    let fullPath = '';
-    if (req.headers.host === 'localhost:9000') {
-      fullPath = pathname;
-    } else {
-      const host = req.headers['eo-pages-host'];
-      const xForwardedProto = req.headers['x-forwarded-proto']; 
-
-      fullPath = (xForwardedProto || 'https') + '://' + host + req.url;
-      
-      if (fullPath.endsWith('?')) {
-        fullPath = fullPath.slice(0, -1);
-      }
-    }
-
-    console.log(`Pages request path: ${fullPath}`);
-
-    await handleResponse(res, response, {
-      'functions-request-id': req.headers['x-scf-request-id'] || ''
-    });
-    return;
-  } catch (error) {
-    console.log(`Pages response status: 502`);
-    // 用户函数内部错误 内部502 - 拦截
-    const requestId = req.headers['x-scf-request-id'] || '';
-    res.statusCode = 502;
-    res.setHeader('Content-Type', 'text/html; charset=utf-8');
-    res.setHeader('Functions-Request-Id', requestId);
-    res.setHeader('eo-pages-inner-scf-status', '502');
-    res.setHeader('eo-pages-inner-status-intercept', 'true');
-    res.end('<html><body><h1>Error</h1><p>'+error.message+'</p></body></html>');
-  }
-});
-
-server.listen(port, () => {
-  console.log('Server is running on http://localhost:9000');
-});
-  
+};

package/dist/build/templates/handler.tmpl.js

@@ -1,5 +1,4 @@
 
-import { createServer } from 'http';
 import {
   createRequestContext,
   runWithRequestContext,
@@ -7,141 +6,8 @@ import {
 import serverHandler from './.edgeone/dist/run/handlers/server.js';
 import { getTracer } from './.edgeone/dist/run/handlers/tracer.cjs';
 
-
-  async function handleResponse(res, response, passHeaders = {}) {
-    const startTime = Date.now();
-    
-    // 没有响应 - 404 拦截
-    if (!response) {
-      const requestId = passHeaders['functions-request-id'] || '';
-      res.writeHead(404, {
-        'Functions-Request-Id': requestId,
-        'eo-pages-inner-scf-status': '404',
-        'eo-pages-inner-status-intercept': 'true'
-      });
-      res.end(JSON.stringify({
-        error: "Not Found",
-        message: "The requested path does not exist"
-      }));
-      const endTime = Date.now();
-      console.log(`Pages response status: 404`);
-      return;
-    }
-
-    try {
-      if (response instanceof Response) {
-        const requestId = passHeaders['functions-request-id'] || '';
-        const responseStatus = response.status;
-        
-        const headers = Object.fromEntries(response.headers);
-        Object.assign(headers, passHeaders);
-        
-        // 添加状态码区分的 headers
-        headers['Functions-Request-Id'] = requestId;
-        
-        // 如果 Response 中已经设置了，使用它的值；否则使用 responseStatus
-        if (!headers['eo-pages-inner-scf-status']) {
-          headers['eo-pages-inner-scf-status'] = String(responseStatus);
-        }
-        
-        // 如果 Response 中已经设置了，使用它的值；否则默认为 false
-        if (!headers['eo-pages-inner-status-intercept']) {
-          headers['eo-pages-inner-status-intercept'] = 'false';
-        }
-        
-        // 删除内部 header
-        if (response.headers.get('eop-client-geo')) {
-          response.headers.delete('eop-client-geo');
-        }
-        // 处理 set-cookie 头部
-        if (response.headers.has('set-cookie')) {
-          const cookieArr = response.headers.getSetCookie();
-          headers['set-cookie'] = cookieArr;
-        }
-        
-        // 检查是否是流式响应
-        const isStream = response.body && (
-          response.headers.get('content-type')?.includes('text/event-stream') ||
-          response.headers.get('transfer-encoding')?.includes('chunked') ||
-          response.body instanceof ReadableStream ||
-          typeof response.body.pipe === 'function' ||
-          response.headers.get('x-content-type-stream') === 'true'
-        );
-
-        if (isStream) {
-          // 设置流式响应所需的头部
-          const streamHeaders = {
-            ...headers
-          };
-
-          if (response.headers.get('content-type')?.includes('text/event-stream')) {
-            streamHeaders['Content-Type'] = 'text/event-stream';
-          }
-
-          res.writeHead(response.status, streamHeaders);
-
-          if (typeof response.body.pipe === 'function') {
-            response.body.pipe(res);
-          } else {
-            const reader = response.body.getReader();
-            try {
-              while (true) {
-                const { done, value } = await reader.read();
-                if (done) break;
-                
-                if (value instanceof Uint8Array || Buffer.isBuffer(value)) {
-                  res.write(value);
-                } else {
-                  const chunk = new TextDecoder().decode(value);
-                  res.write(chunk);
-                }
-              }
-            } finally {
-              reader.releaseLock();
-              // scf可能会立即冻结环境上下文，导致后续日志无法输出，通过延时来确保日志输出
-              setTimeout(() => {
-                res.end();
-              }, 1);
-            } 
-          }
-        } else {
-          // 普通响应
-          res.writeHead(response.status, headers);
-          const body = await response.text();
-          res.end(body);
-        }
-      } else {
-        // 非 Response 对象，直接返回 JSON
-        const requestId = passHeaders['functions-request-id'] || '';
-        res.writeHead(200, {
-          'Content-Type': 'application/json',
-          'Functions-Request-Id': requestId,
-          'eo-pages-inner-scf-status': '200',
-          'eo-pages-inner-status-intercept': 'false'
-        });
-        res.end(JSON.stringify(response));
-      }
-    } catch (error) {
-      // 用户函数内部错误 内部502 - 拦截
-      const requestId = passHeaders['functions-request-id'] || '';
-      res.writeHead(502, {
-        'Functions-Request-Id': requestId,
-        'eo-pages-inner-scf-status': '502',
-        'eo-pages-inner-status-intercept': 'true'
-      });
-      res.end(JSON.stringify({
-        error: "Internal Server Error",
-        message: error.message
-      }));
-    } finally { 
-      const endTime = Date.now();
-      console.log(`Pages response status: ${response?.status || 'unknown'}`);
-    }
-  }
-  
-
 process.env.USE_REGIONAL_BLOBS = 'true';
-export default async function handler(req, context) {
+export default async function handler(req, context = {}) {
   const requestContext = createRequestContext(req, context);
   const tracer = getTracer();
 
@@ -162,115 +28,4 @@ export default async function handler(req, context) {
 export const config = {
   path: '/*',
   preferStatic: true,
-};
-
-const port = 9000;
-
-// 实时流转换函数
-function createReadableStreamFromRequest(req) {
-  return new ReadableStream({
-    start(controller) {
-      req.on('data', chunk => {
-        // 将Buffer转换为Uint8Array
-        const uint8Array = new Uint8Array(chunk);
-        controller.enqueue(uint8Array);
-      });
-      
-      req.on('end', () => {
-        controller.close();
-      });
-      
-      req.on('error', error => {
-        controller.error(error);
-      });
-    },
-    
-    cancel() {
-      // 清理资源
-      req.destroy();
-    }
-  });
-}
-
-const server = createServer(async (req, res) => {
-  try {
-    const requestStartTime = Date.now();
-  
-    // 构造 handler 需要的 req 对象（可根据需要扩展）
-    // 用 eo-pages-host 替换 host
-    const originalHost = req.headers['eo-pages-host'] || req.headers['host'];
-    const handlerReq = {
-      ...req,
-      headers: {
-        ...req.headers,
-        'accept-encoding': 'identity',
-        'host': originalHost,
-      },
-      method: req.method,
-      url: req.url,
-    };
-
-    
-
-    // 读取 body（如果有）
-    // let body = [];
-    // req.on('data', chunk => body.push(chunk));
-    // await new Promise(resolve => req.on('end', resolve));
-    // if (body.length > 0) {
-    //   handlerReq.body = Buffer.concat(body);
-    // }
-
-    handlerReq.body = createReadableStreamFromRequest(req);
-
-    const response = await handler(handlerReq, {});
-
-    // 不要在这里设置 functions-request-id，避免重复
-    // response.headers.set('functions-request-id', req.headers['x-scf-request-id'] || '');
-    // const requestEndTime = Date.now();
-
-    // 解析请求路径
-    const url = new URL(req.url, `http://${req.headers.host}`);
-    let pathname = url.pathname;
-
-    if (pathname !== '/' && pathname.endsWith('/')) {
-      pathname = pathname.slice(0, -1);
-    }
-
-    let fullPath = '';
-    if (req.headers.host === 'localhost:9000') {
-      fullPath = pathname;
-    } else {
-      const host = req.headers['eo-pages-host'];
-      const xForwardedProto = req.headers['x-forwarded-proto']; 
-
-      fullPath = (xForwardedProto || 'https') + '://' + host + req.url;
-      
-      if (fullPath.endsWith('?')) {
-        fullPath = fullPath.slice(0, -1);
-      }
-    }
-
-    console.log(`Pages request path: ${fullPath}`);
-
-    // console.log(`Request processing time: ${requestEndTime - requestStartTime}ms`);
-    await handleResponse(res, response, {
-      'functions-request-id': req.headers['x-scf-request-id'] || ''
-    });
-    return;
-  } catch (error) {
-    console.log(`Pages response status: 502`);
-    // 用户函数内部错误 内部502 - 拦截
-    const requestId = req.headers['x-scf-request-id'] || '';
-    res.statusCode = 502;
-    res.setHeader('Content-Type', 'text/html; charset=utf-8');
-    res.setHeader('Functions-Request-Id', requestId);
-    res.setHeader('eo-pages-inner-scf-status', '502');
-    res.setHeader('eo-pages-inner-status-intercept', 'true');
-    res.end('<html><body><h1>Error</h1><p>'+error.message+'</p></body></html>');
-  }
-});
-
-server.listen(port, () => {
-  console.log('Server is running on http://localhost:9000');
-});
-  
+};

package/dist/index.js

@@ -35,9 +35,9 @@ var onBuild = async (options) => {
     // copyStaticAssets(ctx),
     copyStaticContent(ctx),
     copyPrerenderedContent(ctx),
-    createServerHandler(ctx)
+    createServerHandler(ctx),
+    createRouteMeta(ctx)
   ]);
-  createRouteMeta(ctx);
 };
 var onPostBuild = async (options) => {
   console.log("onPostBuild");

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.0.6";
+var version = "0.0.7";
 
 // 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.0.6",
+  "version": "0.0.7",
   "description": "",
   "main": "./dist/index.js",
   "type": "module",