npm - @tauri-apps/plugin-http - Versions diffs - 2.4.0 → 2.4.2 - Mend

@tauri-apps/plugin-http 2.4.0 → 2.4.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (3) hide show

package/dist-js/index.cjs CHANGED Viewed

@@ -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.
@@ -91,29 +91,6 @@ async function fetch(input, init) {
     if (signal?.aborted) {
         throw new Error(ERROR_REQUEST_CANCELLED);
     }
-    const streamChannel = new core.Channel();
-    const readableStreamBody = new ReadableStream({
-        start: (controller) => {
-            streamChannel.onmessage = (res) => {
-                // close early if aborted
-                if (signal?.aborted) {
-                    controller.error(ERROR_REQUEST_CANCELLED);
-                    controller.close();
-                    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));
-            };
-        }
-    });
     const rid = await core.invoke('plugin:http|fetch', {
         clientConfig: {
             method: req.method,
@@ -124,8 +101,7 @@ async function fetch(input, init) {
             connectTimeout,
             proxy,
             danger
-        },
-        streamChannel
+        }
     });
     const abort = () => core.invoke('plugin:http|fetch_cancel', { rid });
     // abort early here if needed
@@ -136,19 +112,46 @@ async function fetch(input, init) {
         throw new Error(ERROR_REQUEST_CANCELLED);
     }
     signal?.addEventListener('abort', () => void abort());
-    const { status, statusText, url, headers: responseHeaders } = await core.invoke('plugin:http|fetch_send', {
+    const { status, statusText, url, headers: responseHeaders, rid: responseRid } = await core.invoke('plugin:http|fetch_send', {
         rid
     });
+    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;
+                }
+                const resUint8 = new Uint8Array(res);
+                const lastByte = resUint8[resUint8.byteLength - 1];
+                const actualRes = resUint8.slice(0, resUint8.byteLength - 1);
+                // close when the signal to close (last byte is 1) is sent from the IPC.
+                if (lastByte == 1) {
+                    controller.close();
+                    return;
+                }
+                controller.enqueue(actualRes);
+            };
+            // 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(readableStreamBody, {
         status,
         statusText
     });
-    // url and headers are read only properties
-    // but seems like we can set them like this
+    // Set `Response` properties that are ignored by the
+    // constructor, like url and some headers
     //
-    // we define theme like this, because using `Response`
-    // constructor, it removes url and some headers
-    // like `set-cookie` headers
+    // Since url and headers are read only properties
+    // this is the only way to set them.
     Object.defineProperty(res, 'url', { value: url });
     Object.defineProperty(res, 'headers', {
         value: new Headers(responseHeaders)

package/dist-js/index.js CHANGED Viewed

@@ -1,4 +1,4 @@
-import { Channel, 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 { Channel, 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.
@@ -89,29 +89,6 @@ async function fetch(input, init) {
     if (signal?.aborted) {
         throw new Error(ERROR_REQUEST_CANCELLED);
     }
-    const streamChannel = new Channel();
-    const readableStreamBody = new ReadableStream({
-        start: (controller) => {
-            streamChannel.onmessage = (res) => {
-                // close early if aborted
-                if (signal?.aborted) {
-                    controller.error(ERROR_REQUEST_CANCELLED);
-                    controller.close();
-                    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));
-            };
-        }
-    });
     const rid = await invoke('plugin:http|fetch', {
         clientConfig: {
             method: req.method,
@@ -122,8 +99,7 @@ async function fetch(input, init) {
             connectTimeout,
             proxy,
             danger
-        },
-        streamChannel
+        }
     });
     const abort = () => invoke('plugin:http|fetch_cancel', { rid });
     // abort early here if needed
@@ -134,19 +110,46 @@ async function fetch(input, init) {
         throw new Error(ERROR_REQUEST_CANCELLED);
     }
     signal?.addEventListener('abort', () => void abort());
-    const { status, statusText, url, headers: responseHeaders } = await invoke('plugin:http|fetch_send', {
+    const { status, statusText, url, headers: responseHeaders, rid: responseRid } = await invoke('plugin:http|fetch_send', {
         rid
     });
+    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;
+                }
+                const resUint8 = new Uint8Array(res);
+                const lastByte = resUint8[resUint8.byteLength - 1];
+                const actualRes = resUint8.slice(0, resUint8.byteLength - 1);
+                // close when the signal to close (last byte is 1) is sent from the IPC.
+                if (lastByte == 1) {
+                    controller.close();
+                    return;
+                }
+                controller.enqueue(actualRes);
+            };
+            // 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(readableStreamBody, {
         status,
         statusText
     });
-    // url and headers are read only properties
-    // but seems like we can set them like this
+    // Set `Response` properties that are ignored by the
+    // constructor, like url and some headers
     //
-    // we define theme like this, because using `Response`
-    // constructor, it removes url and some headers
-    // like `set-cookie` headers
+    // Since url and headers are read only properties
+    // this is the only way to set them.
     Object.defineProperty(res, 'url', { value: url });
     Object.defineProperty(res, 'headers', {
         value: new Headers(responseHeaders)

package/package.json CHANGED Viewed

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