@dunx/http 3.2.1 → 3.3.0

package/dist/index.js

@@ -1,43 +1,107 @@
 // @bun
 import {
-  TRACEPARENT_HEADER,
-  TRACERESPONSE_HEADER,
-  TRACESTATE_HEADER,
-  TraceContext
-} from "./chunk-3j2n1n11.js";
+  HttpStatusCode2
+} from "./chunk-bg0dr54z.js";
 import {
-  ApiHidden,
-  HIDDEN,
-  HandlerKind,
-  PUBLIC,
-  Public,
-  ROLES,
-  Roles,
-  UNMATCHED,
-  UseGuards,
-  buildContext,
-  defaultStatusFor,
-  discoverGateways,
-  discoverRoutes,
-  joinPath,
+  defaultStatusFor2,
+  markRoute,
   markController,
-  markGateway,
+  metaKey2,
+  meta2,
+  ROLES2,
+  PUBLIC2,
+  HIDDEN2,
+  UNMATCHED2,
+  Roles2,
+  Public2,
+  ApiHidden2,
+  UseGuards2,
+  metaOf2,
+  mergeMeta2,
+  joinPath2,
+  discoverRoutes2,
+  HandlerKind,
   markHandler,
-  markRoute,
-  mergeMeta,
-  meta,
-  metaKey,
-  metaOf
-} from "./chunk-3nbj06q8.js";
+  markGateway,
+  discoverGateways,
+  buildContext2
+} from "./chunk-8939brh2.js";
 import {
-  HttpStatusCode,
-  __decorateElement,
-  __decoratorMetadata,
-  __decoratorStart,
-  __privateAdd,
-  __privateGet,
-  __runInitializers
-} from "./chunk-sz4pvqxy.js";
+  TRACEPARENT_HEADER2,
+  TRACESTATE_HEADER2,
+  TRACERESPONSE_HEADER2,
+  TraceContext2
+} from "./chunk-gmtwad7f.js";
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __name = (target, name) => {
+  Object.defineProperty(target, "name", {
+    value: name,
+    enumerable: false,
+    configurable: true
+  });
+  return target;
+};
+var __knownSymbol = (name, symbol) => (symbol = Symbol[name]) ? symbol : Symbol.for("Symbol." + name);
+var __typeError = (msg) => {
+  throw TypeError(msg);
+};
+var __defNormalProp = (obj, key, value) => (key in obj) ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __accessCheck = (obj, member, msg) => member.has(obj) || __typeError("Cannot " + msg);
+var __privateIn = (member, obj) => Object(obj) !== obj ? __typeError('Cannot use the "in" operator on this value') : member.has(obj);
+var __privateGet = (obj, member, getter) => (__accessCheck(obj, member, "read from private field"), getter ? getter.call(obj) : member.get(obj));
+var __privateAdd = (obj, member, value) => member.has(obj) ? __typeError("Cannot add the same private member more than once") : member instanceof WeakSet ? member.add(obj) : member.set(obj, value);
+var __privateSet = (obj, member, value, setter) => (__accessCheck(obj, member, "write to private field"), setter ? setter.call(obj, value) : member.set(obj, value), value);
+var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "access private method"), method);
+var __decoratorStart = (base) => [, , , __create(base?.[__knownSymbol("metadata")] ?? null)];
+var __decoratorStrings = ["class", "method", "getter", "setter", "accessor", "field", "value", "get", "set"];
+var __expectFn = (fn) => fn !== undefined && typeof fn !== "function" ? __typeError("Function expected") : fn;
+var __decoratorContext = (kind, name, done, metadata, fns) => ({
+  kind: __decoratorStrings[kind],
+  name,
+  metadata,
+  addInitializer: (fn) => done._ ? __typeError("Already initialized") : fns.push(__expectFn(fn || null))
+});
+var __decoratorMetadata = (array, target) => __defNormalProp(target, __knownSymbol("metadata"), array[3]);
+var __runInitializers = (array, flags, self, value) => {
+  for (var i = 0, fns = array[flags >> 1], n = fns && fns.length;i < n; i++)
+    flags & 1 ? fns[i].call(self) : value = fns[i].call(self, value);
+  return value;
+};
+var __decorateElement = (array, flags, name, decorators, target, extra) => {
+  var fn, it, done, ctx, access, k = flags & 7, s = !!(flags & 8), p = !!(flags & 16);
+  var j = k > 3 ? array.length + 1 : k ? s ? 1 : 2 : 0, key = __decoratorStrings[k + 5];
+  var initializers = k > 3 && (array[j - 1] = []), extraInitializers = array[j] || (array[j] = []);
+  var desc = k && (!p && !s && (target = target.prototype), k < 5 && (k > 3 || !p) && __getOwnPropDesc(k < 4 ? target : {
+    get [name]() {
+      return __privateGet(this, extra);
+    },
+    set [name](x) {
+      __privateSet(this, extra, x);
+    }
+  }, name));
+  k ? p && k < 4 && __name(extra, (k > 2 ? "set " : k > 1 ? "get " : "") + name) : __name(target, name);
+  for (var i = decorators.length - 1;i >= 0; i--) {
+    ctx = __decoratorContext(k, name, done = {}, array[3], extraInitializers);
+    if (k) {
+      ctx.static = s, ctx.private = p, access = ctx.access = { has: p ? (x) => __privateIn(target, x) : (x) => (name in x) };
+      if (k ^ 3)
+        access.get = p ? (x) => (k ^ 1 ? __privateGet : __privateMethod)(x, target, k ^ 4 ? extra : desc.get) : (x) => x[name];
+      if (k > 2)
+        access.set = p ? (x, y) => __privateSet(x, target, y, k ^ 4 ? extra : desc.set) : (x, y) => x[name] = y;
+    }
+    it = (0, decorators[i])(k ? k < 4 ? p ? extra : desc[key] : k > 4 ? undefined : { get: desc.get, set: desc.set } : target, ctx);
+    done._ = 1;
+    if (k ^ 4 || it === undefined)
+      __expectFn(it) && (k > 4 ? initializers.unshift(it) : k ? p ? extra = it : desc[key] = it : target = it);
+    else if (typeof it !== "object" || it === null)
+      __typeError("Object expected");
+    else
+      __expectFn(fn = it.get) && (desc.get = fn), __expectFn(fn = it.set) && (desc.set = fn), __expectFn(fn = it.init) && initializers.unshift(fn);
+  }
+  return k || __decoratorMetadata(array, target), desc && __defProp(target, name, desc), p ? k ^ 4 ? extra : desc : target;
+};
 
 // src/route/decorators.ts
 var Controller = (prefix = "") => (target) => {
@@ -74,7 +138,7 @@ class ClientAddress {
     }
     const hops = trustedHops(source.trustProxy);
     if (hops > 0) {
-      const entries = (req.headers.get("x-forwarded-for") ?? "").split(",").map((entry2) => entry2.trim()).filter((entry2) => entry2.length > 0);
+      const entries = (req.headers.get("x-forwarded-for") ?? "").split(",").map((entry) => entry.trim()).filter((entry) => entry.length > 0);
       const entry = entries[Math.max(0, entries.length - hops)];
       if (entry)
         return unmap(entry);
@@ -104,7 +168,7 @@ class ValidationError extends HttpError {
   issues;
   name = "ValidationError";
   constructor(source, issues) {
-    super(HttpStatusCode.BAD_REQUEST, `Invalid ${source}`);
+    super(HttpStatusCode2.BAD_REQUEST, `Invalid ${source}`);
     this.source = source;
     this.issues = issues;
   }
@@ -129,7 +193,7 @@ var errorMapper = (logger) => (error) => {
     });
   }
   if (error instanceof AppError2 && isStatus(error.status)) {
-    if (error.status >= HttpStatusCode.INTERNAL_SERVER_ERROR) {
+    if (error.status >= HttpStatusCode2.INTERNAL_SERVER_ERROR) {
       logger.error("Unhandled error", error);
     }
     return Response.json({ error: error.message, status: error.status }, { status: error.status });
@@ -137,8 +201,8 @@ var errorMapper = (logger) => (error) => {
   logger.error("Unhandled error", error);
   return Response.json({
     error: "Internal Server Error",
-    status: HttpStatusCode.INTERNAL_SERVER_ERROR
-  }, { status: HttpStatusCode.INTERNAL_SERVER_ERROR });
+    status: HttpStatusCode2.INTERNAL_SERVER_ERROR
+  }, { status: HttpStatusCode2.INTERNAL_SERVER_ERROR });
 };
 var isStatus = (value) => value !== undefined && Number.isInteger(value) && value >= 200 && value <= 599;
 var defaultErrorMapper = errorMapper(new ConsoleLogger);
@@ -174,7 +238,7 @@ class RequestMetrics {
   observe(ctx, status, durationNs, traceId) {
     let series = this.#series.get(ctx);
     if (series === undefined) {
-      if (ctx.get(UNMATCHED) === true) {
+      if (ctx.get(UNMATCHED2) === true) {
         series = this.#unmatched.get(ctx.method);
         if (series === undefined) {
           series = seriesFor(UNMATCHED_ROUTE, ctx.method);
@@ -238,7 +302,7 @@ class MetricsMiddleware {
       this.metrics.observe(ctx, response.status, Bun.nanoseconds() - started);
       return response;
     }, (error) => {
-      this.metrics.observe(ctx, error instanceof HttpError ? error.status : HttpStatusCode.INTERNAL_SERVER_ERROR, Bun.nanoseconds() - started);
+      this.metrics.observe(ctx, error instanceof HttpError ? error.status : HttpStatusCode2.INTERNAL_SERVER_ERROR, Bun.nanoseconds() - started);
       throw error;
     });
   }
@@ -348,7 +412,7 @@ var reportedByMiddleware = () => {
 };
 var unreported = (middleware) => "Socket middleware is installed and none of it sets reportsErrors, so a " + "throwing gateway handler is reported nowhere: the console fallback is off " + "whenever middleware wraps the handler. Set reportsErrors on the one that " + "records a failure, or pass websocket.onError. Installed: " + `${middleware.map((entry) => entry.constructor.name).join(", ")}.`;
 var runtimeOf = (socket) => socket.data[RUNTIME];
-var isBinary = (value) => value instanceof ArrayBuffer || ArrayBuffer.isView(value);
+var isBinary = (value) => value instanceof ArrayBuffer || ArrayBuffer.isView(value) || value instanceof Blob;
 var replyRaw = (socket, value) => {
   if (value === undefined)
     return;
@@ -431,7 +495,27 @@ var buildWebSocket = (discovered, options = {}, middleware = []) => {
   const gateways = [...wrapped.values()];
   const onError = options.onError ?? (middleware.length === 0 ? defaultOnError : reportedByMiddleware);
   const reports = options.onError !== undefined || middleware.some((entry) => entry.reportsErrors === true);
-  const { onError: _onError, ...socketOptions } = options;
+  const {
+    onError: _onError,
+    binaryType,
+    backpressureLimit,
+    closeOnBackpressureLimit,
+    idleTimeout,
+    maxPayloadLength,
+    perMessageDeflate,
+    publishToSelf,
+    sendPings,
+    ...rest
+  } = options;
+  const handlerOptions = {
+    ...backpressureLimit !== undefined && { backpressureLimit },
+    ...closeOnBackpressureLimit !== undefined && { closeOnBackpressureLimit },
+    ...idleTimeout !== undefined && { idleTimeout },
+    ...maxPayloadLength !== undefined && { maxPayloadLength },
+    ...perMessageDeflate !== undefined && { perMessageDeflate },
+    ...publishToSelf !== undefined && { publishToSelf },
+    ...sendPings !== undefined && { sendPings }
+  };
   const run = (invoke, args, ws, then) => {
     try {
       settle(invoke(...args), ws, onError, then);
@@ -440,7 +524,7 @@ var buildWebSocket = (discovered, options = {}, middleware = []) => {
     }
   };
   const websocket = {
-    ...socketOptions,
+    ...handlerOptions,
     message(ws, message) {
       const gateway = runtimeOf(ws);
       let event;
@@ -460,17 +544,19 @@ var buildWebSocket = (discovered, options = {}, middleware = []) => {
         run(gateway.raw, [message, ws], ws, (value) => replyRaw(ws, value));
         return;
       }
-      const unclaimed2 = ws.data[UNCLAIMED];
-      if (!unclaimed2)
+      const unclaimed = ws.data[UNCLAIMED];
+      if (!unclaimed)
         return;
       try {
-        settle(unclaimed2({ socket: ws, data: message }, event), ws, onError, undefined);
+        settle(unclaimed({ socket: ws, data: message }, event), ws, onError, undefined);
       } catch (error) {
         onError(error, ws);
       }
     },
-    ...someHandler(gateways, (g) => g.open) && {
+    ...(someHandler(gateways, (g) => g.open) || binaryType !== undefined) && {
       open(ws) {
+        if (binaryType !== undefined)
+          ws.binaryType = binaryType;
         const { open } = runtimeOf(ws);
         if (open)
           run(open, [ws], ws, undefined);
@@ -633,6 +719,8 @@ class SocketLoggingMiddleware {
     if (data instanceof ArrayBuffer || ArrayBuffer.isView(data)) {
       return `[${data.byteLength} bytes]`;
     }
+    if (data instanceof Blob)
+      return `[${data.size} bytes]`;
     const text = JSON.stringify(data) ?? "";
     return text.length > this.#limit ? `[${text.length} chars]` : data;
   }
@@ -928,7 +1016,7 @@ class RequestLoggingMiddleware {
       context: `${ctx.controller}.${ctx.handler}`
     };
     if (this.#trace) {
-      const trace = TraceContext.adopt(req, this.#traceResponse);
+      const trace = TraceContext2.adopt(req, this.#traceResponse);
       scope.traceId = trace.traceId;
       scope.spanId = trace.spanId;
       scope.traceFlags = trace.flags;
@@ -972,7 +1060,7 @@ class RequestLoggingMiddleware {
   #ignoredWithMetrics(req, ctx, path, next) {
     const started = Bun.nanoseconds();
     const failed = (error) => {
-      this.#observe(req, ctx, error instanceof HttpError ? error.status : HttpStatusCode.INTERNAL_SERVER_ERROR, started);
+      this.#observe(req, ctx, error instanceof HttpError ? error.status : HttpStatusCode2.INTERNAL_SERVER_ERROR, started);
       throw error;
     };
     let settled;
@@ -987,8 +1075,8 @@ class RequestLoggingMiddleware {
     }, failed);
   }
   #correlated(req, ctx, path, next) {
-    const trace = this.#trace ? TraceContext.adopt(req, this.#traceResponse) : undefined;
-    const stamp = (response) => trace === undefined ? response : TraceContext.stamp(response, req);
+    const trace = this.#trace ? TraceContext2.adopt(req, this.#traceResponse) : undefined;
+    const stamp = (response) => trace === undefined ? response : TraceContext2.stamp(response, req);
     if (!this.#correlate)
       return next().then(stamp);
     return this.context.runWithContext({
@@ -1020,7 +1108,7 @@ class RequestLoggingMiddleware {
   }
   #failed(req, ctx, path, started, request, error, scope) {
     this.#shared(req, request);
-    const status = error instanceof HttpError ? error.status : HttpStatusCode.INTERNAL_SERVER_ERROR;
+    const status = error instanceof HttpError ? error.status : HttpStatusCode2.INTERNAL_SERVER_ERROR;
     const entry = {
       ...scope,
       request,
@@ -1030,7 +1118,7 @@ class RequestLoggingMiddleware {
     };
     this.#observe(req, ctx, status, started);
     const line = `${req.method} ${path} ${status}`;
-    if (status < HttpStatusCode.INTERNAL_SERVER_ERROR) {
+    if (status < HttpStatusCode2.INTERNAL_SERVER_ERROR) {
       this.logger.warn(line, entry);
     } else {
       this.logger.error(line, entry);
@@ -1047,7 +1135,7 @@ class RequestLoggingMiddleware {
         statusCode: response.status,
         elapsedMs: elapsedMs2(started)
       });
-      return TraceContext.stamp(response, req);
+      return TraceContext2.stamp(response, req);
     }
     return body.then((value) => {
       this.logger.info(`${req.method} ${path} ${response.status}`, {
@@ -1057,13 +1145,13 @@ class RequestLoggingMiddleware {
         ...value === undefined ? {} : { responseBody: value },
         elapsedMs: elapsedMs2(started)
       });
-      return TraceContext.stamp(response, req);
+      return TraceContext2.stamp(response, req);
     });
   }
   #observe(req, ctx, status, started) {
     if (this.#metrics === undefined)
       return;
-    this.#metrics.observe(ctx, status, Bun.nanoseconds() - started, TraceContext.of(req)?.traceId);
+    this.#metrics.observe(ctx, status, Bun.nanoseconds() - started, TraceContext2.of(req)?.traceId);
   }
   #body(req, ctx) {
     if (!this.#requestBody)
@@ -1130,7 +1218,7 @@ var withCors = (options, handler) => {
 var preflight = (options, methods) => {
   const allowMethods = (options.methods ?? methods).join(", ");
   return async (req) => {
-    const response = applyCors(options, req, new Response(null, { status: HttpStatusCode.NO_CONTENT }));
+    const response = applyCors(options, req, new Response(null, { status: HttpStatusCode2.NO_CONTENT }));
     if (!response.headers.has(ORIGIN))
       return response;
     response.headers.set("access-control-allow-methods", allowMethods);
@@ -1206,16 +1294,16 @@ var fillWith = (draft, source, schema, value) => {
 };
 var bodyFill = (schema) => (draft) => {
   const media = mediaTypeOf(draft.req);
-  const parse2 = parserFor(media);
-  if (parse2 === undefined) {
-    throw new HttpError(HttpStatusCode.UNSUPPORTED_MEDIA_TYPE, `Unsupported content type "${media}". Declared bodies accept ` + "application/json, application/x-www-form-urlencoded, multipart/form-data or text/*.");
+  const parse = parserFor(media);
+  if (parse === undefined) {
+    throw new HttpError(HttpStatusCode2.UNSUPPORTED_MEDIA_TYPE, `Unsupported content type "${media}". Declared bodies accept ` + "application/json, application/x-www-form-urlencoded, multipart/form-data or text/*.");
   }
-  const read = parse2 === asJson && RawBody.wanted(draft.req) ? draft.req.text().then((text) => {
+  const read = parse === asJson && RawBody.wanted(draft.req) ? draft.req.text().then((text) => {
     RawBody.record(draft.req, text);
     return JSON.parse(text);
-  }) : parse2(draft.req);
+  }) : parse(draft.req);
   return read.then((value) => fillWith(draft, "body", schema, value), (error) => {
-    throw new HttpError(HttpStatusCode.BAD_REQUEST, `Malformed ${media} body`, { cause: error });
+    throw new HttpError(HttpStatusCode2.BAD_REQUEST, `Malformed ${media} body`, { cause: error });
   });
 };
 var searchOf = (url) => {
@@ -1257,11 +1345,11 @@ var toResponse = (value, status) => {
   if (value instanceof Response)
     return value;
   if (value === undefined || value === null) {
-    return new Response(null, { status: HttpStatusCode.NO_CONTENT });
+    return new Response(null, { status: HttpStatusCode2.NO_CONTENT });
   }
   return Response.json(value, { status });
 };
-var statusFor = (route) => route.options?.status ?? defaultStatusFor(route.method);
+var statusFor = (route) => route.options?.status ?? defaultStatusFor2(route.method);
 var assertNoCollisions = (discovered) => {
   const owners = new Map;
   for (const route of discovered) {
@@ -1295,22 +1383,22 @@ var unmatchedContext = (req, isPublic) => Object.freeze({
   path: new URL(req.url).pathname,
   parsesBody: false,
   get: (key) => {
-    if (key.id === UNMATCHED.id)
+    if (key.id === UNMATCHED2.id)
       return true;
-    if (key.id === PUBLIC.id && isPublic)
+    if (key.id === PUBLIC2.id && isPublic)
       return true;
     return;
   }
 });
 var buildFallback = (middleware = [], onError = defaultErrorMapper, cors, notFound = "guarded") => {
   const miss = () => {
-    throw new HttpError(HttpStatusCode.NOT_FOUND, "NOT_FOUND");
+    throw new HttpError(HttpStatusCode2.NOT_FOUND, "NOT_FOUND");
   };
   const run = async (req) => {
     try {
       return await compose(middleware, unmatchedContext(req, notFound === "public"), miss)(req);
     } catch (error) {
-      return TraceContext.stamp(onError(error, req), req);
+      return TraceContext2.stamp(onError(error, req), req);
     }
   };
   return cors ? withCors(cors, run) : run;
@@ -1318,7 +1406,7 @@ var buildFallback = (middleware = [], onError = defaultErrorMapper, cors, notFou
 var directOr = (guarded, route, read, status, onError, noMiddleware) => {
   if (!noMiddleware)
     return guarded;
-  const settle2 = (value, req) => {
+  const settle = (value, req) => {
     try {
       return toResponse(value, status);
     } catch (error) {
@@ -1328,7 +1416,7 @@ var directOr = (guarded, route, read, status, onError, noMiddleware) => {
   const invoke = (input, req) => {
     try {
       const value = route.handler(input);
-      return value instanceof Promise ? value.then((resolved) => settle2(resolved, req), (error) => onError(error, req)) : settle2(value, req);
+      return value instanceof Promise ? value.then((resolved) => settle(resolved, req), (error) => onError(error, req)) : settle(value, req);
     } catch (error) {
       return onError(error, req);
     }
@@ -1362,12 +1450,12 @@ var buildRoutes = (discovered, middleware = [], onError = defaultErrorMapper, co
       ...(route.moduleMiddleware ?? []).map((entry) => guardOf(entry, route.module)),
       ...(route.guards ?? []).map((guard) => guardOf(guard, route.module))
     ];
-    const chained = compose(chain, buildContext(route), async (req) => toResponse(await route.handler(await read(req)), status));
+    const chained = compose(chain, buildContext2(route), async (req) => toResponse(await route.handler(await read(req)), status));
     const guarded = async (req) => {
       try {
         return await chained(req);
       } catch (error) {
-        return TraceContext.stamp(onError(error, req), req);
+        return TraceContext2.stamp(onError(error, req), req);
       }
     };
     const byMethod = routes[route.path] ??= {};
@@ -1381,6 +1469,74 @@ var buildRoutes = (discovered, middleware = [], onError = defaultErrorMapper, co
   return routes;
 };
 
+// src/server/binding.ts
+class ServerBinding {
+  #protocols;
+  #main;
+  #gateways;
+  constructor(protocols) {
+    this.#protocols = protocols;
+  }
+  bind(plan) {
+    const { websocket: ws } = plan;
+    const { http2, http1, gatewayPort } = this.#protocols;
+    const split = ws !== undefined && gatewayPort !== undefined;
+    const table = ws && !split ? {
+      routes: withUpgradeRoutes(plan.routes, ws.routes),
+      websocket: ws.websocket
+    } : { routes: plan.routes };
+    this.#main = Bun.serve({
+      port: plan.port,
+      fetch: plan.fetch,
+      ...http2 !== undefined && { http2 },
+      ...http1 !== undefined && { http1 },
+      ...table
+    });
+    if (split) {
+      try {
+        this.#gateways = Bun.serve({
+          port: gatewayPort,
+          fetch: plan.fetch,
+          routes: withUpgradeRoutes({}, ws.routes),
+          websocket: ws.websocket
+        });
+      } catch (error) {
+        this.#main.stop(true);
+        this.#main = undefined;
+        throw error;
+      }
+    }
+    const main = this.#main;
+    const gateways = this.#gateways;
+    return {
+      main,
+      sockets: gateways ?? main,
+      gauges: {
+        get pendingRequests() {
+          return main.pendingRequests + (gateways?.pendingRequests ?? 0);
+        },
+        get pendingWebSockets() {
+          return main.pendingWebSockets + (gateways?.pendingWebSockets ?? 0);
+        }
+      }
+    };
+  }
+  get gatewayUrl() {
+    return this.#gateways?.url.href;
+  }
+  async stop(force) {
+    const main = this.#main;
+    const gateways = this.#gateways;
+    this.#main = undefined;
+    this.#gateways = undefined;
+    await Promise.all([
+      main?.stop(gateways === undefined && force),
+      gateways?.stop(force)
+    ]);
+  }
+}
+Object.defineProperty(ServerBinding, Symbol.for("dunx.deps"), { value: () => [{ unresolved: "protocols: BindingProtocols" }] });
+
 // src/server/settings.ts
 var defaultSettings = () => ({ "trust proxy": false });
 
@@ -1402,10 +1558,11 @@ class HttpApplication extends ShutdownAware {
   #relayResubscribe;
   #notFound;
   #bootLogging;
+  #binding;
+  #split;
   #globalPrefix = "";
   #cors;
   #started = false;
-  #server;
   #resolveClosed;
   #shuttingDown;
   constructor(app, discovered, options, root, websocket) {
@@ -1427,6 +1584,12 @@ class HttpApplication extends ShutdownAware {
     this.#relayResubscribe = options.relayResubscribe;
     this.#notFound = options.notFound ?? "public";
     this.#bootLogging = options.bootLogging ?? true;
+    this.#binding = new ServerBinding({
+      http2: options.http2,
+      http1: options.http1,
+      gatewayPort: options.gatewayPort
+    });
+    this.#split = options.gatewayPort !== undefined && websocket !== undefined;
     this.gatewayPaths = websocket?.paths ?? [];
     this.closed = new Promise((resolve) => {
       this.#resolveClosed = resolve;
@@ -1485,23 +1648,17 @@ class HttpApplication extends ShutdownAware {
     const prefixed = this.#prefixed();
     const routes = buildRoutes(prefixed, middleware, this.#onError, this.#cors, (guard, from) => from === undefined ? this.#app.get(guard) : this.#app.get(guard, from));
     const ws = this.#websocket;
-    if (ws)
+    if (ws && !this.#split)
       assertNoGatewayCollisions(prefixed, ws.paths);
     const fetch = buildFallback(middleware, this.#onError, this.#cors, this.#notFound);
-    const options = ws ? {
-      port,
-      fetch,
-      routes: withUpgradeRoutes(routes, ws.routes),
-      websocket: ws.websocket
-    } : { port, fetch, routes };
-    this.#server = Bun.serve(options);
+    const bound = this.#binding.bind({ port, routes, fetch, websocket: ws });
     attachAddressSource(this.#app.get(ClientAddress), {
-      server: this.#server,
+      server: bound.main,
       trustProxy: this.#settings["trust proxy"]
     });
-    this.#app.get(RequestMetrics).attach(this.#server);
+    this.#app.get(RequestMetrics).attach(bound.gauges);
     const pubsub = this.#app.get(PubSub);
-    pubsub.attach(this.#server);
+    pubsub.attach(bound.sockets);
     if (this.#relay) {
       const logger = this.#app.get(Logger3);
       await pubsub.relayThrough(this.#relay, {
@@ -1517,7 +1674,10 @@ class HttpApplication extends ShutdownAware {
       });
     }
     this.#logServed(prefixed, ws);
-    return this.#server.url.href;
+    return bound.main.url.href;
+  }
+  get gatewayUrl() {
+    return this.#binding.gatewayUrl;
   }
   #logServed(routes, ws) {
     if (!this.#bootLogging)
@@ -1529,6 +1689,7 @@ class HttpApplication extends ShutdownAware {
     ].join(" and ");
     this.#app.get(Logger3).info(`Serving ${subject}`, {
       ...runtimeInfo(),
+      ...this.#binding.gatewayUrl === undefined ? {} : { gatewayUrl: this.#binding.gatewayUrl },
       routes: routes.map((route) => `${route.method} ${route.path}`),
       ...gateways.length === 0 ? {} : {
         gateways: gateways.map((gateway) => ({
@@ -1553,8 +1714,7 @@ class HttpApplication extends ShutdownAware {
         }
       };
       await step(() => this.#app.drain());
-      await step(async () => this.#server?.stop(this.#websocket !== undefined));
-      this.#server = undefined;
+      await step(() => this.#binding.stop(this.#websocket !== undefined));
       await step(() => this.#app.get(PubSub).close());
       try {
         await step(() => this.#app.shutdown());
@@ -1571,7 +1731,7 @@ class HttpApplication extends ShutdownAware {
       return this.#discovered;
     return this.#discovered.map((route) => ({
       ...route,
-      path: joinPath(this.#globalPrefix, route.path)
+      path: joinPath2(this.#globalPrefix, route.path)
     }));
   }
   #assertNotStarted(hook) {
@@ -1580,7 +1740,7 @@ class HttpApplication extends ShutdownAware {
     throw new AppError7(`${hook} must be called before listen(). The route table and the middleware ` + "chain are folded into one closure per route when the server binds, so " + "this call could not take effect.");
   }
 }
-Object.defineProperty(HttpApplication, Symbol.for("dunx.deps"), { value: () => [{ unresolved: "app: App", typeOnly: "App" }, { unresolved: "discovered: readonly DiscoveredRoute[]" }, { unresolved: "options: HttpOptions" }, { unresolved: "root: ModuleRef", typeOnly: "ModuleRef" }, { unresolved: "websocket?: WebSocketRuntime", typeOnly: "WebSocketRuntime" }] });
+Object.defineProperty(HttpApplication, Symbol.for("dunx.deps"), { value: () => [{ unresolved: "app: App", typeOnly: "App" }, { unresolved: "discovered: readonly DiscoveredRoute[]" }, { unresolved: "options: HttpOptions", typeOnly: "HttpOptions" }, { unresolved: "root: ModuleRef", typeOnly: "ModuleRef" }, { unresolved: "websocket?: WebSocketRuntime", typeOnly: "WebSocketRuntime" }] });
 
 // src/server/options-provider.ts
 class HttpOptionsProvider {
@@ -1621,6 +1781,15 @@ class HttpOptionsProvider {
   get relayResubscribe() {
     return;
   }
+  get http2() {
+    return;
+  }
+  get http1() {
+    return;
+  }
+  get gatewayPort() {
+    return;
+  }
 }
 
 class DefaultHttpOptions extends HttpOptionsProvider {
@@ -1643,7 +1812,10 @@ function resolveHttpOptions(settings, given) {
     onError: settings.onError,
     websocket: settings.websocket,
     relay: settings.relay,
-    relayResubscribe: settings.relayResubscribe
+    relayResubscribe: settings.relayResubscribe,
+    http2: settings.http2,
+    http1: settings.http1,
+    gatewayPort: settings.gatewayPort
   };
   for (const key of Object.keys(given)) {
     merged[key] = given[key];
@@ -1697,7 +1869,7 @@ class HttpFactory {
     for (const module of modules) {
       const moduleMiddleware = module.options.middleware ?? [];
       for (const controller of readControllers(module)) {
-        const routes = discoverRoutes(app.get(controller, module.ref));
+        const routes = discoverRoutes2(app.get(controller, module.ref));
         if (routes.length === 0) {
           throw new AppError8(`${controller.name} is registered as a controller but declares no routes. ` + "Add a @Get/@Post/... method, or move it to providers.");
         }
@@ -1716,6 +1888,15 @@ class HttpFactory {
     for (const warning of websocket?.warnings ?? []) {
       app.get(Logger4).warn(warning);
     }
+    if (resolved.gatewayPort !== undefined && resolved.gatewayPort !== 0 && websocket === undefined) {
+      app.get(Logger4).warn(`gatewayPort is set and no gateway is declared, so no second server ` + `binds and gatewayUrl stays undefined. Declare a @Gateway in a ` + `module's providers, or drop gatewayPort.`);
+    }
+    if (resolved.http1 === false && websocket !== undefined && resolved.gatewayPort === undefined) {
+      await app.shutdown().catch(() => {
+        return;
+      });
+      throw new AppError8(`http1: false refuses HTTP/1.x with a 505, and a websocket upgrade is an ` + `HTTP/1.1 request - so nothing could ever connect to ` + `${websocket.paths.join(", ")}. Set gatewayPort to serve the gateways ` + "from a second port that keeps HTTP/1.1, or drop http1: false.");
+    }
     return new HttpApplication(app, discovered, resolved, root, websocket);
   }
   static #socketMiddleware(app, root, options) {
@@ -2108,10 +2289,10 @@ __runInitializers(_init, 1, CompressionModule);
 __decoratorMetadata(_init, CompressionModule);
 let _CompressionModule = CompressionModule;
 // src/throttle/decorators.ts
-var THROTTLE = metaKey("throttle");
-var SKIP_THROTTLE = metaKey("skip-throttle");
-var Throttle = (limit) => meta(THROTTLE, limit);
-var SkipThrottle = () => meta(SKIP_THROTTLE, true);
+var THROTTLE = metaKey2("throttle");
+var SKIP_THROTTLE = metaKey2("skip-throttle");
+var Throttle = (limit) => meta2(THROTTLE, limit);
+var SkipThrottle = () => meta2(SKIP_THROTTLE, true);
 // src/throttle/guard.ts
 import { Logger as Logger5 } from "@dunx/core";
 
@@ -2226,7 +2407,7 @@ class ThrottleGuard {
     this.logger = logger;
   }
   async handle(req, ctx, next) {
-    if (ctx.get(UNMATCHED) === true)
+    if (ctx.get(UNMATCHED2) === true)
       return next();
     if (ctx.get(SKIP_THROTTLE) === true)
       return next();
@@ -2237,7 +2418,7 @@ class ThrottleGuard {
       return next();
     if (used > limit.limit) {
       const after = await this.#ttl(key) ?? limit.windowSeconds;
-      throw new HttpError(HttpStatusCode.TOO_MANY_REQUESTS, `Rate limit exceeded: ${limit.limit} requests per ` + `${limit.windowSeconds}s`, this.options.headers ? {
+      throw new HttpError(HttpStatusCode2.TOO_MANY_REQUESTS, `Rate limit exceeded: ${limit.limit} requests per ` + `${limit.windowSeconds}s`, this.options.headers ? {
         headers: {
           "retry-after": String(after),
           "ratelimit-limit": String(limit.limit),
@@ -2670,8 +2851,8 @@ var HEALTH_REPORT_SCHEMA = Object.freeze({
 // src/health/registry.ts
 var bounded = async (indicator, timeoutMs) => {
   let timer;
-  const timeout = new Promise((resolve2) => {
-    timer = setTimeout(() => resolve2({ state: "unknown", detail: `no answer in ${timeoutMs} ms` }), timeoutMs);
+  const timeout = new Promise((resolve) => {
+    timer = setTimeout(() => resolve({ state: "unknown", detail: `no answer in ${timeoutMs} ms` }), timeoutMs);
     timer.unref?.();
   });
   try {
@@ -2775,11 +2956,11 @@ var _dec = [
   Controller("health")
 ];
 var _dec2 = [
-  Public(),
+  Public2(),
   Get("/live", probeResponses)
 ];
 var _dec3 = [
-  Public(),
+  Public2(),
   Get("/ready", probeResponses)
 ];
 var _health = new WeakMap;
@@ -2804,7 +2985,7 @@ __runInitializers(_init, 1, HealthController);
 __decoratorMetadata(_init, HealthController);
 let _HealthController = HealthController;
 var _dec = [
-  ApiHidden()
+  ApiHidden2()
 ];
 var _base = HealthController;
 var _init = __decoratorStart(_base);
@@ -3001,7 +3182,7 @@ __runInitializers(_init, 1, HealthModule);
 __decoratorMetadata(_init, HealthModule);
 let _HealthModule = HealthModule;
 export {
-  ApiHidden,
+  ApiHidden2 as ApiHidden,
   ClientAddress,
   Compression,
   CompressionEncoding,
@@ -3018,7 +3199,7 @@ export {
   Gateway,
   Get,
   HEALTH_REPORT_SCHEMA,
-  HIDDEN,
+  HIDDEN2 as HIDDEN,
   HealthController,
   HealthIndicator,
   HealthModule,
@@ -3027,7 +3208,7 @@ export {
   HttpError,
   HttpFactory,
   HttpOptionsProvider,
-  HttpStatusCode,
+  HttpStatusCode2 as HttpStatusCode,
   MemoryIndicator,
   MemoryOptions,
   MemoryThrottleStore,
@@ -3039,17 +3220,17 @@ export {
   OnPing,
   OnPong,
   OnUpgrade,
-  PUBLIC,
+  PUBLIC2 as PUBLIC,
   Patch,
   PingProbe,
   Post,
   PostgresRelay,
   PostgresRelayConnectionOptions,
   PubSub,
-  Public,
+  Public2 as Public,
   Put,
   QueryProbe,
-  ROLES,
+  ROLES2 as ROLES,
   Readiness,
   ReadinessOptions,
   RedisIndicator,
@@ -3058,7 +3239,7 @@ export {
   RelayConnectionOptions,
   RequestLoggingMiddleware,
   RequestMetrics,
-  Roles,
+  Roles2 as Roles,
   SKIP_THROTTLE,
   SkipThrottle,
   SocketLoggingMiddleware,
@@ -3066,25 +3247,25 @@ export {
   StaticModule,
   StaticOptions,
   THROTTLE,
-  TRACEPARENT_HEADER,
-  TRACERESPONSE_HEADER,
-  TRACESTATE_HEADER,
+  TRACEPARENT_HEADER2 as TRACEPARENT_HEADER,
+  TRACERESPONSE_HEADER2 as TRACERESPONSE_HEADER,
+  TRACESTATE_HEADER2 as TRACESTATE_HEADER,
   Throttle,
   ThrottleGuard,
   ThrottleModule,
   ThrottleOptions,
   ThrottleStore,
-  TraceContext,
-  UNMATCHED,
+  TraceContext2 as TraceContext,
+  UNMATCHED2 as UNMATCHED,
   UNMATCHED_ROUTE,
-  UseGuards,
+  UseGuards2 as UseGuards,
   ValidationError,
   WsRelay,
   WsRelayModule,
   defaultErrorMapper,
   errorMapper,
-  mergeMeta,
-  meta,
-  metaKey,
-  metaOf
+  mergeMeta2 as mergeMeta,
+  meta2 as meta,
+  metaKey2 as metaKey,
+  metaOf2 as metaOf
 };