@tauri-apps/plugin-http 2.0.0-beta.6 → 2.0.0-beta.8

package/dist-js/index.cjs

@@ -28,6 +28,7 @@ var core = require('@tauri-apps/api/core');
  *
  * @module
  */
+const ERROR_REQUEST_CANCELLED = "Request canceled";
 /**
  * Fetch a resource from the network. It returns a `Promise` that resolves to the
  * `Response` to that `Request`, whether it is successful or not.
@@ -43,6 +44,11 @@ var core = require('@tauri-apps/api/core');
  * @since 2.0.0
  */
 async function fetch(input, init) {
+    // abort early here if needed
+    const signal = init?.signal;
+    if (signal?.aborted) {
+        throw new Error(ERROR_REQUEST_CANCELLED);
+    }
     const maxRedirections = init?.maxRedirections;
     const connectTimeout = init?.connectTimeout;
     const proxy = init?.proxy;
@@ -52,7 +58,6 @@ async function fetch(input, init) {
         delete init.connectTimeout;
         delete init.proxy;
     }
-    const signal = init?.signal;
     const headers = init?.headers
         ? init.headers instanceof Headers
             ? init.headers
@@ -80,6 +85,10 @@ async function fetch(input, init) {
         // eslint-disable-next-line
         typeof val === "string" ? val : val.toString(),
     ]);
+    // abort early here if needed
+    if (signal?.aborted) {
+        throw new Error(ERROR_REQUEST_CANCELLED);
+    }
     const rid = await core.invoke("plugin:http|fetch", {
         clientConfig: {
             method: req.method,
@@ -91,11 +100,15 @@ async function fetch(input, init) {
             proxy,
         },
     });
-    signal?.addEventListener("abort", () => {
-        void core.invoke("plugin:http|fetch_cancel", {
-            rid,
-        });
-    });
+    const abort = () => core.invoke("plugin:http|fetch_cancel", { rid });
+    // abort early here if needed
+    if (signal?.aborted) {
+        // we don't care about the result of this proimse
+        // eslint-disable-next-line @typescript-eslint/no-floating-promises
+        abort();
+        throw new Error(ERROR_REQUEST_CANCELLED);
+    }
+    signal?.addEventListener("abort", () => abort);
     const { status, statusText, url, headers: responseHeaders, rid: responseRid, } = await core.invoke("plugin:http|fetch_send", {
         rid,
     });
@@ -107,12 +120,19 @@ async function fetch(input, init) {
         : body instanceof Array && body.length > 0
             ? new Uint8Array(body)
             : null, {
-        headers: responseHeaders,
         status,
         statusText,
     });
-    // url is read only but seems like we can do this
+    // url and headers are read only properties
+    // but seems like we can set them like this
+    //
+    // we define theme like this, because using `Response`
+    // constructor, it removes url and some headers
+    // like `set-cookie` headers
     Object.defineProperty(res, "url", { value: url });
+    Object.defineProperty(res, "headers", {
+        value: new Headers(responseHeaders),
+    });
     return res;
 }
 

package/dist-js/index.js

@@ -26,6 +26,7 @@ import { invoke } from '@tauri-apps/api/core';
  *
  * @module
  */
+const ERROR_REQUEST_CANCELLED = "Request canceled";
 /**
  * Fetch a resource from the network. It returns a `Promise` that resolves to the
  * `Response` to that `Request`, whether it is successful or not.
@@ -41,6 +42,11 @@ import { invoke } from '@tauri-apps/api/core';
  * @since 2.0.0
  */
 async function fetch(input, init) {
+    // abort early here if needed
+    const signal = init?.signal;
+    if (signal?.aborted) {
+        throw new Error(ERROR_REQUEST_CANCELLED);
+    }
     const maxRedirections = init?.maxRedirections;
     const connectTimeout = init?.connectTimeout;
     const proxy = init?.proxy;
@@ -50,7 +56,6 @@ async function fetch(input, init) {
         delete init.connectTimeout;
         delete init.proxy;
     }
-    const signal = init?.signal;
     const headers = init?.headers
         ? init.headers instanceof Headers
             ? init.headers
@@ -78,6 +83,10 @@ async function fetch(input, init) {
         // eslint-disable-next-line
         typeof val === "string" ? val : val.toString(),
     ]);
+    // abort early here if needed
+    if (signal?.aborted) {
+        throw new Error(ERROR_REQUEST_CANCELLED);
+    }
     const rid = await invoke("plugin:http|fetch", {
         clientConfig: {
             method: req.method,
@@ -89,11 +98,15 @@ async function fetch(input, init) {
             proxy,
         },
     });
-    signal?.addEventListener("abort", () => {
-        void invoke("plugin:http|fetch_cancel", {
-            rid,
-        });
-    });
+    const abort = () => invoke("plugin:http|fetch_cancel", { rid });
+    // abort early here if needed
+    if (signal?.aborted) {
+        // we don't care about the result of this proimse
+        // eslint-disable-next-line @typescript-eslint/no-floating-promises
+        abort();
+        throw new Error(ERROR_REQUEST_CANCELLED);
+    }
+    signal?.addEventListener("abort", () => abort);
     const { status, statusText, url, headers: responseHeaders, rid: responseRid, } = await invoke("plugin:http|fetch_send", {
         rid,
     });
@@ -105,12 +118,19 @@ async function fetch(input, init) {
         : body instanceof Array && body.length > 0
             ? new Uint8Array(body)
             : null, {
-        headers: responseHeaders,
         status,
         statusText,
     });
-    // url is read only but seems like we can do this
+    // url and headers are read only properties
+    // but seems like we can set them like this
+    //
+    // we define theme like this, because using `Response`
+    // constructor, it removes url and some headers
+    // like `set-cookie` headers
     Object.defineProperty(res, "url", { value: url });
+    Object.defineProperty(res, "headers", {
+        value: new Headers(responseHeaders),
+    });
     return res;
 }
 

package/package.json

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