Publish New Versions (v2) (#843)

Co-authored-by: lucasfernog <lucasfernog@users.noreply.github.com>

.changes/fix-deep-link-alpha-20.md

@@ -0,0 +1,5 @@
+---
+"deep-link": patch
+---
+
+Fixes issue with tauri alpha.20.

.changes/http-proxy-config.md

@@ -0,0 +1,6 @@
+---
+"http": minor
+"http-js": minor
+---
+
+Add `proxy` field to `fetch` options to configure proxy.

.changes/pre.json

@@ -16,6 +16,7 @@
     ".changes/dialog-export-fileresponse.md",
     ".changes/dialog-pin-rfd.md",
     ".changes/dialog-return-result.md",
+    ".changes/fix-deep-link-alpha-20.md",
     ".changes/fix-docs-build.md",
     ".changes/fix-emit-all-usage.md",
     ".changes/fix-invoke-usage.md",
@@ -31,6 +32,7 @@
     ".changes/global-shortcut-app-handle.md",
     ".changes/http-multipart-refactor.md",
     ".changes/http-plugin-refactor.md",
+    ".changes/http-proxy-config.md",
     ".changes/http-remove-cmd-property.md",
     ".changes/http-response.md",
     ".changes/msrv-1.70.md",

examples/api/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## \[2.0.0-alpha.8]
+
+### Dependencies
+
+- Upgraded to `http-js@2.0.0-alpha.6`
+
 ## \[2.0.0-alpha.7]
 
 ### Dependencies

examples/api/package.json

@@ -1,7 +1,7 @@
 {
   "name": "svelte-app",
   "private": true,
-  "version": "2.0.0-alpha.7",
+  "version": "2.0.0-alpha.8",
   "type": "module",
   "scripts": {
     "dev": "vite --clearScreen false",
@@ -17,7 +17,7 @@
     "@tauri-apps/plugin-dialog": "2.0.0-alpha.5",
     "@tauri-apps/plugin-fs": "2.0.0-alpha.5",
     "@tauri-apps/plugin-global-shortcut": "2.0.0-alpha.5",
-    "@tauri-apps/plugin-http": "2.0.0-alpha.5",
+    "@tauri-apps/plugin-http": "2.0.0-alpha.6",
     "@tauri-apps/plugin-nfc": "2.0.0-alpha.0",
     "@tauri-apps/plugin-notification": "2.0.0-alpha.5",
     "@tauri-apps/plugin-os": "2.0.0-alpha.6",

examples/api/src-tauri/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## \[2.0.0-alpha.10]
+
+### Dependencies
+
+- Upgraded to `http@2.0.0-alpha.8`
+
 ## \[2.0.0-alpha.9]
 
 ### Dependencies

examples/api/src-tauri/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "api"
 publish = false
-version = "2.0.0-alpha.9"
+version = "2.0.0-alpha.10"
 description = "An example Tauri Application showcasing the api"
 edition = "2021"
 rust-version = { workspace = true }
@@ -23,7 +23,7 @@ tauri-plugin-log = { path = "../../../plugins/log", version = "2.0.0-alpha.6" }
 tauri-plugin-fs = { path = "../../../plugins/fs", version = "2.0.0-alpha.6" }
 tauri-plugin-clipboard-manager = { path = "../../../plugins/clipboard-manager", version = "2.0.0-alpha.6" }
 tauri-plugin-dialog = { path = "../../../plugins/dialog", version = "2.0.0-alpha.6" }
-tauri-plugin-http = { path = "../../../plugins/http", features = [ "multipart" ], version = "2.0.0-alpha.7" }
+tauri-plugin-http = { path = "../../../plugins/http", features = [ "multipart" ], version = "2.0.0-alpha.8" }
 tauri-plugin-notification = { path = "../../../plugins/notification", version = "2.0.0-alpha.7", features = [ "windows7-compat" ] }
 tauri-plugin-os = { path = "../../../plugins/os", version = "2.0.0-alpha.6" }
 tauri-plugin-process = { path = "../../../plugins/process", version = "2.0.0-alpha.6" }

plugins/deep-link/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## \[2.0.0-alpha.5]
+
+- [`8b1d821`](https://github.com/tauri-apps/plugins-workspace/commit/8b1d821a375d66a61e06c78b7148e255855cfe1b)([#844](https://github.com/tauri-apps/plugins-workspace/pull/844)) Fixes issue with tauri alpha.20.
+
 ## \[2.0.0-alpha.4]
 
 - [`387c2f9`](https://github.com/tauri-apps/plugins-workspace/commit/387c2f9e0ce4c75c07ffa3fd76391a25b58f5daf)([#802](https://github.com/tauri-apps/plugins-workspace/pull/802)) Update to @tauri-apps/api v2.0.0-alpha.13.

plugins/deep-link/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "tauri-plugin-deep-link"
-version = "2.0.0-alpha.4"
+version = "2.0.0-alpha.5"
 description = "Set your Tauri application as the default handler for an URL"
 authors = { workspace = true }
 license = { workspace = true }

plugins/deep-link/src/lib.rs

@@ -42,12 +42,7 @@ fn init_deep_link<R: Runtime, C: DeserializeOwned>(
                         _ => None,
                     };
 
-                    let payload = vec![url];
-                    app_handle.trigger_global(
-                        "deep-link://new-url",
-                        Some(serde_json::to_string(&payload).unwrap()),
-                    );
-                    let _ = app_handle.emit_all("deep-link://new-url", payload);
+                    let _ = app_handle.emit("deep-link://new-url", vec![url]);
                     Ok(())
                 }),
             },

plugins/http/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## \[2.0.0-alpha.6]
+
+- [`bfa87da`](https://github.com/tauri-apps/plugins-workspace/commit/bfa87da848f9f1da2abae3354eed632881eddf11)([#824](https://github.com/tauri-apps/plugins-workspace/pull/824)) Add `proxy` field to `fetch` options to configure proxy.
+
 ## \[2.0.0-alpha.5]
 
 - [`387c2f9`](https://github.com/tauri-apps/plugins-workspace/commit/387c2f9e0ce4c75c07ffa3fd76391a25b58f5daf)([#802](https://github.com/tauri-apps/plugins-workspace/pull/802)) Update to @tauri-apps/api v2.0.0-alpha.13.
@@ -43,5 +47,5 @@
   371\)) First v2 alpha release!
   !
   371\)) First v2 alpha release!
-!
+  !
   371\)) First v2 alpha release!

plugins/http/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "tauri-plugin-http"
-version = "2.0.0-alpha.7"
+version = "2.0.0-alpha.8"
 description = "Access an HTTP client written in Rust."
 edition = { workspace = true }
 authors = { workspace = true }

plugins/http/guest-js/index.ts

@@ -26,6 +26,45 @@
 
 import { invoke } from "@tauri-apps/api/core";
 
+/**
+ * Configuration of a proxy that a Client should pass requests to.
+ *
+ * @since 2.0.0
+ */
+export type Proxy = {
+  /**
+   * Proxy all traffic to the passed URL.
+   */
+  all?: string | ProxyConfig;
+  /**
+   * Proxy all HTTP traffic to the passed URL.
+   */
+  http?: string | ProxyConfig;
+  /**
+   * Proxy all HTTPS traffic to the passed URL.
+   */
+  https?: string | ProxyConfig;
+};
+
+export interface ProxyConfig {
+  /**
+   * The URL of the proxy server.
+   */
+  url: string;
+  /**
+   * Set the `Proxy-Authorization` header using Basic auth.
+   */
+  basicAuth?: {
+    username: string;
+    password: string;
+  };
+  /**
+   * 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;
+}
+
 /**
  * Options to configure the Rust client used to make fetch requests
  *
@@ -39,6 +78,10 @@ export interface ClientOptions {
   maxRedirections?: number;
   /** Timeout in milliseconds */
   connectTimeout?: number;
+  /**
+   * Configuration of a proxy that a Client should pass requests to.
+   */
+  proxy?: Proxy;
 }
 
 /**
@@ -61,11 +104,13 @@ export async function fetch(
 ): Promise<Response> {
   const maxRedirections = init?.maxRedirections;
   const connectTimeout = init?.maxRedirections;
+  const proxy = init?.proxy;
 
   // Remove these fields before creating the request
   if (init) {
     delete init.maxRedirections;
     delete init.connectTimeout;
+    delete init.proxy;
   }
 
   const req = new Request(input, init);
@@ -73,12 +118,15 @@ export async function fetch(
   const reqData = buffer.byteLength ? Array.from(new Uint8Array(buffer)) : null;
 
   const rid = await invoke<number>("plugin:http|fetch", {
-    method: req.method,
-    url: req.url,
-    headers: Array.from(req.headers.entries()),
-    data: reqData,
-    maxRedirections,
-    connectTimeout,
+    clientConfig: {
+      method: req.method,
+      url: req.url,
+      headers: Array.from(req.headers.entries()),
+      data: reqData,
+      maxRedirections,
+      connectTimeout,
+      proxy,
+    },
   });
 
   req.signal.addEventListener("abort", () => {

plugins/http/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tauri-apps/plugin-http",
-  "version": "2.0.0-alpha.5",
+  "version": "2.0.0-alpha.6",
   "license": "MIT or APACHE-2.0",
   "authors": [
     "Tauri Programme within The Commons Conservancy"

plugins/http/src/api-iife.js

@@ -1 +1 @@
-if("__TAURI__"in window){var __TAURI_PLUGIN_HTTP__=function(e){"use strict";async function t(e,t={},r){return window.__TAURI_INTERNALS__.invoke(e,t,r)}return"function"==typeof SuppressedError&&SuppressedError,e.fetch=async function(e,r){const n=r?.maxRedirections,i=r?.maxRedirections;r&&(delete r.maxRedirections,delete r.connectTimeout);const a=new Request(e,r),s=await a.arrayBuffer(),o=s.byteLength?Array.from(new Uint8Array(s)):null,u=await t("plugin:http|fetch",{method:a.method,url:a.url,headers:Array.from(a.headers.entries()),data:o,maxRedirections:n,connectTimeout:i});a.signal.addEventListener("abort",(()=>{t("plugin:http|fetch_cancel",{rid:u})}));const{status:_,statusText:d,url:c,headers:f}=await t("plugin:http|fetch_send",{rid:u}),h=await t("plugin:http|fetch_read_body",{rid:u}),p=new Response(new Uint8Array(h),{headers:f,status:_,statusText:d});return Object.defineProperty(p,"url",{value:c}),p},e}({});Object.defineProperty(window.__TAURI__,"http",{value:__TAURI_PLUGIN_HTTP__})}
+if("__TAURI__"in window){var __TAURI_PLUGIN_HTTP__=function(e){"use strict";async function t(e,t={},r){return window.__TAURI_INTERNALS__.invoke(e,t,r)}return"function"==typeof SuppressedError&&SuppressedError,e.fetch=async function(e,r){const n=r?.maxRedirections,i=r?.maxRedirections,a=r?.proxy;r&&(delete r.maxRedirections,delete r.connectTimeout,delete r.proxy);const o=new Request(e,r),s=await o.arrayBuffer(),d=s.byteLength?Array.from(new Uint8Array(s)):null,u=await t("plugin:http|fetch",{clientConfig:{method:o.method,url:o.url,headers:Array.from(o.headers.entries()),data:d,maxRedirections:n,connectTimeout:i,proxy:a}});o.signal.addEventListener("abort",(()=>{t("plugin:http|fetch_cancel",{rid:u})}));const{status:_,statusText:c,url:p,headers:f}=await t("plugin:http|fetch_send",{rid:u}),l=await t("plugin:http|fetch_read_body",{rid:u}),h=new Response(new Uint8Array(l),{headers:f,status:_,statusText:c});return Object.defineProperty(h,"url",{value:p}),h},e}({});Object.defineProperty(window.__TAURI__,"http",{value:__TAURI_PLUGIN_HTTP__})}

plugins/http/src/commands.rs

@@ -5,8 +5,8 @@
 use std::{collections::HashMap, time::Duration};
 
 use http::{header, HeaderName, HeaderValue, Method, StatusCode};
-use reqwest::redirect::Policy;
-use serde::Serialize;
+use reqwest::{redirect::Policy, NoProxy};
+use serde::{Deserialize, Serialize};
 use tauri::{command, AppHandle, Runtime};
 
 use crate::{Error, FetchRequest, HttpExt, RequestId};
@@ -20,16 +20,111 @@ pub struct FetchResponse {
     url: String,
 }
 
-#[command]
-pub async fn fetch<R: Runtime>(
-    app: AppHandle<R>,
+#[derive(Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct ClientConfig {
     method: String,
     url: url::Url,
     headers: Vec<(String, String)>,
     data: Option<Vec<u8>>,
     connect_timeout: Option<u64>,
     max_redirections: Option<usize>,
+    proxy: Option<Proxy>,
+}
+
+#[derive(Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct Proxy {
+    all: Option<UrlOrConfig>,
+    http: Option<UrlOrConfig>,
+    https: Option<UrlOrConfig>,
+}
+
+#[derive(Deserialize)]
+#[serde(rename_all = "camelCase")]
+#[serde(untagged)]
+pub enum UrlOrConfig {
+    Url(String),
+    Config(ProxyConfig),
+}
+
+#[derive(Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct ProxyConfig {
+    url: String,
+    basic_auth: Option<BasicAuth>,
+    no_proxy: Option<String>,
+}
+
+#[derive(Deserialize)]
+pub struct BasicAuth {
+    username: String,
+    password: String,
+}
+
+#[inline]
+fn proxy_creator(
+    url_or_config: UrlOrConfig,
+    proxy_fn: fn(String) -> reqwest::Result<reqwest::Proxy>,
+) -> reqwest::Result<reqwest::Proxy> {
+    match url_or_config {
+        UrlOrConfig::Url(url) => Ok(proxy_fn(url)?),
+        UrlOrConfig::Config(ProxyConfig {
+            url,
+            basic_auth,
+            no_proxy,
+        }) => {
+            let mut proxy = proxy_fn(url)?;
+            if let Some(basic_auth) = basic_auth {
+                proxy = proxy.basic_auth(&basic_auth.username, &basic_auth.password);
+            }
+            if let Some(no_proxy) = no_proxy {
+                proxy = proxy.no_proxy(NoProxy::from_string(&no_proxy));
+            }
+            Ok(proxy)
+        }
+    }
+}
+
+fn attach_proxy(
+    proxy: Proxy,
+    mut builder: reqwest::ClientBuilder,
+) -> crate::Result<reqwest::ClientBuilder> {
+    let Proxy { all, http, https } = proxy;
+
+    if let Some(all) = all {
+        let proxy = proxy_creator(all, reqwest::Proxy::all)?;
+        builder = builder.proxy(proxy);
+    }
+
+    if let Some(http) = http {
+        let proxy = proxy_creator(http, reqwest::Proxy::http)?;
+        builder = builder.proxy(proxy);
+    }
+
+    if let Some(https) = https {
+        let proxy = proxy_creator(https, reqwest::Proxy::https)?;
+        builder = builder.proxy(proxy);
+    }
+
+    Ok(builder)
+}
+
+#[command]
+pub async fn fetch<R: Runtime>(
+    app: AppHandle<R>,
+    client_config: ClientConfig,
 ) -> crate::Result<RequestId> {
+    let ClientConfig {
+        method,
+        url,
+        headers,
+        data,
+        connect_timeout,
+        max_redirections,
+        proxy,
+    } = client_config;
+
     let scheme = url.scheme();
     let method = Method::from_bytes(method.as_bytes())?;
     let headers: HashMap<String, String> = HashMap::from_iter(headers);
@@ -51,6 +146,10 @@ pub async fn fetch<R: Runtime>(
                     });
                 }
 
+                if let Some(proxy_config) = proxy {
+                    builder = attach_proxy(proxy_config, builder)?;
+                }
+
                 let mut request = builder.build()?.request(method.clone(), url);
 
                 for (key, value) in &headers {

pnpm-lock.yaml

@@ -88,7 +88,7 @@ importers:
         specifier: 2.0.0-alpha.5
         version: link:../../plugins/global-shortcut
       '@tauri-apps/plugin-http':
-        specifier: 2.0.0-alpha.5
+        specifier: 2.0.0-alpha.6
         version: link:../../plugins/http
       '@tauri-apps/plugin-nfc':
         specifier: 2.0.0-alpha.0