@tauri-apps/plugin-http 2.3.0 → 2.4.1

package/dist-js/index.cjs

@@ -28,7 +28,7 @@ var core = require('@tauri-apps/api/core');
  *
  * @module
  */
-const ERROR_REQUEST_CANCELLED = 'Request canceled';
+const ERROR_REQUEST_CANCELLED = 'Request cancelled';
 /**
  * Fetch a resource from the network. It returns a `Promise` that resolves to the
  * `Response` to that `Request`, whether it is successful or not.
@@ -115,14 +115,36 @@ async function fetch(input, init) {
     const { status, statusText, url, headers: responseHeaders, rid: responseRid } = await core.invoke('plugin:http|fetch_send', {
         rid
     });
-    const body = await core.invoke('plugin:http|fetch_read_body', {
-        rid: responseRid
+    const readableStreamBody = new ReadableStream({
+        start: (controller) => {
+            const streamChannel = new core.Channel();
+            streamChannel.onmessage = (res) => {
+                // close early if aborted
+                if (signal?.aborted) {
+                    controller.error(ERROR_REQUEST_CANCELLED);
+                    return;
+                }
+                // close when the signal to close (an empty chunk)
+                // is sent from the IPC.
+                if (res instanceof ArrayBuffer ? res.byteLength == 0 : res.length == 0) {
+                    controller.close();
+                    return;
+                }
+                // the content conversion (like .text(), .json(), etc.) in Response
+                // must have Uint8Array as its content, else it will
+                // have untraceable error that's hard to debug.
+                controller.enqueue(new Uint8Array(res));
+            };
+            // run a non-blocking body stream fetch
+            core.invoke('plugin:http|fetch_read_body', {
+                rid: responseRid,
+                streamChannel
+            }).catch((e) => {
+                controller.error(e);
+            });
+        }
     });
-    const res = new Response(body instanceof ArrayBuffer && body.byteLength !== 0
-        ? body
-        : body instanceof Array && body.length > 0
-            ? new Uint8Array(body)
-            : null, {
+    const res = new Response(readableStreamBody, {
         status,
         statusText
     });

package/dist-js/index.js

@@ -1,4 +1,4 @@
-import { invoke } from '@tauri-apps/api/core';
+import { invoke, Channel } from '@tauri-apps/api/core';
 
 // Copyright 2019-2023 Tauri Programme within The Commons Conservancy
 // SPDX-License-Identifier: Apache-2.0
@@ -26,7 +26,7 @@ import { invoke } from '@tauri-apps/api/core';
  *
  * @module
  */
-const ERROR_REQUEST_CANCELLED = 'Request canceled';
+const ERROR_REQUEST_CANCELLED = 'Request cancelled';
 /**
  * Fetch a resource from the network. It returns a `Promise` that resolves to the
  * `Response` to that `Request`, whether it is successful or not.
@@ -113,14 +113,36 @@ async function fetch(input, init) {
     const { status, statusText, url, headers: responseHeaders, rid: responseRid } = await invoke('plugin:http|fetch_send', {
         rid
     });
-    const body = await invoke('plugin:http|fetch_read_body', {
-        rid: responseRid
+    const readableStreamBody = new ReadableStream({
+        start: (controller) => {
+            const streamChannel = new Channel();
+            streamChannel.onmessage = (res) => {
+                // close early if aborted
+                if (signal?.aborted) {
+                    controller.error(ERROR_REQUEST_CANCELLED);
+                    return;
+                }
+                // close when the signal to close (an empty chunk)
+                // is sent from the IPC.
+                if (res instanceof ArrayBuffer ? res.byteLength == 0 : res.length == 0) {
+                    controller.close();
+                    return;
+                }
+                // the content conversion (like .text(), .json(), etc.) in Response
+                // must have Uint8Array as its content, else it will
+                // have untraceable error that's hard to debug.
+                controller.enqueue(new Uint8Array(res));
+            };
+            // run a non-blocking body stream fetch
+            invoke('plugin:http|fetch_read_body', {
+                rid: responseRid,
+                streamChannel
+            }).catch((e) => {
+                controller.error(e);
+            });
+        }
     });
-    const res = new Response(body instanceof ArrayBuffer && body.byteLength !== 0
-        ? body
-        : body instanceof Array && body.length > 0
-            ? new Uint8Array(body)
-            : null, {
+    const res = new Response(readableStreamBody, {
         status,
         statusText
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tauri-apps/plugin-http",
-  "version": "2.3.0",
+  "version": "2.4.1",
   "license": "MIT OR Apache-2.0",
   "authors": [
     "Tauri Programme within The Commons Conservancy"