srvx 0.1.2 → 0.1.3

package/dist/node-utils/index.d.mts

@@ -20,14 +20,10 @@ declare const NodeRequestProxy: {
         referrerPolicy: ReferrerPolicy;
         headers: xHeaders;
         bodyUsed: boolean;
-        xNode: {
-            req: NodeHttp__default.IncomingMessage;
-            res: NodeHttp__default.ServerResponse;
-        } | undefined;
-        "__#448@#url": URL;
+        _url: URL;
         "__#448@#abortSignal"?: AbortController;
         "__#448@#hasBody": boolean | undefined;
-        "__#448@#rawBody"?: Promise<Uint8Array>;
+        "__#448@#bodyBytes"?: Promise<Uint8Array>;
         "__#448@#blobBody"?: Promise<Blob>;
         "__#448@#formDataBody"?: Promise<FormData>;
         "__#448@#jsonBody"?: Promise<any>;
@@ -40,12 +36,12 @@ declare const NodeRequestProxy: {
         readonly signal: AbortSignal;
         readonly _hasBody: boolean;
         readonly body: ReadableStream<Uint8Array<ArrayBufferLike>> | null;
-        arrayBuffer(): Promise<ArrayBuffer>;
         bytes(): Promise<Uint8Array>;
+        arrayBuffer(): Promise<ArrayBuffer>;
         blob(): Promise<Blob>;
         formData(): Promise<FormData>;
-        json(): Promise<any>;
         text(): Promise<string>;
+        json(): Promise<any>;
         [kNodeReq]: NodeHttp__default.IncomingMessage;
         readonly [Symbol.toStringTag]: string;
         [kNodeInspect](): {
@@ -68,7 +64,7 @@ declare const NodeFastResponse: {
             status: number;
             statusText: string;
             headers: NodeHttp__default.OutgoingHttpHeader[];
-            body: string | Buffer<ArrayBufferLike> | Uint8Array<ArrayBufferLike> | ReadableStream<Uint8Array<ArrayBufferLike>> | DataView<ArrayBufferLike> | null | undefined;
+            body: string | Uint8Array<ArrayBufferLike> | ReadableStream<Uint8Array<ArrayBufferLike>> | Buffer<ArrayBufferLike> | DataView<ArrayBufferLike> | null | undefined;
         };
         /** Lazy initialized response instance */
         "__#449@#responseObj"?: Response;

package/dist/node-utils/index.d.ts

@@ -20,14 +20,10 @@ declare const NodeRequestProxy: {
         referrerPolicy: ReferrerPolicy;
         headers: xHeaders;
         bodyUsed: boolean;
-        xNode: {
-            req: NodeHttp__default.IncomingMessage;
-            res: NodeHttp__default.ServerResponse;
-        } | undefined;
-        "__#448@#url": URL;
+        _url: URL;
         "__#448@#abortSignal"?: AbortController;
         "__#448@#hasBody": boolean | undefined;
-        "__#448@#rawBody"?: Promise<Uint8Array>;
+        "__#448@#bodyBytes"?: Promise<Uint8Array>;
         "__#448@#blobBody"?: Promise<Blob>;
         "__#448@#formDataBody"?: Promise<FormData>;
         "__#448@#jsonBody"?: Promise<any>;
@@ -40,12 +36,12 @@ declare const NodeRequestProxy: {
         readonly signal: AbortSignal;
         readonly _hasBody: boolean;
         readonly body: ReadableStream<Uint8Array<ArrayBufferLike>> | null;
-        arrayBuffer(): Promise<ArrayBuffer>;
         bytes(): Promise<Uint8Array>;
+        arrayBuffer(): Promise<ArrayBuffer>;
         blob(): Promise<Blob>;
         formData(): Promise<FormData>;
-        json(): Promise<any>;
         text(): Promise<string>;
+        json(): Promise<any>;
         [kNodeReq]: NodeHttp__default.IncomingMessage;
         readonly [Symbol.toStringTag]: string;
         [kNodeInspect](): {
@@ -68,7 +64,7 @@ declare const NodeFastResponse: {
             status: number;
             statusText: string;
             headers: NodeHttp__default.OutgoingHttpHeader[];
-            body: string | Buffer<ArrayBufferLike> | Uint8Array<ArrayBufferLike> | ReadableStream<Uint8Array<ArrayBufferLike>> | DataView<ArrayBufferLike> | null | undefined;
+            body: string | Uint8Array<ArrayBufferLike> | ReadableStream<Uint8Array<ArrayBufferLike>> | Buffer<ArrayBufferLike> | DataView<ArrayBufferLike> | null | undefined;
         };
         /** Lazy initialized response instance */
         "__#449@#responseObj"?: Response;

package/dist/node-utils/index.mjs

@@ -1,4 +1,4 @@
-export { a as NodeReqHeadersProxy, N as NodeRequestProxy, b as NodeResHeadersProxy, s as sendNodeResponse } from '../shared/srvx.2143ff37.mjs';
+export { a as NodeReqHeadersProxy, N as NodeRequestProxy, b as NodeResHeadersProxy, s as sendNodeResponse } from '../shared/srvx.1e3bbf3a.mjs';
 import { splitSetCookieString } from 'cookie-es';
 
 const NodeFastResponse = /* @__PURE__ */ (() => (

package/dist/node.mjs

@@ -1,6 +1,6 @@
 import NodeHttp from 'node:http';
 import { S as Server, r as resolvePort } from './shared/srvx.4f681732.mjs';
-import { N as NodeRequestProxy, s as sendNodeResponse } from './shared/srvx.2143ff37.mjs';
+import { N as NodeRequestProxy, s as sendNodeResponse } from './shared/srvx.1e3bbf3a.mjs';
 import 'cookie-es';
 
 function serve(options) {

package/dist/shared/{srvx.2143ff37.mjs → srvx.1e3bbf3a.mjs}

@@ -337,13 +337,12 @@ const NodeRequestProxy = /* @__PURE__ */ (() => class NodeRequestProxy2 {
     this.referrerPolicy = "";
     this.bodyUsed = false;
     this[kNodeReq] = nodeReq;
-    this.#url = new NodeReqURLProxy(nodeReq);
+    this._url = new NodeReqURLProxy(nodeReq);
     this.headers = new NodeReqHeadersProxy(nodeReq);
   }
-  #url;
   #abortSignal;
   #hasBody;
-  #rawBody;
+  #bodyBytes;
   #blobBody;
   #formDataBody;
   #jsonBody;
@@ -356,7 +355,7 @@ const NodeRequestProxy = /* @__PURE__ */ (() => class NodeRequestProxy2 {
     return new NodeRequestProxy2(this[kNodeReq]);
   }
   get url() {
-    return this.#url.href;
+    return this._url.href;
   }
   get method() {
     return this[kNodeReq].method || "GET";
@@ -386,7 +385,7 @@ const NodeRequestProxy = /* @__PURE__ */ (() => class NodeRequestProxy2 {
     return true;
   }
   get body() {
-    if (!this.#hasBody) {
+    if (!this._hasBody) {
       return null;
     }
     if (!this.#bodyStream) {
@@ -408,24 +407,25 @@ const NodeRequestProxy = /* @__PURE__ */ (() => class NodeRequestProxy2 {
     }
     return this.#bodyStream;
   }
-  arrayBuffer() {
-    if (!this.#rawBody) {
-      const _bodyStream = this.body;
-      return _bodyStream ? _readStream(_bodyStream).then((buff) => buff.buffer) : Promise.resolve(new ArrayBuffer(0));
-    }
-    return this.#rawBody.then((buff) => buff.buffer);
-  }
   bytes() {
-    if (!this.#rawBody) {
+    if (!this.#bodyBytes) {
       const _bodyStream = this.body;
-      return _bodyStream ? _readStream(_bodyStream) : Promise.resolve(new Uint8Array());
+      this.#bodyBytes = _bodyStream ? _readStream(_bodyStream) : Promise.resolve(new Uint8Array());
     }
-    return this.#rawBody;
+    return this.#bodyBytes;
+  }
+  arrayBuffer() {
+    return this.bytes().then((buff) => {
+      return buff.buffer.slice(
+        buff.byteOffset,
+        buff.byteOffset + buff.byteLength
+      );
+    });
   }
   blob() {
     if (!this.#blobBody) {
-      this.#blobBody = this.arrayBuffer().then((buff) => {
-        return new Blob([buff], {
+      this.#blobBody = this.bytes().then((bytes) => {
+        return new Blob([bytes], {
           type: this[kNodeReq].headers["content-type"]
         });
       });
@@ -440,6 +440,14 @@ const NodeRequestProxy = /* @__PURE__ */ (() => class NodeRequestProxy2 {
     }
     return this.#formDataBody;
   }
+  text() {
+    if (!this.#textBody) {
+      this.#textBody = this.bytes().then((bytes) => {
+        return new TextDecoder().decode(bytes);
+      });
+    }
+    return this.#textBody;
+  }
   json() {
     if (!this.#jsonBody) {
       this.#jsonBody = this.text().then((txt) => {
@@ -448,14 +456,6 @@ const NodeRequestProxy = /* @__PURE__ */ (() => class NodeRequestProxy2 {
     }
     return this.#jsonBody;
   }
-  text() {
-    if (!this.#textBody) {
-      this.#textBody = this.arrayBuffer().then((buff) => {
-        return new TextDecoder().decode(buff);
-      });
-    }
-    return this.#textBody;
-  }
   get [(Symbol.toStringTag)]() {
     return "Request";
   }

package/package.json

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