Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(http): remove cmd property from http|fetch invoke, closes #587 #588

Merged
merged 5 commits into from
Sep 4, 2023
Merged

fix(http): remove cmd property from http|fetch invoke, closes #587 #588

merged 5 commits into from
Sep 4, 2023

Conversation

i-c-b
Copy link
Contributor

@i-c-b i-c-b commented Sep 2, 2023

closes #587

@i-c-b i-c-b requested a review from a team as a code owner September 2, 2023 14:13
amrbashir
amrbashir previously approved these changes Sep 2, 2023
@amrbashir
Copy link
Member

@i-c-b Thanks for the contribution, could you add a change file as well?

@Bricklou
Copy link
Contributor

Bricklou commented Sep 2, 2023

There is also another bug with the ArrayBuffer, here is the patch file I made to fix the issue temporarily:

diff --git a/dist-js/index.min.js b/dist-js/index.min.js
index a61a5cfca422aad611349e6924fa948b8e0cc603..1d08fdc1b40f69fc598a39cea0f94c285eefdf31 100644
--- a/dist-js/index.min.js
+++ b/dist-js/index.min.js
@@ -27,7 +27,6 @@ async function fetch(input, init) {
     const buffer = await req.arrayBuffer();
     const reqData = buffer.byteLength ? Array.from(new Uint8Array(buffer)) : null;
     const rid = await window.__TAURI_INVOKE__("plugin:http|fetch", {
-        cmd: "fetch",
         method: req.method,
         url: req.url,
         headers: Array.from(req.headers.entries()),
@@ -46,7 +45,7 @@ async function fetch(input, init) {
     const body = await window.__TAURI_INVOKE__("plugin:http|fetch_read_body", {
         rid,
     });
-    const res = new Response(Uint8Array.from(body), {
+    const res = new Response(new Uint8Array(body), {
         headers,
         status,
         statusText,
diff --git a/dist-js/index.mjs b/dist-js/index.mjs
index c7768ebc0abecf32eda4c9e759c7ac40400e00b7..ce9e9b3ab8ac59c5ff3746f8406a002d6d6e94a6 100644
--- a/dist-js/index.mjs
+++ b/dist-js/index.mjs
@@ -27,7 +27,6 @@ async function fetch(input, init) {
     const buffer = await req.arrayBuffer();
     const reqData = buffer.byteLength ? Array.from(new Uint8Array(buffer)) : null;
     const rid = await window.__TAURI_INVOKE__("plugin:http|fetch", {
-        cmd: "fetch",
         method: req.method,
         url: req.url,
         headers: Array.from(req.headers.entries()),
@@ -46,7 +45,7 @@ async function fetch(input, init) {
     const body = await window.__TAURI_INVOKE__("plugin:http|fetch_read_body", {
         rid,
     });
-    const res = new Response(Uint8Array.from(body), {
+    const res = new Response(new Uint8Array(body), {
         headers,
         status,
         statusText,

the line below, need to be changed from Uint8Array.from into new Uint8Array

const res = new Response(Uint8Array.from(body), {

i-c-b and others added 2 commits September 4, 2023 18:58
Co-authored-by: Louis Bailleau <Bricklou@users.noreply.github.com>
Co-authored-by: Louis Bailleau <Bricklou@users.noreply.github.com>
@i-c-b i-c-b requested a review from amrbashir September 4, 2023 09:00
Copy link
Member

@amrbashir amrbashir left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you

@amrbashir amrbashir merged commit 2cb0fa7 into tauri-apps:v2 Sep 4, 2023
7 checks passed
@i-c-b i-c-b deleted the v2-http-fetch-not-found branch September 4, 2023 22:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants