mirror of
https://github.com/Portabase/agent.git
synced 2026-09-10 01:57:10 +00:00
chore(release): 1.0.5-rc.2
This commit is contained in:
+1
-1
@@ -22,5 +22,5 @@ keywords:
|
||||
- self-hosted
|
||||
- portabase
|
||||
license: Apache-2.0
|
||||
version: 1.0.5-rc.1
|
||||
version: 1.0.5-rc.2
|
||||
date-released: "2026-02-01"
|
||||
Generated
+1
-1
@@ -1617,7 +1617,7 @@ checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c"
|
||||
|
||||
[[package]]
|
||||
name = "portabase-agent"
|
||||
version = "1.0.4"
|
||||
version = "1.0.5-rc.1"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"async-stream",
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "portabase-agent"
|
||||
version = "1.0.5-rc.1"
|
||||
version = "1.0.5-rc.2"
|
||||
edition = "2024"
|
||||
|
||||
[dependencies]
|
||||
|
||||
+9
-21
@@ -6,14 +6,14 @@ use crate::services::config::{DatabaseConfig, DatabasesConfig, DbType};
|
||||
use crate::utils::common::BackupMethod;
|
||||
use crate::utils::file::{encrypt_file_stream, full_extension};
|
||||
use anyhow::Result;
|
||||
use futures::StreamExt;
|
||||
use hex;
|
||||
use rand::RngCore;
|
||||
use reqwest::Body;
|
||||
use std::path::{Path, PathBuf};
|
||||
use std::sync::Arc;
|
||||
use rand::RngCore;
|
||||
use tempfile::TempDir;
|
||||
use tracing::{error, info};
|
||||
use reqwest::Body;
|
||||
use futures::StreamExt;
|
||||
|
||||
#[derive(Debug)]
|
||||
pub struct BackupResult {
|
||||
@@ -130,16 +130,8 @@ impl BackupService {
|
||||
|
||||
let public_key_pem = self.ctx.edge_key.public_key.as_bytes().to_vec();
|
||||
|
||||
|
||||
let (encrypted_stream, encrypted_key_hex) =
|
||||
match encrypt_file_stream(
|
||||
file_path.clone(),
|
||||
aes_key,
|
||||
iv,
|
||||
public_key_pem,
|
||||
)
|
||||
.await
|
||||
{
|
||||
match encrypt_file_stream(file_path.clone(), aes_key, iv, public_key_pem).await {
|
||||
Ok(v) => v,
|
||||
Err(e) => {
|
||||
error!("Encryption failed: {}", e);
|
||||
@@ -147,24 +139,20 @@ impl BackupService {
|
||||
}
|
||||
};
|
||||
|
||||
let file_size = std::fs::metadata(&file_path)
|
||||
.map(|m| m.len())
|
||||
.unwrap_or(0);
|
||||
let file_size = std::fs::metadata(&file_path).map(|m| m.len()).unwrap_or(0);
|
||||
|
||||
let body = Body::wrap_stream(
|
||||
encrypted_stream.map(|r| r.map_err(|e| std::io::Error::new(std::io::ErrorKind::Other, e)))
|
||||
encrypted_stream
|
||||
.map(|r| r.map_err(|e| std::io::Error::new(std::io::ErrorKind::Other, e))),
|
||||
);
|
||||
|
||||
let url = format!(
|
||||
"{}/api/agent/{}/backup",
|
||||
// "{}/services/v1/upload/{}",
|
||||
self.ctx.edge_key.server_url,
|
||||
self.ctx.edge_key.agent_id
|
||||
"{}/services/v1/upload/{}",
|
||||
self.ctx.edge_key.server_url, self.ctx.edge_key.agent_id
|
||||
);
|
||||
|
||||
let client = reqwest::Client::new();
|
||||
|
||||
|
||||
info!("file Size to {}", file_size);
|
||||
|
||||
let resp = client
|
||||
|
||||
Reference in New Issue
Block a user