@tauri-apps/plugin-http 2.0.0-beta.2 → 2.0.0-beta.4

package/dist-js/index.cjs

@@ -51,35 +51,45 @@ async function fetch(input, init) {
         delete init.proxy;
     }
     const signal = init?.signal;
-    const headers = !init?.headers
-        ? []
-        : init.headers instanceof Headers
-            ? Array.from(init.headers.entries())
-            : Array.isArray(init.headers)
-                ? init.headers
-                : Object.entries(init.headers);
-    const mappedHeaders = headers.map(([name, val]) => [
+    const headers = init?.headers
+        ? init.headers instanceof Headers
+            ? init.headers
+            : new Headers(init.headers)
+        : new Headers();
+    const req = new Request(input, init);
+    const buffer = await req.arrayBuffer();
+    const data = buffer.byteLength !== 0 ? Array.from(new Uint8Array(buffer)) : null;
+    // append new headers created by the browser `Request` implementation,
+    // if not already declared by the caller of this function
+    for (const [key, value] of req.headers) {
+        if (!headers.get(key)) {
+            headers.set(key, value);
+        }
+    }
+    const headersArray = headers instanceof Headers
+        ? Array.from(headers.entries())
+        : Array.isArray(headers)
+            ? headers
+            : Object.entries(headers);
+    const mappedHeaders = headersArray.map(([name, val]) => [
         name,
-        // we need to ensure we have all values as strings
+        // we need to ensure we have all header values as strings
         // eslint-disable-next-line
         typeof val === "string" ? val : val.toString(),
     ]);
-    const req = new Request(input, init);
-    const buffer = await req.arrayBuffer();
-    const reqData = buffer.byteLength ? Array.from(new Uint8Array(buffer)) : null;
     const rid = await core.invoke("plugin:http|fetch", {
         clientConfig: {
             method: req.method,
             url: req.url,
             headers: mappedHeaders,
-            data: reqData,
+            data,
             maxRedirections,
             connectTimeout,
             proxy,
         },
     });
     signal?.addEventListener("abort", () => {
-        core.invoke("plugin:http|fetch_cancel", {
+        void core.invoke("plugin:http|fetch_cancel", {
             rid,
         });
     });
@@ -89,9 +99,9 @@ async function fetch(input, init) {
     const body = await core.invoke("plugin:http|fetch_read_body", {
         rid: responseRid,
     });
-    const res = new Response(body instanceof ArrayBuffer && body.byteLength
+    const res = new Response(body instanceof ArrayBuffer && body.byteLength !== 0
         ? body
-        : body instanceof Array && body.length
+        : body instanceof Array && body.length > 0
             ? new Uint8Array(body)
             : null, {
         headers: responseHeaders,

package/dist-js/index.d.ts

@@ -3,7 +3,7 @@
  *
  * @since 2.0.0
  */
-export type Proxy = {
+export interface Proxy {
     /**
      * Proxy all traffic to the passed URL.
      */
@@ -16,7 +16,7 @@ export type Proxy = {
      * Proxy all HTTPS traffic to the passed URL.
      */
     https?: string | ProxyConfig;
-};
+}
 export interface ProxyConfig {
     /**
      * The URL of the proxy server.
@@ -30,7 +30,7 @@ export interface ProxyConfig {
         password: string;
     };
     /**
-     * A configuration for filtering out requests that shouldn’t be proxied.
+     * A configuration for filtering out requests that shouldn't be proxied.
      * Entries are expected to be comma-separated (whitespace between entries is ignored)
      */
     noProxy?: string;

package/dist-js/index.js

@@ -49,35 +49,45 @@ async function fetch(input, init) {
         delete init.proxy;
     }
     const signal = init?.signal;
-    const headers = !init?.headers
-        ? []
-        : init.headers instanceof Headers
-            ? Array.from(init.headers.entries())
-            : Array.isArray(init.headers)
-                ? init.headers
-                : Object.entries(init.headers);
-    const mappedHeaders = headers.map(([name, val]) => [
+    const headers = init?.headers
+        ? init.headers instanceof Headers
+            ? init.headers
+            : new Headers(init.headers)
+        : new Headers();
+    const req = new Request(input, init);
+    const buffer = await req.arrayBuffer();
+    const data = buffer.byteLength !== 0 ? Array.from(new Uint8Array(buffer)) : null;
+    // append new headers created by the browser `Request` implementation,
+    // if not already declared by the caller of this function
+    for (const [key, value] of req.headers) {
+        if (!headers.get(key)) {
+            headers.set(key, value);
+        }
+    }
+    const headersArray = headers instanceof Headers
+        ? Array.from(headers.entries())
+        : Array.isArray(headers)
+            ? headers
+            : Object.entries(headers);
+    const mappedHeaders = headersArray.map(([name, val]) => [
         name,
-        // we need to ensure we have all values as strings
+        // we need to ensure we have all header values as strings
         // eslint-disable-next-line
         typeof val === "string" ? val : val.toString(),
     ]);
-    const req = new Request(input, init);
-    const buffer = await req.arrayBuffer();
-    const reqData = buffer.byteLength ? Array.from(new Uint8Array(buffer)) : null;
     const rid = await invoke("plugin:http|fetch", {
         clientConfig: {
             method: req.method,
             url: req.url,
             headers: mappedHeaders,
-            data: reqData,
+            data,
             maxRedirections,
             connectTimeout,
             proxy,
         },
     });
     signal?.addEventListener("abort", () => {
-        invoke("plugin:http|fetch_cancel", {
+        void invoke("plugin:http|fetch_cancel", {
             rid,
         });
     });
@@ -87,9 +97,9 @@ async function fetch(input, init) {
     const body = await invoke("plugin:http|fetch_read_body", {
         rid: responseRid,
     });
-    const res = new Response(body instanceof ArrayBuffer && body.byteLength
+    const res = new Response(body instanceof ArrayBuffer && body.byteLength !== 0
         ? body
-        : body instanceof Array && body.length
+        : body instanceof Array && body.length > 0
             ? new Uint8Array(body)
             : null, {
         headers: responseHeaders,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tauri-apps/plugin-http",
-  "version": "2.0.0-beta.2",
+  "version": "2.0.0-beta.4",
   "license": "MIT or APACHE-2.0",
   "authors": [
     "Tauri Programme within The Commons Conservancy"
@@ -20,7 +20,7 @@
     "LICENSE"
   ],
   "dependencies": {
-    "@tauri-apps/api": "2.0.0-beta.4"
+    "@tauri-apps/api": "2.0.0-beta.12"
   },
   "scripts": {
     "build": "rollup -c"