srvx 0.2.5 → 0.2.6

package/README.md

@@ -9,7 +9,7 @@
 
 Universal Server API based on web platform standards. Works with [Deno](https://deno.com/), [Bun](https://bun.sh/) and [Node.js](https://nodejs.org/en).
 
-- ✅ Seamless runtime integration with identical usage ([handler](https://srvx.unjs.io/guide/handler) and
+- ✅ Seamless runtime integration with identical usage ([handler](https://srvx.unjs.io/guide/handler) and [instance](https://srvx.unjs.io/guide/server))
 - ✅ Zero overhead [Deno](https://deno.com/) and [Bun](https://bun.sh/) support
 - ✅ [Node.js compatibility](https://srvx.unjs.io/guide/node) with ~native perf and [fast response](https://srvx.unjs.io/guide/node#fast-response) support
 

package/dist/adapters/bun.d.mts

@@ -1,6 +1,7 @@
 import { ServerOptions, Server, BunFetchandler } from '../types.mjs';
 import * as Bun from 'bun';
 import 'node:http';
+import 'node:https';
 import 'node:net';
 import '@cloudflare/workers-types';
 
@@ -16,7 +17,7 @@ declare class BunServer implements Server<BunFetchandler> {
     readonly runtime = "bun";
     readonly options: ServerOptions;
     readonly bun: Server["bun"];
-    readonly serveOptions: Bun.ServeOptions;
+    readonly serveOptions: Bun.ServeOptions | Bun.TLSServeOptions;
     readonly fetch: BunFetchandler;
     constructor(options: ServerOptions);
     serve(): Promise<Awaited<this>>;

package/dist/adapters/bun.mjs

@@ -1,5 +1,6 @@
-import { r as resolvePort } from '../shared/srvx.PbkQy9Ck.mjs';
+import { r as resolveTLSOptions, a as resolvePort } from '../shared/srvx.lC_d9z2b.mjs';
 import { w as wrapFetch } from '../shared/srvx.DhN4g5wJ.mjs';
+import 'node:fs';
 
 const Response = globalThis.Response;
 function serve(options) {
@@ -21,11 +22,18 @@ class BunServer {
       });
       return fetchHandler(request);
     };
+    const tls = resolveTLSOptions(this.options);
     this.serveOptions = {
       hostname: this.options.hostname,
       reusePort: this.options.reusePort,
       port: resolvePort(this.options.port, globalThis.process?.env.PORT),
       ...this.options.bun,
+      tls: {
+        cert: tls?.cert,
+        key: tls?.key,
+        passphrase: tls?.passphrase,
+        ...this.options.bun?.tls
+      },
       fetch: this.fetch
     };
     if (!options.manual) {

package/dist/adapters/cloudflare.d.mts

@@ -1,6 +1,7 @@
 import { ServerOptions, Server } from '../types.mjs';
 import * as CF from '@cloudflare/workers-types';
 import 'node:http';
+import 'node:https';
 import 'node:net';
 import 'bun';
 

package/dist/adapters/deno.d.mts

@@ -1,5 +1,6 @@
 import { ServerOptions, Server, DenoFetchHandler } from '../types.mjs';
 import 'node:http';
+import 'node:https';
 import 'node:net';
 import 'bun';
 import '@cloudflare/workers-types';
@@ -17,7 +18,7 @@ declare class DenoServer implements Server<DenoFetchHandler> {
     readonly runtime = "deno";
     readonly options: ServerOptions;
     readonly deno: Server["deno"];
-    readonly serveOptions: Deno.ServeTcpOptions;
+    readonly serveOptions: Deno.ServeTcpOptions | (Deno.ServeTcpOptions & Deno.TlsCertifiedKeyPem);
     readonly fetch: DenoFetchHandler;
     constructor(options: ServerOptions);
     serve(): Promise<this>;

package/dist/adapters/deno.mjs

@@ -1,5 +1,6 @@
-import { r as resolvePort, f as fmtURL } from '../shared/srvx.PbkQy9Ck.mjs';
+import { r as resolveTLSOptions, a as resolvePort, f as fmtURL } from '../shared/srvx.lC_d9z2b.mjs';
 import { w as wrapFetch } from '../shared/srvx.DhN4g5wJ.mjs';
+import 'node:fs';
 
 const Response = globalThis.Response;
 function serve(options) {
@@ -21,10 +22,12 @@ class DenoServer {
       });
       return fetchHandler(request);
     };
+    const tls = resolveTLSOptions(this.options);
     this.serveOptions = {
       port: resolvePort(this.options.port, globalThis.Deno?.env.get("PORT")),
       hostname: this.options.hostname,
       reusePort: this.options.reusePort,
+      ...tls ? { key: tls.key, cert: tls.cert, passphrase: tls.passphrase } : {},
       ...this.options.deno
     };
     if (!options.manual) {
@@ -55,7 +58,11 @@ class DenoServer {
     return Promise.resolve(this.#listeningPromise).then(() => this);
   }
   get url() {
-    return this.#listeningInfo ? fmtURL(this.#listeningInfo.hostname, this.#listeningInfo.port) : void 0;
+    return this.#listeningInfo ? fmtURL(
+      this.#listeningInfo.hostname,
+      this.#listeningInfo.port,
+      !!this.serveOptions.cert
+    ) : void 0;
   }
   ready() {
     return Promise.resolve(this.#listeningPromise).then(() => this);

package/dist/adapters/node.d.mts

@@ -1,6 +1,7 @@
 import { ServerOptions, Server, FetchHandler, NodeHttpHandler } from '../types.mjs';
 import NodeHttp__default from 'node:http';
 import { Readable } from 'node:stream';
+import 'node:https';
 import 'node:net';
 import 'bun';
 import '@cloudflare/workers-types';
@@ -13,8 +14,8 @@ type NodeFastResponse = InstanceType<typeof NodeFastResponse>;
  */
 declare const NodeFastResponse: {
     new (body?: BodyInit | null, init?: ResponseInit): {
-        "__#4201@#body"?: BodyInit | null;
-        "__#4201@#init"?: ResponseInit;
+        "__#4363@#body"?: BodyInit | null;
+        "__#4363@#init"?: ResponseInit;
         /**
          * Prepare Node.js response object
          */
@@ -25,11 +26,11 @@ declare const NodeFastResponse: {
             body: string | Uint8Array<ArrayBufferLike> | ReadableStream<Uint8Array<ArrayBufferLike>> | Readable | Buffer<ArrayBufferLike> | DataView<ArrayBufferLike> | null | undefined;
         };
         /** Lazy initialized response instance */
-        "__#4201@#responseObj"?: Response;
+        "__#4363@#responseObj"?: Response;
         /** Lazy initialized headers instance */
-        "__#4201@#headersObj"?: Headers;
+        "__#4363@#headersObj"?: Headers;
         clone(): Response;
-        readonly "__#4201@#response": Response;
+        readonly "__#4363@#response": Response;
         readonly headers: Headers;
         readonly ok: boolean;
         readonly redirected: boolean;
@@ -37,7 +38,7 @@ declare const NodeFastResponse: {
         readonly statusText: string;
         readonly type: ResponseType;
         readonly url: string;
-        "__#4201@#fastBody"<T extends object>(as: new (...args: any[]) => T): T | null | false;
+        "__#4363@#fastBody"<T extends object>(as: new (...args: any[]) => T): T | null | false;
         readonly body: ReadableStream<Uint8Array> | null;
         readonly bodyUsed: boolean;
         arrayBuffer(): Promise<ArrayBuffer>;

package/dist/adapters/node.mjs

@@ -1,7 +1,9 @@
 import NodeHttp from 'node:http';
+import NodeHttps from 'node:https';
 import { splitSetCookieString } from 'cookie-es';
-import { r as resolvePort, f as fmtURL } from '../shared/srvx.PbkQy9Ck.mjs';
+import { r as resolveTLSOptions, a as resolvePort, f as fmtURL } from '../shared/srvx.lC_d9z2b.mjs';
 import { w as wrapFetch } from '../shared/srvx.DhN4g5wJ.mjs';
+import 'node:fs';
 
 async function sendNodeResponse(nodeRes, webRes) {
   if (!webRes) {
@@ -11,7 +13,7 @@ async function sendNodeResponse(nodeRes, webRes) {
   if (webRes.nodeResponse) {
     const res = webRes.nodeResponse();
     if (!nodeRes.headersSent) {
-      nodeRes.writeHead(res.status, res.statusText, res.headers);
+      nodeRes.writeHead(res.status, res.statusText, res.headers.flat());
     }
     if (res.body) {
       if (res.body instanceof ReadableStream) {
@@ -35,7 +37,11 @@ async function sendNodeResponse(nodeRes, webRes) {
     }
   }
   if (!nodeRes.headersSent) {
-    nodeRes.writeHead(webRes.status || 200, webRes.statusText, headerEntries);
+    nodeRes.writeHead(
+      webRes.status || 200,
+      webRes.statusText,
+      headerEntries.flat()
+    );
   }
   return webRes.body ? streamBody(webRes.body, nodeRes) : endNodeResponse(nodeRes);
 }
@@ -416,6 +422,7 @@ const NodeRequestProxy = /* @__PURE__ */ (() => {
           return false;
         }
       }
+      this.#hasBody = true;
       return true;
     }
     get body() {
@@ -761,13 +768,18 @@ class NodeServer {
       const res = fetchHandler(request);
       return res instanceof Promise ? res.then((resolvedRes) => sendNodeResponse(nodeRes, resolvedRes)) : sendNodeResponse(nodeRes, res);
     };
+    const tls = resolveTLSOptions(this.options);
     this.serveOptions = {
       port: resolvePort(this.options.port, globalThis.process?.env.PORT),
       host: this.options.hostname,
       exclusive: !this.options.reusePort,
+      ...tls ? { cert: tls.cert, key: tls.key, passphrase: tls.passphrase } : {},
       ...this.options.node
     };
-    const server = NodeHttp.createServer(this.serveOptions, handler);
+    const server = this.serveOptions.cert ? NodeHttps.createServer(
+      this.serveOptions,
+      handler
+    ) : NodeHttp.createServer(this.serveOptions, handler);
     this.node = { server, handler };
     if (!options.manual) {
       this.serve();
@@ -787,7 +799,11 @@ class NodeServer {
     if (!addr) {
       return;
     }
-    return typeof addr === "string" ? addr : fmtURL(addr.address, addr.port);
+    return typeof addr === "string" ? addr : fmtURL(
+      addr.address,
+      addr.port,
+      this.node.server instanceof NodeHttps.Server
+    );
   }
   ready() {
     return Promise.resolve(this.#listeningPromise).then(() => this);

package/dist/shared/srvx.lC_d9z2b.mjs

@@ -0,0 +1,57 @@
+import { readFileSync } from 'node:fs';
+
+function resolvePort(portOptions, portEnv) {
+  const portInput = portOptions ?? portEnv;
+  if (portInput === void 0) {
+    return 3e3;
+  }
+  return typeof portInput === "number" ? portInput : Number.parseInt(portInput, 10);
+}
+function fmtURL(host, port, secure) {
+  if (!host || !port) {
+    return void 0;
+  }
+  if (host.includes(":")) {
+    host = `[${host}]`;
+  }
+  return `http${secure ? "s" : ""}://${host}:${port}/`;
+}
+function resolveTLSOptions(opts) {
+  if (!opts.tls || opts.protocol === "http") {
+    return;
+  }
+  const cert = resolveCertOrKey(opts.tls.cert);
+  const key = resolveCertOrKey(opts.tls.key);
+  if (!cert && !key) {
+    if (opts.protocol === "https") {
+      throw new TypeError(
+        "TLS `cert` and `key` must be provided for `https` protocol."
+      );
+    }
+    return;
+  }
+  if (!cert || !key) {
+    throw new TypeError("TLS `cert` and `key` must be provided together.");
+  }
+  return {
+    cert,
+    key,
+    passphrase: opts.tls.passphrase
+  };
+}
+function resolveCertOrKey(value) {
+  if (!value) {
+    return;
+  }
+  if (typeof value !== "string") {
+    throw new TypeError(
+      "TLS certificate and key must be strings in PEM format or file paths."
+    );
+  }
+  if (value.startsWith("-----BEGIN ")) {
+    return value;
+  }
+  return readFileSync(value, "utf8");
+}
+
+export { resolvePort as a, fmtURL as f, resolveTLSOptions as r };

package/dist/types.d.mts

@@ -1,4 +1,5 @@
 import * as NodeHttp from 'node:http';
+import * as NodeHttps from 'node:https';
 import * as NodeNet from 'node:net';
 import * as Bun from 'bun';
 import * as CF from '@cloudflare/workers-types';
@@ -51,16 +52,41 @@ interface ServerOptions {
      * **Note:** Despite Node.js built-in behavior that has `exclusive` flag (opposite of `reusePort`) enabled by default, srvx uses non-exclusive mode for consistency.
      */
     reusePort?: boolean;
+    /**
+     * The protocol to use for the server.
+     *
+     * Possible values are `http` and `https`.
+     *
+     * If `protocol` is not set, Server will use `http` as the default protocol or `https` if both `tls.cert` and `tls.key` options are provided.
+     */
+    protocol?: "http" | "https";
+    /**
+     * TLS server options.
+     */
+    tls?: {
+        /**
+         * File path or inlined TLS certificate in PEM format (required).
+         */
+        cert?: string;
+        /**
+         * File path or inlined TLS private key in PEM format (required).
+         */
+        key?: string;
+        /**
+         * Passphrase for the private key (optional).
+         */
+        passphrase?: string;
+    };
     /**
      * Node.js server options.
      */
-    node?: NodeHttp.ServerOptions & NodeNet.ListenOptions;
+    node?: (NodeHttp.ServerOptions | NodeHttps.ServerOptions) & NodeNet.ListenOptions;
     /**
      * Bun server options
      *
      * @docs https://bun.sh/docs/api/http
      */
-    bun?: Omit<Bun.ServeOptions, "fetch">;
+    bun?: Omit<Bun.ServeOptions | Bun.TLSServeOptions, "fetch">;
     /**
      * Deno server options
      *

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "srvx",
-  "version": "0.2.5",
+  "version": "0.2.6",
   "description": "Universal Server API based on web platform standards. Works seamlessly with Deno, Bun and Node.js.",
   "repository": "unjs/srvx",
   "license": "MIT",
@@ -30,6 +30,7 @@
     "dev": "vitest dev",
     "lint": "eslint . && prettier -c .",
     "lint:fix": "automd && eslint . --fix && prettier -w .",
+    "play:mkcert": "openssl req -x509 -newkey rsa:2048 -nodes -keyout server.key -out server.crt -days 365 -subj /CN=srvx.local",
     "play:node": "node playground/app.mjs",
     "play:deno": "deno run -A playground/app.mjs",
     "play:bun": "bun playground/app.mjs",
@@ -46,16 +47,16 @@
     "cookie-es": "^2.0.0"
   },
   "devDependencies": {
-    "@cloudflare/workers-types": "^4.20250303.0",
-    "@hono/node-server": "^1.13.8",
+    "@cloudflare/workers-types": "^4.20250321.0",
+    "@hono/node-server": "^1.14.0",
     "@mjackson/node-fetch-server": "^0.6.1",
-    "@types/bun": "^1.2.4",
+    "@types/bun": "^1.2.5",
     "@types/deno": "^2.2.0",
-    "@types/node": "^22.13.10",
-    "@vitest/coverage-v8": "^3.0.8",
+    "@types/node": "^22.13.13",
+    "@vitest/coverage-v8": "^3.0.9",
     "automd": "^0.4.0",
     "changelogen": "^0.6.1",
-    "eslint": "^9.22.0",
+    "eslint": "^9.23.0",
     "eslint-config-unjs": "^0.4.2",
     "execa": "^9.5.2",
     "get-port-please": "^3.1.2",
@@ -63,7 +64,7 @@
     "prettier": "^3.5.3",
     "typescript": "^5.8.2",
     "unbuild": "^3.5.0",
-    "vitest": "^3.0.8"
+    "vitest": "^3.0.9"
   },
-  "packageManager": "pnpm@10.6.2"
+  "packageManager": "pnpm@10.6.5"
 }

package/dist/shared/srvx.PbkQy9Ck.mjs

@@ -1,18 +0,0 @@
-function resolvePort(portOptions, portEnv) {
-  const portInput = portOptions ?? portEnv;
-  if (portInput === void 0) {
-    return 3e3;
-  }
-  return typeof portInput === "number" ? portInput : Number.parseInt(portInput, 10);
-}
-function fmtURL(host, port, ssl) {
-  if (!host || !port) {
-    return void 0;
-  }
-  if (host.includes(":")) {
-    host = `[${host}]`;
-  }
-  return `http${""}://${host}:${port}/`;
-}
-
-export { fmtURL as f, resolvePort as r };