srvx 0.3.0 → 0.4.0

package/dist/adapters/bun.mjs

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

package/dist/adapters/cloudflare.mjs

@@ -13,12 +13,18 @@ class CloudflareServer {
       this.options.fetch
     );
     this.fetch = (request, env, context) => {
-      Object.defineProperty(request, "x", {
-        enumerable: true,
-        value: {
-          runtime: "cloudflare",
-          cloudflare: { env, context }
+      Object.defineProperties(request, {
+        runtime: {
+          enumerable: true,
+          value: { runtime: "cloudflare", cloudflare: { env, context } }
         }
+        // TODO
+        // ip: {
+        //   enumerable: true,
+        //   get() {
+        //     return;
+        //   },
+        // },
       });
       return fetchHandler(request);
     };

package/dist/adapters/deno.mjs

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

package/dist/adapters/node.d.mts

@@ -14,8 +14,8 @@ type NodeResponse = InstanceType<typeof NodeResponse>;
  */
 declare const NodeResponse: {
     new (body?: BodyInit | null, init?: ResponseInit): {
-        "__#4362@#body"?: BodyInit | null;
-        "__#4362@#init"?: ResponseInit;
+        "__#4366@#body"?: BodyInit | null;
+        "__#4366@#init"?: ResponseInit;
         /**
          * Prepare Node.js response object
          */
@@ -23,14 +23,14 @@ declare const NodeResponse: {
             status: number;
             statusText: string;
             headers: NodeHttp__default.OutgoingHttpHeader[];
-            body: string | Uint8Array<ArrayBufferLike> | ReadableStream<Uint8Array<ArrayBufferLike>> | Readable | Buffer<ArrayBufferLike> | DataView<ArrayBufferLike> | null | undefined;
+            body: string | Buffer<ArrayBufferLike> | Uint8Array<ArrayBufferLike> | ReadableStream<Uint8Array<ArrayBufferLike>> | Readable | DataView<ArrayBufferLike> | null | undefined;
         };
         /** Lazy initialized response instance */
-        "__#4362@#responseObj"?: globalThis.Response;
+        "__#4366@#responseObj"?: globalThis.Response;
         /** Lazy initialized headers instance */
-        "__#4362@#headersObj"?: Headers;
+        "__#4366@#headersObj"?: Headers;
         clone(): globalThis.Response;
-        readonly "__#4362@#response": globalThis.Response;
+        readonly "__#4366@#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;
-        "__#4362@#fastBody"<T extends object>(as: new (...args: any[]) => T): T | null | false;
+        "__#4366@#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

@@ -491,14 +491,14 @@ const NodeRequest = /* @__PURE__ */ (() => {
     #bodyStream;
     constructor(nodeCtx) {
       this._node = nodeCtx;
-      this.x = {
-        runtime: "node",
-        node: nodeCtx,
-        get ip() {
-          return nodeCtx.req.socket?.remoteAddress;
-        }
+      this.runtime = {
+        name: "node",
+        node: nodeCtx
       };
     }
+    get ip() {
+      return this._node.req.socket?.remoteAddress;
+    }
     get headers() {
       if (!this.#headers) {
         this.#headers = new NodeRequestHeaders(this._node);

package/dist/types.d.mts

@@ -162,11 +162,7 @@ interface ServerPluginInstance {
     response?: (request: ServerRequest, response: Response) => MaybePromise<void | Response>;
 }
 interface ServerRuntimeContext {
-    runtime: "node" | "deno" | "bun" | "cloudflare" | (string & {});
-    /**
-     * IP address of the client.
-     */
-    ip?: string | undefined;
+    name: "node" | "deno" | "bun" | "cloudflare" | (string & {});
     /**
      * Underlying Node.js server request info.
      */
@@ -198,7 +194,11 @@ interface ServerRequest extends Request {
     /**
      * Runtime specific request context.
      */
-    x?: ServerRuntimeContext;
+    runtime?: ServerRuntimeContext;
+    /**
+     * IP address of the client.
+     */
+    ip?: string | undefined;
 }
 type FetchHandler = (request: Request) => Response | Promise<Response>;
 type BunFetchHandler = (request: Request, server?: Bun.Server) => Response | Promise<Response>;

package/package.json

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