Open-Source API Development Ecosystem • https://hoppscotch.io • Offline, On-Prem & Cloud • Web, Desktop & CLI • Open-Source Alternative to Postman, Insomnia
TypeScript apiapi-clientapi-restapi-testingdeveloper-toolsgraphqlhttphttp-clientpwarestrest-apispatestingtesting-toolstoolsvuevuejswebsocket
feat: `hoppscotch-relay` for request forwarding (#4471)
Shreyas8dc471f33fd9
diff --git a/packages/hoppscotch-selfhost-desktop/.envrc b/packages/hoppscotch-selfhost-desktop/.envrcnew file mode 100644index 000000000..5bf8fc159--- /dev/null+++ b/packages/hoppscotch-selfhost-desktop/.envrc@@ -0,0 +1,3 @@+source_url "https://raw.githubusercontent.com/cachix/devenv/95f329d49a8a5289d31e0982652f7058a189bfca/direnvrc" "sha256-d+8cBpDfDBj41inrADaJt+bDWhOktwslgoP5YiGJ1v0="++use devenv\ No newline at end of filediff --git a/packages/hoppscotch-selfhost-desktop/.gitignore b/packages/hoppscotch-selfhost-desktop/.gitignoreindex 358c8d9a8..8aa22c989 100644--- a/packages/hoppscotch-selfhost-desktop/.gitignore+++ b/packages/hoppscotch-selfhost-desktop/.gitignore@@ -28,3 +28,12 @@ dist-ssr# Backend Code generationsrc/api/generated+# Devenv+.devenv*+devenv.local.nix++# direnv+.direnv++# pre-commit+.pre-commit-config.yamldiff --git a/packages/hoppscotch-selfhost-desktop/devenv.lock b/packages/hoppscotch-selfhost-desktop/devenv.locknew file mode 100644index 000000000..ccb1d8caf--- /dev/null+++ b/packages/hoppscotch-selfhost-desktop/devenv.lock@@ -0,0 +1,153 @@+{+ "nodes": {+ "devenv": {+ "locked": {+ "dir": "src/modules",+ "lastModified": 1729681848,+ "owner": "cachix",+ "repo": "devenv",+ "rev": "2634c4c9e9226a3fb54550ad4115df1992d502c5",+ "type": "github"+ },+ "original": {+ "dir": "src/modules",+ "owner": "cachix",+ "repo": "devenv",+ "type": "github"+ }+ },+ "fenix": {+ "inputs": {+ "nixpkgs": [+ "nixpkgs"+ ],+ "rust-analyzer-src": "rust-analyzer-src"+ },+ "locked": {+ "lastModified": 1729751566,+ "owner": "nix-community",+ "repo": "fenix",+ "rev": "f32a2d484091a6dc98220b1f4a2c2d60b7c97c64",+ "type": "github"+ },+ "original": {+ "owner": "nix-community",+ "repo": "fenix",+ "type": "github"+ }+ },+ "flake-compat": {+ "flake": false,+ "locked": {+ "lastModified": 1696426674,+ "owner": "edolstra",+ "repo": "flake-compat",+ "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",+ "type": "github"+ },+ "original": {+ "owner": "edolstra",+ "repo": "flake-compat",+ "type": "github"+ }+ },+ "gitignore": {+ "inputs": {+ "nixpkgs": [+ "pre-commit-hooks",+ "nixpkgs"+ ]+ },+ "locked": {+ "lastModified": 1709087332,+ "owner": "hercules-ci",+ "repo": "gitignore.nix",+ "rev": "637db329424fd7e46cf4185293b9cc8c88c95394",+ "type": "github"+ },+ "original": {+ "owner": "hercules-ci",+ "repo": "gitignore.nix",+ "type": "github"+ }+ },+ "nixpkgs": {+ "locked": {+ "lastModified": 1729690727,+ "owner": "NixOS",+ "repo": "nixpkgs",+ "rev": "be79af5ec63facf6c7709094db72b253c34e1ac2",+ "type": "github"+ },+ "original": {+ "owner": "NixOS",+ "ref": "nixpkgs-unstable",+ "repo": "nixpkgs",+ "type": "github"+ }+ },+ "nixpkgs-stable": {+ "locked": {+ "lastModified": 1729449015,+ "owner": "NixOS",+ "repo": "nixpkgs",+ "rev": "89172919243df199fe237ba0f776c3e3e3d72367",+ "type": "github"+ },+ "original": {+ "owner": "NixOS",+ "ref": "nixos-24.05",+ "repo": "nixpkgs",+ "type": "github"+ }+ },+ "pre-commit-hooks": {+ "inputs": {+ "flake-compat": "flake-compat",+ "gitignore": "gitignore",+ "nixpkgs": [+ "nixpkgs"+ ],+ "nixpkgs-stable": "nixpkgs-stable"+ },+ "locked": {+ "lastModified": 1729104314,+ "owner": "cachix",+ "repo": "pre-commit-hooks.nix",+ "rev": "3c3e88f0f544d6bb54329832616af7eb971b6be6",+ "type": "github"+ },+ "original": {+ "owner": "cachix",+ "repo": "pre-commit-hooks.nix",+ "type": "github"+ }+ },+ "root": {+ "inputs": {+ "devenv": "devenv",+ "fenix": "fenix",+ "nixpkgs": "nixpkgs",+ "pre-commit-hooks": "pre-commit-hooks"+ }+ },+ "rust-analyzer-src": {+ "flake": false,+ "locked": {+ "lastModified": 1729715509,+ "owner": "rust-lang",+ "repo": "rust-analyzer",+ "rev": "40492e15d49b89cf409e2c5536444131fac49429",+ "type": "github"+ },+ "original": {+ "owner": "rust-lang",+ "ref": "nightly",+ "repo": "rust-analyzer",+ "type": "github"+ }+ }+ },+ "root": "root",+ "version": 7+}diff --git a/packages/hoppscotch-selfhost-desktop/devenv.nix b/packages/hoppscotch-selfhost-desktop/devenv.nixnew file mode 100644index 000000000..902e90719--- /dev/null+++ b/packages/hoppscotch-selfhost-desktop/devenv.nix@@ -0,0 +1,92 @@+{ pkgs, lib, config, inputs, ... }:++{+ # https://devenv.sh/packages/+ packages = with pkgs; [+ git+ postgresql_16+ # BE and Tauri stuff+ libsoup+ webkitgtk_4_0+ # FE and Node stuff+ nodejs_22+ nodePackages_latest.typescript-language-server+ nodePackages_latest.vls+ nodePackages_latest.prisma+ prisma-engines+ # CI+ act+ # Cargo+ cargo-edit+ ];++ # https://devenv.sh/basics/+ env = {+ APP_GREET = "Hoppscotch";+ # NOTE: Setting these `PRISMA_*` environment variable fixes+ # Error: Failed to fetch sha256 checksum at https://binaries.prisma.sh/all_commits/<hash>/linux-nixos/libquery_engine.so.node.gz.sha256 - 404 Not Found+ # See: https://github.com/prisma/prisma/discussions/3120+ PRISMA_QUERY_ENGINE_LIBRARY = "${pkgs.prisma-engines}/lib/libquery_engine.node";+ PRISMA_QUERY_ENGINE_BINARY = "${pkgs.prisma-engines}/bin/query-engine";+ PRISMA_SCHEMA_ENGINE_BINARY = "${pkgs.prisma-engines}/bin/schema-engine";+ };+++ # https://devenv.sh/scripts/+ scripts = {+ hello.exec = "echo hello from $APP_GREET";+ e.exec = "emacs";+ };++ enterShell = ''+ git --version+ '';++ # https://devenv.sh/tests/+ enterTest = ''+ echo "Running tests"+ '';++ # https://devenv.sh/integrations/dotenv/+ dotenv.enable = true;++ # https://devenv.sh/languages/++ # https://devenv.sh/languages/+ languages = {+ typescript.enable = true;++ javascript = {+ enable = true;+ pnpm = {+ enable = true;+ };+ npm = {+ enable = true;+ };+ };++ rust = {+ enable = true;+ channel = "nightly";+ components = [+ "rustc"+ "cargo"+ "clippy"+ "rustfmt"+ "rust-analyzer"+ "llvm-tools-preview"+ "rust-src"+ "rustc-codegen-cranelift-preview"+ ];+ };+ };++ # https://devenv.sh/pre-commit-hooks/+ # pre-commit.hooks.shellcheck.enable = true;++ # https://devenv.sh/processes/+ # processes.ping.exec = "ping example.com";++ # See full reference at https://devenv.sh/reference/options/+}diff --git a/packages/hoppscotch-selfhost-desktop/devenv.yaml b/packages/hoppscotch-selfhost-desktop/devenv.yamlnew file mode 100644index 000000000..9ee9ba349--- /dev/null+++ b/packages/hoppscotch-selfhost-desktop/devenv.yaml@@ -0,0 +1,23 @@+# yaml-language-server: $schema=https://devenv.sh/devenv.schema.json+inputs:+ # For NodeJS-22 and above+ nixpkgs:+ url: github:NixOS/nixpkgs/nixpkgs-unstable+ # nixpkgs:+ # url: github:cachix/devenv-nixpkgs/rolling+ fenix:+ url: github:nix-community/fenix+ inputs:+ nixpkgs:+ follows: nixpkgs++# If you're using non-OSS software, you can set allowUnfree to true.+allowUnfree: true++# If you're willing to use a package that's vulnerable+# permittedInsecurePackages:+# - "openssl-1.1.1w"++# If you have more than one devenv you can merge them+#imports:+# - ./backenddiff --git a/packages/hoppscotch-selfhost-desktop/src-tauri/Cargo.lock b/packages/hoppscotch-selfhost-desktop/src-tauri/Cargo.lockindex b97cd4bfc..f3b483c77 100644--- a/packages/hoppscotch-selfhost-desktop/src-tauri/Cargo.lock+++ b/packages/hoppscotch-selfhost-desktop/src-tauri/Cargo.lock@@ -4,18 +4,18 @@ version = 4[[package]]name = "addr2line"-version = "0.22.0"+version = "0.24.2"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678"+checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1"dependencies = ["gimli",][[package]]-name = "adler"-version = "1.0.2"+name = "adler2"+version = "2.0.0"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"+checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627"[[package]]name = "aho-corasick"@@ -107,9 +107,9 @@ dependencies = [[[package]]name = "anyhow"-version = "1.0.86"+version = "1.0.91"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da"+checksum = "c042108f3ed77fd83760a5fd79b53be043192bb3b9dba91d8c574c0ada7850c8"[[package]]name = "atk"@@ -137,23 +137,23 @@ dependencies = [[[package]]name = "autocfg"-version = "1.3.0"+version = "1.4.0"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"[[package]]name = "backtrace"-version = "0.3.72"+version = "0.3.74"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "17c6a35df3749d2e8bb1b7b21a976d82b15548788d2735b9d82f329268f71a11"+checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a"dependencies = ["addr2line",- "cc","cfg-if","libc","miniz_oxide","object","rustc-demangle",+ "windows-targets 0.52.6",][[package]]@@ -191,9 +191,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"[[package]]name = "bitflags"-version = "2.5.0"+version = "2.6.0"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"[[package]]name = "block"@@ -233,9 +233,9 @@ dependencies = [[[package]]name = "bstr"-version = "1.9.1"+version = "1.10.0"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "05efc5cfd9110c8416e471df0e96702d58690178e206e61b7173706673c93706"+checksum = "40723b8fb387abc38f4f4a37c09073622e41dd12327033091ef8950659e6dc0c"dependencies = ["memchr","serde",@@ -249,9 +249,9 @@ checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"[[package]]name = "bytemuck"-version = "1.16.0"+version = "1.19.0"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "78834c15cb5d5efe3452d58b1e8ba890dd62d21907f867f383358198e56ebca5"+checksum = "8334215b81e418a0a7bdb8ef0849474f40bb10c8b71f1c4ed315cff49f32494d"[[package]]name = "byteorder"@@ -261,9 +261,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"[[package]]name = "bytes"-version = "1.6.0"+version = "1.8.0"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9"+checksum = "9ac0150caa2ae65ca5bd83f25c7de183dea78d4d366469f148435e2acfbad0da"dependencies = ["serde",]@@ -304,9 +304,12 @@ dependencies = [[[package]]name = "cc"-version = "1.0.98"+version = "1.1.31"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "41c270e7540d725e65ac7f1b212ac8ce349719624d7bcff99f8e2e488e8cf03f"+checksum = "c2e7962b54006dcfcc61cb72735f4d89bb97061dd6a7ed882ec6b8ee53714c6f"+dependencies = [+ "shlex",+][[package]]name = "cesu8"@@ -360,7 +363,7 @@ dependencies = ["iana-time-zone","num-traits","serde",- "windows-targets 0.52.5",+ "windows-targets 0.52.6",][[package]]@@ -449,9 +452,9 @@ dependencies = [[[package]]name = "core-foundation-sys"-version = "0.8.6"+version = "0.8.7"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f"+checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"[[package]]name = "core-graphics"@@ -492,9 +495,9 @@ dependencies = [[[package]]name = "cpufeatures"-version = "0.2.12"+version = "0.2.14"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504"+checksum = "608697df725056feaccfa42cffdaeeec3fccc4ffc38358ecd19b243e716a78e0"dependencies = ["libc",]@@ -576,7 +579,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331"dependencies = ["quote",- "syn 2.0.66",+ "syn 2.0.85",][[package]]@@ -586,14 +589,39 @@ source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "edb49164822f3ee45b17acd4a208cfc1251410cf0cad9a833234c9890774dd9f"dependencies = ["quote",- "syn 2.0.66",+ "syn 2.0.85",+]++[[package]]+name = "curl"+version = "0.4.47"+source = "git+https://github.com/CuriousCorrelation/curl-rust.git#1ec8079cf527b9cf47cc7a48c68b458affdae273"+dependencies = [+ "curl-sys",+ "libc",+ "openssl-probe",+ "openssl-sys",+ "socket2",+]++[[package]]+name = "curl-sys"+version = "0.4.77+curl-8.10.1"+source = "git+https://github.com/CuriousCorrelation/curl-rust.git#1ec8079cf527b9cf47cc7a48c68b458affdae273"+dependencies = [+ "cc",+ "libc",+ "libz-sys",+ "openssl-sys",+ "pkg-config",+ "windows-sys 0.52.0",][[package]]name = "darling"-version = "0.20.9"+version = "0.20.10"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "83b2eb4d90d12bdda5ed17de686c2acb4c57914f8f921b8da7e112b5a36f3fe1"+checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989"dependencies = ["darling_core","darling_macro",@@ -601,27 +629,27 @@ dependencies = [[[package]]name = "darling_core"-version = "0.20.9"+version = "0.20.10"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "622687fe0bac72a04e5599029151f5796111b90f1baaa9b544d807a5e31cd120"+checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5"dependencies = ["fnv","ident_case","proc-macro2","quote","strsim",- "syn 2.0.66",+ "syn 2.0.85",][[package]]name = "darling_macro"-version = "0.20.9"+version = "0.20.10"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "733cabb43482b1a1b53eee8583c2b9e8684d592215ea83efd305dd31bc2f0178"+checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806"dependencies = ["darling_core","quote",- "syn 2.0.66",+ "syn 2.0.85",][[package]]@@ -649,15 +677,15 @@ dependencies = [[[package]]name = "derive_more"-version = "0.99.17"+version = "0.99.18"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321"+checksum = "5f33878137e4dafd7fa914ad4e259e18a4e8e532b9617a2d0150262bf53abfce"dependencies = ["convert_case","proc-macro2","quote","rustc_version",- "syn 1.0.109",+ "syn 2.0.85",][[package]]@@ -726,29 +754,29 @@ checksum = "dcbb2bf8e87535c23f7a8a321e364ce21462d0ff10cb6407820e8e96dfff6653"[[package]]name = "dtoa-short"-version = "0.3.4"+version = "0.3.5"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "dbaceec3c6e4211c79e7b1800fb9680527106beb2f9c51904a3210c03a448c74"+checksum = "cd1511a7b6a56299bd043a9c167a6d2bfb37bf84a6dfceaba651168adfb43c87"dependencies = ["dtoa",][[package]]name = "dunce"-version = "1.0.4"+version = "1.0.5"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b"+checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813"[[package]]name = "embed-resource"-version = "2.4.2"+version = "2.5.0"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "c6985554d0688b687c5cb73898a34fbe3ad6c24c58c238a4d91d5e840670ee9d"+checksum = "f4e24052d7be71f0efb50c201557f6fe7d237cfd5a64fd5bcd7fd8fe32dbbffa"dependencies = ["cc","memchr","rustc_version",- "toml 0.8.13",+ "toml 0.8.19","vswhom","winreg 0.52.0",]@@ -761,9 +789,9 @@ checksum = "4ef6b89e5b37196644d8796de5268852ff179b44e96276cf4290264843743bb7"[[package]]name = "encoding_rs"-version = "0.8.34"+version = "0.8.35"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59"+checksum = "75030f3c4f45dafd7586dd6780965a8c7e8e285a5ecb86713e63a79c5b2766f3"dependencies = ["cfg-if",]@@ -809,15 +837,15 @@ dependencies = [[[package]]name = "fastrand"-version = "2.1.0"+version = "2.1.1"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a"+checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6"[[package]]name = "fdeflate"-version = "0.3.4"+version = "0.3.5"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "4f9bfee30e4dedf0ab8b422f03af778d9612b63f502710fc500a334ebe2de645"+checksum = "d8090f921a24b04994d9929e204f50b498a33ea6ba559ffaa05e04f7ee7fb5ab"dependencies = ["simd-adler32",]@@ -834,21 +862,21 @@ dependencies = [[[package]]name = "filetime"-version = "0.2.23"+version = "0.2.25"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd"+checksum = "35c0522e981e68cbfa8c3f978441a5f34b30b96e146b33cd3359176b50fe8586"dependencies = ["cfg-if","libc",- "redox_syscall 0.4.1",- "windows-sys 0.52.0",+ "libredox",+ "windows-sys 0.59.0",][[package]]name = "flate2"-version = "1.0.30"+version = "1.0.34"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae"+checksum = "a1b589b4dc103969ad3cf85c950899926ec64300a1a46d76c03a6072957036f0"dependencies = ["crc32fast","miniz_oxide",@@ -896,7 +924,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742"dependencies = ["proc-macro2","quote",- "syn 2.0.66",+ "syn 2.0.85",][[package]]@@ -932,24 +960,24 @@ dependencies = [[[package]]name = "futures-channel"-version = "0.3.30"+version = "0.3.31"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78"+checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10"dependencies = ["futures-core",][[package]]name = "futures-core"-version = "0.3.30"+version = "0.3.31"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d"+checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e"[[package]]name = "futures-executor"-version = "0.3.30"+version = "0.3.31"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d"+checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f"dependencies = ["futures-core","futures-task",@@ -958,38 +986,38 @@ dependencies = [[[package]]name = "futures-io"-version = "0.3.30"+version = "0.3.31"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1"+checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6"[[package]]name = "futures-macro"-version = "0.3.30"+version = "0.3.31"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"+checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"dependencies = ["proc-macro2","quote",- "syn 2.0.66",+ "syn 2.0.85",][[package]]name = "futures-sink"-version = "0.3.30"+version = "0.3.31"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5"+checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7"[[package]]name = "futures-task"-version = "0.3.30"+version = "0.3.31"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004"+checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988"[[package]]name = "futures-util"-version = "0.3.30"+version = "0.3.31"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48"+checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81"dependencies = ["futures-core","futures-io",@@ -1144,9 +1172,9 @@ dependencies = [[[package]]name = "gimli"-version = "0.29.0"+version = "0.31.1"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd"+checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f"[[package]]name = "gio"@@ -1231,15 +1259,15 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"[[package]]name = "globset"-version = "0.4.14"+version = "0.4.15"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "57da3b9b5b85bd66f31093f8c408b90a74431672542466497dcbdfdc02034be1"+checksum = "15f1ce686646e7f1e19bf7d5533fe443a45dbfb990e00629110797578b42fb19"dependencies = ["aho-corasick","bstr","log",- "regex-automata 0.4.6",- "regex-syntax 0.8.3",+ "regex-automata 0.4.8",+ "regex-syntax 0.8.5",][[package]]@@ -1319,8 +1347,8 @@ dependencies = ["futures-core","futures-sink","futures-util",- "http",- "indexmap 2.2.6",+ "http 0.2.12",+ "indexmap 2.6.0","slab","tokio","tokio-util",@@ -1339,6 +1367,12 @@ version = "0.14.5"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"+[[package]]+name = "hashbrown"+version = "0.15.0"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb"+[[package]]name = "heck"version = "0.3.3"@@ -1389,9 +1423,9 @@ dependencies = ["dashmap","env_logger","hex_color",+ "hoppscotch-relay","log","objc",- "reqwest","serde","serde_json","tauri",@@ -1407,6 +1441,23 @@ dependencies = ["winver",]+[[package]]+name = "hoppscotch-relay"+version = "0.1.1"+dependencies = [+ "curl",+ "env_logger",+ "http 1.1.0",+ "log",+ "openssl",+ "openssl-sys",+ "serde",+ "serde_json",+ "thiserror",+ "tokio-util",+ "url-escape",+]+[[package]]name = "html5ever"version = "0.26.0"@@ -1432,6 +1483,17 @@ dependencies = ["itoa 1.0.11",]+[[package]]+name = "http"+version = "1.1.0"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258"+dependencies = [+ "bytes",+ "fnv",+ "itoa 1.0.11",+]+[[package]]name = "http-body"version = "0.4.6"@@ -1439,7 +1501,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2"dependencies = ["bytes",- "http",+ "http 0.2.12","pin-project-lite",]@@ -1451,9 +1513,9 @@ checksum = "21dec9db110f5f872ed9699c3ecf50cf16f423502706ba5c72462e28d3157573"[[package]]name = "httparse"-version = "1.8.0"+version = "1.9.5"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904"+checksum = "7d71d3574edd2771538b901e6549113b4006ece66150fb69c0fb6d9a2adae946"[[package]]name = "httpdate"@@ -1469,16 +1531,16 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"[[package]]name = "hyper"-version = "0.14.28"+version = "0.14.31"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80"+checksum = "8c08302e8fa335b151b788c775ff56e7a03ae64ff85c548ee820fecb70356e85"dependencies = ["bytes","futures-channel","futures-core","futures-util","h2",- "http",+ "http 0.2.12","http-body","httparse","httpdate",@@ -1506,9 +1568,9 @@ dependencies = [[[package]]name = "iana-time-zone"-version = "0.1.60"+version = "0.1.61"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141"+checksum = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220"dependencies = ["android_system_properties","core-foundation-sys",@@ -1555,15 +1617,15 @@ dependencies = [[[package]]name = "ignore"-version = "0.4.22"+version = "0.4.23"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "b46810df39e66e925525d6e38ce1e7f6e1d208f72dc39757880fcb66e2c58af1"+checksum = "6d89fd380afde86567dfba715db065673989d6253f42b88179abd3eae47bda4b"dependencies = ["crossbeam-deque","globset","log","memchr",- "regex-automata 0.4.6",+ "regex-automata 0.4.8","same-file","walkdir","winapi-util",@@ -1594,12 +1656,12 @@ dependencies = [[[package]]name = "indexmap"-version = "2.2.6"+version = "2.6.0"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26"+checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da"dependencies = ["equivalent",- "hashbrown 0.14.5",+ "hashbrown 0.15.0","serde",]@@ -1636,9 +1698,9 @@ dependencies = [[[package]]name = "ipnet"-version = "2.9.0"+version = "2.10.1"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3"+checksum = "ddc24109865250148c2e0f3d25d4f0f479571723792d3802153c60922a4fb708"[[package]]name = "is_terminal_polyfill"@@ -1703,9 +1765,9 @@ checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130"[[package]]name = "js-sys"-version = "0.3.69"+version = "0.3.72"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d"+checksum = "6a88f1bda2bd75b0452a14784937d796722fdebfe50df998aeb3f0b7603019a9"dependencies = ["wasm-bindgen",]@@ -1748,15 +1810,15 @@ dependencies = [[[package]]name = "lazy_static"-version = "1.4.0"+version = "1.5.0"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"+checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"[[package]]name = "libc"-version = "0.2.155"+version = "0.2.161"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"+checksum = "8e9489c2807c139ffd9c1794f4af0ebe86a828db53ecdc7fea2111d0fed085d1"[[package]]name = "libredox"@@ -1764,15 +1826,22 @@ version = "0.1.3"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d"dependencies = [- "bitflags 2.5.0",+ "bitflags 2.6.0","libc",+ "redox_syscall",][[package]]-name = "line-wrap"-version = "0.2.0"+name = "libz-sys"+version = "1.1.20"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "dd1bc4d24ad230d21fb898d1116b1801d7adfc449d42026475862ab48b11e70e"+checksum = "d2d16453e800a8cf6dd2fc3eb4bc99b786a9b90c663b8559a5b1a041bf89e472"+dependencies = [+ "cc",+ "libc",+ "pkg-config",+ "vcpkg",+][[package]]name = "linux-raw-sys"@@ -1857,9 +1926,9 @@ checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5"[[package]]name = "memchr"-version = "2.7.2"+version = "2.7.4"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d"+checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"[[package]]name = "memoffset"@@ -1878,9 +1947,9 @@ checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"[[package]]name = "mime_guess"-version = "2.0.4"+version = "2.0.5"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef"+checksum = "f7c44f8e672c00fe5308fa235f821cb4198414e1c77935c1ab6948d3fd78550e"dependencies = ["mime","unicase",@@ -1888,11 +1957,11 @@ dependencies = [[[package]]name = "miniz_oxide"-version = "0.7.3"+version = "0.8.0"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "87dfd01fe195c66b572b37921ad8803d010623c0aca821bea2302239d155cdae"+checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1"dependencies = [- "adler",+ "adler2","simd-adler32",]@@ -2074,18 +2143,18 @@ dependencies = [[[package]]name = "object"-version = "0.35.0"+version = "0.36.5"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "b8ec7ab813848ba4522158d5517a6093db1ded27575b070f4177b8d12b41db5e"+checksum = "aedf0a2d09c573ed1d8d85b30c119153926a2b36dce0ab28322c09a117a4683e"dependencies = ["memchr",][[package]]name = "once_cell"-version = "1.19.0"+version = "1.20.2"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"+checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775"[[package]]name = "open"@@ -2099,11 +2168,11 @@ dependencies = [[[package]]name = "openssl"-version = "0.10.64"+version = "0.10.68"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f"+checksum = "6174bc48f102d208783c2c84bf931bb75927a617866870de8a4ea85597f871f5"dependencies = [- "bitflags 2.5.0",+ "bitflags 2.6.0","cfg-if","foreign-types 0.3.2","libc",@@ -2120,7 +2189,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"dependencies = ["proc-macro2","quote",- "syn 2.0.66",+ "syn 2.0.85",][[package]]@@ -2129,14 +2198,24 @@ version = "0.1.5"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"+[[package]]+name = "openssl-src"+version = "300.4.0+3.4.0"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "a709e02f2b4aca747929cca5ed248880847c650233cf8b8cdc48f40aaf4898a6"+dependencies = [+ "cc",+]+[[package]]name = "openssl-sys"-version = "0.9.102"+version = "0.9.104"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "c597637d56fbc83893a35eb0dd04b2b8e7a50c91e64e9493e398b5df4fb45fa2"+checksum = "45abf306cbf99debc8195b66b7346498d7b10c210de50418b5ccd7ceba08c741"dependencies = ["cc","libc",+ "openssl-src","pkg-config","vcpkg",]@@ -2207,16 +2286,16 @@ checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"dependencies = ["cfg-if","libc",- "redox_syscall 0.5.1",+ "redox_syscall","smallvec",- "windows-targets 0.52.5",+ "windows-targets 0.52.6",][[package]]name = "pathdiff"-version = "0.2.1"+version = "0.2.2"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd"+checksum = "d61c5ce1153ab5b689d0c074c4e7fc613e942dfb7dd9eea5ab202d2ad91fe361"[[package]]name = "percent-encoding"@@ -2328,7 +2407,7 @@ dependencies = ["phf_shared 0.11.2","proc-macro2","quote",- "syn 2.0.66",+ "syn 2.0.85",][[package]]@@ -2372,19 +2451,18 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"[[package]]name = "pkg-config"-version = "0.3.30"+version = "0.3.31"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec"+checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2"[[package]]name = "plist"-version = "1.6.1"+version = "1.7.0"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "d9d34169e64b3c7a80c8621a48adaf44e0cf62c78a9b25dd9dd35f1881a17cf9"+checksum = "42cf17e9a1800f5f396bc67d193dc9411b59012a5876445ef450d449881e1016"dependencies = [- "base64 0.21.7",- "indexmap 2.2.6",- "line-wrap",+ "base64 0.22.1",+ "indexmap 2.6.0","quick-xml","serde","time",@@ -2392,9 +2470,9 @@ dependencies = [[[package]]name = "png"-version = "0.17.13"+version = "0.17.14"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "06e4b0d3d1312775e782c86c91a111aa1f910cbb65e1337f9975b5f9a554b5e1"+checksum = "52f9d46a34a05a6a57566bc2bfae066ef07585a6e3fa30fbbdff5936380623f0"dependencies = ["bitflags 1.3.2","crc32fast",@@ -2411,9 +2489,12 @@ checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"[[package]]name = "ppv-lite86"-version = "0.2.17"+version = "0.2.20"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"+checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04"+dependencies = [+ "zerocopy",+][[package]]name = "precomputed-hash"@@ -2463,27 +2544,27 @@ checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068"[[package]]name = "proc-macro2"-version = "1.0.84"+version = "1.0.89"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "ec96c6a92621310b51366f1e28d05ef11489516e93be030060e5fc12024a49d6"+checksum = "f139b0662de085916d1fb67d2b4169d1addddda1919e696f3252b740b629986e"dependencies = ["unicode-ident",][[package]]name = "quick-xml"-version = "0.31.0"+version = "0.32.0"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33"+checksum = "1d3a6e5838b60e0e8fa7a43f22ade549a37d61f8bdbe636d0d7816191de969c2"dependencies = ["memchr",][[package]]name = "quote"-version = "1.0.36"+version = "1.0.37"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"dependencies = ["proc-macro2",]@@ -2577,27 +2658,18 @@ checksum = "f2ff9a1f06a88b01621b7ae906ef0211290d1c8a168a15542486a8f61c0833b9"[[package]]name = "redox_syscall"-version = "0.4.1"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa"-dependencies = [- "bitflags 1.3.2",-]--[[package]]-name = "redox_syscall"-version = "0.5.1"+version = "0.5.7"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e"+checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f"dependencies = [- "bitflags 2.5.0",+ "bitflags 2.6.0",][[package]]name = "redox_users"-version = "0.4.5"+version = "0.4.6"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891"+checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43"dependencies = ["getrandom 0.2.15","libredox",@@ -2606,14 +2678,14 @@ dependencies = [[[package]]name = "regex"-version = "1.10.4"+version = "1.11.0"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c"+checksum = "38200e5ee88914975b69f657f0801b6f6dccafd44fd9326302a4aaeecfacb1d8"dependencies = ["aho-corasick","memchr",- "regex-automata 0.4.6",- "regex-syntax 0.8.3",+ "regex-automata 0.4.8",+ "regex-syntax 0.8.5",][[package]]@@ -2627,13 +2699,13 @@ dependencies = [[[package]]name = "regex-automata"-version = "0.4.6"+version = "0.4.8"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea"+checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3"dependencies = ["aho-corasick","memchr",- "regex-syntax 0.8.3",+ "regex-syntax 0.8.5",][[package]]@@ -2644,9 +2716,9 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"[[package]]name = "regex-syntax"-version = "0.8.3"+version = "0.8.5"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56"+checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"[[package]]name = "reqwest"@@ -2660,7 +2732,7 @@ dependencies = ["futures-core","futures-util","h2",- "http",+ "http 0.2.12","http-body","hyper","hyper-tls",@@ -2723,20 +2795,20 @@ checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"[[package]]name = "rustc_version"-version = "0.4.0"+version = "0.4.1"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"+checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92"dependencies = ["semver",][[package]]name = "rustix"-version = "0.38.34"+version = "0.38.37"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f"+checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811"dependencies = [- "bitflags 2.5.0",+ "bitflags 2.6.0","errno","libc","linux-raw-sys",@@ -2754,9 +2826,9 @@ dependencies = [[[package]]name = "rustversion"-version = "1.0.17"+version = "1.0.18"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6"+checksum = "0e819f2bc632f285be6d7cd36e25940d45b2391dd6d9b939e79de557f7014248"[[package]]name = "ryu"@@ -2775,11 +2847,11 @@ dependencies = [[[package]]name = "schannel"-version = "0.1.23"+version = "0.1.26"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534"+checksum = "01227be5826fa0690321a2ba6c5cd57a19cf3f6a09e76973b58e61de6ab9d1c1"dependencies = [- "windows-sys 0.52.0",+ "windows-sys 0.59.0",][[package]]@@ -2796,11 +2868,11 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"[[package]]name = "security-framework"-version = "2.11.0"+version = "2.11.1"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "c627723fd09706bacdb5cf41499e95098555af3c3c29d014dc3c458ef6be11c0"+checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02"dependencies = [- "bitflags 2.5.0",+ "bitflags 2.6.0","core-foundation","core-foundation-sys","libc",@@ -2809,9 +2881,9 @@ dependencies = [[[package]]name = "security-framework-sys"-version = "2.11.0"+version = "2.12.0"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "317936bbbd05227752583946b9e66d7ce3b489f84e11a94a510b4437fef407d7"+checksum = "ea4a292869320c0272d7bc55a5a6aafaff59b4f63404a003887b679a2e05b4b6"dependencies = ["core-foundation-sys","libc",@@ -2848,31 +2920,31 @@ dependencies = [[[package]]name = "serde"-version = "1.0.210"+version = "1.0.213"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a"+checksum = "3ea7893ff5e2466df8d720bb615088341b295f849602c6956047f8f80f0e9bc1"dependencies = ["serde_derive",][[package]]name = "serde_derive"-version = "1.0.210"+version = "1.0.213"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f"+checksum = "7e85ad2009c50b58e87caa8cd6dac16bdf511bbfb7af6c33df902396aa480fa5"dependencies = ["proc-macro2","quote",- "syn 2.0.66",+ "syn 2.0.85",][[package]]name = "serde_json"-version = "1.0.128"+version = "1.0.132"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8"+checksum = "d726bfaff4b320266d395898905d0eba0345aae23b54aee3a737e260fd46db03"dependencies = [- "indexmap 2.2.6",+ "indexmap 2.6.0","itoa 1.0.11","memchr","ryu",@@ -2887,14 +2959,14 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9"dependencies = ["proc-macro2","quote",- "syn 2.0.66",+ "syn 2.0.85",][[package]]name = "serde_spanned"-version = "0.6.6"+version = "0.6.8"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0"+checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1"dependencies = ["serde",]@@ -2913,15 +2985,15 @@ dependencies = [[[package]]name = "serde_with"-version = "3.8.1"+version = "3.11.0"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "0ad483d2ab0149d5a5ebcd9972a3852711e0153d863bf5a5d0391d28883c4a20"+checksum = "8e28bdad6db2b8340e449f7108f020b3b092e8583a9e3fb82713e1d4e71fe817"dependencies = ["base64 0.22.1","chrono","hex","indexmap 1.9.3",- "indexmap 2.2.6",+ "indexmap 2.6.0","serde","serde_derive","serde_json",@@ -2931,14 +3003,14 @@ dependencies = [[[package]]name = "serde_with_macros"-version = "3.8.1"+version = "3.11.0"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "65569b702f41443e8bc8bbb1c5779bd0450bbe723b56198980e80ec45780bce2"+checksum = "9d846214a9854ef724f3da161b426242d8de7c1fc7de2f89bb1efcb154dca79d"dependencies = ["darling","proc-macro2","quote",- "syn 2.0.66",+ "syn 2.0.85",][[package]]@@ -2960,7 +3032,7 @@ checksum = "772ee033c0916d670af7860b6e1ef7d658a4629a6d0b4c8c3e67f09b3765b75d"dependencies = ["proc-macro2","quote",- "syn 2.0.66",+ "syn 2.0.85",][[package]]@@ -2993,6 +3065,12 @@ dependencies = ["lazy_static",]+[[package]]+name = "shlex"+version = "1.3.0"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"+[[package]]name = "simd-adler32"version = "0.3.7"@@ -3118,9 +3196,9 @@ dependencies = [[[package]]name = "syn"-version = "2.0.66"+version = "2.0.85"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5"+checksum = "5023162dfcd14ef8f32034d8bcd4cc5ddc61ef7a247c024a33e24e1f24d21b56"dependencies = ["proc-macro2","quote",@@ -3185,15 +3263,15 @@ dependencies = ["cfg-expr 0.15.8","heck 0.5.0","pkg-config",- "toml 0.8.13",+ "toml 0.8.19","version-compare 0.2.0",][[package]]name = "tao"-version = "0.16.9"+version = "0.16.10"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "575c856fc21e551074869dcfaad8f706412bd5b803dfa0fbf6881c4ff4bfafab"+checksum = "48d298c441a1da46e28e8ad8ec205aab7fd8cd71b9d10e05454224eef422e1ae"dependencies = ["bitflags 1.3.2","cairo-rs",@@ -3238,20 +3316,20 @@ dependencies = [[[package]]name = "tao-macros"-version = "0.1.2"+version = "0.1.3"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "ec114582505d158b669b136e6851f85840c109819d77c42bb7c0709f727d18c2"+checksum = "f4e16beb8b2ac17db28eab8bca40e62dbfbb34c0fcdc6d9826b11b7b5d047dfd"dependencies = ["proc-macro2","quote",- "syn 1.0.109",+ "syn 2.0.85",][[package]]name = "tar"-version = "0.4.40"+version = "0.4.42"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "b16afcea1f22891c49a00c751c7b63b2233284064f11a200fc624137c51e2ddb"+checksum = "4ff6c40d3aedb5e06b57c6f669ad17ab063dd1e63d977c6a88e7f4dfa4f04020"dependencies = ["filetime","libc",@@ -3260,9 +3338,9 @@ dependencies = [[[package]]name = "target-lexicon"-version = "0.12.14"+version = "0.12.16"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f"+checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1"[[package]]name = "tauri"@@ -3284,7 +3362,7 @@ dependencies = ["glob","gtk","heck 0.5.0",- "http",+ "http 0.2.12","ignore","indexmap 1.9.3","log",@@ -3398,7 +3476,7 @@ dependencies = [[[package]]name = "tauri-plugin-store"version = "0.0.0"-source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v1#5e3900e682e13f3759b439116ae2f77a6d389ca2"+source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v1#fa8ee1d4f2115bf1201cb4b4082d343476c01785"dependencies = ["log","serde",@@ -3414,7 +3492,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "fa47eaa4047a7b51064caff32f0c6282e2c5adc6ceacdd493ecf1b01fa4b0eaa"dependencies = ["bincode",- "bitflags 2.5.0",+ "bitflags 2.6.0","log","serde","serde_json",@@ -3429,7 +3507,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "f33fda7d213e239077fad52e96c6b734cecedb30c2382118b64f94cb5103ff3a"dependencies = ["gtk",- "http",+ "http 0.2.12","http-range","rand 0.8.5","raw-window-handle",@@ -3505,14 +3583,15 @@ dependencies = [[[package]]name = "tempfile"-version = "3.10.1"+version = "3.13.0"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1"+checksum = "f0f2c9fc62d0beef6951ccffd757e241266a2c833136efbe35af6cd2567dca5b"dependencies = ["cfg-if","fastrand",+ "once_cell","rustix",- "windows-sys 0.52.0",+ "windows-sys 0.59.0",][[package]]@@ -3534,22 +3613,22 @@ checksum = "8eaa81235c7058867fa8c0e7314f33dcce9c215f535d1913822a2b3f5e289f3c"[[package]]name = "thiserror"-version = "1.0.64"+version = "1.0.65"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "d50af8abc119fb8bb6dbabcfa89656f46f84aa0ac7688088608076ad2b459a84"+checksum = "5d11abd9594d9b38965ef50805c5e469ca9cc6f197f883f717e0269a3057b3d5"dependencies = ["thiserror-impl",][[package]]name = "thiserror-impl"-version = "1.0.64"+version = "1.0.65"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3"+checksum = "ae71770322cbd277e69d762a16c444af02aa0575ac0d174f0b9562d3b37f8602"dependencies = ["proc-macro2","quote",- "syn 2.0.66",+ "syn 2.0.85",][[package]]@@ -3595,9 +3674,9 @@ dependencies = [[[package]]name = "tinyvec"-version = "1.6.0"+version = "1.8.0"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50"+checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938"dependencies = ["tinyvec_macros",]@@ -3616,9 +3695,9 @@ checksum = "c7c4ceeeca15c8384bbc3e011dbd8fccb7f068a440b752b7d9b32ceb0ca0e2e8"[[package]]name = "tokio"-version = "1.40.0"+version = "1.41.0"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998"+checksum = "145f3413504347a2be84393cc8a7d2fb4d863b375909ea59f2158261aa258bbb"dependencies = ["backtrace","bytes",@@ -3638,7 +3717,7 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752"dependencies = ["proc-macro2","quote",- "syn 2.0.66",+ "syn 2.0.85",][[package]]@@ -3687,21 +3766,21 @@ dependencies = [[[package]]name = "toml"-version = "0.8.13"+version = "0.8.19"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "a4e43f8cc456c9704c851ae29c67e17ef65d2c30017c17a9765b89c382dc8bba"+checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e"dependencies = ["serde","serde_spanned","toml_datetime",- "toml_edit 0.22.13",+ "toml_edit 0.22.22",][[package]]name = "toml_datetime"-version = "0.6.6"+version = "0.6.8"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf"+checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41"dependencies = ["serde",]@@ -3712,7 +3791,7 @@ version = "0.19.15"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"dependencies = [- "indexmap 2.2.6",+ "indexmap 2.6.0","serde","serde_spanned","toml_datetime",@@ -3721,22 +3800,22 @@ dependencies = [[[package]]name = "toml_edit"-version = "0.22.13"+version = "0.22.22"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "c127785850e8c20836d49732ae6abfa47616e60bf9d9f57c43c250361a9db96c"+checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5"dependencies = [- "indexmap 2.2.6",+ "indexmap 2.6.0","serde","serde_spanned","toml_datetime",- "winnow 0.6.9",+ "winnow 0.6.20",][[package]]name = "tower-service"-version = "0.3.2"+version = "0.3.3"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52"+checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3"[[package]]name = "tracing"@@ -3757,7 +3836,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"dependencies = ["proc-macro2","quote",- "syn 2.0.66",+ "syn 2.0.85",][[package]]@@ -3813,39 +3892,36 @@ checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"[[package]]name = "unicase"-version = "2.7.0"+version = "2.8.0"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89"-dependencies = [- "version_check",-]+checksum = "7e51b68083f157f853b6379db119d1c1be0e6e4dec98101079dec41f6f5cf6df"[[package]]name = "unicode-bidi"-version = "0.3.15"+version = "0.3.17"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75"+checksum = "5ab17db44d7388991a428b2ee655ce0c212e862eff1768a455c58f9aad6e7893"[[package]]name = "unicode-ident"-version = "1.0.12"+version = "1.0.13"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"+checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"[[package]]name = "unicode-normalization"-version = "0.1.23"+version = "0.1.24"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5"+checksum = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956"dependencies = ["tinyvec",][[package]]name = "unicode-segmentation"-version = "1.11.0"+version = "1.12.0"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202"+checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493"[[package]]name = "url"@@ -3859,6 +3935,15 @@ dependencies = ["serde",]+[[package]]+name = "url-escape"+version = "0.1.1"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "44e0ce4d1246d075ca5abec4b41d33e87a6054d08e2366b63205665e950db218"+dependencies = [+ "percent-encoding",+]+[[package]]name = "utf-8"version = "0.7.6"@@ -3873,9 +3958,9 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"[[package]]name = "uuid"-version = "1.8.0"+version = "1.11.0"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0"+checksum = "f8c5f0a0af699448548ad1a2fbf920fb4bee257eae39953ba95cb84891a0446a"dependencies = ["getrandom 0.2.15",]@@ -3906,9 +3991,9 @@ checksum = "852e951cb7832cb45cb1169900d19760cfa39b82bc0ea9c0e5a14ae88411c98b"[[package]]name = "version_check"-version = "0.9.4"+version = "0.9.5"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"+checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"[[package]]name = "vswhom"@@ -3963,34 +4048,35 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"[[package]]name = "wasm-bindgen"-version = "0.2.92"+version = "0.2.95"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8"+checksum = "128d1e363af62632b8eb57219c8fd7877144af57558fb2ef0368d0087bddeb2e"dependencies = ["cfg-if",+ "once_cell","wasm-bindgen-macro",][[package]]name = "wasm-bindgen-backend"-version = "0.2.92"+version = "0.2.95"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da"+checksum = "cb6dd4d3ca0ddffd1dd1c9c04f94b868c37ff5fac97c30b97cff2d74fce3a358"dependencies = ["bumpalo","log","once_cell","proc-macro2","quote",- "syn 2.0.66",+ "syn 2.0.85","wasm-bindgen-shared",][[package]]name = "wasm-bindgen-futures"-version = "0.4.42"+version = "0.4.45"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0"+checksum = "cc7ec4f8827a71586374db3e87abdb5a2bb3a15afed140221307c3ec06b1f63b"dependencies = ["cfg-if","js-sys",@@ -4000,9 +4086,9 @@ dependencies = [[[package]]name = "wasm-bindgen-macro"-version = "0.2.92"+version = "0.2.95"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726"+checksum = "e79384be7f8f5a9dd5d7167216f022090cf1f9ec128e6e6a482a2cb5c5422c56"dependencies = ["quote","wasm-bindgen-macro-support",@@ -4010,28 +4096,28 @@ dependencies = [[[package]]name = "wasm-bindgen-macro-support"-version = "0.2.92"+version = "0.2.95"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"+checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68"dependencies = ["proc-macro2","quote",- "syn 2.0.66",+ "syn 2.0.85","wasm-bindgen-backend","wasm-bindgen-shared",][[package]]name = "wasm-bindgen-shared"-version = "0.2.92"+version = "0.2.95"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96"+checksum = "65fc09f10666a9f147042251e0dda9c18f166ff7de300607007e96bdebc1068d"[[package]]name = "wasm-streams"-version = "0.4.0"+version = "0.4.1"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "b65dc4c90b63b118468cf747d8bf3566c1913ef60be765b5730ead9e0a3ba129"+checksum = "4e072d4e72f700fb3443d8fe94a39315df013eef1104903cdb0a2abd322bbecd"dependencies = ["futures-util","js-sys",@@ -4042,9 +4128,9 @@ dependencies = [[[package]]name = "web-sys"-version = "0.3.69"+version = "0.3.72"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef"+checksum = "f6488b90108c040df0fe62fa815cbdee25124641df01814dd7282749234c6112"dependencies = ["js-sys","wasm-bindgen",@@ -4153,11 +4239,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"[[package]]name = "winapi-util"-version = "0.1.8"+version = "0.1.9"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b"+checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"dependencies = [- "windows-sys 0.52.0",+ "windows-sys 0.59.0",][[package]]@@ -4209,7 +4295,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be"dependencies = ["windows-core",- "windows-targets 0.52.5",+ "windows-targets 0.52.6",][[package]]@@ -4228,7 +4314,7 @@ version = "0.52.0"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"dependencies = [- "windows-targets 0.52.5",+ "windows-targets 0.52.6",][[package]]@@ -4277,7 +4363,16 @@ version = "0.52.0"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"dependencies = [- "windows-targets 0.52.5",+ "windows-targets 0.52.6",+]++[[package]]+name = "windows-sys"+version = "0.59.0"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"+dependencies = [+ "windows-targets 0.52.6",][[package]]@@ -4297,18 +4392,18 @@ dependencies = [[[package]]name = "windows-targets"-version = "0.52.5"+version = "0.52.6"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb"+checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"dependencies = [- "windows_aarch64_gnullvm 0.52.5",- "windows_aarch64_msvc 0.52.5",- "windows_i686_gnu 0.52.5",+ "windows_aarch64_gnullvm 0.52.6",+ "windows_aarch64_msvc 0.52.6",+ "windows_i686_gnu 0.52.6","windows_i686_gnullvm",- "windows_i686_msvc 0.52.5",- "windows_x86_64_gnu 0.52.5",- "windows_x86_64_gnullvm 0.52.5",- "windows_x86_64_msvc 0.52.5",+ "windows_i686_msvc 0.52.6",+ "windows_x86_64_gnu 0.52.6",+ "windows_x86_64_gnullvm 0.52.6",+ "windows_x86_64_msvc 0.52.6",][[package]]@@ -4323,7 +4418,7 @@ version = "0.1.1"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "6998aa457c9ba8ff2fb9f13e9d2a930dabcea28f1d0ab94d687d8b3654844515"dependencies = [- "windows-targets 0.52.5",+ "windows-targets 0.52.6",][[package]]@@ -4340,9 +4435,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"[[package]]name = "windows_aarch64_gnullvm"-version = "0.52.5"+version = "0.52.6"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263"+checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"[[package]]name = "windows_aarch64_msvc"@@ -4370,9 +4465,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"[[package]]name = "windows_aarch64_msvc"-version = "0.52.5"+version = "0.52.6"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6"+checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"[[package]]name = "windows_i686_gnu"@@ -4400,15 +4495,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"[[package]]name = "windows_i686_gnu"-version = "0.52.5"+version = "0.52.6"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670"+checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"[[package]]name = "windows_i686_gnullvm"-version = "0.52.5"+version = "0.52.6"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9"+checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"[[package]]name = "windows_i686_msvc"@@ -4436,9 +4531,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"[[package]]name = "windows_i686_msvc"-version = "0.52.5"+version = "0.52.6"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf"+checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"[[package]]name = "windows_x86_64_gnu"@@ -4466,9 +4561,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"[[package]]name = "windows_x86_64_gnu"-version = "0.52.5"+version = "0.52.6"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9"+checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"[[package]]name = "windows_x86_64_gnullvm"@@ -4484,9 +4579,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"[[package]]name = "windows_x86_64_gnullvm"-version = "0.52.5"+version = "0.52.6"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596"+checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"[[package]]name = "windows_x86_64_msvc"@@ -4514,9 +4609,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"[[package]]name = "windows_x86_64_msvc"-version = "0.52.5"+version = "0.52.6"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0"+checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"[[package]]name = "winnow"@@ -4529,9 +4624,9 @@ dependencies = [[[package]]name = "winnow"-version = "0.6.9"+version = "0.6.20"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "86c949fede1d13936a99f14fafd3e76fd642b556dd2ce96287fbe2e0151bfac6"+checksum = "36c1fec1a2bb5866f07c25f68c26e565c4c200aebb96d7e55710c19d3e8ac49b"dependencies = ["memchr",]@@ -4567,9 +4662,9 @@ dependencies = [[[package]]name = "wry"-version = "0.24.10"+version = "0.24.11"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "00711278ed357350d44c749c286786ecac644e044e4da410d466212152383b45"+checksum = "c55c80b12287eb1ff7c365fc2f7a5037cb6181bd44c9fce81c8d1cf7605ffad6"dependencies = ["base64 0.13.1","block",@@ -4582,7 +4677,7 @@ dependencies = ["glib","gtk","html5ever",- "http",+ "http 0.2.12","kuchikiki","libc","log",@@ -4634,3 +4729,24 @@ dependencies = ["linux-raw-sys","rustix",]++[[package]]+name = "zerocopy"+version = "0.7.35"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0"+dependencies = [+ "byteorder",+ "zerocopy-derive",+]++[[package]]+name = "zerocopy-derive"+version = "0.7.35"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"+dependencies = [+ "proc-macro2",+ "quote",+ "syn 2.0.85",+]diff --git a/packages/hoppscotch-selfhost-desktop/src-tauri/Cargo.toml b/packages/hoppscotch-selfhost-desktop/src-tauri/Cargo.tomlindex 639133018..16205ac4c 100644--- a/packages/hoppscotch-selfhost-desktop/src-tauri/Cargo.toml+++ b/packages/hoppscotch-selfhost-desktop/src-tauri/Cargo.toml@@ -25,7 +25,7 @@ tauri = { version = "1.8.1", features = [tauri-plugin-store = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v1" }tauri-plugin-deep-link = { git = "https://github.com/FabianLars/tauri-plugin-deep-link", branch = "main" }tauri-plugin-window-state = "0.1.1"-reqwest = { version = "0.11.27", features = ["native-tls"] }+hoppscotch-relay = { path = "../../hoppscotch-relay" }serde_json = "1.0.128"url = "2.5.2"hex_color = "3.0.0"diff --git a/packages/hoppscotch-selfhost-desktop/src-tauri/src/interceptor.rs b/packages/hoppscotch-selfhost-desktop/src-tauri/src/interceptor.rsindex f733d52e5..fb2d0317b 100644--- a/packages/hoppscotch-selfhost-desktop/src-tauri/src/interceptor.rs+++ b/packages/hoppscotch-selfhost-desktop/src-tauri/src/interceptor.rs@@ -1,320 +1,90 @@use dashmap::DashMap;-use reqwest::{header::{HeaderMap, HeaderName, HeaderValue}, Certificate, ClientBuilder, Identity};-use serde::{Deserialize, Serialize};-use tauri::{plugin::{Builder, TauriPlugin}, Manager, Runtime, State};+use hoppscotch_relay::{RequestWithMetadata, ResponseWithMetadata};+use serde::Serialize;+use tauri::{+ plugin::{Builder, TauriPlugin},+ Manager, Runtime, State,+};+use thiserror::Error;use tokio_util::sync::CancellationToken;#[derive(Default)]struct InterceptorState {- cancellation_tokens: DashMap<usize, CancellationToken>+ cancellation_tokens: DashMap<usize, CancellationToken>,}-#[derive(Debug, Serialize, Deserialize)]-struct KeyValuePair {- key: String,- value: String-}--#[derive(Debug, Deserialize)]-enum FormDataValue {- Text(String),- File {- filename: String,- data: Vec<u8>,- mime: String- }-}--#[derive(Debug, Deserialize)]-struct FormDataEntry {- key: String,- value: FormDataValue-}--#[derive(Debug, Deserialize)]-enum BodyDef {- Text(String),- URLEncoded(Vec<KeyValuePair>),- FormData(Vec<FormDataEntry>)-}--#[derive(Debug, Deserialize)]-enum ClientCertDef {- PEMCert {- certificate_pem: Vec<u8>,- key_pem: Vec<u8>- },-- PFXCert {- certificate_pfx: Vec<u8>,- password: String- }-}--#[derive(Debug, Deserialize)]-struct RequestDef {- req_id: usize,-- method: String,- endpoint: String,-- parameters: Vec<KeyValuePair>,- headers: Vec<KeyValuePair>,-- body: Option<BodyDef>,-- validate_certs: bool,- root_cert_bundle_files: Vec<Vec<u8>>,- client_cert: Option<ClientCertDef>-}--fn get_identity_from_req(req: &RequestDef) -> Result<Option<Identity>, reqwest::Error> {- let result = match &req.client_cert {- None => return Ok(None),- Some(ClientCertDef::PEMCert { certificate_pem, key_pem }) => Identity::from_pkcs8_pem(&certificate_pem, &key_pem),- Some(ClientCertDef::PFXCert { certificate_pfx, password }) => Identity::from_pkcs12_der(&certificate_pfx, &password)- };-- Ok(Some(result?))-}--fn parse_root_certs(req: &RequestDef) -> Result<Vec<Certificate>, reqwest::Error> {- let mut result = vec![];-- for cert_bundle_file in &req.root_cert_bundle_files {- let mut certs = Certificate::from_pem_bundle(&cert_bundle_file)?;- result.append(&mut certs);- }-- Ok(result)-}--enum ReqBodyAction {- Body(reqwest::Body),- UrlEncodedForm(Vec<(String, String)>),- MultipartForm(reqwest::multipart::Form)-}--fn convert_bodydef_to_req_action(req: &RequestDef) -> Option<ReqBodyAction> {- match &req.body {- None => None,- Some(BodyDef::Text(text)) => Some(ReqBodyAction::Body(text.clone().into())),- Some(BodyDef::URLEncoded(entries)) =>- Some(- ReqBodyAction::UrlEncodedForm(- entries.iter()- .map(|KeyValuePair { key, value }| (key.clone(), value.clone()))- .collect()- )- ),- Some(BodyDef::FormData(entries)) => {- let mut form = reqwest::multipart::Form::new();-- for entry in entries {- form = match &entry.value {- FormDataValue::Text(value) => form.text(entry.key.clone(), value.clone()),- FormDataValue::File { filename, data, mime } =>- form.part(- entry.key.clone(),- reqwest::multipart::Part::bytes(data.clone())- .file_name(filename.clone())- .mime_str(mime.as_str()).expect("Error while setting File enum")- ),- }- }-- Some(ReqBodyAction::MultipartForm(form))- }- }-}--#[derive(Serialize)]-struct RunRequestResponse {- status: u16,- status_text: String,- headers: Vec<KeyValuePair>,- data: Vec<u8>,-- time_start_ms: u128,- time_end_ms: u128-}--#[derive(Serialize)]-enum RunRequestError {- RequestCancelled,- ClientCertError,- RootCertError,- InvalidMethod,- InvalidUrl,- InvalidHeaders,- RequestRunError(String)-}--async fn execute_request(req_builder: reqwest::RequestBuilder) -> Result<RunRequestResponse, RunRequestError> {- let start_time_ms = std::time::SystemTime::now()- .duration_since(std::time::UNIX_EPOCH)- .unwrap()- .as_millis();-- let response = req_builder.send()- .await- .map_err(|err| RunRequestError::RequestRunError(err.to_string()))?;-- // We hold on to these values becase we lose ownership of response- // when we read the body- let res_status = response.status();- let res_headers = response.headers().clone();--- let res_body_bytes = response.bytes()- .await- .map_err(|err| RunRequestError::RequestRunError(err.to_string()))?;-- // Reqwest resolves the send before all the response is loaded, to keep the timing- // correctly, we load the response as well.- let end_time_ms = std::time::SystemTime::now()- .duration_since(std::time::UNIX_EPOCH)- .unwrap()- .as_millis();-- let response_status = res_status.as_u16();- let response_status_text = res_status- .canonical_reason()- .unwrap_or("Unknown Status")- .to_owned();-- let response_headers = res_headers- .iter()- .map(|(key, value)|- KeyValuePair {- key: key.as_str().to_owned(),- value: value.to_str().unwrap_or("").to_owned()- }- )- .collect();-- Ok(- RunRequestResponse {- status: response_status,- status_text: response_status_text,- headers: response_headers,- data: res_body_bytes.into(),- time_start_ms: start_time_ms,- time_end_ms: end_time_ms- }- )+#[derive(Debug, Serialize, Error)]+pub enum RunRequestError {+ #[error("Request cancelled")]+ RequestCancelled,+ #[error("Internal server error")]+ InternalServerError,+ #[error("Relay error: {0}")]+ Relay(#[from] hoppscotch_relay::RelayError),}#[tauri::command]-async fn run_request(req: RequestDef, state: State<'_, InterceptorState>) -> Result<RunRequestResponse, RunRequestError> {- let method = reqwest::Method::from_bytes(req.method.as_bytes())- .map_err(|_| RunRequestError::InvalidMethod)?;-- let endpoint_url = reqwest::Url::parse(&req.endpoint)- .map_err(|_| RunRequestError::InvalidUrl)?;-- let headers = req.headers- .iter()- .map(|KeyValuePair { key, value }|- Ok(- (- key.parse::<HeaderName>().map_err(|_| ())?,- value.parse::<HeaderValue>().map_err(|_| ())?- )- )- )- .collect::<Result<HeaderMap, ()>>()- .map_err(|_| RunRequestError::InvalidHeaders)?;-- let body_action = convert_bodydef_to_req_action(&req);-- let client_identity = get_identity_from_req(&req)- .map_err(|_| RunRequestError::ClientCertError)?;-- let root_certs = parse_root_certs(&req)- .map_err(|_| RunRequestError::RootCertError)?;-- let mut client_builder = ClientBuilder::new()- .danger_accept_invalid_certs(!req.validate_certs);-- // NOTE: Root Certificates are not currently implemented into the Hoppscotch UI- // This is done so as the current mechanism doesn't allow for v1 X.509 certificates- // to be accepted. Reqwest supports `native-tls` and `rustls`.- // `native-tls` should support v1 X.509 in Linux [OpenSSL] (and hopefully on Win [SChannel]), but on- // macOS the Security Framework system in it blocks certiticates pretty harshly and blocks v1.- // `rustls` doesn't allow v1 x.509 as well as documented here: https://github.com/rustls/webpki/issues/29- // We will fully introduce the feature when the dilemma is solved (or demand is voiced), until- // then, disabling SSL verification should yield same results- for root_cert in root_certs {- client_builder = client_builder.add_root_certificate(root_cert);- }-- if let Some(identity) = client_identity {- client_builder = client_builder.identity(identity);- }-- let client = client_builder.build()- .expect("TLS Backend couldn't be initialized");-- let mut req_builder = client.request(method, endpoint_url)- .query(- &req.parameters- .iter()- .map(|KeyValuePair { key, value }| (key, value))- .collect::<Vec<_>>()- )- .headers(headers);-- req_builder = match body_action {- None => req_builder,- Some(ReqBodyAction::Body(body)) => req_builder.body(body),- Some(ReqBodyAction::UrlEncodedForm(entries)) => req_builder.form(&entries),- Some(ReqBodyAction::MultipartForm(form)) => req_builder.multipart(form)- };-- let cancel_token = CancellationToken::new();-- // NOTE: This will drop reference to an existing cancellation token- // if you send a request with the same request id as an existing one,- // thereby, dropping any means to cancel a running operation with the old token.- // This is done so because, on FE side, we may lose cancel token info upon reloads- // and this allows us to work around that.- state.cancellation_tokens.insert(req.req_id, cancel_token.clone());-- // Races between whether cancellation happened or requext execution happened- let result = tokio::select! {- _ = cancel_token.cancelled() => { None },- result = execute_request(req_builder) => {- // Remove cancellation token since the request has now completed- state.cancellation_tokens.remove(&req.req_id);+async fn run_request(+ req: RequestWithMetadata,+ state: State<'_, InterceptorState>,+) -> Result<ResponseWithMetadata, RunRequestError> {+ let req_id = req.req_id;+ let cancel_token = CancellationToken::new();+ // NOTE: This will drop reference to an existing cancellation token+ // if you send a request with the same request id as an existing one,+ // thereby, dropping any means to cancel a running operation with the old token.+ // This is done so because, on FE side, we may lose cancel token info upon reloads+ // and this allows us to work around that.+ state+ .cancellation_tokens+ .insert(req_id, cancel_token.clone());++ let cancel_token_clone = cancel_token.clone();+ // Execute the HTTP request in a blocking thread pool and handles cancellation.+ //+ // It:+ // 1. Uses `spawn_blocking` to run the sync `run_request_task`+ // without blocking the main Tokio runtime.+ // 2. Uses `select!` to concurrently wait for either+ // a. the task to complete,+ // b. or a cancellation signal.+ //+ // Why spawn_blocking?+ // - `run_request_task` uses synchronous curl operations which would block+ // the async runtime if not run in a separate thread.+ // - `spawn_blocking` moves this operation to a thread pool designed for+ // blocking tasks, so other async operations to continue unblocked.+ let result = tokio::select! {+ res = tokio::task::spawn_blocking(move || hoppscotch_relay::run_request_task(&req, cancel_token_clone)) => {+ match res {+ Ok(task_result) => Ok(task_result?),+ Err(_) => Err(RunRequestError::InternalServerError),+ }+ },+ _ = cancel_token.cancelled() => {+ Err(RunRequestError::RequestCancelled)+ }+ };- Some(result)- }- };+ state.cancellation_tokens.remove(&req_id);- result- .unwrap_or(Err(RunRequestError::RequestCancelled))+ result}#[tauri::command]fn cancel_request(req_id: usize, state: State<'_, InterceptorState>) {- if let Some((_, cancel_token)) = state.cancellation_tokens.remove(&req_id) {- cancel_token.cancel();- }+ if let Some((_, cancel_token)) = state.cancellation_tokens.remove(&req_id) {+ cancel_token.cancel();+ }}pub fn init<R: Runtime>() -> TauriPlugin<R> {- Builder::new("hopp_native_interceptor")- .invoke_handler(- tauri::generate_handler![- run_request,- cancel_request- ]- )- .setup(|app_handle| {- app_handle.manage(InterceptorState::default());-- Ok(())- })- .build()+ Builder::new("hopp_native_interceptor")+ .invoke_handler(tauri::generate_handler![run_request, cancel_request])+ .setup(|app_handle| {+ app_handle.manage(InterceptorState::default());++ Ok(())+ })+ .build()}