@siddharatha/adapter-node-rolldown 1.0.9 → 1.1.3

package/index.js

@@ -1,38 +1,30 @@
-import { writeFileSync, readFileSync } from 'node:fs';
+import { readFileSync, writeFileSync } from 'node:fs';
 import { fileURLToPath } from 'node:url';
 import { rolldown } from 'rolldown';
 
-const files = fileURLToPath(new URL('./files', import.meta.url).href);
 
 /**
- * @typedef {Object} AdapterOptions
- * @property {string} [out='build'] - Output directory
- * @property {boolean} [precompress=true] - Pre-compress static assets
- * @property {string} [envPrefix=''] - Prefix for environment variables
- * @property {boolean} [polyfill=true] - Inject global polyfills
- * @property {string[]|((pkg: any) => string[])} [external] - External packages to exclude from bundle
- * @property {object} [rolldownOptions={}] - Additional rolldown configuration options
+ * @template T
+ * @template {keyof T} K
+ * @typedef {Partial<Omit<T, K>> & Required<Pick<T, K>>} PartialExcept
  */
 
 /**
- * High-performance SvelteKit adapter for Node.js
- * @param {AdapterOptions} options
+ * We use a custom `Builder` type here to support the minimum version of SvelteKit.
+ * @typedef {PartialExcept<import('@sveltejs/kit').Builder, 'log' | 'rimraf' | 'mkdirp' | 'config' | 'prerendered' | 'routes' | 'createEntries' | 'findServerAssets' | 'generateFallback' | 'generateEnvModule' | 'generateManifest' | 'getBuildDirectory' | 'getClientDirectory' | 'getServerDirectory' | 'getAppPath' | 'writeClient' | 'writePrerendered' | 'writePrerendered' | 'writeServer' | 'copy' | 'compress'>} Builder2_4_0
  */
-export default function (options = {}) {
-    const {
-        out = 'build',
-        precompress = true,
-        envPrefix = '',
-        polyfill = true,
-        external,
-        rolldownOptions = {}
-    } = options;
 
-    return {
-        name: '@sveltejs/adapter-node-rolldown',
+const files = fileURLToPath(new URL('./files', import.meta.url).href);
 
+/** @type {import('./index.js').default} */
+export default function (opts = {}) {
+    const { out = 'build', precompress = true, envPrefix = '', external, bundleAll = false, rolldownOptions = {} } = opts;
+
+    return {
+        name: '@sveltejs/adapter-node',
+        /** @param {Builder2_4_0} builder */
         async adapt(builder) {
-            const tmp = builder.getBuildDirectory('adapter-node-rolldown');
+            const tmp = builder.getBuildDirectory('adapter-node');
 
             builder.rimraf(out);
             builder.rimraf(tmp);
@@ -65,72 +57,29 @@ export default function (options = {}) {
 
             const pkg = JSON.parse(readFileSync('package.json', 'utf8'));
 
+            // determine external patterns for bundling
+            let externalPatterns;
+            if (bundleAll) {
+                externalPatterns = [];
+            } else if (external) {
+                externalPatterns = typeof external === 'function' ? external(pkg) : external;
+            } else {
+                externalPatterns = Object.keys(pkg.dependencies || {});
+            }
+
             /** @type {Record<string, string>} */
             const input = {
                 index: `${tmp}/index.js`,
                 manifest: `${tmp}/manifest.js`
             };
 
-            // Support for instrumentation files
             if (builder.hasServerInstrumentationFile?.()) {
                 input['instrumentation.server'] = `${tmp}/instrumentation.server.js`;
             }
 
-            // Node.js built-in modules (always external)
-            const builtins = [
-                'assert', 'async_hooks', 'buffer', 'child_process', 'cluster', 'console',
-                'constants', 'crypto', 'dgram', 'diagnostics_channel', 'dns', 'domain',
-                'events', 'fs', 'http', 'http2', 'https', 'inspector', 'module', 'net',
-                'os', 'path', 'perf_hooks', 'process', 'punycode', 'querystring', 'readline',
-                'repl', 'stream', 'string_decoder', 'sys', 'timers', 'tls', 'trace_events',
-                'tty', 'url', 'util', 'v8', 'vm', 'wasi', 'worker_threads', 'zlib'
-            ];
-
-            // Determine external packages
-            // 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
-            const allExternal = [...new Set([...builtins, ...externalPackages])];
-
-            // Convert to regex patterns for deep exports support
-            // Also handle node: prefix for built-ins
-            const externalPatterns = allExternal.map((d) =>
-                new RegExp(`^(node:)?${d.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')}(\\/.*)?$`)
-            );
-
-            // Bundle the Vite output so deployments only need production dependencies
-            // Anything in devDependencies will get included in the bundled code
-            // Rolldown has native support for node resolution, CommonJS, and JSON
+            // we bundle the Vite output so that deployments only need
+            // their production dependencies. Anything in devDependencies
+            // will get included in the bundled code
             const bundle = await rolldown({
                 input,
                 external: externalPatterns,
@@ -147,59 +96,21 @@ export default function (options = {}) {
                 dir: `${out}/server`,
                 format: 'esm',
                 sourcemap: true,
-                chunkFileNames: 'chunks/[name]-[hash].js',
-                minify: false,
-                keepNames: true
+                chunkFileNames: 'chunks/[name]-[hash].js'
             });
 
-            // Now copy and bundle the runtime files
-            builder.copy(files, `${tmp}/runtime`, {
+            builder.copy(files, out, {
                 replace: {
+                    ENV: './env.js',
                     HANDLER: './handler.js',
                     MANIFEST: './server/manifest.js',
                     SERVER: './server/index.js',
                     SHIMS: './shims.js',
-                    MIDDLEWARES: './middlewares.js',
                     ENV_PREFIX: JSON.stringify(envPrefix),
-                    POLYFILL: JSON.stringify(polyfill)
+                    PRECOMPRESS: JSON.stringify(precompress)
                 }
             });
 
-            // 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?.({
                     entrypoint: `${out}/index.js`,
@@ -209,49 +120,6 @@ export default function (options = {}) {
                     }
                 });
             }
-
-            builder.log.minor('Generating package.json');
-
-            // 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',
-                ...(pkg.dependencies || {})
-            };
-
-            // 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];
-                }
-            }
-
-            builder.log.info(`Including ${Object.keys(finalDeps).length} dependencies in output package.json`);
-
-            writeFileSync(
-                `${out}/package.json`,
-                JSON.stringify(
-                    {
-                        name: pkg.name || 'sveltekit-app',
-                        version: pkg.version || '1.0.0',
-                        type: 'module',
-                        main: './index.js',
-                        dependencies: finalDeps
-                    },
-                    null,
-                    2
-                )
-            );
-
-            builder.log.success(`Adapter complete! Output: ${out}`);
-            builder.log.info(`\nTo run the server:\n  cd ${out}\n  npm install\n  node index.js\n`);
         },
 
         supports: {
@@ -259,4 +127,4 @@ export default function (options = {}) {
             instrumentation: () => true
         }
     };
-}
+}

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@siddharatha/adapter-node-rolldown",
-    "version": "1.0.9",
-    "description": "High-performance SvelteKit adapter for Node.js with Polka, WebSockets, and OpenTelemetry",
+    "version": "1.1.3",
+    "description": "Just replacing @sveltejs/adapter-node with rolldown",
     "type": "module",
     "exports": {
         ".": "./index.js"
@@ -12,7 +12,12 @@
         "index.d.ts"
     ],
     "scripts": {
-        "test": "echo \"Error: no test specified\" && exit 1"
+        "dev": "rollup -cw",
+        "build": "rollup -c",
+        "check": "tsc",
+        "lint": "prettier --check .",
+        "format": "pnpm lint --write",
+        "prepublishOnly": "pnpm build"
     },
     "keywords": [
         "svelte",
@@ -29,25 +34,19 @@
     "author": "",
     "license": "MIT",
     "dependencies": {
-        "rolldown": "^0.15.0"
+        "rolldown": "1.0.0-beta.60",
+        "@rollup/plugin-commonjs": "^28.0.1",
+        "@rollup/plugin-json": "^6.1.0",
+        "@rollup/plugin-node-resolve": "^16.0.0",
+        "rollup": "^4.9.5"
     },
     "peerDependencies": {
         "@sveltejs/kit": "^2.4.0"
     },
     "devDependencies": {
-        "@sveltejs/kit": "^2.4.0",
         "@polka/url": "^1.0.0-next.28",
+        "@sveltejs/kit": "^2.4.0",
         "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"
+        "sirv": "^3.0.2"
     }
 }

package/files/middlewares.js

@@ -1,162 +0,0 @@
-import compression from 'compression';
-import sirv from 'sirv';
-import { config } from 'ENV';
-
-/**
- * Create compression middleware with optimized settings
- */
-export function createCompressionMiddleware() {
-    if (!config.compression) {
-        return (req, res, next) => next();
-    }
-
-    return compression({
-        level: config.compressionLevel,
-        threshold: 1024, // Only compress responses > 1KB
-        memLevel: 8,
-        filter: (req, res) => {
-            const contentType = res.getHeader('Content-Type');
-
-            // Don't compress images, videos, or already compressed content
-            if (contentType && (
-                contentType.includes('image/') ||
-                contentType.includes('video/') ||
-                contentType.includes('audio/') ||
-                contentType.includes('font/')
-            )) {
-                return false;
-            }
-
-            // Use default compression filter for everything else
-            return compression.filter(req, res);
-        }
-    });
-}
-
-/**
- * Create static file serving middleware with optimized settings
- */
-export function createStaticMiddleware(dir, precompressed = true) {
-    return sirv(dir, {
-        dev: false,
-        etag: true,
-        maxAge: 31536000, // 1 year for immutable assets
-        immutable: true,
-        gzip: precompressed, // Serve .gz files if available
-        brotli: precompressed, // Serve .br files if available
-        setHeaders: (res, pathname) => {
-            // Cache control based on file type
-            if (pathname.includes('immutable')) {
-                res.setHeader('Cache-Control', 'public, immutable, max-age=31536000');
-            } else if (pathname.endsWith('.html')) {
-                res.setHeader('Cache-Control', 'public, max-age=0, must-revalidate');
-            } else {
-                res.setHeader('Cache-Control', 'public, max-age=3600');
-            }
-        }
-    });
-}
-
-/**
- * Simple body parser for JSON and URL-encoded data with configurable limits
- */
-export function createBodyParser() {
-    const limitBytes = parseLimit(config.bodyLimit);
-
-    return (req, res, next) => {
-        // Skip if not a body method
-        if (req.method !== 'POST' && req.method !== 'PUT' && req.method !== 'PATCH') {
-            return next();
-        }
-
-        // Skip if body already parsed
-        if (req.body) {
-            return next();
-        }
-
-        const contentType = req.headers['content-type'] || '';
-
-        // Skip if not JSON or form data (SvelteKit will handle FormData/multipart)
-        if (!contentType.includes('application/json') &&
-            !contentType.includes('application/x-www-form-urlencoded')) {
-            return next();
-        }
-
-        let data = '';
-        let size = 0;
-
-        req.on('data', chunk => {
-            size += chunk.length;
-            if (size > limitBytes) {
-                req.removeAllListeners('data');
-                req.removeAllListeners('end');
-                res.writeHead(413, { 'Content-Type': 'application/json' });
-                res.end(JSON.stringify({ error: 'Request body too large' }));
-                return;
-            }
-            data += chunk.toString();
-        });
-
-        req.on('end', () => {
-            try {
-                if (contentType.includes('application/json')) {
-                    req.body = data ? JSON.parse(data) : {};
-                } else if (contentType.includes('application/x-www-form-urlencoded')) {
-                    req.body = parseUrlEncoded(data);
-                }
-            } catch (error) {
-                res.writeHead(400, { 'Content-Type': 'application/json' });
-                res.end(JSON.stringify({ error: 'Invalid request body' }));
-                return;
-            }
-            next();
-        });
-
-        req.on('error', (error) => {
-            console.error('Body parse error:', error);
-            res.writeHead(400, { 'Content-Type': 'application/json' });
-            res.end(JSON.stringify({ error: 'Request error' }));
-        });
-    };
-}
-
-/**
- * Parse size limit string to bytes
- */
-function parseLimit(limit) {
-    if (typeof limit === 'number') return limit;
-
-    const match = limit.match(/^(\d+(?:\.\d+)?)\s*(kb|mb|gb)?$/i);
-    if (!match) return 10 * 1024 * 1024; // Default 10MB
-
-    const value = parseFloat(match[1]);
-    const unit = (match[2] || 'b').toLowerCase();
-
-    const multipliers = {
-        b: 1,
-        kb: 1024,
-        mb: 1024 * 1024,
-        gb: 1024 * 1024 * 1024
-    };
-
-    return value * (multipliers[unit] || 1);
-}
-
-/**
- * Parse URL-encoded form data
- */
-function parseUrlEncoded(str) {
-    const obj = {};
-    const pairs = str.split('&');
-
-    for (const pair of pairs) {
-        const [key, value] = pair.split('=');
-        if (key) {
-            const decodedKey = decodeURIComponent(key);
-            const decodedValue = value ? decodeURIComponent(value.replace(/\+/g, ' ')) : '';
-            obj[decodedKey] = decodedValue;
-        }
-    }
-
-    return obj;
-}

package/files/telemetry.js

@@ -1,126 +0,0 @@
-import { config } from 'ENV';
-
-let sdk = null;
-
-/**
- * Initialize OpenTelemetry SDK for distributed tracing
- */
-export async function initTelemetry() {
-    if (!config.telemetry.enabled) {
-        console.log('OpenTelemetry is disabled');
-        return null;
-    }
-
-    try {
-        // Dynamic imports to avoid loading if telemetry is disabled
-        const { NodeSDK } = await import('@opentelemetry/sdk-node');
-        const { getNodeAutoInstrumentations } = await import('@opentelemetry/auto-instrumentations-node');
-        const { Resource } = await import('@opentelemetry/resources');
-        const { SemanticResourceAttributes } = await import('@opentelemetry/semantic-conventions');
-
-        // Choose exporter based on protocol
-        let TraceExporter;
-        if (config.telemetry.protocol === 'grpc') {
-            const module = await import('@opentelemetry/exporter-trace-otlp-grpc');
-            TraceExporter = module.OTLPTraceExporter;
-        } else {
-            const module = await import('@opentelemetry/exporter-trace-otlp-http');
-            TraceExporter = module.OTLPTraceExporter;
-        }
-
-        const exporterConfig = {
-            url: config.telemetry.endpoint,
-            headers: {}
-        };
-
-        // Add Dynatrace API token if provided
-        if (config.telemetry.dynatraceToken) {
-            exporterConfig.headers['Authorization'] = `Api-Token ${config.telemetry.dynatraceToken}`;
-        }
-
-        // Merge custom headers from config
-        if (config.telemetry.customConfig.headers) {
-            Object.assign(exporterConfig.headers, config.telemetry.customConfig.headers);
-        }
-
-        sdk = new NodeSDK({
-            resource: new Resource({
-                [SemanticResourceAttributes.SERVICE_NAME]: config.telemetry.serviceName,
-                [SemanticResourceAttributes.SERVICE_VERSION]: config.telemetry.serviceVersion,
-                ...config.telemetry.customConfig.resourceAttributes
-            }),
-            traceExporter: new TraceExporter(exporterConfig),
-            instrumentations: [
-                getNodeAutoInstrumentations({
-                    // Disable noisy instrumentations
-                    '@opentelemetry/instrumentation-fs': {
-                        enabled: false
-                    },
-                    '@opentelemetry/instrumentation-http': {
-                        enabled: true,
-                        ignoreIncomingPaths: ['/health', '/readiness'],
-                        ignoreOutgoingUrls: [/\/health$/, /\/readiness$/]
-                    },
-                    '@opentelemetry/instrumentation-dns': {
-                        enabled: false
-                    },
-                    // Enable all others by default
-                    ...config.telemetry.customConfig.instrumentations
-                })
-            ],
-            // Sampling configuration
-            ...(config.telemetry.sampleRate < 1.0 && {
-                sampler: {
-                    shouldSample: () => {
-                        return Math.random() < config.telemetry.sampleRate
-                            ? { decision: 1 } // RECORD_AND_SAMPLED
-                            : { decision: 0 }; // NOT_RECORD
-                    }
-                }
-            })
-        });
-
-        await sdk.start();
-        console.log('OpenTelemetry SDK initialized successfully');
-        console.log(`  Service: ${config.telemetry.serviceName}`);
-        console.log(`  Endpoint: ${config.telemetry.endpoint || 'default'}`);
-        console.log(`  Protocol: ${config.telemetry.protocol}`);
-        console.log(`  Sample Rate: ${(config.telemetry.sampleRate * 100).toFixed(1)}%`);
-
-        return sdk;
-    } catch (error) {
-        console.error('Failed to initialize OpenTelemetry:', error.message);
-        return null;
-    }
-}
-
-/**
- * Shutdown telemetry SDK and flush remaining spans
- */
-export async function shutdownTelemetry() {
-    if (sdk) {
-        console.log('Shutting down OpenTelemetry SDK...');
-        try {
-            await sdk.shutdown();
-            console.log('OpenTelemetry SDK shutdown complete');
-        } catch (error) {
-            console.error('Error shutting down OpenTelemetry:', error.message);
-        }
-    }
-}
-
-/**
- * Get tracer for custom instrumentation
- */
-export function getTracer(name = 'sveltekit-adapter') {
-    if (!config.telemetry.enabled) {
-        return null;
-    }
-
-    try {
-        const { trace } = require('@opentelemetry/api');
-        return trace.getTracer(name);
-    } catch {
-        return null;
-    }
-}