Ldc1

Cargo.toml

@@ -96,7 +96,7 @@ toml = "0.8"
 git2 = { version = "0.18", default-features = false, features = ["https", "vendored-libgit2"] }
 
 # Terminal
-portable-pty = "0.8"
+portable-pty = "0.9.0"
 vte = "0.15.0"
 
 # Grep (search)
@@ -113,15 +113,17 @@ similar = "2.5"
 urlencoding = "2.1"
 
 # Tauri (desktop only)
- tauri = { version = "2", features = ["unstable", "macos-private-api", "tray-icon"] }
+tauri = { git = "https://github.com/richerfu/tauri", branch = "feat/open-harmony", features = [] }
+tauri-plugin-dialog = "2"
 tauri-plugin-opener = "2"
-tauri-plugin-dialog = "2.6"
 tauri-plugin-fs = "2"
 tauri-plugin-log = "2"
 tauri-plugin-autostart = "2"
 tauri-plugin-notification = "2"
 tauri-plugin-updater = "2"
-tauri-build = { version = "2", features = [] }
+tauri-build = { git = "https://github.com/richerfu/tauri", branch = "feat/open-harmony", features = [] }
+napi-ohos = { version = "1.1" }
+napi-derive-ohos = { version = "1.1" }
 
 # Windows-specific dependencies
 win32job = "2.0"
@@ -163,3 +165,13 @@ lto = false
 codegen-units = 16
 strip = false
 incremental = true
+
+[patch.crates-io]
+wry = { git = "https://github.com/richerfu/wry"}
+tao = { git = "https://github.com/richerfu/tao", branch = "feat-ohos-webview"}
+openharmony-ability = {git = "https://github.com/harmony-contrib/openharmony-ability.git"}
+openharmony-ability-derive = {git = "https://github.com/harmony-contrib/openharmony-ability.git"}
+tauri = { git = "https://github.com/richerfu/tauri", branch = "feat/open-harmony"}
+tauri-runtime = { git = "https://github.com/richerfu/tauri", branch = "feat/open-harmony"}
+tauri-macros = { git = "https://github.com/richerfu/tauri", branch = "feat/open-harmony"}
+tauri-runtime-wry = { git = "https://github.com/richerfu/tauri", branch = "feat/open-harmony"}

src/apps/desktop/Cargo.toml

@@ -30,9 +30,8 @@ tauri-plugin-opener = { workspace = true }
 tauri-plugin-dialog = { workspace = true }
 tauri-plugin-fs = { workspace = true }
 tauri-plugin-log = { workspace = true }
-tauri-plugin-autostart = { workspace = true }
-tauri-plugin-notification = { workspace = true }
-tauri-plugin-updater = { workspace = true }
+napi-ohos = { workspace = true }
+napi-derive-ohos = { workspace = true }
 
 # Inherited from workspace
 tokio = { workspace = true }
@@ -44,7 +43,6 @@ chrono = { workspace = true }
 uuid = { workspace = true }
 regex = { workspace = true }
 dirs = { workspace = true }
-dark-light = { workspace = true }
 similar = { workspace = true }
 ignore = { workspace = true }
 urlencoding = { workspace = true }
@@ -54,8 +52,6 @@ thiserror = "1.0"
 futures = { workspace = true }
 async-trait = { workspace = true }
 sha1 = { workspace = true }
-screenshots = "0.8"
-enigo = "0.2"
 image = { version = "0.24", default-features = false, features = ["png", "jpeg"] }
 resvg = { version = "0.47.0", default-features = false }
 
@@ -90,6 +86,6 @@ default = []
 # Never enabled in release profile intended for end users.
 devtools = ["tauri/devtools"]
 
-[target.'cfg(target_os = "linux")'.dependencies]
-atspi = "0.29"
+[target.'cfg(all(target_os = "linux", not(target_env = "ohos")))'.dependencies]
 leptess = "0.14.0"
+atspi = "0.29"

src/apps/desktop/capabilities/default.json

@@ -1,110 +1,89 @@
 {
-  "$schema": "../gen/schemas/desktop-schema.json",
-  "identifier": "default",
-  "description": "BitFun default capabilities",
-  "windows": ["main", "agent-companion-pet"],
-  "permissions": [
-    "log:default",
-    "autostart:default",
-    "core:default",
-    "core:path:default",
-    "core:event:default",
-    "core:event:allow-listen",
-    "core:event:allow-emit",
-    "core:window:default",
-    "core:webview:default",
-    "core:webview:allow-create-webview",
-    "core:webview:allow-set-webview-position",
-    "core:webview:allow-set-webview-size",
-    "core:webview:allow-set-webview-focus",
-    "core:webview:allow-reparent",
-    "core:webview:allow-webview-show",
-    "core:webview:allow-webview-hide",
-    "core:webview:allow-webview-close",
-    "core:window:allow-create",
-    "core:window:allow-set-focus",
-    "core:window:allow-set-always-on-top",
-    "core:window:allow-set-position",
-    "core:window:allow-set-size",
-    "core:window:allow-set-decorations",
-    "core:window:allow-set-title-bar-style",
-    "core:window:allow-set-skip-taskbar",
-    "core:window:allow-set-resizable",
-    "core:window:allow-current-monitor",
-    "core:window:allow-outer-position",
-    "core:window:allow-outer-size",
-    "core:window:allow-is-fullscreen",
-    "core:window:allow-is-maximized",
-    "core:window:allow-center",
-    "core:window:allow-close",
-    "core:window:allow-hide",
-    "core:window:allow-maximize",
-    "core:window:allow-minimize",
-    "core:window:allow-show",
-    "core:window:allow-start-dragging",
-    "core:window:allow-unmaximize",
-    "core:window:allow-unminimize",
-    "core:window:allow-set-min-size",
-    "dialog:default",
-    "dialog:allow-open",
-    "dialog:allow-save",
-    "dialog:allow-ask",
-    "dialog:allow-confirm",
-    "dialog:allow-message",
-    "opener:default",
-    "opener:allow-open-url",
-    {
-      "identifier": "opener:allow-open-path",
-      "allow": [
-        { "path": "$APPDATA/**" },
-        { "path": "$HOME/**" }
-      ]
-    },
-    "opener:allow-reveal-item-in-dir",
-    "fs:default",
-    "fs:allow-read-file",
-    "fs:allow-write-file",
-    "fs:allow-read-dir",
-    "fs:allow-copy-file",
-    "fs:allow-create",
-    "fs:allow-mkdir",
-    "fs:allow-remove",
-    "fs:allow-rename",
-    "fs:allow-exists",
-    "fs:allow-read-text-file",
-    "fs:allow-write-text-file",
-    "fs:allow-stat",
-    "fs:allow-lstat",
-    "fs:allow-fstat",
-    "fs:allow-truncate",
-    "fs:allow-ftruncate",
-    "fs:allow-open",
-    "fs:allow-read",
-    "fs:allow-write",
-    "fs:allow-seek",
-    "fs:allow-unwatch",
-    "fs:allow-watch",
-    "fs:read-all",
-    "fs:write-all",
-    "fs:scope-app-recursive",
-    {
-      "identifier": "fs:allow-home-read-recursive",
-      "allow": [
-        { "path": "$HOME/**" }
-      ]
-    },
-    {
-      "identifier":     "fs:allow-home-write-recursive",
-      "allow": [
-        { "path": "$HOME/**" }
-      ]
-    },
-    "notification:default",
-    "notification:allow-notify",
-    "notification:allow-show",
-    "notification:allow-request-permission",
-    "notification:allow-check-permissions",
-    "notification:allow-permission-state",
-    "notification:allow-is-permission-granted"
-  ]
-}
+    "$schema": "../gen/schemas/desktop-schema.json",
+    "identifier": "default",
+    "description": "BitFun default capabilities",
+    "windows": ["main"],
+    "permissions": [
+        "log:default",
+        "core:default",
+        "core:path:default",
+        "core:event:default",
+        "core:event:allow-listen",
+        "core:event:allow-emit",
+        "core:window:default",
+        "core:webview:default",
+        "core:webview:allow-create-webview",
+        "core:webview:allow-set-webview-position",
+        "core:webview:allow-set-webview-size",
+        "core:webview:allow-set-webview-focus",
+        "core:webview:allow-reparent",
+        "core:webview:allow-webview-show",
+        "core:webview:allow-webview-hide",
+        "core:webview:allow-webview-close",
+        "core:window:allow-create",
+        "core:window:allow-set-focus",
+        "core:window:allow-set-always-on-top",
+        "core:window:allow-set-position",
+        "core:window:allow-set-size",
+        "core:window:allow-set-decorations",
+        "core:window:allow-set-title-bar-style",
+        "core:window:allow-set-skip-taskbar",
+        "core:window:allow-set-resizable",
+        "core:window:allow-current-monitor",
+        "core:window:allow-outer-position",
+        "core:window:allow-outer-size",
+        "core:window:allow-is-maximized",
+        "core:window:allow-center",
+        "core:window:allow-close",
+        "core:window:allow-hide",
+        "core:window:allow-maximize",
+        "core:window:allow-minimize",
+        "core:window:allow-show",
+        "core:window:allow-start-dragging",
+        "core:window:allow-unmaximize",
+        "core:window:allow-unminimize",
+        "core:window:allow-set-min-size",
+        "opener:default",
+        "opener:allow-open-url",
+        "opener:allow-open-path",
+        "opener:allow-reveal-item-in-dir",
+        "fs:default",
+        "fs:allow-read-file",
+        "fs:allow-write-file",
+        "fs:allow-read-dir",
+        "fs:allow-copy-file",
+        "fs:allow-create",
+        "fs:allow-mkdir",
+        "fs:allow-remove",
+        "fs:allow-rename",
+        "fs:allow-exists",
+        "fs:allow-read-text-file",
+        "fs:allow-write-text-file",
+        "fs:allow-stat",
+        "fs:allow-lstat",
+        "fs:allow-fstat",
+        "fs:allow-truncate",
+        "fs:allow-ftruncate",
+        "fs:allow-open",
+        "fs:allow-read",
+        "fs:allow-write",
+        "fs:allow-seek",
+        "fs:allow-unwatch",
+        "fs:allow-watch",
+        "fs:read-all",
+        "fs:write-all",
+        "fs:scope-app-recursive",
+        {
+            "identifier": "fs:allow-home-read-recursive",
+            "allow": [
+                { "path": "$HOME/**" }
+            ]
+        },
+        {
+            "identifier": "fs:allow-home-write-recursive",
+            "allow": [
+                { "path": "$HOME/**" }
+            ]
+        }
+    ]
+}

src/apps/desktop/src/api/app_state.rs

@@ -1,3 +1,6 @@
+
+
+
 //! Application state management
 
 use crate::api::workspace_activation::spawn_workspace_background_warmup;
@@ -181,7 +184,7 @@ impl AppState {
                     "worker_host.js not found in any candidate location; \
                      MiniApp Workers will not start"
                 );
-                std::path::PathBuf::from("worker_host.js")
+                std::path::PathBuf::from("/data/storage/el2/base/files").join("woker_host.js")
             }
         };
         let js_worker_pool = JsWorkerPool::new(path_manager, worker_host_path)

src/apps/desktop/src/api/browser_api.rs

@@ -20,13 +20,7 @@ pub async fn browser_webview_eval(
     app: tauri::AppHandle,
     request: WebviewEvalRequest,
 ) -> Result<(), String> {
-    let webview = app
-        .get_webview(&request.label)
-        .ok_or_else(|| format!("Webview not found: {}", request.label))?;
-
-    webview
-        .eval(&request.script)
-        .map_err(|e| format!("eval failed: {e}"))
+    Err("Webview not found".to_string())
 }
 
 #[derive(Debug, Deserialize)]
@@ -45,15 +39,5 @@ pub async fn browser_get_url(
     app: tauri::AppHandle,
     request: WebviewLabelRequest,
 ) -> Result<String, String> {
-    let webview = app
-        .get_webview(&request.label)
-        .ok_or_else(|| format!("Webview not found: {}", request.label))?;
-
-    let result = std::panic::catch_unwind(std::panic::AssertUnwindSafe(|| webview.url()));
-
-    match result {
-        Ok(Ok(url)) => Ok(url.to_string()),
-        Ok(Err(e)) => Err(format!("url failed: {e}")),
-        Err(_) => Err("url unavailable (webview URL is nil)".to_string()),
-    }
+    Err("Url is unavailable (webview URL is nil)".to_string())
 }

src/apps/desktop/src/api/commands.rs

@@ -2732,6 +2732,12 @@ pub async fn reveal_in_explorer(
             ))
         }
     };
+    #[cfg(target_env = "ohos")]
+     {
+        use crate::ohos::ohos_file_system::reveal_in_oh_explorer;
+        let _ = reveal_in_oh_explorer(path.to_string_lossy().to_string());
+        return Ok(());
+    }
     if !path.exists() {
         return Err(format!("Path does not exist: {}", request.path));
     }