@web-ts-toolkit/express-runtime 0.43.0 → 0.44.0

package/cli-api.js

@@ -61,11 +61,15 @@ function parsePortValue(value, name) {
   }
   return value;
 }
-var MAX_INTEGER_OPTION_VALUE;
+function validateTimerDuration(value, name) {
+  return validateFiniteInteger(value, { name, min: 0, max: MAX_TIMER_DURATION_MS });
+}
+var MAX_INTEGER_OPTION_VALUE, MAX_TIMER_DURATION_MS;
 var init_numeric_validation = __esm({
   "src/numeric-validation.ts"() {
     "use strict";
     MAX_INTEGER_OPTION_VALUE = Number.MAX_SAFE_INTEGER;
+    MAX_TIMER_DURATION_MS = 2147483647;
   }
 });
 
@@ -152,11 +156,7 @@ function startLocalServer(app, options = {}) {
   const logger = options.logger ?? defaultLogger;
   const port = normalizePort(options.port);
   const host = options.host ?? process.env.HOST ?? "0.0.0.0";
-  const shutdownTimeout = validateFiniteInteger(options.shutdownTimeout ?? DEFAULT_SHUTDOWN_TIMEOUT, {
-    name: "shutdownTimeout",
-    min: 0,
-    max: MAX_INTEGER_OPTION_VALUE
-  });
+  const shutdownTimeout = validateTimerDuration(options.shutdownTimeout ?? DEFAULT_SHUTDOWN_TIMEOUT, "shutdownTimeout");
   const server = import_node_http.default.createServer(app);
   app.set("port", port);
   let state = "initializing";
@@ -328,6 +328,7 @@ function startLocalServer(app, options = {}) {
         done();
       }
     });
+    let shutdownFailed = false;
     let shutdownError;
     try {
       if (options.onShutdown) {
@@ -335,9 +336,10 @@ function startLocalServer(app, options = {}) {
       }
     } catch (err) {
       logger.error("onShutdown hook failed:", err);
+      shutdownFailed = true;
       shutdownError = err;
     }
-    if (shutdownError) {
+    if (shutdownFailed) {
       state = "failed";
       if (options.exitAfterShutdown) {
         process.exit(1);
@@ -356,7 +358,7 @@ function startLocalServer(app, options = {}) {
   };
   if (options.signals !== false) {
     const list = options.signals === void 0 || options.signals === true ? DEFAULT_SIGNALS : options.signals;
-    for (const sig of list) {
+    for (const sig of new Set(list)) {
       const handler = () => {
         void shutdown().catch(() => {
         });
@@ -508,6 +510,12 @@ function parseIntegerFlag(raw, name, min = 0, max = MAX_INTEGER_OPTION_VALUE) {
   }
   return validateFiniteInteger(Number(raw), { name, min, max });
 }
+function parseTimerFlag(raw, name) {
+  if (!/^(0|[1-9]\d*)$/.test(raw)) {
+    throw new Error(`Invalid ${name}: ${raw}. Must be a finite integer in 0..${MAX_TIMER_DURATION_MS}.`);
+  }
+  return validateTimerDuration(Number(raw), name);
+}
 function parsePortFlag(raw, name = "--port") {
   try {
     return parsePortValue(raw, name);
@@ -547,13 +555,13 @@ Dev options:
   --port <number>               Port or named pipe (default: process.env.PORT or 8080)
   --host <hostname>             Hostname to bind (default: process.env.HOST or 0.0.0.0)
   --no-signals                  Disable SIGINT/SIGTERM handler registration
-  --shutdown-timeout <ms>       Max ms to wait for in-flight requests (default: 5000)
+  --shutdown-timeout <ms>       Max ms to wait for in-flight requests (default: 5000; 0..2147483647)
   --require <module>            Module(s) to preload before app load (repeatable)
   --env <path>                  Env file(s) to load (repeatable; existing env vars are not overridden)
   --tsconfig <path>             Tsconfig used by config-aware consumers for TS path resolution
   --watch <paths>               Comma-separated paths to watch for restart (repeatable; dev only)
   --ext <extensions>            Comma-separated extensions to watch (default: ts,js,mjs,cjs,json)
-  --delay <ms>                  Debounce ms before restarting on change (default: 500)
+  --delay <ms>                  Debounce ms before restarting on change (default: 500; 0..2147483647)
 
 Build options:
   --init <path>                 Init hook module (default export, async function)
@@ -562,14 +570,14 @@ Build options:
   --out-name <name>             Output filename without extension (default: app)
   --format <cjs|esm>            Output format (default: cjs)
   --target <target>             Compilation target (default: node22)
-  --external <pkg>              Mark package as external (repeatable; express always external)
+  --external <pkg>              Mark package as external (repeatable; express and @web-ts-toolkit/express-runtime always external)
   --no-clean                    Don't clean the output directory before building
 
 Start options:
   --port <number>               Port or named pipe (default: process.env.PORT or 8080)
   --host <hostname>             Hostname to bind (default: process.env.HOST or 0.0.0.0)
   --no-signals                  Disable SIGINT/SIGTERM handler registration
-  --shutdown-timeout <ms>       Max ms to wait for in-flight requests (default: 5000)
+  --shutdown-timeout <ms>       Max ms to wait for in-flight requests (default: 5000; 0..2147483647)
   --require <module>            Module(s) to preload before app load (repeatable)
   --env <path>                  Env file(s) to load (repeatable; existing env vars are not overridden)
 
@@ -580,14 +588,14 @@ Build-serverless options:
   --out-name <name>             Output filename without extension (default: handler)
   --format <cjs|esm>            Output format (default: cjs)
   --target <target>             Compilation target (default: node22)
-  --external <pkg>              Mark package as external (repeatable; express always external)
+  --external <pkg>              Mark package as external (repeatable; express and @web-ts-toolkit/express-runtime always external)
   --no-clean                    Don't clean the output directory before building
 
 Start-serverless options:
   --port <number>               Port or named pipe (default: process.env.PORT or 8080)
   --host <hostname>             Hostname to bind (default: process.env.HOST or 0.0.0.0)
   --no-signals                  Disable SIGINT/SIGTERM handler registration
-  --shutdown-timeout <ms>       Max ms to wait for in-flight requests (default: 5000)
+  --shutdown-timeout <ms>       Max ms to wait for in-flight requests (default: 5000; 0..2147483647)
   --max-body-bytes <bytes>      Max request body bytes for adapter (default: 1048576; 0 disallows bodies)
   --require <module>            Module(s) to preload before handler load (repeatable)
   --env <path>                  Env file(s) to load (repeatable; existing env vars are not overridden)
@@ -617,7 +625,7 @@ Notes:
   - --watch forks one child process running the same CLI without --watch. File changes
     are serialized into one restart at a time: SIGTERM, SIGKILL after 5000 ms if needed,
     then respawn after the debounce delay. Shutdown closes owned watchers and signal handlers.
-  - In build/build-serverless mode, express is always external. Add more externals with --external.
+  - In build/build-serverless mode, express and @web-ts-toolkit/express-runtime are always external. Add more externals with --external.
   - In start mode, the bundled app file must default-export an Express app (or export it as "app").
     If the bundle exports "init", it runs before the server starts listening.
   - In start-serverless mode, the bundled handler file must be a JS/CJS module whose
@@ -701,12 +709,12 @@ function parseDevArgs(argv) {
       continue;
     }
     if (arg === "--shutdown-timeout") {
-      options.shutdownTimeout = parseIntegerFlag(readValue(argv, index, arg), "--shutdown-timeout");
+      options.shutdownTimeout = parseTimerFlag(readValue(argv, index, arg), "--shutdown-timeout");
       index += 1;
       continue;
     }
     if (arg.startsWith("--shutdown-timeout=")) {
-      options.shutdownTimeout = parseIntegerFlag(
+      options.shutdownTimeout = parseTimerFlag(
         readInlineValue(arg, "--shutdown-timeout=", "--shutdown-timeout"),
         "--shutdown-timeout"
       );
@@ -756,12 +764,12 @@ function parseDevArgs(argv) {
       continue;
     }
     if (arg === "--delay") {
-      watchDelay = parseIntegerFlag(readValue(argv, index, arg), "--delay");
+      watchDelay = parseTimerFlag(readValue(argv, index, arg), "--delay");
       index += 1;
       continue;
     }
     if (arg.startsWith("--delay=")) {
-      watchDelay = parseIntegerFlag(readInlineValue(arg, "--delay=", "--delay"), "--delay");
+      watchDelay = parseTimerFlag(readInlineValue(arg, "--delay=", "--delay"), "--delay");
       continue;
     }
     if (!arg.startsWith("--")) {
@@ -1057,14 +1065,23 @@ function loadEnvFiles(paths) {
   }
 }
 async function preloadModules(modules) {
+  const invocationRequire = (0, import_node_module.createRequire)(
+    (0, import_node_url.pathToFileURL)((0, import_node_path.resolve)(process.cwd(), "__wtt_runtime_preload__.js"))
+  );
   for (const mod of modules) {
-    moduleRequire(mod);
+    invocationRequire(mod);
   }
 }
 function toDiagnosticMessage(prefix, error) {
   const message = error instanceof Error ? error.message : String(error);
   return `${prefix}: ${message}`;
 }
+function isChildGone(proc) {
+  const exitCode = proc.exitCode;
+  const signalCode = proc.signalCode;
+  if (exitCode != null || signalCode != null) return true;
+  return proc.pid === void 0;
+}
 function createWatchSupervisor(args, deps = {}) {
   const forkImpl = deps.fork ?? import_node_child_process.fork;
   const watchImpl = deps.watch ?? import_node_fs.watch;
@@ -1073,6 +1090,11 @@ function createWatchSupervisor(args, deps = {}) {
   const setTimeoutImpl = deps.setTimeout ?? setTimeout;
   const clearTimeoutImpl = deps.clearTimeout ?? clearTimeout;
   const killTimeoutMs = deps.killTimeoutMs ?? DEFAULT_WATCH_KILL_TIMEOUT_MS;
+  validateTimerDuration(args.watchDelay, "--delay");
+  validateTimerDuration(killTimeoutMs, "killTimeoutMs");
+  if (args.options.shutdownTimeout !== void 0) {
+    validateTimerDuration(args.options.shutdownTimeout, "--shutdown-timeout");
+  }
   const cliPath = process.argv[1];
   const childArgv = buildChildArgs(args);
   let child = null;
@@ -1129,7 +1151,7 @@ function createWatchSupervisor(args, deps = {}) {
     }
     child = nextChild;
     nextChild.once("error", (error) => {
-      if (child === nextChild) {
+      if (isChildGone(nextChild) && child === nextChild) {
         child = null;
       }
       fail(toDiagnosticMessage("Watch child process error", error));
@@ -1159,10 +1181,15 @@ function createWatchSupervisor(args, deps = {}) {
         clearKillTimer();
         target.removeListener("exit", onExit);
         target.removeListener("error", onError);
-        if (child === target) child = null;
-        if (terminatingChild === target) terminatingChild = null;
-        if (error) reject(error);
-        else resolve();
+        if (error) {
+          if (terminatingChild === target) terminatingChild = null;
+          if (child === target && isChildGone(target)) child = null;
+          reject(error);
+        } else {
+          if (child === target) child = null;
+          if (terminatingChild === target) terminatingChild = null;
+          resolve();
+        }
       };
       const onExit = () => settle();
       const onError = (error) => settle(error);
@@ -1291,7 +1318,7 @@ function createWatchSupervisor(args, deps = {}) {
   };
 }
 function buildChildArgs(args) {
-  const result = ["dev", args.appPath];
+  const result = ["dev"];
   if (args.options.port !== void 0) result.push("--port", String(args.options.port));
   if (args.options.host !== void 0) result.push("--host", args.options.host);
   if (args.options.signals === false) result.push("--no-signals");
@@ -1300,17 +1327,23 @@ function buildChildArgs(args) {
   if (args.tsconfigPath !== void 0) result.push("--tsconfig", args.tsconfigPath);
   for (const r of args.require) result.push("--require", r);
   for (const e of args.env) result.push("--env", e);
+  result.push("--", args.appPath);
   return result;
 }
 function runWithWatch(args, deps = {}) {
   const usingInjectedDeps = Object.keys(deps).length > 0;
   const installSignalHandlers = deps.installSignalHandlers ?? !usingInjectedDeps;
   const exitImpl = deps.exit ?? (usingInjectedDeps ? void 0 : (code) => process.exit(code));
+  let exited = false;
+  const exitOnce = (code) => {
+    if (exited) return;
+    exited = true;
+    exitImpl?.(code);
+  };
   const controller = createWatchSupervisor(args, {
     ...deps,
-    exit: exitImpl
+    exit: exitOnce
   });
-  let shutdownStarted = false;
   const ownedHandlers = [];
   const removeOwnedHandlers = () => {
     for (const [signal, handler] of ownedHandlers.splice(0)) {
@@ -1318,8 +1351,11 @@ function runWithWatch(args, deps = {}) {
     }
   };
   const shutdown = async () => {
-    removeOwnedHandlers();
-    await controller.shutdown();
+    try {
+      await controller.shutdown();
+    } finally {
+      removeOwnedHandlers();
+    }
   };
   const wrappedController = {
     shutdown,
@@ -1328,14 +1364,38 @@ function runWithWatch(args, deps = {}) {
     isShuttingDown: controller.isShuttingDown
   };
   if (installSignalHandlers) {
-    const shutdownAndExit = () => {
-      if (shutdownStarted) return;
-      shutdownStarted = true;
-      void shutdown().then(() => exitImpl?.(0));
+    let signalCount = 0;
+    const shutdownAndExit = (signal) => {
+      signalCount += 1;
+      if (signalCount === 1) {
+        void shutdown().then(
+          () => exitOnce(0),
+          () => exitOnce(1)
+        );
+        return;
+      }
+      if (signalCount === 2) {
+        try {
+          const live = controller.getChild();
+          if (live?.pid) {
+            try {
+              live.kill("SIGKILL");
+            } catch (_error) {
+              void _error;
+            }
+          }
+        } catch (_error) {
+          void _error;
+        }
+        void signal;
+        return;
+      }
     };
-    ownedHandlers.push(["SIGINT", shutdownAndExit], ["SIGTERM", shutdownAndExit]);
-    process.on("SIGINT", shutdownAndExit);
-    process.on("SIGTERM", shutdownAndExit);
+    const onSigint = () => shutdownAndExit("SIGINT");
+    const onSigterm = () => shutdownAndExit("SIGTERM");
+    ownedHandlers.push(["SIGINT", onSigint], ["SIGTERM", onSigterm]);
+    process.on("SIGINT", onSigint);
+    process.on("SIGTERM", onSigterm);
   }
   return wrappedController;
 }
@@ -1373,56 +1433,107 @@ function generateRuntimeEntry(appPath, initPath) {
 function validateOutDirForClean(outDir, clean, appPath, initPath) {
   if (!clean) return;
   const cwd = process.cwd();
+  const canonicalCwd = canonicalizeCwd(cwd);
   const outAbs = (0, import_node_path.resolve)(cwd, outDir);
-  const normalized = (0, import_node_path.normalize)(outAbs);
-  const root = (0, import_node_path.parse)(normalized).root;
-  if (normalized === root) {
-    throw new Error(`Refusing to clean filesystem root: ${outDir} resolves to ${normalized}`);
+  const canonicalOut = canonicalizePhysicalPath(outAbs, "outDir");
+  const root = (0, import_node_path.parse)(canonicalOut).root;
+  if (canonicalOut === root) {
+    throw new Error(`Refusing to clean filesystem root: ${outDir} resolves to ${canonicalOut}`);
   }
-  if (normalized === (0, import_node_path.normalize)(cwd)) {
+  if (canonicalOut === canonicalCwd) {
     throw new Error(`Refusing to clean project directory: ${outDir} resolves to cwd ${cwd}`);
   }
-  if (cwd !== root && (cwd === normalized || cwd.startsWith(normalized + import_node_path.sep))) {
+  if (canonicalCwd === canonicalOut || canonicalCwd.startsWith(canonicalOut + import_node_path.sep)) {
     throw new Error(
-      `Refusing to clean ancestor of project directory: ${outDir} resolves to ${normalized} which contains cwd ${cwd}`
+      `Refusing to clean ancestor of project directory: ${outDir} resolves to ${canonicalOut} which contains cwd ${cwd}`
     );
   }
   try {
-    if ((0, import_node_fs.existsSync)(outAbs)) {
-      const st = (0, import_node_fs.lstatSync)(outAbs);
-      if (st.isSymbolicLink()) {
-        throw new Error(`Refusing to clean symlinked outDir: ${outDir} resolves to symlink ${outAbs}`);
-      }
+    const st = (0, import_node_fs.lstatSync)(outAbs);
+    if (st.isSymbolicLink()) {
+      throw new Error(`Refusing to clean symlinked outDir: ${outDir} resolves to symlink ${outAbs}`);
     }
   } catch (e) {
     if (e.message.startsWith("Refusing to clean")) throw e;
+    const code = e.code;
+    if (code !== "ENOENT" && code !== "ENOTDIR") {
+      throw new Error(
+        `Refusing to clean outDir with unresolvable state: ${outDir} (${outAbs}): ${e.message}`,
+        { cause: e }
+      );
+    }
   }
   const checkOverlap = (inputPath, label) => {
     if (!inputPath) return;
     const inputAbs = (0, import_node_path.resolve)(cwd, inputPath);
-    const inputNorm = (0, import_node_path.normalize)(inputAbs);
-    if (inputNorm === normalized) {
+    const canonicalInput = canonicalizePhysicalPath(inputAbs, label);
+    if (canonicalInput === canonicalOut) {
       throw new Error(`Refusing to clean outDir that is the same as ${label}: ${outDir} == ${inputPath}`);
     }
-    if (inputNorm.startsWith(normalized + import_node_path.sep)) {
+    if (canonicalInput.startsWith(canonicalOut + import_node_path.sep)) {
       throw new Error(`Refusing to clean outDir that contains ${label}: ${outDir} contains ${inputPath}`);
     }
+    if (canonicalOut.startsWith(canonicalInput + import_node_path.sep)) {
+      throw new Error(`Refusing to clean outDir inside ${label}: ${outDir} is inside ${inputPath}`);
+    }
   };
   checkOverlap(appPath, "appPath");
   checkOverlap(initPath, "initPath");
 }
-function createUniqueStagingDir() {
+function canonicalizePhysicalPath(absPath, label) {
+  const normalizedStart = (0, import_node_path.normalize)(absPath);
+  let current = normalizedStart;
+  const suffixParts = [];
+  while (true) {
+    try {
+      const real = (0, import_node_fs.realpathSync)(current);
+      if (suffixParts.length === 0) return (0, import_node_path.normalize)(real);
+      return (0, import_node_path.normalize)((0, import_node_path.join)(real, ...suffixParts.slice().reverse()));
+    } catch (error) {
+      const code = error.code;
+      if (code === "ENOENT" || code === "ENOTDIR") {
+        const parent = (0, import_node_path.dirname)(current);
+        if (parent === current) {
+          throw new Error(`Refusing to clean ${label}: unable to resolve existing ancestor of ${absPath}`, {
+            cause: error
+          });
+        }
+        suffixParts.push((0, import_node_path.basename)(current));
+        current = parent;
+        continue;
+      }
+      throw new Error(`Refusing to clean ${label}: unable to resolve ${absPath}: ${error.message}`, {
+        cause: error
+      });
+    }
+  }
+}
+function canonicalizeCwd(cwd) {
+  try {
+    return (0, import_node_path.normalize)((0, import_node_fs.realpathSync)(cwd));
+  } catch (error) {
+    throw new Error(`Refusing to clean: unable to resolve project directory ${cwd}: ${error.message}`, {
+      cause: error
+    });
+  }
+}
+function createUniqueStagingDir(deps = {}) {
   const cwd = process.cwd();
   const prefix = (0, import_node_path.join)(cwd, STAGING_DIR_PREFIX);
-  const dir = (0, import_node_fs.mkdtempSync)(prefix);
+  const mkdtemp = deps.mkdtempSyncImpl ?? import_node_fs.mkdtempSync;
+  const lstat = deps.lstatSyncImpl ?? import_node_fs.lstatSync;
+  const rm = deps.rmSyncImpl ?? import_node_fs.rmSync;
+  const dir = mkdtemp(prefix);
   try {
-    const st = (0, import_node_fs.lstatSync)(dir);
+    const st = lstat(dir);
     if (st.isSymbolicLink()) {
-      (0, import_node_fs.rmSync)(dir, { recursive: true, force: true });
       throw new Error(`Staging directory is a symlink: ${dir}`);
     }
   } catch (e) {
-    if (e.message.includes("Staging directory is a symlink")) throw e;
+    try {
+      rm(dir, { recursive: true, force: true });
+    } catch {
+    }
     throw e;
   }
   try {
@@ -1431,41 +1542,58 @@ function createUniqueStagingDir() {
   }
   return dir;
 }
-function writeStagingEntry(dir, content) {
+function writeStagingEntry(dir, content, deps = {}) {
   const entryPath = (0, import_node_path.join)(dir, "entry.ts");
+  const lstat = deps.lstatSyncImpl ?? import_node_fs.lstatSync;
+  const writeFile = deps.writeFileSyncImpl ?? import_node_fs.writeFileSync;
+  const rm = deps.rmSyncImpl ?? import_node_fs.rmSync;
   try {
-    if ((0, import_node_fs.existsSync)(entryPath)) {
-      const st = (0, import_node_fs.lstatSync)(entryPath);
-      if (st.isSymbolicLink()) {
-        throw new Error(`Refusing to overwrite symlink at staging path: ${entryPath}`);
-      }
-      throw new Error(`Staging file already exists: ${entryPath}`);
+    const st = lstat(entryPath);
+    if (st.isSymbolicLink()) {
+      throw new Error(`Refusing to overwrite symlink at staging path: ${entryPath}`);
     }
+    throw new Error(`Staging file already exists: ${entryPath}`);
   } catch (e) {
-    if (e.message.startsWith("Refusing to") || e.message.startsWith("Staging file already exists"))
-      throw e;
+    const message = e.message;
+    if (message.startsWith("Refusing to") || message.startsWith("Staging file already exists")) throw e;
+    const code = e.code;
+    if (code !== "ENOENT" && code !== "ENOTDIR") {
+      throw new Error(`Refusing to use staging path with unresolvable state: ${entryPath}: ${message}`, {
+        cause: e
+      });
+    }
   }
-  (0, import_node_fs.writeFileSync)(entryPath, content, { encoding: "utf8", flag: "wx", mode: 384 });
+  writeFile(entryPath, content, { encoding: "utf8", flag: "wx", mode: 384 });
   try {
-    const st = (0, import_node_fs.lstatSync)(entryPath);
+    const st = lstat(entryPath);
     if (st.isSymbolicLink()) {
-      (0, import_node_fs.rmSync)(entryPath, { force: true });
+      try {
+        rm(entryPath, { force: true });
+      } catch {
+      }
       throw new Error(`Staging file is a symlink after write: ${entryPath}`);
     }
   } catch (e) {
     if (e.message.includes("Staging file is a symlink")) throw e;
+    try {
+      rm(entryPath, { force: true });
+    } catch {
+    }
+    throw new Error(`Refusing to use staging file with unresolvable state: ${entryPath}: ${e.message}`, {
+      cause: e
+    });
   }
   return entryPath;
 }
-async function buildBundleFromEntryContent(args) {
+async function buildBundleFromEntryContent(args, deps = {}) {
   validateOutDirForClean(args.outDir, args.clean);
-  const tsupModule = await import("tsup");
-  const { build } = tsupModule;
-  const stagingDir = createUniqueStagingDir();
-  const tempEntryPath = writeStagingEntry(stagingDir, args.entryContent);
-  const absOutDir = (0, import_node_path.resolve)(process.cwd(), args.outDir);
+  const buildImpl = deps.buildImpl ?? (await import("tsup")).build;
+  const rm = deps.rmSyncImpl ?? import_node_fs.rmSync;
+  const stagingDir = createUniqueStagingDir(deps);
   try {
-    await build({
+    const tempEntryPath = writeStagingEntry(stagingDir, args.entryContent, deps);
+    const absOutDir = (0, import_node_path.resolve)(process.cwd(), args.outDir);
+    await buildImpl({
       config: false,
       entry: { [args.outName]: tempEntryPath },
       tsconfig: args.tsconfigPath,
@@ -1479,7 +1607,10 @@ async function buildBundleFromEntryContent(args) {
       splitting: false
     });
   } finally {
-    (0, import_node_fs.rmSync)(stagingDir, { recursive: true, force: true });
+    try {
+      rm(stagingDir, { recursive: true, force: true });
+    } catch {
+    }
   }
 }
 async function buildRuntime(args) {
@@ -1578,11 +1709,14 @@ function collectBody(req, maxBytes) {
       if (finished) return;
       finished = true;
       cleanup();
+      let body;
       try {
-        resolve(Buffer.concat(chunks, total));
+        body = Buffer.concat(chunks, total);
       } catch (e) {
-        fail(e);
+        reject(e);
+        return;
       }
+      resolve(body);
     };
     const onError = (err) => {
       const e = err;
@@ -1606,13 +1740,13 @@ function collectBody(req, maxBytes) {
     }
   });
 }
-function toServerlessEvent(method, url, headers, body) {
-  const parsedUrl = new URL(url, "http://localhost");
-  const { queryStringParameters, multiValueQueryStringParameters } = parseAwsRestQuery(parsedUrl.search);
-  const { singleValueHeaders, multiValueHeaders } = normalizeAwsRestHeaders(headers);
+function toServerlessEvent(method, url, headers, body, rawHeaders) {
+  const { path, search } = splitRequestTarget(url);
+  const { queryStringParameters, multiValueQueryStringParameters } = parseAwsRestQuery(search);
+  const { singleValueHeaders, multiValueHeaders } = buildAwsRestHeaders(headers, rawHeaders);
   return {
     httpMethod: method,
-    path: parsedUrl.pathname,
+    path,
     headers: singleValueHeaders,
     multiValueHeaders,
     queryStringParameters,
@@ -1627,12 +1761,49 @@ function toServerlessEvent(method, url, headers, body) {
     }
   };
 }
+function splitRequestTarget(target) {
+  if (target === "") {
+    return { path: "/", search: "" };
+  }
+  let remainder = target;
+  const absoluteMatch = remainder.match(/^([A-Za-z][A-Za-z0-9+.-]*):\/\//);
+  if (absoluteMatch) {
+    const afterScheme = remainder.slice(absoluteMatch[0].length);
+    const boundary = afterScheme.search(/[/?#]/);
+    if (boundary === -1) {
+      return { path: "/", search: "" };
+    }
+    remainder = afterScheme.slice(boundary);
+    if (remainder.startsWith("?") || remainder.startsWith("#")) {
+      remainder = `/${remainder}`;
+    }
+  } else if (remainder === "*" || remainder.startsWith("*?") || remainder.startsWith("*#")) {
+    remainder = remainder.slice(1);
+    if (remainder === "") {
+      return { path: "*", search: "" };
+    }
+    const hashIndex2 = remainder.indexOf("#");
+    const withoutFragment2 = hashIndex2 === -1 ? remainder : remainder.slice(0, hashIndex2);
+    return { path: "*", search: withoutFragment2 };
+  } else if (!remainder.startsWith("/")) {
+    throw new Error(
+      `Unsupported request target: ${JSON.stringify(target)}. Expected an origin-form path ("/path?query"), an absolute-form URI ("scheme://authority/path?query"), or "*"`
+    );
+  }
+  const hashIndex = remainder.indexOf("#");
+  const withoutFragment = hashIndex === -1 ? remainder : remainder.slice(0, hashIndex);
+  const queryIndex = withoutFragment.indexOf("?");
+  if (queryIndex === -1) {
+    return { path: withoutFragment, search: "" };
+  }
+  return { path: withoutFragment.slice(0, queryIndex), search: withoutFragment.slice(queryIndex) };
+}
 function parseAwsRestQuery(search) {
   if (search === "" || search === "?") {
     return { queryStringParameters: null, multiValueQueryStringParameters: null };
   }
-  const single = {};
-  const multi = {};
+  const single = /* @__PURE__ */ Object.create(null);
+  const multi = /* @__PURE__ */ Object.create(null);
   const query = search.startsWith("?") ? search.slice(1) : search;
   for (const pair of query.split("&")) {
     if (pair === "") continue;
@@ -1642,7 +1813,11 @@ function parseAwsRestQuery(search) {
     const key = decodeQueryComponent(rawKey);
     const value = decodeQueryComponent(rawValue);
     single[key] = value;
-    (multi[key] ??= []).push(value);
+    if (Object.prototype.hasOwnProperty.call(multi, key)) {
+      multi[key].push(value);
+    } else {
+      multi[key] = [value];
+    }
   }
   return {
     queryStringParameters: Object.keys(single).length > 0 ? single : null,
@@ -1658,8 +1833,8 @@ function decodeQueryComponent(value) {
   }
 }
 function normalizeAwsRestHeaders(headers) {
-  const singleValueHeaders = {};
-  const multiValueHeaders = {};
+  const singleValueHeaders = /* @__PURE__ */ Object.create(null);
+  const multiValueHeaders = /* @__PURE__ */ Object.create(null);
   for (const [key, value] of Object.entries(headers)) {
     if (value === void 0) continue;
     const values = Array.isArray(value) ? value.map(String) : [String(value)];
@@ -1668,23 +1843,92 @@ function normalizeAwsRestHeaders(headers) {
   }
   return { singleValueHeaders, multiValueHeaders };
 }
+function buildAwsRestHeaders(headers, rawHeaders) {
+  const fromRaw = headersFromRawHeadersList(rawHeaders);
+  if (fromRaw) return fromRaw;
+  if (isPlainRecord(rawHeaders)) {
+    return normalizeAwsRestHeaders(rawHeaders);
+  }
+  return normalizeAwsRestHeaders(headers);
+}
+function headersFromRawHeadersList(rawHeaders) {
+  if (!Array.isArray(rawHeaders)) return null;
+  if (rawHeaders.length % 2 !== 0) return null;
+  for (const entry of rawHeaders) {
+    if (typeof entry !== "string") return null;
+  }
+  const singleValueHeaders = /* @__PURE__ */ Object.create(null);
+  const multiValueHeaders = /* @__PURE__ */ Object.create(null);
+  for (let index = 0; index < rawHeaders.length; index += 2) {
+    const name = rawHeaders[index].toLowerCase();
+    const value = rawHeaders[index + 1];
+    if (Object.prototype.hasOwnProperty.call(multiValueHeaders, name)) {
+      multiValueHeaders[name].push(value);
+    } else {
+      multiValueHeaders[name] = [value];
+    }
+  }
+  for (const key of Object.keys(multiValueHeaders)) {
+    singleValueHeaders[key] = multiValueHeaders[key].join(", ");
+  }
+  return { singleValueHeaders, multiValueHeaders };
+}
 function applyServerlessResult(result, res) {
   const response = validateServerlessResult(result);
   res.status(response.statusCode);
-  for (const [key, value] of Object.entries(response.headers)) {
-    res.setHeader(key, value);
+  let baseline;
+  try {
+    baseline = new Set(Object.keys(res.getHeaders()).map((name) => name.toLowerCase()));
+  } catch (_e) {
+    void _e;
+    baseline = void 0;
   }
-  for (const [key, values] of Object.entries(response.multiValueHeaders)) {
-    if (key.toLowerCase() === "set-cookie") {
-      res.setHeader(key, values);
+  try {
+    for (const [key, value] of Object.entries(response.headers)) {
+      res.setHeader(key, value);
+    }
+    for (const [key, values] of Object.entries(response.multiValueHeaders)) {
+      if (key.toLowerCase() === "set-cookie") {
+        res.setHeader(key, values);
+      } else {
+        res.setHeader(key, values.join(","));
+      }
+    }
+    if (response.isBase64Encoded) {
+      res.end(response.decodedBody);
     } else {
-      res.setHeader(key, values.join(","));
+      res.end(response.body);
     }
-  }
-  if (response.isBase64Encoded) {
-    res.end(response.decodedBody);
-  } else {
-    res.end(response.body);
+  } catch (error) {
+    if (!res.headersSent) {
+      try {
+        if (baseline !== void 0) {
+          for (const name of Object.keys(res.getHeaders())) {
+            if (!baseline.has(name.toLowerCase())) {
+              res.removeHeader(name);
+            }
+          }
+        } else {
+          for (const [key] of Object.entries(response.headers)) {
+            try {
+              res.removeHeader(key);
+            } catch (_e) {
+              void _e;
+            }
+          }
+          for (const [key] of Object.entries(response.multiValueHeaders)) {
+            try {
+              res.removeHeader(key);
+            } catch (_e) {
+              void _e;
+            }
+          }
+        }
+      } catch (_e) {
+        void _e;
+      }
+    }
+    throw error;
   }
 }
 function validateServerlessResult(result) {
@@ -1736,7 +1980,7 @@ function validateSingleValueHeaders(value, name) {
   if (!isPlainRecord(value)) {
     throw new Error(`Invalid serverless result ${name}: expected an object of string header values.`);
   }
-  const headers = {};
+  const headers = /* @__PURE__ */ Object.create(null);
   for (const [key, headerValue] of Object.entries(value)) {
     if (headerValue === void 0) continue;
     if (typeof headerValue !== "string") {
@@ -1752,12 +1996,16 @@ function validateMultiValueHeaders(value, name) {
   if (!isPlainRecord(value)) {
     throw new Error(`Invalid serverless result ${name}: expected an object of string-array header values.`);
   }
-  const headers = {};
+  const headers = /* @__PURE__ */ Object.create(null);
   for (const [key, headerValue] of Object.entries(value)) {
     if (headerValue === void 0) continue;
     if (!Array.isArray(headerValue) || headerValue.some((entry) => typeof entry !== "string")) {
       throw new Error(`Invalid serverless result ${name}.${key}: expected an array of string header values.`);
     }
+    if (headerValue.length === 0) {
+      validateServerlessHeaderName(key, `${name}.${key}`);
+      continue;
+    }
     for (const entry of headerValue) {
       validateServerlessHeader(key, entry, `${name}.${key}`);
     }
@@ -1765,6 +2013,13 @@ function validateMultiValueHeaders(value, name) {
   }
   return headers;
 }
+function validateServerlessHeaderName(key, label) {
+  try {
+    (0, import_node_http2.validateHeaderName)(key);
+  } catch (error) {
+    throw new Error(`Invalid serverless result header ${label}: ${error.message}`, { cause: error });
+  }
+}
 function validateServerlessHeader(key, value, label) {
   try {
     (0, import_node_http2.validateHeaderName)(key);
@@ -1823,18 +2078,42 @@ function createServerlessAdapterApp(handler, options = {}) {
         }
         let result;
         try {
-          const event = toServerlessEvent(req.method, req.url, req.headers, body);
+          const raw = req.rawHeaders ?? req.headersDistinct;
+          const event = toServerlessEvent(req.method, req.url, req.headers, body, raw);
           result = await handler(event, {});
         } catch (e) {
           console.error("Serverless adapter error:", e);
           if (!res.headersSent && !res.writableEnded) res.status(500).end("Internal server error");
           return;
         }
+        let baselineHeaders;
+        try {
+          baselineHeaders = new Set(Object.keys(res.getHeaders()).map((name) => name.toLowerCase()));
+        } catch (_e) {
+          void _e;
+          baselineHeaders = void 0;
+        }
         try {
           applyServerlessResult(result, res);
         } catch (e) {
           console.error("Invalid serverless handler result:", e);
-          if (!res.headersSent && !res.writableEnded) res.status(500).end("Internal server error");
+          if (!res.headersSent && !res.writableEnded) {
+            try {
+              for (const name of Object.keys(res.getHeaders())) {
+                const lower = name.toLowerCase();
+                if (lower === "content-length") continue;
+                if (baselineHeaders !== void 0 && baselineHeaders.has(lower)) continue;
+                try {
+                  res.removeHeader(name);
+                } catch (_e) {
+                  void _e;
+                }
+              }
+            } catch (_e) {
+              void _e;
+            }
+            res.status(500).end("Internal server error");
+          }
         }
       });
     },
@@ -1880,7 +2159,7 @@ async function loadHandler(handlerPath) {
   }
   return exported;
 }
-var import_node_url, import_node_path, import_node_fs, import_node_module, import_node_child_process, import_node_http2, CLI_VERSION, DEFAULT_WATCH_EXTENSIONS, DEFAULT_WATCH_DELAY, moduleRequire, DEFAULT_WATCH_KILL_TIMEOUT_MS, TEMP_BUILD_ENTRY_FILENAME, TEMP_SERVERLESS_ENTRY_FILENAME, STAGING_DIR_PREFIX, DEFAULT_ADAPTER_MAX_BODY_BYTES;
+var import_node_url, import_node_path, import_node_fs, import_node_module, import_node_child_process, import_node_http2, CLI_VERSION, DEFAULT_WATCH_EXTENSIONS, DEFAULT_WATCH_DELAY, DEFAULT_WATCH_KILL_TIMEOUT_MS, TEMP_BUILD_ENTRY_FILENAME, TEMP_SERVERLESS_ENTRY_FILENAME, STAGING_DIR_PREFIX, DEFAULT_ADAPTER_MAX_BODY_BYTES;
 var init_cli_utils = __esm({
   "src/cli-utils.ts"() {
     "use strict";
@@ -1895,9 +2174,6 @@ var init_cli_utils = __esm({
     CLI_VERSION = resolveCliVersion();
     DEFAULT_WATCH_EXTENSIONS = ["ts", "js", "mjs", "cjs", "json"];
     DEFAULT_WATCH_DELAY = 500;
-    moduleRequire = (0, import_node_module.createRequire)(
-      (0, import_node_url.pathToFileURL)((0, import_node_path.resolve)(process.cwd(), "__wtt_runtime_preload__.js"))
-    );
     DEFAULT_WATCH_KILL_TIMEOUT_MS = 5e3;
     TEMP_BUILD_ENTRY_FILENAME = ".express-runtime-build-entry.ts";
     TEMP_SERVERLESS_ENTRY_FILENAME = ".express-runtime-build-serverless-entry.ts";
@@ -1961,7 +2237,7 @@ async function runExpressDevCommand(args) {
   await runDevCommand(args, {
     load: loadApp,
     start: (app, options) => {
-      startLocalServer(app, options);
+      return startLocalServer(app, options);
     }
   });
 }