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

package/README.md

@@ -4,7 +4,7 @@ Access the HTTP client written in Rust.
 
 ## Install
 
-_This plugin requires a Rust version of at least **1.70**_
+_This plugin requires a Rust version of at least **1.75**_
 
 There are three general methods of installation that we can recommend.
 

package/dist-js/index.cjs

@@ -51,6 +51,19 @@ 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]) => [
+        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;
@@ -58,7 +71,7 @@ async function fetch(input, init) {
         clientConfig: {
             method: req.method,
             url: req.url,
-            headers: Array.from(req.headers.entries()),
+            headers: mappedHeaders,
             data: reqData,
             maxRedirections,
             connectTimeout,
@@ -70,14 +83,18 @@ async function fetch(input, init) {
             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(new Uint8Array(body), {
-        headers,
+    const res = new Response(body instanceof ArrayBuffer && body.byteLength
+        ? body
+        : body instanceof Array && body.length
+            ? new Uint8Array(body)
+            : null, {
+        headers: responseHeaders,
         status,
         statusText,
     });

package/dist-js/index.js

@@ -49,6 +49,19 @@ 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]) => [
+        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;
@@ -56,7 +69,7 @@ async function fetch(input, init) {
         clientConfig: {
             method: req.method,
             url: req.url,
-            headers: Array.from(req.headers.entries()),
+            headers: mappedHeaders,
             data: reqData,
             maxRedirections,
             connectTimeout,
@@ -68,14 +81,18 @@ async function fetch(input, init) {
             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(new Uint8Array(body), {
-        headers,
+    const res = new Response(body instanceof ArrayBuffer && body.byteLength
+        ? body
+        : body instanceof Array && body.length
+            ? new Uint8Array(body)
+            : null, {
+        headers: responseHeaders,
         status,
         statusText,
     });

package/package.json

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