11
This commit is contained in:
2
src-tauri/Cargo.lock
generated
2
src-tauri/Cargo.lock
generated
@@ -5112,7 +5112,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "tauri-app"
|
name = "tauri-app"
|
||||||
version = "0.1.13"
|
version = "0.1.14"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"aes-gcm",
|
"aes-gcm",
|
||||||
"async-trait",
|
"async-trait",
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "tauri-app"
|
name = "tauri-app"
|
||||||
version = "0.1.13"
|
version = "0.1.14"
|
||||||
description = "A Tauri App"
|
description = "A Tauri App"
|
||||||
authors = ["you"]
|
authors = ["you"]
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
use serde::Deserialize;
|
use serde::Deserialize;
|
||||||
use serde_json::{json, Value};
|
use serde_json::{json, Value};
|
||||||
use tauri::{AppHandle, Manager, State, Window};
|
use tauri::{AppHandle, Emitter, Manager, State, Window};
|
||||||
use tokio::sync::watch;
|
use tokio::sync::watch;
|
||||||
|
|
||||||
use crate::app_config::AppConfig;
|
use crate::app_config::AppConfig;
|
||||||
@@ -108,6 +108,16 @@ pub async fn publish_login(
|
|||||||
} else {
|
} else {
|
||||||
(store.create_account_slot(platform.clone()).await?.id, true)
|
(store.create_account_slot(platform.clone()).await?.id, true)
|
||||||
};
|
};
|
||||||
|
|
||||||
|
let _ = window.emit(
|
||||||
|
"nodejs:event",
|
||||||
|
serde_json::json!({
|
||||||
|
"type": "progress",
|
||||||
|
"scriptName": "publish_login.js",
|
||||||
|
"status": "正在加载登录脚本并启动浏览器…",
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
|
||||||
let result = run_publish_script(
|
let result = run_publish_script(
|
||||||
app,
|
app,
|
||||||
window,
|
window,
|
||||||
|
|||||||
@@ -293,7 +293,44 @@ async fn write_script_bundle(
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
fn local_nodejs_scripts_dir() -> Option<PathBuf> {
|
||||||
|
if let Ok(dir) = std::env::var("AICLIENT_NODEJS_SCRIPTS_DIR") {
|
||||||
|
let p = PathBuf::from(dir.trim());
|
||||||
|
if p.is_dir() {
|
||||||
|
return Some(p);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
#[cfg(debug_assertions)]
|
||||||
|
{
|
||||||
|
let dev = PathBuf::from(env!("CARGO_MANIFEST_DIR"))
|
||||||
|
.join("../../pythonbackend/scripts/nodejs");
|
||||||
|
if dev.is_dir() {
|
||||||
|
return Some(dev);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
None
|
||||||
|
}
|
||||||
|
|
||||||
|
fn read_local_node_script(script_name: &str) -> Option<String> {
|
||||||
|
let name = normalize_script_name(script_name)?;
|
||||||
|
let dir = local_nodejs_scripts_dir()?;
|
||||||
|
let path = dir.join(&name);
|
||||||
|
if !path.is_file() {
|
||||||
|
return None;
|
||||||
|
}
|
||||||
|
std::fs::read_to_string(&path).ok()
|
||||||
|
}
|
||||||
|
|
||||||
async fn fetch_node_script_source(script_name: &str) -> Result<String, NodeError> {
|
async fn fetch_node_script_source(script_name: &str) -> Result<String, NodeError> {
|
||||||
|
// if let Some(source) = read_local_node_script(script_name) {
|
||||||
|
// log::info!(
|
||||||
|
// target: "nodejs",
|
||||||
|
// "使用本地脚本: {}",
|
||||||
|
// script_name
|
||||||
|
// );
|
||||||
|
// return Ok(source);
|
||||||
|
// }
|
||||||
|
|
||||||
let q = urlencoding::encode(script_name);
|
let q = urlencoding::encode(script_name);
|
||||||
let path = format!("/nodejs-scripts?name={q}");
|
let path = format!("/nodejs-scripts?name={q}");
|
||||||
let (_status, v) = crate::api_client::request_json("GET", &path, None, HashMap::new())
|
let (_status, v) = crate::api_client::request_json("GET", &path, None, HashMap::new())
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"$schema": "https://schema.tauri.app/config/2",
|
"$schema": "https://schema.tauri.app/config/2",
|
||||||
"productName": "aiclient",
|
"productName": "aiclient",
|
||||||
"version": "0.1.13",
|
"version": "0.1.14",
|
||||||
"identifier": "com.aiclient.desktop",
|
"identifier": "com.aiclient.desktop",
|
||||||
"build": {
|
"build": {
|
||||||
"beforeDevCommand": "npm run dev --prefix ../aiclient_ui",
|
"beforeDevCommand": "npm run dev --prefix ../aiclient_ui",
|
||||||
|
|||||||
Reference in New Issue
Block a user