@edgeone/nuxt-pages 1.0.2 → 1.0.3

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

@@ -205,7 +205,7 @@ export default async function handler(req, res, context) {
       });
 
       return new Response(response.body, {
-        status: response.statusCode,
+        status: response.status || response.statusCode,
         headers: response.headers
       });
     } catch (nitroError) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@edgeone/nuxt-pages",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "main": "./dist/index.js",
   "scripts": {
     "test": "ts-node src/test.ts",

package/dist/build/templates/nuxt-handler-backup.js

@@ -1,305 +0,0 @@
-import { resolve, dirname } from 'path';
-import { fileURLToPath } from 'url';
-import { readFileSync, existsSync, statSync } from 'fs';
-import { extname } from 'path';
-
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = dirname(__filename);
-
-// Static assets directory
-const ASSET_DIR = resolve(__dirname, '../assets');
-
-// MIME type mapping
-const MIME_TYPES = {
-  '.html': 'text/html; charset=utf-8',
-  '.js': 'application/javascript',
-  '.css': 'text/css',
-  '.json': 'application/json',
-  '.png': 'image/png',
-  '.jpg': 'image/jpeg',
-  '.jpeg': 'image/jpeg',
-  '.gif': 'image/gif',
-  '.svg': 'image/svg+xml',
-  '.ico': 'image/x-icon',
-  '.txt': 'text/plain',
-  '.xml': 'application/xml'
-};
-
-/**
- * Get the MIME type of a file
- */
-function getMimeType(filePath) {
-  const ext = extname(filePath).toLowerCase();
-  return MIME_TYPES[ext] || 'application/octet-stream';
-}
-
-/**
- * Handle HTTP response
- */
-async function handleResponse(response, req, res, context) {
-  if (!response) {
-    res.statusCode = 500;
-    res.setHeader('Content-Type', 'text/plain');
-    res.end('Server Error');
-    return;
-  }
-
-  // Ensure response.headers is a Headers object
-  if (!(response.headers instanceof Headers)) {
-    response.headers = new Headers(response.headers || {});
-  }
-  
-  // Correctly iterate over Headers object (using entries() method)
-  for (const [key, value] of response.headers.entries()) {
-    res.setHeader(key, value);
-  }
-
-  // Check if Content-Type already exists (case-insensitive)
-  const hasContentType = response.headers.has('content-type');
-  
-  // Only set default value if Content-Type is missing
-  if (!hasContentType) {
-    res.setHeader('Content-Type', 'text/html; charset=utf-8');
-  }
-  // try {
-  //   res.setHeader('functions-request-id', context.headers['x-scf-request-id']);
-  // } catch (error) {
-  //   console.error('Handle response error:', error);
-  // }
-
-  res.setHeader('from-server', 'true');
-
-  // Handle set-cookie header (special handling, as there may be multiple values)
-  if (response.headers.has('set-cookie')) {
-    const cookieArr = response.headers.getSetCookie();
-    res.setHeader('set-cookie', Array.isArray(cookieArr) ? cookieArr : [cookieArr]);
-    // headers['set-cookie'] = Array.isArray(cookieArr) ? cookieArr : [cookieArr];
-  }
-
-  res.statusCode = response.status || response.statusCode || 200;
-  if(Buffer.isBuffer(response.body)) {
-    res.end(response.body);
-  } else if(response.body && typeof response.body === 'object' && typeof response.body.getReader === 'function') {
-    const reader = response.body.getReader();
-    const chunks = [];
-    while (true) {
-      const { done, value } = await reader.read();
-      if (done) break;
-      chunks.push(Buffer.from(value));
-    }
-    res.end(Buffer.concat(chunks));
-  } else {
-    res.end(response.body || response._data || '');
-  }
-}
-
-/**
- * Lazy load Nitro application
- */
-let nitroApp = null;
-async function getNitroApp() {
-  if (!nitroApp) {
-    // Set environment variables to prevent automatic server startup
-    process.env.NITRO_PORT = '';
-    process.env.PORT = '';
-    
-    // Set correct static assets path
-    process.env.NITRO_PUBLIC_DIR = ASSET_DIR;
-    
-    const { {{USE_NITRO_APP_SYMBOL}}: useNitroApp } = await import('./chunks/nitro/nitro.mjs');
-    nitroApp = useNitroApp();
-  }
-  return nitroApp;
-}
-
-/**
- * Handle HTTP response
- */
-function handleResponse(response, event) {
-  if (!response) {
-    return {
-      statusCode: 500,
-      headers: { 'Content-Type': 'text/plain' },
-      body: 'Internal Server Error'
-    };
-  }
-
-  const headers = {};
-  
-  // Ensure response.headers is a Headers object
-  if (!(response.headers instanceof Headers)) {
-    response.headers = new Headers(response.headers || {});
-  }
-  
-  // Correctly iterate over Headers object (using entries() method)
-  for (const [key, value] of response.headers.entries()) {
-    headers[key] = value;
-  }
-
-  // Check if Content-Type already exists (case-insensitive)
-  const hasContentType = response.headers.has('content-type');
-  
-  // Only set default value if Content-Type is missing
-  if (!hasContentType) {
-    headers['Content-Type'] = 'text/html; charset=utf-8';
-  }
-
-  headers['from-server'] = 'true';
-  headers['functions-request-id'] = event.headers['x-scf-request-id'];
-
-  // Handle set-cookie header (special handling, as there may be multiple values)
-  if (response.headers.has('set-cookie')) {
-    const cookieArr = response.headers.getSetCookie();
-    headers['set-cookie'] = Array.isArray(cookieArr) ? cookieArr : [cookieArr];
-  }
-
-  return {
-    statusCode: response.status || response.statusCode || 200,
-    headers,
-    body: response.body || response._data || ''
-  };
-}
-
-/**
- * EdgeOne function handler
- */
-export async function handler(event) {
-  try {
-    const url = event.path || '/';
-    const method = event.httpMethod || event.method || 'GET';
-    const headers = event.headers || {};
-    const body = event.body || '';
-
-    // First try to handle static assets
-    if (method === 'GET') {
-      const staticResponse = handleStaticFile(url);
-      if (staticResponse) {
-        return staticResponse;
-      }
-    }
-
-    // Handle dynamic requests
-    const app = await getNitroApp();
-    
-    try {
-      const response = await app.localCall({
-        url,
-        method,
-        headers,
-        body
-      });
-
-      return handleResponse(response, event);
-    } catch (nitroError) {
-      // Handle Nitro static file read errors (prerender files not found)
-      // Check error and its cause property (H3Error may wrap actual error in cause)
-      const actualError = nitroError?.cause || nitroError;
-      const errorPath = actualError?.path || nitroError?.path;
-      const errorCode = actualError?.code || nitroError?.code;
-      
-      // If error is due to prerender static file not found, try dynamic rendering
-      if (errorCode === 'ENOENT' && 
-          errorPath && 
-          (errorPath.includes('/assets/') || errorPath.includes('assets/')) &&
-          (errorPath.includes('/index.html') || errorPath.includes('index.html'))) {
-        console.warn(`Prerender file not found: ${errorPath}, falling back to dynamic rendering for ${url}`);
-        
-        // If static file handling has been tried but file not found, should perform dynamic rendering
-        // Nitro should be able to handle dynamic routes, but if it still tries to read static files,
-        // it may be due to configuration issues. We throw an error directly to let user know to build or check configuration
-        throw new Error(`Prerender route ${url} not found. Make sure to run build first or configure routeRules correctly. Original error: ${actualError?.message || nitroError?.message}`);
-      }
-      
-      // Other errors are thrown directly
-      throw nitroError;
-    }
-  } catch (error) {
-    console.error('EdgeOne handler error:', error);
-    return {
-      statusCode: 500,
-      headers: { 'Content-Type': 'text/plain' },
-      body: `Internal Server Error: ${error.message}`
-    };
-  }
-}
-
-import('http').then(async (http) => {
-  const { createServer } = http;
-  // Dynamically import stream module to handle ReadableStream
-  await import('stream').then(({ Readable, pipeline }) => {
-    const server = createServer(async (req, res) => {
-      try {
-        const event = {
-          path: req.url,
-          httpMethod: req.method,
-          headers: req.headers,
-          body: ''
-        };
-
-        if (req.method !== 'GET' && req.method !== 'HEAD') {
-          const chunks = [];
-          for await (const chunk of req) {
-            chunks.push(chunk);
-          }
-          event.body = Buffer.concat(chunks).toString();
-        }
-
-        const result = await handler(event);
-
-        res.statusCode = result.statusCode;
-        // Object.entries(result.headers).forEach(([key, value]) => {
-        //   if(key === 'set-cookie') {
-            res.setHeader('set-cookie', Array.isArray(value) ? value[0].split(',') : value);
-        //   } else {
-        //     res.setHeader(key, value);
-        //   }
-        // });
-        // debug message
-        // res.setHeader('functions-request-id', req.headers['x-scf-request-id']);
-
-
-        // Handle response body: support Buffer, string, and ReadableStream
-        if (Buffer.isBuffer(result.body)) {
-          res.end(result.body);
-        } else if (result.body && typeof result.body === 'object' && typeof result.body.getReader === 'function') {
-          // Detect ReadableStream (Web Streams API)
-          try {
-            const nodeStream = Readable.fromWeb(result.body);
-            nodeStream.pipe(res);
-          } catch (streamError) {
-            console.error('Stream conversion error:', streamError);
-            // If conversion fails, try to read the entire stream
-            const reader = result.body.getReader();
-            const chunks = [];
-            try {
-              while (true) {
-                const { done, value } = await reader.read();
-                if (done) break;
-                chunks.push(Buffer.from(value));
-              }
-              res.end(Buffer.concat(chunks));
-            } catch (readError) {
-              console.error('Stream read error:', readError);
-              res.end();
-            }
-          }
-        } else {
-          // Handle string or other types
-          res.end(result.body || '');
-        }
-      } catch (error) {
-        console.error('Local server error:', error);
-        res.statusCode = 500;
-        res.setHeader('Content-Type', 'text/plain');
-        res.end(`Server Error: ${error.message}`);
-      }
-    });
-
-    const port = process.env.DEV_PORT || 9000;
-    server.listen(port, () => {
-      console.log(`EdgeOne development server running at http://localhost:${port}`);
-      console.log(`Static assets served from: ${ASSET_DIR}`);
-    });
-  });
-});
-

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

@@ -1,212 +0,0 @@
-// import { createServer } from 'http';
-// import {
-//   createRequestContext,
-//   runWithRequestContext,
-// } from './.edgeone/dist/run/handlers/request-context.cjs';
-// import { 
-//   createEdgeOneNuxtServerHandler,
-//   defaultEdgeOneNuxtConfig 
-// } from './.edgeone/dist/run/handlers/nuxt-server.cjs';
-// import { 
-//   createEdgeOneNuxtCacheHandler 
-// } from './.edgeone/dist/run/handlers/nuxt-cache.cjs';
-
-// // Initialize Nuxt server handler
-// const nuxtServerHandler = createEdgeOneNuxtServerHandler(defaultEdgeOneNuxtConfig);
-
-// async function handleResponse(res, response, passHeaders = {}) {
-//   const startTime = Date.now();
-  
-//   if (!response) {
-//     res.writeHead(404, { 'Content-Type': 'application/json' });
-//     res.end(JSON.stringify({
-//       error: "Not Found",
-//       message: "The requested path does not exist"
-//     }));
-//     console.log(`HandleResponse: 404 Not Found - ${Date.now() - startTime}ms`);
-//     return;
-//   }
-
-//   try {
-//     if (response instanceof Response) {
-//       const headers = Object.fromEntries(response.headers);
-//       Object.assign(headers, passHeaders);
-      
-//       // Handle set-cookie headers properly
-//       if (response.headers.has('set-cookie')) {
-//         const cookieArr = response.headers.getSetCookie();
-//         headers['set-cookie'] = cookieArr;
-//       }
-      
-//       res.writeHead(response.status, headers);
-      
-//       if (response.body) {
-//         const arrayBuffer = await response.arrayBuffer();
-//         res.end(Buffer.from(arrayBuffer));
-//       } else {
-//         res.end();
-//       }
-//     } else {
-//       // Handle non-Response objects
-//       res.writeHead(200, { 'Content-Type': 'application/json', ...passHeaders });
-//       res.end(JSON.stringify(response));
-//     }
-//   } catch (error) {
-//     console.error('Error in handleResponse:', error);
-//     res.writeHead(500, { 'Content-Type': 'application/json' });
-//     res.end(JSON.stringify({
-//       error: "Internal Server Error",
-//       message: error.message
-//     }));
-//   } finally {
-//     console.log(`HandleResponse: ${response?.status || 'unknown'} - ${Date.now() - startTime}ms`);
-//   }
-// }
-
-// // Enable regional blobs for EdgeOne
-// process.env.USE_REGIONAL_BLOBS = 'true';
-
-// export default async function handler(req, context) {
-//   const requestContext = createRequestContext(req, context);
-  
-//   // Initialize cache handler for this request
-//   const cacheHandler = createEdgeOneNuxtCacheHandler({
-//     maxMemoryCacheSize: 50 * 1024 * 1024, // 50MB
-//     revalidateOnStale: true
-//   });
-  
-//   // Add cache handler to request context
-//   requestContext.cacheHandler = cacheHandler;
-
-//   const handlerResponse = await runWithRequestContext(requestContext, async () => {
-//     try {
-//       // Convert Node.js request to Web API Request
-//       const url = new URL(req.url, `http://${req.headers.host}`);
-//       const method = req.method || 'GET';
-      
-//       let body = null;
-//       if (method !== 'GET' && method !== 'HEAD') {
-//         body = createReadableStreamFromRequest(req);
-//       }
-      
-//       const webRequest = new Request(url.toString(), {
-//         method,
-//         headers: req.headers,
-//         body
-//       });
-      
-//       // Handle request with Nuxt server handler
-//       return await nuxtServerHandler.handleRequest(webRequest, requestContext);
-//     } catch (error) {
-//       console.error('Error in Nuxt handler:', error);
-      
-//       return new Response(JSON.stringify({
-//         error: 'Internal Server Error',
-//         message: error.message,
-//         timestamp: new Date().toISOString()
-//       }), {
-//         status: 500,
-//         headers: {
-//           'Content-Type': 'application/json',
-//           'X-Handled-By': 'EdgeOne-Nuxt-Error'
-//         }
-//       });
-//     }
-//   });
-
-//   return handlerResponse;
-// }
-
-// export const config = {
-//   path: '/*',
-//   preferStatic: true,
-// };
-
-// // Development server configuration
-// const port = 9000;
-
-// // Convert Node.js request stream to Web API ReadableStream
-// function createReadableStreamFromRequest(req) {
-//   return new ReadableStream({
-//     start(controller) {
-//       req.on('data', chunk => {
-//         // Convert Buffer to Uint8Array
-//         const uint8Array = new Uint8Array(chunk);
-//         controller.enqueue(uint8Array);
-//       });
-      
-//       req.on('end', () => {
-//         controller.close();
-//       });
-      
-//       req.on('error', error => {
-//         controller.error(error);
-//       });
-//     },
-    
-//     cancel() {
-//       // Clean up resources
-//       req.destroy();
-//     }
-//   });
-// }
-
-// // Development server for local testing
-// // Start development server directly when running the script
-// const server = createServer(async (req, res) => {
-//   try {
-//     const response = await handler(req, { waitUntil: () => {} });
-//     await handleResponse(res, response);
-//   } catch (error) {
-//     console.error('Development server error:', error);
-//     res.writeHead(500, { 'Content-Type': 'application/json' });
-//     res.end(JSON.stringify({
-//       error: 'Development Server Error',
-//       message: error.message
-//     }));
-//   }
-// });
-
-// server.listen(port, () => {
-//   console.log(`Nuxt development server running on http://localhost:${port}`);
-// });
-
-// Ensure Nitro can read import.meta and env like in built index
-globalThis._importMeta_ = { url: import.meta.url, env: process.env };
-
-// Choose port
-process.env.NITRO_PORT = process.env.NITRO_PORT || '9000';
-process.env.PORT = process.env.PORT || process.env.NITRO_PORT;
-
-// Import and execute Nitro server (top-level code starts the server)
-const nitroModule = await import('./chunks/nitro/nitro.mjs');
-
-// Get useNitroApp (your build exports it as `k`)
-const useNitroApp = nitroModule.k || nitroModule.useNitroApp;
-if (!useNitroApp) {
-  console.error('useNitroApp not found in nitro module exports');
-  process.exit(1);
-}
-
-const nitroApp = useNitroApp();
-
-// Request interceptor
-nitroApp.hooks.hook('request', async (event) => {
-  const { req } = event.node;
-  console.log(`📥 [${new Date().toISOString()}] ${req.method} ${req.url}`);
-  console.log('📋 Request Headers:', req.headers);
-  // Example: mark request source
-  req.headers['x-intercepted-by'] = 'custom-hooks';
-});
-
-// Response interceptor
-nitroApp.hooks.hook('beforeResponse', async (event, response) => {
-  const { res } = event.node;
-  console.log(`📤 [${new Date().toISOString()}] Status: ${res.statusCode}`);
-  console.log('📋 Response Headers:', res.getHeaders());
-  // Example: add a custom header
-  res.setHeader('x-intercepted', 'true');
-  return response;
-});
-
-console.log('🔍 Request/Response interception enabled (run-with-hooks)');