@siddharatha/adapter-node-rolldown 1.0.3 → 1.0.7

package/files/handler.js

@@ -1,16 +1,27 @@
 import 'SHIMS';
 import { Server } from 'SERVER';
 import { manifest } from 'MANIFEST';
+import { getRequest, setResponse } from '@sveltejs/kit/node';
 
 export const server = new Server(manifest);
 
 await server.init({ env: process.env });
 
 export const handler = async (req, res) => {
+    // Convert Node.js request to Web API Request
+    const request = await getRequest({
+        request: req,
+        base: `${req.socket.encrypted ? 'https' : 'http'}://${req.headers.host}`
+    });
+
     // Let SvelteKit handle the request
-    return server.respond(req, res, {
+    const response = await server.respond(request, {
         getClientAddress() {
             return req.headers['x-forwarded-for']?.split(',')[0] || req.socket.remoteAddress;
-        }
+        },
+        platform: { req }
     });
+
+    // Write response back to Node.js response
+    await setResponse(res, response);
 };

package/files/index.js

@@ -1,217 +1,46 @@
-import { createServer } from 'node:http';
 import polka from 'polka';
-import { config } from 'ENV';
-import { initTelemetry, shutdownTelemetry } from 'TELEMETRY';
-import { createCompressionMiddleware, createStaticMiddleware, createBodyParser } from 'MIDDLEWARES';
+import sirv from 'sirv';
 import { handler } from 'HANDLER';
 
-// WebSocket support
-let wss = null;
-if (config.websocket.enabled) {
-    const { WebSocketServer } = await import('ws');
-    wss = WebSocketServer;
-}
-
-// Track server state
-let isShuttingDown = false;
-let server = null;
-let wsServer = null;
-
-// Export for instrumentation support
-export const path = '/';
-export let port = config.port;
-export let host = config.host;
-export { server };
-
-/**
- * Initialize and start the server
- */
-async function start() {
-    console.log('Starting SvelteKit high-performance server...');
-
-    // Initialize OpenTelemetry first (for request tracing)
-    await initTelemetry();
-
-    // Create HTTP server
-    server = createServer();
-
-    // Configure server performance settings
-    server.keepAliveTimeout = config.keepAliveTimeout;
-    server.headersTimeout = config.headersTimeout;
-    if (config.maxRequestsPerSocket) {
-        server.maxRequestsPerSocket = config.maxRequestsPerSocket;
-    }
-
-    // Create Polka app
-    const app = polka({ server });
-
-    // Health check endpoints (before other middleware)
-    if (config.healthCheck.enabled) {
-        app.get('/health', (req, res) => {
-            if (isShuttingDown) {
-                res.writeHead(503, { 'Content-Type': 'text/plain' });
-                res.end('Shutting down');
-                return;
-            }
-            res.writeHead(200, { 'Content-Type': 'text/plain' });
-            res.end('OK');
-        });
-
-        app.get('/readiness', async (req, res) => {
-            if (isShuttingDown) {
-                res.writeHead(503, { 'Content-Type': 'application/json' });
-                res.end(JSON.stringify({ status: 'not ready', reason: 'shutting down' }));
-                return;
-            }
-
-            // Add custom readiness checks here (database, cache, etc.)
-            res.writeHead(200, { 'Content-Type': 'application/json' });
-            res.end(JSON.stringify({ status: 'ready' }));
-        });
-    }
-
-    // Apply compression middleware
-    app.use(createCompressionMiddleware());
-
-    // Apply body parser
-    app.use(createBodyParser());
-
-    // Serve prerendered pages and static assets
-    app.use(createStaticMiddleware('client', true));
-    app.use(createStaticMiddleware('prerendered', false));
-
-    // Handle all other requests with SvelteKit
-    app.use((req, res) => {
-        // Convert Polka request to format expected by SvelteKit
-        handler(req, res);
-    });
-
-    // Initialize WebSocket server if enabled
-    if (config.websocket.enabled && wss) {
-        wsServer = new wss({
-            server,
-            path: config.websocket.path
-        });
-
-        wsServer.on('connection', (ws, req) => {
-            console.log(`WebSocket connection established: ${req.url}`);
-
-            ws.on('message', (data) => {
-                // Handle WebSocket messages
-                // You can add custom logic here or expose via hooks
-                try {
-                    const message = JSON.parse(data.toString());
-                    console.log('WebSocket message:', message);
-
-                    // Echo back for now (customize as needed)
-                    ws.send(JSON.stringify({ type: 'echo', data: message }));
-                } catch (error) {
-                    console.error('WebSocket message error:', error);
-                    ws.send(JSON.stringify({ type: 'error', message: 'Invalid message format' }));
-                }
-            });
-
-            ws.on('close', () => {
-                console.log('WebSocket connection closed');
-            });
-
-            ws.on('error', (error) => {
-                console.error('WebSocket error:', error);
-            });
-
-            // Send welcome message
-            ws.send(JSON.stringify({ type: 'connected', message: 'WebSocket connected' }));
-        });
-
-        console.log(`WebSocket server enabled on path: ${config.websocket.path}`);
-    }
-
-    // Start listening
-    server.listen(config.port, config.host, () => {
-        console.log(`\n✓ Server running on http://${config.host}:${config.port}`);
-        console.log(`  - Compression: ${config.compression ? 'enabled' : 'disabled'}`);
-        console.log(`  - WebSocket: ${config.websocket.enabled ? `enabled (${config.websocket.path})` : 'disabled'}`);
-        console.log(`  - OpenTelemetry: ${config.telemetry.enabled ? 'enabled' : 'disabled'}`);
-        console.log(`  - Health checks: ${config.healthCheck.enabled ? 'enabled (/health, /readiness)' : 'disabled'}`);
-        console.log(`  - Body limit: ${config.bodyLimit}`);
-        console.log('');
-    });
-}
-
-/**
- * Graceful shutdown handler
- */
-async function gracefulShutdown(signal) {
-    if (isShuttingDown) {
-        console.log('Shutdown already in progress...');
-        return;
-    }
-
-    isShuttingDown = true;
-    console.log(`\n${signal} received, starting graceful shutdown...`);
-
-    // Set a timeout to force shutdown
-    const forceShutdownTimer = setTimeout(() => {
-        console.error('Forced shutdown after timeout');
-        process.exit(1);
-    }, config.gracefulShutdownTimeout);
-
-    try {
-        // Stop accepting new connections
-        if (server) {
-            await new Promise((resolve) => {
-                server.close(() => {
-                    console.log('✓ HTTP server closed');
-                    resolve();
-                });
-            });
-        }
-
-        // Close WebSocket connections
-        if (wsServer) {
-            console.log('Closing WebSocket connections...');
-            wsServer.clients.forEach((ws) => {
-                ws.close(1001, 'Server shutting down');
-            });
-
-            await new Promise((resolve) => {
-                wsServer.close(() => {
-                    console.log('✓ WebSocket server closed');
-                    resolve();
-                });
-            });
-        }
-
-        // Shutdown OpenTelemetry and flush traces
-        await shutdownTelemetry();
-
-        clearTimeout(forceShutdownTimer);
-        console.log('✓ Graceful shutdown complete');
-        process.exit(0);
-    } catch (error) {
-        console.error('Error during shutdown:', error);
-        clearTimeout(forceShutdownTimer);
-        process.exit(1);
+const app = polka();
+
+// Serve static assets
+app.use(sirv('client', {
+    etag: true,
+    maxAge: 31536000,
+    immutable: true,
+    gzip: true,
+    brotli: true
+}));
+
+// Serve prerendered pages if they exist
+try {
+    const { existsSync } = await import('node:fs');
+    if (existsSync('prerendered')) {
+        app.use(sirv('prerendered', {
+            etag: true,
+            maxAge: 0
+        }));
     }
+} catch (e) {
+    // Skip if prerendered doesn't exist
 }
 
-// Register shutdown handlers
-process.on('SIGTERM', () => gracefulShutdown('SIGTERM'));
-process.on('SIGINT', () => gracefulShutdown('SIGINT'));
+// Handle all SvelteKit requests
+app.use(handler);
 
-// Handle uncaught errors
-process.on('uncaughtException', (error) => {
-    console.error('Uncaught exception:', error);
-    gracefulShutdown('UNCAUGHT_EXCEPTION');
-});
+// Get port and host from environment
+const PORT = parseInt(process.env.PORT || '3000', 10);
+const HOST = process.env.HOST || '0.0.0.0';
 
-process.on('unhandledRejection', (reason, promise) => {
-    console.error('Unhandled rejection at:', promise, 'reason:', reason);
-    gracefulShutdown('UNHANDLED_REJECTION');
+// Start server
+app.listen(PORT, HOST, () => {
+    const displayHost = HOST === '0.0.0.0' ? 'localhost' : HOST;
+    console.log(`\n✓ Server running on http://${displayHost}:${PORT}\n`);
 });
 
-// Start the server
-start().catch((error) => {
-    console.error('Failed to start server:', error);
-    process.exit(1);
-});
+// Export for instrumentation
+export const path = '/';
+export const host = HOST;
+export const port = PORT;
+export const server = app.server;

package/index.js

@@ -9,19 +9,8 @@ const files = fileURLToPath(new URL('./files', import.meta.url).href);
  * @property {string} [out='build'] - Output directory
  * @property {boolean} [precompress=true] - Pre-compress static assets
  * @property {string} [envPrefix=''] - Prefix for environment variables
- * @property {boolean} [compression=true] - Enable runtime compression
- * @property {number} [compressionLevel=6] - Compression level (1-9)
- * @property {string} [bodyLimit='10mb'] - Body parser size limit
- * @property {boolean} [websocket=true] - Enable WebSocket support
- * @property {string} [websocketPath='/ws'] - WebSocket endpoint path
- * @property {boolean} [telemetry=true] - Enable OpenTelemetry
- * @property {object} [telemetryConfig={}] - Additional telemetry configuration
- * @property {number} [telemetrySampleRate=1.0] - Sampling rate (0.0-1.0)
- * @property {boolean} [healthCheck=true] - Enable health check endpoints
- * @property {number} [gracefulShutdownTimeout=30000] - Graceful shutdown timeout (ms)
  * @property {boolean} [polyfill=true] - Inject global polyfills
- * @property {string[]|((pkg: any) => string[])} [external] - External packages to exclude from bundle. Can be array of package names or function that receives package.json and returns array
- * @property {boolean} [bundleAll=false] - Bundle all dependencies (ignore package.json dependencies)
+ * @property {string[]|((pkg: any) => string[])} [external] - External packages to exclude from bundle
  * @property {object} [rolldownOptions={}] - Additional rolldown configuration options
  */
 
@@ -30,23 +19,13 @@ const files = fileURLToPath(new URL('./files', import.meta.url).href);
  * @param {AdapterOptions} options
  */
 export default function (options = {}) {
+    console.log('Using @siddharatha/adapter-node-rolldown v1.0.6 at 15 jan 11:58');
     const {
         out = 'build',
         precompress = true,
         envPrefix = '',
-        compression = true,
-        compressionLevel = 6,
-        bodyLimit = '1000mb',
-        websocket = true,
-        websocketPath = '/ws',
-        telemetry = true,
-        telemetryConfig = {},
-        telemetrySampleRate = 1.0,
-        healthCheck = true,
-        gracefulShutdownTimeout = 30000,
         polyfill = true,
         external,
-        bundleAll = false,
         rolldownOptions = {}
     } = options;
 
@@ -109,16 +88,36 @@ export default function (options = {}) {
             ];
 
             // Determine external packages
-            let externalPackages = [];
-            if (!bundleAll) {
-                if (typeof external === 'function') {
-                    externalPackages = external(pkg);
-                } else if (Array.isArray(external)) {
-                    externalPackages = external;
-                } else {
-                    // Default: use package.json dependencies
-                    externalPackages = Object.keys(pkg.dependencies || {});
-                }
+            // Always include runtime dependencies and user dependencies
+            const runtimeDeps = ['polka', 'sirv', '@polka/url'];
+
+            // OpenTelemetry packages have CommonJS/require issues when bundled as ESM
+            // Always mark them as external
+            const otelPackages = [
+                '@opentelemetry/api',
+                '@opentelemetry/sdk-node',
+                '@opentelemetry/auto-instrumentations-node',
+                '@opentelemetry/exporter-trace-otlp-http',
+                '@opentelemetry/exporter-trace-otlp-grpc',
+                '@opentelemetry/exporter-metrics-otlp-http',
+                '@opentelemetry/exporter-metrics-otlp-grpc',
+                '@opentelemetry/otlp-exporter-base',
+                '@opentelemetry/resources',
+                '@opentelemetry/semantic-conventions',
+                '@opentelemetry/core',
+                '@opentelemetry/instrumentation',
+                'import-in-the-middle'
+            ];
+
+            let externalPackages = [...runtimeDeps, ...otelPackages];
+
+            if (typeof external === 'function') {
+                externalPackages = [...externalPackages, ...external(pkg)];
+            } else if (Array.isArray(external)) {
+                externalPackages = [...externalPackages, ...external];
+            } else {
+                // Default: use package.json dependencies
+                externalPackages = [...externalPackages, ...Object.keys(pkg.dependencies || {})];
             }
 
             // Combine builtins with external packages
@@ -136,6 +135,7 @@ export default function (options = {}) {
             const bundle = await rolldown({
                 input,
                 external: externalPatterns,
+                platform: 'node',
                 resolve: {
                     conditionNames: ['node', 'import'],
                     ...rolldownOptions.resolve
@@ -148,33 +148,57 @@ export default function (options = {}) {
                 dir: `${out}/server`,
                 format: 'esm',
                 sourcemap: true,
-                chunkFileNames: 'chunks/[name]-[hash].js'
+                chunkFileNames: 'chunks/[name]-[hash].js',
+                minify: false,
+                keepNames: true
             });
 
-            builder.copy(files, out, {
+            // Now copy and bundle the runtime files
+            builder.copy(files, `${tmp}/runtime`, {
                 replace: {
-                    ENV: './env.js',
                     HANDLER: './handler.js',
                     MANIFEST: './server/manifest.js',
                     SERVER: './server/index.js',
                     SHIMS: './shims.js',
-                    MIDDLEWARES: './middlewares.js',
-                    TELEMETRY: './telemetry.js',
                     ENV_PREFIX: JSON.stringify(envPrefix),
-                    COMPRESSION_ENABLED: JSON.stringify(compression),
-                    COMPRESSION_LEVEL: JSON.stringify(compressionLevel),
-                    BODY_LIMIT: JSON.stringify(bodyLimit),
-                    WEBSOCKET_ENABLED: JSON.stringify(websocket),
-                    WEBSOCKET_PATH: JSON.stringify(websocketPath),
-                    TELEMETRY_ENABLED: JSON.stringify(telemetry),
-                    TELEMETRY_CONFIG: JSON.stringify(telemetryConfig),
-                    TELEMETRY_SAMPLE_RATE: JSON.stringify(telemetrySampleRate),
-                    HEALTH_CHECK_ENABLED: JSON.stringify(healthCheck),
-                    GRACEFUL_SHUTDOWN_TIMEOUT: JSON.stringify(gracefulShutdownTimeout),
                     POLYFILL: JSON.stringify(polyfill)
                 }
             });
 
+            // Bundle the runtime files (second pass)
+            // Mark the server files as external since they're already bundled
+            const runtimeExternalPatterns = [
+                ...externalPatterns,
+                /^\.\/server\//  // Server files are already bundled, keep them external
+            ];
+
+            const runtimeBundle = await rolldown({
+                input: {
+                    index: `${tmp}/runtime/index.js`
+                },
+                external: runtimeExternalPatterns,
+                platform: 'node',
+                resolve: {
+                    conditionNames: ['node', 'import'],
+                    modulePaths: [
+                        fileURLToPath(new URL('./node_modules', import.meta.url)),
+                        ...(rolldownOptions.resolve?.modulePaths || [])
+                    ],
+                    ...rolldownOptions.resolve
+                },
+                cwd: process.cwd(),
+                ...rolldownOptions
+            });
+
+            await runtimeBundle.write({
+                dir: `${out}`,
+                format: 'esm',
+                sourcemap: true,
+                chunkFileNames: 'chunks/[name]-[hash].js',
+                minify: false,
+                keepNames: true
+            });
+
             // Support for instrumentation
             if (builder.hasServerInstrumentationFile?.()) {
                 builder.instrument?.({
@@ -188,36 +212,28 @@ export default function (options = {}) {
 
             builder.log.minor('Generating package.json');
 
-            // Required runtime dependencies for the adapter
-            const adapterDeps = {
+            // Collect all user dependencies (both dependencies and devDependencies)
+            const allUserDeps = {
+                ...(pkg.dependencies || {}),
+                ...(pkg.devDependencies || {})
+            };
+
+            // Include adapter runtime dependencies + all user dependencies
+            const finalDeps = {
                 '@polka/url': '^1.0.0-next.28',
                 'polka': '^0.5.2',
                 'sirv': '^3.0.2',
-                'compression': '^1.7.4'
+                ...(pkg.dependencies || {})
             };
 
-            // Optional dependencies based on configuration
-            if (websocket) {
-                adapterDeps['ws'] = '^8.16.0';
-            }
-
-            if (telemetry) {
-                Object.assign(adapterDeps, {
-                    '@opentelemetry/sdk-node': '0.48.0',
-                    '@opentelemetry/auto-instrumentations-node': '0.41.0',
-                    '@opentelemetry/exporter-trace-otlp-http': '0.48.0',
-                    '@opentelemetry/exporter-trace-otlp-grpc': '0.48.0',
-                    '@opentelemetry/resources': '1.21.0',
-                    '@opentelemetry/semantic-conventions': '1.21.0',
-                    '@opentelemetry/api': '1.7.0',
-                    'import-in-the-middle': '^2.0.3'
-                });
+            // Add OpenTelemetry packages if they're used (from devDependencies or dependencies)
+            for (const otelPkg of otelPackages) {
+                if (allUserDeps[otelPkg] && !finalDeps[otelPkg]) {
+                    finalDeps[otelPkg] = allUserDeps[otelPkg];
+                }
             }
 
-            // Merge user's production dependencies with adapter dependencies
-            // This ensures packages like aws-sdk, dynamodb, etc. are installed at runtime
-            const userDeps = pkg.dependencies || {};
-            const finalDeps = { ...userDeps, ...adapterDeps };
+            builder.log.info(`Including ${Object.keys(finalDeps).length} dependencies in output package.json`);
 
             writeFileSync(
                 `${out}/package.json`,
@@ -227,9 +243,6 @@ export default function (options = {}) {
                         version: pkg.version || '1.0.0',
                         type: 'module',
                         main: './index.js',
-                        engines: {
-                            node: pkg.engines?.node || '>=24.12.0'
-                        },
                         dependencies: finalDeps
                     },
                     null,

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@siddharatha/adapter-node-rolldown",
-    "version": "1.0.3",
+    "version": "1.0.7",
     "description": "High-performance SvelteKit adapter for Node.js with Polka, WebSockets, and OpenTelemetry",
     "type": "module",
     "exports": {
@@ -11,9 +11,6 @@
         "index.js",
         "index.d.ts"
     ],
-    "engines": {
-        "node": ">=21.0.0"
-    },
     "scripts": {
         "test": "echo \"Error: no test specified\" && exit 1"
     },
@@ -38,6 +35,19 @@
         "@sveltejs/kit": "^2.4.0"
     },
     "devDependencies": {
-        "@sveltejs/kit": "^2.4.0"
+        "@sveltejs/kit": "^2.4.0",
+        "@polka/url": "^1.0.0-next.28",
+        "polka": "^0.5.2",
+        "sirv": "^3.0.2",
+        "compression": "^1.7.4",
+        "ws": "^8.16.0",
+        "@opentelemetry/sdk-node": "0.48.0",
+        "@opentelemetry/auto-instrumentations-node": "0.41.0",
+        "@opentelemetry/exporter-trace-otlp-http": "0.48.0",
+        "@opentelemetry/exporter-trace-otlp-grpc": "0.48.0",
+        "@opentelemetry/resources": "1.21.0",
+        "@opentelemetry/semantic-conventions": "1.21.0",
+        "@opentelemetry/api": "1.7.0",
+        "import-in-the-middle": "^2.0.3"
     }
 }