Lucas Nogueira
2 years ago
commit
666d185afc
@ -0,0 +1,5 @@
|
|||||||
|
---
|
||||||
|
"dialog": "patch"
|
||||||
|
---
|
||||||
|
|
||||||
|
On non-Linux system, use `AsyncMessageDialog` instead of `MessageDialog`. [(tauri#7182)](https://github.com/tauri-apps/tauri/issues/7182)
|
||||||
@ -0,0 +1,30 @@
|
|||||||
|
---
|
||||||
|
"app": patch
|
||||||
|
"authenticator": patch
|
||||||
|
"autostart": patch
|
||||||
|
"cli": patch
|
||||||
|
"clipboard-manager": patch
|
||||||
|
"dialog": patch
|
||||||
|
"fs": patch
|
||||||
|
"global-shortcut": patch
|
||||||
|
"http": patch
|
||||||
|
"localhost": patch
|
||||||
|
"log-plugin": patch
|
||||||
|
"notification": patch
|
||||||
|
"os": patch
|
||||||
|
"persisted-scope": patch
|
||||||
|
"positioner": patch
|
||||||
|
"process": patch
|
||||||
|
"shell": patch
|
||||||
|
"single-instance": patch
|
||||||
|
"sql": patch
|
||||||
|
"store": patch
|
||||||
|
"stronghold": patch
|
||||||
|
"updater": patch
|
||||||
|
"upload": patch
|
||||||
|
"websocket": patch
|
||||||
|
"window": patch
|
||||||
|
"window-state": patch
|
||||||
|
---
|
||||||
|
|
||||||
|
Fixes docs.rs build by enabling the `tauri/dox` feature flag.
|
||||||
@ -0,0 +1,5 @@
|
|||||||
|
---
|
||||||
|
"fs-js": patch
|
||||||
|
---
|
||||||
|
|
||||||
|
Fix `writeBinaryFile` crashing with `command 'write_binary_file' not found`
|
||||||
@ -0,0 +1,5 @@
|
|||||||
|
---
|
||||||
|
"http-js": minor
|
||||||
|
---
|
||||||
|
|
||||||
|
Multipart requests are now handled in JavaScript by the `Request` JavaScript class so you just need to use a `FormData` body and not set the content-type header to `multipart/form-data`. `application/x-www-form-urlencoded` requests must be done manually.
|
||||||
@ -0,0 +1,6 @@
|
|||||||
|
---
|
||||||
|
"http": minor
|
||||||
|
"http-js": minor
|
||||||
|
---
|
||||||
|
|
||||||
|
The http plugin has been rewritten from scratch and now only exposes a `fetch` function in Javascript and Re-exports `reqwest` crate in Rust. The new `fetch` method tries to be as close and compliant to the `fetch` Web API as possible.
|
||||||
@ -0,0 +1,5 @@
|
|||||||
|
---
|
||||||
|
"http": patch
|
||||||
|
---
|
||||||
|
|
||||||
|
Improve response performance by using the new IPC streaming data.
|
||||||
@ -0,0 +1,5 @@
|
|||||||
|
---
|
||||||
|
"os-js": "patch"
|
||||||
|
---
|
||||||
|
|
||||||
|
Fix `macss -> macos` typo in `OsType` type.
|
||||||
@ -0,0 +1,5 @@
|
|||||||
|
---
|
||||||
|
"persisted-scope": patch
|
||||||
|
---
|
||||||
|
|
||||||
|
Split up fs and asset scopes. **This will reset the asset protocol scope once!**
|
||||||
@ -0,0 +1,5 @@
|
|||||||
|
---
|
||||||
|
"persisted-scope": patch
|
||||||
|
---
|
||||||
|
|
||||||
|
Fix usage of directory patterns by removing glob asterisks at the end before allowing/forbidding them. This was causing them to be escaped, and so undesirable paths were allowed/forbidden while polluting the `.persisted-scope` file.
|
||||||
@ -0,0 +1,5 @@
|
|||||||
|
---
|
||||||
|
"positioner": patch
|
||||||
|
---
|
||||||
|
|
||||||
|
Change `system-tray` feature flag to `tray-icon`.
|
||||||
@ -1,9 +1,36 @@
|
|||||||
{
|
{
|
||||||
"tag": "alpha",
|
"tag": "alpha",
|
||||||
"changes": [
|
"changes": [
|
||||||
|
".changes/dialog-async-message-dialog.md",
|
||||||
|
".changes/disable-window-controls-api-options.md",
|
||||||
|
".changes/disable-window-controls-api.md",
|
||||||
|
".changes/fix-docs-build.md",
|
||||||
|
".changes/fs-wiret-binary-file.md",
|
||||||
|
".changes/http-multipart-refactor.md",
|
||||||
|
".changes/http-plugin-refactor.md",
|
||||||
|
".changes/http-response.md",
|
||||||
".changes/notification-init-script.md",
|
".changes/notification-init-script.md",
|
||||||
|
".changes/notification-revert-sound.md",
|
||||||
".changes/notification-sound.md",
|
".changes/notification-sound.md",
|
||||||
|
".changes/os-OsType.md",
|
||||||
|
".changes/os-plugin-refactor.md",
|
||||||
|
".changes/persisted-scope-asset.md",
|
||||||
|
".changes/persisted-scope-glob.md",
|
||||||
|
".changes/positioner-tray-flag.md",
|
||||||
|
".changes/shell-command-apis.md",
|
||||||
|
".changes/shell-detached.md",
|
||||||
|
".changes/stronghold-arg-name.md",
|
||||||
".changes/stronghold-constructor.md",
|
".changes/stronghold-constructor.md",
|
||||||
".changes/v2-alpha.md"
|
".changes/tauri-alpha.11.md",
|
||||||
|
".changes/updater-nsis-admin.md",
|
||||||
|
".changes/updater-nsis.md",
|
||||||
|
".changes/updater-plugin-refactor.md",
|
||||||
|
".changes/v2-alpha.md",
|
||||||
|
".changes/window-incognito.md",
|
||||||
|
".changes/window-is-focused.md",
|
||||||
|
".changes/window-plugin-refactor.md",
|
||||||
|
".changes/window-set-effects.md",
|
||||||
|
".changes/window-state-decorated.md",
|
||||||
|
".changes/window-state-promise.md"
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|||||||
@ -0,0 +1,5 @@
|
|||||||
|
---
|
||||||
|
"shell": "patch"
|
||||||
|
---
|
||||||
|
|
||||||
|
Added `Command::arg`, `Command::env` and changed `Command::new` input type.
|
||||||
@ -0,0 +1,5 @@
|
|||||||
|
---
|
||||||
|
"shell": patch
|
||||||
|
---
|
||||||
|
|
||||||
|
Ensure the launched process is detached so it can out-live your tauri app and does not shutdown with it.
|
||||||
@ -0,0 +1,5 @@
|
|||||||
|
---
|
||||||
|
"stronghold-js": patch
|
||||||
|
---
|
||||||
|
|
||||||
|
Change the argument name of the `Stronghold.remove` from `location` to `recordPath` to match the Stronghold command argument
|
||||||
@ -0,0 +1,53 @@
|
|||||||
|
---
|
||||||
|
"app": patch
|
||||||
|
"app-js": patch
|
||||||
|
"authenticator": patch
|
||||||
|
"authenticator-js": patch
|
||||||
|
"autostart": patch
|
||||||
|
"autostart-js": patch
|
||||||
|
"cli": patch
|
||||||
|
"cli-js": patch
|
||||||
|
"clipboard-manager": patch
|
||||||
|
"clipboard-manager-js": patch
|
||||||
|
"dialog": patch
|
||||||
|
"dialog-js": patch
|
||||||
|
"fs": patch
|
||||||
|
"fs-js": patch
|
||||||
|
"global-shortcut": patch
|
||||||
|
"global-shortcut-js": patch
|
||||||
|
"http": patch
|
||||||
|
"http-js": patch
|
||||||
|
"localhost": patch
|
||||||
|
"log-plugin": patch
|
||||||
|
"log-js": patch
|
||||||
|
"notification": patch
|
||||||
|
"notification-js": patch
|
||||||
|
"os": patch
|
||||||
|
"os-js": patch
|
||||||
|
"persisted-scope": patch
|
||||||
|
"positioner": patch
|
||||||
|
"positioner-js": patch
|
||||||
|
"process": patch
|
||||||
|
"process-js": patch
|
||||||
|
"shell": patch
|
||||||
|
"shell-js": patch
|
||||||
|
"single-instance": patch
|
||||||
|
"sql": patch
|
||||||
|
"sql-js": patch
|
||||||
|
"store": patch
|
||||||
|
"store-js": patch
|
||||||
|
"stronghold": patch
|
||||||
|
"stronghold-js": patch
|
||||||
|
"updater": patch
|
||||||
|
"updater-js": patch
|
||||||
|
"upload": patch
|
||||||
|
"upload-js": patch
|
||||||
|
"websocket": patch
|
||||||
|
"websocket-js": patch
|
||||||
|
"window": patch
|
||||||
|
"window-js": patch
|
||||||
|
"window-state": patch
|
||||||
|
"window-state-js": patch
|
||||||
|
---
|
||||||
|
|
||||||
|
Update to alpha.11.
|
||||||
@ -0,0 +1,6 @@
|
|||||||
|
---
|
||||||
|
"updater": minor
|
||||||
|
"updater-js": minor
|
||||||
|
---
|
||||||
|
|
||||||
|
The updater plugin is recieving a few changes to improve consistency and ergonomics of the Rust and JS APIs
|
||||||
@ -0,0 +1,10 @@
|
|||||||
|
---
|
||||||
|
"window": "patch"
|
||||||
|
"window-js": "patch"
|
||||||
|
---
|
||||||
|
|
||||||
|
The window plugin is recieving a few changes to improve consistency and add new features:
|
||||||
|
|
||||||
|
- Removed `appWindow` variable from JS module, use `getCurrent` or `Window.getCurrent`.
|
||||||
|
- Removed `WindowManager`, `WebviewWindow` and `WebviewHandle` types and merged them into one `Window` type that matches the name of the rust window type.
|
||||||
|
- Added `Window.getCurrent` and `Window.getAll` which is a convenient method for `getCurrent` and `getAll` functions.
|
||||||
@ -0,0 +1,54 @@
|
|||||||
|
# Copyright 2019-2023 Tauri Programme within The Commons Conservancy
|
||||||
|
# SPDX-License-Identifier: Apache-2.0
|
||||||
|
# SPDX-License-Identifier: MIT
|
||||||
|
|
||||||
|
name: integration tests
|
||||||
|
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
branches:
|
||||||
|
- v1
|
||||||
|
- v2
|
||||||
|
paths:
|
||||||
|
- ".github/workflows/integration-tests.yml"
|
||||||
|
- "plugins/updater/src/**"
|
||||||
|
pull_request:
|
||||||
|
branches:
|
||||||
|
- v1
|
||||||
|
- v2
|
||||||
|
paths:
|
||||||
|
- ".github/workflows/integration-tests.yml"
|
||||||
|
- "plugins/updater/src/**"
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
run-integration-tests:
|
||||||
|
runs-on: ${{ matrix.platform }}
|
||||||
|
|
||||||
|
strategy:
|
||||||
|
fail-fast: false
|
||||||
|
matrix:
|
||||||
|
platform: [ubuntu-latest, macos-latest, windows-latest]
|
||||||
|
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v2
|
||||||
|
with:
|
||||||
|
fetch-depth: 0
|
||||||
|
|
||||||
|
- name: install stable
|
||||||
|
uses: actions-rs/toolchain@v1
|
||||||
|
with:
|
||||||
|
toolchain: stable
|
||||||
|
|
||||||
|
- name: install Linux dependencies
|
||||||
|
if: matrix.platform == 'ubuntu-latest'
|
||||||
|
run: |
|
||||||
|
sudo apt-get update
|
||||||
|
sudo apt-get install -y webkit2gtk-4.1 libayatana-appindicator3-dev libfuse2
|
||||||
|
|
||||||
|
- uses: Swatinem/rust-cache@v2
|
||||||
|
|
||||||
|
- name: install Tauri CLI
|
||||||
|
run: cargo install tauri-cli --git https://github.com/tauri-apps/tauri --branch dev
|
||||||
|
|
||||||
|
- name: run integration tests
|
||||||
|
run: cargo test --test '*' -- --ignored
|
||||||
File diff suppressed because it is too large
Load Diff
@ -1,5 +1,14 @@
|
|||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
|
## \[2.0.0-alpha.1]
|
||||||
|
|
||||||
|
- [`d74fc0a`](https://github.com/tauri-apps/plugins-workspace/commit/d74fc0a097996e90a37be8f57d50b7d1f6ca616f)([#555](https://github.com/tauri-apps/plugins-workspace/pull/555)) Update to alpha.11.
|
||||||
|
|
||||||
|
## \[2.0.0-alpha.0]
|
||||||
|
|
||||||
|
- [`717ae67`](https://github.com/tauri-apps/plugins-workspace/commit/717ae670978feb4492fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
|
||||||
|
te to alpha.11.
|
||||||
|
|
||||||
## \[2.0.0-alpha.0]
|
## \[2.0.0-alpha.0]
|
||||||
|
|
||||||
- [`717ae67`](https://github.com/tauri-apps/plugins-workspace/commit/717ae670978feb4492fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
|
- [`717ae67`](https://github.com/tauri-apps/plugins-workspace/commit/717ae670978feb4492fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
|
||||||
|
|||||||
@ -1,10 +1,13 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "tauri-plugin-app"
|
name = "tauri-plugin-app"
|
||||||
version = "2.0.0-alpha.0"
|
version = "2.0.0-alpha.1"
|
||||||
description = "APIs to read application metadata and change app visibility on macOS."
|
description = "APIs to read application metadata and change app visibility on macOS."
|
||||||
edition = { workspace = true }
|
edition = { workspace = true }
|
||||||
authors = { workspace = true }
|
authors = { workspace = true }
|
||||||
license = { workspace = true }
|
license = { workspace = true }
|
||||||
|
|
||||||
|
[package.metadata.docs.rs]
|
||||||
|
features = [ "tauri/dox" ]
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
tauri = { workspace = true }
|
tauri = { workspace = true }
|
||||||
|
|||||||
@ -1,5 +1,14 @@
|
|||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
|
## \[2.0.0-alpha.1]
|
||||||
|
|
||||||
|
- [`d74fc0a`](https://github.com/tauri-apps/plugins-workspace/commit/d74fc0a097996e90a37be8f57d50b7d1f6ca616f)([#555](https://github.com/tauri-apps/plugins-workspace/pull/555)) Update to alpha.11.
|
||||||
|
|
||||||
|
## \[2.0.0-alpha.0]
|
||||||
|
|
||||||
|
- [`717ae67`](https://github.com/tauri-apps/plugins-workspace/commit/717ae670978feb4492fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
|
||||||
|
te to alpha.11.
|
||||||
|
|
||||||
## \[2.0.0-alpha.0]
|
## \[2.0.0-alpha.0]
|
||||||
|
|
||||||
- [`717ae67`](https://github.com/tauri-apps/plugins-workspace/commit/717ae670978feb4492fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
|
- [`717ae67`](https://github.com/tauri-apps/plugins-workspace/commit/717ae670978feb4492fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
|
||||||
|
|||||||
@ -1,5 +1,14 @@
|
|||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
|
## \[2.0.0-alpha.1]
|
||||||
|
|
||||||
|
- [`d74fc0a`](https://github.com/tauri-apps/plugins-workspace/commit/d74fc0a097996e90a37be8f57d50b7d1f6ca616f)([#555](https://github.com/tauri-apps/plugins-workspace/pull/555)) Update to alpha.11.
|
||||||
|
|
||||||
|
## \[2.0.0-alpha.0]
|
||||||
|
|
||||||
|
- [`717ae67`](https://github.com/tauri-apps/plugins-workspace/commit/717ae670978feb4492fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
|
||||||
|
te to alpha.11.
|
||||||
|
|
||||||
## \[2.0.0-alpha.0]
|
## \[2.0.0-alpha.0]
|
||||||
|
|
||||||
- [`717ae67`](https://github.com/tauri-apps/plugins-workspace/commit/717ae670978feb4492fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
|
- [`717ae67`](https://github.com/tauri-apps/plugins-workspace/commit/717ae670978feb4492fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
|
||||||
|
|||||||
@ -1,5 +1,14 @@
|
|||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
|
## \[2.0.0-alpha.1]
|
||||||
|
|
||||||
|
- [`d74fc0a`](https://github.com/tauri-apps/plugins-workspace/commit/d74fc0a097996e90a37be8f57d50b7d1f6ca616f)([#555](https://github.com/tauri-apps/plugins-workspace/pull/555)) Update to alpha.11.
|
||||||
|
|
||||||
|
## \[2.0.0-alpha.0]
|
||||||
|
|
||||||
|
- [`717ae67`](https://github.com/tauri-apps/plugins-workspace/commit/717ae670978feb4492fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
|
||||||
|
te to alpha.11.
|
||||||
|
|
||||||
## \[2.0.0-alpha.0]
|
## \[2.0.0-alpha.0]
|
||||||
|
|
||||||
- [`717ae67`](https://github.com/tauri-apps/plugins-workspace/commit/717ae670978feb4492fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
|
- [`717ae67`](https://github.com/tauri-apps/plugins-workspace/commit/717ae670978feb4492fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
|
||||||
|
|||||||
@ -1,5 +1,14 @@
|
|||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
|
## \[2.0.0-alpha.1]
|
||||||
|
|
||||||
|
- [`d74fc0a`](https://github.com/tauri-apps/plugins-workspace/commit/d74fc0a097996e90a37be8f57d50b7d1f6ca616f)([#555](https://github.com/tauri-apps/plugins-workspace/pull/555)) Update to alpha.11.
|
||||||
|
|
||||||
|
## \[2.0.0-alpha.0]
|
||||||
|
|
||||||
|
- [`717ae67`](https://github.com/tauri-apps/plugins-workspace/commit/717ae670978feb4492fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
|
||||||
|
te to alpha.11.
|
||||||
|
|
||||||
## \[2.0.0-alpha.0]
|
## \[2.0.0-alpha.0]
|
||||||
|
|
||||||
- [`717ae67`](https://github.com/tauri-apps/plugins-workspace/commit/717ae670978feb4492fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
|
- [`717ae67`](https://github.com/tauri-apps/plugins-workspace/commit/717ae670978feb4492fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
|
||||||
|
|||||||
@ -1,5 +1,19 @@
|
|||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
|
## \[2.0.0-alpha.1]
|
||||||
|
|
||||||
|
- [`d74fc0a`](https://github.com/tauri-apps/plugins-workspace/commit/d74fc0a097996e90a37be8f57d50b7d1f6ca616f)([#555](https://github.com/tauri-apps/plugins-workspace/pull/555)) Update to alpha.11.
|
||||||
|
|
||||||
|
## \[2.0.0-alpha.0]
|
||||||
|
|
||||||
|
- [`717ae67`](https://github.com/tauri-apps/plugins-workspace/commit/717ae670978feb4492fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
|
||||||
|
d6e80b)([#545](https://github.com/tauri-apps/plugins-workspace/pull/545)) Fixes docs.rs build by enabling the `tauri/dox` feature flag.
|
||||||
|
- [`d74fc0a`](https://github.com/tauri-apps/plugins-workspace/commit/d74fc0a097996e90a37be8f57d50b7d1f6ca616f)([#555](https://github.com/tauri-apps/plugins-workspace/pull/555)) Update to alpha.11.
|
||||||
|
|
||||||
|
### Dependencies
|
||||||
|
|
||||||
|
- Upgraded to `fs@2.0.0-alpha.1`
|
||||||
|
|
||||||
## \[2.0.0-alpha.0]
|
## \[2.0.0-alpha.0]
|
||||||
|
|
||||||
- [`717ae67`](https://github.com/tauri-apps/plugins-workspace/commit/717ae670978feb4492fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
|
- [`717ae67`](https://github.com/tauri-apps/plugins-workspace/commit/717ae670978feb4492fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
|
||||||
|
|||||||
@ -1,5 +1,10 @@
|
|||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
|
## \[2.0.0-alpha.1]
|
||||||
|
|
||||||
|
- [`0bba693`](https://github.com/tauri-apps/plugins-workspace/commit/0bba6932c09da5267a9dbf75ba52252e39458420)([#454](https://github.com/tauri-apps/plugins-workspace/pull/454)) Fix `writeBinaryFile` crashing with `command 'write_binary_file' not found`
|
||||||
|
- [`d74fc0a`](https://github.com/tauri-apps/plugins-workspace/commit/d74fc0a097996e90a37be8f57d50b7d1f6ca616f)([#555](https://github.com/tauri-apps/plugins-workspace/pull/555)) Update to alpha.11.
|
||||||
|
|
||||||
## \[2.0.0-alpha.0]
|
## \[2.0.0-alpha.0]
|
||||||
|
|
||||||
- [`717ae67`](https://github.com/tauri-apps/plugins-workspace/commit/717ae670978feb4492fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
|
- [`717ae67`](https://github.com/tauri-apps/plugins-workspace/commit/717ae670978feb4492fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
|
||||||
|
|||||||
File diff suppressed because one or more lines are too long
@ -1,5 +1,14 @@
|
|||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
|
## \[2.0.0-alpha.1]
|
||||||
|
|
||||||
|
- [`d74fc0a`](https://github.com/tauri-apps/plugins-workspace/commit/d74fc0a097996e90a37be8f57d50b7d1f6ca616f)([#555](https://github.com/tauri-apps/plugins-workspace/pull/555)) Update to alpha.11.
|
||||||
|
|
||||||
|
## \[2.0.0-alpha.0]
|
||||||
|
|
||||||
|
- [`717ae67`](https://github.com/tauri-apps/plugins-workspace/commit/717ae670978feb4492fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
|
||||||
|
te to alpha.11.
|
||||||
|
|
||||||
## \[2.0.0-alpha.0]
|
## \[2.0.0-alpha.0]
|
||||||
|
|
||||||
- [`717ae67`](https://github.com/tauri-apps/plugins-workspace/commit/717ae670978feb4492fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
|
- [`717ae67`](https://github.com/tauri-apps/plugins-workspace/commit/717ae670978feb4492fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
|
||||||
|
|||||||
@ -1 +1 @@
|
|||||||
if("__TAURI__"in window){var __TAURI_GLOBALSHORTCUT__=function(_){"use strict";return _.isRegistered=async function(_){return await window.__TAURI_INVOKE__("plugin:globalShortcut|is_registered",{shortcut:_})},_.register=async function(_,t){return await window.__TAURI_INVOKE__("plugin:globalShortcut|register",{shortcut:_,handler:window.__TAURI__.transformCallback(t)})},_.registerAll=async function(_,t){return await window.__TAURI_INVOKE__("plugin:globalShortcut|register_all",{shortcuts:_,handler:window.__TAURI__.transformCallback(t)})},_.unregister=async function(_){return await window.__TAURI_INVOKE__("plugin:globalShortcut|unregister",{shortcut:_})},_.unregisterAll=async function(){return await window.__TAURI_INVOKE__("plugin:globalShortcut|unregister_all")},_}({});Object.defineProperty(window.__TAURI__,"globalShortcut",{value:__TAURI_GLOBALSHORTCUT__})}
|
if("__TAURI__"in window){var __TAURI_GLOBALSHORTCUT__=function(e){"use strict";var t=Object.defineProperty,n=(e,t,n)=>{if(!t.has(e))throw TypeError("Cannot "+n)},r=(e,t,r)=>(n(e,t,"read from private field"),r?r.call(e):t.get(e)),i=(e,t,r,i)=>(n(e,t,"write to private field"),i?i.call(e,r):t.set(e,r),r);function a(e,t=!1){let n=window.crypto.getRandomValues(new Uint32Array(1))[0],r=`_${n}`;return Object.defineProperty(window,r,{value:n=>(t&&Reflect.deleteProperty(window,r),e?.(n)),writable:!1,configurable:!0}),n}((e,n)=>{for(var r in n)t(e,r,{get:n[r],enumerable:!0})})({},{Channel:()=>s,PluginListener:()=>l,addPluginListener:()=>c,convertFileSrc:()=>_,invoke:()=>u,transformCallback:()=>a});var o,s=class{constructor(){this.__TAURI_CHANNEL_MARKER__=!0,((e,t,n)=>{if(t.has(e))throw TypeError("Cannot add the same private member more than once");t instanceof WeakSet?t.add(e):t.set(e,n)})(this,o,(()=>{})),this.id=a((e=>{r(this,o).call(this,e)}))}set onmessage(e){i(this,o,e)}get onmessage(){return r(this,o)}toJSON(){return`__CHANNEL__:${this.id}`}};o=new WeakMap;var l=class{constructor(e,t,n){this.plugin=e,this.event=t,this.channelId=n}async unregister(){return u(`plugin:${this.plugin}|remove_listener`,{event:this.event,channelId:this.channelId})}};async function c(e,t,n){let r=new s;return r.onmessage=n,u(`plugin:${e}|register_listener`,{event:t,handler:r}).then((()=>new l(e,t,r.id)))}async function u(e,t={},n){return new Promise(((r,i)=>{let o=a((e=>{r(e),Reflect.deleteProperty(window,`_${s}`)}),!0),s=a((e=>{i(e),Reflect.deleteProperty(window,`_${o}`)}),!0);window.__TAURI_IPC__({cmd:e,callback:o,error:s,payload:t,options:n})}))}function _(e,t="asset"){return window.__TAURI__.convertFileSrc(e,t)}return e.isRegistered=async function(e){return await u("plugin:globalShortcut|is_registered",{shortcut:e})},e.register=async function(e,t){const n=new s;return n.onmessage=t,await u("plugin:globalShortcut|register",{shortcut:e,handler:n})},e.registerAll=async function(e,t){const n=new s;return n.onmessage=t,await u("plugin:globalShortcut|register_all",{shortcuts:e,handler:n})},e.unregister=async function(e){return await u("plugin:globalShortcut|unregister",{shortcut:e})},e.unregisterAll=async function(){return await u("plugin:globalShortcut|unregister_all")},e}({});Object.defineProperty(window.__TAURI__,"globalShortcut",{value:__TAURI_GLOBALSHORTCUT__})}
|
||||||
|
|||||||
@ -1,5 +1,15 @@
|
|||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
|
## \[2.0.0-alpha.2]
|
||||||
|
|
||||||
|
- [`aec17a9`](https://github.com/tauri-apps/plugins-workspace/commit/aec17a90fc365774c70c4876b94a899416120e26)([#558](https://github.com/tauri-apps/plugins-workspace/pull/558)) Improve response performance by using the new IPC streaming data.
|
||||||
|
|
||||||
|
## \[2.0.0-alpha.1]
|
||||||
|
|
||||||
|
- [`7d9df72`](https://github.com/tauri-apps/plugins-workspace/commit/7d9df7297a221a64d9de945ffc2cd8313d3104dc)([#428](https://github.com/tauri-apps/plugins-workspace/pull/428)) Multipart requests are now handled in JavaScript by the `Request` JavaScript class so you just need to use a `FormData` body and not set the content-type header to `multipart/form-data`. `application/x-www-form-urlencoded` requests must be done manually.
|
||||||
|
- [`7d9df72`](https://github.com/tauri-apps/plugins-workspace/commit/7d9df7297a221a64d9de945ffc2cd8313d3104dc)([#428](https://github.com/tauri-apps/plugins-workspace/pull/428)) The http plugin has been rewritten from scratch and now only exposes a `fetch` function in Javascript and Re-exports `reqwest` crate in Rust. The new `fetch` method tries to be as close and compliant to the `fetch` Web API as possible.
|
||||||
|
- [`d74fc0a`](https://github.com/tauri-apps/plugins-workspace/commit/d74fc0a097996e90a37be8f57d50b7d1f6ca616f)([#555](https://github.com/tauri-apps/plugins-workspace/pull/555)) Update to alpha.11.
|
||||||
|
|
||||||
## \[2.0.0-alpha.0]
|
## \[2.0.0-alpha.0]
|
||||||
|
|
||||||
- [`717ae67`](https://github.com/tauri-apps/plugins-workspace/commit/717ae670978feb4492fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
|
- [`717ae67`](https://github.com/tauri-apps/plugins-workspace/commit/717ae670978feb4492fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
|
||||||
|
|||||||
@ -1,26 +1,43 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "tauri-plugin-http"
|
name = "tauri-plugin-http"
|
||||||
version = "2.0.0-alpha.0"
|
version = "2.0.0-alpha.2"
|
||||||
description = "Access an HTTP client written in Rust."
|
description = "Access an HTTP client written in Rust."
|
||||||
edition = { workspace = true }
|
edition = { workspace = true }
|
||||||
authors = { workspace = true }
|
authors = { workspace = true }
|
||||||
license = { workspace = true }
|
license = { workspace = true }
|
||||||
|
|
||||||
|
[package.metadata.docs.rs]
|
||||||
|
features = [ "tauri/dox" ]
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
serde = { workspace = true }
|
serde = { workspace = true }
|
||||||
serde_json = { workspace = true }
|
serde_json = { workspace = true }
|
||||||
tauri = { workspace = true }
|
tauri = { workspace = true }
|
||||||
thiserror = { workspace = true }
|
thiserror = { workspace = true }
|
||||||
tauri-plugin-fs = { path = "../fs", version = "2.0.0-alpha.0" }
|
tauri-plugin-fs = { path = "../fs", version = "2.0.0-alpha.1" }
|
||||||
glob = "0.3"
|
glob = "0.3"
|
||||||
rand = "0.8"
|
|
||||||
bytes = { version = "1", features = [ "serde" ] }
|
|
||||||
serde_repr = "0.1"
|
|
||||||
http = "0.2"
|
http = "0.2"
|
||||||
reqwest = { version = "0.11", default-features = false, features = [ "json", "stream" ] }
|
reqwest = { version = "0.11", default-features = false }
|
||||||
|
url = "2.4"
|
||||||
|
data-url = "0.3"
|
||||||
|
|
||||||
[features]
|
[features]
|
||||||
multipart = [ "reqwest/multipart" ]
|
multipart = [ "reqwest/multipart" ]
|
||||||
|
json = [ "reqwest/json" ]
|
||||||
|
stream = [ "reqwest/stream" ]
|
||||||
native-tls = [ "reqwest/native-tls" ]
|
native-tls = [ "reqwest/native-tls" ]
|
||||||
native-tls-vendored = [ "reqwest/native-tls-vendored" ]
|
native-tls-vendored = [ "reqwest/native-tls-vendored" ]
|
||||||
rustls-tls = [ "reqwest/rustls-tls" ]
|
rustls-tls = [ "reqwest/rustls-tls" ]
|
||||||
|
default-tls = [ "reqwest/default-tls" ]
|
||||||
|
native-tls-alpn = [ "reqwest/native-tls-alpn" ]
|
||||||
|
rustls-tls-manual-roots = [ "reqwest/rustls-tls-manual-roots" ]
|
||||||
|
rustls-tls-webpki-roots = [ "reqwest/rustls-tls-webpki-roots" ]
|
||||||
|
rustls-tls-native-roots = [ "reqwest/rustls-tls-native-roots" ]
|
||||||
|
blocking = [ "reqwest/blocking" ]
|
||||||
|
cookies = [ "reqwest/cookies" ]
|
||||||
|
gzip = [ "reqwest/gzip" ]
|
||||||
|
brotli = [ "reqwest/brotli" ]
|
||||||
|
deflate = [ "reqwest/deflate" ]
|
||||||
|
trust-dns = [ "reqwest/trust-dns" ]
|
||||||
|
socks = [ "reqwest/socks" ]
|
||||||
|
http3 = [ "reqwest/http3" ]
|
||||||
|
|||||||
@ -1 +1 @@
|
|||||||
if("__TAURI__"in window){var __TAURI_HTTP__=function(e){"use strict";var t;e.ResponseType=void 0,(t=e.ResponseType||(e.ResponseType={}))[t.JSON=1]="JSON",t[t.Text=2]="Text",t[t.Binary=3]="Binary";class r{constructor(e,t){this.type=e,this.payload=t}static form(e){const t={},s=(e,r)=>{if(null!==r){let s;s="string"==typeof r?r:r instanceof Uint8Array||Array.isArray(r)?Array.from(r):r instanceof File?{file:r.name,mime:r.type,fileName:r.name}:"string"==typeof r.file?{file:r.file,mime:r.mime,fileName:r.fileName}:{file:Array.from(r.file),mime:r.mime,fileName:r.fileName},t[String(e)]=s}};if(e instanceof FormData)for(const[t,r]of e)s(t,r);else for(const[t,r]of Object.entries(e))s(t,r);return new r("Form",t)}static json(e){return new r("Json",e)}static text(e){return new r("Text",e)}static bytes(e){return new r("Bytes",Array.from(e instanceof ArrayBuffer?new Uint8Array(e):e))}}class s{constructor(e){this.url=e.url,this.status=e.status,this.ok=this.status>=200&&this.status<300,this.headers=e.headers,this.rawHeaders=e.rawHeaders,this.data=e.data}}class n{constructor(e){this.id=e}async drop(){return window.__TAURI_INVOKE__("plugin:http|drop_client",{client:this.id})}async request(t){const r=!t.responseType||t.responseType===e.ResponseType.JSON;return r&&(t.responseType=e.ResponseType.Text),window.__TAURI_INVOKE__("plugin:http|request",{clientId:this.id,options:t}).then((e=>{const t=new s(e);if(r){try{t.data=JSON.parse(t.data)}catch(e){if(t.ok&&""===t.data)t.data={};else if(t.ok)throw Error(`Failed to parse response \`${t.data}\` as JSON: ${e};\n try setting the \`responseType\` option to \`ResponseType.Text\` or \`ResponseType.Binary\` if the API does not return a JSON response.`)}return t}return t}))}async get(e,t){return this.request({method:"GET",url:e,...t})}async post(e,t,r){return this.request({method:"POST",url:e,body:t,...r})}async put(e,t,r){return this.request({method:"PUT",url:e,body:t,...r})}async patch(e,t){return this.request({method:"PATCH",url:e,...t})}async delete(e,t){return this.request({method:"DELETE",url:e,...t})}}async function i(e){return window.__TAURI_INVOKE__("plugin:http|create_client",{options:e}).then((e=>new n(e)))}let o=null;return e.Body=r,e.Client=n,e.Response=s,e.fetch=async function(e,t){var r;return null===o&&(o=await i()),o.request({url:e,method:null!==(r=null==t?void 0:t.method)&&void 0!==r?r:"GET",...t})},e.getClient=i,e}({});Object.defineProperty(window.__TAURI__,"http",{value:__TAURI_HTTP__})}
|
if("__TAURI__"in window){var __TAURI_HTTP__=function(e){"use strict";return e.fetch=async function(e,t){const n=null==t?void 0:t.maxRedirections,r=null==t?void 0:t.maxRedirections;t&&(delete t.maxRedirections,delete t.connectTimeout);const _=new Request(e,t),i=await _.arrayBuffer(),a=i.byteLength?Array.from(new Uint8Array(i)):null,d=await window.__TAURI_INVOKE__("plugin:http|fetch",{cmd:"fetch",method:_.method,url:_.url,headers:Array.from(_.headers.entries()),data:a,maxRedirections:n,connectTimeout:r});_.signal.addEventListener("abort",(()=>{window.__TAURI_INVOKE__("plugin:http|fetch_cancel",{rid:d})}));const{status:o,statusText:s,url:c,headers:u}=await window.__TAURI_INVOKE__("plugin:http|fetch_send",{rid:d}),l=await window.__TAURI_INVOKE__("plugin:http|fetch_read_body",{rid:d}),w=new Response(Uint8Array.from(l),{headers:u,status:o,statusText:s});return Object.defineProperty(w,"url",{value:c}),w},e}({});Object.defineProperty(window.__TAURI__,"http",{value:__TAURI_HTTP__})}
|
||||||
|
|||||||
@ -1,341 +0,0 @@
|
|||||||
// Copyright 2019-2023 Tauri Programme within The Commons Conservancy
|
|
||||||
// SPDX-License-Identifier: Apache-2.0
|
|
||||||
// SPDX-License-Identifier: MIT
|
|
||||||
|
|
||||||
use std::{collections::HashMap, path::PathBuf, time::Duration};
|
|
||||||
|
|
||||||
use reqwest::{header, Method, Url};
|
|
||||||
use serde::{Deserialize, Deserializer, Serialize};
|
|
||||||
use serde_json::Value;
|
|
||||||
use serde_repr::{Deserialize_repr, Serialize_repr};
|
|
||||||
|
|
||||||
#[derive(Deserialize)]
|
|
||||||
#[serde(untagged)]
|
|
||||||
enum SerdeDuration {
|
|
||||||
Seconds(u64),
|
|
||||||
Duration(Duration),
|
|
||||||
}
|
|
||||||
|
|
||||||
fn deserialize_duration<'de, D: Deserializer<'de>>(
|
|
||||||
deserializer: D,
|
|
||||||
) -> std::result::Result<Option<Duration>, D::Error> {
|
|
||||||
if let Some(duration) = Option::<SerdeDuration>::deserialize(deserializer)? {
|
|
||||||
Ok(Some(match duration {
|
|
||||||
SerdeDuration::Seconds(s) => Duration::from_secs(s),
|
|
||||||
SerdeDuration::Duration(d) => d,
|
|
||||||
}))
|
|
||||||
} else {
|
|
||||||
Ok(None)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// The builder of [`Client`].
|
|
||||||
#[derive(Debug, Clone, Default, Deserialize)]
|
|
||||||
#[serde(rename_all = "camelCase")]
|
|
||||||
pub struct ClientBuilder {
|
|
||||||
/// Max number of redirections to follow.
|
|
||||||
pub max_redirections: Option<usize>,
|
|
||||||
/// Connect timeout for the request.
|
|
||||||
#[serde(deserialize_with = "deserialize_duration", default)]
|
|
||||||
pub connect_timeout: Option<Duration>,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl ClientBuilder {
|
|
||||||
/// Builds the Client.
|
|
||||||
pub fn build(self) -> crate::Result<Client> {
|
|
||||||
let mut client_builder = reqwest::Client::builder();
|
|
||||||
|
|
||||||
if let Some(max_redirections) = self.max_redirections {
|
|
||||||
client_builder = client_builder.redirect(if max_redirections == 0 {
|
|
||||||
reqwest::redirect::Policy::none()
|
|
||||||
} else {
|
|
||||||
reqwest::redirect::Policy::limited(max_redirections)
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
if let Some(connect_timeout) = self.connect_timeout {
|
|
||||||
client_builder = client_builder.connect_timeout(connect_timeout);
|
|
||||||
}
|
|
||||||
|
|
||||||
let client = client_builder.build()?;
|
|
||||||
Ok(Client(client))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// The HTTP client based on [`reqwest`].
|
|
||||||
#[derive(Debug, Clone)]
|
|
||||||
pub struct Client(reqwest::Client);
|
|
||||||
|
|
||||||
impl Client {
|
|
||||||
/// Executes an HTTP request
|
|
||||||
///
|
|
||||||
/// # Examples
|
|
||||||
pub async fn send(&self, mut request: HttpRequestBuilder) -> crate::Result<Response> {
|
|
||||||
let method = Method::from_bytes(request.method.to_uppercase().as_bytes())?;
|
|
||||||
|
|
||||||
let mut request_builder = self.0.request(method, request.url.as_str());
|
|
||||||
|
|
||||||
if let Some(query) = request.query {
|
|
||||||
request_builder = request_builder.query(&query);
|
|
||||||
}
|
|
||||||
|
|
||||||
if let Some(timeout) = request.timeout {
|
|
||||||
request_builder = request_builder.timeout(timeout);
|
|
||||||
}
|
|
||||||
|
|
||||||
if let Some(body) = request.body {
|
|
||||||
request_builder = match body {
|
|
||||||
Body::Bytes(data) => request_builder.body(bytes::Bytes::from(data)),
|
|
||||||
Body::Text(text) => request_builder.body(bytes::Bytes::from(text)),
|
|
||||||
Body::Json(json) => request_builder.json(&json),
|
|
||||||
Body::Form(form_body) => {
|
|
||||||
#[allow(unused_variables)]
|
|
||||||
fn send_form(
|
|
||||||
request_builder: reqwest::RequestBuilder,
|
|
||||||
headers: &mut Option<HeaderMap>,
|
|
||||||
form_body: FormBody,
|
|
||||||
) -> crate::Result<reqwest::RequestBuilder> {
|
|
||||||
#[cfg(feature = "multipart")]
|
|
||||||
if matches!(
|
|
||||||
headers
|
|
||||||
.as_ref()
|
|
||||||
.and_then(|h| h.0.get("content-type"))
|
|
||||||
.map(|v| v.as_bytes()),
|
|
||||||
Some(b"multipart/form-data")
|
|
||||||
) {
|
|
||||||
// the Content-Type header will be set by reqwest in the `.multipart` call
|
|
||||||
headers.as_mut().map(|h| h.0.remove("content-type"));
|
|
||||||
let mut multipart = reqwest::multipart::Form::new();
|
|
||||||
|
|
||||||
for (name, part) in form_body.0 {
|
|
||||||
let part = match part {
|
|
||||||
FormPart::File {
|
|
||||||
file,
|
|
||||||
mime,
|
|
||||||
file_name,
|
|
||||||
} => {
|
|
||||||
let bytes: Vec<u8> = file.try_into()?;
|
|
||||||
let mut part = reqwest::multipart::Part::bytes(bytes);
|
|
||||||
if let Some(mime) = mime {
|
|
||||||
part = part.mime_str(&mime)?;
|
|
||||||
}
|
|
||||||
if let Some(file_name) = file_name {
|
|
||||||
part = part.file_name(file_name);
|
|
||||||
}
|
|
||||||
part
|
|
||||||
}
|
|
||||||
FormPart::Text(value) => reqwest::multipart::Part::text(value),
|
|
||||||
};
|
|
||||||
|
|
||||||
multipart = multipart.part(name, part);
|
|
||||||
}
|
|
||||||
|
|
||||||
return Ok(request_builder.multipart(multipart));
|
|
||||||
}
|
|
||||||
|
|
||||||
let mut form = Vec::new();
|
|
||||||
for (name, part) in form_body.0 {
|
|
||||||
match part {
|
|
||||||
FormPart::File { file, .. } => {
|
|
||||||
let bytes: Vec<u8> = file.try_into()?;
|
|
||||||
form.push((name, serde_json::to_string(&bytes)?))
|
|
||||||
}
|
|
||||||
FormPart::Text(value) => form.push((name, value)),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Ok(request_builder.form(&form))
|
|
||||||
}
|
|
||||||
send_form(request_builder, &mut request.headers, form_body)?
|
|
||||||
}
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
if let Some(headers) = request.headers {
|
|
||||||
request_builder = request_builder.headers(headers.0);
|
|
||||||
}
|
|
||||||
|
|
||||||
let http_request = request_builder.build()?;
|
|
||||||
|
|
||||||
let response = self.0.execute(http_request).await?;
|
|
||||||
|
|
||||||
Ok(Response(
|
|
||||||
request.response_type.unwrap_or(ResponseType::Json),
|
|
||||||
response,
|
|
||||||
))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Serialize_repr, Deserialize_repr, Clone, Debug)]
|
|
||||||
#[repr(u16)]
|
|
||||||
#[non_exhaustive]
|
|
||||||
/// The HTTP response type.
|
|
||||||
pub enum ResponseType {
|
|
||||||
/// Read the response as JSON
|
|
||||||
Json = 1,
|
|
||||||
/// Read the response as text
|
|
||||||
Text,
|
|
||||||
/// Read the response as binary
|
|
||||||
Binary,
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Debug)]
|
|
||||||
pub struct Response(ResponseType, reqwest::Response);
|
|
||||||
|
|
||||||
impl Response {
|
|
||||||
/// Reads the response.
|
|
||||||
///
|
|
||||||
/// Note that the body is serialized to a [`Value`].
|
|
||||||
pub async fn read(self) -> crate::Result<ResponseData> {
|
|
||||||
let url = self.1.url().clone();
|
|
||||||
|
|
||||||
let mut headers = HashMap::new();
|
|
||||||
let mut raw_headers = HashMap::new();
|
|
||||||
for (name, value) in self.1.headers() {
|
|
||||||
headers.insert(
|
|
||||||
name.as_str().to_string(),
|
|
||||||
String::from_utf8(value.as_bytes().to_vec())?,
|
|
||||||
);
|
|
||||||
raw_headers.insert(
|
|
||||||
name.as_str().to_string(),
|
|
||||||
self.1
|
|
||||||
.headers()
|
|
||||||
.get_all(name)
|
|
||||||
.into_iter()
|
|
||||||
.map(|v| String::from_utf8(v.as_bytes().to_vec()).map_err(Into::into))
|
|
||||||
.collect::<crate::Result<Vec<String>>>()?,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
let status = self.1.status().as_u16();
|
|
||||||
|
|
||||||
let data = match self.0 {
|
|
||||||
ResponseType::Json => self.1.json().await?,
|
|
||||||
ResponseType::Text => Value::String(self.1.text().await?),
|
|
||||||
ResponseType::Binary => serde_json::to_value(&self.1.bytes().await?)?,
|
|
||||||
};
|
|
||||||
|
|
||||||
Ok(ResponseData {
|
|
||||||
url,
|
|
||||||
status,
|
|
||||||
headers,
|
|
||||||
raw_headers,
|
|
||||||
data,
|
|
||||||
})
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Debug, Serialize)]
|
|
||||||
#[serde(rename_all = "camelCase")]
|
|
||||||
#[non_exhaustive]
|
|
||||||
pub struct ResponseData {
|
|
||||||
/// Response URL. Useful if it followed redirects.
|
|
||||||
pub url: Url,
|
|
||||||
/// Response status code.
|
|
||||||
pub status: u16,
|
|
||||||
/// Response headers.
|
|
||||||
pub headers: HashMap<String, String>,
|
|
||||||
/// Response raw headers.
|
|
||||||
pub raw_headers: HashMap<String, Vec<String>>,
|
|
||||||
/// Response data.
|
|
||||||
pub data: Value,
|
|
||||||
}
|
|
||||||
|
|
||||||
/// A file path or contents.
|
|
||||||
#[derive(Debug, Clone, Deserialize)]
|
|
||||||
#[serde(untagged)]
|
|
||||||
#[non_exhaustive]
|
|
||||||
pub enum FilePart {
|
|
||||||
/// File path.
|
|
||||||
Path(PathBuf),
|
|
||||||
/// File contents.
|
|
||||||
Contents(Vec<u8>),
|
|
||||||
}
|
|
||||||
|
|
||||||
impl TryFrom<FilePart> for Vec<u8> {
|
|
||||||
type Error = crate::Error;
|
|
||||||
fn try_from(file: FilePart) -> crate::Result<Self> {
|
|
||||||
let bytes = match file {
|
|
||||||
FilePart::Path(path) => std::fs::read(path)?,
|
|
||||||
FilePart::Contents(bytes) => bytes,
|
|
||||||
};
|
|
||||||
Ok(bytes)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Debug, Deserialize)]
|
|
||||||
#[serde(untagged)]
|
|
||||||
#[non_exhaustive]
|
|
||||||
pub enum FormPart {
|
|
||||||
/// A string value.
|
|
||||||
Text(String),
|
|
||||||
/// A file value.
|
|
||||||
#[serde(rename_all = "camelCase")]
|
|
||||||
File {
|
|
||||||
/// File path or content.
|
|
||||||
file: FilePart,
|
|
||||||
/// Mime type of this part.
|
|
||||||
/// Only used when the `Content-Type` header is set to `multipart/form-data`.
|
|
||||||
mime: Option<String>,
|
|
||||||
/// File name.
|
|
||||||
/// Only used when the `Content-Type` header is set to `multipart/form-data`.
|
|
||||||
file_name: Option<String>,
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Debug, Deserialize)]
|
|
||||||
pub struct FormBody(pub(crate) HashMap<String, FormPart>);
|
|
||||||
|
|
||||||
#[derive(Debug, Deserialize)]
|
|
||||||
#[serde(tag = "type", content = "payload")]
|
|
||||||
#[non_exhaustive]
|
|
||||||
pub enum Body {
|
|
||||||
Form(FormBody),
|
|
||||||
Json(Value),
|
|
||||||
Text(String),
|
|
||||||
Bytes(Vec<u8>),
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Debug, Default)]
|
|
||||||
pub struct HeaderMap(header::HeaderMap);
|
|
||||||
|
|
||||||
impl<'de> Deserialize<'de> for HeaderMap {
|
|
||||||
fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
|
|
||||||
where
|
|
||||||
D: Deserializer<'de>,
|
|
||||||
{
|
|
||||||
let map = HashMap::<String, String>::deserialize(deserializer)?;
|
|
||||||
let mut headers = header::HeaderMap::default();
|
|
||||||
for (key, value) in map {
|
|
||||||
if let (Ok(key), Ok(value)) = (
|
|
||||||
header::HeaderName::from_bytes(key.as_bytes()),
|
|
||||||
header::HeaderValue::from_str(&value),
|
|
||||||
) {
|
|
||||||
headers.insert(key, value);
|
|
||||||
} else {
|
|
||||||
return Err(serde::de::Error::custom(format!(
|
|
||||||
"invalid header `{key}` `{value}`"
|
|
||||||
)));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Ok(Self(headers))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Debug, Deserialize)]
|
|
||||||
#[serde(rename_all = "camelCase")]
|
|
||||||
pub struct HttpRequestBuilder {
|
|
||||||
/// The request method (GET, POST, PUT, DELETE, PATCH, HEAD, OPTIONS, CONNECT or TRACE)
|
|
||||||
pub method: String,
|
|
||||||
/// The request URL
|
|
||||||
pub url: Url,
|
|
||||||
/// The request query params
|
|
||||||
pub query: Option<HashMap<String, String>>,
|
|
||||||
/// The request headers
|
|
||||||
pub headers: Option<HeaderMap>,
|
|
||||||
/// The request body
|
|
||||||
pub body: Option<Body>,
|
|
||||||
/// Timeout for the whole request
|
|
||||||
#[serde(deserialize_with = "deserialize_duration", default)]
|
|
||||||
pub timeout: Option<Duration>,
|
|
||||||
/// The response type (defaults to Json)
|
|
||||||
pub response_type: Option<ResponseType>,
|
|
||||||
}
|
|
||||||
@ -1,78 +0,0 @@
|
|||||||
// Copyright 2019-2023 Tauri Programme within The Commons Conservancy
|
|
||||||
// SPDX-License-Identifier: Apache-2.0
|
|
||||||
// SPDX-License-Identifier: MIT
|
|
||||||
|
|
||||||
use tauri::{path::SafePathBuf, AppHandle, Runtime, State};
|
|
||||||
use tauri_plugin_fs::FsExt;
|
|
||||||
|
|
||||||
use crate::{ClientId, Http};
|
|
||||||
|
|
||||||
mod client;
|
|
||||||
use client::{Body, ClientBuilder, FilePart, FormPart, HttpRequestBuilder, ResponseData};
|
|
||||||
|
|
||||||
pub use client::Client;
|
|
||||||
|
|
||||||
#[tauri::command]
|
|
||||||
pub async fn create_client<R: Runtime>(
|
|
||||||
_app: AppHandle<R>,
|
|
||||||
http: State<'_, Http<R>>,
|
|
||||||
options: Option<ClientBuilder>,
|
|
||||||
) -> super::Result<ClientId> {
|
|
||||||
let client = options.unwrap_or_default().build()?;
|
|
||||||
let mut store = http.clients.lock().unwrap();
|
|
||||||
let id = rand::random::<ClientId>();
|
|
||||||
store.insert(id, client);
|
|
||||||
Ok(id)
|
|
||||||
}
|
|
||||||
|
|
||||||
#[tauri::command]
|
|
||||||
pub async fn drop_client<R: Runtime>(
|
|
||||||
_app: AppHandle<R>,
|
|
||||||
http: State<'_, Http<R>>,
|
|
||||||
client: ClientId,
|
|
||||||
) -> super::Result<()> {
|
|
||||||
let mut store = http.clients.lock().unwrap();
|
|
||||||
store.remove(&client);
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
|
|
||||||
#[tauri::command]
|
|
||||||
pub async fn request<R: Runtime>(
|
|
||||||
app: AppHandle<R>,
|
|
||||||
http: State<'_, Http<R>>,
|
|
||||||
client_id: ClientId,
|
|
||||||
options: Box<HttpRequestBuilder>,
|
|
||||||
) -> super::Result<ResponseData> {
|
|
||||||
if http.scope.is_allowed(&options.url) {
|
|
||||||
let client = http
|
|
||||||
.clients
|
|
||||||
.lock()
|
|
||||||
.unwrap()
|
|
||||||
.get(&client_id)
|
|
||||||
.ok_or_else(|| crate::Error::HttpClientNotInitialized)?
|
|
||||||
.clone();
|
|
||||||
let options = *options;
|
|
||||||
if let Some(Body::Form(form)) = &options.body {
|
|
||||||
for value in form.0.values() {
|
|
||||||
if let FormPart::File {
|
|
||||||
file: FilePart::Path(path),
|
|
||||||
..
|
|
||||||
} = value
|
|
||||||
{
|
|
||||||
if SafePathBuf::new(path.clone()).is_err()
|
|
||||||
|| !app
|
|
||||||
.try_fs_scope()
|
|
||||||
.map(|s| s.is_allowed(path))
|
|
||||||
.unwrap_or_default()
|
|
||||||
{
|
|
||||||
return Err(crate::Error::PathNotAllowed(path.clone()));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
let response = client.send(options).await?;
|
|
||||||
Ok(response.read().await?)
|
|
||||||
} else {
|
|
||||||
Err(crate::Error::UrlNotAllowed(options.url))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue