max
/
tauri-plugins-workspace
mirror of https://github.com/tauri-apps/plugins-workspace
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

feat(upload): Add function to download files

Browse Source
pull/44/head^2
FabianLars 3 years ago
parent 27b73413e9
commit edaf951db3
No known key found for this signature in database
GPG Key ID: 3B12BC1DEBF61125
9 changed files with 179 additions and 78 deletions
Show Stats Download Patch File Download Diff File

2
Cargo.lock generated
Unescape View File

@ -4251,7 +4251,7 @@ dependencies = [
name = "tauri-plugin-upload"
version = "0.1.0"
dependencies = [
"futures",
"futures-util",
"log 0.4.17",
"read-progress-stream",
"reqwest",

2
plugins/upload/Cargo.toml
Unescape View File

@ -16,5 +16,5 @@ thiserror.workspace = true
tokio = { version = "1.17", features = [ "fs" ] }
tokio-util = { version = "0.7", features = [ "codec" ] }
reqwest = { version = "0.11", features = [ "json", "stream" ] }
futures = "0.3"
futures-util = "0.3"
read-progress-stream = "1.0.0"

6
plugins/upload/guest-js/dist/index.d.ts vendored
Unescape View File

@ -1,3 +1,5 @@
type ProgressHandler = (progress: number, total: number) => void;
export default function upload(url: string, filePath: string, progressHandler?: ProgressHandler, headers?: Map<string, string>): Promise<void>;
export {};
declare function upload(url: string, filePath: string, progressHandler?: ProgressHandler, headers?: Map<string, string>): Promise<void>;
declare function download(url: string, filePath: string, progressHandler?: ProgressHandler, headers?: Map<string, string>): Promise<void>;
export default upload;
export { download, upload };

25
plugins/upload/guest-js/dist/index.min.js vendored
Unescape View File

@ -11,12 +11,12 @@ Note that this is not an issue if running this frontend on a browser instead of
const handlers = new Map();
let listening = false;
async function listenToUploadEventIfNeeded() {
async function listenToEventIfNeeded(event) {
if (listening) {
return await Promise.resolve();
}
return await b
.listen("upload://progress", ({ payload }) => {
.listen(event, ({ payload }) => {
const handler = handlers.get(payload.id);
if (handler != null) {
handler(payload.progress, payload.total);
@ -33,8 +33,23 @@ async function upload(url, filePath, progressHandler, headers) {
if (progressHandler != null) {
handlers.set(id, progressHandler);
}
await listenToUploadEventIfNeeded();
await c$2("plugin:upload|upload", {
await listenToEventIfNeeded('upload://progress');
await c$2('plugin:upload|upload', {
id,
url,
filePath,
headers: headers !== null && headers !== void 0 ? headers : {},
});
}
async function download(url, filePath, progressHandler, headers) {
const ids = new Uint32Array(1);
window.crypto.getRandomValues(ids);
const id = ids[0];
if (progressHandler != null) {
handlers.set(id, progressHandler);
}
await listenToEventIfNeeded('download://progress');
await c$2('plugin:upload|upload', {
id,
url,
filePath,
@ -42,5 +57,5 @@ async function upload(url, filePath, progressHandler, headers) {
});
}
export { upload as default };
export { upload as default, download, upload };
//# sourceMappingURL=index.min.js.map

2
plugins/upload/guest-js/dist/index.min.js.map vendored
View File

File diff suppressed because one or more lines are too long

25
plugins/upload/guest-js/dist/index.mjs vendored
Unescape View File

@ -3,12 +3,12 @@ import { appWindow } from '@tauri-apps/api/window';
const handlers = new Map();
let listening = false;
async function listenToUploadEventIfNeeded() {
async function listenToEventIfNeeded(event) {
if (listening) {
return await Promise.resolve();
}
return await appWindow
.listen("upload://progress", ({ payload }) => {
.listen(event, ({ payload }) => {
const handler = handlers.get(payload.id);
if (handler != null) {
handler(payload.progress, payload.total);
@ -25,8 +25,23 @@ async function upload(url, filePath, progressHandler, headers) {
if (progressHandler != null) {
handlers.set(id, progressHandler);
}
await listenToUploadEventIfNeeded();
await invoke("plugin:upload|upload", {
await listenToEventIfNeeded('upload://progress');
await invoke('plugin:upload|upload', {
id,
url,
filePath,
headers: headers !== null && headers !== void 0 ? headers : {},
});
}
async function download(url, filePath, progressHandler, headers) {
const ids = new Uint32Array(1);
window.crypto.getRandomValues(ids);
const id = ids[0];
if (progressHandler != null) {
handlers.set(id, progressHandler);
}
await listenToEventIfNeeded('download://progress');
await invoke('plugin:upload|upload', {
id,
url,
filePath,
@ -34,5 +49,5 @@ async function upload(url, filePath, progressHandler, headers) {
});
}
export { upload as default };
export { upload as default, download, upload };
//# sourceMappingURL=index.mjs.map

2
plugins/upload/guest-js/dist/index.mjs.map vendored
Unescape View File

@ -1 +1 @@
{"version":3,"file":"index.mjs","sources":["../index.ts"],"sourcesContent":[null],"names":[],"mappings":";;;AAUA,MAAM,QAAQ,GAAiC,IAAI,GAAG,EAAE,CAAC;AACzD,IAAI,SAAS,GAAG,KAAK,CAAC;AAEtB,eAAe,2BAA2B,GAAA;AACxC,IAAA,IAAI,SAAS,EAAE;AACb,QAAA,OAAO,MAAM,OAAO,CAAC,OAAO,EAAE,CAAC;AAChC,KAAA;AACD,IAAA,OAAO,MAAM,SAAS;SACnB,MAAM,CAAkB,mBAAmB,EAAE,CAAC,EAAE,OAAO,EAAE,KAAI;QAC5D,MAAM,OAAO,GAAG,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QACzC,IAAI,OAAO,IAAI,IAAI,EAAE;YACnB,OAAO,CAAC,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC;AAC1C,SAAA;AACH,KAAC,CAAC;SACD,IAAI,CAAC,MAAK;QACT,SAAS,GAAG,IAAI,CAAC;AACnB,KAAC,CAAC,CAAC;AACP,CAAC;AAEc,eAAe,MAAM,CAClC,GAAW,EACX,QAAgB,EAChB,eAAiC,EACjC,OAA6B,EAAA;AAE7B,IAAA,MAAM,GAAG,GAAG,IAAI,WAAW,CAAC,CAAC,CAAC,CAAC;AAC/B,IAAA,MAAM,CAAC,MAAM,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC;AACnC,IAAA,MAAM,EAAE,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC;IAElB,IAAI,eAAe,IAAI,IAAI,EAAE;AAC3B,QAAA,QAAQ,CAAC,GAAG,CAAC,EAAE,EAAE,eAAe,CAAC,CAAC;AACnC,KAAA;IAED,MAAM,2BAA2B,EAAE,CAAC;IAEpC,MAAM,MAAM,CAAC,sBAAsB,EAAE;QACnC,EAAE;QACF,GAAG;QACH,QAAQ;AACR,QAAA,OAAO,EAAE,OAAO,KAAA,IAAA,IAAP,OAAO,KAAP,KAAA,CAAA,GAAA,OAAO,GAAI,EAAE;AACvB,KAAA,CAAC,CAAC;AACL;;;;"}
{"version":3,"file":"index.mjs","sources":["../index.ts"],"sourcesContent":[null],"names":[],"mappings":";;;AAUA,MAAM,QAAQ,GAAiC,IAAI,GAAG,EAAE,CAAC;AACzD,IAAI,SAAS,GAAG,KAAK,CAAC;AAEtB,eAAe,qBAAqB,CAAC,KAAa,EAAA;AAC9C,IAAA,IAAI,SAAS,EAAE;AACX,QAAA,OAAO,MAAM,OAAO,CAAC,OAAO,EAAE,CAAC;AAClC,KAAA;AACD,IAAA,OAAO,MAAM,SAAS;SACjB,MAAM,CAAkB,KAAK,EAAE,CAAC,EAAE,OAAO,EAAE,KAAI;QAC5C,MAAM,OAAO,GAAG,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QACzC,IAAI,OAAO,IAAI,IAAI,EAAE;YACjB,OAAO,CAAC,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC;AAC5C,SAAA;AACL,KAAC,CAAC;SACD,IAAI,CAAC,MAAK;QACP,SAAS,GAAG,IAAI,CAAC;AACrB,KAAC,CAAC,CAAC;AACX,CAAC;AAED,eAAe,MAAM,CAAC,GAAW,EAAE,QAAgB,EAAE,eAAiC,EAAE,OAA6B,EAAA;AACjH,IAAA,MAAM,GAAG,GAAG,IAAI,WAAW,CAAC,CAAC,CAAC,CAAC;AAC/B,IAAA,MAAM,CAAC,MAAM,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC;AACnC,IAAA,MAAM,EAAE,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC;IAElB,IAAI,eAAe,IAAI,IAAI,EAAE;AACzB,QAAA,QAAQ,CAAC,GAAG,CAAC,EAAE,EAAE,eAAe,CAAC,CAAC;AACrC,KAAA;AAED,IAAA,MAAM,qBAAqB,CAAC,mBAAmB,CAAC,CAAC;IAEjD,MAAM,MAAM,CAAC,sBAAsB,EAAE;QACjC,EAAE;QACF,GAAG;QACH,QAAQ;AACR,QAAA,OAAO,EAAE,OAAO,KAAA,IAAA,IAAP,OAAO,KAAP,KAAA,CAAA,GAAA,OAAO,GAAI,EAAE;AACzB,KAAA,CAAC,CAAC;AACP,CAAC;AAED,eAAe,QAAQ,CAAC,GAAW,EAAE,QAAgB,EAAE,eAAiC,EAAE,OAA6B,EAAA;AACnH,IAAA,MAAM,GAAG,GAAG,IAAI,WAAW,CAAC,CAAC,CAAC,CAAC;AAC/B,IAAA,MAAM,CAAC,MAAM,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC;AACnC,IAAA,MAAM,EAAE,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC;IAElB,IAAI,eAAe,IAAI,IAAI,EAAE;AACzB,QAAA,QAAQ,CAAC,GAAG,CAAC,EAAE,EAAE,eAAe,CAAC,CAAC;AACrC,KAAA;AAED,IAAA,MAAM,qBAAqB,CAAC,qBAAqB,CAAC,CAAC;IAEnD,MAAM,MAAM,CAAC,sBAAsB,EAAE;QACjC,EAAE;QACF,GAAG;QACH,QAAQ;AACR,QAAA,OAAO,EAAE,OAAO,KAAA,IAAA,IAAP,OAAO,KAAP,KAAA,CAAA,GAAA,OAAO,GAAI,EAAE;AACzB,KAAA,CAAC,CAAC;AACP;;;;"}

35
plugins/upload/guest-js/index.ts
Unescape View File

@ -11,12 +11,12 @@ type ProgressHandler = (progress: number, total: number) => void;
const handlers: Map<number, ProgressHandler> = new Map();
let listening = false;
async function listenToUploadEventIfNeeded(): Promise<void> {
async function listenToEventIfNeeded(event: string): Promise<void> {
if (listening) {
return await Promise.resolve();
}
return await appWindow
.listen<ProgressPayload>("upload://progress", ({ payload }) => {
.listen<ProgressPayload>(event, ({ payload }) => {
const handler = handlers.get(payload.id);
if (handler != null) {
handler(payload.progress, payload.total);
@ -27,7 +27,7 @@ async function listenToUploadEventIfNeeded(): Promise<void> {
});
}
export default async function upload(
async function upload(
url: string,
filePath: string,
progressHandler?: ProgressHandler,
@ -41,7 +41,7 @@ export default async function upload(
handlers.set(id, progressHandler);
}
await listenToUploadEventIfNeeded();
await listenToEventIfNeeded("upload://progress");
await invoke("plugin:upload|upload", {
id,
@ -50,3 +50,30 @@ export default async function upload(
headers: headers ?? {},
});
}
async function download(
url: string,
filePath: string,
progressHandler?: ProgressHandler,
headers?: Map<string, string>
): Promise<void> {
const ids = new Uint32Array(1);
window.crypto.getRandomValues(ids);
const id = ids[0];
if (progressHandler != null) {
handlers.set(id, progressHandler);
}
await listenToEventIfNeeded("download://progress");
await invoke("plugin:upload|upload", {
id,
url,
filePath,
headers: headers ?? {},
});
}
export default upload;
export { download, upload };

48
plugins/upload/src/lib.rs
Unescape View File

@ -2,10 +2,10 @@
// SPDX-License-Identifier: Apache-2.0
// SPDX-License-Identifier: MIT
use futures::TryStreamExt;
use futures_util::TryStreamExt;
use serde::{ser::Serializer, Serialize};
use tauri::{command, plugin::Plugin, Invoke, Runtime, Window};
use tokio::fs::File;
use tokio::{fs::File, io::AsyncWriteExt};
use tokio_util::codec::{BytesCodec, FramedRead};
use read_progress_stream::ReadProgressStream;
@ -20,6 +20,8 @@ pub enum Error {
Io(#[from] std::io::Error),
#[error(transparent)]
Request(#[from] reqwest::Error),
#[error("{0}")]
ContentLength(String),
}
impl Serialize for Error {
@ -38,6 +40,46 @@ struct ProgressPayload {
total: u64,
}
#[command]
async fn download<R: Runtime>(
window: Window<R>,
id: u32,
url: &str,
file_path: &str,
headers: HashMap<String, String>,
) -> Result<u32> {
let client = reqwest::Client::new();
let mut request = client.get(url);
// Loop trought the headers keys and values
// and add them to the request object.
for (key, value) in headers {
request = request.header(&key, value);
}
let response = request.send().await?;
let total = response.content_length().ok_or_else(|| {
Error::ContentLength(format!("Failed to get content length from '{}'", url))
})?;
let mut file = File::create(file_path).await?;
let mut stream = response.bytes_stream();
while let Some(chunk) = stream.try_next().await? {
file.write_all(&chunk).await?;
let _ = window.emit(
"download://progress",
ProgressPayload {
id,
progress: chunk.len() as u64,
total,
},
);
}
Ok(id)
}
#[command]
async fn upload<R: Runtime>(
window: Window<R>,
@ -90,7 +132,7 @@ pub struct Upload<R: Runtime> {
impl<R: Runtime> Default for Upload<R> {
fn default() -> Self {
Self {
invoke_handler: Box::new(tauri::generate_handler![upload]),
invoke_handler: Box::new(tauri::generate_handler![download, upload]),
}
}
}

Write Preview
Loading…
Cancel
Save