@standardserver/peer 0.0.0 → 0.0.1

package/dist/index.mjs

@@ -1,5 +1,5 @@
-import { flattenStandardHeader, getFilenameFromContentDisposition, generateContentDisposition } from '@standardserver/core';
-import { AsyncIteratorClass, isTypescriptObject, SequentialIdGenerator, AsyncIdQueue, isAsyncIteratorObject, AbortError, stringifyJSON } from '@standardserver/shared';
+import { AsyncIteratorClass, isTypescriptObject, isAsyncIteratorObject, SequentialIdGenerator, AsyncIdQueue, AbortError, stringifyJSON } from '@standardserver/shared';
+import { generateContentDisposition, flattenStandardHeader, getFilenameFromContentDisposition } from '@standardserver/core';
 import { withEventIteratorEventMeta, EventIteratorErrorEvent, resolveEventIteratorEvent } from '@standardserver/core/event-stream';
 
 function toEventIterator(pull, cleanup) {
@@ -181,6 +181,37 @@ async function toStandardBody(message, eventStreamMessageQueue, octetStreamMessa
     await cleanup(true);
   }
 }
+async function encodeAtomicStandardBody(body, headers) {
+  headers = { ...headers };
+  let binary;
+  let jsonBody = body;
+  headers["standard-server"] = void 0;
+  if (body instanceof ReadableStream) {
+    jsonBody = void 0;
+    headers["standard-server"] = "octet-stream";
+  } else if (isAsyncIteratorObject(body)) {
+    jsonBody = void 0;
+    headers["standard-server"] = "event-stream";
+  } else if (body instanceof FormData) {
+    const res = new Response(body);
+    binary = await res.blob();
+    jsonBody = void 0;
+    headers["standard-server"] = "form-data";
+    headers["content-type"] ??= res.headers.get("content-type");
+  } else if (body instanceof Blob) {
+    binary = body;
+    jsonBody = void 0;
+    headers["standard-server"] = "file";
+    headers["content-disposition"] ??= generateContentDisposition(
+      body instanceof File ? body.name : "blob"
+    );
+    headers["content-type"] ??= body.type;
+  } else if (body instanceof URLSearchParams) {
+    jsonBody = body.toString();
+    headers["standard-server"] = "url-search-params";
+  }
+  return [jsonBody, headers, binary];
+}
 
 class ClientPeer {
   constructor(send) {
@@ -245,39 +276,20 @@ class ClientPeer {
     ];
     this.cleanupFns.set(id, cleanupFns);
     try {
+      const [jsonBody, headers, binary] = await encodeAtomicStandardBody(request.body, request.headers);
+      signal?.throwIfAborted();
       const requestMessage = {
         id,
         kind: "request",
         json: {
-          ...{ ...request, signal: void 0 },
-          // clone and remove signal from request
-          headers: { ...request.headers }
-          // clone headers
-        }
+          ...request,
+          headers,
+          body: jsonBody,
+          ...{ signal: void 0 }
+          // remove signal from request
+        },
+        binary
       };
-      if (request.body instanceof ReadableStream) {
-        requestMessage.json.body = void 0;
-        requestMessage.json.headers["standard-server"] = "octet-stream";
-      } else if (isAsyncIteratorObject(request.body)) {
-        requestMessage.json.body = void 0;
-        requestMessage.json.headers["standard-server"] = "event-stream";
-      } else if (request.body instanceof FormData) {
-        const res = new Response(request.body);
-        requestMessage.binary = await res.blob();
-        requestMessage.json.body = void 0;
-        requestMessage.json.headers["standard-server"] = "form-data";
-        requestMessage.json.headers["content-type"] = res.headers.get("content-type") ?? void 0;
-      } else if (request.body instanceof Blob) {
-        requestMessage.binary = request.body;
-        requestMessage.json.body = void 0;
-        requestMessage.json.headers["standard-server"] = "file";
-        requestMessage.json.headers["content-disposition"] = generateContentDisposition(request.body instanceof File ? request.body.name : "blob");
-        requestMessage.json.headers["content-type"] = request.body.type;
-      } else if (request.body instanceof URLSearchParams) {
-        requestMessage.json.body = request.body.toString();
-        requestMessage.json.headers["standard-server"] = "url-search-params";
-      }
-      signal?.throwIfAborted();
       await this.send(requestMessage);
       signal?.throwIfAborted();
       if (isAsyncIteratorObject(request.body)) {
@@ -509,41 +521,22 @@ class ServerPeer {
       if (signal.aborted) {
         return;
       }
+      const [jsonBody, headers, binary] = await encodeAtomicStandardBody(response.body, response.headers);
+      if (signal.aborted) {
+        return;
+      }
       const responseMessage = {
         id: message.id,
         kind: "response",
         json: {
-          ...{ ...response, signal: void 0 },
-          // clone and remove signal from request
-          headers: { ...response.headers }
-          // clone headers
-        }
+          ...response,
+          headers,
+          body: jsonBody,
+          ...{ signal: void 0 }
+          // remove signal from request
+        },
+        binary
       };
-      if (response.body instanceof ReadableStream) {
-        responseMessage.json.body = void 0;
-        responseMessage.json.headers["standard-server"] = "octet-stream";
-      } else if (isAsyncIteratorObject(response.body)) {
-        responseMessage.json.body = void 0;
-        responseMessage.json.headers["standard-server"] = "event-stream";
-      } else if (response.body instanceof FormData) {
-        const res = new Response(response.body);
-        responseMessage.binary = await res.blob();
-        responseMessage.json.body = void 0;
-        responseMessage.json.headers["standard-server"] = "form-data";
-        responseMessage.json.headers["content-type"] = res.headers.get("content-type") ?? void 0;
-      } else if (response.body instanceof Blob) {
-        responseMessage.binary = response.body;
-        responseMessage.json.body = void 0;
-        responseMessage.json.headers["standard-server"] = "file";
-        responseMessage.json.headers["content-disposition"] = generateContentDisposition(response.body instanceof File ? response.body.name : "blob");
-        responseMessage.json.headers["content-type"] = response.body.type;
-      } else if (response.body instanceof URLSearchParams) {
-        responseMessage.json.body = response.body.toString();
-        responseMessage.json.headers["standard-server"] = "url-search-params";
-      }
-      if (signal.aborted) {
-        return;
-      }
       await this.send(responseMessage);
       if (signal.aborted) {
         return;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@standardserver/peer",
   "type": "module",
-  "version": "0.0.0",
+  "version": "0.0.1",
   "license": "MIT",
   "homepage": "https://standardserver.dev",
   "repository": {
@@ -20,8 +20,8 @@
     "dist"
   ],
   "dependencies": {
-    "@standardserver/core": "0.0.0",
-    "@standardserver/shared": "0.0.0"
+    "@standardserver/core": "0.0.1",
+    "@standardserver/shared": "0.0.1"
   },
   "scripts": {
     "build": "unbuild",