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: client certificates and ability to skip ssl cert verification in desktop app (#4111)
Andrew Bastinaead9e6c98fb
diff --git a/packages/hoppscotch-common/src/components.d.ts b/packages/hoppscotch-common/src/components.d.tsindex 6f4408365..406788270 100644--- a/packages/hoppscotch-common/src/components.d.ts+++ b/packages/hoppscotch-common/src/components.d.ts@@ -1,12 +1,16 @@// generated by unplugin-vue-components// We suggest you to commit this file into source control// Read more: https://github.com/vuejs/core/pull/3399-import "@vue/runtime-core"+import '@vue/runtime-core'export {}-declare module "@vue/runtime-core" {+declare module '@vue/runtime-core' {export interface GlobalComponents {+ AccessTokens: typeof import('./components/accessTokens/index.vue')['default']+ AccessTokensGenerateModal: typeof import('./components/accessTokens/GenerateModal.vue')['default']+ AccessTokensList: typeof import('./components/accessTokens/List.vue')['default']+ AccessTokensOverview: typeof import('./components/accessTokens/Overview.vue')['default']AppActionHandler: typeof import('./components/app/ActionHandler.vue')['default']AppBanner: typeof import('./components/app/Banner.vue')['default']AppContextMenu: typeof import('./components/app/ContextMenu.vue')['default']@@ -123,7 +127,6 @@ declare module "@vue/runtime-core" {HttpBody: typeof import('./components/http/Body.vue')['default']HttpBodyParameters: typeof import('./components/http/BodyParameters.vue')['default']HttpCodegen: typeof import('./components/http/Codegen.vue')['default']- HttpCodegenBody: typeof import('./components/http/CodegenBody.vue')['default']HttpCodegenModal: typeof import('./components/http/CodegenModal.vue')['default']HttpHeaders: typeof import('./components/http/Headers.vue')['default']HttpImportCurl: typeof import('./components/http/ImportCurl.vue')['default']@@ -150,71 +153,76 @@ declare module "@vue/runtime-core" {IconLucideAlertTriangle: typeof import('~icons/lucide/alert-triangle')['default']IconLucideArrowLeft: typeof import('~icons/lucide/arrow-left')['default']IconLucideArrowUpRight: typeof import('~icons/lucide/arrow-up-right')['default']- IconLucideBrush: (typeof import("~icons/lucide/brush"))["default"]- IconLucideCheckCircle: (typeof import("~icons/lucide/check-circle"))["default"]- IconLucideChevronRight: (typeof import("~icons/lucide/chevron-right"))["default"]- IconLucideGlobe: (typeof import("~icons/lucide/globe"))["default"]- IconLucideHelpCircle: (typeof import("~icons/lucide/help-circle"))["default"]- IconLucideInbox: (typeof import("~icons/lucide/inbox"))["default"]- IconLucideInfo: (typeof import("~icons/lucide/info"))["default"]- IconLucideLayers: (typeof import("~icons/lucide/layers"))["default"]- IconLucideListEnd: (typeof import("~icons/lucide/list-end"))["default"]- IconLucideMinus: (typeof import("~icons/lucide/minus"))["default"]- IconLucideRss: (typeof import("~icons/lucide/rss"))["default"]- IconLucideSearch: (typeof import("~icons/lucide/search"))["default"]- IconLucideUsers: (typeof import("~icons/lucide/users"))["default"]- IconLucideVerified: (typeof import("~icons/lucide/verified"))["default"]- IconLucideX: (typeof import("~icons/lucide/x"))["default"]- ImportExportBase: (typeof import("./components/importExport/Base.vue"))["default"]- ImportExportImportExportList: (typeof import("./components/importExport/ImportExportList.vue"))["default"]- ImportExportImportExportSourcesList: (typeof import("./components/importExport/ImportExportSourcesList.vue"))["default"]- ImportExportImportExportStepsFileImport: (typeof import("./components/importExport/ImportExportSteps/FileImport.vue"))["default"]- ImportExportImportExportStepsMyCollectionImport: (typeof import("./components/importExport/ImportExportSteps/MyCollectionImport.vue"))["default"]- ImportExportImportExportStepsUrlImport: (typeof import("./components/importExport/ImportExportSteps/UrlImport.vue"))["default"]- InterceptorsErrorPlaceholder: (typeof import("./components/interceptors/ErrorPlaceholder.vue"))["default"]- InterceptorsExtensionSubtitle: (typeof import("./components/interceptors/ExtensionSubtitle.vue"))["default"]- LensesHeadersRenderer: (typeof import("./components/lenses/HeadersRenderer.vue"))["default"]- LensesHeadersRendererEntry: (typeof import("./components/lenses/HeadersRendererEntry.vue"))["default"]- LensesRenderersAudioLensRenderer: (typeof import("./components/lenses/renderers/AudioLensRenderer.vue"))["default"]- LensesRenderersHTMLLensRenderer: (typeof import("./components/lenses/renderers/HTMLLensRenderer.vue"))["default"]- LensesRenderersImageLensRenderer: (typeof import("./components/lenses/renderers/ImageLensRenderer.vue"))["default"]- LensesRenderersJSONLensRenderer: (typeof import("./components/lenses/renderers/JSONLensRenderer.vue"))["default"]- LensesRenderersPDFLensRenderer: (typeof import("./components/lenses/renderers/PDFLensRenderer.vue"))["default"]- LensesRenderersRawLensRenderer: (typeof import("./components/lenses/renderers/RawLensRenderer.vue"))["default"]- LensesRenderersVideoLensRenderer: (typeof import("./components/lenses/renderers/VideoLensRenderer.vue"))["default"]- LensesRenderersXMLLensRenderer: (typeof import("./components/lenses/renderers/XMLLensRenderer.vue"))["default"]- LensesResponseBodyRenderer: (typeof import("./components/lenses/ResponseBodyRenderer.vue"))["default"]- ProfileUserDelete: (typeof import("./components/profile/UserDelete.vue"))["default"]- RealtimeCommunication: (typeof import("./components/realtime/Communication.vue"))["default"]- RealtimeConnectionConfig: (typeof import("./components/realtime/ConnectionConfig.vue"))["default"]- RealtimeLog: (typeof import("./components/realtime/Log.vue"))["default"]- RealtimeLogEntry: (typeof import("./components/realtime/LogEntry.vue"))["default"]- RealtimeSubscription: (typeof import("./components/realtime/Subscription.vue"))["default"]- SettingsExtension: (typeof import("./components/settings/Extension.vue"))["default"]- SettingsProxy: (typeof import("./components/settings/Proxy.vue"))["default"]- Share: (typeof import("./components/share/index.vue"))["default"]- ShareCreateModal: (typeof import("./components/share/CreateModal.vue"))["default"]- ShareCustomizeModal: (typeof import("./components/share/CustomizeModal.vue"))["default"]- ShareModal: (typeof import("./components/share/Modal.vue"))["default"]- ShareRequest: (typeof import("./components/share/Request.vue"))["default"]- ShareTemplatesButton: (typeof import("./components/share/templates/Button.vue"))["default"]- ShareTemplatesEmbeds: (typeof import("./components/share/templates/Embeds.vue"))["default"]- ShareTemplatesLink: (typeof import("./components/share/templates/Link.vue"))["default"]- SmartAccentModePicker: (typeof import("./components/smart/AccentModePicker.vue"))["default"]- SmartChangeLanguage: (typeof import("./components/smart/ChangeLanguage.vue"))["default"]- SmartColorModePicker: (typeof import("./components/smart/ColorModePicker.vue"))["default"]- SmartEnvInput: (typeof import("./components/smart/EnvInput.vue"))["default"]- TabPrimary: (typeof import("./components/tab/Primary.vue"))["default"]- TabSecondary: (typeof import("./components/tab/Secondary.vue"))["default"]- Teams: (typeof import("./components/teams/index.vue"))["default"]- TeamsAdd: (typeof import("./components/teams/Add.vue"))["default"]- TeamsEdit: (typeof import("./components/teams/Edit.vue"))["default"]- TeamsInvite: (typeof import("./components/teams/Invite.vue"))["default"]- TeamsMemberStack: (typeof import("./components/teams/MemberStack.vue"))["default"]- TeamsModal: (typeof import("./components/teams/Modal.vue"))["default"]- TeamsTeam: (typeof import("./components/teams/Team.vue"))["default"]- Tippy: (typeof import("vue-tippy"))["Tippy"]- WorkspaceCurrent: (typeof import("./components/workspace/Current.vue"))["default"]- WorkspaceSelector: (typeof import("./components/workspace/Selector.vue"))["default"]+ IconLucideBrush: typeof import('~icons/lucide/brush')['default']+ IconLucideCheckCircle: typeof import('~icons/lucide/check-circle')['default']+ IconLucideChevronRight: typeof import('~icons/lucide/chevron-right')['default']+ IconLucideGlobe: typeof import('~icons/lucide/globe')['default']+ IconLucideHelpCircle: typeof import('~icons/lucide/help-circle')['default']+ IconLucideInbox: typeof import('~icons/lucide/inbox')['default']+ IconLucideInfo: typeof import('~icons/lucide/info')['default']+ IconLucideLayers: typeof import('~icons/lucide/layers')['default']+ IconLucideListEnd: typeof import('~icons/lucide/list-end')['default']+ IconLucideMinus: typeof import('~icons/lucide/minus')['default']+ IconLucideRss: typeof import('~icons/lucide/rss')['default']+ IconLucideSearch: typeof import('~icons/lucide/search')['default']+ IconLucideUsers: typeof import('~icons/lucide/users')['default']+ IconLucideVerified: typeof import('~icons/lucide/verified')['default']+ IconLucideX: typeof import('~icons/lucide/x')['default']+ ImportExportBase: typeof import('./components/importExport/Base.vue')['default']+ ImportExportImportExportList: typeof import('./components/importExport/ImportExportList.vue')['default']+ ImportExportImportExportSourcesList: typeof import('./components/importExport/ImportExportSourcesList.vue')['default']+ ImportExportImportExportStepsFileImport: typeof import('./components/importExport/ImportExportSteps/FileImport.vue')['default']+ ImportExportImportExportStepsMyCollectionImport: typeof import('./components/importExport/ImportExportSteps/MyCollectionImport.vue')['default']+ ImportExportImportExportStepsUrlImport: typeof import('./components/importExport/ImportExportSteps/UrlImport.vue')['default']+ InterceptorsErrorPlaceholder: typeof import('./components/interceptors/ErrorPlaceholder.vue')['default']+ InterceptorsExtensionSubtitle: typeof import('./components/interceptors/ExtensionSubtitle.vue')['default']+ LensesHeadersRenderer: typeof import('./components/lenses/HeadersRenderer.vue')['default']+ LensesHeadersRendererEntry: typeof import('./components/lenses/HeadersRendererEntry.vue')['default']+ LensesRenderersAudioLensRenderer: typeof import('./components/lenses/renderers/AudioLensRenderer.vue')['default']+ LensesRenderersHTMLLensRenderer: typeof import('./components/lenses/renderers/HTMLLensRenderer.vue')['default']+ LensesRenderersImageLensRenderer: typeof import('./components/lenses/renderers/ImageLensRenderer.vue')['default']+ LensesRenderersJSONLensRenderer: typeof import('./components/lenses/renderers/JSONLensRenderer.vue')['default']+ LensesRenderersPDFLensRenderer: typeof import('./components/lenses/renderers/PDFLensRenderer.vue')['default']+ LensesRenderersRawLensRenderer: typeof import('./components/lenses/renderers/RawLensRenderer.vue')['default']+ LensesRenderersVideoLensRenderer: typeof import('./components/lenses/renderers/VideoLensRenderer.vue')['default']+ LensesRenderersXMLLensRenderer: typeof import('./components/lenses/renderers/XMLLensRenderer.vue')['default']+ LensesResponseBodyRenderer: typeof import('./components/lenses/ResponseBodyRenderer.vue')['default']+ ModalsNativeCACertificates: typeof import('./../../hoppscotch-selfhost-desktop/src/components/modals/NativeCACertificates.vue')['default']+ ModalsNativeClientCertificates: typeof import('./../../hoppscotch-selfhost-desktop/src/components/modals/NativeClientCertificates.vue')['default']+ ModalsNativeClientCertsAdd: typeof import('./../../hoppscotch-selfhost-desktop/src/components/modals/NativeClientCertsAdd.vue')['default']+ ProfileUserDelete: typeof import('./components/profile/UserDelete.vue')['default']+ RealtimeCommunication: typeof import('./components/realtime/Communication.vue')['default']+ RealtimeConnectionConfig: typeof import('./components/realtime/ConnectionConfig.vue')['default']+ RealtimeLog: typeof import('./components/realtime/Log.vue')['default']+ RealtimeLogEntry: typeof import('./components/realtime/LogEntry.vue')['default']+ RealtimeSubscription: typeof import('./components/realtime/Subscription.vue')['default']+ SettingsExtension: typeof import('./components/settings/Extension.vue')['default']+ SettingsNativeInterceptor: typeof import('./../../hoppscotch-selfhost-desktop/src/components/settings/NativeInterceptor.vue')['default']+ SettingsProxy: typeof import('./components/settings/Proxy.vue')['default']+ Share: typeof import('./components/share/index.vue')['default']+ ShareCreateModal: typeof import('./components/share/CreateModal.vue')['default']+ ShareCustomizeModal: typeof import('./components/share/CustomizeModal.vue')['default']+ ShareModal: typeof import('./components/share/Modal.vue')['default']+ ShareRequest: typeof import('./components/share/Request.vue')['default']+ ShareTemplatesButton: typeof import('./components/share/templates/Button.vue')['default']+ ShareTemplatesEmbeds: typeof import('./components/share/templates/Embeds.vue')['default']+ ShareTemplatesLink: typeof import('./components/share/templates/Link.vue')['default']+ SmartAccentModePicker: typeof import('./components/smart/AccentModePicker.vue')['default']+ SmartChangeLanguage: typeof import('./components/smart/ChangeLanguage.vue')['default']+ SmartColorModePicker: typeof import('./components/smart/ColorModePicker.vue')['default']+ SmartEnvInput: typeof import('./components/smart/EnvInput.vue')['default']+ TabPrimary: typeof import('./components/tab/Primary.vue')['default']+ TabSecondary: typeof import('./components/tab/Secondary.vue')['default']+ Teams: typeof import('./components/teams/index.vue')['default']+ TeamsAdd: typeof import('./components/teams/Add.vue')['default']+ TeamsEdit: typeof import('./components/teams/Edit.vue')['default']+ TeamsInvite: typeof import('./components/teams/Invite.vue')['default']+ TeamsMemberStack: typeof import('./components/teams/MemberStack.vue')['default']+ TeamsModal: typeof import('./components/teams/Modal.vue')['default']+ TeamsTeam: typeof import('./components/teams/Team.vue')['default']+ Tippy: typeof import('vue-tippy')['Tippy']+ WorkspaceCurrent: typeof import('./components/workspace/Current.vue')['default']+ WorkspaceSelector: typeof import('./components/workspace/Selector.vue')['default']}+}diff --git a/packages/hoppscotch-selfhost-desktop/package.json b/packages/hoppscotch-selfhost-desktop/package.jsonindex b4edf4938..03fa7b20e 100644--- a/packages/hoppscotch-selfhost-desktop/package.json+++ b/packages/hoppscotch-selfhost-desktop/package.json@@ -36,8 +36,10 @@"tauri": "link:@tauri-apps/api/tauri","tauri-plugin-store-api": "0.0.0","util": "0.12.5",+ "verzod": "0.2.2","vue": "3.3.9",- "workbox-window": "6.6.0"+ "workbox-window": "6.6.0",+ "zod": "3.22.4"},"devDependencies": {"@graphql-codegen/add": "5.0.0",diff --git a/packages/hoppscotch-selfhost-desktop/src-tauri/Cargo.lock b/packages/hoppscotch-selfhost-desktop/src-tauri/Cargo.lockindex 4c4d56cdb..8ff76054c 100644--- a/packages/hoppscotch-selfhost-desktop/src-tauri/Cargo.lock+++ b/packages/hoppscotch-selfhost-desktop/src-tauri/Cargo.lock@@ -4,9 +4,9 @@ version = 3[[package]]name = "addr2line"-version = "0.20.0"+version = "0.22.0"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "f4fa78e18c64fce05e902adecd7a5eed15a5e0a3439f7b0e169f0252214865e3"+checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678"dependencies = ["gimli",]@@ -19,9 +19,9 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"[[package]]name = "aho-corasick"-version = "1.0.2"+version = "1.1.3"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41"+checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"dependencies = ["memchr",]@@ -58,9 +58,9 @@ dependencies = [[[package]]name = "anyhow"-version = "1.0.72"+version = "1.0.86"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "3b13c32d80ecc7ab747b80c3784bce54ee8a7a0cc4fbda9bf4cda2cf6fe90854"+checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da"[[package]]name = "atk"@@ -83,20 +83,20 @@ dependencies = ["glib-sys","gobject-sys","libc",- "system-deps 6.1.1",+ "system-deps 6.2.2",][[package]]name = "autocfg"-version = "1.1.0"+version = "1.3.0"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"+checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"[[package]]name = "backtrace"-version = "0.3.68"+version = "0.3.72"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "4319208da049c43661739c5fade2ba182f09d1dc2299b32298d3a31692b17e12"+checksum = "17c6a35df3749d2e8bb1b7b21a976d82b15548788d2735b9d82f329268f71a11"dependencies = ["addr2line","cc",@@ -115,9 +115,15 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"[[package]]name = "base64"-version = "0.21.2"+version = "0.21.7"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d"+checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567"++[[package]]+name = "base64"+version = "0.22.1"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"[[package]]name = "bincode"@@ -136,9 +142,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"[[package]]name = "bitflags"-version = "2.4.0"+version = "2.5.0"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635"+checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"[[package]]name = "block"@@ -157,9 +163,9 @@ dependencies = [[[package]]name = "brotli"-version = "3.3.4"+version = "3.5.0"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "a1a0b1dbcc8ae29329621f8d4f0d835787c1c38bb1401979b49d13b0b305ff68"+checksum = "d640d25bc63c50fb1f0b545ffd80207d2e10a4c965530809b40ba3386825c391"dependencies = ["alloc-no-stdlib","alloc-stdlib",@@ -168,9 +174,9 @@ dependencies = [[[package]]name = "brotli-decompressor"-version = "2.3.4"+version = "2.5.1"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "4b6561fd3f895a11e8f72af2cb7d22e08366bebc2b6b57f7744c4bda27034744"+checksum = "4e2e4afe60d7dd600fdd3de8d0f08c2b7ec039712e3b6137ff98b7004e82de4f"dependencies = ["alloc-no-stdlib","alloc-stdlib",@@ -178,9 +184,9 @@ dependencies = [[[package]]name = "bstr"-version = "1.6.0"+version = "1.9.1"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "6798148dccfbff0fae41c7574d2fa8f1ef3492fba0face179de5d8d447d67b05"+checksum = "05efc5cfd9110c8416e471df0e96702d58690178e206e61b7173706673c93706"dependencies = ["memchr","serde",@@ -188,27 +194,27 @@ dependencies = [[[package]]name = "bumpalo"-version = "3.13.0"+version = "3.16.0"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1"+checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"[[package]]name = "bytemuck"-version = "1.13.1"+version = "1.16.0"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "17febce684fd15d89027105661fec94afb475cb995fbc59d2865198446ba2eea"+checksum = "78834c15cb5d5efe3452d58b1e8ba890dd62d21907f867f383358198e56ebca5"[[package]]name = "byteorder"-version = "1.4.3"+version = "1.5.0"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"+checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"[[package]]name = "bytes"-version = "1.4.0"+version = "1.6.0"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be"+checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9"dependencies = ["serde",]@@ -234,7 +240,7 @@ checksum = "3c55d429bef56ac9172d25fecb85dc8068307d17acd74b377866b7a1ef25d3c8"dependencies = ["glib-sys","libc",- "system-deps 6.1.1",+ "system-deps 6.2.2",][[package]]@@ -244,14 +250,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "599aa35200ffff8f04c1925aa1acc92fa2e08874379ef42e210a80e527e60838"dependencies = ["serde",- "toml 0.7.6",+ "toml 0.7.8",][[package]]name = "cc"-version = "1.0.79"+version = "1.0.98"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f"+checksum = "41c270e7540d725e65ac7f1b212ac8ce349719624d7bcff99f8e2e488e8cf03f"[[package]]name = "cesu8"@@ -281,9 +287,9 @@ dependencies = [[[package]]name = "cfg-expr"-version = "0.15.3"+version = "0.15.8"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "215c0072ecc28f92eeb0eea38ba63ddfcb65c2828c46311d646f1a3ff5f9841c"+checksum = "d067ad48b8650848b989a59a86c6c36a995d02d2bf778d45c3c5d57bc2718f02"dependencies = ["smallvec","target-lexicon",@@ -297,15 +303,15 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"[[package]]name = "chrono"-version = "0.4.26"+version = "0.4.38"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5"+checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401"dependencies = ["android-tzdata","iana-time-zone","num-traits","serde",- "winapi",+ "windows-targets 0.52.5",][[package]]@@ -334,7 +340,7 @@ dependencies = ["block","cocoa-foundation","core-foundation",- "core-graphics 0.23.1",+ "core-graphics 0.23.2","foreign-types 0.5.0","libc","objc",@@ -342,15 +348,14 @@ dependencies = [[[package]]name = "cocoa-foundation"-version = "0.1.1"+version = "0.1.2"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "931d3837c286f56e3c58423ce4eba12d08db2374461a785c86f672b08b5650d6"+checksum = "8c6234cbb2e4c785b456c0644748b1ac416dd045799740356f8363dfe00c93f7"dependencies = ["bitflags 1.3.2","block","core-foundation","core-graphics-types",- "foreign-types 0.3.2","libc","objc",]@@ -363,9 +368,9 @@ checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b"[[package]]name = "combine"-version = "4.6.6"+version = "4.6.7"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "35ed6e9d84f0b51a7f52daf1c7d71dd136fd7a3f41a8462b8cdb8c78d920fad4"+checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd"dependencies = ["bytes","memchr",@@ -379,9 +384,9 @@ checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e"[[package]]name = "core-foundation"-version = "0.9.3"+version = "0.9.4"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146"+checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f"dependencies = ["core-foundation-sys","libc",@@ -389,9 +394,9 @@ dependencies = [[[package]]name = "core-foundation-sys"-version = "0.8.4"+version = "0.8.6"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa"+checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f"[[package]]name = "core-graphics"@@ -408,9 +413,9 @@ dependencies = [[[package]]name = "core-graphics"-version = "0.23.1"+version = "0.23.2"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "970a29baf4110c26fedbc7f82107d42c23f7e88e404c4577ed73fe99ff85a212"+checksum = "c07782be35f9e1140080c6b96f0d44b739e2278479f64e02fdab4e32dfd8b081"dependencies = ["bitflags 1.3.2","core-foundation",@@ -421,9 +426,9 @@ dependencies = [[[package]]name = "core-graphics-types"-version = "0.1.2"+version = "0.1.3"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "2bb142d41022986c1d8ff29103a1411c8a3dfad3552f87a4f8dc50d61d4f4e33"+checksum = "45390e6114f68f718cc7a830514a96f903cccd70d02a8f6d9f643ac4ba45afaf"dependencies = ["bitflags 1.3.2","core-foundation",@@ -432,41 +437,56 @@ dependencies = [[[package]]name = "cpufeatures"-version = "0.2.9"+version = "0.2.12"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1"+checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504"dependencies = ["libc",][[package]]name = "crc32fast"-version = "1.3.2"+version = "1.4.2"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d"+checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3"dependencies = ["cfg-if",][[package]]name = "crossbeam-channel"-version = "0.5.8"+version = "0.5.13"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200"+checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2"dependencies = [- "cfg-if","crossbeam-utils",][[package]]-name = "crossbeam-utils"-version = "0.8.16"+name = "crossbeam-deque"+version = "0.8.5"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294"+checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d"dependencies = [- "cfg-if",+ "crossbeam-epoch",+ "crossbeam-utils",]+[[package]]+name = "crossbeam-epoch"+version = "0.9.18"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e"+dependencies = [+ "crossbeam-utils",+]++[[package]]+name = "crossbeam-utils"+version = "0.8.20"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80"+[[package]]name = "crypto-common"version = "0.1.6"@@ -501,24 +521,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331"dependencies = ["quote",- "syn 2.0.26",+ "syn 2.0.66",][[package]]name = "ctor"-version = "0.2.6"+version = "0.2.8"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "30d2b3721e861707777e3195b0158f950ae6dc4a27e4d02ff9f67e3eb3de199e"+checksum = "edb49164822f3ee45b17acd4a208cfc1251410cf0cad9a833234c9890774dd9f"dependencies = ["quote",- "syn 2.0.26",+ "syn 2.0.66",][[package]]name = "darling"-version = "0.20.3"+version = "0.20.9"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "0209d94da627ab5605dcccf08bb18afa5009cfbef48d8a8b7d7bdbc79be25c5e"+checksum = "83b2eb4d90d12bdda5ed17de686c2acb4c57914f8f921b8da7e112b5a36f3fe1"dependencies = ["darling_core","darling_macro",@@ -526,27 +546,50 @@ dependencies = [[[package]]name = "darling_core"-version = "0.20.3"+version = "0.20.9"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "177e3443818124b357d8e76f53be906d60937f0d3a90773a664fa63fa253e621"+checksum = "622687fe0bac72a04e5599029151f5796111b90f1baaa9b544d807a5e31cd120"dependencies = ["fnv","ident_case","proc-macro2","quote","strsim",- "syn 2.0.26",+ "syn 2.0.66",][[package]]name = "darling_macro"-version = "0.20.3"+version = "0.20.9"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5"+checksum = "733cabb43482b1a1b53eee8583c2b9e8684d592215ea83efd305dd31bc2f0178"dependencies = ["darling_core","quote",- "syn 2.0.26",+ "syn 2.0.66",+]++[[package]]+name = "dashmap"+version = "5.5.3"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856"+dependencies = [+ "cfg-if",+ "hashbrown 0.14.5",+ "lock_api",+ "once_cell",+ "parking_lot_core",+]++[[package]]+name = "deranged"+version = "0.3.11"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4"+dependencies = [+ "powerfmt",+ "serde",][[package]]@@ -643,15 +686,16 @@ checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b"[[package]]name = "embed-resource"-version = "2.2.0"+version = "2.4.2"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "f7f1e82a60222fc67bfd50d752a9c89da5cce4c39ed39decc84a443b07bbd69a"+checksum = "c6985554d0688b687c5cb73898a34fbe3ad6c24c58c238a4d91d5e840670ee9d"dependencies = ["cc",+ "memchr","rustc_version",- "toml 0.7.6",+ "toml 0.8.13","vswhom",- "winreg 0.11.0",+ "winreg 0.52.0",][[package]]@@ -662,9 +706,9 @@ checksum = "4ef6b89e5b37196644d8796de5268852ff179b44e96276cf4290264843743bb7"[[package]]name = "encoding_rs"-version = "0.8.32"+version = "0.8.34"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394"+checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59"dependencies = ["cfg-if",]@@ -677,39 +721,25 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"[[package]]name = "errno"-version = "0.3.1"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a"-dependencies = [- "errno-dragonfly",- "libc",- "windows-sys 0.48.0",-]--[[package]]-name = "errno-dragonfly"-version = "0.1.2"+version = "0.3.9"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf"+checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba"dependencies = [- "cc","libc",+ "windows-sys 0.52.0",][[package]]name = "fastrand"-version = "1.9.0"+version = "2.1.0"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be"-dependencies = [- "instant",-]+checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a"[[package]]name = "fdeflate"-version = "0.3.0"+version = "0.3.4"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "d329bdeac514ee06249dabc27877490f17f5d371ec693360768b838e19f3ae10"+checksum = "4f9bfee30e4dedf0ab8b422f03af778d9612b63f502710fc500a334ebe2de645"dependencies = ["simd-adler32",]@@ -726,21 +756,21 @@ dependencies = [[[package]]name = "filetime"-version = "0.2.21"+version = "0.2.23"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "5cbc844cecaee9d4443931972e1289c8ff485cb4cc2767cb03ca139ed6885153"+checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd"dependencies = ["cfg-if","libc",- "redox_syscall 0.2.16",- "windows-sys 0.48.0",+ "redox_syscall 0.4.1",+ "windows-sys 0.52.0",][[package]]name = "flate2"-version = "1.0.26"+version = "1.0.30"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743"+checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae"dependencies = ["crc32fast","miniz_oxide",@@ -779,7 +809,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742"dependencies = ["proc-macro2","quote",- "syn 2.0.26",+ "syn 2.0.66",][[package]]@@ -815,24 +845,24 @@ dependencies = [[[package]]name = "futures-channel"-version = "0.3.28"+version = "0.3.30"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2"+checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78"dependencies = ["futures-core",][[package]]name = "futures-core"-version = "0.3.28"+version = "0.3.30"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c"+checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d"[[package]]name = "futures-executor"-version = "0.3.28"+version = "0.3.30"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0"+checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d"dependencies = ["futures-core","futures-task",@@ -841,38 +871,38 @@ dependencies = [[[package]]name = "futures-io"-version = "0.3.28"+version = "0.3.30"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964"+checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1"[[package]]name = "futures-macro"-version = "0.3.28"+version = "0.3.30"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72"+checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"dependencies = ["proc-macro2","quote",- "syn 2.0.26",+ "syn 2.0.66",][[package]]name = "futures-sink"-version = "0.3.28"+version = "0.3.30"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e"+checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5"[[package]]name = "futures-task"-version = "0.3.28"+version = "0.3.30"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65"+checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004"[[package]]name = "futures-util"-version = "0.3.28"+version = "0.3.30"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533"+checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48"dependencies = ["futures-core","futures-io",@@ -933,7 +963,7 @@ dependencies = ["glib-sys","gobject-sys","libc",- "system-deps 6.1.1",+ "system-deps 6.2.2",][[package]]@@ -950,7 +980,7 @@ dependencies = ["libc","pango-sys","pkg-config",- "system-deps 6.1.1",+ "system-deps 6.2.2",][[package]]@@ -964,7 +994,7 @@ dependencies = ["gobject-sys","libc","pkg-config",- "system-deps 6.1.1",+ "system-deps 6.2.2",][[package]]@@ -976,7 +1006,7 @@ dependencies = ["gdk-sys","glib-sys","libc",- "system-deps 6.1.1",+ "system-deps 6.2.2","x11",]@@ -1016,9 +1046,9 @@ dependencies = [[[package]]name = "getrandom"-version = "0.2.10"+version = "0.2.15"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427"+checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"dependencies = ["cfg-if","libc",@@ -1027,9 +1057,9 @@ dependencies = [[[package]]name = "gimli"-version = "0.27.3"+version = "0.29.0"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e"+checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd"[[package]]name = "gio"@@ -1057,7 +1087,7 @@ dependencies = ["glib-sys","gobject-sys","libc",- "system-deps 6.1.1",+ "system-deps 6.2.2","winapi",]@@ -1103,7 +1133,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "ef4b192f8e65e9cf76cbf4ea71fa8e3be4a0e18ffe3d68b8da6836974cc5bad4"dependencies = ["libc",- "system-deps 6.1.1",+ "system-deps 6.2.2",][[package]]@@ -1114,15 +1144,15 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"[[package]]name = "globset"-version = "0.4.11"+version = "0.4.14"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "1391ab1f92ffcc08911957149833e682aa3fe252b9f45f966d2ef972274c97df"+checksum = "57da3b9b5b85bd66f31093f8c408b90a74431672542466497dcbdfdc02034be1"dependencies = ["aho-corasick","bstr",- "fnv","log",- "regex",+ "regex-automata 0.4.6",+ "regex-syntax 0.8.3",][[package]]@@ -1133,7 +1163,7 @@ checksum = "0d57ce44246becd17153bd035ab4d32cfee096a657fc01f2231c9278378d1e0a"dependencies = ["glib-sys","libc",- "system-deps 6.1.1",+ "system-deps 6.2.2",][[package]]@@ -1174,7 +1204,7 @@ dependencies = ["gobject-sys","libc","pango-sys",- "system-deps 6.1.1",+ "system-deps 6.2.2",][[package]]@@ -1193,9 +1223,9 @@ dependencies = [[[package]]name = "h2"-version = "0.3.21"+version = "0.3.26"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "91fc23aa11be92976ef4729127f1a74adf36d8436f7816b185d18df956790833"+checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8"dependencies = ["bytes","fnv",@@ -1203,7 +1233,7 @@ dependencies = ["futures-sink","futures-util","http",- "indexmap 1.9.3",+ "indexmap 2.2.6","slab","tokio","tokio-util",@@ -1218,9 +1248,9 @@ checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"[[package]]name = "hashbrown"-version = "0.14.0"+version = "0.14.5"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a"+checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"[[package]]name = "heck"@@ -1237,11 +1267,17 @@ version = "0.4.1"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"+[[package]]+name = "heck"+version = "0.5.0"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"+[[package]]name = "hermit-abi"-version = "0.3.2"+version = "0.3.9"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b"+checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"[[package]]name = "hex"@@ -1263,34 +1299,24 @@ name = "hoppscotch-desktop"version = "24.3.4"dependencies = ["cocoa 0.25.0",+ "dashmap","hex_color","objc","reqwest",+ "serde","serde_json","tauri","tauri-build","tauri-plugin-deep-link","tauri-plugin-store","tauri-plugin-window-state",+ "tokio",+ "tokio-util","url","windows 0.52.0","winver",]-[[package]]-name = "html5ever"-version = "0.25.2"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "e5c13fb08e5d4dfc151ee5e88bae63f7773d61852f3bdc73c9f4b9e1bde03148"-dependencies = [- "log",- "mac",- "markup5ever 0.10.1",- "proc-macro2",- "quote",- "syn 1.0.109",-]-[[package]]name = "html5ever"version = "0.26.0"@@ -1299,7 +1325,7 @@ checksum = "bea68cab48b8459f17cf1c944c67ddc572d272d9f2b274140f223ecb1da4a3b7"dependencies = ["log","mac",- "markup5ever 0.11.0",+ "markup5ever","proc-macro2","quote","syn 1.0.109",@@ -1307,20 +1333,20 @@ dependencies = [[[package]]name = "http"-version = "0.2.9"+version = "0.2.12"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482"+checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1"dependencies = ["bytes","fnv",- "itoa 1.0.9",+ "itoa 1.0.11",][[package]]name = "http-body"-version = "0.4.5"+version = "0.4.6"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1"+checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2"dependencies = ["bytes","http",@@ -1347,9 +1373,9 @@ checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9"[[package]]name = "hyper"-version = "0.14.27"+version = "0.14.28"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468"+checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80"dependencies = ["bytes","futures-channel",@@ -1360,7 +1386,7 @@ dependencies = ["http-body","httparse","httpdate",- "itoa 1.0.9",+ "itoa 1.0.11","pin-project-lite","socket2","tokio",@@ -1384,16 +1410,16 @@ dependencies = [[[package]]name = "iana-time-zone"-version = "0.1.57"+version = "0.1.60"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613"+checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141"dependencies = ["android_system_properties","core-foundation-sys","iana-time-zone-haiku","js-sys","wasm-bindgen",- "windows 0.48.0",+ "windows-core",][[package]]@@ -1433,31 +1459,29 @@ dependencies = [[[package]]name = "ignore"-version = "0.4.20"+version = "0.4.22"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "dbe7873dab538a9a44ad79ede1faf5f30d49f9a5c883ddbab48bce81b64b7492"+checksum = "b46810df39e66e925525d6e38ce1e7f6e1d208f72dc39757880fcb66e2c58af1"dependencies = [+ "crossbeam-deque","globset",- "lazy_static","log","memchr",- "regex",+ "regex-automata 0.4.6","same-file",- "thread_local","walkdir","winapi-util",][[package]]name = "image"-version = "0.24.6"+version = "0.24.9"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "527909aa81e20ac3a44803521443a765550f09b5130c2c2fa1ea59c2f8f50a3a"+checksum = "5690139d2f55868e080017335e4b94cb7414274c74f1669c84fb5feba2c9f69d"dependencies = ["bytemuck","byteorder","color_quant",- "num-rational","num-traits",]@@ -1474,12 +1498,13 @@ dependencies = [[[package]]name = "indexmap"-version = "2.0.0"+version = "2.2.6"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d"+checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26"dependencies = ["equivalent",- "hashbrown 0.14.0",+ "hashbrown 0.14.5",+ "serde",][[package]]@@ -1493,9 +1518,9 @@ dependencies = [[[package]]name = "instant"-version = "0.1.12"+version = "0.1.13"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c"+checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222"dependencies = ["cfg-if",]@@ -1513,22 +1538,11 @@ dependencies = ["winapi",]-[[package]]-name = "io-lifetimes"-version = "1.0.11"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2"-dependencies = [- "hermit-abi",- "libc",- "windows-sys 0.48.0",-]-[[package]]name = "ipnet"-version = "2.8.0"+version = "2.9.0"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "28b29a3cd74f0f4598934efe3aeba42bae0eb4680554128851ebbecb02af14e6"+checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3"[[package]]name = "itoa"@@ -1538,9 +1552,9 @@ checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4"[[package]]name = "itoa"-version = "1.0.9"+version = "1.0.11"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38"+checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"[[package]]name = "javascriptcore-rs"@@ -1587,35 +1601,22 @@ checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130"[[package]]name = "js-sys"-version = "0.3.64"+version = "0.3.69"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a"+checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d"dependencies = ["wasm-bindgen",][[package]]name = "json-patch"-version = "1.2.0"+version = "1.4.0"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "55ff1e1486799e3f64129f8ccad108b38290df9cd7015cd31bed17239f0789d6"+checksum = "ec9ad60d674508f3ca8f380a928cfe7b096bc729c4e2dbfe3852bc45da3ab30b"dependencies = ["serde","serde_json","thiserror",- "treediff",-]--[[package]]-name = "kuchiki"-version = "0.8.1"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "1ea8e9c6e031377cff82ee3001dc8026cdf431ed4e2e6b51f98ab8c73484a358"-dependencies = [- "cssparser",- "html5ever 0.25.2",- "matches",- "selectors",][[package]]@@ -1625,7 +1626,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "f29e4755b7b995046f510a7520c42b2fed58b77bd94d5a87a8eb43d2fd126da8"dependencies = ["cssparser",- "html5ever 0.26.0",+ "html5ever","indexmap 1.9.3","matches","selectors",@@ -1639,30 +1640,37 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"[[package]]name = "libc"-version = "0.2.147"+version = "0.2.155"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3"+checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"[[package]]-name = "line-wrap"-version = "0.1.1"+name = "libredox"+version = "0.1.3"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "f30344350a2a51da54c1d53be93fade8a237e545dbcc4bdbe635413f2117cab9"+checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d"dependencies = [- "safemem",+ "bitflags 2.5.0",+ "libc",]+[[package]]+name = "line-wrap"+version = "0.2.0"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "dd1bc4d24ad230d21fb898d1116b1801d7adfc449d42026475862ab48b11e70e"+[[package]]name = "linux-raw-sys"-version = "0.3.8"+version = "0.4.14"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519"+checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"[[package]]name = "lock_api"-version = "0.4.10"+version = "0.4.12"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16"+checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17"dependencies = ["autocfg","scopeguard",@@ -1670,9 +1678,9 @@ dependencies = [[[package]]name = "log"-version = "0.4.20"+version = "0.4.21"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f"+checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c"[[package]]name = "loom"@@ -1704,20 +1712,6 @@ dependencies = ["libc",]-[[package]]-name = "markup5ever"-version = "0.10.1"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "a24f40fb03852d1cdd84330cddcaf98e9ec08a7b7768e952fad3b4cf048ec8fd"-dependencies = [- "log",- "phf 0.8.0",- "phf_codegen 0.8.0",- "string_cache",- "string_cache_codegen",- "tendril",-]-[[package]]name = "markup5ever"version = "0.11.0"@@ -1749,15 +1743,15 @@ checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5"[[package]]name = "memchr"-version = "2.5.0"+version = "2.7.2"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"+checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d"[[package]]name = "memoffset"-version = "0.9.0"+version = "0.9.1"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c"+checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a"dependencies = ["autocfg",]@@ -1780,9 +1774,9 @@ dependencies = [[[package]]name = "miniz_oxide"-version = "0.7.1"+version = "0.7.3"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7"+checksum = "87dfd01fe195c66b572b37921ad8803d010623c0aca821bea2302239d155cdae"dependencies = ["adler","simd-adler32",@@ -1790,9 +1784,9 @@ dependencies = [[[package]]name = "mio"-version = "0.8.8"+version = "0.8.11"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2"+checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c"dependencies = ["libc","wasi 0.11.0+wasi-snapshot-preview1",@@ -1801,11 +1795,10 @@ dependencies = [[[package]]name = "native-tls"-version = "0.2.11"+version = "0.2.12"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e"+checksum = "a8614eb2c83d59d1c8cc974dd3f920198647674a0a035e1af1fa58707e317466"dependencies = [- "lazy_static","libc","log","openssl",@@ -1847,9 +1840,9 @@ dependencies = [[[package]]name = "new_debug_unreachable"-version = "1.0.4"+version = "1.0.6"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54"+checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086"[[package]]name = "nodrop"@@ -1868,31 +1861,16 @@ dependencies = [][[package]]-name = "num-integer"-version = "0.1.45"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9"-dependencies = [- "autocfg",- "num-traits",-]--[[package]]-name = "num-rational"-version = "0.4.1"+name = "num-conv"+version = "0.1.0"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0"-dependencies = [- "autocfg",- "num-integer",- "num-traits",-]+checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"[[package]]name = "num-traits"-version = "0.2.15"+version = "0.2.19"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd"+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"dependencies = ["autocfg",]@@ -1951,9 +1929,9 @@ dependencies = [[[package]]name = "objc-sys"-version = "0.3.1"+version = "0.3.5"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "99e1d07c6eab1ce8b6382b8e3c7246fe117ff3f8b34be065f5ebace6749fe845"+checksum = "cdb91bdd390c7ce1a8607f35f3ca7151b65afc0ff5ff3b34fa350f7d7c7e4310"[[package]]name = "objc2"@@ -1991,18 +1969,18 @@ dependencies = [[[package]]name = "object"-version = "0.31.1"+version = "0.35.0"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "8bda667d9f2b5051b8833f59f3bf748b28ef54f850f4fcb389a252aa383866d1"+checksum = "b8ec7ab813848ba4522158d5517a6093db1ded27575b070f4177b8d12b41db5e"dependencies = ["memchr",][[package]]name = "once_cell"-version = "1.18.0"+version = "1.19.0"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"[[package]]name = "open"@@ -2016,11 +1994,11 @@ dependencies = [[[package]]name = "openssl"-version = "0.10.57"+version = "0.10.64"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "bac25ee399abb46215765b1cb35bc0212377e58a061560d8b29b024fd0430e7c"+checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f"dependencies = [- "bitflags 2.4.0",+ "bitflags 2.5.0","cfg-if","foreign-types 0.3.2","libc",@@ -2037,7 +2015,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"dependencies = ["proc-macro2","quote",- "syn 2.0.26",+ "syn 2.0.66",][[package]]@@ -2048,9 +2026,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"[[package]]name = "openssl-sys"-version = "0.9.92"+version = "0.9.102"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "db7e971c2c2bba161b2d2fdf37080177eff520b3bc044787c7f1f5f9e78d869b"+checksum = "c597637d56fbc83893a35eb0dd04b2b8e7a50c91e64e9493e398b5df4fb45fa2"dependencies = ["cc","libc",@@ -2066,13 +2044,13 @@ checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d"[[package]]name = "os_info"-version = "3.7.0"+version = "3.8.2"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "006e42d5b888366f1880eda20371fedde764ed2213dc8496f49622fa0c99cd5e"+checksum = "ae99c7fa6dd38c7cafe1ec085e804f8f555a2f8659b0dbe03f1f9963a9b51092"dependencies = ["log","serde",- "winapi",+ "windows-sys 0.52.0",][[package]]@@ -2103,14 +2081,14 @@ dependencies = ["glib-sys","gobject-sys","libc",- "system-deps 6.1.1",+ "system-deps 6.2.2",][[package]]name = "parking_lot"-version = "0.12.1"+version = "0.12.3"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f"+checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27"dependencies = ["lock_api","parking_lot_core",@@ -2118,15 +2096,15 @@ dependencies = [[[package]]name = "parking_lot_core"-version = "0.9.8"+version = "0.9.10"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447"+checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"dependencies = ["cfg-if","libc",- "redox_syscall 0.3.5",+ "redox_syscall 0.5.1","smallvec",- "windows-targets 0.48.5",+ "windows-targets 0.52.5",][[package]]@@ -2245,7 +2223,7 @@ dependencies = ["phf_shared 0.11.2","proc-macro2","quote",- "syn 2.0.26",+ "syn 2.0.66",][[package]]@@ -2277,9 +2255,9 @@ dependencies = [[[package]]name = "pin-project-lite"-version = "0.2.10"+version = "0.2.14"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "4c40d25201921e5ff0c862a505c6557ea88568a4e3ace775ab55e93f2f4f9d57"+checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02"[[package]]name = "pin-utils"@@ -2289,18 +2267,18 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"[[package]]name = "pkg-config"-version = "0.3.27"+version = "0.3.30"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964"+checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec"[[package]]name = "plist"-version = "1.5.0"+version = "1.6.1"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "bdc0001cfea3db57a2e24bc0d818e9e20e554b5f97fabb9bc231dc240269ae06"+checksum = "d9d34169e64b3c7a80c8621a48adaf44e0cf62c78a9b25dd9dd35f1881a17cf9"dependencies = [- "base64 0.21.2",- "indexmap 1.9.3",+ "base64 0.21.7",+ "indexmap 2.2.6","line-wrap","quick-xml","serde",@@ -2309,9 +2287,9 @@ dependencies = [[[package]]name = "png"-version = "0.17.9"+version = "0.17.13"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "59871cc5b6cce7eaccca5a802b4173377a1c2ba90654246789a8fa2334426d11"+checksum = "06e4b0d3d1312775e782c86c91a111aa1f910cbb65e1337f9975b5f9a554b5e1"dependencies = ["bitflags 1.3.2","crc32fast",@@ -2320,6 +2298,12 @@ dependencies = ["miniz_oxide",]+[[package]]+name = "powerfmt"+version = "0.2.0"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"+[[package]]name = "ppv-lite86"version = "0.2.17"@@ -2339,7 +2323,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919"dependencies = ["once_cell",- "toml_edit",+ "toml_edit 0.19.15",][[package]]@@ -2374,27 +2358,27 @@ checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068"[[package]]name = "proc-macro2"-version = "1.0.66"+version = "1.0.84"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9"+checksum = "ec96c6a92621310b51366f1e28d05ef11489516e93be030060e5fc12024a49d6"dependencies = ["unicode-ident",][[package]]name = "quick-xml"-version = "0.29.0"+version = "0.31.0"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "81b9228215d82c7b61490fec1de287136b5de6f5700f6e58ea9ad61a7964ca51"+checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33"dependencies = ["memchr",][[package]]name = "quote"-version = "1.0.31"+version = "1.0.36"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "5fe8a65d69dd0808184ebb5f836ab526bb259db23c657efa38711b1072ee47f0"+checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"dependencies = ["proc-macro2",]@@ -2459,7 +2443,7 @@ version = "0.6.4"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"dependencies = [- "getrandom 0.2.10",+ "getrandom 0.2.15",][[package]]@@ -2488,43 +2472,43 @@ checksum = "f2ff9a1f06a88b01621b7ae906ef0211290d1c8a168a15542486a8f61c0833b9"[[package]]name = "redox_syscall"-version = "0.2.16"+version = "0.4.1"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a"+checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa"dependencies = ["bitflags 1.3.2",][[package]]name = "redox_syscall"-version = "0.3.5"+version = "0.5.1"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29"+checksum = "469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e"dependencies = [- "bitflags 1.3.2",+ "bitflags 2.5.0",][[package]]name = "redox_users"-version = "0.4.3"+version = "0.4.5"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b"+checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891"dependencies = [- "getrandom 0.2.10",- "redox_syscall 0.2.16",+ "getrandom 0.2.15",+ "libredox","thiserror",][[package]]name = "regex"-version = "1.9.1"+version = "1.10.4"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "b2eae68fc220f7cf2532e4494aded17545fce192d59cd996e0fe7887f4ceb575"+checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c"dependencies = ["aho-corasick","memchr",- "regex-automata 0.3.3",- "regex-syntax 0.7.4",+ "regex-automata 0.4.6",+ "regex-syntax 0.8.3",][[package]]@@ -2538,13 +2522,13 @@ dependencies = [[[package]]name = "regex-automata"-version = "0.3.3"+version = "0.4.6"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "39354c10dd07468c2e73926b23bb9c2caca74c5501e38a35da70406f1d923310"+checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea"dependencies = ["aho-corasick","memchr",- "regex-syntax 0.7.4",+ "regex-syntax 0.8.3",][[package]]@@ -2555,17 +2539,17 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"[[package]]name = "regex-syntax"-version = "0.7.4"+version = "0.8.3"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2"+checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56"[[package]]name = "reqwest"-version = "0.11.22"+version = "0.11.27"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "046cd98826c46c2ac8ddecae268eb5c2e58628688a5fc7a2643704a73faba95b"+checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62"dependencies = [- "base64 0.21.2",+ "base64 0.21.7","bytes","encoding_rs","futures-core",@@ -2584,9 +2568,11 @@ dependencies = ["once_cell","percent-encoding","pin-project-lite",+ "rustls-pemfile","serde","serde_json","serde_urlencoded",+ "sync_wrapper","system-configuration","tokio","tokio-native-tls",@@ -2626,9 +2612,9 @@ dependencies = [[[package]]name = "rustc-demangle"-version = "0.1.23"+version = "0.1.24"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76"+checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"[[package]]name = "rustc_version"@@ -2641,35 +2627,37 @@ dependencies = [[[package]]name = "rustix"-version = "0.37.23"+version = "0.38.34"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "4d69718bf81c6127a49dc64e44a742e8bb9213c0ff8869a22c308f84c1d4ab06"+checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f"dependencies = [- "bitflags 1.3.2",+ "bitflags 2.5.0","errno",- "io-lifetimes","libc","linux-raw-sys",- "windows-sys 0.48.0",+ "windows-sys 0.52.0",][[package]]-name = "rustversion"-version = "1.0.14"+name = "rustls-pemfile"+version = "1.0.4"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4"+checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c"+dependencies = [+ "base64 0.21.7",+][[package]]-name = "ryu"-version = "1.0.15"+name = "rustversion"+version = "1.0.17"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741"+checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6"[[package]]-name = "safemem"-version = "0.3.3"+name = "ryu"+version = "1.0.18"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072"+checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"[[package]]name = "same-file"@@ -2682,11 +2670,11 @@ dependencies = [[[package]]name = "schannel"-version = "0.1.22"+version = "0.1.23"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88"+checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534"dependencies = [- "windows-sys 0.48.0",+ "windows-sys 0.52.0",][[package]]@@ -2703,11 +2691,11 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"[[package]]name = "security-framework"-version = "2.9.2"+version = "2.11.0"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de"+checksum = "c627723fd09706bacdb5cf41499e95098555af3c3c29d014dc3c458ef6be11c0"dependencies = [- "bitflags 1.3.2",+ "bitflags 2.5.0","core-foundation","core-foundation-sys","libc",@@ -2716,9 +2704,9 @@ dependencies = [[[package]]name = "security-framework-sys"-version = "2.9.1"+version = "2.11.0"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a"+checksum = "317936bbbd05227752583946b9e66d7ce3b489f84e11a94a510b4437fef407d7"dependencies = ["core-foundation-sys","libc",@@ -2746,60 +2734,61 @@ dependencies = [[[package]]name = "semver"-version = "1.0.18"+version = "1.0.23"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918"+checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b"dependencies = ["serde",][[package]]name = "serde"-version = "1.0.171"+version = "1.0.203"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "30e27d1e4fd7659406c492fd6cfaf2066ba8773de45ca75e855590f856dc34a9"+checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094"dependencies = ["serde_derive",][[package]]name = "serde_derive"-version = "1.0.171"+version = "1.0.203"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "389894603bd18c46fa56231694f8d827779c0951a667087194cf9de94ed24682"+checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba"dependencies = ["proc-macro2","quote",- "syn 2.0.26",+ "syn 2.0.66",][[package]]name = "serde_json"-version = "1.0.108"+version = "1.0.117"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b"+checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3"dependencies = [- "itoa 1.0.9",+ "indexmap 2.2.6",+ "itoa 1.0.11","ryu","serde",][[package]]name = "serde_repr"-version = "0.1.14"+version = "0.1.19"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "1d89a8107374290037607734c0b73a85db7ed80cae314b3c5791f192a496e731"+checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9"dependencies = ["proc-macro2","quote",- "syn 2.0.26",+ "syn 2.0.66",][[package]]name = "serde_spanned"-version = "0.6.3"+version = "0.6.6"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "96426c9936fd7a0124915f9185ea1d20aa9445cc9821142f0a73bc9207a2e186"+checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0"dependencies = ["serde",]@@ -2811,22 +2800,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd"dependencies = ["form_urlencoded",- "itoa 1.0.9",+ "itoa 1.0.11","ryu","serde",][[package]]name = "serde_with"-version = "3.0.0"+version = "3.8.1"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "9f02d8aa6e3c385bf084924f660ce2a3a6bd333ba55b35e8590b321f35d88513"+checksum = "0ad483d2ab0149d5a5ebcd9972a3852711e0153d863bf5a5d0391d28883c4a20"dependencies = [- "base64 0.21.2",+ "base64 0.22.1","chrono","hex","indexmap 1.9.3",+ "indexmap 2.2.6","serde",+ "serde_derive","serde_json","serde_with_macros","time",@@ -2834,14 +2825,14 @@ dependencies = [[[package]]name = "serde_with_macros"-version = "3.0.0"+version = "3.8.1"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "edc7d5d3932fb12ce722ee5e64dd38c504efba37567f0c402f6ca728c3b8b070"+checksum = "65569b702f41443e8bc8bbb1c5779bd0450bbe723b56198980e80ec45780bce2"dependencies = ["darling","proc-macro2","quote",- "syn 2.0.26",+ "syn 2.0.66",][[package]]@@ -2878,9 +2869,9 @@ dependencies = [[[package]]name = "sha2"-version = "0.10.7"+version = "0.10.8"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "479fb9d862239e610720565ca91403019f2f00410f1864c5aa7479b950a76ed8"+checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8"dependencies = ["cfg-if","cpufeatures",@@ -2889,48 +2880,48 @@ dependencies = [[[package]]name = "sharded-slab"-version = "0.1.4"+version = "0.1.7"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31"+checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6"dependencies = ["lazy_static",][[package]]name = "simd-adler32"-version = "0.3.5"+version = "0.3.7"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "238abfbb77c1915110ad968465608b68e869e0772622c9656714e73e5a1a522f"+checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe"[[package]]name = "siphasher"-version = "0.3.10"+version = "0.3.11"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de"+checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d"[[package]]name = "slab"-version = "0.4.8"+version = "0.4.9"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d"+checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67"dependencies = ["autocfg",][[package]]name = "smallvec"-version = "1.11.0"+version = "1.13.2"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9"+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"[[package]]name = "socket2"-version = "0.4.9"+version = "0.5.7"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662"+checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c"dependencies = ["libc",- "winapi",+ "windows-sys 0.52.0",][[package]]@@ -3004,9 +2995,9 @@ dependencies = [[[package]]name = "strsim"-version = "0.10.0"+version = "0.11.1"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"+checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"[[package]]name = "syn"@@ -3021,15 +3012,21 @@ dependencies = [[[package]]name = "syn"-version = "2.0.26"+version = "2.0.66"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "45c3457aacde3c65315de5031ec191ce46604304d2446e803d71ade03308d970"+checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5"dependencies = ["proc-macro2","quote","unicode-ident",]+[[package]]+name = "sync_wrapper"+version = "0.1.2"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160"+[[package]]name = "sys-locale"version = "0.2.4"@@ -3079,22 +3076,22 @@ dependencies = [[[package]]name = "system-deps"-version = "6.1.1"+version = "6.2.2"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "30c2de8a4d8f4b823d634affc9cd2a74ec98c53a756f317e529a48046cbf71f3"+checksum = "a3e535eb8dded36d55ec13eddacd30dec501792ff23a0b1682c38601b8cf2349"dependencies = [- "cfg-expr 0.15.3",- "heck 0.4.1",+ "cfg-expr 0.15.8",+ "heck 0.5.0","pkg-config",- "toml 0.7.6",- "version-compare 0.1.1",+ "toml 0.8.13",+ "version-compare 0.2.0",][[package]]name = "tao"-version = "0.16.2"+version = "0.16.9"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "6a6d198e01085564cea63e976ad1566c1ba2c2e4cc79578e35d9f05521505e31"+checksum = "575c856fc21e551074869dcfaad8f706412bd5b803dfa0fbf6881c4ff4bfafab"dependencies = ["bitflags 1.3.2","cairo-rs",@@ -3139,9 +3136,9 @@ dependencies = [[[package]]name = "tao-macros"-version = "0.1.1"+version = "0.1.2"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "3b27a4bcc5eb524658234589bdffc7e7bfb996dbae6ce9393bfd39cb4159b445"+checksum = "ec114582505d158b669b136e6851f85840c109819d77c42bb7c0709f727d18c2"dependencies = ["proc-macro2","quote",@@ -3150,9 +3147,9 @@ dependencies = [[[package]]name = "tar"-version = "0.4.39"+version = "0.4.40"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "ec96d2ffad078296368d46ff1cb309be1c23c513b4ab0e22a45de0185275ac96"+checksum = "b16afcea1f22891c49a00c751c7b63b2233284064f11a200fc624137c51e2ddb"dependencies = ["filetime","libc",@@ -3161,30 +3158,33 @@ dependencies = [[[package]]name = "target-lexicon"-version = "0.12.9"+version = "0.12.14"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "df8e77cb757a61f51b947ec4a7e3646efd825b73561db1c232a8ccb639e611a0"+checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f"[[package]]name = "tauri"-version = "1.5.3"+version = "1.6.7"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "32d563b672acde8d0cc4c1b1f5b855976923f67e8d6fe1eba51df0211e197be2"+checksum = "67c7177b6be45bbb875aa239578f5adc982a1b3d5ea5b315ccd100aeb0043374"dependencies = ["anyhow","bytes","cocoa 0.24.1","dirs-next",+ "dunce","embed_plist","encoding_rs","flate2","futures-util",+ "getrandom 0.2.15","glib","glob","gtk",- "heck 0.4.1",+ "heck 0.5.0","http","ignore",+ "indexmap 1.9.3","objc","once_cell","open",@@ -3219,14 +3219,14 @@ dependencies = [[[package]]name = "tauri-build"-version = "1.5.0"+version = "1.5.2"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "defbfc551bd38ab997e5f8e458f87396d2559d05ce32095076ad6c30f7fc5f9c"+checksum = "ab30cba12974d0f9b09794f61e72cad6da2142d3ceb81e519321bab86ce53312"dependencies = ["anyhow","cargo_toml","dirs-next",- "heck 0.4.1",+ "heck 0.5.0","json-patch","semver","serde",@@ -3238,11 +3238,11 @@ dependencies = [[[package]]name = "tauri-codegen"-version = "1.4.1"+version = "1.4.3"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "7b3475e55acec0b4a50fb96435f19631fb58cbcd31923e1a213de5c382536bbb"+checksum = "c3a1d90db526a8cdfd54444ad3f34d8d4d58fa5c536463915942393743bd06f8"dependencies = [- "base64 0.21.2",+ "base64 0.21.7","brotli","ico","json-patch",@@ -3264,11 +3264,11 @@ dependencies = [[[package]]name = "tauri-macros"-version = "1.4.2"+version = "1.4.4"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "acea6445eececebd72ed7720cfcca46eee3b5bad8eb408be8f7ef2e3f7411500"+checksum = "6a582d75414250122e4a597b9dd7d3c910a2c77906648fc2ac9353845ff0feec"dependencies = [- "heck 0.4.1",+ "heck 0.5.0","proc-macro2","quote","syn 1.0.109",@@ -3279,7 +3279,7 @@ dependencies = [[[package]]name = "tauri-plugin-deep-link"version = "0.1.2"-source = "git+https://github.com/FabianLars/tauri-plugin-deep-link?branch=main#0c28b75ac663b4ba0fb1f0d1ea4220f82a583764"+source = "git+https://github.com/FabianLars/tauri-plugin-deep-link?branch=main#1aa5c3d01dfadfe6495673bb8767a913198da279"dependencies = ["dirs","interprocess",@@ -3287,14 +3287,14 @@ dependencies = ["objc2","once_cell","tauri-utils",- "windows-sys 0.48.0",- "winreg 0.50.0",+ "windows-sys 0.52.0",+ "winreg 0.52.0",][[package]]name = "tauri-plugin-store"version = "0.0.0"-source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v1#5b814f56e6368fdec46c4ddb04a07e0923ff995a"+source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v1#5e3900e682e13f3759b439116ae2f77a6d389ca2"dependencies = ["log","serde",@@ -3305,21 +3305,24 @@ dependencies = [[[package]]name = "tauri-plugin-window-state"-version = "0.1.0"+version = "0.1.1"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "2f15dab0be2ce3ce8a57d0d2de17d201d0c2f3230d68981ff3f0942684de03eb"+checksum = "fa47eaa4047a7b51064caff32f0c6282e2c5adc6ceacdd493ecf1b01fa4b0eaa"dependencies = ["bincode",+ "bitflags 2.5.0",+ "log","serde",+ "serde_json","tauri","thiserror",][[package]]name = "tauri-runtime"-version = "0.14.1"+version = "0.14.3"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "07f8e9e53e00e9f41212c115749e87d5cd2a9eebccafca77a19722eeecd56d43"+checksum = "cd7ffddf36d450791018e63a3ddf54979b9581d9644c584a5fb5611e6b5f20b4"dependencies = ["gtk","http",@@ -3338,9 +3341,9 @@ dependencies = [[[package]]name = "tauri-runtime-wry"-version = "0.14.2"+version = "0.14.8"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "803a01101bc611ba03e13329951a1bde44287a54234189b9024b78619c1bc206"+checksum = "1989b3b4d611f5428b3414a4abae6fa6df30c7eb8ed33250ca90a5f7e5bb3655"dependencies = ["cocoa 0.24.1","gtk",@@ -3358,16 +3361,16 @@ dependencies = [[[package]]name = "tauri-utils"-version = "1.5.1"+version = "1.5.4"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "a52165bb340e6f6a75f1f5eeeab1bb49f861c12abe3a176067d53642b5454986"+checksum = "450b17a7102e5d46d4bdabae0d1590fd27953e704e691fc081f06c06d2253b35"dependencies = ["brotli","ctor","dunce","glob",- "heck 0.4.1",- "html5ever 0.26.0",+ "heck 0.5.0",+ "html5ever","infer","json-patch","kuchikiki",@@ -3393,21 +3396,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "5993dc129e544393574288923d1ec447c857f3f644187f4fbf7d9a875fbfc4fb"dependencies = ["embed-resource",- "toml 0.7.6",+ "toml 0.7.8",][[package]]name = "tempfile"-version = "3.6.0"+version = "3.10.1"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "31c0432476357e58790aaa47a8efb0c5138f137343f3b5f23bd36a27e3b0a6d6"+checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1"dependencies = [- "autocfg","cfg-if","fastrand",- "redox_syscall 0.3.5","rustix",- "windows-sys 0.48.0",+ "windows-sys 0.52.0",][[package]]@@ -3429,29 +3430,29 @@ checksum = "8eaa81235c7058867fa8c0e7314f33dcce9c215f535d1913822a2b3f5e289f3c"[[package]]name = "thiserror"-version = "1.0.43"+version = "1.0.61"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "a35fc5b8971143ca348fa6df4f024d4d55264f3468c71ad1c2f365b0a4d58c42"+checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709"dependencies = ["thiserror-impl",][[package]]name = "thiserror-impl"-version = "1.0.43"+version = "1.0.61"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "463fe12d7993d3b327787537ce8dd4dfa058de32fc2b195ef3cde03dc4771e8f"+checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533"dependencies = ["proc-macro2","quote",- "syn 2.0.26",+ "syn 2.0.66",][[package]]name = "thread_local"-version = "1.1.7"+version = "1.1.8"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152"+checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c"dependencies = ["cfg-if","once_cell",@@ -3459,11 +3460,14 @@ dependencies = [[[package]]name = "time"-version = "0.3.23"+version = "0.3.36"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "59e399c068f43a5d116fedaf73b203fa4f9c519f17e2b34f63221d3792f81446"+checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885"dependencies = [- "itoa 1.0.9",+ "deranged",+ "itoa 1.0.11",+ "num-conv",+ "powerfmt","serde","time-core","time-macros",@@ -3471,16 +3475,17 @@ dependencies = [[[package]]name = "time-core"-version = "0.1.1"+version = "0.1.2"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb"+checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"[[package]]name = "time-macros"-version = "0.2.10"+version = "0.2.18"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "96ba15a897f3c86766b757e5ac7221554c6750054d74d5b28844fce5fb36a6c4"+checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf"dependencies = [+ "num-conv","time-core",]@@ -3507,11 +3512,10 @@ checksum = "c7c4ceeeca15c8384bbc3e011dbd8fccb7f068a440b752b7d9b32ceb0ca0e2e8"[[package]]name = "tokio"-version = "1.29.1"+version = "1.38.0"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "532826ff75199d5833b9d2c5fe410f29235e25704ee5f0ef599fb51c21f4a4da"+checksum = "ba4f4a02a7a80d6f274636f0aa95c7e383b912d41fe721a31f29e29698585a4a"dependencies = [- "autocfg","backtrace","bytes","libc",@@ -3519,9 +3523,21 @@ dependencies = ["num_cpus","pin-project-lite","socket2",+ "tokio-macros","windows-sys 0.48.0",]+[[package]]+name = "tokio-macros"+version = "2.3.0"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a"+dependencies = [+ "proc-macro2",+ "quote",+ "syn 2.0.66",+]+[[package]]name = "tokio-native-tls"version = "0.3.1"@@ -3534,16 +3550,15 @@ dependencies = [[[package]]name = "tokio-util"-version = "0.7.8"+version = "0.7.11"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d"+checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1"dependencies = ["bytes","futures-core","futures-sink","pin-project-lite","tokio",- "tracing",][[package]]@@ -3557,36 +3572,61 @@ dependencies = [[[package]]name = "toml"-version = "0.7.6"+version = "0.7.8"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "c17e963a819c331dcacd7ab957d80bc2b9a9c1e71c804826d2f283dd65306542"+checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257"dependencies = ["serde","serde_spanned","toml_datetime",- "toml_edit",+ "toml_edit 0.19.15",+]++[[package]]+name = "toml"+version = "0.8.13"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "a4e43f8cc456c9704c851ae29c67e17ef65d2c30017c17a9765b89c382dc8bba"+dependencies = [+ "serde",+ "serde_spanned",+ "toml_datetime",+ "toml_edit 0.22.13",][[package]]name = "toml_datetime"-version = "0.6.3"+version = "0.6.6"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf"+dependencies = [+ "serde",+]++[[package]]+name = "toml_edit"+version = "0.19.15"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b"+checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"dependencies = [+ "indexmap 2.2.6","serde",+ "serde_spanned",+ "toml_datetime",+ "winnow 0.5.40",][[package]]name = "toml_edit"-version = "0.19.14"+version = "0.22.13"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "f8123f27e969974a3dfba720fdb560be359f57b44302d280ba72e76a74480e8a"+checksum = "c127785850e8c20836d49732ae6abfa47616e60bf9d9f57c43c250361a9db96c"dependencies = [- "indexmap 2.0.0",+ "indexmap 2.2.6","serde","serde_spanned","toml_datetime",- "winnow",+ "winnow 0.6.9",][[package]]@@ -3597,11 +3637,10 @@ checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52"[[package]]name = "tracing"-version = "0.1.37"+version = "0.1.40"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8"+checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef"dependencies = [- "cfg-if","pin-project-lite","tracing-attributes","tracing-core",@@ -3609,20 +3648,20 @@ dependencies = [[[package]]name = "tracing-attributes"-version = "0.1.26"+version = "0.1.27"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab"+checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"dependencies = ["proc-macro2","quote",- "syn 2.0.26",+ "syn 2.0.66",][[package]]name = "tracing-core"-version = "0.1.31"+version = "0.1.32"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a"+checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54"dependencies = ["once_cell","valuable",@@ -3630,20 +3669,20 @@ dependencies = [[[package]]name = "tracing-log"-version = "0.1.3"+version = "0.2.0"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922"+checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3"dependencies = [- "lazy_static","log",+ "once_cell","tracing-core",][[package]]name = "tracing-subscriber"-version = "0.3.17"+version = "0.3.18"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77"+checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b"dependencies = ["matchers","nu-ansi-term",@@ -3657,62 +3696,53 @@ dependencies = ["tracing-log",]-[[package]]-name = "treediff"-version = "4.0.2"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "52984d277bdf2a751072b5df30ec0377febdb02f7696d64c2d7d54630bac4303"-dependencies = [- "serde_json",-]-[[package]]name = "try-lock"-version = "0.2.4"+version = "0.2.5"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed"+checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"[[package]]name = "typenum"-version = "1.16.0"+version = "1.17.0"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba"+checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"[[package]]name = "unicase"-version = "2.6.0"+version = "2.7.0"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6"+checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89"dependencies = ["version_check",][[package]]name = "unicode-bidi"-version = "0.3.13"+version = "0.3.15"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460"+checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75"[[package]]name = "unicode-ident"-version = "1.0.11"+version = "1.0.12"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c"+checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"[[package]]name = "unicode-normalization"-version = "0.1.22"+version = "0.1.23"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921"+checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5"dependencies = ["tinyvec",][[package]]name = "unicode-segmentation"-version = "1.10.1"+version = "1.11.0"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36"+checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202"[[package]]name = "url"@@ -3734,11 +3764,11 @@ checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9"[[package]]name = "uuid"-version = "1.4.1"+version = "1.8.0"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "79daa5ed5740825c40b389c5e50312b9c86df53fccd33f281df655642b43869d"+checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0"dependencies = [- "getrandom 0.2.10",+ "getrandom 0.2.15",][[package]]@@ -3761,9 +3791,9 @@ checksum = "1c18c859eead79d8b95d09e4678566e8d70105c4e7b251f707a03df32442661b"[[package]]name = "version-compare"-version = "0.1.1"+version = "0.2.0"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "579a42fc0b8e0c63b76519a339be31bed574929511fa53c1a3acae26eb258f29"+checksum = "852e951cb7832cb45cb1169900d19760cfa39b82bc0ea9c0e5a14ae88411c98b"[[package]]name = "version_check"@@ -3793,9 +3823,9 @@ dependencies = [[[package]]name = "walkdir"-version = "2.3.3"+version = "2.5.0"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698"+checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b"dependencies = ["same-file","winapi-util",@@ -3824,9 +3854,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"[[package]]name = "wasm-bindgen"-version = "0.2.87"+version = "0.2.92"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342"+checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8"dependencies = ["cfg-if","wasm-bindgen-macro",@@ -3834,24 +3864,24 @@ dependencies = [[[package]]name = "wasm-bindgen-backend"-version = "0.2.87"+version = "0.2.92"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd"+checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da"dependencies = ["bumpalo","log","once_cell","proc-macro2","quote",- "syn 2.0.26",+ "syn 2.0.66","wasm-bindgen-shared",][[package]]name = "wasm-bindgen-futures"-version = "0.4.37"+version = "0.4.42"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "c02dbc21516f9f1f04f187958890d7e6026df8d16540b7ad9492bc34a67cea03"+checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0"dependencies = ["cfg-if","js-sys",@@ -3861,9 +3891,9 @@ dependencies = [[[package]]name = "wasm-bindgen-macro"-version = "0.2.87"+version = "0.2.92"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d"+checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726"dependencies = ["quote","wasm-bindgen-macro-support",@@ -3871,28 +3901,28 @@ dependencies = [[[package]]name = "wasm-bindgen-macro-support"-version = "0.2.87"+version = "0.2.92"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b"+checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"dependencies = ["proc-macro2","quote",- "syn 2.0.26",+ "syn 2.0.66","wasm-bindgen-backend","wasm-bindgen-shared",][[package]]name = "wasm-bindgen-shared"-version = "0.2.87"+version = "0.2.92"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1"+checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96"[[package]]name = "wasm-streams"-version = "0.3.0"+version = "0.4.0"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "b4609d447824375f43e1ffbc051b50ad8f4b3ae8219680c94452ea05eb240ac7"+checksum = "b65dc4c90b63b118468cf747d8bf3566c1913ef60be765b5730ead9e0a3ba129"dependencies = ["futures-util","js-sys",@@ -3903,9 +3933,9 @@ dependencies = [[[package]]name = "web-sys"-version = "0.3.64"+version = "0.3.69"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b"+checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef"dependencies = ["js-sys","wasm-bindgen",@@ -3955,7 +3985,7 @@ dependencies = ["pango-sys","pkg-config","soup2-sys",- "system-deps 6.1.1",+ "system-deps 6.2.2",][[package]]@@ -4014,11 +4044,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"[[package]]name = "winapi-util"-version = "0.1.5"+version = "0.1.8"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"+checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b"dependencies = [- "winapi",+ "windows-sys 0.52.0",][[package]]@@ -4070,7 +4100,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be"dependencies = ["windows-core",- "windows-targets 0.52.0",+ "windows-targets 0.52.5",][[package]]@@ -4089,7 +4119,7 @@ version = "0.52.0"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"dependencies = [- "windows-targets 0.52.0",+ "windows-targets 0.52.5",][[package]]@@ -4141,6 +4171,15 @@ dependencies = ["windows-targets 0.48.5",]+[[package]]+name = "windows-sys"+version = "0.52.0"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"+dependencies = [+ "windows-targets 0.52.5",+]+[[package]]name = "windows-targets"version = "0.42.2"@@ -4173,17 +4212,18 @@ dependencies = [[[package]]name = "windows-targets"-version = "0.52.0"+version = "0.52.5"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd"+checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb"dependencies = [- "windows_aarch64_gnullvm 0.52.0",- "windows_aarch64_msvc 0.52.0",- "windows_i686_gnu 0.52.0",- "windows_i686_msvc 0.52.0",- "windows_x86_64_gnu 0.52.0",- "windows_x86_64_gnullvm 0.52.0",- "windows_x86_64_msvc 0.52.0",+ "windows_aarch64_gnullvm 0.52.5",+ "windows_aarch64_msvc 0.52.5",+ "windows_i686_gnu 0.52.5",+ "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",][[package]]@@ -4194,11 +4234,11 @@ checksum = "f838de2fe15fe6bac988e74b798f26499a8b21a9d97edec321e79b28d1d7f597"[[package]]name = "windows-version"-version = "0.1.0"+version = "0.1.1"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "75aa004c988e080ad34aff5739c39d0312f4684699d6d71fc8a198d057b8b9b4"+checksum = "6998aa457c9ba8ff2fb9f13e9d2a930dabcea28f1d0ab94d687d8b3654844515"dependencies = [- "windows-targets 0.52.0",+ "windows-targets 0.52.5",][[package]]@@ -4215,9 +4255,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"[[package]]name = "windows_aarch64_gnullvm"-version = "0.52.0"+version = "0.52.5"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea"+checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263"[[package]]name = "windows_aarch64_msvc"@@ -4245,9 +4285,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"[[package]]name = "windows_aarch64_msvc"-version = "0.52.0"+version = "0.52.5"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef"+checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6"[[package]]name = "windows_i686_gnu"@@ -4275,9 +4315,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"[[package]]name = "windows_i686_gnu"-version = "0.52.0"+version = "0.52.5"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670"++[[package]]+name = "windows_i686_gnullvm"+version = "0.52.5"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313"+checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9"[[package]]name = "windows_i686_msvc"@@ -4305,9 +4351,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"[[package]]name = "windows_i686_msvc"-version = "0.52.0"+version = "0.52.5"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a"+checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf"[[package]]name = "windows_x86_64_gnu"@@ -4335,9 +4381,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"[[package]]name = "windows_x86_64_gnu"-version = "0.52.0"+version = "0.52.5"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd"+checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9"[[package]]name = "windows_x86_64_gnullvm"@@ -4353,9 +4399,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"[[package]]name = "windows_x86_64_gnullvm"-version = "0.52.0"+version = "0.52.5"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e"+checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596"[[package]]name = "windows_x86_64_msvc"@@ -4383,27 +4429,26 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"[[package]]name = "windows_x86_64_msvc"-version = "0.52.0"+version = "0.52.5"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04"+checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0"[[package]]name = "winnow"-version = "0.5.0"+version = "0.5.40"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "81fac9742fd1ad1bd9643b991319f72dd031016d44b77039a26977eb667141e7"+checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876"dependencies = ["memchr",][[package]]-name = "winreg"-version = "0.11.0"+name = "winnow"+version = "0.6.9"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "76a1a57ff50e9b408431e8f97d5456f2807f8eb2a2cd79b06068fc87f8ecf189"+checksum = "86c949fede1d13936a99f14fafd3e76fd642b556dd2ce96287fbe2e0151bfac6"dependencies = [- "cfg-if",- "winapi",+ "memchr",][[package]]@@ -4416,6 +4461,16 @@ dependencies = ["windows-sys 0.48.0",]+[[package]]+name = "winreg"+version = "0.52.0"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5"+dependencies = [+ "cfg-if",+ "windows-sys 0.48.0",+]+[[package]]name = "winver"version = "1.0.0"@@ -4427,9 +4482,9 @@ dependencies = [[[package]]name = "wry"-version = "0.24.6"+version = "0.24.10"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "64a70547e8f9d85da0f5af609143f7bde3ac7457a6e1073104d9b73d6c5ac744"+checksum = "00711278ed357350d44c749c286786ecac644e044e4da410d466212152383b45"dependencies = ["base64 0.13.1","block",@@ -4441,9 +4496,9 @@ dependencies = ["gio","glib","gtk",- "html5ever 0.25.2",+ "html5ever","http",- "kuchiki",+ "kuchikiki","libc","log","objc",@@ -4486,9 +4541,11 @@ dependencies = [[[package]]name = "xattr"-version = "0.2.3"+version = "1.3.1"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "6d1526bbe5aaeb5eb06885f4d987bcdfa5e23187055de9b83fe00156a821fabc"+checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f"dependencies = ["libc",+ "linux-raw-sys",+ "rustix",]diff --git a/packages/hoppscotch-selfhost-desktop/src-tauri/Cargo.toml b/packages/hoppscotch-selfhost-desktop/src-tauri/Cargo.tomlindex 5a841c4a8..6a1f0667e 100644--- a/packages/hoppscotch-selfhost-desktop/src-tauri/Cargo.toml+++ b/packages/hoppscotch-selfhost-desktop/src-tauri/Cargo.toml@@ -26,10 +26,14 @@ tauri = { version = "1.5.3", 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.0"-reqwest = "0.11.22"+reqwest = { version = "0.11.22", features = ["native-tls"] }serde_json = "1.0.108"url = "2.5.0"hex_color = "3.0.0"+serde = { version = "1.0.203", features = ["derive"] }+dashmap = "5.5.3"+tokio = { version = "1.38.0", features = ["macros"] }+tokio-util = "0.7.11"[target.'cfg(target_os = "macos")'.dependencies]cocoa = "0.25.0"diff --git a/packages/hoppscotch-selfhost-desktop/src-tauri/src/interceptor.rs b/packages/hoppscotch-selfhost-desktop/src-tauri/src/interceptor.rsnew file mode 100644index 000000000..0528dccef--- /dev/null+++ b/packages/hoppscotch-selfhost-desktop/src-tauri/src/interceptor.rs@@ -0,0 +1,318 @@+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 tokio_util::sync::CancellationToken;++#[derive(Default)]+struct InterceptorState {+ 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>+ }+}++#[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 } =>+ form.part(+ entry.key.clone(),+ reqwest::multipart::Part::bytes(data.clone())+ .file_name(filename.clone())+ ),+ }+ }++ 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+ }+ )+}++#[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);++ Some(result)+ }+ };++ result+ .unwrap_or(Err(RunRequestError::RequestCancelled))+}++#[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();+ }+}++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()+}diff --git a/packages/hoppscotch-selfhost-desktop/src-tauri/src/main.rs b/packages/hoppscotch-selfhost-desktop/src-tauri/src/main.rsindex 34171068b..1c280b9a1 100644--- a/packages/hoppscotch-selfhost-desktop/src-tauri/src/main.rs+++ b/packages/hoppscotch-selfhost-desktop/src-tauri/src/main.rs@@ -15,6 +15,8 @@ mod mac;#[cfg(target_os = "windows")]mod win;+mod interceptor;+use tauri::Manager;fn main() {@@ -23,6 +25,7 @@ fn main() {tauri::Builder::default().plugin(tauri_plugin_window_state::Builder::default().build()).plugin(tauri_plugin_store::Builder::default().build())+ .plugin(interceptor::init()).setup(|app| {if cfg!(target_os = "macos") {#[cfg(target_os = "macos")]diff --git a/packages/hoppscotch-selfhost-desktop/src/components/modals/NativeCACertificates.vue b/packages/hoppscotch-selfhost-desktop/src/components/modals/NativeCACertificates.vuenew file mode 100644index 000000000..60993ed59--- /dev/null+++ b/packages/hoppscotch-selfhost-desktop/src/components/modals/NativeCACertificates.vue@@ -0,0 +1,167 @@+<template>+ <HoppSmartModal+ v-if="show"+ dialog+ :title="'CA Certificates'"+ @close="emit('hide-modal')"+ >+ <template #body>+ <div class="flex flex-col space-y-4">+ <ul+ v-if="certificates.length > 0"+ class="mx-4 border border-dividerDark rounded"+ >+ <li+ v-for="(certificate, index) in certificates"+ :key="index"+ class="flex border-dividerDark px-2 items-center justify-between"+ :class="{ 'border-t border-dividerDark': index !== 0 }"+ >+ <div class="truncate">+ {{ certificate.filename }}+ </div>++ <div class="flex items-center">+ <HoppButtonSecondary+ :icon="certificate.enabled ? IconCheckCircle : IconCircle"+ v-tippy="{ theme: 'tooltip' }"+ :title="+ certificate.enabled+ ? t('action.turn_off')+ : t('action.turn_on')+ "+ color="green"+ @click="toggleEntryEnabled(index)"+ />++ <HoppButtonSecondary+ :icon="IconTrash"+ v-tippy="{ theme: 'tooltip' }"+ :title="t('action.remove')"+ @click="deleteEntry(index)"+ />+ </div>+ </li>+ </ul>++ <HoppButtonSecondary+ class="mx-4"+ :icon="IconPlus"+ :label="'Add Certifcate File'"+ :loading="selectedFiles && selectedFiles!.length > 0"+ filled+ outline+ @click="openFilePicker"+ />++ <p class="text-center text-secondaryLight">+ Hoppscotch supports .crt, .cer or .pem files containing one or more+ certificates.+ </p>+ </div>+ </template>++ <template #footer>+ <div class="flex space-x-2">+ <HoppButtonPrimary :label="'Save'" @click="save" />+ <HoppButtonSecondary+ :label="'Cancel'"+ filled+ outline+ @click="emit('hide-modal')"+ />+ </div>+ </template>+ </HoppSmartModal>+</template>++<!-- TODO: i18n -->+<script setup lang="ts">+import IconPlus from "~icons/lucide/plus"+import IconCheckCircle from "~icons/lucide/check-circle"+import IconCircle from "~icons/lucide/circle"+import IconTrash from "~icons/lucide/trash"+import { useService } from "dioc/vue"+import { ref, watch } from "vue"+import { useFileDialog } from "@vueuse/core"+import { cloneDeep } from "lodash-es"+import {+ NativeInterceptorService,+ CACertificateEntry,+} from "@platform/interceptors/native"+import { useI18n } from "@composables/i18n"++const t = useI18n()++const props = defineProps<{+ show: boolean+}>()++const emit = defineEmits<{+ (e: "hide-modal"): void+}>()++const nativeInterceptorService = useService(NativeInterceptorService)++const certificates = ref<CACertificateEntry[]>([])++const {+ files: selectedFiles,+ open: openFilePicker,+ reset: resetFilePicker,+ onChange: onSelectedFilesChange,+} = useFileDialog({+ multiple: true,+})++// When files are selected, add them to the list of certificates and reset the file list+onSelectedFilesChange(async (files) => {+ if (files) {+ const addedCertificates: CACertificateEntry[] = []++ for (let i = 0; i < files.length; i++) {+ const file = files[i]++ const data = new Uint8Array(await file.arrayBuffer())++ addedCertificates.push({+ filename: file.name,+ enabled: true,+ certificate: data,+ })+ }++ certificates.value.push(...addedCertificates)++ resetFilePicker()+ }+})++// When the modal is shown, clone the certificates from the service,+// We only write to the service when the user clicks on save+watch(+ () => props.show,+ (show) => {+ if (show) {+ certificates.value = cloneDeep(+ nativeInterceptorService.caCertificates.value+ )+ } else {+ resetFilePicker()+ }+ }+)++function save() {+ nativeInterceptorService.caCertificates.value = certificates.value+ emit("hide-modal")+}++function deleteEntry(index: number) {+ certificates.value.splice(index, 1)+}++function toggleEntryEnabled(index: number) {+ certificates.value[index].enabled = !certificates.value[index].enabled+}+</script>diff --git a/packages/hoppscotch-selfhost-desktop/src/components/modals/NativeClientCertificates.vue b/packages/hoppscotch-selfhost-desktop/src/components/modals/NativeClientCertificates.vuenew file mode 100644index 000000000..c731bf36a--- /dev/null+++ b/packages/hoppscotch-selfhost-desktop/src/components/modals/NativeClientCertificates.vue@@ -0,0 +1,153 @@+<template>+ <HoppSmartModal+ v-if="show"+ dialog+ :title="'Client Certificates'"+ @close="emit('hide-modal')"+ >+ <template #body>+ <div class="flex flex-col space-y-4">+ <ul+ v-if="certificateMap.size > 0"+ class="mx-4 border border-dividerDark rounded"+ >+ <li+ v-for="([domain, certificate], index) in certificateMap"+ :key="domain"+ class="flex border-dividerDark px-2 items-center justify-between"+ :class="{ 'border-t border-dividerDark': index !== 0 }"+ >+ <div class="flex space-x-2">+ <div class="truncate">+ {{ domain }}+ </div>+ </div>++ <div class="flex items-center space-x-1">+ <div class="text-secondaryLight mr-2">+ {{ "PEMCert" in certificate.cert ? "PEM" : "PFX/PKCS12" }}+ </div>++ <HoppButtonSecondary+ :icon="certificate.enabled ? IconCheckCircle : IconCircle"+ v-tippy="{ theme: 'tooltip' }"+ :title="+ certificate.enabled+ ? t('action.turn_off')+ : t('action.turn_on')+ "+ color="green"+ @click="toggleEntryEnabled(domain)"+ />++ <HoppButtonSecondary+ :icon="IconTrash"+ v-tippy="{ theme: 'tooltip' }"+ :title="t('action.remove')"+ color="red"+ @click="deleteEntry(domain)"+ />+ </div>+ </li>+ </ul>++ <HoppButtonSecondary+ class="mx-4"+ :icon="IconPlus"+ :label="'Add Certificate File'"+ filled+ outline+ @click="showAddModal = true"+ />+ </div>+ </template>++ <template #footer>+ <div class="flex space-x-2">+ <HoppButtonPrimary :label="'Save'" @click="save" />+ <HoppButtonSecondary+ :label="'Cancel'"+ filled+ outline+ @click="emit('hide-modal')"+ />+ </div>+ </template>+ </HoppSmartModal>++ <ModalsNativeClientCertsAdd+ :show="showAddModal"+ :existing-domains="Array.from(certificateMap.keys())"+ @hide-modal="showAddModal = false"+ @save="saveCertificate"+ />+</template>++<!-- TODO: i18n -->+<script setup lang="ts">+import IconPlus from "~icons/lucide/plus"+import IconCheckCircle from "~icons/lucide/check-circle"+import IconCircle from "~icons/lucide/circle"+import IconTrash from "~icons/lucide/trash"+import { ref, watch } from "vue"+import { useI18n } from "@composables/i18n"+import { useService } from "dioc/vue"+import {+ ClientCertificateEntry,+ NativeInterceptorService,+} from "@platform/interceptors/native"+import { cloneDeep } from "lodash-es"++const props = defineProps<{+ show: boolean+}>()++const emit = defineEmits<{+ (e: "hide-modal"): void+}>()++const t = useI18n()++const nativeInterceptorService = useService(NativeInterceptorService)++const certificateMap = ref(new Map<string, ClientCertificateEntry>())++const showAddModal = ref(false)++watch(+ () => props.show,+ (show) => {+ if (show) {+ certificateMap.value = cloneDeep(+ nativeInterceptorService.clientCertificates.value+ )+ }+ }+)++function save() {+ nativeInterceptorService.clientCertificates.value = cloneDeep(+ certificateMap.value+ )+ emit("hide-modal")+}++function saveCertificate(cert: ClientCertificateEntry) {+ certificateMap.value.set(cert.domain, cert)+}++function toggleEntryEnabled(domain: string) {+ const certificate = certificateMap.value.get(domain)++ if (certificate) {+ certificateMap.value.set(domain, {+ ...certificate,+ enabled: !certificate.enabled,+ })+ }+}++function deleteEntry(domain: string) {+ certificateMap.value.delete(domain)+}+</script>diff --git a/packages/hoppscotch-selfhost-desktop/src/components/modals/NativeClientCertsAdd.vue b/packages/hoppscotch-selfhost-desktop/src/components/modals/NativeClientCertsAdd.vuenew file mode 100644index 000000000..7ef7122e4--- /dev/null+++ b/packages/hoppscotch-selfhost-desktop/src/components/modals/NativeClientCertsAdd.vue@@ -0,0 +1,281 @@+<template>+ <HoppSmartModal+ v-if="show"+ dialog+ :title="'Add Client Certificate'"+ @close="emit('hide-modal')"+ >+ <template #body>+ <div class="space-y-4">+ <HoppSmartInput+ v-model="domain"+ :autofocus="false"+ styles="flex-1"+ placeholder=" "+ :label="'Domain'"+ input-styles="input floating-input"+ />++ <HoppSmartTabs v-model="selectedTab">+ <HoppSmartTab :id="'pem'" :label="'PEM'">+ <div class="p-4 space-y-4">+ <div class="flex flex-col space-y-2">+ <label> Certificate </label>+ <HoppButtonSecondary+ :icon="pemCert?.type === 'loaded' ? IconFile : IconPlus"+ :loading="pemCert?.type === 'loading'"+ :label="+ pemCert?.type === 'loaded'+ ? pemCert.filename+ : 'Add Certifcate File'+ "+ filled+ outline+ @click="openFilePicker('pem_cert')"+ />+ </div>+ <div class="flex flex-col space-y-2">+ <label> Key </label>+ <HoppButtonSecondary+ :icon="pemKey?.type === 'loaded' ? IconFile : IconPlus"+ :loading="pemKey?.type === 'loading'"+ :label="+ pemKey?.type === 'loaded' ? pemKey.filename : 'Add Key File'+ "+ @click="openFilePicker('pem_key')"+ filled+ outline+ />+ </div>+ </div>+ </HoppSmartTab>++ <HoppSmartTab :id="'pfx'" :label="'PFX/PKCS12'">+ <div class="p-4 space-y-6">+ <div class="flex flex-col space-y-2">+ <label> PFX/PKCS12 File </label>+ <HoppButtonSecondary+ :icon="pfxCert?.type === 'loaded' ? IconFile : IconPlus"+ :loading="pfxCert?.type === 'loading'"+ :label="+ pfxCert?.type === 'loaded'+ ? pfxCert.filename+ : 'Add PFX/PKCS12 File'+ "+ @click="openFilePicker('pfx_cert')"+ filled+ outline+ />+ </div>++ <div class="border border-divider rounded">+ <HoppSmartInput+ v-model="pfxPassword"+ :type="showPfxPassword ? 'text' : 'password'"+ :label="'Password'"+ input-styles="floating-input !border-0 "+ :placeholder="' '"+ >+ <template #button>+ <HoppButtonSecondary+ v-tippy="{ theme: 'tooltip' }"+ :title="+ showPfxPassword ? 'Hide Password' : 'Show Password'+ "+ :icon="showPfxPassword ? IconEye : IconEyeOff"+ @click="showPfxPassword = !showPfxPassword"+ />+ </template>+ </HoppSmartInput>+ </div>+ </div>+ </HoppSmartTab>+ </HoppSmartTabs>+ </div>+ </template>++ <template #footer>+ <div class="flex space-x-2">+ <HoppButtonPrimary+ :label="'Save'"+ :disabled="!isValidCertificate || anyFileSelectorIsLoading"+ @click="save"+ />+ <HoppButtonSecondary+ :label="'Cancel'"+ filled+ outline+ @click="emit('hide-modal')"+ />+ </div>+ </template>+ </HoppSmartModal>+</template>++<!-- TODO: i18n -->+<script setup lang="ts">+import IconPlus from "~icons/lucide/plus"+import IconEyeOff from "~icons/lucide/eye-off"+import IconEye from "~icons/lucide/eye"+import IconFile from "~icons/lucide/file"+import { ref, watch, computed } from "vue"+import { useFileDialog } from "@vueuse/core"+import { ClientCertificateEntry } from "../../platform/interceptors/native"+import { useToast } from "@composables/toast"++const toast = useToast()++const props = defineProps<{+ show: boolean+ existingDomains: string[]+}>()++const emit = defineEmits<{+ (e: "hide-modal"): void+ (e: "save", certificate: ClientCertificateEntry): void+}>()++type FileSelectorState =+ | null+ | { type: "loading" }+ | { type: "loaded"; filename: string; data: Uint8Array }++const domain = ref("")++const pemCert = ref<FileSelectorState>(null)+const pemKey = ref<FileSelectorState>(null)++const pfxCert = ref<FileSelectorState>(null)++const pfxPassword = ref("")+const showPfxPassword = ref(false)++const anyFileSelectorIsLoading = computed(+ () =>+ pemCert.value?.type === "loading" ||+ pemKey.value?.type === "loading" ||+ pfxCert.value?.type === "loading"+)++const currentlyPickingFile = ref<null | "pem_cert" | "pem_key" | "pfx_cert">(+ null+)++const selectedTab = ref<"pem" | "pfx">("pem")++watch(+ () => props.show,+ (show) => {+ if (!show) return++ currentlyPickingFile.value = null++ domain.value = ""+ pemCert.value = null+ pemKey.value = null+ pfxCert.value = null+ pfxPassword.value = ""+ showPfxPassword.value = false+ selectedTab.value = "pem"+ }+)++const certificate = computed<ClientCertificateEntry | null>(() => {+ if (selectedTab.value === "pem") {+ if (pemCert.value?.type === "loaded" && pemKey.value?.type === "loaded") {+ return <ClientCertificateEntry>{+ domain: domain.value,+ enabled: true,+ cert: {+ PEMCert: {+ certificate_filename: pemCert.value.filename,+ certificate_pem: pemCert.value.data,++ key_filename: pemKey.value.filename,+ key_pem: pemKey.value.data,+ },+ },+ }+ }+ } else {+ if (pfxCert.value?.type === "loaded") {+ return <ClientCertificateEntry>{+ domain: domain.value.trim(),+ enabled: true,+ cert: {+ PFXCert: {+ certificate_filename: pfxCert.value.filename,+ certificate_pfx: pfxCert.value.data,+ password: pfxPassword.value,+ },+ },+ }+ }+ }++ return null+})++const isValidCertificate = computed(() => {+ if (certificate.value === null) return false++ if (props.existingDomains.includes(certificate.value.domain)) {+ toast.error("A certificate for this domain already exists")+ return false+ }++ return ClientCertificateEntry.safeParse(certificate.value).success+})++const {+ open: openFileDialog,+ reset: resetFilePicker,+ onChange: onFilePickerChange,+} = useFileDialog({+ reset: true,+ multiple: false,+})++onFilePickerChange(async (files) => {+ if (!files) return++ const file = files.item(0)++ if (!file) return++ if (currentlyPickingFile.value === "pem_cert") {+ pemCert.value = { type: "loading" }+ } else if (currentlyPickingFile.value === "pem_key") {+ pemKey.value = { type: "loading" }+ } else if (currentlyPickingFile.value === "pfx_cert") {+ pfxCert.value = { type: "loading" }+ }++ const data = new Uint8Array(await file.arrayBuffer())++ if (currentlyPickingFile.value === "pem_cert") {+ pemCert.value = { type: "loaded", filename: file.name, data }+ } else if (currentlyPickingFile.value === "pem_key") {+ pemKey.value = { type: "loaded", filename: file.name, data }+ } else if (currentlyPickingFile.value === "pfx_cert") {+ pfxCert.value = { type: "loaded", filename: file.name, data }+ }++ currentlyPickingFile.value = null++ resetFilePicker()+})++function openFilePicker(type: "pem_cert" | "pem_key" | "pfx_cert") {+ currentlyPickingFile.value = type++ openFileDialog()+}++function save() {+ if (certificate.value) {+ emit("save", certificate.value)+ emit("hide-modal")+ }+}+</script>diff --git a/packages/hoppscotch-selfhost-desktop/src/components/settings/NativeInterceptor.vue b/packages/hoppscotch-selfhost-desktop/src/components/settings/NativeInterceptor.vuenew file mode 100644index 000000000..3c3d5db85--- /dev/null+++ b/packages/hoppscotch-selfhost-desktop/src/components/settings/NativeInterceptor.vue@@ -0,0 +1,55 @@+<template>+ <div class="py-4 space-y-4">+ <div class="flex items-center">+ <HoppSmartToggle+ :on="allowSSLVerification"+ @change="allowSSLVerification = !allowSSLVerification"+ />+ Verify SSL Certificates+ </div>++ <div class="flex space-x-4">+ <!--+ <HoppButtonSecondary+ :icon="IconLucideFileBadge"+ :label="'CA Certificates'"+ outline+ @click="showCACertificatesModal = true"+ />+ -->+ <HoppButtonSecondary+ :icon="IconLucideFileKey"+ :label="'Client Certificates'"+ @click="showClientCertificatesModal = true"+ outline+ />+ </div>++ <!--+ <ModalsNativeCACertificates+ :show="showCACertificatesModal"+ @hide-modal="showCACertificatesModal = false"+ />+ -->+ <ModalsNativeClientCertificates+ :show="showClientCertificatesModal"+ @hide-modal="showClientCertificatesModal = false"+ />+ </div>+</template>++<!-- TODO: i18n -->+<script setup lang="ts">+import { ref } from "vue"+import IconLucideFileBadge from "~icons/lucide/file-badge"+import IconLucideFileKey from "~icons/lucide/file-key"+import { useService } from "dioc/vue"+import { NativeInterceptorService } from "@platform/interceptors/native"++const nativeInterceptorService = useService(NativeInterceptorService)++const allowSSLVerification = nativeInterceptorService.validateCerts++// const showCACertificatesModal = ref(false)+const showClientCertificatesModal = ref(false)+</script>diff --git a/packages/hoppscotch-selfhost-desktop/src/platform/interceptors/native.ts b/packages/hoppscotch-selfhost-desktop/src/platform/interceptors/native.tsdeleted file mode 100644index 16bb11e9a..000000000--- a/packages/hoppscotch-selfhost-desktop/src/platform/interceptors/native.ts+++ /dev/null@@ -1,170 +0,0 @@-import * as E from "fp-ts/Either"-import {- Interceptor,- InterceptorError,- RequestRunResult,-} from "@hoppscotch/common/services/interceptor.service"-import { CookieJarService } from "@hoppscotch/common/services/cookie-jar.service"-import axios, { AxiosRequestConfig, CancelToken } from "axios"-import { cloneDeep } from "lodash-es"-import { Body, HttpVerb, ResponseType, getClient } from "@tauri-apps/api/http"-import { Service } from "dioc"--export const preProcessRequest = (- req: AxiosRequestConfig-): AxiosRequestConfig => {- const reqClone = cloneDeep(req)-- // If the parameters are URLSearchParams, inject them to URL instead- // This prevents issues of marshalling the URLSearchParams to the proxy- if (reqClone.params instanceof URLSearchParams) {- try {- const url = new URL(reqClone.url ?? "")-- for (const [key, value] of reqClone.params.entries()) {- url.searchParams.append(key, value)- }-- reqClone.url = url.toString()- } catch (e) {- // making this a non-empty block, so we can make the linter happy.- // we should probably use, allowEmptyCatch, or take the time to do something with the caught errors :)- }-- reqClone.params = {}- }-- return reqClone-}--async function runRequest(- req: AxiosRequestConfig,- cancelled: () => boolean-): RequestRunResult["response"] {- const timeStart = Date.now()-- const processedReq = preProcessRequest(req)- try {- const client = await getClient()-- if (cancelled()) {- client.drop()- return E.left("cancellation")- }-- let body = Body.text(processedReq.data ?? "")-- if (processedReq.data instanceof FormData) {- let body_data = {}- for (const entry of processedReq.data.entries()) {- const [name, value] = entry-- if (value instanceof File) {- let file_data = await value.arrayBuffer()-- body_data[name] = {- file: new Uint8Array(file_data),- fileName: value.name,- }- }- }-- body = Body.form(body_data)- }-- const res = await client.request({- method: processedReq.method as HttpVerb,- url: processedReq.url ?? "",- responseType: ResponseType.Binary,- headers: processedReq.headers,- body: body,- })-- if (cancelled()) {- client.drop()- return E.left("cancellation")- }-- res.data = new Uint8Array(res.data as number[]).buffer-- const timeEnd = Date.now()-- return E.right({- ...res,- config: {- timeData: {- startTime: timeStart,- endTime: timeEnd,- },- },- additional: {- multiHeaders: Object.entries(res.rawHeaders).flatMap(- ([header, values]) => values.map((value) => ({ key: header, value }))- ),- },- })- } catch (e) {- const timeEnd = Date.now()-- if (axios.isAxiosError(e) && e.response) {- return E.right({- ...e.response,- config: {- timeData: {- startTime: timeStart,- endTime: timeEnd,- },- },- })- } else if (axios.isCancel(e)) {- return E.left("cancellation")- } else {- return E.left(<InterceptorError>{- humanMessage: {- heading: (t) => t("error.network_fail"),- description: (t) => t("helpers.network_fail"),- },- error: e,- })- }- }-}--export class NativeInterceptorService extends Service implements Interceptor {- public static readonly ID = "NATIVE_INTERCEPTOR_SERVICE"-- public interceptorID = "native" // TODO: i18n this-- public name = () => "Native"-- public selectable = { type: "selectable" as const }-- public supportsCookies = true-- public cookieJarService = this.bind(CookieJarService)-- public runRequest(req: any) {- const processedReq = preProcessRequest(req)-- const relevantCookies = this.cookieJarService.getCookiesForURL(- new URL(processedReq.url!)- )-- processedReq.headers["Cookie"] = relevantCookies- .map((cookie) => `${cookie.name!}=${cookie.value!}`)- .join(";")-- let cancelled = false-- const checkCancelled = () => {- return cancelled- }-- return {- cancel: () => {- cancelled = true- },- response: runRequest(processedReq, checkCancelled),- }- }-}diff --git a/packages/hoppscotch-selfhost-desktop/src/platform/interceptors/native/index.ts b/packages/hoppscotch-selfhost-desktop/src/platform/interceptors/native/index.tsnew file mode 100644index 000000000..1bc271f36--- /dev/null+++ b/packages/hoppscotch-selfhost-desktop/src/platform/interceptors/native/index.ts@@ -0,0 +1,459 @@+import { CookieJarService } from "@hoppscotch/common/services/cookie-jar.service"+import { Interceptor, InterceptorError, NetworkResponse, RequestRunResult } from "@hoppscotch/common/services/interceptor.service"+import { Service } from "dioc"+import { cloneDeep } from "lodash-es"+import { invoke } from "@tauri-apps/api/tauri"+import * as E from "fp-ts/Either"+import SettingsNativeInterceptor from "../../../components/settings/NativeInterceptor.vue"+import { ref, watch } from "vue"+import { z } from "zod"+import { PersistenceService } from "@hoppscotch/common/services/persistence"+import { CACertStore, ClientCertsStore, ClientCertStore, StoredClientCert } from "./persisted-data"+++type KeyValuePair = {+ key: string,+ value: string+}++type FormDataValue =+ | { Text: string }+ | {+ File: {+ filename: string,+ data: Uint8Array+ }+ }++type FormDataEntry = {+ key: string,+ value: FormDataValue+}++type BodyDef =+ | { Text: string }+ | { URLEncoded: KeyValuePair[] }+ | { FormData: FormDataEntry[] }++type ClientCertDef =+ | {+ PEMCert: {+ certificate_pem: number[],+ key_pem: number[]+ },+ }+ | {+ PFXCert: {+ certificate_pfx: number[],+ password: string+ }+ }++// TODO: Figure out a way to autogen this from the interceptor definition on the Rust side+type RequestDef = {+ req_id: number++ method: string+ endpoint: string++ parameters: KeyValuePair[]+ headers: KeyValuePair[]++ body: BodyDef | null,++ validate_certs: boolean,+ root_cert_bundle_files: number[],+ client_cert: ClientCertDef | null+}++type RunRequestResponse = {+ status: number,+ status_text: string,+ headers: KeyValuePair[],+ data: number[],++ time_start_ms: number,+ time_end_ms: number+}++// HACK: To solve the AxiosRequestConfig being different between @hoppscotch/common+// and the axios present in this package+type AxiosRequestConfig = Parameters<Interceptor["runRequest"]>[0]++export const preProcessRequest = (+ req: AxiosRequestConfig+): AxiosRequestConfig => {+ const reqClone = cloneDeep(req)++ // If the parameters are URLSearchParams, inject them to URL instead+ // This prevents issues of marshalling the URLSearchParams to the proxy+ if (reqClone.params instanceof URLSearchParams) {+ try {+ const url = new URL(reqClone.url ?? "")++ for (const [key, value] of reqClone.params.entries()) {+ url.searchParams.append(key, value)+ }++ reqClone.url = url.toString()+ } catch (e) {+ // making this a non-empty block, so we can make the linter happy.+ // we should probably use, allowEmptyCatch, or take the time to do something with the caught errors :)+ }++ reqClone.params = {}+ }++ return reqClone+}++async function processBody(axiosReq: AxiosRequestConfig): Promise<BodyDef | null> {+ if (!axiosReq.data) return null++ if (typeof axiosReq.data === "string") {+ return { Text: axiosReq.data }+ }++ if (axiosReq.data instanceof FormData) {+ const entries: FormDataEntry[] = []++ for (const [key, value] of axiosReq.data.entries()) {+ if (typeof value === "string") {+ entries.push({+ key,+ value: { Text: value }+ })+ } else {+ entries.push({+ key,+ value: {+ File: {+ filename: value.name,+ data: new Uint8Array(await value.arrayBuffer())+ }+ }+ })+ }+ }++ return { FormData: entries }+ }++ throw new Error("Native Process Body: Unhandled Axios Request Configuration")+}++function getURLDomain(url: string): string | null {+ try {+ return new URL(url).host+ } catch (_) {+ return null+ }+}++function convertClientCertToDefCert(cert: ClientCertificateEntry): ClientCertDef {+ if ("PEMCert" in cert.cert) {+ return {+ PEMCert: {+ certificate_pem: Array.from(cert.cert.PEMCert.certificate_pem),+ key_pem: Array.from(cert.cert.PEMCert.key_pem)+ }+ }+ } else {+ return {+ PFXCert: {+ certificate_pfx: Array.from(cert.cert.PFXCert.certificate_pfx),+ password: cert.cert.PFXCert.password+ }+ }+ }+}++async function convertToRequestDef(+ axiosReq: AxiosRequestConfig,+ reqID: number,+ caCertificates: CACertificateEntry[],+ clientCertificates: Map<string, ClientCertificateEntry>,+ validateCerts: boolean+): Promise<RequestDef> {+ const clientCertDomain = getURLDomain(axiosReq.url!)++ const clientCert = clientCertDomain ? clientCertificates.get(clientCertDomain) : null++ return {+ req_id: reqID,+ method: axiosReq.method ?? "GET",+ endpoint: axiosReq.url ?? "",+ headers: Object.entries(axiosReq.headers ?? {})+ .map(([key, value]): KeyValuePair => ({ key, value })),+ parameters: Object.entries(axiosReq.params as Record<string, string> ?? {})+ .map(([key, value]): KeyValuePair => ({ key, value })),+ body: await processBody(axiosReq),+ root_cert_bundle_files: caCertificates.map((cert) => Array.from(cert.certificate)),+ validate_certs: validateCerts,+ client_cert: clientCert ? convertClientCertToDefCert(clientCert) : null+ }+}++export const CACertificateEntry = z.object({+ filename: z.string().min(1),+ enabled: z.boolean(),+ certificate: z.instanceof(Uint8Array)+})++export type CACertificateEntry = z.infer<typeof CACertificateEntry>++export const ClientCertificateEntry = z.object({+ enabled: z.boolean(),+ domain: z.string().trim().min(1),+ cert: z.union([+ z.object({+ PEMCert: z.object({+ certificate_filename: z.string().min(1),+ certificate_pem: z.instanceof(Uint8Array),++ key_filename: z.string().min(1),+ key_pem: z.instanceof(Uint8Array),+ })+ }),+ z.object({+ PFXCert: z.object({+ certificate_filename: z.string().min(1),+ certificate_pfx: z.instanceof(Uint8Array),++ password: z.string()+ })+ })+ ])+})++export type ClientCertificateEntry = z.infer<typeof ClientCertificateEntry>++const CA_STORE_PERSIST_KEY = "native_interceptor_ca_store"+const CLIENT_CERTS_PERSIST_KEY = "native_interceptor_client_certs_store"+const VALIDATE_SSL_KEY = "native_interceptor_validate_ssl"++export class NativeInterceptorService extends Service implements Interceptor {+ public static readonly ID = "NATIVE_INTERCEPTOR_SERVICE"++ public interceptorID = "native"++ public name = () => "Native"++ public selectable = { type: "selectable" as const }++ public supportsCookies = true++ private cookieJarService = this.bind(CookieJarService)+ private persistenceService: PersistenceService = this.bind(PersistenceService)++ private reqIDTicker = 0++ public settingsPageEntry = {+ entryTitle: () => "Native", // TODO: i18n this+ component: SettingsNativeInterceptor+ }++ public caCertificates = ref<CACertificateEntry[]>([])++ public clientCertificates = ref<Map<string, ClientCertificateEntry>>(new Map())+ public validateCerts = ref(true)++ override onServiceInit() {+ // Load SSL Validation+ const persistedValidateSSL: unknown = JSON.parse(+ this.persistenceService.getLocalConfig(VALIDATE_SSL_KEY) ?? "null"+ )++ if (typeof persistedValidateSSL === "boolean") {+ this.validateCerts.value = persistedValidateSSL+ }++ watch(this.validateCerts, () => {+ this.persistenceService.setLocalConfig(VALIDATE_SSL_KEY, JSON.stringify(this.validateCerts.value))+ })++ // Load and setup writes for CA Store+ const persistedCAStoreData = JSON.parse(+ this.persistenceService.getLocalConfig(CA_STORE_PERSIST_KEY) ?? "null"+ )++ const caStoreDataParseResult = CACertStore.safeParse(persistedCAStoreData)++ if (caStoreDataParseResult.type === "ok") {+ this.caCertificates.value = caStoreDataParseResult.value.certs+ .map((entry) => ({ ...entry, certificate: new Uint8Array(entry.certificate) }))+ }++ watch(this.caCertificates, (certs) => {+ const storableValue: CACertStore = {+ v: 1,+ certs: certs+ .map((el) => ({ ...el, certificate: Array.from(el.certificate) }))+ }++ this.persistenceService.setLocalConfig(CA_STORE_PERSIST_KEY, JSON.stringify(storableValue))+ })+++ // Load and setup writes for Client Certs Store+ const persistedClientCertStoreData = JSON.parse(+ this.persistenceService.getLocalConfig(CLIENT_CERTS_PERSIST_KEY) ?? "null"+ )++ const clientCertStoreDataParseResult = ClientCertsStore.safeParse(persistedClientCertStoreData)++ if (clientCertStoreDataParseResult.type === "ok") {+ this.clientCertificates.value = new Map(+ Object.entries(+ clientCertStoreDataParseResult.value.clientCerts+ )+ .map(([domain, cert]) => {+ if ("PFXCert" in cert.cert) {+ const newCert = <ClientCertificateEntry>{+ ...cert,+ cert: {+ PFXCert: {+ certificate_pfx: new Uint8Array(cert.cert.PFXCert.certificate_pfx),+ certificate_filename: cert.cert.PFXCert.certificate_filename,++ password: cert.cert.PFXCert.password+ }+ }+ }++ return [domain, newCert]+ } else {+ const newCert = <ClientCertificateEntry>{+ ...cert,+ cert: {+ PEMCert: {+ certificate_pem: new Uint8Array(cert.cert.PEMCert.certificate_pem),+ certificate_filename: cert.cert.PEMCert.certificate_filename,++ key_pem: new Uint8Array(cert.cert.PEMCert.key_pem),+ key_filename: cert.cert.PEMCert.key_filename+ }+ }+ }++ return [domain, newCert]+ }+ })+ )+ }++ watch(this.clientCertificates, (certs) => {+ const storableValue: ClientCertStore = {+ v: 1,+ clientCerts: Object.fromEntries(+ Array.from(certs.entries())+ .map(([domain, cert]) => {+ if ("PFXCert" in cert.cert) {+ const newCert = <StoredClientCert>{+ ...cert,+ cert: {+ PFXCert: {+ certificate_pfx: Array.from(cert.cert.PFXCert.certificate_pfx),+ certificate_filename: cert.cert.PFXCert.certificate_filename,++ password: cert.cert.PFXCert.password+ }+ }+ }++ return [domain, newCert]+ } else {+ const newCert = <StoredClientCert>{+ ...cert,+ cert: {+ PEMCert: {+ certificate_pem: Array.from(cert.cert.PEMCert.certificate_pem),+ certificate_filename: cert.cert.PEMCert.certificate_filename,++ key_pem: Array.from(cert.cert.PEMCert.key_pem),+ key_filename: cert.cert.PEMCert.key_filename+ }+ }+ }++ return [domain, newCert]+ }+ })+ )+ }+++ this.persistenceService.setLocalConfig(CLIENT_CERTS_PERSIST_KEY, JSON.stringify(storableValue))+ })+ }++ public runRequest(req: AxiosRequestConfig): RequestRunResult<InterceptorError> {+ const processedReq = preProcessRequest(req)++ const relevantCookies = this.cookieJarService.getCookiesForURL(+ new URL(processedReq.url!)+ )++ processedReq.headers["Cookie"] = relevantCookies+ .map((cookie) => `${cookie.name!}=${cookie.value!}`)+ .join(";")++ const reqID = this.reqIDTicker++;++ return {+ cancel: () => {+ invoke("plugin:hopp_native_interceptor|cancel_request", { reqId: reqID });+ },+ response: (async () => {+ const requestDef = await convertToRequestDef(+ processedReq,+ reqID,+ this.caCertificates.value,+ this.clientCertificates.value,+ this.validateCerts.value+ )++ try {+ console.log(requestDef)++ const response: RunRequestResponse = await invoke(+ "plugin:hopp_native_interceptor|run_request",+ { req: requestDef }+ )++ return E.right({+ headers: Object.fromEntries(+ response.headers.map(({ key, value }) => [key, value])+ ),+ status: response.status,+ statusText: response.status_text,+ data: new Uint8Array(response.data).buffer,+ config: {+ timeData: {+ startTime: response.time_start_ms,+ endTime: response.time_end_ms+ }+ },+ additional: {+ multiHeaders: response.headers+ }+ })+ } catch (e) {+ console.log(e)++ if (typeof e === "object" && (e as any)["RequestCancelled"]) {+ return E.left("cancellation" as const)+ }++ // TODO: More in-depth error messages+ return E.left(<InterceptorError>{+ humanMessage: {+ heading: (t) => t("error.network_fail"),+ description: (t) => t("helpers.network_fail"),+ }+ })+ }+ })()+ }+ }+}diff --git a/packages/hoppscotch-selfhost-desktop/src/platform/interceptors/native/persisted-data.ts b/packages/hoppscotch-selfhost-desktop/src/platform/interceptors/native/persisted-data.tsnew file mode 100644index 000000000..bea7234b0--- /dev/null+++ b/packages/hoppscotch-selfhost-desktop/src/platform/interceptors/native/persisted-data.ts@@ -0,0 +1,85 @@+import { z } from "zod"+import { defineVersion, createVersionedEntity, InferredEntity } from "verzod"++const Uint8 = z.number()+ .int()+ .gte(0)+ .lte(255);++export const StoredCACert = z.object({+ filename: z.string().min(1),+ enabled: z.boolean(),+ certificate: z.array(Uint8)+})++const caCertStore_v1 = defineVersion({+ initial: true,+ schema: z.object({+ v: z.literal(1),+ certs: z.array(StoredCACert)+ })+})++export const CACertStore = createVersionedEntity({+ latestVersion: 1,+ versionMap: {+ 1: caCertStore_v1+ },+ getVersion(data) {+ const result = caCertStore_v1.schema.safeParse(data)++ return result.success ? result.data.v : null+ }+})++export type CACertStore = InferredEntity<typeof CACertStore>++++export const StoredClientCert = z.object({+ enabled: z.boolean(),+ domain: z.string().trim().min(1),+ cert: z.union([+ z.object({+ PEMCert: z.object({+ certificate_filename: z.string().min(1),+ certificate_pem: z.array(Uint8),++ key_filename: z.string().min(1),+ key_pem: z.array(Uint8)+ })+ }),+ z.object({+ PFXCert: z.object({+ certificate_filename: z.string().min(1),+ certificate_pfx: z.array(Uint8),++ password: z.string()+ })+ })+ ])+})++export type StoredClientCert = z.infer<typeof StoredClientCert>++const clientCertsStore_v1 = defineVersion({+ initial: true,+ schema: z.object({+ v: z.literal(1),+ clientCerts: z.record(StoredClientCert)+ })+})++export const ClientCertsStore = createVersionedEntity({+ latestVersion: 1,+ versionMap: {+ 1: clientCertsStore_v1+ },+ getVersion(data) {+ const result = clientCertsStore_v1.schema.safeParse(data)++ return result.success ? result.data.v : null+ }+})++export type ClientCertStore = InferredEntity<typeof ClientCertsStore>diff --git a/packages/hoppscotch-selfhost-desktop/vite.config.ts b/packages/hoppscotch-selfhost-desktop/vite.config.tsindex e11a6ea59..979654ca0 100644--- a/packages/hoppscotch-selfhost-desktop/vite.config.ts+++ b/packages/hoppscotch-selfhost-desktop/vite.config.ts@@ -108,6 +108,7 @@ export default defineConfig({dts: "../hoppscotch-common/src/components.d.ts",dirs: ["../hoppscotch-common/src/components",+ "./src/components"],directoryAsNamespace: true,resolvers: [diff --git a/pnpm-lock.yaml b/pnpm-lock.yamlindex a9e8f0cf8..834ee9b46 100644--- a/pnpm-lock.yaml+++ b/pnpm-lock.yaml@@ -964,12 +964,18 @@ importers:util:specifier: 0.12.5version: 0.12.5+ verzod:+ specifier: 0.2.2+ version: 0.2.2([email protected])vue:specifier: 3.3.9version: 3.3.9([email protected])workbox-window:specifier: 6.6.0version: 6.6.0+ zod:+ specifier: 3.22.4+ version: 3.22.4devDependencies:'@graphql-codegen/add':specifier: 5.0.0