hk/kunkun
1
0
Fork 0
mirror of https://github.com/kunkunsh/kunkun.git synced 2025-04-04 14:46:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/window-styling

Browse Source
This commit is contained in:
Huakun 2025-02-22 10:10:25 -05:00 committed by GitHub
commit 12b91f623b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
42 changed files with 788 additions and 153 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
CONTRIBUTING.md
View File

@ -26,6 +26,8 @@ If you are interested in contributing to the project, please read the following
- [cmake](https://cmake.org/) - [cmake](https://cmake.org/)
- MacOS: `brew install cmake` - MacOS: `brew install cmake`
- Linux: `sudo apt install -y cmake` - Linux: `sudo apt install -y cmake`
- Other Linux Dependencies
- `sudo apt-get install -y protobuf-compiler libwebkit2gtk-4.1-dev libappindicator3-dev librsvg2-dev patchelf libxdo-dev`
### Setup ### Setup
@ -44,6 +46,15 @@ cd apps/desktop
pnpm tauri dev pnpm tauri dev
``` ```
### Build from Source
If you have problem running the app, consider building from source to see if it works.
```bash
cd apps/desktop
pnpm tauri build
```
## i188n ## i188n
If you are willing to help with the translation, please use translations in json files in `apps/desktop/messages`. If you are willing to help with the translation, please use translations in json files in `apps/desktop/messages`.

339
Cargo.lock generated
View File

@ -837,7 +837,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bf4918709cc4dd777ad2b6303ed03cb37f3ca0ccede8c1b0d28ac6db8f4710e0" checksum = "bf4918709cc4dd777ad2b6303ed03cb37f3ca0ccede8c1b0d28ac6db8f4710e0"
dependencies = [ dependencies = [
"once_cell", "once_cell",
"proc-macro-crate 2.0.2", "proc-macro-crate 2.0.0",
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.87", "syn 2.0.87",
@ -1013,26 +1013,26 @@ dependencies = [
[[package]] [[package]]
name = "cargo_metadata" name = "cargo_metadata"
version = "0.18.1" version = "0.19.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2d886547e41f740c616ae73108f6eb70afe6d940c7bc697cb30f13daec073037" checksum = "8769706aad5d996120af43197bf46ef6ad0fda35216b4505f926a365a232d924"
dependencies = [ dependencies = [
"camino", "camino",
"cargo-platform", "cargo-platform",
"semver", "semver",
"serde", "serde",
"serde_json", "serde_json",
"thiserror 1.0.66", "thiserror 2.0.3",
] ]
[[package]] [[package]]
name = "cargo_toml" name = "cargo_toml"
version = "0.17.2" version = "0.21.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8a969e13a7589e9e3e4207e153bae624ade2b5622fb4684a4923b23ec3d57719" checksum = "5fbd1fe9db3ebf71b89060adaf7b0504c2d6a425cf061313099547e382c2e472"
dependencies = [ dependencies = [
"serde", "serde",
"toml 0.8.2", "toml 0.8.20",
] ]
[[package]] [[package]]
@ -1554,6 +1554,19 @@ dependencies = [
"cfg-if", "cfg-if",
] ]
[[package]]
name = "crossbeam"
version = "0.8.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1137cd7e7fc0fb5d3c5a8678be38ec56e819125d8d7907411fe24ccb943faca8"
dependencies = [
"crossbeam-channel",
"crossbeam-deque",
"crossbeam-epoch",
"crossbeam-queue",
"crossbeam-utils",
]
[[package]] [[package]]
name = "crossbeam-channel" name = "crossbeam-channel"
version = "0.5.13" version = "0.5.13"
@ -1582,6 +1595,15 @@ dependencies = [
"crossbeam-utils", "crossbeam-utils",
] ]
[[package]]
name = "crossbeam-queue"
version = "0.3.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0f58bbc28f91df819d0aa2a2c00cd19754769c2fad90579b3592b1c9ba7a3115"
dependencies = [
"crossbeam-utils",
]
[[package]] [[package]]
name = "crossbeam-utils" name = "crossbeam-utils"
version = "0.8.20" version = "0.8.20"
@ -1864,6 +1886,17 @@ dependencies = [
"subtle", "subtle",
] ]
[[package]]
name = "dircpy"
version = "0.3.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a88521b0517f5f9d51d11925d8ab4523497dcf947073fa3231a311b63941131c"
dependencies = [
"jwalk",
"log",
"walkdir",
]
[[package]] [[package]]
name = "dirs" name = "dirs"
version = "4.0.0" version = "4.0.0"
@ -1882,6 +1915,15 @@ dependencies = [
"dirs-sys 0.4.1", "dirs-sys 0.4.1",
] ]
[[package]]
name = "dirs"
version = "6.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c3e8aa94d75141228480295a7d0e7feb620b1a5ad9f12bc40be62411e38cce4e"
dependencies = [
"dirs-sys 0.5.0",
]
[[package]] [[package]]
name = "dirs-next" name = "dirs-next"
version = "2.0.0" version = "2.0.0"
@ -1899,7 +1941,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6" checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6"
dependencies = [ dependencies = [
"libc", "libc",
"redox_users", "redox_users 0.4.6",
"winapi", "winapi",
] ]
@ -1911,10 +1953,22 @@ checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c"
dependencies = [ dependencies = [
"libc", "libc",
"option-ext", "option-ext",
"redox_users", "redox_users 0.4.6",
"windows-sys 0.48.0", "windows-sys 0.48.0",
] ]
[[package]]
name = "dirs-sys"
version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e01a3366d27ee9890022452ee61b2b63a67e6f13f58900b651ff5665f0bb1fab"
dependencies = [
"libc",
"option-ext",
"redox_users 0.5.0",
"windows-sys 0.59.0",
]
[[package]] [[package]]
name = "dirs-sys-next" name = "dirs-sys-next"
version = "0.1.2" version = "0.1.2"
@ -1922,7 +1976,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d"
dependencies = [ dependencies = [
"libc", "libc",
"redox_users", "redox_users 0.4.6",
"winapi", "winapi",
] ]
@ -2098,7 +2152,7 @@ dependencies = [
"cc", "cc",
"memchr", "memchr",
"rustc_version", "rustc_version",
"toml 0.8.2", "toml 0.8.20",
"vswhom", "vswhom",
"winreg 0.52.0", "winreg 0.52.0",
] ]
@ -2336,6 +2390,15 @@ dependencies = [
"rustc_version", "rustc_version",
] ]
[[package]]
name = "file-id"
version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6bc904b9bbefcadbd8e3a9fb0d464a9b979de6324c03b3c663e8994f46a5be36"
dependencies = [
"windows-sys 0.52.0",
]
[[package]] [[package]]
name = "filetime" name = "filetime"
version = "0.2.25" version = "0.2.25"
@ -2439,6 +2502,15 @@ version = "1.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c" checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c"
[[package]]
name = "fsevent-sys"
version = "4.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "76ee7a02da4d231650c7cea31349b889be2f45ddb3ef3032d2ec8185f6313fd2"
dependencies = [
"libc",
]
[[package]] [[package]]
name = "funty" name = "funty"
version = "2.0.0" version = "2.0.0"
@ -2720,6 +2792,18 @@ dependencies = [
"wasm-bindgen", "wasm-bindgen",
] ]
[[package]]
name = "getrandom"
version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "43a49c392881ce6d5c3b8cb70f98717b7c07aabbdff06687b9030dbfbe2725f8"
dependencies = [
"cfg-if",
"libc",
"wasi 0.13.3+wasi-0.2.2",
"windows-targets 0.52.6",
]
[[package]] [[package]]
name = "ghash" name = "ghash"
version = "0.5.1" version = "0.5.1"
@ -2808,7 +2892,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0bb0228f477c0900c880fd78c8759b95c7636dbd7842707f49e132378aa2acdc" checksum = "0bb0228f477c0900c880fd78c8759b95c7636dbd7842707f49e132378aa2acdc"
dependencies = [ dependencies = [
"heck 0.4.1", "heck 0.4.1",
"proc-macro-crate 2.0.2", "proc-macro-crate 2.0.0",
"proc-macro-error", "proc-macro-error",
"proc-macro2", "proc-macro2",
"quote", "quote",
@ -3731,6 +3815,16 @@ dependencies = [
"serde_json", "serde_json",
] ]
[[package]]
name = "jwalk"
version = "0.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2735847566356cd2179a2a38264839308f7079fa96e6bd5a42d740460e003c56"
dependencies = [
"crossbeam",
"rayon",
]
[[package]] [[package]]
name = "k256" name = "k256"
version = "0.13.4" version = "0.13.4"
@ -3769,6 +3863,26 @@ dependencies = [
"windows-sys 0.59.0", "windows-sys 0.59.0",
] ]
[[package]]
name = "kqueue"
version = "1.0.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7447f1ca1b7b563588a205fe93dea8df60fd981423a768bc1c0ded35ed147d0c"
dependencies = [
"kqueue-sys",
"libc",
]
[[package]]
name = "kqueue-sys"
version = "1.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ed9625ffda8729b85e45cf04090035ac368927b8cebc34898e7c120f52e4838b"
dependencies = [
"bitflags 1.3.2",
"libc",
]
[[package]] [[package]]
name = "kuchikiki" name = "kuchikiki"
version = "0.8.2" version = "0.8.2"
@ -4263,6 +4377,7 @@ checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec"
dependencies = [ dependencies = [
"hermit-abi 0.3.9", "hermit-abi 0.3.9",
"libc", "libc",
"log",
"wasi 0.11.0+wasi-snapshot-preview1", "wasi 0.11.0+wasi-snapshot-preview1",
"windows-sys 0.52.0", "windows-sys 0.52.0",
] ]
@ -4448,6 +4563,38 @@ version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0676bb32a98c1a483ce53e500a81ad9c3d5b3f7c920c28c24e9cb0980d0b5bc8" checksum = "0676bb32a98c1a483ce53e500a81ad9c3d5b3f7c920c28c24e9cb0980d0b5bc8"
[[package]]
name = "notify"
version = "7.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c533b4c39709f9ba5005d8002048266593c1cfaf3c5f0739d5b8ab0c6c504009"
dependencies = [
"bitflags 2.6.0",
"filetime",
"fsevent-sys",
"inotify",
"kqueue",
"libc",
"log",
"mio 1.0.2",
"notify-types",
"walkdir",
"windows-sys 0.52.0",
]
[[package]]
name = "notify-debouncer-full"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9dcf855483228259b2353f89e99df35fc639b2b2510d1166e4858e3f67ec1afb"
dependencies = [
"file-id",
"log",
"notify",
"notify-types",
"walkdir",
]
[[package]] [[package]]
name = "notify-rust" name = "notify-rust"
version = "4.11.3" version = "4.11.3"
@ -4461,6 +4608,16 @@ dependencies = [
"zbus", "zbus",
] ]
[[package]]
name = "notify-types"
version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "585d3cb5e12e01aed9e8a1f70d5c6b5e86fe2a6e48fc8cd0b3e0b8df6f6eb174"
dependencies = [
"instant",
"serde",
]
[[package]] [[package]]
name = "ntapi" name = "ntapi"
version = "0.4.1" version = "0.4.1"
@ -4596,7 +4753,7 @@ version = "0.7.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "af1844ef2428cc3e1cb900be36181049ef3d3193c63e43026cfe202983b27a56" checksum = "af1844ef2428cc3e1cb900be36181049ef3d3193c63e43026cfe202983b27a56"
dependencies = [ dependencies = [
"proc-macro-crate 2.0.2", "proc-macro-crate 1.3.1",
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.87", "syn 2.0.87",
@ -5419,11 +5576,10 @@ dependencies = [
[[package]] [[package]]
name = "proc-macro-crate" name = "proc-macro-crate"
version = "2.0.2" version = "2.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b00f26d3400549137f92511a46ac1cd8ce37cb5598a96d382381458b992a5d24" checksum = "7e8366a6159044a37876a2b9817124296703c586a5c92e2c53751fa06d8d43e8"
dependencies = [ dependencies = [
"toml_datetime",
"toml_edit 0.20.2", "toml_edit 0.20.2",
] ]
@ -5892,6 +6048,17 @@ dependencies = [
"thiserror 1.0.66", "thiserror 1.0.66",
] ]
[[package]]
name = "redox_users"
version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dd6f9d3d47bdd2ad6945c5015a226ec6155d0bcdfd8f7cd29f86b71f8de99d2b"
dependencies = [
"getrandom 0.2.15",
"libredox",
"thiserror 2.0.3",
]
[[package]] [[package]]
name = "regex" name = "regex"
version = "1.11.1" version = "1.11.1"
@ -7161,15 +7328,15 @@ dependencies = [
"cfg-expr", "cfg-expr",
"heck 0.5.0", "heck 0.5.0",
"pkg-config", "pkg-config",
"toml 0.8.2", "toml 0.8.20",
"version-compare", "version-compare",
] ]
[[package]] [[package]]
name = "tao" name = "tao"
version = "0.30.8" version = "0.31.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6682a07cf5bab0b8a2bd20d0a542917ab928b5edb75ebd4eda6b05cbaab872da" checksum = "3731d04d4ac210cd5f344087733943b9bfb1a32654387dad4d1c70de21aee2c9"
dependencies = [ dependencies = [
"bitflags 2.6.0", "bitflags 2.6.0",
"cocoa 0.26.0", "cocoa 0.26.0",
@ -7182,7 +7349,6 @@ dependencies = [
"gdkwayland-sys", "gdkwayland-sys",
"gdkx11-sys", "gdkx11-sys",
"gtk", "gtk",
"instant",
"jni", "jni",
"lazy_static", "lazy_static",
"libc", "libc",
@ -7240,13 +7406,13 @@ checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1"
[[package]] [[package]]
name = "tauri" name = "tauri"
version = "2.1.1" version = "2.2.5"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e545de0a2dfe296fa67db208266cd397c5a55ae782da77973ef4c4fac90e9f2c" checksum = "58a998b6be84104ca05c7e9a21f2180ddec020c8b84ea59a8fc8530a2a19588d"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"bytes", "bytes",
"dirs 5.0.1", "dirs 6.0.0",
"dunce", "dunce",
"embed_plist", "embed_plist",
"futures-util", "futures-util",
@ -7291,9 +7457,9 @@ dependencies = [
[[package]] [[package]]
name = "tauri-build" name = "tauri-build"
version = "2.0.3" version = "2.0.5"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7bd2a4bcfaf5fb9f4be72520eefcb61ae565038f8ccba2a497d8c28f463b8c01" checksum = "8e950124f6779c6cf98e3260c7a6c8488a74aa6350dd54c6950fdaa349bca2df"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"cargo_toml", "cargo_toml",
@ -7307,15 +7473,15 @@ dependencies = [
"serde_json", "serde_json",
"tauri-utils", "tauri-utils",
"tauri-winres", "tauri-winres",
"toml 0.8.2", "toml 0.8.20",
"walkdir", "walkdir",
] ]
[[package]] [[package]]
name = "tauri-codegen" name = "tauri-codegen"
version = "2.0.3" version = "2.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bf79faeecf301d3e969b1fae977039edb77a4c1f25cc0a961be298b54bff97cf" checksum = "f77894f9ddb5cb6c04fcfe8c8869ebe0aded4dabf19917118d48be4a95599ab5"
dependencies = [ dependencies = [
"base64 0.22.1", "base64 0.22.1",
"brotli", "brotli",
@ -7350,9 +7516,9 @@ dependencies = [
[[package]] [[package]]
name = "tauri-macros" name = "tauri-macros"
version = "2.0.3" version = "2.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c52027c8c5afb83166dacddc092ee8fff50772f9646d461d8c33ee887e447a03" checksum = "3240a5caed760a532e8f687be6f05b2c7d11a1d791fb53ccc08cfeb3e5308736"
dependencies = [ dependencies = [
"heck 0.5.0", "heck 0.5.0",
"proc-macro2", "proc-macro2",
@ -7375,7 +7541,7 @@ dependencies = [
"serde", "serde",
"serde_json", "serde_json",
"tauri-utils", "tauri-utils",
"toml 0.8.2", "toml 0.8.20",
"walkdir", "walkdir",
] ]
@ -7470,6 +7636,8 @@ dependencies = [
"anyhow", "anyhow",
"dunce", "dunce",
"glob", "glob",
"notify",
"notify-debouncer-full",
"percent-encoding", "percent-encoding",
"schemars", "schemars",
"serde", "serde",
@ -7479,7 +7647,7 @@ dependencies = [
"tauri-plugin", "tauri-plugin",
"tauri-utils", "tauri-utils",
"thiserror 2.0.3", "thiserror 2.0.3",
"toml 0.8.2", "toml 0.8.20",
"url", "url",
"uuid", "uuid",
] ]
@ -7501,9 +7669,9 @@ dependencies = [
[[package]] [[package]]
name = "tauri-plugin-http" name = "tauri-plugin-http"
version = "2.2.0" version = "2.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e62a9bde54d6a0218b63f5a248f02056ad4316ba6ad81dfb9e4f73715df5deb1" checksum = "3a8137a106e0741fdd357366178fc6e0597abe7d20796f53f44171a1bcec1683"
dependencies = [ dependencies = [
"data-url", "data-url",
"http 1.1.0", "http 1.1.0",
@ -7535,6 +7703,7 @@ dependencies = [
"cocoa 0.24.1", "cocoa 0.24.1",
"crypto", "crypto",
"db", "db",
"dircpy",
"flate2", "flate2",
"futures-util", "futures-util",
"grpc", "grpc",
@ -7594,16 +7763,16 @@ dependencies = [
[[package]] [[package]]
name = "tauri-plugin-log" name = "tauri-plugin-log"
version = "2.2.0" version = "2.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "eddd784c138c08a43954bc3e735402e6b2b2ee8d8c254a7391f4e77c01273dd5" checksum = "367a28a5e0ca39eac98005699466e8906edc4a2a8f8e13a5f1a71dc0bea6c677"
dependencies = [ dependencies = [
"android_logger", "android_logger",
"byte-unit", "byte-unit",
"cocoa 0.26.0",
"fern", "fern",
"log", "log",
"objc", "objc2",
"objc2-foundation",
"serde", "serde",
"serde_json", "serde_json",
"serde_repr", "serde_repr",
@ -7634,9 +7803,9 @@ dependencies = [
[[package]] [[package]]
name = "tauri-plugin-notification" name = "tauri-plugin-notification"
version = "2.2.0" version = "2.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "46ab803095f14ac6521fdb6477210a49e86fed6623c3c97d8e4b2b35e045e922" checksum = "0f8d3ee5207d3359ca2b714545664f24f70374d795bf91f7c1935a494003a57d"
dependencies = [ dependencies = [
"log", "log",
"notify-rust", "notify-rust",
@ -7776,7 +7945,7 @@ dependencies = [
[[package]] [[package]]
name = "tauri-plugin-system-info" name = "tauri-plugin-system-info"
version = "2.0.8" version = "2.0.9"
dependencies = [ dependencies = [
"serde", "serde",
"starship-battery", "starship-battery",
@ -7851,9 +8020,9 @@ dependencies = [
[[package]] [[package]]
name = "tauri-runtime" name = "tauri-runtime"
version = "2.2.0" version = "2.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cce18d43f80d4aba3aa8a0c953bbe835f3d0f2370aca75e8dbb14bd4bab27958" checksum = "2274ef891ccc0a8d318deffa9d70053f947664d12d58b9c0d1ae5e89237e01f7"
dependencies = [ dependencies = [
"dpi", "dpi",
"gtk", "gtk",
@ -7870,9 +8039,9 @@ dependencies = [
[[package]] [[package]]
name = "tauri-runtime-wry" name = "tauri-runtime-wry"
version = "2.2.0" version = "2.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9f442a38863e10129ffe2cec7bd09c2dcf8a098a3a27801a476a304d5bb991d2" checksum = "3707b40711d3b9f6519150869e358ffbde7c57567fb9b5a8b51150606939b2a0"
dependencies = [ dependencies = [
"gtk", "gtk",
"http 1.1.0", "http 1.1.0",
@ -7896,9 +8065,9 @@ dependencies = [
[[package]] [[package]]
name = "tauri-utils" name = "tauri-utils"
version = "2.1.0" version = "2.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9271a88f99b4adea0dc71d0baca4505475a0bbd139fb135f62958721aaa8fe54" checksum = "96fb10e7cc97456b2d5b9c03e335b5de5da982039a303a20d10006885e4523a0"
dependencies = [ dependencies = [
"brotli", "brotli",
"cargo_metadata", "cargo_metadata",
@ -7924,7 +8093,7 @@ dependencies = [
"serde_with", "serde_with",
"swift-rs", "swift-rs",
"thiserror 2.0.3", "thiserror 2.0.3",
"toml 0.8.2", "toml 0.8.20",
"url", "url",
"urlpattern", "urlpattern",
"uuid", "uuid",
@ -8209,21 +8378,21 @@ dependencies = [
[[package]] [[package]]
name = "toml" name = "toml"
version = "0.8.2" version = "0.8.20"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "185d8ab0dfbb35cf1399a6344d8484209c088f75f8f68230da55d48d95d43e3d" checksum = "cd87a5cdd6ffab733b2f74bc4fd7ee5fff6634124999ac278c35fc78c6120148"
dependencies = [ dependencies = [
"serde", "serde",
"serde_spanned", "serde_spanned",
"toml_datetime", "toml_datetime",
"toml_edit 0.20.2", "toml_edit 0.22.24",
] ]
[[package]] [[package]]
name = "toml_datetime" name = "toml_datetime"
version = "0.6.3" version = "0.6.8"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41"
dependencies = [ dependencies = [
"serde", "serde",
] ]
@ -8238,7 +8407,7 @@ dependencies = [
"serde", "serde",
"serde_spanned", "serde_spanned",
"toml_datetime", "toml_datetime",
"winnow", "winnow 0.5.40",
] ]
[[package]] [[package]]
@ -8246,12 +8415,23 @@ name = "toml_edit"
version = "0.20.2" version = "0.20.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "396e4d48bbb2b7554c944bde63101b5ae446cff6ec4a24227428f15eb72ef338" checksum = "396e4d48bbb2b7554c944bde63101b5ae446cff6ec4a24227428f15eb72ef338"
dependencies = [
"indexmap 2.6.0",
"toml_datetime",
"winnow 0.5.40",
]
[[package]]
name = "toml_edit"
version = "0.22.24"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "17b4795ff5edd201c7cd6dca065ae59972ce77d1b80fa0a84d94950ece7d1474"
dependencies = [ dependencies = [
"indexmap 2.6.0", "indexmap 2.6.0",
"serde", "serde",
"serde_spanned", "serde_spanned",
"toml_datetime", "toml_datetime",
"winnow", "winnow 0.7.3",
] ]
[[package]] [[package]]
@ -8628,11 +8808,11 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
[[package]] [[package]]
name = "uuid" name = "uuid"
version = "1.11.0" version = "1.14.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f8c5f0a0af699448548ad1a2fbf920fb4bee257eae39953ba95cb84891a0446a" checksum = "93d59ca99a559661b96bf898d8fce28ed87935fd2bea9f05983c1464dd6c71b1"
dependencies = [ dependencies = [
"getrandom 0.2.15", "getrandom 0.3.1",
"serde", "serde",
] ]
@ -8742,6 +8922,15 @@ version = "0.11.0+wasi-snapshot-preview1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
[[package]]
name = "wasi"
version = "0.13.3+wasi-0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "26816d2e1a4a36a2940b96c5296ce403917633dff8f3440e9b236ed6f6bacad2"
dependencies = [
"wit-bindgen-rt",
]
[[package]] [[package]]
name = "wasm-bindgen" name = "wasm-bindgen"
version = "0.2.95" version = "0.2.95"
@ -8947,9 +9136,9 @@ dependencies = [
[[package]] [[package]]
name = "webview2-com" name = "webview2-com"
version = "0.33.0" version = "0.34.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6f61ff3d9d0ee4efcb461b14eb3acfda2702d10dc329f339303fc3e57215ae2c" checksum = "823e7ebcfaea51e78f72c87fc3b65a1e602c321f407a0b36dbb327d7bb7cd921"
dependencies = [ dependencies = [
"webview2-com-macros", "webview2-com-macros",
"webview2-com-sys", "webview2-com-sys",
@ -8972,9 +9161,9 @@ dependencies = [
[[package]] [[package]]
name = "webview2-com-sys" name = "webview2-com-sys"
version = "0.33.0" version = "0.34.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a3a3e2eeb58f82361c93f9777014668eb3d07e7d174ee4c819575a9208011886" checksum = "7a82bce72db6e5ee83c68b5de1e2cd6ea195b9fbff91cb37df5884cbe3222df4"
dependencies = [ dependencies = [
"thiserror 1.0.66", "thiserror 1.0.66",
"windows 0.58.0", "windows 0.58.0",
@ -9507,6 +9696,15 @@ dependencies = [
"memchr", "memchr",
] ]
[[package]]
name = "winnow"
version = "0.7.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0e7f4ea97f6f78012141bcdb6a216b2609f0979ada50b20ca5b52dde2eac2bb1"
dependencies = [
"memchr",
]
[[package]] [[package]]
name = "winreg" name = "winreg"
version = "0.10.1" version = "0.10.1"
@ -9537,10 +9735,19 @@ dependencies = [
] ]
[[package]] [[package]]
name = "wry" name = "wit-bindgen-rt"
version = "0.47.0" version = "0.33.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "553ca1ce149982123962fac2506aa75b8b76288779a77e72b12fa2fc34938647" checksum = "3268f3d866458b787f390cf61f4bbb563b922d091359f9608842999eaee3943c"
dependencies = [
"bitflags 2.6.0",
]
[[package]]
name = "wry"
version = "0.48.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a2e33c08b174442ff80d5c791020696f9f8b4e4a87b8cfc7494aad6167ec44e1"
dependencies = [ dependencies = [
"base64 0.22.1", "base64 0.22.1",
"block2", "block2",
@ -9568,7 +9775,7 @@ dependencies = [
"sha2", "sha2",
"soup3", "soup3",
"tao-macros", "tao-macros",
"thiserror 1.0.66", "thiserror 2.0.3",
"url", "url",
"webkit2gtk", "webkit2gtk",
"webkit2gtk-sys", "webkit2gtk-sys",

17
README.md
View File

@ -46,7 +46,22 @@
</tr> </tr>
</table> </table>
## Star History <table>
<tr>
<th>Extension Request</th>
</tr>
<tr>
<td>
You can <a href="https://github.com/kunkunsh/kunkun/discussions/new?category=extension-requests&body=%3E%20%5B!IMPORTANT%5D%0A%3E%20Upvote%20if%20you%20want%20this">Submit Extension Request</a>
request in the
<a href="https://github.com/kunkunsh/kunkun/discussions/categories/extension-requests?discussions_q=is%3Aopen+sort%3Atop+category%3A%22Extension+Requests%22">Extension Requests discussion</a>
section to gauge interest in your request.
<br/>
If there is significant demand, the extension may be considered for implementation.
</td>
</tr>
</table>
<a href="https://star-history.com/#kunkunsh/kunkun&Date"> <a href="https://star-history.com/#kunkunsh/kunkun&Date">
<picture> <picture>

2
apps/desktop/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@kksh/desktop", "name": "@kksh/desktop",
"version": "0.1.23", "version": "0.1.27",
"description": "", "description": "",
"type": "module", "type": "module",
"scripts": { "scripts": {

15
apps/desktop/src-tauri/Cargo.toml
View File

@ -14,10 +14,10 @@ name = "kunkun_lib"
crate-type = ["staticlib", "cdylib", "rlib"] crate-type = ["staticlib", "cdylib", "rlib"]
[build-dependencies] [build-dependencies]
tauri-build = { version = "2.0.3", features = [] } tauri-build = { version = "2.0.5", features = [] }
[dependencies] [dependencies]
tauri = { version = "2.1.1", features = [ tauri = { version = "2.2.5", features = [
"macos-private-api", "macos-private-api",
"image-png", "image-png",
"image-ico", "image-ico",
@ -35,11 +35,11 @@ log = { workspace = true }
urlencoding = "2.1.3" urlencoding = "2.1.3"
tauri-plugin-process = "2.2.0" tauri-plugin-process = "2.2.0"
tauri-plugin-shellx = "2.0.12" tauri-plugin-shellx = "2.0.12"
tauri-plugin-fs = "2.2.0" tauri-plugin-fs = { version = "2.2.0", features = ["watch"] }
tauri-plugin-dialog = "2.2.0" tauri-plugin-dialog = "2.2.0"
tauri-plugin-notification = "2.2.0" tauri-plugin-notification = "2.2.1"
tauri-plugin-os = "2.2.0" tauri-plugin-os = "2.2.0"
tauri-plugin-http = "2.2.0" tauri-plugin-http = "2.3.0"
tauri-plugin-upload = { workspace = true } tauri-plugin-upload = { workspace = true }
# tauri-plugin-upload = "2.2.1" # tauri-plugin-upload = "2.2.1"
tauri-plugin-jarvis = { workspace = true } tauri-plugin-jarvis = { workspace = true }
@ -50,15 +50,16 @@ tauri-plugin-user-input = { workspace = true }
tauri-plugin-clipboard = { workspace = true } tauri-plugin-clipboard = { workspace = true }
tauri-plugin-store = "2.2.0" tauri-plugin-store = "2.2.0"
tauri-plugin-deep-link = "2.2.0" tauri-plugin-deep-link = "2.2.0"
tauri-plugin-log = { version = "2.2.0", features = ["colored"] } tauri-plugin-log = { version = "2.2.1", features = ["colored"] }
crypto = { workspace = true } crypto = { workspace = true }
zip = "2.2.2" zip = "2.2.2"
uuid = "1.11.0" uuid = "1.14.0"
# tauri-plugin-devtools = "2.0.0" # tauri-plugin-devtools = "2.0.0"
obfstr = { workspace = true } obfstr = { workspace = true }
base64 = { workspace = true } base64 = { workspace = true }
tauri-plugin-stronghold = "2.2.0" tauri-plugin-stronghold = "2.2.0"
[target."cfg(target_os = \"macos\")".dependencies] [target."cfg(target_os = \"macos\")".dependencies]
cocoa = "0.24.1" cocoa = "0.24.1"
mac-security-rs = { workspace = true } mac-security-rs = { workspace = true }

1
apps/desktop/src-tauri/capabilities/default.json
View File

@ -39,6 +39,7 @@
"core:webview:allow-create-webview", "core:webview:allow-create-webview",
"core:webview:allow-create-webview-window", "core:webview:allow-create-webview-window",
"core:app:default", "core:app:default",
"core:app:allow-app-hide",
"core:resources:default", "core:resources:default",
"core:menu:default", "core:menu:default",
"core:tray:default", "core:tray:default",

27
apps/desktop/src-tauri/src/lib.rs
View File

@ -66,16 +66,28 @@ pub fn run() {
// ); // );
// } // }
if KUNKUN_PUBLISH == "true" { if KUNKUN_PUBLISH == "true" {
// only include updater with KUNKUN_PUBLISH = true, this is used to avoid using updater in beta build CI, which requires secrets for the updater endpoint if updater is included
println!("KUNKUN_PUBLISH: {}", KUNKUN_PUBLISH); println!("KUNKUN_PUBLISH: {}", KUNKUN_PUBLISH);
builder = builder.plugin(tauri_plugin_updater::Builder::new().build()); builder = builder.plugin(tauri_plugin_updater::Builder::new().build());
} }
let shell_unlocked = true; let shell_unlocked = true;
builder = builder builder = builder
.plugin(tauri_plugin_single_instance::init(|app, args, cwd| { .plugin(tauri_plugin_single_instance::init(|app, args, _cwd| {
let _ = app let window = app.get_webview_window("main").expect("no main window");
.get_webview_window("main")
.expect("no main window") // if toggle is passed, we want to show/hide the main window
.set_focus(); if args.get(1).map_or(false, |arg| arg == "toggle") {
if window.is_visible().unwrap_or(false) {
log::info!("hiding main window");
window.hide().unwrap();
} else {
log::info!("showing main window");
window.show().unwrap();
window.set_focus().unwrap();
};
} else {
let _ = window.set_focus();
}
})) }))
.plugin( .plugin(
tauri_plugin_log::Builder::new() tauri_plugin_log::Builder::new()
@ -119,7 +131,7 @@ pub fn run() {
.plugin(tauri_plugin_network::init()) .plugin(tauri_plugin_network::init())
.plugin(tauri_plugin_system_info::init()) .plugin(tauri_plugin_system_info::init())
.invoke_handler(tauri::generate_handler![ .invoke_handler(tauri::generate_handler![
commands::keyring::get_stronghold_key commands::keyring::get_stronghold_key,
]); ]);
let app = builder let app = builder
@ -218,7 +230,8 @@ pub fn run() {
} }
// setup::deeplink::setup_deeplink(app); // setup::deeplink::setup_deeplink(app);
// #[cfg(all(target_os = "macos", debug_assertions))] // #[cfg(all(target_os = "macos", debug_assertions))]
// app.set_activation_policy(ActivationPolicy::Accessory); #[cfg(target_os = "macos")]
app.set_activation_policy(ActivationPolicy::Accessory);
// let mut store = StoreBuilder::new("appConfig.bin").build(app.handle().clone()); // let mut store = StoreBuilder::new("appConfig.bin").build(app.handle().clone());
// let store = app.handle().store_builder("appConfig.json").build()?; // let store = app.handle().store_builder("appConfig.json").build()?;

6
apps/desktop/src-tauri/tauri.conf.json
View File

@ -26,12 +26,14 @@
"windowEffects": { "windowEffects": {
"effects": ["sidebar", "micaDark"] "effects": ["sidebar", "micaDark"]
}, },
"decorations": true "decorations": true,
"center": true
}, },
{ {
"url": "/splashscreen", "url": "/splashscreen",
"visible": true, "visible": true,
"label": "splashscreen" "label": "splashscreen",
"center": true
} }
] ]
}, },

3
apps/desktop/src/lib/cmds/ext.ts
View File

@ -163,7 +163,8 @@ export async function onCustomUiCmdSelect(
extPath: ext.extPath, extPath: ext.extPath,
dist: cmd.dist dist: cmd.dist
}) })
if (platform() === "windows" && !useDevMain) { const _platform = platform()
if ((_platform === "windows" || _platform === "linux") && !useDevMain) {
const addr = await spawnExtensionFileServer(winLabel) // addr has format "127.0.0.1:<port>" const addr = await spawnExtensionFileServer(winLabel) // addr has format "127.0.0.1:<port>"
console.log("Extension file server address: ", addr) console.log("Extension file server address: ", addr)
const newUrl = `http://${addr}` const newUrl = `http://${addr}`

14
apps/desktop/src/lib/components/main/AppsCmds.svelte
View File

@ -6,14 +6,14 @@
import { convertFileSrc } from "@tauri-apps/api/core" import { convertFileSrc } from "@tauri-apps/api/core"
import * as os from "@tauri-apps/plugin-os" import * as os from "@tauri-apps/plugin-os"
import { toast } from "svelte-sonner" import { toast } from "svelte-sonner"
import { open } from "tauri-plugin-shellx-api" import { executeBashScript, open } from "tauri-plugin-shellx-api"
const platform = os.platform() const platform = os.platform()
let { apps }: { apps: AppInfo[] } = $props() let { apps }: { apps: AppInfo[] } = $props()
</script> </script>
<DraggableCommandGroup heading="Apps"> <DraggableCommandGroup heading="Apps">
{#each apps as app} {#each apps.filter((app) => app.name) as app}
<Command.Item <Command.Item
class="flex justify-between" class="flex justify-between"
onSelect={() => { onSelect={() => {
@ -23,8 +23,16 @@
} else { } else {
toast.error("No executable path found for this app") toast.error("No executable path found for this app")
} }
} else { } else if (platform === "macos") {
open(app.app_desktop_path) open(app.app_desktop_path)
} else if (platform === "linux") {
if (app.app_path_exe) {
executeBashScript(app.app_path_exe)
} else {
toast.error("No executable path found for this app")
}
} else {
toast.error("Unsupported platform")
} }
}} }}
value={app.name} value={app.name}

5
apps/desktop/src/lib/stores/appConfig.ts
View File

@ -48,7 +48,10 @@ function createAppConfig(): WithSyncStore<AppConfig & { language: string }> & Ap
async function init() { async function init() {
debug("Initializing app config") debug("Initializing app config")
const persistStore = await load("kk-config.json", { autoSave: true }) const persistStore = await load("kk-config.json", { autoSave: true })
const loadedConfig = await persistStore.get("config") let loadedConfig = await persistStore.get("config")
if (typeof loadedConfig === "object") {
loadedConfig = { ...defaultAppConfig, ...loadedConfig }
}
const parseRes = v.safeParse(PersistedAppConfig, loadedConfig) const parseRes = v.safeParse(PersistedAppConfig, loadedConfig)
if (parseRes.success) { if (parseRes.success) {
console.log("Parse Persisted App Config Success", parseRes.output) console.log("Parse Persisted App Config Success", parseRes.output)

18
apps/desktop/src/lib/stores/extensions.ts
View File

@ -29,6 +29,7 @@ function createExtensionsStore(): Writable<ExtPackageJsonExtra[]> & {
tarballUrl: string, tarballUrl: string,
extras?: { overwritePackageJson?: string } extras?: { overwritePackageJson?: string }
) => Promise<ExtPackageJsonExtra> ) => Promise<ExtPackageJsonExtra>
reloadExtension: (extPath: string) => Promise<void>
} { } {
const store = writable<ExtPackageJsonExtra[]>([]) const store = writable<ExtPackageJsonExtra[]>([])
@ -42,6 +43,22 @@ function createExtensionsStore(): Writable<ExtPackageJsonExtra[]> & {
}) })
} }
// if dev extension's package.json is changed, use this function to reload commands
async function reloadExtension(extPath: string) {
const ext = get(extensions).find((ext) => ext.extPath === extPath)
if (ext) {
const pkgJsonPath = await path.join(extPath, "package.json")
const ext = await extAPI.loadExtensionManifestFromDisk(pkgJsonPath)
// replace the old extension with the new one
store.update((exts) => {
// filter out the old extension
return [...exts.filter((e) => e.extPath !== extPath), ext]
})
} else {
console.warn(`reloadExtension: Extension ${extPath} not found`)
}
}
/** /**
* Get all extensions installed from the store (non-dev extensions) * Get all extensions installed from the store (non-dev extensions)
*/ */
@ -195,6 +212,7 @@ function createExtensionsStore(): Writable<ExtPackageJsonExtra[]> & {
return { return {
...store, ...store,
init, init,
reloadExtension,
getExtensionsFromStore, getExtensionsFromStore,
findStoreExtensionByIdentifier, findStoreExtensionByIdentifier,
registerNewExtensionByPath, registerNewExtensionByPath,

12
apps/desktop/src/lib/types/fs.ts Normal file
View File

@ -0,0 +1,12 @@
import * as v from "valibot"
export const WatchEvent = v.object({
type: v.object({
modify: v.object({
kind: v.union([v.literal("data"), v.literal("metadata")]),
mode: v.union([v.literal("any"), v.literal("content")])
})
}),
paths: v.array(v.string())
})
export type WatchEvent = v.InferOutput<typeof WatchEvent>

45
apps/desktop/src/lib/utils/hotkey.ts
View File

@ -1,7 +1,10 @@
import { getAllWindows } from "@tauri-apps/api/window" import { getAllWindows } from "@tauri-apps/api/window"
import { isRegistered, register, unregister } from "@tauri-apps/plugin-global-shortcut" import { isRegistered, register, unregister } from "@tauri-apps/plugin-global-shortcut"
import { debug, info, warn } from "@tauri-apps/plugin-log" import { debug, info, warn } from "@tauri-apps/plugin-log"
import * as os from "@tauri-apps/plugin-os"
import * as userInput from "tauri-plugin-user-input-api"
import { sendNotificationWithPermission } from "./notification" import { sendNotificationWithPermission } from "./notification"
import { sleep } from "./time"
/** /**
* Tauri global shortcut doesn't accept 'Meta' Key. This function maps browser detected keys to Tauri-accepted keys. * Tauri global shortcut doesn't accept 'Meta' Key. This function maps browser detected keys to Tauri-accepted keys.
@ -14,6 +17,11 @@ export function mapKeyToTauriKey(key: string): string {
return key return key
} }
/**
* Registers a global hotkey for the application. If the hotkey is already registered, it will be unregistered first.
* When the hotkey is pressed, it toggles the visibility and focus of the main window.
* @param hotkeyStr - The hotkey string to register.
*/
export async function registerAppHotkey(hotkeyStr: string) { export async function registerAppHotkey(hotkeyStr: string) {
if (await isRegistered(hotkeyStr)) { if (await isRegistered(hotkeyStr)) {
warn(`Hotkey (${hotkeyStr}) already registered`) warn(`Hotkey (${hotkeyStr}) already registered`)
@ -46,6 +54,11 @@ export async function registerAppHotkey(hotkeyStr: string) {
}) })
} }
/**
* Updates the application's global hotkey. If an old hotkey is provided, it will be unregistered first.
* @param newHotkey - The new hotkey combination to register.
* @param oldHotkey - The old hotkey combination to unregister, if any.
*/
export async function updateAppHotkey(newHotkey: string[], oldHotkey?: string[] | null) { export async function updateAppHotkey(newHotkey: string[], oldHotkey?: string[] | null) {
if (oldHotkey) { if (oldHotkey) {
const hotkeyStr = oldHotkey.map(mapKeyToTauriKey).join("+") const hotkeyStr = oldHotkey.map(mapKeyToTauriKey).join("+")
@ -56,3 +69,35 @@ export async function updateAppHotkey(newHotkey: string[], oldHotkey?: string[]
const hotkeyStr = newHotkey.map(mapKeyToTauriKey).join("+") const hotkeyStr = newHotkey.map(mapKeyToTauriKey).join("+")
return registerAppHotkey(hotkeyStr) return registerAppHotkey(hotkeyStr)
} }
/**
* Simulates a key combination press and release.
* @param keys - The array of keys to press and release.
*/
export async function applyKeyComb(keys: userInput.Key[]) {
// await Promise.all(keys.map((key) => userInput.key("KeyPress", key)))
for (const key of keys) {
await userInput.key("KeyPress", key)
await sleep(20)
}
await sleep(100)
for (const key of keys) {
await userInput.key("KeyRelease", key)
await sleep(20)
}
}
/**
* Simulates a paste operation based on the operating system.
* On macOS, it uses Command+V. On Windows and Linux, it uses Shift+Insert.
*/
export async function paste() {
const _platform = os.platform()
if (_platform === "macos") {
return applyKeyComb(["MetaLeft", "KeyV"])
} else if (_platform === "windows" || _platform === "linux") {
return applyKeyComb(["ShiftLeft", "Insert"])
} else {
console.error("Unsupported platform: " + _platform)
}
}

7
apps/desktop/src/lib/utils/init.ts
View File

@ -1,8 +1,9 @@
import { appConfig } from "@/stores" import { appConfig, extensions } from "@/stores"
import { getCurrentWindow } from "@tauri-apps/api/window" import { getCurrentWindow } from "@tauri-apps/api/window"
import { info } from "@tauri-apps/plugin-log" import { info } from "@tauri-apps/plugin-log"
import { dev } from "$app/environment" import { dev } from "$app/environment"
import { mapKeyToTauriKey, registerAppHotkey } from "./hotkey" import { mapKeyToTauriKey, registerAppHotkey } from "./hotkey"
import { listenToReloadOneExtension } from "./tauri-events"
/** /**
* Initialize the app * Initialize the app
@ -11,6 +12,10 @@ export function init() {
const window = getCurrentWindow() const window = getCurrentWindow()
if (window.label === "main") { if (window.label === "main") {
initMainWindow() initMainWindow()
listenToReloadOneExtension(({ payload: { extPath } }) => {
info(`listenToReloadOneExtension in main window: ${extPath}`)
extensions.reloadExtension(extPath)
})
} }
if (!dev) { if (!dev) {

5
apps/desktop/src/lib/utils/key.ts
View File

@ -76,7 +76,10 @@ export function goHomeOrCloseOnEscapeWithInput(e: KeyboardEvent) {
export async function globalKeyDownHandler(e: KeyboardEvent) { export async function globalKeyDownHandler(e: KeyboardEvent) {
keys.keydown(e.key) keys.keydown(e.key)
const _platform = platform() const _platform = platform()
if ((_platform === "macos" && e.metaKey) || (_platform === "windows" && e.ctrlKey)) { if (
(_platform === "macos" && e.metaKey) ||
((_platform === "windows" || _platform === "linux") && e.ctrlKey)
) {
if (e.key === ",") { if (e.key === ",") {
e.preventDefault() e.preventDefault()
goto(i18n.resolveRoute("/app/settings")) goto(i18n.resolveRoute("/app/settings"))

10
apps/desktop/src/lib/utils/tauri-events.ts
View File

@ -16,6 +16,8 @@ export const FileDragOver = "tauri://drag-over"
export const NewClipboardItemAddedEvent = "new_clipboard_item_added" export const NewClipboardItemAddedEvent = "new_clipboard_item_added"
export const RefreshConfigEvent = "kunkun://refresh-config" export const RefreshConfigEvent = "kunkun://refresh-config"
export const RefreshExtEvent = "kunkun://refresh-extensions" export const RefreshExtEvent = "kunkun://refresh-extensions"
export const ReloadOneExtensionEvent = "kunkun://reload-one-extension"
export function listenToFileDrop(cb: EventCallback<{ paths: string[] }>) { export function listenToFileDrop(cb: EventCallback<{ paths: string[] }>) {
return listen<{ paths: string[] }>(FileDragDrop, cb) return listen<{ paths: string[] }>(FileDragDrop, cb)
} }
@ -55,3 +57,11 @@ export function emitRefreshDevExt() {
export function listenToRefreshDevExt(cb: EventCallback<null>) { export function listenToRefreshDevExt(cb: EventCallback<null>) {
return listen(DEEP_LINK_PATH_REFRESH_DEV_EXTENSION, cb) return listen(DEEP_LINK_PATH_REFRESH_DEV_EXTENSION, cb)
} }
export function emitReloadOneExtension(extPath: string) {
return emitTo("main", ReloadOneExtensionEvent, { extPath })
}
export function listenToReloadOneExtension(cb: EventCallback<{ extPath: string }>) {
return listen(ReloadOneExtensionEvent, cb)
}

4
apps/desktop/src/routes/app/+page.svelte
View File

@ -96,7 +96,7 @@
}} }}
/> />
<Command.Root <Command.Root
class={cn("h-screen rounded-lg border border-none shadow-md", { class={cn("h-screen rounded-lg border-none shadow-md", {
"bg-transparent": _platform === "macos", "bg-transparent": _platform === "macos",
"bg-background/50": _platform === "windows" "bg-background/50": _platform === "windows"
})} })}
@ -143,7 +143,7 @@
<DropdownMenu.Trigger> <DropdownMenu.Trigger>
<Button variant="outline" size="icon" class=""><EllipsisVerticalIcon /></Button> <Button variant="outline" size="icon" class=""><EllipsisVerticalIcon /></Button>
</DropdownMenu.Trigger> </DropdownMenu.Trigger>
<DropdownMenu.Content class="w-80"> <DropdownMenu.Content class="w-fit min-w-80">
<DropdownMenu.Group> <DropdownMenu.Group>
<DropdownMenu.Item onclick={() => exit()}> <DropdownMenu.Item onclick={() => exit()}>
<CircleXIcon class="h-4 w-4 text-red-500" /> <CircleXIcon class="h-4 w-4 text-red-500" />

55
apps/desktop/src/routes/app/extension/clipboard/+page.svelte
View File

@ -1,19 +1,26 @@
<script lang="ts"> <script lang="ts">
import { paste } from "@/utils/hotkey"
import { goBack, goHome } from "@/utils/route" import { goBack, goHome } from "@/utils/route"
import { listenToNewClipboardItem } from "@/utils/tauri-events" import { listenToNewClipboardItem } from "@/utils/tauri-events"
import { sleep } from "@/utils/time"
import Icon from "@iconify/svelte" import Icon from "@iconify/svelte"
import { ClipboardContentType, db } from "@kksh/api/commands" import { ClipboardContentType, db } from "@kksh/api/commands"
import { SearchModeEnum, SQLSortOrderEnum, type ExtData } from "@kksh/api/models" import { SearchModeEnum, SQLSortOrderEnum, type ExtData } from "@kksh/api/models"
import { Button, Command, Resizable } from "@kksh/svelte5" import { Button, Command, Resizable } from "@kksh/svelte5"
import { Constants } from "@kksh/ui" import { Constants } from "@kksh/ui"
import { CustomCommandInput, GlobalCommandPaletteFooter } from "@kksh/ui/main" import { CustomCommandInput, GlobalCommandPaletteFooter } from "@kksh/ui/main"
import { app } from "@tauri-apps/api"
import type { UnlistenFn } from "@tauri-apps/api/event" import type { UnlistenFn } from "@tauri-apps/api/event"
import { getCurrentWebviewWindow } from "@tauri-apps/api/webviewWindow"
import { platform } from "@tauri-apps/plugin-os"
import { ArrowLeft, FileQuestionIcon, ImageIcon, LetterTextIcon } from "lucide-svelte" import { ArrowLeft, FileQuestionIcon, ImageIcon, LetterTextIcon } from "lucide-svelte"
import { onDestroy, onMount, type Snippet } from "svelte" import { onDestroy, onMount, type Snippet } from "svelte"
import { toast } from "svelte-sonner" import { toast } from "svelte-sonner"
import clipboard from "tauri-plugin-clipboard-api" import clipboard from "tauri-plugin-clipboard-api"
import ContentPreview from "./content-preview.svelte" import ContentPreview from "./content-preview.svelte"
const _platform = platform()
const curWin = getCurrentWebviewWindow()
let searchTerm = $state("") let searchTerm = $state("")
let clipboardHistoryList = $state<ExtData[]>([]) let clipboardHistoryList = $state<ExtData[]>([])
let highlightedItemValue = $state<string>("") let highlightedItemValue = $state<string>("")
@ -155,29 +162,45 @@
} }
} }
function writeToClipboard(data: ExtData) {
if (!data.data) {
toast.warning("No data found")
return Promise.reject(new Error("No data found"))
}
const dataType = data?.dataType as ClipboardContentType
switch (dataType) {
case "Text":
return clipboard.writeText(data.data)
case "Image":
return clipboard.writeImageBase64(data.data)
case "Html":
return clipboard.writeHtmlAndText(data.data, data.searchText ?? data.data)
case "Rtf":
return clipboard.writeRtf(data.data)
default:
return Promise.reject(new Error("Unsupported data type: " + dataType))
}
}
function onItemSelected(dataId: number) { function onItemSelected(dataId: number) {
// fetch data from db
db.getExtensionDataById(dataId) db.getExtensionDataById(dataId)
.then((data) => { .then((data) => {
if (!data || !data.data) { console.log("data", data)
return if (!data) {
} toast.warning("No data found")
const dataType = data?.dataType as ClipboardContentType return Promise.reject(new Error("No data found"))
switch (dataType) {
case "Text":
return clipboard.writeText(data.data)
case "Image":
return clipboard.writeImageBase64(data.data)
case "Html":
return clipboard.writeHtml(data.data)
case "Rtf":
return clipboard.writeRtf(data.data)
default:
return Promise.reject(new Error("Unsupported data type: " + dataType))
} }
return writeToClipboard(data).then(async () => {
return app
.hide()
.then(() => sleep(100))
.then(() => curWin.hide())
.then(() => paste())
})
}) })
.then(() => toast.success("Copied to clipboard")) .then(() => toast.success("Copied to clipboard"))
.catch((err) => { .catch((err) => {
console.error(err)
toast.error("Failed to fetch data from db", { toast.error("Failed to fetch data from db", {
description: err.message description: err.message
}) })

96
apps/desktop/src/routes/app/extension/store/+page.svelte
View File

@ -1,9 +1,12 @@
<script lang="ts"> <script lang="ts">
import { getExtensionsFolder } from "@/constants" import { getExtensionsFolder } from "@/constants"
import { appState, extensions } from "@/stores" import { appState, extensions } from "@/stores"
import { keys } from "@/stores/keys"
import { supabaseAPI } from "@/supabase" import { supabaseAPI } from "@/supabase"
import { goBackOnEscapeClearSearchTerm, goHomeOnEscapeClearSearchTerm } from "@/utils/key" import { goBackOnEscapeClearSearchTerm, goHomeOnEscapeClearSearchTerm } from "@/utils/key"
import { goBack, goHome } from "@/utils/route" import { goBack, goHome } from "@/utils/route"
import { Action as ActionSchema } from "@kksh/api/models"
import { Action } from "@kksh/api/ui"
import { SBExt } from "@kksh/supabase/models" import { SBExt } from "@kksh/supabase/models"
import type { ExtPublishMetadata } from "@kksh/supabase/models" import type { ExtPublishMetadata } from "@kksh/supabase/models"
import { type Tables } from "@kksh/supabase/types" import { type Tables } from "@kksh/supabase/types"
@ -21,7 +24,11 @@
const _platform = platform() const _platform = platform()
let { data } = $props() let { data } = $props()
const { storeExtList, installedStoreExts, installedExtsMap, upgradableExpsMap } = data const { storeExtList, installedExtsMap, upgradableExpsMap } = data
const _platform = platform()
let actionPanelOpen = $state(false)
let listviewInputRef = $state<HTMLInputElement | null>(null)
let highlightedCmdValue = $state("")
// function isUpgradeable(item: DbExtItem): boolean { // function isUpgradeable(item: DbExtItem): boolean {
// if (!item.version) return true // latest extensions always have version, this check should be removed later // if (!item.version) return true // latest extensions always have version, this check should be removed later
@ -80,9 +87,48 @@
}) })
) )
} }
function onActionPanelBlur() {
setTimeout(() => {
listviewInputRef?.focus()
}, 300)
}
$effect(() => {
void $keys
const keySet = keys.getSet()
if (keySet.size === 2) {
if (keySet.has(_platform === "macos" ? "Meta" : "Control") && keySet.has("k")) {
setTimeout(() => {
actionPanelOpen = !actionPanelOpen
if (!actionPanelOpen) {
onActionPanelBlur()
listviewInputRef?.focus()
}
}, 100)
}
}
})
function onkeydown(e: KeyboardEvent) {
if (e.key === "Escape") {
if (document.activeElement === listviewInputRef) {
goHome()
}
}
}
let highlightedCmd = $derived.by(() => {
void highlightedCmdValue
const ext = storeExtList.find((ext) => ext.identifier === highlightedCmdValue)
if (ext) {
return ext
}
return null
})
</script> </script>
<svelte:window on:keydown={goHomeOnEscapeClearSearchTerm} /> <svelte:window on:keydown={onkeydown} />
{#snippet leftSlot()} {#snippet leftSlot()}
<Button <Button
variant="outline" variant="outline"
@ -105,10 +151,25 @@
loop loop
> >
<CustomCommandInput <CustomCommandInput
bind:ref={listviewInputRef}
autofocus autofocus
placeholder="Type a command or search..." placeholder="Type a command or search..."
leftSlot={leftSlot as Snippet} leftSlot={leftSlot as Snippet}
bind:value={$appState.searchTerm} bind:value={$appState.searchTerm}
onkeydown={(e) => {
if (e.key === "Enter") {
const modifier = _platform === "macos" ? e.metaKey : e.ctrlKey
if (modifier) {
if (highlightedCmd) {
onExtItemInstall(highlightedCmd)
}
} else {
if (highlightedCmd) {
onExtItemSelected(highlightedCmd)
}
}
}
}}
/> />
<Command.List class="max-h-screen grow"> <Command.List class="max-h-screen grow">
<Command.Empty>No results found.</Command.Empty> <Command.Empty>No results found.</Command.Empty>
@ -117,11 +178,38 @@
{ext} {ext}
installedVersion={$installedExtsMap[ext.identifier]} installedVersion={$installedExtsMap[ext.identifier]}
isUpgradable={!!$upgradableExpsMap[ext.identifier]} isUpgradable={!!$upgradableExpsMap[ext.identifier]}
onSelect={() => onExtItemSelected(ext)} onSelect={() => {}}
onUpgrade={() => onExtItemUpgrade(ext)} onUpgrade={() => onExtItemUpgrade(ext)}
onInstall={() => onExtItemInstall(ext)} onInstall={() => onExtItemInstall(ext)}
/> />
{/each} {/each}
</Command.List> </Command.List>
<GlobalCommandPaletteFooter /> <GlobalCommandPaletteFooter
defaultAction="Show Details"
bind:actionPanelOpen
{onActionPanelBlur}
actionPanel={new Action.ActionPanel({
title: "Actions",
items: [
new Action.Action({
title: `Install (${_platform === "macos" ? "⌘" : "Ctrl"} + ⏎)`,
value: "install"
})
]
})}
onActionSelected={(value) => {
if (value === "install") {
console.log("install")
if (highlightedCmd) {
onExtItemInstall(highlightedCmd)
}
}
}}
onDefaultActionSelected={() => {
console.log("default install")
if (highlightedCmd) {
onExtItemInstall(highlightedCmd)
}
}}
/>
</Command.Root> </Command.Root>

35
apps/desktop/src/routes/app/extension/ui-worker/+page.svelte
View File

@ -3,8 +3,13 @@
import { appState } from "@/stores/appState.js" import { appState } from "@/stores/appState.js"
import { keys } from "@/stores/keys" import { keys } from "@/stores/keys"
import { winExtMap } from "@/stores/winExtMap.js" import { winExtMap } from "@/stores/winExtMap.js"
import { WatchEvent } from "@/types/fs.js"
import { helperAPI } from "@/utils/helper.js" import { helperAPI } from "@/utils/helper.js"
import { listenToFileDrop, listenToRefreshDevExt } from "@/utils/tauri-events.js" import {
emitReloadOneExtension,
listenToFileDrop,
listenToRefreshDevExt
} from "@/utils/tauri-events.js"
import { isInMainWindow } from "@/utils/window.js" import { isInMainWindow } from "@/utils/window.js"
import { db } from "@kksh/api/commands" import { db } from "@kksh/api/commands"
import { import {
@ -28,6 +33,7 @@
import type { IKunkunFullServerAPI } from "@kunkunapi/src/api/server" import type { IKunkunFullServerAPI } from "@kunkunapi/src/api/server"
import type { UnlistenFn } from "@tauri-apps/api/event" import type { UnlistenFn } from "@tauri-apps/api/event"
import { getCurrentWebviewWindow } from "@tauri-apps/api/webviewWindow" import { getCurrentWebviewWindow } from "@tauri-apps/api/webviewWindow"
import * as fs from "@tauri-apps/plugin-fs"
import { readTextFile } from "@tauri-apps/plugin-fs" import { readTextFile } from "@tauri-apps/plugin-fs"
import { debug } from "@tauri-apps/plugin-log" import { debug } from "@tauri-apps/plugin-log"
import { platform } from "@tauri-apps/plugin-os" import { platform } from "@tauri-apps/plugin-os"
@ -57,6 +63,7 @@
let loaded = $state(false) let loaded = $state(false)
let listview: Templates.ListView | undefined = $state(undefined) let listview: Templates.ListView | undefined = $state(undefined)
const _platform = platform() const _platform = platform()
let unlistenPkgJsonWatch: UnlistenFn | undefined
async function goBack() { async function goBack() {
if (isInMainWindow()) { if (isInMainWindow()) {
@ -242,6 +249,22 @@
worker?.terminate() worker?.terminate()
} }
}) })
function onPkgJsonChange(evt: fs.WatchEvent) {
const parsed = v.safeParse(WatchEvent, evt)
if (parsed.success) {
if (
parsed.output.type.modify.kind === "data" &&
parsed.output.type.modify.mode === "content" &&
parsed.output.paths.includes(data.pkgJsonPath)
) {
console.log("pkgJson changed", parsed.output.paths)
// emit event to reload extension commands
emitReloadOneExtension(loadedExt.extPath)
}
}
}
onMount(async () => { onMount(async () => {
setTimeout(() => { setTimeout(() => {
appState.setLoadingBar(true) appState.setLoadingBar(true)
@ -261,11 +284,16 @@
appState.setLoadingBar(false) appState.setLoadingBar(false)
loaded = true loaded = true
}, 500) }, 500)
console.log("watching", data.pkgJsonPath)
fs.watch(data.pkgJsonPath, onPkgJsonChange).then((unlisten) => {
unlistenPkgJsonWatch = unlisten
})
}) })
onDestroy(() => { onDestroy(() => {
unlistenRefreshWorkerExt?.() unlistenRefreshWorkerExt?.()
unlistenFileDrop?.() unlistenFileDrop?.()
unlistenPkgJsonWatch?.()
winExtMap.unregisterExtensionFromWindow(appWin.label) winExtMap.unregisterExtensionFromWindow(appWin.label)
extensionLoadingBar = false extensionLoadingBar = false
appState.setActionPanel(undefined) appState.setActionPanel(undefined)
@ -281,7 +309,6 @@
) { ) {
// actionPanelOpen = true // actionPanelOpen = true
setTimeout(() => { setTimeout(() => {
console.log("toggle action panel")
actionPanelOpen = !actionPanelOpen actionPanelOpen = !actionPanelOpen
if (!actionPanelOpen) { if (!actionPanelOpen) {
onActionPanelBlur() onActionPanelBlur()
@ -298,8 +325,6 @@
function onkeydown(e: KeyboardEvent) { function onkeydown(e: KeyboardEvent) {
if (e.key === "Escape") { if (e.key === "Escape") {
console.log(document.activeElement)
console.log(document.activeElement?.nodeName)
if (document.activeElement?.nodeName === "INPUT") { if (document.activeElement?.nodeName === "INPUT") {
console.log("input") console.log("input")
} }
@ -376,7 +401,7 @@
{pbar} {pbar}
onGoBack={goBack} onGoBack={goBack}
onSubmit={(formData: Record<string, string | number | boolean>) => { onSubmit={(formData: Record<string, string | number | boolean>) => {
console.log("formData", formData) console.log("Submit formData", formData)
workerAPI?.onFormSubmit(formData) workerAPI?.onFormSubmit(formData)
}} }}
/> />

9
deno.lock generated
View File

@ -51,6 +51,7 @@
"npm:@tauri-apps/api@^2.2.0": "2.2.0", "npm:@tauri-apps/api@^2.2.0": "2.2.0",
"npm:@tauri-apps/cli@^2.2.2": "2.2.7", "npm:@tauri-apps/cli@^2.2.2": "2.2.7",
"npm:@tauri-apps/cli@^2.2.7": "2.2.7", "npm:@tauri-apps/cli@^2.2.7": "2.2.7",
"npm:@tauri-apps/plugin-autostart@^2.2.0": "2.2.0",
"npm:@tauri-apps/plugin-deep-link@^2.2.0": "2.2.0", "npm:@tauri-apps/plugin-deep-link@^2.2.0": "2.2.0",
"npm:@tauri-apps/plugin-dialog@^2.2.0": "2.2.0", "npm:@tauri-apps/plugin-dialog@^2.2.0": "2.2.0",
"npm:@tauri-apps/plugin-fs@^2.2.0": "2.2.0", "npm:@tauri-apps/plugin-fs@^2.2.0": "2.2.0",
@ -180,6 +181,7 @@
"npm:tauri-api-adapter@~0.3.20": "0.3.20_typescript@5.6.3", "npm:tauri-api-adapter@~0.3.20": "0.3.20_typescript@5.6.3",
"npm:tauri-plugin-clipboard-api@^2.1.11": "2.1.11_typescript@5.6.3", "npm:tauri-plugin-clipboard-api@^2.1.11": "2.1.11_typescript@5.6.3",
"npm:tauri-plugin-shellx-api@^2.0.14": "2.0.14", "npm:tauri-plugin-shellx-api@^2.0.14": "2.0.14",
"npm:tauri-plugin-system-info-api@2.0.8": "2.0.8_typescript@5.6.3",
"npm:ts-proto@^2.3.0": "2.6.1", "npm:ts-proto@^2.3.0": "2.6.1",
"npm:tslib@^2.8.1": "2.8.1", "npm:tslib@^2.8.1": "2.8.1",
"npm:turbo@^2.3.4": "2.4.0", "npm:turbo@^2.3.4": "2.4.0",
@ -5025,6 +5027,12 @@
"@tauri-apps/cli-win32-x64-msvc" "@tauri-apps/cli-win32-x64-msvc"
] ]
}, },
"@tauri-apps/plugin-autostart@2.2.0": {
"integrity": "sha512-TzVcDZdOvdot0avkpstUWJKKEl4cyxLpFB9DZZRW5zH8k+Bv8IVJmO0zyYuw+7oKlGdHOINbD/7Je7GHMViw5w==",
"dependencies": [
"@tauri-apps/api@2.2.0"
]
},
"@tauri-apps/plugin-deep-link@2.2.0": { "@tauri-apps/plugin-deep-link@2.2.0": {
"integrity": "sha512-H6mkxr2KZ3XJcKL44tiq6cOjCw9DL8OgU1xjn3j26Qsn+H/roPFiyhR7CHuB8Ar+sQFj4YVlfmJwtBajK2FETQ==", "integrity": "sha512-H6mkxr2KZ3XJcKL44tiq6cOjCw9DL8OgU1xjn3j26Qsn+H/roPFiyhR7CHuB8Ar+sQFj4YVlfmJwtBajK2FETQ==",
"dependencies": [ "dependencies": [
@ -15068,6 +15076,7 @@
"npm:@tanstack/table-core@^8.20.5", "npm:@tanstack/table-core@^8.20.5",
"npm:@tauri-apps/api@^2.1.1", "npm:@tauri-apps/api@^2.1.1",
"npm:@tauri-apps/cli@^2.2.7", "npm:@tauri-apps/cli@^2.2.7",
"npm:@tauri-apps/plugin-autostart@^2.2.0",
"npm:@tauri-apps/plugin-shell@^2.2.0", "npm:@tauri-apps/plugin-shell@^2.2.0",
"npm:@tauri-apps/plugin-stronghold@^2.2.0", "npm:@tauri-apps/plugin-stronghold@^2.2.0",
"npm:@types/bun@latest", "npm:@types/bun@latest",

2
packages/api/src/api/server/shell.ts
View File

@ -168,7 +168,7 @@ export function constructShellApi(
ShellPermissionMap.executePowershellScript, ShellPermissionMap.executePowershellScript,
objectPermissions, objectPermissions,
"powershell", "powershell",
["-Command", script] ["-WindowStyle", "Hidden", "-Command", script]
) )
return executePowershellScript(script) return executePowershellScript(script)
} }

12
packages/api/src/commands/fs.ts
View File

@ -68,3 +68,15 @@ export function unzip(
overwrite: options?.overwrite ?? false overwrite: options?.overwrite ?? false
}) })
} }
/**
* Copy directory from one location to another in tauri backend
*
* Needed as Linux cannot rename paths across different filesystems
*
* @param from Source directory
* @param to Destination directory
*/
export async function copy_dir_all(from: string, to: string) {
await invoke(generateJarvisPluginCommand("copy_dir_all"), { from, to })
}

1
packages/api/src/ui/index.ts
View File

@ -21,3 +21,4 @@ export type {
export * from "../api/client" // all client types export * from "../api/client" // all client types
export type { IUiTemplate } from "./template" export type { IUiTemplate } from "./template"
export type { IShell } from "../api/shell" export type { IShell } from "../api/shell"
export * from "./template/components"

12
packages/extension/src/install.ts
View File

@ -3,7 +3,7 @@
* including install, uninstall, upgrade, check app-extension compatibility, etc. * including install, uninstall, upgrade, check app-extension compatibility, etc.
*/ */
import { isCompatible } from "@kksh/api" import { isCompatible } from "@kksh/api"
import { db, decompressTarball } from "@kksh/api/commands" import { copy_dir_all, db, decompressTarball } from "@kksh/api/commands"
import type { ExtPackageJsonExtra } from "@kksh/api/models" import type { ExtPackageJsonExtra } from "@kksh/api/models"
import { SBExt } from "@kksh/supabase/models" import { SBExt } from "@kksh/supabase/models"
import { greaterThan, parse as parseSemver } from "@std/semver" import { greaterThan, parse as parseSemver } from "@std/semver"
@ -76,7 +76,15 @@ export async function installTarball(
} }
} }
await fs.rename(decompressDest, extInstallPath) // copy all files from decompressDest to extInstallPat
await copy_dir_all(decompressDest, extInstallPath)
// Clean up temp directory
// we need the actual temp dir, as decompressDest is the /tmp/uuidv4/package dir
const tempDir = await path.dirname(decompressDest)
// tempDir is "/tmp/uuidv4"
await fs.remove(tempDir, { recursive: true })
await db.createExtension({ await db.createExtension({
identifier: manifest.kunkun.identifier, identifier: manifest.kunkun.identifier,
version: manifest.version, version: manifest.version,

24
packages/supabase/src/database.types.ts
View File

@ -3,6 +3,30 @@ export type Json = string | number | boolean | null | { [key: string]: Json | un
export type Database = { export type Database = {
public: { public: {
Tables: { Tables: {
cache: {
Row: {
created_at: string
data: Json | null
expiry_date: string | null
id: number
key: string
}
Insert: {
created_at?: string
data?: Json | null
expiry_date?: string | null
id?: number
key: string
}
Update: {
created_at?: string
data?: Json | null
expiry_date?: string | null
id?: number
key?: string
}
Relationships: []
}
events: { events: {
Row: { Row: {
created_at: string created_at: string

2
packages/tauri-plugins/jarvis/Cargo.toml
View File

@ -56,7 +56,7 @@ grpc = { workspace = true }
futures-util = "0.3.31" futures-util = "0.3.31"
rayon = { workspace = true } rayon = { workspace = true }
local-ip-address = "0.6.3" local-ip-address = "0.6.3"
dircpy = "0.3.19"
[target.'cfg(target_os = "macos")'.dependencies] [target.'cfg(target_os = "macos")'.dependencies]
tauri-icns = "0.1.0" tauri-icns = "0.1.0"

1
packages/tauri-plugins/jarvis/build.rs
View File

@ -50,6 +50,7 @@ const COMMANDS: &[&str] = &[
"decompress_tarball", "decompress_tarball",
"compress_tarball", "compress_tarball",
"unzip", "unzip",
"copy_dir_all",
/* -------------------------------------------------------------------------- */ /* -------------------------------------------------------------------------- */
/* File Search */ /* File Search */
/* -------------------------------------------------------------------------- */ /* -------------------------------------------------------------------------- */

3
packages/tauri-plugins/jarvis/permissions/all.toml
View File

@ -49,9 +49,10 @@ commands.allow = [
# File System # File System
"decompress_tarball", "decompress_tarball",
"compress_tarball", "compress_tarball",
"copy_dir_all",
"unzip",
# File Search # File Search
"file_search", "file_search",
"unzip",
# Path # Path
"get_default_extensions_dir", "get_default_extensions_dir",
"get_default_extensions_storage_dir", "get_default_extensions_storage_dir",

13
packages/tauri-plugins/jarvis/permissions/autogenerated/commands/copy_dir_all.toml Normal file
View File

@ -0,0 +1,13 @@
# Automatically generated - DO NOT EDIT!
"$schema" = "../../schemas/schema.json"
[[permission]]
identifier = "allow-copy-dir-all"
description = "Enables the copy_dir_all command without any pre-configured scope."
commands.allow = ["copy_dir_all"]
[[permission]]
identifier = "deny-copy-dir-all"
description = "Denies the copy_dir_all command without any pre-configured scope."
commands.deny = ["copy_dir_all"]

26
packages/tauri-plugins/jarvis/permissions/autogenerated/reference.md
View File

@ -154,6 +154,32 @@ Denies the compress_tarball command without any pre-configured scope.
<tr> <tr>
<td> <td>
`jarvis:allow-copy-dir-all`
</td>
<td>
Enables the copy_dir_all command without any pre-configured scope.
</td>
</tr>
<tr>
<td>
`jarvis:deny-copy-dir-all`
</td>
<td>
Denies the copy_dir_all command without any pre-configured scope.
</td>
</tr>
<tr>
<td>
`jarvis:allow-create-command` `jarvis:allow-create-command`
</td> </td>

10
packages/tauri-plugins/jarvis/permissions/schemas/schema.json
View File

@ -349,6 +349,16 @@
"type": "string", "type": "string",
"const": "deny-compress-tarball" "const": "deny-compress-tarball"
}, },
{
"description": "Enables the copy_dir_all command without any pre-configured scope.",
"type": "string",
"const": "allow-copy-dir-all"
},
{
"description": "Denies the copy_dir_all command without any pre-configured scope.",
"type": "string",
"const": "deny-copy-dir-all"
},
{ {
"description": "Enables the create_command command without any pre-configured scope.", "description": "Enables the create_command command without any pre-configured scope.",
"type": "string", "type": "string",

8
packages/tauri-plugins/jarvis/src/commands/fs.rs
View File

@ -35,3 +35,11 @@ pub async fn unzip(
) -> Result<(), String> { ) -> Result<(), String> {
utils::fs::unzip(&path, &destination_folder, overwrite).map_err(|err| err.to_string()) utils::fs::unzip(&path, &destination_folder, overwrite).map_err(|err| err.to_string())
} }
#[tauri::command]
/// copy one dir to another (or location)
///
/// uses the [`dircpy`](https://crates.io/crates/dircpy) crate for recursive directory copying.
pub async fn copy_dir_all(from: String, to: String) -> Result<(), String> {
dircpy::copy_dir(from, to).map_err(|e| e.to_string())
}

1
packages/tauri-plugins/jarvis/src/lib.rs
View File

@ -115,6 +115,7 @@ pub fn init<R: Runtime>() -> TauriPlugin<R> {
commands::fs::decompress_tarball, commands::fs::decompress_tarball,
commands::fs::compress_tarball, commands::fs::compress_tarball,
commands::fs::unzip, commands::fs::unzip,
commands::fs::copy_dir_all,
/* ------------------------------- file search ------------------------------ */ /* ------------------------------- file search ------------------------------ */
commands::file_search::file_search, commands::file_search::file_search,
/* ------------------------------- extensions ------------------------------- */ /* ------------------------------- extensions ------------------------------- */

11
packages/tauri-plugins/jarvis/src/utils/icns.rs
View File

@ -52,10 +52,13 @@ pub fn load_icns(icns_path: &PathBuf) -> anyhow::Result<RustImageData> {
#[cfg(target_os = "linux")] #[cfg(target_os = "linux")]
pub fn load_icon(path: PathBuf) -> tauri::http::Response<Vec<u8>> { pub fn load_icon(path: PathBuf) -> tauri::http::Response<Vec<u8>> {
match path.exists() { match path.exists() {
true => { true => match std::fs::read(&path) {
let bytes = std::fs::read(&path).expect("Error reading file"); Ok(bytes) => tauri::http::Response::builder().body(bytes).unwrap(),
tauri::http::Response::builder().body(bytes).unwrap() Err(err) => tauri::http::Response::builder()
} .status(tauri::http::StatusCode::NOT_FOUND)
.body(format!("error loading icon: {:?}", err).as_bytes().to_vec())
.unwrap(),
},
false => { false => {
let res = tauri::http::Response::builder() let res = tauri::http::Response::builder()
.status(tauri::http::StatusCode::NOT_FOUND) .status(tauri::http::StatusCode::NOT_FOUND)

2
packages/tauri-plugins/jarvis/src/utils/script.rs
View File

@ -17,6 +17,8 @@ pub fn run_apple_script(script: &str) -> anyhow::Result<String> {
pub fn run_powershell(script: &str) -> anyhow::Result<String> { pub fn run_powershell(script: &str) -> anyhow::Result<String> {
let output = Command::new("powershell") let output = Command::new("powershell")
.arg("-WindowStyle")
.arg("Hidden")
.arg("-Command") .arg("-Command")
.arg(script) .arg(script)
.output() .output()

9
packages/ui/src/components/extension/ExtListItem.svelte
View File

@ -1,6 +1,6 @@
<script lang="ts"> <script lang="ts">
import Icon from "@iconify/svelte" import Icon from "@iconify/svelte"
import { Icon as TIcon } from "@kksh/api/models" import { ExtData, Icon as TIcon } from "@kksh/api/models"
import { SBExt } from "@kksh/supabase/models" import { SBExt } from "@kksh/supabase/models"
import { Button, Command } from "@kksh/svelte5" import { Button, Command } from "@kksh/svelte5"
import { Constants, IconMultiplexer } from "@kksh/ui" import { Constants, IconMultiplexer } from "@kksh/ui"
@ -28,7 +28,12 @@
} = $props() } = $props()
</script> </script>
<Command.Item class={cn("flex items-center justify-between", className)} {onSelect}> <Command.Item
class={cn("flex items-center justify-between", className)}
{onSelect}
value={ext.identifier}
keywords={[ext.name]}
>
<span class="flex items-center space-x-2"> <span class="flex items-center space-x-2">
<span class="!h-6 !w-6"> <span class="!h-6 !w-6">
<IconMultiplexer <IconMultiplexer

47
packages/ui/src/components/extension/StoreExtDetail.svelte
View File

@ -182,28 +182,31 @@
).format("YYYY-MM-DD HH:mm")}</pre> ).format("YYYY-MM-DD HH:mm")}</pre>
</div> </div>
</div> </div>
<div class="flex items-center space-x-2"> {#if !isInTauri}
{#if metadata && metadata.sourceType === ExtPublishSourceTypeEnum.jsr} <Button onclick={onInstallSelected}>Install</Button>
<a href={metadata.source} target="_blank"> {/if}
<Icon class="h-10 w-10" icon="vscode-icons:file-type-jsr" /> </div>
</a> <div class="mt-2 flex gap-2">
{:else if metadata && metadata.sourceType === ExtPublishSourceTypeEnum.npm} {#if metadata && metadata.sourceType === ExtPublishSourceTypeEnum.jsr}
<a href={metadata.source} target="_blank"> <a href={metadata.source} target="_blank">
<Icon class="h-10 w-10" icon="vscode-icons:file-type-npm" /> <Icon class="h-10 w-10" icon="vscode-icons:file-type-jsr" />
</a> </a>
{/if} {:else if metadata && metadata.sourceType === ExtPublishSourceTypeEnum.npm}
{#if metadata && metadata?.git?.commit && metadata?.rekorLogIndex && metadata?.git?.owner && metadata?.git?.repo} <a href={metadata.source} target="_blank">
<a <Icon class="h-10 w-10" icon="vscode-icons:file-type-npm" />
href={`https://github.com/${metadata.git.owner}/${metadata.git.repo}/tree/${metadata.git.commit}`} </a>
target="_blank" {/if}
> {#if metadata && metadata?.git?.commit && metadata?.rekorLogIndex && metadata?.git?.owner && metadata?.git?.repo}
<Badge class="h-8 space-x-2" variant="secondary"> <a
<Icon class="h-6 w-6" icon="mdi:github" /> href={`https://github.com/${metadata.git.owner}/${metadata.git.repo}/tree/${metadata.git.commit}`}
<span>{metadata.git.owner}/{metadata.git.repo}</span> target="_blank"
</Badge> >
</a> <Badge class="h-8 space-x-2" variant="secondary">
{/if} <Icon class="h-6 w-6" icon="mdi:github" />
</div> <span>{metadata.git.owner}/{metadata.git.repo}</span>
</Badge>
</a>
{/if}
</div> </div>
{#if metadata && metadata?.git?.commit && metadata?.rekorLogIndex && metadata?.git?.owner && metadata?.git?.repo} {#if metadata && metadata?.git?.commit && metadata?.rekorLogIndex && metadata?.git?.owner && metadata?.git?.repo}
<Separator class="my-3" /> <Separator class="my-3" />

2
packages/ui/src/components/main/SystemCmds.svelte
View File

@ -21,6 +21,8 @@
if (confirmed) { if (confirmed) {
cmd.function() cmd.function()
} }
} else {
cmd.function()
} }
}} }}
value={cmd.name} value={cmd.name}

17
pnpm-lock.yaml generated
View File

@ -815,7 +815,7 @@ importers:
devDependencies: devDependencies:
'@types/bun': '@types/bun':
specifier: latest specifier: latest
version: 1.2.2 version: 1.2.3
packages/templates/template-ext-next: packages/templates/template-ext-next:
dependencies: dependencies:
@ -5130,6 +5130,9 @@ packages:
'@types/bun@1.2.2': '@types/bun@1.2.2':
resolution: {integrity: sha512-tr74gdku+AEDN5ergNiBnplr7hpDp3V1h7fqI2GcR/rsUaM39jpSeKH0TFibRvU0KwniRx5POgaYnaXbk0hU+w==} resolution: {integrity: sha512-tr74gdku+AEDN5ergNiBnplr7hpDp3V1h7fqI2GcR/rsUaM39jpSeKH0TFibRvU0KwniRx5POgaYnaXbk0hU+w==}
'@types/bun@1.2.3':
resolution: {integrity: sha512-054h79ipETRfjtsCW9qJK8Ipof67Pw9bodFWmkfkaUaRiIQ1dIV2VTlheshlBx3mpKr0KeK8VqnMMCtgN9rQtw==}
'@types/cookie@0.6.0': '@types/cookie@0.6.0':
resolution: {integrity: sha512-4Kh9a6B2bQciAhf7FSuMRRkUWecJgJu9nPnx3yzpsfXX/c50REIqpHY4C82bXP90qrLtXtkDxTZosYO3UpOwlA==} resolution: {integrity: sha512-4Kh9a6B2bQciAhf7FSuMRRkUWecJgJu9nPnx3yzpsfXX/c50REIqpHY4C82bXP90qrLtXtkDxTZosYO3UpOwlA==}
@ -6180,6 +6183,9 @@ packages:
bun-types@1.2.2: bun-types@1.2.2:
resolution: {integrity: sha512-RCbMH5elr9gjgDGDhkTTugA21XtJAy/9jkKe/G3WR2q17VPGhcquf9Sir6uay9iW+7P/BV0CAHA1XlHXMAVKHg==} resolution: {integrity: sha512-RCbMH5elr9gjgDGDhkTTugA21XtJAy/9jkKe/G3WR2q17VPGhcquf9Sir6uay9iW+7P/BV0CAHA1XlHXMAVKHg==}
bun-types@1.2.3:
resolution: {integrity: sha512-P7AeyTseLKAvgaZqQrvp3RqFM3yN9PlcLuSTe7SoJOfZkER73mLdT2vEQi8U64S1YvM/ldcNiQjn0Sn7H9lGgg==}
bundle-name@4.1.0: bundle-name@4.1.0:
resolution: {integrity: sha512-tjwM5exMg6BGRI+kNmTntNsvdZS1X8BFYS6tnJ2hdH0kVxM6/eVZ2xy+FqStSWvYmtfFMDLIxurorHwDKfDz5Q==} resolution: {integrity: sha512-tjwM5exMg6BGRI+kNmTntNsvdZS1X8BFYS6tnJ2hdH0kVxM6/eVZ2xy+FqStSWvYmtfFMDLIxurorHwDKfDz5Q==}
engines: {node: '>=18'} engines: {node: '>=18'}
@ -16633,6 +16639,10 @@ snapshots:
dependencies: dependencies:
bun-types: 1.2.2 bun-types: 1.2.2
'@types/bun@1.2.3':
dependencies:
bun-types: 1.2.3
'@types/cookie@0.6.0': {} '@types/cookie@0.6.0': {}
'@types/d3-array@3.2.1': {} '@types/d3-array@3.2.1': {}
@ -18183,6 +18193,11 @@ snapshots:
'@types/node': 22.13.1 '@types/node': 22.13.1
'@types/ws': 8.5.14 '@types/ws': 8.5.14
bun-types@1.2.3:
dependencies:
'@types/node': 22.13.1
'@types/ws': 8.5.14
bundle-name@4.1.0: bundle-name@4.1.0:
dependencies: dependencies:
run-applescript: 7.0.0 run-applescript: 7.0.0

2
vendors/tauri-plugin-system-info vendored

@ -1 +1 @@
Subproject commit 282b6df90c6e4fc596e1be33e923e13270174ee1 Subproject commit 5d0424ddb61e217a03a4d3d75ef9a761d9901c41