srvx 0.2.8 → 0.3.0

package/dist/adapters/bun.mjs

@@ -13,11 +13,14 @@ class BunServer {
     this.options = options;
     const fetchHandler = wrapFetch(this, this.options.fetch);
     this.fetch = (request, server) => {
-      Object.defineProperties(request, {
-        bun: { value: { server }, enumerable: true },
-        remoteAddress: {
-          get: () => server?.requestIP(request)?.address,
-          enumerable: true
+      Object.defineProperty(request, "x", {
+        enumerable: true,
+        value: {
+          runtime: "bun",
+          bun: { server },
+          get ip() {
+            return server?.requestIP(request)?.address;
+          }
         }
       });
       return fetchHandler(request);

package/dist/adapters/cloudflare.mjs

@@ -13,11 +13,11 @@ class CloudflareServer {
       this.options.fetch
     );
     this.fetch = (request, env, context) => {
-      Object.defineProperties(request, {
-        cloudflare: { value: { env, context }, enumerable: true },
-        remoteAddress: {
-          get: () => void 0,
-          enumerable: true
+      Object.defineProperty(request, "x", {
+        enumerable: true,
+        value: {
+          runtime: "cloudflare",
+          cloudflare: { env, context }
         }
       });
       return fetchHandler(request);

package/dist/adapters/deno.mjs

@@ -13,11 +13,14 @@ class DenoServer {
     this.options = options;
     const fetchHandler = wrapFetch(this, this.options.fetch);
     this.fetch = (request, info) => {
-      Object.defineProperties(request, {
-        deno: { value: { info, server: this.deno?.server }, enumerable: true },
-        remoteAddress: {
-          get: () => info?.remoteAddr?.hostname,
-          enumerable: true
+      Object.defineProperty(request, "x", {
+        enumerable: true,
+        value: {
+          runtime: "deno",
+          deno: { info, server: this.deno?.server },
+          get ip() {
+            return info?.remoteAddr?.hostname;
+          }
         }
       });
       return fetchHandler(request);

package/dist/adapters/node.d.mts

@@ -14,8 +14,8 @@ type NodeResponse = InstanceType<typeof NodeResponse>;
  */
 declare const NodeResponse: {
     new (body?: BodyInit | null, init?: ResponseInit): {
-        "__#4363@#body"?: BodyInit | null;
-        "__#4363@#init"?: ResponseInit;
+        "__#4362@#body"?: BodyInit | null;
+        "__#4362@#init"?: ResponseInit;
         /**
          * Prepare Node.js response object
          */
@@ -23,14 +23,14 @@ declare const NodeResponse: {
             status: number;
             statusText: string;
             headers: NodeHttp__default.OutgoingHttpHeader[];
-            body: string | Buffer<ArrayBufferLike> | Uint8Array<ArrayBufferLike> | ReadableStream<Uint8Array<ArrayBufferLike>> | Readable | DataView<ArrayBufferLike> | null | undefined;
+            body: string | Uint8Array<ArrayBufferLike> | ReadableStream<Uint8Array<ArrayBufferLike>> | Readable | Buffer<ArrayBufferLike> | DataView<ArrayBufferLike> | null | undefined;
         };
         /** Lazy initialized response instance */
-        "__#4363@#responseObj"?: globalThis.Response;
+        "__#4362@#responseObj"?: globalThis.Response;
         /** Lazy initialized headers instance */
-        "__#4363@#headersObj"?: Headers;
+        "__#4362@#headersObj"?: Headers;
         clone(): globalThis.Response;
-        readonly "__#4363@#response": globalThis.Response;
+        readonly "__#4362@#response": globalThis.Response;
         readonly headers: Headers;
         readonly ok: boolean;
         readonly redirected: boolean;
@@ -38,7 +38,7 @@ declare const NodeResponse: {
         readonly statusText: string;
         readonly type: ResponseType;
         readonly url: string;
-        "__#4363@#fastBody"<T extends object>(as: new (...args: any[]) => T): T | null | false;
+        "__#4362@#fastBody"<T extends object>(as: new (...args: any[]) => T): T | null | false;
         readonly body: ReadableStream<Uint8Array> | null;
         readonly bodyUsed: boolean;
         arrayBuffer(): Promise<ArrayBuffer>;
@@ -67,7 +67,7 @@ declare const NodeRequestHeaders: {
         req: NodeHttp__default.IncomingMessage;
         res?: NodeHttp__default.ServerResponse;
     }): {
-        node: {
+        _node: {
             req: NodeHttp__default.IncomingMessage;
             res?: NodeHttp__default.ServerResponse;
         };
@@ -96,7 +96,7 @@ declare const NodeResponseHeaders: {
         req?: NodeHttp__default.IncomingMessage;
         res: NodeHttp__default.ServerResponse;
     }): {
-        node: {
+        _node: {
             req?: NodeHttp__default.IncomingMessage;
             res: NodeHttp__default.ServerResponse;
         };

package/dist/adapters/node.mjs

@@ -96,11 +96,11 @@ const kNodeInspect = /* @__PURE__ */ Symbol.for(
 const NodeRequestHeaders = /* @__PURE__ */ (() => {
   const _Headers = class Headers {
     constructor(nodeCtx) {
-      this.node = nodeCtx;
+      this._node = nodeCtx;
     }
     append(name, value) {
       name = name.toLowerCase();
-      const _headers = this.node.req.headers;
+      const _headers = this._node.req.headers;
       const _current = _headers[name];
       if (_current) {
         if (Array.isArray(_current)) {
@@ -114,18 +114,18 @@ const NodeRequestHeaders = /* @__PURE__ */ (() => {
     }
     delete(name) {
       name = name.toLowerCase();
-      this.node.req.headers[name] = void 0;
+      this._node.req.headers[name] = void 0;
     }
     get(name) {
       name = name.toLowerCase();
-      const rawValue = this.node.req.headers[name];
+      const rawValue = this._node.req.headers[name];
       if (rawValue === void 0) {
         return null;
       }
-      return _normalizeValue(this.node.req.headers[name]);
+      return _normalizeValue(this._node.req.headers[name]);
     }
     getSetCookie() {
-      const setCookie = this.node.req.headers["set-cookie"];
+      const setCookie = this._node.req.headers["set-cookie"];
       if (!setCookie || setCookie.length === 0) {
         return [];
       }
@@ -133,11 +133,11 @@ const NodeRequestHeaders = /* @__PURE__ */ (() => {
     }
     has(name) {
       name = name.toLowerCase();
-      return !!this.node.req.headers[name];
+      return !!this._node.req.headers[name];
     }
     set(name, value) {
       name = name.toLowerCase();
-      this.node.req.headers[name] = value;
+      this._node.req.headers[name] = value;
     }
     get count() {
       throw new Error("Method not implemented.");
@@ -146,7 +146,7 @@ const NodeRequestHeaders = /* @__PURE__ */ (() => {
       throw new Error("Method not implemented.");
     }
     toJSON() {
-      const _headers = this.node.req.headers;
+      const _headers = this._node.req.headers;
       const result = {};
       for (const key in _headers) {
         if (_headers[key]) {
@@ -156,7 +156,7 @@ const NodeRequestHeaders = /* @__PURE__ */ (() => {
       return result;
     }
     forEach(cb, thisArg) {
-      const _headers = this.node.req.headers;
+      const _headers = this._node.req.headers;
       for (const key in _headers) {
         if (_headers[key]) {
           cb.call(
@@ -169,19 +169,19 @@ const NodeRequestHeaders = /* @__PURE__ */ (() => {
       }
     }
     *entries() {
-      const _headers = this.node.req.headers;
+      const _headers = this._node.req.headers;
       for (const key in _headers) {
         yield [key, _normalizeValue(_headers[key])];
       }
     }
     *keys() {
-      const keys = Object.keys(this.node.req.headers);
+      const keys = Object.keys(this._node.req.headers);
       for (const key of keys) {
         yield key;
       }
     }
     *values() {
-      const values = Object.values(this.node.req.headers);
+      const values = Object.values(this._node.req.headers);
       for (const value of values) {
         yield _normalizeValue(value);
       }
@@ -202,33 +202,33 @@ const NodeRequestHeaders = /* @__PURE__ */ (() => {
 const NodeResponseHeaders = /* @__PURE__ */ (() => {
   const _Headers = class Headers {
     constructor(nodeCtx) {
-      this.node = nodeCtx;
+      this._node = nodeCtx;
     }
     append(name, value) {
-      this.node.res.appendHeader(name, value);
+      this._node.res.appendHeader(name, value);
     }
     delete(name) {
-      this.node.res.removeHeader(name);
+      this._node.res.removeHeader(name);
     }
     get(name) {
-      const rawValue = this.node.res.getHeader(name);
+      const rawValue = this._node.res.getHeader(name);
       if (rawValue === void 0) {
         return null;
       }
       return _normalizeValue(rawValue);
     }
     getSetCookie() {
-      const setCookie = _normalizeValue(this.node.res.getHeader("set-cookie"));
+      const setCookie = _normalizeValue(this._node.res.getHeader("set-cookie"));
       if (!setCookie) {
         return [];
       }
       return splitSetCookieString(setCookie);
     }
     has(name) {
-      return this.node.res.hasHeader(name);
+      return this._node.res.hasHeader(name);
     }
     set(name, value) {
-      this.node.res.setHeader(name, value);
+      this._node.res.setHeader(name, value);
     }
     get count() {
       throw new Error("Method not implemented.");
@@ -237,7 +237,7 @@ const NodeResponseHeaders = /* @__PURE__ */ (() => {
       throw new Error("Method not implemented.");
     }
     toJSON() {
-      const _headers = this.node.res.getHeaders();
+      const _headers = this._node.res.getHeaders();
       const result = {};
       for (const key in _headers) {
         if (_headers[key]) {
@@ -247,7 +247,7 @@ const NodeResponseHeaders = /* @__PURE__ */ (() => {
       return result;
     }
     forEach(cb, thisArg) {
-      const _headers = this.node.res.getHeaders();
+      const _headers = this._node.res.getHeaders();
       for (const key in _headers) {
         if (_headers[key]) {
           cb.call(
@@ -260,19 +260,19 @@ const NodeResponseHeaders = /* @__PURE__ */ (() => {
       }
     }
     *entries() {
-      const _headers = this.node.res.getHeaders();
+      const _headers = this._node.res.getHeaders();
       for (const key in _headers) {
         yield [key, _normalizeValue(_headers[key])];
       }
     }
     *keys() {
-      const keys = this.node.res.getHeaderNames();
+      const keys = this._node.res.getHeaderNames();
       for (const key of keys) {
         yield key;
       }
     }
     *values() {
-      const values = Object.values(this.node.res.getHeaders());
+      const values = Object.values(this._node.res.getHeaders());
       for (const value of values) {
         yield _normalizeValue(value);
       }
@@ -303,7 +303,7 @@ const NodeRequestURL = /* @__PURE__ */ (() => {
       this._hash = "";
       this._username = "";
       this._password = "";
-      this.node = nodeCtx;
+      this._node = nodeCtx;
     }
     get hash() {
       return this._hash;
@@ -325,17 +325,17 @@ const NodeRequestURL = /* @__PURE__ */ (() => {
     }
     // host
     get host() {
-      return this.node.req.headers.host || "";
+      return this._node.req.headers.host || "";
     }
     set host(value) {
       this._hostname = void 0;
       this._port = void 0;
-      this.node.req.headers.host = value;
+      this._node.req.headers.host = value;
     }
     // hostname
     get hostname() {
       if (this._hostname === void 0) {
-        const [hostname, port] = parseHost(this.node.req.headers.host);
+        const [hostname, port] = parseHost(this._node.req.headers.host);
         if (this._port === void 0 && port) {
           this._port = String(Number.parseInt(port) || "");
         }
@@ -349,11 +349,11 @@ const NodeRequestURL = /* @__PURE__ */ (() => {
     // port
     get port() {
       if (this._port === void 0) {
-        const [hostname, port] = parseHost(this.node.req.headers.host);
+        const [hostname, port] = parseHost(this._node.req.headers.host);
         if (this._hostname === void 0 && hostname) {
           this._hostname = hostname;
         }
-        this._port = port || String(this.node.req.socket?.localPort || "");
+        this._port = port || String(this._node.req.socket?.localPort || "");
       }
       return this._port;
     }
@@ -363,7 +363,7 @@ const NodeRequestURL = /* @__PURE__ */ (() => {
     // pathname
     get pathname() {
       if (this._pathname === void 0) {
-        const [pathname, search] = parsePath(this.node.req.url || "/");
+        const [pathname, search] = parsePath(this._node.req.url || "/");
         this._pathname = pathname;
         if (this._search === void 0) {
           this._search = search;
@@ -379,12 +379,12 @@ const NodeRequestURL = /* @__PURE__ */ (() => {
         return;
       }
       this._pathname = value;
-      this.node.req.url = value + this.search;
+      this._node.req.url = value + this.search;
     }
     // search
     get search() {
       if (this._search === void 0) {
-        const [pathname, search] = parsePath(this.node.req.url || "/");
+        const [pathname, search] = parsePath(this._node.req.url || "/");
         this._search = search;
         if (this._pathname === void 0) {
           this._pathname = pathname;
@@ -403,7 +403,7 @@ const NodeRequestURL = /* @__PURE__ */ (() => {
       }
       this._search = value;
       this._searchParams = void 0;
-      this.node.req.url = this.pathname + value;
+      this._node.req.url = this.pathname + value;
     }
     // searchParams
     get searchParams() {
@@ -419,7 +419,7 @@ const NodeRequestURL = /* @__PURE__ */ (() => {
     // protocol
     get protocol() {
       if (!this._protocol) {
-        this._protocol = this.node.req.socket?.encrypted || this.node.req.headers["x-forwarded-proto"] === "https" ? "https:" : "http:";
+        this._protocol = this._node.req.socket?.encrypted || this._node.req.headers["x-forwarded-proto"] === "https" ? "https:" : "http:";
       }
       return this._protocol;
     }
@@ -490,23 +490,27 @@ const NodeRequest = /* @__PURE__ */ (() => {
     #textBody;
     #bodyStream;
     constructor(nodeCtx) {
-      this.node = nodeCtx;
+      this._node = nodeCtx;
+      this.x = {
+        runtime: "node",
+        node: nodeCtx,
+        get ip() {
+          return nodeCtx.req.socket?.remoteAddress;
+        }
+      };
     }
     get headers() {
       if (!this.#headers) {
-        this.#headers = new NodeRequestHeaders(this.node);
+        this.#headers = new NodeRequestHeaders(this._node);
       }
       return this.#headers;
     }
-    get remoteAddress() {
-      return this.node.req.socket?.remoteAddress;
-    }
     clone() {
-      return new _Request({ ...this.node });
+      return new _Request({ ...this._node });
     }
     get _url() {
       if (!this.#url) {
-        this.#url = new NodeRequestURL(this.node);
+        this.#url = new NodeRequestURL(this._node);
       }
       return this.#url;
     }
@@ -514,7 +518,7 @@ const NodeRequest = /* @__PURE__ */ (() => {
       return this._url.href;
     }
     get method() {
-      return this.node.req.method || "GET";
+      return this._node.req.method || "GET";
     }
     get signal() {
       if (!this.#abortSignal) {
@@ -529,13 +533,13 @@ const NodeRequest = /* @__PURE__ */ (() => {
       if (this.#hasBody !== void 0) {
         return this.#hasBody;
       }
-      const method = this.node.req.method?.toUpperCase();
+      const method = this._node.req.method?.toUpperCase();
       if (!method || !(method === "PATCH" || method === "POST" || method === "PUT" || method === "DELETE")) {
         this.#hasBody = false;
         return false;
       }
-      if (!Number.parseInt(this.node.req.headers["content-length"] || "")) {
-        const isChunked = (this.node.req.headers["transfer-encoding"] || "").split(",").map((e) => e.trim()).filter(Boolean).includes("chunked");
+      if (!Number.parseInt(this._node.req.headers["content-length"] || "")) {
+        const isChunked = (this._node.req.headers["transfer-encoding"] || "").split(",").map((e) => e.trim()).filter(Boolean).includes("chunked");
         if (!isChunked) {
           this.#hasBody = false;
           return false;
@@ -552,7 +556,7 @@ const NodeRequest = /* @__PURE__ */ (() => {
         this.#bodyUsed = true;
         this.#bodyStream = new ReadableStream({
           start: (controller) => {
-            this.node.req.on("data", (chunk) => {
+            this._node.req.on("data", (chunk) => {
               controller.enqueue(chunk);
             }).once("error", (error) => {
               controller.error(error);
@@ -586,7 +590,7 @@ const NodeRequest = /* @__PURE__ */ (() => {
       if (!this.#blobBody) {
         this.#blobBody = this.bytes().then((bytes) => {
           return new Blob([bytes], {
-            type: this.node.req.headers["content-type"]
+            type: this._node.req.headers["content-type"]
           });
         });
       }

package/dist/types.d.mts

@@ -161,17 +161,18 @@ interface ServerPluginInstance {
      */
     response?: (request: ServerRequest, response: Response) => MaybePromise<void | Response>;
 }
-interface ServerRequest extends Request {
+interface ServerRuntimeContext {
+    runtime: "node" | "deno" | "bun" | "cloudflare" | (string & {});
     /**
-     * Remote address of the client.
+     * IP address of the client.
      */
-    remoteAddress?: string | undefined;
+    ip?: string | undefined;
     /**
      * Underlying Node.js server request info.
      */
     node?: {
         req: NodeHttp.IncomingMessage;
-        res: NodeHttp.ServerResponse;
+        res?: NodeHttp.ServerResponse;
     };
     /**
      * Underlying Deno server request info.
@@ -193,10 +194,16 @@ interface ServerRequest extends Request {
         context: CF.ExecutionContext;
     };
 }
+interface ServerRequest extends Request {
+    /**
+     * Runtime specific request context.
+     */
+    x?: ServerRuntimeContext;
+}
 type FetchHandler = (request: Request) => Response | Promise<Response>;
 type BunFetchHandler = (request: Request, server?: Bun.Server) => Response | Promise<Response>;
 type DenoFetchHandler = (request: Request, info?: Deno.ServeHandlerInfo<Deno.NetAddr>) => Response | Promise<Response>;
 type NodeHttpHandler = (nodeReq: NodeHttp.IncomingMessage, nodeRes: NodeHttp.ServerResponse) => void | Promise<void>;
 type CloudflareFetchHandler = CF.ExportedHandlerFetchHandler;
 
-export { type BunFetchHandler, type CloudflareFetchHandler, type DenoFetchHandler, type FetchHandler, type NodeHttpHandler, Response, type Server, type ServerHandler, type ServerOptions, type ServerPlugin, type ServerPluginInstance, type ServerRequest, serve };
+export { type BunFetchHandler, type CloudflareFetchHandler, type DenoFetchHandler, type FetchHandler, type NodeHttpHandler, Response, type Server, type ServerHandler, type ServerOptions, type ServerPlugin, type ServerPluginInstance, type ServerRequest, type ServerRuntimeContext, serve };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "srvx",
-  "version": "0.2.8",
+  "version": "0.3.0",
   "description": "Universal Server API based on web platform standards. Works seamlessly with Deno, Bun and Node.js.",
   "repository": "unjs/srvx",
   "license": "MIT",