From a6361dfacd492be5df33621021c42441b783d8d1 Mon Sep 17 00:00:00 2001 From: Lucas Fernandes Nogueira Date: Fri, 20 Oct 2023 16:51:56 +0000 Subject: [PATCH] chore: update to tauri alpha.16, api alpha.9 (#673) Co-authored-by: Amr Bashir Committed via a GitHub action: https://github.com/tauri-apps/plugins-workspace/actions/runs/6590505706 Co-authored-by: lucasfernog --- Cargo.toml | 1 + README.md | 2 +- dist-js/index.d.ts | 26 -------------------------- dist-js/index.min.js | 33 +++++++++++++++++++++++++++++---- dist-js/index.min.js.map | 2 +- dist-js/index.mjs | 31 +++++++++++++++++++++++++++---- dist-js/index.mjs.map | 2 +- guest-js/index.ts | 23 +++++++++-------------- node_modules/@tauri-apps/api | 2 +- package.json | 2 +- src/api-iife.js | 2 +- 11 files changed, 72 insertions(+), 54 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 5d96c42..49cb18b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -5,6 +5,7 @@ description = "Access an HTTP client written in Rust." edition = { workspace = true } authors = { workspace = true } license = { workspace = true } +rust-version = { workspace = true } [package.metadata.docs.rs] features = [ "tauri/dox" ] diff --git a/README.md b/README.md index 148fe7e..b46b0e2 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ Access the HTTP client written in Rust. ## Install -_This plugin requires a Rust version of at least **1.65**_ +_This plugin requires a Rust version of at least **1.70**_ There are three general methods of installation that we can recommend. diff --git a/dist-js/index.d.ts b/dist-js/index.d.ts index 717ea52..ff4b38d 100644 --- a/dist-js/index.d.ts +++ b/dist-js/index.d.ts @@ -1,29 +1,3 @@ -/** - * Make HTTP requests with the Rust backend. - * - * ## Security - * - * This API has a scope configuration that forces you to restrict the URLs and paths that can be accessed using glob patterns. - * - * For instance, this scope configuration only allows making HTTP requests to the GitHub API for the `tauri-apps` organization: - * ```json - * { - * "plugins": { - * "http": { - * "scope": ["https://api.github.com/repos/tauri-apps/*"] - * } - * } - * } - * ``` - * Trying to execute any API with a URL not configured on the scope results in a promise rejection due to denied access. - * - * @module - */ -declare global { - interface Window { - __TAURI_INVOKE__: (cmd: string, args?: unknown) => Promise; - } -} /** * Options to configure the Rust client used to make fetch requests * diff --git a/dist-js/index.min.js b/dist-js/index.min.js index 1d08fdc..9a64104 100644 --- a/dist-js/index.min.js +++ b/dist-js/index.min.js @@ -1,6 +1,31 @@ +var f=Object.defineProperty;var g=(a,b)=>{for(var c in b)f(a,c,{get:b[c],enumerable:!0});};var e=(a,b,c)=>{if(!b.has(a))throw TypeError("Cannot "+c)};var h=(a,b,c)=>(e(a,b,"read from private field"),c?c.call(a):b.get(a)),i$1=(a,b,c)=>{if(b.has(a))throw TypeError("Cannot add the same private member more than once");b instanceof WeakSet?b.add(a):b.set(a,c);},j=(a,b,c,d)=>(e(a,b,"write to private field"),d?d.call(a,c):b.set(a,c),c); + +var T={};g(T,{Channel:()=>i,PluginListener:()=>o,addPluginListener:()=>l,convertFileSrc:()=>v,invoke:()=>u,transformCallback:()=>_});function _(e,n=!1){return window.__TAURI_INTERNALS__.transformCallback(e,n)}var r,i=class{constructor(){this.__TAURI_CHANNEL_MARKER__=!0;i$1(this,r,()=>{});this.id=_(n=>{h(this,r).call(this,n);});}set onmessage(n){j(this,r,n);}get onmessage(){return h(this,r)}toJSON(){return `__CHANNEL__:${this.id}`}};r=new WeakMap;var o=class{constructor(n,s,t){this.plugin=n,this.event=s,this.channelId=t;}async unregister(){return u(`plugin:${this.plugin}|remove_listener`,{event:this.event,channelId:this.channelId})}};async function l(e,n,s){let t=new i;return t.onmessage=s,u(`plugin:${e}|register_listener`,{event:n,handler:t}).then(()=>new o(e,n,t.id))}async function u(e,n={},s){return window.__TAURI_INTERNALS__.invoke(e,n,s)}function v(e,n="asset"){return window.__TAURI_INTERNALS__.convertFileSrc(e,n)} + // Copyright 2019-2023 Tauri Programme within The Commons Conservancy // SPDX-License-Identifier: Apache-2.0 // SPDX-License-Identifier: MIT +/** + * Make HTTP requests with the Rust backend. + * + * ## Security + * + * This API has a scope configuration that forces you to restrict the URLs and paths that can be accessed using glob patterns. + * + * For instance, this scope configuration only allows making HTTP requests to the GitHub API for the `tauri-apps` organization: + * ```json + * { + * "plugins": { + * "http": { + * "scope": ["https://api.github.com/repos/tauri-apps/*"] + * } + * } + * } + * ``` + * Trying to execute any API with a URL not configured on the scope results in a promise rejection due to denied access. + * + * @module + */ /** * Fetch a resource from the network. It returns a `Promise` that resolves to the * `Response` to that `Request`, whether it is successful or not. @@ -26,7 +51,7 @@ async function fetch(input, init) { const req = new Request(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", { + const rid = await u("plugin:http|fetch", { method: req.method, url: req.url, headers: Array.from(req.headers.entries()), @@ -35,14 +60,14 @@ async function fetch(input, init) { connectTimeout, }); req.signal.addEventListener("abort", () => { - window.__TAURI_INVOKE__("plugin:http|fetch_cancel", { + u("plugin:http|fetch_cancel", { rid, }); }); - const { status, statusText, url, headers } = await window.__TAURI_INVOKE__("plugin:http|fetch_send", { + const { status, statusText, url, headers } = await u("plugin:http|fetch_send", { rid, }); - const body = await window.__TAURI_INVOKE__("plugin:http|fetch_read_body", { + const body = await u("plugin:http|fetch_read_body", { rid, }); const res = new Response(new Uint8Array(body), { diff --git a/dist-js/index.min.js.map b/dist-js/index.min.js.map index ea3d8de..f3a52ab 100644 --- a/dist-js/index.min.js.map +++ b/dist-js/index.min.js.map @@ -1 +1 @@ -{"version":3,"file":"index.min.js","sources":["../guest-js/index.ts"],"sourcesContent":[null],"names":[],"mappings":"AAAA;AACA;AACA;AA6CA;;;;;;;;;;;;;AAaG;AACI,eAAe,KAAK,CACzB,KAA6B,EAC7B,IAAkC,EAAA;IAElC,MAAM,eAAe,GAAG,IAAI,KAAA,IAAA,IAAJ,IAAI,KAAJ,KAAA,CAAA,GAAA,KAAA,CAAA,GAAA,IAAI,CAAE,eAAe,CAAC;IAC9C,MAAM,cAAc,GAAG,IAAI,KAAA,IAAA,IAAJ,IAAI,KAAJ,KAAA,CAAA,GAAA,KAAA,CAAA,GAAA,IAAI,CAAE,eAAe,CAAC;;AAG7C,IAAA,IAAI,IAAI,EAAE;QACR,OAAO,IAAI,CAAC,eAAe,CAAC;QAC5B,OAAO,IAAI,CAAC,cAAc,CAAC;AAC5B,KAAA;IAED,MAAM,GAAG,GAAG,IAAI,OAAO,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;AACrC,IAAA,MAAM,MAAM,GAAG,MAAM,GAAG,CAAC,WAAW,EAAE,CAAC;IACvC,MAAM,OAAO,GAAG,MAAM,CAAC,UAAU,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,UAAU,CAAC,MAAM,CAAC,CAAC,GAAG,IAAI,CAAC;IAE9E,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,gBAAgB,CAAS,mBAAmB,EAAE;QACrE,MAAM,EAAE,GAAG,CAAC,MAAM;QAClB,GAAG,EAAE,GAAG,CAAC,GAAG;QACZ,OAAO,EAAE,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;AAC1C,QAAA,IAAI,EAAE,OAAO;QACb,eAAe;QACf,cAAc;AACf,KAAA,CAAC,CAAC;IAEH,GAAG,CAAC,MAAM,CAAC,gBAAgB,CAAC,OAAO,EAAE,MAAK;AACxC,QAAA,MAAM,CAAC,gBAAgB,CAAC,0BAA0B,EAAE;YAClD,GAAG;AACJ,SAAA,CAAC,CAAC;AACL,KAAC,CAAC,CAAC;AASH,IAAA,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,GAAG,EAAE,OAAO,EAAE,GACxC,MAAM,MAAM,CAAC,gBAAgB,CAAoB,wBAAwB,EAAE;QACzE,GAAG;AACJ,KAAA,CAAC,CAAC;IAEL,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,gBAAgB,CACxC,6BAA6B,EAC7B;QACE,GAAG;AACJ,KAAA,CACF,CAAC;IAEF,MAAM,GAAG,GAAG,IAAI,QAAQ,CAAC,IAAI,UAAU,CAAC,IAAI,CAAC,EAAE;QAC7C,OAAO;QACP,MAAM;QACN,UAAU;AACX,KAAA,CAAC,CAAC;;AAGH,IAAA,MAAM,CAAC,cAAc,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,CAAC;AAElD,IAAA,OAAO,GAAG,CAAC;AACb;;;;"} \ No newline at end of file +{"version":3,"file":"index.min.js","sources":["../../../node_modules/.pnpm/@tauri-apps+api@2.0.0-alpha.9/node_modules/@tauri-apps/api/chunk-NDS2DDJC.js","../../../node_modules/.pnpm/@tauri-apps+api@2.0.0-alpha.9/node_modules/@tauri-apps/api/chunk-CTAYYLOC.js","../guest-js/index.ts"],"sourcesContent":["var f=Object.defineProperty;var g=(a,b)=>{for(var c in b)f(a,c,{get:b[c],enumerable:!0})};var e=(a,b,c)=>{if(!b.has(a))throw TypeError(\"Cannot \"+c)};var h=(a,b,c)=>(e(a,b,\"read from private field\"),c?c.call(a):b.get(a)),i=(a,b,c)=>{if(b.has(a))throw TypeError(\"Cannot add the same private member more than once\");b instanceof WeakSet?b.add(a):b.set(a,c)},j=(a,b,c,d)=>(e(a,b,\"write to private field\"),d?d.call(a,c):b.set(a,c),c);export{g as a,h as b,i as c,j as d};\n","import{a as d,b as a,c as g,d as c}from\"./chunk-NDS2DDJC.js\";var T={};d(T,{Channel:()=>i,PluginListener:()=>o,addPluginListener:()=>l,convertFileSrc:()=>v,invoke:()=>u,transformCallback:()=>_});function _(e,n=!1){return window.__TAURI_INTERNALS__.transformCallback(e,n)}var r,i=class{constructor(){this.__TAURI_CHANNEL_MARKER__=!0;g(this,r,()=>{});this.id=_(n=>{a(this,r).call(this,n)})}set onmessage(n){c(this,r,n)}get onmessage(){return a(this,r)}toJSON(){return`__CHANNEL__:${this.id}`}};r=new WeakMap;var o=class{constructor(n,s,t){this.plugin=n,this.event=s,this.channelId=t}async unregister(){return u(`plugin:${this.plugin}|remove_listener`,{event:this.event,channelId:this.channelId})}};async function l(e,n,s){let t=new i;return t.onmessage=s,u(`plugin:${e}|register_listener`,{event:n,handler:t}).then(()=>new o(e,n,t.id))}async function u(e,n={},s){return window.__TAURI_INTERNALS__.invoke(e,n,s)}function v(e,n=\"asset\"){return window.__TAURI_INTERNALS__.convertFileSrc(e,n)}export{_ as a,i as b,o as c,l as d,u as e,v as f,T as g};\n",null],"names":["i","d","g","a","c","invoke"],"mappings":"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","x_google_ignoreList":[0,1]} \ No newline at end of file diff --git a/dist-js/index.mjs b/dist-js/index.mjs index ce9e9b3..f2ba182 100644 --- a/dist-js/index.mjs +++ b/dist-js/index.mjs @@ -1,6 +1,29 @@ +import { invoke } from '@tauri-apps/api/primitives'; + // Copyright 2019-2023 Tauri Programme within The Commons Conservancy // SPDX-License-Identifier: Apache-2.0 // SPDX-License-Identifier: MIT +/** + * Make HTTP requests with the Rust backend. + * + * ## Security + * + * This API has a scope configuration that forces you to restrict the URLs and paths that can be accessed using glob patterns. + * + * For instance, this scope configuration only allows making HTTP requests to the GitHub API for the `tauri-apps` organization: + * ```json + * { + * "plugins": { + * "http": { + * "scope": ["https://api.github.com/repos/tauri-apps/*"] + * } + * } + * } + * ``` + * Trying to execute any API with a URL not configured on the scope results in a promise rejection due to denied access. + * + * @module + */ /** * Fetch a resource from the network. It returns a `Promise` that resolves to the * `Response` to that `Request`, whether it is successful or not. @@ -26,7 +49,7 @@ async function fetch(input, init) { const req = new Request(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", { + const rid = await invoke("plugin:http|fetch", { method: req.method, url: req.url, headers: Array.from(req.headers.entries()), @@ -35,14 +58,14 @@ async function fetch(input, init) { connectTimeout, }); req.signal.addEventListener("abort", () => { - window.__TAURI_INVOKE__("plugin:http|fetch_cancel", { + invoke("plugin:http|fetch_cancel", { rid, }); }); - const { status, statusText, url, headers } = await window.__TAURI_INVOKE__("plugin:http|fetch_send", { + const { status, statusText, url, headers } = await invoke("plugin:http|fetch_send", { rid, }); - const body = await window.__TAURI_INVOKE__("plugin:http|fetch_read_body", { + const body = await invoke("plugin:http|fetch_read_body", { rid, }); const res = new Response(new Uint8Array(body), { diff --git a/dist-js/index.mjs.map b/dist-js/index.mjs.map index 7088a8d..10b2464 100644 --- a/dist-js/index.mjs.map +++ b/dist-js/index.mjs.map @@ -1 +1 @@ -{"version":3,"file":"index.mjs","sources":["../guest-js/index.ts"],"sourcesContent":[null],"names":[],"mappings":"AAAA;AACA;AACA;AA6CA;;;;;;;;;;;;;AAaG;AACI,eAAe,KAAK,CACzB,KAA6B,EAC7B,IAAkC,EAAA;IAElC,MAAM,eAAe,GAAG,IAAI,KAAA,IAAA,IAAJ,IAAI,KAAJ,KAAA,CAAA,GAAA,KAAA,CAAA,GAAA,IAAI,CAAE,eAAe,CAAC;IAC9C,MAAM,cAAc,GAAG,IAAI,KAAA,IAAA,IAAJ,IAAI,KAAJ,KAAA,CAAA,GAAA,KAAA,CAAA,GAAA,IAAI,CAAE,eAAe,CAAC;;AAG7C,IAAA,IAAI,IAAI,EAAE;QACR,OAAO,IAAI,CAAC,eAAe,CAAC;QAC5B,OAAO,IAAI,CAAC,cAAc,CAAC;AAC5B,KAAA;IAED,MAAM,GAAG,GAAG,IAAI,OAAO,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;AACrC,IAAA,MAAM,MAAM,GAAG,MAAM,GAAG,CAAC,WAAW,EAAE,CAAC;IACvC,MAAM,OAAO,GAAG,MAAM,CAAC,UAAU,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,UAAU,CAAC,MAAM,CAAC,CAAC,GAAG,IAAI,CAAC;IAE9E,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,gBAAgB,CAAS,mBAAmB,EAAE;QACrE,MAAM,EAAE,GAAG,CAAC,MAAM;QAClB,GAAG,EAAE,GAAG,CAAC,GAAG;QACZ,OAAO,EAAE,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;AAC1C,QAAA,IAAI,EAAE,OAAO;QACb,eAAe;QACf,cAAc;AACf,KAAA,CAAC,CAAC;IAEH,GAAG,CAAC,MAAM,CAAC,gBAAgB,CAAC,OAAO,EAAE,MAAK;AACxC,QAAA,MAAM,CAAC,gBAAgB,CAAC,0BAA0B,EAAE;YAClD,GAAG;AACJ,SAAA,CAAC,CAAC;AACL,KAAC,CAAC,CAAC;AASH,IAAA,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,GAAG,EAAE,OAAO,EAAE,GACxC,MAAM,MAAM,CAAC,gBAAgB,CAAoB,wBAAwB,EAAE;QACzE,GAAG;AACJ,KAAA,CAAC,CAAC;IAEL,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,gBAAgB,CACxC,6BAA6B,EAC7B;QACE,GAAG;AACJ,KAAA,CACF,CAAC;IAEF,MAAM,GAAG,GAAG,IAAI,QAAQ,CAAC,IAAI,UAAU,CAAC,IAAI,CAAC,EAAE;QAC7C,OAAO;QACP,MAAM;QACN,UAAU;AACX,KAAA,CAAC,CAAC;;AAGH,IAAA,MAAM,CAAC,cAAc,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,CAAC;AAElD,IAAA,OAAO,GAAG,CAAC;AACb;;;;"} \ No newline at end of file +{"version":3,"file":"index.mjs","sources":["../guest-js/index.ts"],"sourcesContent":[null],"names":[],"mappings":";;AAAA;AACA;AACA;AAEA;;;;;;;;;;;;;;;;;;;;AAoBG;AAmBH;;;;;;;;;;;;;AAaG;AACI,eAAe,KAAK,CACzB,KAA6B,EAC7B,IAAkC,EAAA;IAElC,MAAM,eAAe,GAAG,IAAI,KAAA,IAAA,IAAJ,IAAI,KAAJ,KAAA,CAAA,GAAA,KAAA,CAAA,GAAA,IAAI,CAAE,eAAe,CAAC;IAC9C,MAAM,cAAc,GAAG,IAAI,KAAA,IAAA,IAAJ,IAAI,KAAJ,KAAA,CAAA,GAAA,KAAA,CAAA,GAAA,IAAI,CAAE,eAAe,CAAC;;AAG7C,IAAA,IAAI,IAAI,EAAE;QACR,OAAO,IAAI,CAAC,eAAe,CAAC;QAC5B,OAAO,IAAI,CAAC,cAAc,CAAC;AAC5B,KAAA;IAED,MAAM,GAAG,GAAG,IAAI,OAAO,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;AACrC,IAAA,MAAM,MAAM,GAAG,MAAM,GAAG,CAAC,WAAW,EAAE,CAAC;IACvC,MAAM,OAAO,GAAG,MAAM,CAAC,UAAU,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,UAAU,CAAC,MAAM,CAAC,CAAC,GAAG,IAAI,CAAC;AAE9E,IAAA,MAAM,GAAG,GAAG,MAAM,MAAM,CAAS,mBAAmB,EAAE;QACpD,MAAM,EAAE,GAAG,CAAC,MAAM;QAClB,GAAG,EAAE,GAAG,CAAC,GAAG;QACZ,OAAO,EAAE,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;AAC1C,QAAA,IAAI,EAAE,OAAO;QACb,eAAe;QACf,cAAc;AACf,KAAA,CAAC,CAAC;IAEH,GAAG,CAAC,MAAM,CAAC,gBAAgB,CAAC,OAAO,EAAE,MAAK;QACxC,MAAM,CAAC,0BAA0B,EAAE;YACjC,GAAG;AACJ,SAAA,CAAC,CAAC;AACL,KAAC,CAAC,CAAC;AASH,IAAA,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,MAAM,MAAM,CACvD,wBAAwB,EACxB;QACE,GAAG;AACJ,KAAA,CACF,CAAC;AAEF,IAAA,MAAM,IAAI,GAAG,MAAM,MAAM,CAAW,6BAA6B,EAAE;QACjE,GAAG;AACJ,KAAA,CAAC,CAAC;IAEH,MAAM,GAAG,GAAG,IAAI,QAAQ,CAAC,IAAI,UAAU,CAAC,IAAI,CAAC,EAAE;QAC7C,OAAO;QACP,MAAM;QACN,UAAU;AACX,KAAA,CAAC,CAAC;;AAGH,IAAA,MAAM,CAAC,cAAc,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,CAAC;AAElD,IAAA,OAAO,GAAG,CAAC;AACb;;;;"} \ No newline at end of file diff --git a/guest-js/index.ts b/guest-js/index.ts index 020faae..27a2a15 100644 --- a/guest-js/index.ts +++ b/guest-js/index.ts @@ -24,11 +24,7 @@ * @module */ -declare global { - interface Window { - __TAURI_INVOKE__: (cmd: string, args?: unknown) => Promise; - } -} +import { invoke } from "@tauri-apps/api/primitives"; /** * Options to configure the Rust client used to make fetch requests @@ -76,7 +72,7 @@ export async function fetch( const buffer = await req.arrayBuffer(); const reqData = buffer.byteLength ? Array.from(new Uint8Array(buffer)) : null; - const rid = await window.__TAURI_INVOKE__("plugin:http|fetch", { + const rid = await invoke("plugin:http|fetch", { method: req.method, url: req.url, headers: Array.from(req.headers.entries()), @@ -86,7 +82,7 @@ export async function fetch( }); req.signal.addEventListener("abort", () => { - window.__TAURI_INVOKE__("plugin:http|fetch_cancel", { + invoke("plugin:http|fetch_cancel", { rid, }); }); @@ -98,18 +94,17 @@ export async function fetch( url: string; } - const { status, statusText, url, headers } = - await window.__TAURI_INVOKE__("plugin:http|fetch_send", { - rid, - }); - - const body = await window.__TAURI_INVOKE__( - "plugin:http|fetch_read_body", + const { status, statusText, url, headers } = await invoke( + "plugin:http|fetch_send", { rid, }, ); + const body = await invoke("plugin:http|fetch_read_body", { + rid, + }); + const res = new Response(new Uint8Array(body), { headers, status, diff --git a/node_modules/@tauri-apps/api b/node_modules/@tauri-apps/api index ffebeb3..95531a9 120000 --- a/node_modules/@tauri-apps/api +++ b/node_modules/@tauri-apps/api @@ -1 +1 @@ -../../../../node_modules/.pnpm/@tauri-apps+api@2.0.0-alpha.8/node_modules/@tauri-apps/api \ No newline at end of file +../../../../node_modules/.pnpm/@tauri-apps+api@2.0.0-alpha.9/node_modules/@tauri-apps/api \ No newline at end of file diff --git a/package.json b/package.json index c086dc1..29ec4c1 100644 --- a/package.json +++ b/package.json @@ -27,6 +27,6 @@ "tslib": "^2.5.0" }, "dependencies": { - "@tauri-apps/api": "2.0.0-alpha.8" + "@tauri-apps/api": "2.0.0-alpha.9" } } diff --git a/src/api-iife.js b/src/api-iife.js index a2a5b5c..e1d5d3c 100644 --- a/src/api-iife.js +++ b/src/api-iife.js @@ -1 +1 @@ -if("__TAURI__"in window){var __TAURI_HTTP__=function(e){"use strict";return e.fetch=async function(e,t){const n=null==t?void 0:t.maxRedirections,r=null==t?void 0:t.maxRedirections;t&&(delete t.maxRedirections,delete t.connectTimeout);const _=new Request(e,t),i=await _.arrayBuffer(),a=i.byteLength?Array.from(new Uint8Array(i)):null,d=await window.__TAURI_INVOKE__("plugin:http|fetch",{method:_.method,url:_.url,headers:Array.from(_.headers.entries()),data:a,maxRedirections:n,connectTimeout:r});_.signal.addEventListener("abort",(()=>{window.__TAURI_INVOKE__("plugin:http|fetch_cancel",{rid:d})}));const{status:o,statusText:s,url:u,headers:c}=await window.__TAURI_INVOKE__("plugin:http|fetch_send",{rid:d}),l=await window.__TAURI_INVOKE__("plugin:http|fetch_read_body",{rid:d}),w=new Response(new Uint8Array(l),{headers:c,status:o,statusText:s});return Object.defineProperty(w,"url",{value:u}),w},e}({});Object.defineProperty(window.__TAURI__,"http",{value:__TAURI_HTTP__})} +if("__TAURI__"in window){var __TAURI_HTTP__=function(e){"use strict";var t=Object.defineProperty,n=(e,t,n)=>{if(!t.has(e))throw TypeError("Cannot "+n)},r=(e,t,r)=>(n(e,t,"read from private field"),r?r.call(e):t.get(e));function i(e,t=!1){return window.__TAURI_INTERNALS__.transformCallback(e,t)}((e,n)=>{for(var r in n)t(e,r,{get:n[r],enumerable:!0})})({},{Channel:()=>s,PluginListener:()=>o,addPluginListener:()=>c,convertFileSrc:()=>_,invoke:()=>l,transformCallback:()=>i});var a,s=class{constructor(){this.__TAURI_CHANNEL_MARKER__=!0,((e,t,n)=>{if(t.has(e))throw TypeError("Cannot add the same private member more than once");t instanceof WeakSet?t.add(e):t.set(e,n)})(this,a,(()=>{})),this.id=i((e=>{r(this,a).call(this,e)}))}set onmessage(e){var t,r,i,s;i=e,n(t=this,r=a,"write to private field"),s?s.call(t,i):r.set(t,i)}get onmessage(){return r(this,a)}toJSON(){return`__CHANNEL__:${this.id}`}};a=new WeakMap;var o=class{constructor(e,t,n){this.plugin=e,this.event=t,this.channelId=n}async unregister(){return l(`plugin:${this.plugin}|remove_listener`,{event:this.event,channelId:this.channelId})}};async function c(e,t,n){let r=new s;return r.onmessage=n,l(`plugin:${e}|register_listener`,{event:t,handler:r}).then((()=>new o(e,t,r.id)))}async function l(e,t={},n){return window.__TAURI_INTERNALS__.invoke(e,t,n)}function _(e,t="asset"){return window.__TAURI_INTERNALS__.convertFileSrc(e,t)}return e.fetch=async function(e,t){const n=null==t?void 0:t.maxRedirections,r=null==t?void 0:t.maxRedirections;t&&(delete t.maxRedirections,delete t.connectTimeout);const i=new Request(e,t),a=await i.arrayBuffer(),s=a.byteLength?Array.from(new Uint8Array(a)):null,o=await l("plugin:http|fetch",{method:i.method,url:i.url,headers:Array.from(i.headers.entries()),data:s,maxRedirections:n,connectTimeout:r});i.signal.addEventListener("abort",(()=>{l("plugin:http|fetch_cancel",{rid:o})}));const{status:c,statusText:_,url:d,headers:u}=await l("plugin:http|fetch_send",{rid:o}),h=await l("plugin:http|fetch_read_body",{rid:o}),f=new Response(new Uint8Array(h),{headers:u,status:c,statusText:_});return Object.defineProperty(f,"url",{value:d}),f},e}({});Object.defineProperty(window.__TAURI__,"http",{value:__TAURI_HTTP__})}