@standardserver/fetch 0.0.10 → 0.0.12

package/dist/index.d.mts

@@ -35,11 +35,11 @@ interface ToEventStreamOptions {
      */
     initialComment?: string;
     /**
-     * If true, no `close` event is sent when the iterator completes with `undefined`.
+     * If true, a empty `close` event is sent when the iterator completes with `undefined`.
      *
      * @default true
      */
-    omitEmptyCloseEvent?: boolean;
+    emptyCloseEventEnabled?: boolean;
 }
 declare function toEventStream(iterator: AsyncIterator<unknown | void, unknown | void, void>, options?: ToEventStreamOptions): ReadableStream<Uint8Array<ArrayBuffer>>;
 

package/dist/index.d.ts

@@ -35,11 +35,11 @@ interface ToEventStreamOptions {
      */
     initialComment?: string;
     /**
-     * If true, no `close` event is sent when the iterator completes with `undefined`.
+     * If true, a empty `close` event is sent when the iterator completes with `undefined`.
      *
      * @default true
      */
-    omitEmptyCloseEvent?: boolean;
+    emptyCloseEventEnabled?: boolean;
 }
 declare function toEventStream(iterator: AsyncIterator<unknown | void, unknown | void, void>, options?: ToEventStreamOptions): ReadableStream<Uint8Array<ArrayBuffer>>;
 

package/dist/index.mjs

@@ -53,7 +53,7 @@ function toEventStream(iterator, options = {}) {
   const keepAliveComment = options.keepAliveComment ?? "";
   const initialCommentEnabled = options.initialCommentEnabled ?? true;
   const initialComment = options.initialComment ?? "";
-  const omitEmptyCloseEvent = options.omitEmptyCloseEvent ?? true;
+  const emptyCloseEventEnabled = options.emptyCloseEventEnabled ?? true;
   let cancelled = false;
   let timeout;
   const stream = new ReadableStream({
@@ -79,7 +79,7 @@ function toEventStream(iterator, options = {}) {
           return;
         }
         const [data, meta] = unwrapEventIteratorEvent(result.value);
-        if (!omitEmptyCloseEvent || !result.done || data !== void 0 || meta !== void 0) {
+        if (!result.done || data !== void 0 || meta !== void 0 || emptyCloseEventEnabled) {
           const event = result.done ? "close" : "message";
           controller.enqueue(encodeEventStreamMessage({
             ...meta,
@@ -119,9 +119,8 @@ function toEventStream(iterator, options = {}) {
 async function toStandardBody(re, options) {
   const hint = re.headers.get("standard-server") ?? options?.hint;
   const mimeType = re.headers.get("content-type")?.split(";")[0]?.trim();
-  const contentDisposition = re.headers.get("content-disposition");
   const contentLength = re.headers.get("content-length");
-  if (hint === "none") {
+  if (hint === "none" || hint === void 0 && mimeType === void 0 && (contentLength === "0" || contentLength === null)) {
     return void 0;
   }
   if (hint === void 0 && re.body === null) {
@@ -130,21 +129,22 @@ async function toStandardBody(re, options) {
   if (re.bodyUsed) {
     throw new TypeError("Failed to read body: body stream already read");
   }
-  if (hint === "json" || hint === void 0 && contentDisposition === null && mimeType === "application/json") {
+  if (hint === "json" || hint === void 0 && mimeType === "application/json") {
     const text = await re.text();
     return parseEmptyableJSON(text);
   }
-  if (hint === "form-data" || hint === void 0 && contentDisposition === null && mimeType === "multipart/form-data") {
+  if (hint === "form-data" || hint === void 0 && mimeType === "multipart/form-data") {
     return await re.formData();
   }
-  if (hint === "url-search-params" || hint === void 0 && contentDisposition === null && mimeType === "application/x-www-form-urlencoded") {
+  if (hint === "url-search-params" || hint === void 0 && mimeType === "application/x-www-form-urlencoded") {
     const text = await re.text();
     return new URLSearchParams(text);
   }
-  if (hint === "event-stream" || hint === void 0 && contentDisposition === null && mimeType === "text/event-stream") {
+  if (hint === "event-stream" || hint === void 0 && mimeType === "text/event-stream") {
     return toEventIterator(re.body);
   }
-  if (hint === "file" || hint === void 0 && (contentDisposition !== null || contentLength !== null)) {
+  if (hint === "file" || hint === void 0 && contentLength !== null) {
+    const contentDisposition = re.headers.get("content-disposition");
     const fileName = contentDisposition !== null ? getFilenameFromContentDisposition(contentDisposition) : void 0;
     const blob = await re.blob();
     return new File([blob], fileName ?? "blob", {
@@ -158,19 +158,26 @@ async function toStandardBody(re, options) {
   });
 }
 function toFetchBody(body, headers, options = {}) {
-  headers = { ...headers };
+  const originalContentType = headers["content-type"];
+  const originalContentLength = headers["content-length"];
+  headers = {
+    ...headers,
+    "standard-server": void 0,
+    "content-type": void 0,
+    "content-length": void 0
+  };
   if (body === void 0) {
-    headers["standard-server"] = "none";
     return [void 0, headers];
   }
   if (body instanceof ReadableStream) {
     headers["standard-server"] = "octet-stream";
-    headers["content-type"] ??= "application/octet-stream";
+    headers["content-type"] = originalContentType ?? "application/octet-stream";
+    headers["content-length"] = originalContentLength;
     return [body, headers];
   }
   if (body instanceof Blob) {
     headers["standard-server"] = "file";
-    headers["content-type"] ??= body.type;
+    headers["content-type"] = body.type;
     headers["content-disposition"] ??= generateContentDisposition(body instanceof File ? body.name : "blob");
     if (Number.isNaN(body.size)) {
       return [body.stream(), headers];
@@ -179,20 +186,16 @@ function toFetchBody(body, headers, options = {}) {
     return [body, headers];
   }
   if (body instanceof FormData) {
-    headers["standard-server"] = "form-data";
     return [body, headers];
   }
   if (body instanceof URLSearchParams) {
-    headers["standard-server"] = "url-search-params";
     return [body, headers];
   }
   if (isAsyncIteratorObject(body)) {
-    headers["standard-server"] = "event-stream";
-    headers["content-type"] ??= "text/event-stream";
+    headers["content-type"] = "text/event-stream";
     return [toEventStream(body, options.eventStream), headers];
   }
-  headers["standard-server"] = "json";
-  headers["content-type"] ??= "application/json";
+  headers["content-type"] = "application/json";
   return [stringifyJSON(body), headers];
 }
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@standardserver/fetch",
   "type": "module",
-  "version": "0.0.10",
+  "version": "0.0.12",
   "license": "MIT",
   "homepage": "https://standardserver.dev",
   "repository": {
@@ -9,6 +9,7 @@
     "url": "git+https://github.com/standardserver/standardserver.git",
     "directory": "packages/fetch"
   },
+  "sideEffects": false,
   "exports": {
     ".": {
       "types": "./dist/index.d.mts",
@@ -20,11 +21,11 @@
     "dist"
   ],
   "dependencies": {
-    "@standardserver/shared": "0.0.10",
-    "@standardserver/core": "0.0.10"
+    "@standardserver/core": "0.0.12",
+    "@standardserver/shared": "0.0.12"
   },
   "devDependencies": {
-    "@hono/node-server": "^1.19.7"
+    "@hono/node-server": "^2.0.1"
   },
   "scripts": {
     "build": "unbuild",