@tauri-apps/plugin-http 2.0.0-beta.1 → 2.0.0-beta.3

package/dist-js/index.cjs

@@ -45,20 +45,33 @@ async function fetch(input, init) {
     const connectTimeout = init?.connectTimeout;
     const proxy = init?.proxy;
     // Remove these fields before creating the request
-    if (init) {
+    if (init != null) {
         delete init.maxRedirections;
         delete init.connectTimeout;
         delete init.proxy;
     }
     const signal = init?.signal;
+    const headers = init?.headers == null
+        ? []
+        : 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]) => [
+        name,
+        // we need to ensure we have all 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 reqData = buffer.byteLength !== 0 ? Array.from(new Uint8Array(buffer)) : null;
     const rid = await core.invoke("plugin:http|fetch", {
         clientConfig: {
             method: req.method,
             url: req.url,
-            headers: Array.from(req.headers.entries()),
+            headers: mappedHeaders,
             data: reqData,
             maxRedirections,
             connectTimeout,
@@ -66,22 +79,22 @@ async function fetch(input, init) {
         },
     });
     signal?.addEventListener("abort", () => {
-        core.invoke("plugin:http|fetch_cancel", {
+        void core.invoke("plugin:http|fetch_cancel", {
             rid,
         });
     });
-    const { status, statusText, url, headers, rid: responseRid, } = await core.invoke("plugin:http|fetch_send", {
+    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 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,
+        headers: responseHeaders,
         status,
         statusText,
     });

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

@@ -43,20 +43,33 @@ async function fetch(input, init) {
     const connectTimeout = init?.connectTimeout;
     const proxy = init?.proxy;
     // Remove these fields before creating the request
-    if (init) {
+    if (init != null) {
         delete init.maxRedirections;
         delete init.connectTimeout;
         delete init.proxy;
     }
     const signal = init?.signal;
+    const headers = init?.headers == null
+        ? []
+        : 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]) => [
+        name,
+        // we need to ensure we have all 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 reqData = buffer.byteLength !== 0 ? Array.from(new Uint8Array(buffer)) : null;
     const rid = await invoke("plugin:http|fetch", {
         clientConfig: {
             method: req.method,
             url: req.url,
-            headers: Array.from(req.headers.entries()),
+            headers: mappedHeaders,
             data: reqData,
             maxRedirections,
             connectTimeout,
@@ -64,22 +77,22 @@ async function fetch(input, init) {
         },
     });
     signal?.addEventListener("abort", () => {
-        invoke("plugin:http|fetch_cancel", {
+        void invoke("plugin:http|fetch_cancel", {
             rid,
         });
     });
-    const { status, statusText, url, headers, rid: responseRid, } = await invoke("plugin:http|fetch_send", {
+    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 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,
+        headers: responseHeaders,
         status,
         statusText,
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tauri-apps/plugin-http",
-  "version": "2.0.0-beta.1",
+  "version": "2.0.0-beta.3",
   "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.2"
+    "@tauri-apps/api": "2.0.0-beta.11"
   },
   "scripts": {
     "build": "rollup -c"