@tauri-apps/plugin-http 2.2.0 → 2.4.0

package/dist-js/index.cjs

@@ -52,11 +52,13 @@ async function fetch(input, init) {
     const maxRedirections = init?.maxRedirections;
     const connectTimeout = init?.connectTimeout;
     const proxy = init?.proxy;
+    const danger = init?.danger;
     // Remove these fields before creating the request
     if (init) {
         delete init.maxRedirections;
         delete init.connectTimeout;
         delete init.proxy;
+        delete init.danger;
     }
     const headers = init?.headers
         ? init.headers instanceof Headers
@@ -89,6 +91,29 @@ 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,
@@ -97,8 +122,10 @@ async function fetch(input, init) {
             data,
             maxRedirections,
             connectTimeout,
-            proxy
-        }
+            proxy,
+            danger
+        },
+        streamChannel
     });
     const abort = () => core.invoke('plugin:http|fetch_cancel', { rid });
     // abort early here if needed
@@ -109,17 +136,10 @@ async function fetch(input, init) {
         throw new Error(ERROR_REQUEST_CANCELLED);
     }
     signal?.addEventListener('abort', () => void abort());
-    const { status, statusText, url, headers: responseHeaders, rid: responseRid } = await core.invoke('plugin:http|fetch_send', {
+    const { status, statusText, url, headers: responseHeaders } = await core.invoke('plugin:http|fetch_send', {
         rid
     });
-    const body = await core.invoke('plugin:http|fetch_read_body', {
-        rid: responseRid
-    });
-    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.d.ts

@@ -52,6 +52,25 @@ export interface ClientOptions {
      * Configuration of a proxy that a Client should pass requests to.
      */
     proxy?: Proxy;
+    /**
+     * Configuration for dangerous settings on the client such as disabling SSL verification.
+     */
+    danger?: DangerousSettings;
+}
+/**
+ * Configuration for dangerous settings on the client such as disabling SSL verification.
+ *
+ * @since 2.3.0
+ */
+export interface DangerousSettings {
+    /**
+     * Disables SSL verification.
+     */
+    acceptInvalidCerts?: boolean;
+    /**
+     * Disables hostname verification.
+     */
+    acceptInvalidHostnames?: boolean;
 }
 /**
  * Fetch a resource from the network. It returns a `Promise` that resolves to the

package/dist-js/index.js

@@ -1,4 +1,4 @@
-import { invoke } from '@tauri-apps/api/core';
+import { Channel, invoke } from '@tauri-apps/api/core';
 
 // Copyright 2019-2023 Tauri Programme within The Commons Conservancy
 // SPDX-License-Identifier: Apache-2.0
@@ -50,11 +50,13 @@ async function fetch(input, init) {
     const maxRedirections = init?.maxRedirections;
     const connectTimeout = init?.connectTimeout;
     const proxy = init?.proxy;
+    const danger = init?.danger;
     // Remove these fields before creating the request
     if (init) {
         delete init.maxRedirections;
         delete init.connectTimeout;
         delete init.proxy;
+        delete init.danger;
     }
     const headers = init?.headers
         ? init.headers instanceof Headers
@@ -87,6 +89,29 @@ 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,
@@ -95,8 +120,10 @@ async function fetch(input, init) {
             data,
             maxRedirections,
             connectTimeout,
-            proxy
-        }
+            proxy,
+            danger
+        },
+        streamChannel
     });
     const abort = () => invoke('plugin:http|fetch_cancel', { rid });
     // abort early here if needed
@@ -107,17 +134,10 @@ async function fetch(input, init) {
         throw new Error(ERROR_REQUEST_CANCELLED);
     }
     signal?.addEventListener('abort', () => void abort());
-    const { status, statusText, url, headers: responseHeaders, rid: responseRid } = await invoke('plugin:http|fetch_send', {
+    const { status, statusText, url, headers: responseHeaders } = await invoke('plugin:http|fetch_send', {
         rid
     });
-    const body = await invoke('plugin:http|fetch_read_body', {
-        rid: responseRid
-    });
-    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.2.0",
+  "version": "2.4.0",
   "license": "MIT OR Apache-2.0",
   "authors": [
     "Tauri Programme within The Commons Conservancy"