mirror of
https://github.com/kunkunsh/kunkun.git
synced 2025-04-03 22:26:43 +00:00
Feature: add drizzle (#264)
* feat: add drizzle orm * feat: update drizzle configuration and schema management - Added a check for DB_FILE_NAME in drizzle.config.ts to ensure it's set. - Updated package.json to change the package name to @kksh/drizzle and added exports for schema and relations. - Enhanced README.md with instructions for using the schema generation. - Refactored schema.ts for improved readability and organization of imports. * add tauri-plugin-sql * feat: add database select and execute commands - Introduced `select` and `execute` functions in the database module to facilitate querying and executing SQL commands. - Updated the Tauri plugin to expose these commands, allowing for database interactions from the frontend. - Added corresponding permissions for the new commands in the permissions configuration. - Enhanced the database library with JSON value handling for query parameters. * fix: sqlite select command * drizzle ORM verified working * refactor: clean up database module by removing unused SelectQueryResult type and disabling eslint for explicit any usage * pnpm lock update * Update enum definition for type safety - Changed enum to use 'as const' for better type inference - Ensured more robust handling of extension publish sources * reimplemented most db command functions with ORM (migrate from tauri command invoke * fixed searchExtensionData orm function * Refactor ORM commands and searchExtensionData function for improved readability and consistency - Reformatted import statements for better organization. - Cleaned up whitespace and indentation in searchExtensionData function. - Enhanced readability of SQL conditions and query building logic. - Disabled eslint for explicit any usage in the troubleshooters page. * Fix test assertions in database module to use array indexing for results format rust code * update deno lock * move drizzle from desktop to drizzle package * update pnpm version and lock * refactor: migrate db tauri commands to drizzle * refactor: remove unused extension and command CRUD operations from db module
This commit is contained in:
Huakun
GitHub
parent
bf51fdadbc
commit
bb9a46935c
385
Cargo.lock
generated
385
Cargo.lock
generated
@ -479,6 +479,15 @@ dependencies = [
|
|||||||
"system-deps",
|
"system-deps",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "atoi"
|
||||||
|
version = "2.0.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "f28d99ec8bfea296261ca1af174f24225171fea9664ba9003cbebee704810528"
|
||||||
|
dependencies = [
|
||||||
|
"num-traits",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "atomic-waker"
|
name = "atomic-waker"
|
||||||
version = "1.1.2"
|
version = "1.1.2"
|
||||||
@ -1869,6 +1878,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||||||
checksum = "f55bf8e7b65898637379c1b74eb1551107c8294ed26d855ceb9fd1a09cfc9bc0"
|
checksum = "f55bf8e7b65898637379c1b74eb1551107c8294ed26d855ceb9fd1a09cfc9bc0"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"const-oid",
|
"const-oid",
|
||||||
|
"pem-rfc7468",
|
||||||
"zeroize",
|
"zeroize",
|
||||||
]
|
]
|
||||||
|
|
||||||
@ -2081,6 +2091,12 @@ dependencies = [
|
|||||||
"const-random",
|
"const-random",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "dotenvy"
|
||||||
|
version = "0.15.7"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "1aaf95b3e5c8f23aa320147307562d361db0ae0d51242340f558153b4eb2439b"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "downcast-rs"
|
name = "downcast-rs"
|
||||||
version = "1.2.1"
|
version = "1.2.1"
|
||||||
@ -2166,6 +2182,9 @@ name = "either"
|
|||||||
version = "1.13.0"
|
version = "1.13.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
|
checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
|
||||||
|
dependencies = [
|
||||||
|
"serde",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "elliptic-curve"
|
name = "elliptic-curve"
|
||||||
@ -2347,6 +2366,17 @@ version = "3.3.1"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "a5d9305ccc6942a704f4335694ecd3de2ea531b114ac2d51f5f843750787a92f"
|
checksum = "a5d9305ccc6942a704f4335694ecd3de2ea531b114ac2d51f5f843750787a92f"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "etcetera"
|
||||||
|
version = "0.8.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "136d1b5283a1ab77bd9257427ffd09d8667ced0570b6f938942bc7568ed5b943"
|
||||||
|
dependencies = [
|
||||||
|
"cfg-if",
|
||||||
|
"home",
|
||||||
|
"windows-sys 0.48.0",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "event-listener"
|
name = "event-listener"
|
||||||
version = "5.3.1"
|
version = "5.3.1"
|
||||||
@ -2625,6 +2655,17 @@ dependencies = [
|
|||||||
"futures-util",
|
"futures-util",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "futures-intrusive"
|
||||||
|
version = "0.5.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "1d930c203dd0b6ff06e0201a4a2fe9149b43c684fd4420555b26d21b1a02956f"
|
||||||
|
dependencies = [
|
||||||
|
"futures-core",
|
||||||
|
"lock_api",
|
||||||
|
"parking_lot",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "futures-io"
|
name = "futures-io"
|
||||||
version = "0.3.31"
|
version = "0.3.31"
|
||||||
@ -4014,6 +4055,7 @@ dependencies = [
|
|||||||
"tauri-plugin-shell",
|
"tauri-plugin-shell",
|
||||||
"tauri-plugin-shellx",
|
"tauri-plugin-shellx",
|
||||||
"tauri-plugin-single-instance",
|
"tauri-plugin-single-instance",
|
||||||
|
"tauri-plugin-sql",
|
||||||
"tauri-plugin-store",
|
"tauri-plugin-store",
|
||||||
"tauri-plugin-stronghold",
|
"tauri-plugin-stronghold",
|
||||||
"tauri-plugin-svelte",
|
"tauri-plugin-svelte",
|
||||||
@ -4032,6 +4074,9 @@ name = "lazy_static"
|
|||||||
version = "1.5.0"
|
version = "1.5.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
|
checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
|
||||||
|
dependencies = [
|
||||||
|
"spin",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "lazycell"
|
name = "lazycell"
|
||||||
@ -4139,6 +4184,12 @@ dependencies = [
|
|||||||
"windows-targets 0.52.6",
|
"windows-targets 0.52.6",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "libm"
|
||||||
|
version = "0.2.11"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "8355be11b20d696c8f18f6cc018c4e372165b1fa8126cef092399c9951984ffa"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "libredox"
|
name = "libredox"
|
||||||
version = "0.1.3"
|
version = "0.1.3"
|
||||||
@ -4356,6 +4407,16 @@ dependencies = [
|
|||||||
"cfg-if",
|
"cfg-if",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "md-5"
|
||||||
|
version = "0.10.6"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf"
|
||||||
|
dependencies = [
|
||||||
|
"cfg-if",
|
||||||
|
"digest",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "mdns-sd"
|
name = "mdns-sd"
|
||||||
version = "0.11.5"
|
version = "0.11.5"
|
||||||
@ -4734,6 +4795,23 @@ dependencies = [
|
|||||||
"num-traits",
|
"num-traits",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "num-bigint-dig"
|
||||||
|
version = "0.8.4"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "dc84195820f291c7697304f3cbdadd1cb7199c0efc917ff5eafd71225c136151"
|
||||||
|
dependencies = [
|
||||||
|
"byteorder",
|
||||||
|
"lazy_static",
|
||||||
|
"libm",
|
||||||
|
"num-integer",
|
||||||
|
"num-iter",
|
||||||
|
"num-traits",
|
||||||
|
"rand 0.8.5",
|
||||||
|
"smallvec",
|
||||||
|
"zeroize",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "num-complex"
|
name = "num-complex"
|
||||||
version = "0.4.6"
|
version = "0.4.6"
|
||||||
@ -4809,6 +4887,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||||||
checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
|
checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"autocfg",
|
"autocfg",
|
||||||
|
"libm",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@ -5327,6 +5406,15 @@ dependencies = [
|
|||||||
"hmac",
|
"hmac",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "pem-rfc7468"
|
||||||
|
version = "0.7.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "88b39c9bfcfc231068454382784bb460aae594343fb030d46e9f50a645418412"
|
||||||
|
dependencies = [
|
||||||
|
"base64ct",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "percent-encoding"
|
name = "percent-encoding"
|
||||||
version = "2.3.1"
|
version = "2.3.1"
|
||||||
@ -5520,6 +5608,17 @@ dependencies = [
|
|||||||
"futures-io",
|
"futures-io",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "pkcs1"
|
||||||
|
version = "0.7.5"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "c8ffb9f10fa047879315e6625af03c164b16962a5368d724ed16323b68ace47f"
|
||||||
|
dependencies = [
|
||||||
|
"der",
|
||||||
|
"pkcs8",
|
||||||
|
"spki",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "pkcs8"
|
name = "pkcs8"
|
||||||
version = "0.10.2"
|
version = "0.10.2"
|
||||||
@ -6361,6 +6460,26 @@ version = "1.0.3"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "3582f63211428f83597b51b2ddb88e2a91a9d52d12831f9d08f5e624e8977422"
|
checksum = "3582f63211428f83597b51b2ddb88e2a91a9d52d12831f9d08f5e624e8977422"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "rsa"
|
||||||
|
version = "0.9.8"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "78928ac1ed176a5ca1d17e578a1825f3d81ca54cf41053a592584b020cfd691b"
|
||||||
|
dependencies = [
|
||||||
|
"const-oid",
|
||||||
|
"digest",
|
||||||
|
"num-bigint-dig",
|
||||||
|
"num-integer",
|
||||||
|
"num-traits",
|
||||||
|
"pkcs1",
|
||||||
|
"pkcs8",
|
||||||
|
"rand_core 0.6.4",
|
||||||
|
"signature",
|
||||||
|
"spki",
|
||||||
|
"subtle",
|
||||||
|
"zeroize",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "rusqlite"
|
name = "rusqlite"
|
||||||
version = "0.31.0"
|
version = "0.31.0"
|
||||||
@ -7006,6 +7125,9 @@ name = "smallvec"
|
|||||||
version = "1.13.2"
|
version = "1.13.2"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
|
checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
|
||||||
|
dependencies = [
|
||||||
|
"serde",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "socket2"
|
name = "socket2"
|
||||||
@ -7084,6 +7206,211 @@ dependencies = [
|
|||||||
"der",
|
"der",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "sqlformat"
|
||||||
|
version = "0.2.6"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "7bba3a93db0cc4f7bdece8bb09e77e2e785c20bfebf79eb8340ed80708048790"
|
||||||
|
dependencies = [
|
||||||
|
"nom",
|
||||||
|
"unicode_categories",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "sqlx"
|
||||||
|
version = "0.8.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "27144619c6e5802f1380337a209d2ac1c431002dd74c6e60aebff3c506dc4f0c"
|
||||||
|
dependencies = [
|
||||||
|
"sqlx-core",
|
||||||
|
"sqlx-macros",
|
||||||
|
"sqlx-mysql",
|
||||||
|
"sqlx-postgres",
|
||||||
|
"sqlx-sqlite",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "sqlx-core"
|
||||||
|
version = "0.8.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "a999083c1af5b5d6c071d34a708a19ba3e02106ad82ef7bbd69f5e48266b613b"
|
||||||
|
dependencies = [
|
||||||
|
"atoi",
|
||||||
|
"byteorder",
|
||||||
|
"bytes",
|
||||||
|
"crc",
|
||||||
|
"crossbeam-queue",
|
||||||
|
"either",
|
||||||
|
"event-listener",
|
||||||
|
"futures-channel",
|
||||||
|
"futures-core",
|
||||||
|
"futures-intrusive",
|
||||||
|
"futures-io",
|
||||||
|
"futures-util",
|
||||||
|
"hashbrown 0.14.5",
|
||||||
|
"hashlink",
|
||||||
|
"hex",
|
||||||
|
"indexmap 2.6.0",
|
||||||
|
"log",
|
||||||
|
"memchr",
|
||||||
|
"once_cell",
|
||||||
|
"paste",
|
||||||
|
"percent-encoding",
|
||||||
|
"serde",
|
||||||
|
"serde_json",
|
||||||
|
"sha2",
|
||||||
|
"smallvec",
|
||||||
|
"sqlformat",
|
||||||
|
"thiserror 1.0.66",
|
||||||
|
"time",
|
||||||
|
"tracing",
|
||||||
|
"url",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "sqlx-macros"
|
||||||
|
version = "0.8.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "a23217eb7d86c584b8cbe0337b9eacf12ab76fe7673c513141ec42565698bb88"
|
||||||
|
dependencies = [
|
||||||
|
"proc-macro2",
|
||||||
|
"quote",
|
||||||
|
"sqlx-core",
|
||||||
|
"sqlx-macros-core",
|
||||||
|
"syn 2.0.87",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "sqlx-macros-core"
|
||||||
|
version = "0.8.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "1a099220ae541c5db479c6424bdf1b200987934033c2584f79a0e1693601e776"
|
||||||
|
dependencies = [
|
||||||
|
"dotenvy",
|
||||||
|
"either",
|
||||||
|
"heck 0.5.0",
|
||||||
|
"hex",
|
||||||
|
"once_cell",
|
||||||
|
"proc-macro2",
|
||||||
|
"quote",
|
||||||
|
"serde",
|
||||||
|
"serde_json",
|
||||||
|
"sha2",
|
||||||
|
"sqlx-core",
|
||||||
|
"sqlx-mysql",
|
||||||
|
"sqlx-postgres",
|
||||||
|
"sqlx-sqlite",
|
||||||
|
"syn 2.0.87",
|
||||||
|
"tempfile",
|
||||||
|
"url",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "sqlx-mysql"
|
||||||
|
version = "0.8.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "5afe4c38a9b417b6a9a5eeffe7235d0a106716495536e7727d1c7f4b1ff3eba6"
|
||||||
|
dependencies = [
|
||||||
|
"atoi",
|
||||||
|
"base64 0.22.1",
|
||||||
|
"bitflags 2.6.0",
|
||||||
|
"byteorder",
|
||||||
|
"bytes",
|
||||||
|
"crc",
|
||||||
|
"digest",
|
||||||
|
"dotenvy",
|
||||||
|
"either",
|
||||||
|
"futures-channel",
|
||||||
|
"futures-core",
|
||||||
|
"futures-io",
|
||||||
|
"futures-util",
|
||||||
|
"generic-array",
|
||||||
|
"hex",
|
||||||
|
"hkdf",
|
||||||
|
"hmac",
|
||||||
|
"itoa 1.0.11",
|
||||||
|
"log",
|
||||||
|
"md-5",
|
||||||
|
"memchr",
|
||||||
|
"once_cell",
|
||||||
|
"percent-encoding",
|
||||||
|
"rand 0.8.5",
|
||||||
|
"rsa",
|
||||||
|
"serde",
|
||||||
|
"sha1",
|
||||||
|
"sha2",
|
||||||
|
"smallvec",
|
||||||
|
"sqlx-core",
|
||||||
|
"stringprep",
|
||||||
|
"thiserror 1.0.66",
|
||||||
|
"time",
|
||||||
|
"tracing",
|
||||||
|
"whoami",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "sqlx-postgres"
|
||||||
|
version = "0.8.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "b1dbb157e65f10dbe01f729339c06d239120221c9ad9fa0ba8408c4cc18ecf21"
|
||||||
|
dependencies = [
|
||||||
|
"atoi",
|
||||||
|
"base64 0.22.1",
|
||||||
|
"bitflags 2.6.0",
|
||||||
|
"byteorder",
|
||||||
|
"crc",
|
||||||
|
"dotenvy",
|
||||||
|
"etcetera",
|
||||||
|
"futures-channel",
|
||||||
|
"futures-core",
|
||||||
|
"futures-io",
|
||||||
|
"futures-util",
|
||||||
|
"hex",
|
||||||
|
"hkdf",
|
||||||
|
"hmac",
|
||||||
|
"home",
|
||||||
|
"itoa 1.0.11",
|
||||||
|
"log",
|
||||||
|
"md-5",
|
||||||
|
"memchr",
|
||||||
|
"once_cell",
|
||||||
|
"rand 0.8.5",
|
||||||
|
"serde",
|
||||||
|
"serde_json",
|
||||||
|
"sha2",
|
||||||
|
"smallvec",
|
||||||
|
"sqlx-core",
|
||||||
|
"stringprep",
|
||||||
|
"thiserror 1.0.66",
|
||||||
|
"time",
|
||||||
|
"tracing",
|
||||||
|
"whoami",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "sqlx-sqlite"
|
||||||
|
version = "0.8.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "9b2cdd83c008a622d94499c0006d8ee5f821f36c89b7d625c900e5dc30b5c5ee"
|
||||||
|
dependencies = [
|
||||||
|
"atoi",
|
||||||
|
"flume",
|
||||||
|
"futures-channel",
|
||||||
|
"futures-core",
|
||||||
|
"futures-executor",
|
||||||
|
"futures-intrusive",
|
||||||
|
"futures-util",
|
||||||
|
"libsqlite3-sys",
|
||||||
|
"log",
|
||||||
|
"percent-encoding",
|
||||||
|
"serde",
|
||||||
|
"serde_urlencoded",
|
||||||
|
"sqlx-core",
|
||||||
|
"time",
|
||||||
|
"tracing",
|
||||||
|
"url",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "stable_deref_trait"
|
name = "stable_deref_trait"
|
||||||
version = "1.2.0"
|
version = "1.2.0"
|
||||||
@ -7139,6 +7466,17 @@ dependencies = [
|
|||||||
"quote",
|
"quote",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "stringprep"
|
||||||
|
version = "0.1.5"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "7b4df3d392d81bd458a8a621b8bffbd2302a12ffe288a9d931670948749463b1"
|
||||||
|
dependencies = [
|
||||||
|
"unicode-bidi",
|
||||||
|
"unicode-normalization",
|
||||||
|
"unicode-properties",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "strip-ansi-escapes"
|
name = "strip-ansi-escapes"
|
||||||
version = "0.2.0"
|
version = "0.2.0"
|
||||||
@ -7989,6 +8327,25 @@ dependencies = [
|
|||||||
"zbus",
|
"zbus",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "tauri-plugin-sql"
|
||||||
|
version = "2.2.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "b6ccca89ded6bd2ff49fdad9a5b34bcd624aa223fdfddbab83c85706ee3a4948"
|
||||||
|
dependencies = [
|
||||||
|
"futures-core",
|
||||||
|
"indexmap 2.6.0",
|
||||||
|
"log",
|
||||||
|
"serde",
|
||||||
|
"serde_json",
|
||||||
|
"sqlx",
|
||||||
|
"tauri",
|
||||||
|
"tauri-plugin",
|
||||||
|
"thiserror 2.0.3",
|
||||||
|
"time",
|
||||||
|
"tokio",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "tauri-plugin-store"
|
name = "tauri-plugin-store"
|
||||||
version = "2.2.0"
|
version = "2.2.0"
|
||||||
@ -8854,12 +9211,24 @@ dependencies = [
|
|||||||
"tinyvec",
|
"tinyvec",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "unicode-properties"
|
||||||
|
version = "0.1.3"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "e70f2a8b45122e719eb623c01822704c4e0907e7e426a05927e1a1cfff5b75d0"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "unicode-segmentation"
|
name = "unicode-segmentation"
|
||||||
version = "1.12.0"
|
version = "1.12.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493"
|
checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "unicode_categories"
|
||||||
|
version = "0.1.1"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "39ec24b3121d976906ece63c9daad25b85969647682eee313cb5779fdd69e14e"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "universal-hash"
|
name = "universal-hash"
|
||||||
version = "0.5.1"
|
version = "0.5.1"
|
||||||
@ -9082,6 +9451,12 @@ dependencies = [
|
|||||||
"wit-bindgen-rt",
|
"wit-bindgen-rt",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "wasite"
|
||||||
|
version = "0.1.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "b8dad83b4f25e74f184f64c43b150b91efe7647395b42289f38e50566d82855b"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "wasm-bindgen"
|
name = "wasm-bindgen"
|
||||||
version = "0.2.95"
|
version = "0.2.95"
|
||||||
@ -9339,6 +9714,16 @@ dependencies = [
|
|||||||
"rustix",
|
"rustix",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "whoami"
|
||||||
|
version = "1.5.2"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "372d5b87f58ec45c384ba03563b03544dc5fadc3983e434b286913f5b4a9bb6d"
|
||||||
|
dependencies = [
|
||||||
|
"redox_syscall",
|
||||||
|
"wasite",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "widestring"
|
name = "widestring"
|
||||||
version = "0.4.3"
|
version = "0.4.3"
|
||||||
|
|||||||
@ -17,6 +17,7 @@
|
|||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@formkit/auto-animate": "^0.8.2",
|
"@formkit/auto-animate": "^0.8.2",
|
||||||
"@inlang/paraglide-sveltekit": "0.16.0",
|
"@inlang/paraglide-sveltekit": "0.16.0",
|
||||||
|
"@kksh/drizzle": "workspace:*",
|
||||||
"@kksh/extension": "workspace:*",
|
"@kksh/extension": "workspace:*",
|
||||||
"@kksh/svelte5": "^0.1.15",
|
"@kksh/svelte5": "^0.1.15",
|
||||||
"@kksh/ui": "workspace:*",
|
"@kksh/ui": "workspace:*",
|
||||||
@ -27,9 +28,11 @@
|
|||||||
"@tauri-apps/api": "^2.3.0",
|
"@tauri-apps/api": "^2.3.0",
|
||||||
"@tauri-apps/plugin-autostart": "^2.2.0",
|
"@tauri-apps/plugin-autostart": "^2.2.0",
|
||||||
"@tauri-apps/plugin-shell": "^2.2.0",
|
"@tauri-apps/plugin-shell": "^2.2.0",
|
||||||
|
"@tauri-apps/plugin-sql": "^2.2.0",
|
||||||
"@tauri-apps/plugin-stronghold": "^2.2.0",
|
"@tauri-apps/plugin-stronghold": "^2.2.0",
|
||||||
"@tauri-store/svelte": "^2.1.1",
|
"@tauri-store/svelte": "^2.1.1",
|
||||||
"dompurify": "^3.2.4",
|
"dompurify": "^3.2.4",
|
||||||
|
"drizzle-orm": "^0.40.1",
|
||||||
"eslint": "^9.21.0",
|
"eslint": "^9.21.0",
|
||||||
"fuse.js": "^7.1.0",
|
"fuse.js": "^7.1.0",
|
||||||
"gsap": "^3.12.7",
|
"gsap": "^3.12.7",
|
||||||
@ -37,7 +40,7 @@
|
|||||||
"lz-string": "^1.5.0",
|
"lz-string": "^1.5.0",
|
||||||
"pretty-bytes": "^6.1.1",
|
"pretty-bytes": "^6.1.1",
|
||||||
"semver": "^7.7.1",
|
"semver": "^7.7.1",
|
||||||
"svelte-inspect-value": "^0.3.0",
|
"svelte-inspect-value": "^0.5.0",
|
||||||
"svelte-sonner": "^0.3.28",
|
"svelte-sonner": "^0.3.28",
|
||||||
"sveltekit-superforms": "^2.23.1",
|
"sveltekit-superforms": "^2.23.1",
|
||||||
"tauri-plugin-clipboard-api": "^2.1.11",
|
"tauri-plugin-clipboard-api": "^2.1.11",
|
||||||
|
|||||||
@ -58,6 +58,7 @@ uuid = "1.14.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"
|
||||||
|
tauri-plugin-sql = "2"
|
||||||
|
|
||||||
|
|
||||||
[target."cfg(target_os = \"macos\")".dependencies]
|
[target."cfg(target_os = \"macos\")".dependencies]
|
||||||
|
|||||||
@ -108,6 +108,11 @@ pub fn run() {
|
|||||||
.build(),
|
.build(),
|
||||||
)
|
)
|
||||||
.plugin(tauri_plugin_cli::init())
|
.plugin(tauri_plugin_cli::init())
|
||||||
|
.plugin(
|
||||||
|
tauri_plugin_sql::Builder::default()
|
||||||
|
// .add_migrations("sqlite:mydatabase.db", migrations)
|
||||||
|
.build(),
|
||||||
|
)
|
||||||
.plugin(tauri_plugin_user_input::init())
|
.plugin(tauri_plugin_user_input::init())
|
||||||
.plugin(tauri_plugin_deep_link::init())
|
.plugin(tauri_plugin_deep_link::init())
|
||||||
.plugin(tauri_plugin_shell::init())
|
.plugin(tauri_plugin_shell::init())
|
||||||
|
|||||||
@ -242,6 +242,23 @@ export const rawBuiltinCmds: BuiltinCmd[] = [
|
|||||||
},
|
},
|
||||||
keywords: ["extension", "troubleshooter"]
|
keywords: ["extension", "troubleshooter"]
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
name: "ORM Troubleshooter",
|
||||||
|
icon: {
|
||||||
|
type: IconEnum.Iconify,
|
||||||
|
value: "material-symbols:database"
|
||||||
|
},
|
||||||
|
description: "",
|
||||||
|
flags: {
|
||||||
|
developer: true,
|
||||||
|
dev: true
|
||||||
|
},
|
||||||
|
function: async () => {
|
||||||
|
appState.clearSearchTerm()
|
||||||
|
goto(i18n.resolveRoute("/app/troubleshooters/orm"))
|
||||||
|
},
|
||||||
|
keywords: ["extension", "troubleshooter", "database", "orm"]
|
||||||
|
},
|
||||||
{
|
{
|
||||||
name: "Create Quicklink",
|
name: "Create Quicklink",
|
||||||
icon: {
|
icon: {
|
||||||
|
|||||||
@ -7,10 +7,11 @@ import { decideKkrpcSerialization } from "@/utils/kkrpc"
|
|||||||
import { sleep } from "@/utils/time"
|
import { sleep } from "@/utils/time"
|
||||||
import { trimSlash } from "@/utils/url"
|
import { trimSlash } from "@/utils/url"
|
||||||
import { constructExtensionSupportDir } from "@kksh/api"
|
import { constructExtensionSupportDir } from "@kksh/api"
|
||||||
import { db, spawnExtensionFileServer } from "@kksh/api/commands"
|
import { spawnExtensionFileServer } from "@kksh/api/commands"
|
||||||
import type { HeadlessCommand } from "@kksh/api/headless"
|
import type { HeadlessCommand } from "@kksh/api/headless"
|
||||||
import { CustomUiCmd, ExtPackageJsonExtra, HeadlessCmd, TemplateUiCmd } from "@kksh/api/models"
|
import { CustomUiCmd, ExtPackageJsonExtra, HeadlessCmd, TemplateUiCmd } from "@kksh/api/models"
|
||||||
import { constructJarvisServerAPIWithPermissions, type IApp } from "@kksh/api/ui"
|
import { constructJarvisServerAPIWithPermissions, type IApp } from "@kksh/api/ui"
|
||||||
|
import { db } from "@kksh/drizzle"
|
||||||
import { launchNewExtWindow, loadExtensionManifestFromDisk } from "@kksh/extension"
|
import { launchNewExtWindow, loadExtensionManifestFromDisk } from "@kksh/extension"
|
||||||
import type { IKunkunFullServerAPI } from "@kunkunapi/src/api/server"
|
import type { IKunkunFullServerAPI } from "@kunkunapi/src/api/server"
|
||||||
import { convertFileSrc } from "@tauri-apps/api/core"
|
import { convertFileSrc } from "@tauri-apps/api/core"
|
||||||
|
|||||||
0
apps/desktop/src/lib/orm/cmds.ts
Normal file
0
apps/desktop/src/lib/orm/cmds.ts
Normal file
60
apps/desktop/src/lib/orm/database.ts
Normal file
60
apps/desktop/src/lib/orm/database.ts
Normal file
@ -0,0 +1,60 @@
|
|||||||
|
// /* eslint-disable @typescript-eslint/no-explicit-any */
|
||||||
|
// import { db as dbCmd } from "@kksh/api/commands"
|
||||||
|
// import * as schema from "@kksh/drizzle/schema"
|
||||||
|
// import { error } from "@tauri-apps/plugin-log"
|
||||||
|
// import { drizzle } from "drizzle-orm/sqlite-proxy"
|
||||||
|
|
||||||
|
// /**
|
||||||
|
// * Loads the sqlite database via the Tauri Proxy.
|
||||||
|
// */
|
||||||
|
// // export const sqlite = await Database.load("sqlite:test.db");
|
||||||
|
|
||||||
|
// /**
|
||||||
|
// * The drizzle database instance.
|
||||||
|
// */
|
||||||
|
// export const db = drizzle<typeof schema>(
|
||||||
|
// async (sql, params, method) => {
|
||||||
|
// let rows: any = []
|
||||||
|
// let results = []
|
||||||
|
// console.log({
|
||||||
|
// sql,
|
||||||
|
// params,
|
||||||
|
// method
|
||||||
|
// })
|
||||||
|
// console.log(sql)
|
||||||
|
// // If the query is a SELECT, use the select method
|
||||||
|
// if (isSelectQuery(sql)) {
|
||||||
|
// rows = await dbCmd.select(sql, params).catch((e) => {
|
||||||
|
// error("SQL Error:", e)
|
||||||
|
// return []
|
||||||
|
// })
|
||||||
|
// } else {
|
||||||
|
// // Otherwise, use the execute method
|
||||||
|
// rows = await dbCmd.execute(sql, params).catch((e) => {
|
||||||
|
// error("SQL Error:", e)
|
||||||
|
// return []
|
||||||
|
// })
|
||||||
|
// return { rows: [] }
|
||||||
|
// }
|
||||||
|
|
||||||
|
// rows = rows.map((row: any) => {
|
||||||
|
// return Object.values(row)
|
||||||
|
// })
|
||||||
|
|
||||||
|
// // If the method is "all", return all rows
|
||||||
|
// results = method === "all" ? rows : rows[0]
|
||||||
|
// return { rows: results }
|
||||||
|
// },
|
||||||
|
// // Pass the schema to the drizzle instance
|
||||||
|
// { schema: schema, logger: true }
|
||||||
|
// )
|
||||||
|
|
||||||
|
// /**
|
||||||
|
// * Checks if the given SQL query is a SELECT query.
|
||||||
|
// * @param sql The SQL query to check.
|
||||||
|
// * @returns True if the query is a SELECT query, false otherwise.
|
||||||
|
// */
|
||||||
|
// function isSelectQuery(sql: string): boolean {
|
||||||
|
// const selectRegex = /^\s*SELECT\b/i
|
||||||
|
// return selectRegex.test(sql)
|
||||||
|
// }
|
||||||
@ -1,5 +1,5 @@
|
|||||||
import { db } from "@kksh/api/commands"
|
|
||||||
import type { CustomUiCmd, ExtPackageJsonExtra, HeadlessCmd, TemplateUiCmd } from "@kksh/api/models"
|
import type { CustomUiCmd, ExtPackageJsonExtra, HeadlessCmd, TemplateUiCmd } from "@kksh/api/models"
|
||||||
|
import { db } from "@kksh/drizzle"
|
||||||
import * as extAPI from "@kksh/extension"
|
import * as extAPI from "@kksh/extension"
|
||||||
import * as path from "@tauri-apps/api/path"
|
import * as path from "@tauri-apps/api/path"
|
||||||
import Fuse from "fuse.js"
|
import Fuse from "fuse.js"
|
||||||
|
|||||||
@ -12,6 +12,7 @@
|
|||||||
|
|
||||||
<svelte:window on:keydown={handleKeyDown} />
|
<svelte:window on:keydown={handleKeyDown} />
|
||||||
|
|
||||||
|
<div class="fixed h-12 w-full" data-tauri-drag-region></div>
|
||||||
<Layouts.Center class="min-h-screen py-5">
|
<Layouts.Center class="min-h-screen py-5">
|
||||||
<Error.RawErrorJSONPreset
|
<Error.RawErrorJSONPreset
|
||||||
title="Error"
|
title="Error"
|
||||||
|
|||||||
@ -31,6 +31,7 @@
|
|||||||
SystemCmds
|
SystemCmds
|
||||||
} from "@kksh/ui/main"
|
} from "@kksh/ui/main"
|
||||||
import { cn } from "@kksh/ui/utils"
|
import { cn } from "@kksh/ui/utils"
|
||||||
|
import { Ext } from "@kunkunapi/src/models/extension"
|
||||||
import { getCurrentWebviewWindow } from "@tauri-apps/api/webviewWindow"
|
import { getCurrentWebviewWindow } from "@tauri-apps/api/webviewWindow"
|
||||||
import { getCurrentWindow, Window } from "@tauri-apps/api/window"
|
import { getCurrentWindow, Window } from "@tauri-apps/api/window"
|
||||||
import { platform } from "@tauri-apps/plugin-os"
|
import { platform } from "@tauri-apps/plugin-os"
|
||||||
@ -45,6 +46,7 @@
|
|||||||
} from "lucide-svelte"
|
} from "lucide-svelte"
|
||||||
import { onMount } from "svelte"
|
import { onMount } from "svelte"
|
||||||
import { Inspect } from "svelte-inspect-value"
|
import { Inspect } from "svelte-inspect-value"
|
||||||
|
import * as v from "valibot"
|
||||||
|
|
||||||
const win = getCurrentWindow()
|
const win = getCurrentWindow()
|
||||||
let inputEle: HTMLInputElement | null = $state(null)
|
let inputEle: HTMLInputElement | null = $state(null)
|
||||||
@ -114,6 +116,7 @@
|
|||||||
<Inspect name="devStoreExtCmds" value={$devStoreExtCmds} />
|
<Inspect name="devStoreExtCmds" value={$devStoreExtCmds} />
|
||||||
<Inspect name="$appState.searchTerm" value={$appState.searchTerm} />
|
<Inspect name="$appState.searchTerm" value={$appState.searchTerm} />
|
||||||
-->
|
-->
|
||||||
|
|
||||||
<Command.Root
|
<Command.Root
|
||||||
class={cn("h-screen rounded-lg shadow-md")}
|
class={cn("h-screen rounded-lg shadow-md")}
|
||||||
bind:value={$appState.highlightedCmd}
|
bind:value={$appState.highlightedCmd}
|
||||||
|
|||||||
@ -3,8 +3,9 @@
|
|||||||
import { goHome } from "@/utils/route"
|
import { goHome } from "@/utils/route"
|
||||||
import { listenToNewClipboardItem, listenToWindowFocus } from "@/utils/tauri-events"
|
import { listenToNewClipboardItem, listenToWindowFocus } from "@/utils/tauri-events"
|
||||||
import Icon from "@iconify/svelte"
|
import Icon from "@iconify/svelte"
|
||||||
import { ClipboardContentType, db } from "@kksh/api/commands"
|
import { ClipboardContentType } from "@kksh/api/commands"
|
||||||
import { SearchModeEnum, SQLSortOrderEnum, type ExtData } from "@kksh/api/models"
|
import { SearchModeEnum, SQLSortOrderEnum, type ExtData } from "@kksh/api/models"
|
||||||
|
import { db } from "@kksh/drizzle"
|
||||||
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"
|
||||||
|
|||||||
@ -1,7 +1,7 @@
|
|||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
import { cn } from "@/utils"
|
import { cn } from "@/utils"
|
||||||
import { db } from "@kksh/api/commands"
|
|
||||||
import type { ExtData } from "@kksh/api/models"
|
import type { ExtData } from "@kksh/api/models"
|
||||||
|
import { db } from "@kksh/drizzle"
|
||||||
import { Resizable, Separator } from "@kksh/svelte5"
|
import { Resizable, Separator } from "@kksh/svelte5"
|
||||||
import { convertFileSrc } from "@tauri-apps/api/core"
|
import { convertFileSrc } from "@tauri-apps/api/core"
|
||||||
import DOMPurify from "dompurify"
|
import DOMPurify from "dompurify"
|
||||||
|
|||||||
@ -10,7 +10,6 @@
|
|||||||
import { positionToCssStyleString, positionToTailwindClasses } from "@/utils/style"
|
import { positionToCssStyleString, positionToTailwindClasses } from "@/utils/style"
|
||||||
import { sleep } from "@/utils/time"
|
import { sleep } from "@/utils/time"
|
||||||
import { isInMainWindow } from "@/utils/window"
|
import { isInMainWindow } from "@/utils/window"
|
||||||
import { db } from "@kksh/api/commands"
|
|
||||||
import { CustomPosition, ThemeColor, type Position } from "@kksh/api/models"
|
import { CustomPosition, ThemeColor, type Position } from "@kksh/api/models"
|
||||||
import {
|
import {
|
||||||
constructJarvisServerAPIWithPermissions,
|
constructJarvisServerAPIWithPermissions,
|
||||||
@ -19,6 +18,7 @@
|
|||||||
type IUiCustom
|
type IUiCustom
|
||||||
} from "@kksh/api/ui"
|
} from "@kksh/api/ui"
|
||||||
import { toast, type IUiCustomServer1, type IUiCustomServer2 } from "@kksh/api/ui/custom"
|
import { toast, type IUiCustomServer1, type IUiCustomServer2 } from "@kksh/api/ui/custom"
|
||||||
|
import { db } from "@kksh/drizzle"
|
||||||
import { Button } from "@kksh/svelte5"
|
import { Button } from "@kksh/svelte5"
|
||||||
import { cn } from "@kksh/ui/utils"
|
import { cn } from "@kksh/ui/utils"
|
||||||
import type { IKunkunFullServerAPI } from "@kunkunapi/src/api/server"
|
import type { IKunkunFullServerAPI } from "@kunkunapi/src/api/server"
|
||||||
|
|||||||
@ -1,8 +1,7 @@
|
|||||||
import { KunkunIframeExtParams } from "@/cmds/ext"
|
import { KunkunIframeExtParams } from "@/cmds/ext"
|
||||||
import { i18n } from "@/i18n"
|
import { i18n } from "@/i18n"
|
||||||
import { appState } from "@/stores/appState"
|
|
||||||
import { db, unregisterExtensionWindow } from "@kksh/api/commands"
|
|
||||||
import type { Ext as ExtInfoInDB, ExtPackageJsonExtra } from "@kksh/api/models"
|
import type { Ext as ExtInfoInDB, ExtPackageJsonExtra } from "@kksh/api/models"
|
||||||
|
import { db } from "@kksh/drizzle"
|
||||||
import { loadExtensionManifestFromDisk } from "@kksh/extension"
|
import { loadExtensionManifestFromDisk } from "@kksh/extension"
|
||||||
import { error as svError } from "@sveltejs/kit"
|
import { error as svError } from "@sveltejs/kit"
|
||||||
import { join } from "@tauri-apps/api/path"
|
import { join } from "@tauri-apps/api/path"
|
||||||
|
|||||||
@ -13,7 +13,6 @@
|
|||||||
} from "@/utils/tauri-events.js"
|
} from "@/utils/tauri-events.js"
|
||||||
import { sleep } from "@/utils/time.js"
|
import { sleep } from "@/utils/time.js"
|
||||||
import { isInMainWindow } from "@/utils/window.js"
|
import { isInMainWindow } from "@/utils/window.js"
|
||||||
import { db } from "@kksh/api/commands"
|
|
||||||
import {
|
import {
|
||||||
constructJarvisServerAPIWithPermissions,
|
constructJarvisServerAPIWithPermissions,
|
||||||
type IApp,
|
type IApp,
|
||||||
@ -29,6 +28,7 @@
|
|||||||
type IComponent,
|
type IComponent,
|
||||||
type TemplateUiCommand
|
type TemplateUiCommand
|
||||||
} from "@kksh/api/ui/template"
|
} from "@kksh/api/ui/template"
|
||||||
|
import { db } from "@kksh/drizzle"
|
||||||
import { Button, Form } from "@kksh/svelte5"
|
import { Button, Form } from "@kksh/svelte5"
|
||||||
import { LoadingBar } from "@kksh/ui"
|
import { LoadingBar } from "@kksh/ui"
|
||||||
import { Templates } from "@kksh/ui/extension"
|
import { Templates } from "@kksh/ui/extension"
|
||||||
|
|||||||
@ -1,7 +1,7 @@
|
|||||||
import { KunkunTemplateExtParams } from "@/cmds/ext"
|
import { KunkunTemplateExtParams } from "@/cmds/ext"
|
||||||
import { i18n } from "@/i18n"
|
import { i18n } from "@/i18n"
|
||||||
import { db, unregisterExtensionWindow } from "@kksh/api/commands"
|
import type { ExtPackageJsonExtra } from "@kksh/api/models"
|
||||||
import type { Ext as ExtInfoInDB, ExtPackageJsonExtra } from "@kksh/api/models"
|
import { db } from "@kksh/drizzle"
|
||||||
import { loadExtensionManifestFromDisk } from "@kksh/extension"
|
import { loadExtensionManifestFromDisk } from "@kksh/extension"
|
||||||
import { error as sbError, error as svError } from "@sveltejs/kit"
|
import { error as sbError, error as svError } from "@sveltejs/kit"
|
||||||
import { join } from "@tauri-apps/api/path"
|
import { join } from "@tauri-apps/api/path"
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
import * as m from "@/paraglide/messages"
|
import * as m from "@/paraglide/messages"
|
||||||
import { db } from "@kksh/api/commands"
|
import { db } from "@kksh/drizzle"
|
||||||
import { loadExtensionManifestFromDisk } from "@kksh/extension"
|
import { loadExtensionManifestFromDisk } from "@kksh/extension"
|
||||||
import { Button, Dialog, Table } from "@kksh/svelte5"
|
import { Button, Dialog, Table } from "@kksh/svelte5"
|
||||||
import { join } from "@tauri-apps/api/path"
|
import { join } from "@tauri-apps/api/path"
|
||||||
|
|||||||
124
apps/desktop/src/routes/app/troubleshooters/orm/+page.svelte
Normal file
124
apps/desktop/src/routes/app/troubleshooters/orm/+page.svelte
Normal file
@ -0,0 +1,124 @@
|
|||||||
|
<script lang="ts">
|
||||||
|
import {
|
||||||
|
getAllCmds,
|
||||||
|
getAllExtensions,
|
||||||
|
getExtensionDataById,
|
||||||
|
getUniqueExtensionByIdentifier,
|
||||||
|
getUniqueExtensionByPath,
|
||||||
|
searchExtensionData,
|
||||||
|
updateCmdByID
|
||||||
|
} from "@kksh/drizzle/api"
|
||||||
|
import * as schema from "@kksh/drizzle/schema"
|
||||||
|
import { Button, Input } from "@kksh/svelte5"
|
||||||
|
import { CmdTypeEnum, Ext } from "@kunkunapi/src/models/extension"
|
||||||
|
import { SearchModeEnum, SQLSortOrderEnum } from "@kunkunapi/src/models/sql"
|
||||||
|
// import * as orm from "drizzle-orm"
|
||||||
|
import { Inspect } from "svelte-inspect-value"
|
||||||
|
import { toast } from "svelte-sonner"
|
||||||
|
import * as v from "valibot"
|
||||||
|
|
||||||
|
let searchText = $state("")
|
||||||
|
/* eslint-disable */
|
||||||
|
let data: any = $state(null)
|
||||||
|
let inspectTitle = $state("")
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<main class="container space-y-2">
|
||||||
|
<Button
|
||||||
|
onclick={async () => {
|
||||||
|
getAllCmds()
|
||||||
|
.then((cmds) => {
|
||||||
|
console.log(cmds)
|
||||||
|
data = cmds
|
||||||
|
inspectTitle = "All Commands"
|
||||||
|
})
|
||||||
|
.catch((e) => {
|
||||||
|
console.error(e)
|
||||||
|
toast.error("Failed to get all commands", {
|
||||||
|
description: "See console for more details"
|
||||||
|
})
|
||||||
|
})
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
Get All Commands
|
||||||
|
</Button>
|
||||||
|
<Button
|
||||||
|
onclick={() => {
|
||||||
|
getAllExtensions()
|
||||||
|
.then((exts) => {
|
||||||
|
data = exts
|
||||||
|
inspectTitle = "All Extensions"
|
||||||
|
})
|
||||||
|
.catch((e) => {
|
||||||
|
console.error(e)
|
||||||
|
toast.error("Failed to get all extensions", {
|
||||||
|
description: "See console for more details"
|
||||||
|
})
|
||||||
|
})
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
Get All Extensions
|
||||||
|
</Button>
|
||||||
|
|
||||||
|
<Button
|
||||||
|
onclick={async () => {
|
||||||
|
// get all extensions with path not null
|
||||||
|
const exts = await getAllExtensions()
|
||||||
|
for (const ext of exts) {
|
||||||
|
if (ext.path === null) continue
|
||||||
|
const _ext = await getUniqueExtensionByIdentifier(ext.identifier)
|
||||||
|
console.log(_ext)
|
||||||
|
if (ext.path) {
|
||||||
|
const __ext = await getUniqueExtensionByPath(ext.path)
|
||||||
|
console.log(__ext)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// data = exts
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
Get Unique Extension By Identifier and Path
|
||||||
|
</Button>
|
||||||
|
<!-- <Button
|
||||||
|
onclick={async () => {
|
||||||
|
updateCmdByID({
|
||||||
|
cmdId: 1,
|
||||||
|
name: "google",
|
||||||
|
cmdType: CmdTypeEnum.QuickLink,
|
||||||
|
data: `{"link":"https://google.com/search?query={argument}","icon":{"type":"remote-url","value":"https://google.com/favicon.ico","invert":false}}`,
|
||||||
|
enabled: true
|
||||||
|
})
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
Update Command By ID
|
||||||
|
</Button> -->
|
||||||
|
<Button
|
||||||
|
onclick={async () => {
|
||||||
|
const _data = await getExtensionDataById(1, ["search_text", "data"])
|
||||||
|
data = _data
|
||||||
|
inspectTitle = "Extension Data"
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
Get Extension Data By ID
|
||||||
|
</Button>
|
||||||
|
<form
|
||||||
|
class="flex gap-1"
|
||||||
|
onsubmit={async (e) => {
|
||||||
|
e.preventDefault()
|
||||||
|
const _data = await searchExtensionData({
|
||||||
|
extId: 1,
|
||||||
|
searchMode: SearchModeEnum.FTS,
|
||||||
|
searchText: searchText,
|
||||||
|
orderByCreatedAt: SQLSortOrderEnum.Desc,
|
||||||
|
limit: 10,
|
||||||
|
fields: ["search_text", "data"]
|
||||||
|
})
|
||||||
|
console.log(_data)
|
||||||
|
data = _data
|
||||||
|
inspectTitle = "Search Results"
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
<Input class="" bind:value={searchText} placeholder="Search Text" />
|
||||||
|
<Button class="" type="submit">Search Extension Data</Button>
|
||||||
|
</form>
|
||||||
|
<Inspect name={inspectTitle} value={data} expandLevel={2} />
|
||||||
|
</main>
|
||||||
@ -6,6 +6,7 @@
|
|||||||
import { Constants } from "@kksh/ui"
|
import { Constants } from "@kksh/ui"
|
||||||
import { ArrowLeftIcon } from "lucide-svelte"
|
import { ArrowLeftIcon } from "lucide-svelte"
|
||||||
import AppWindow from "lucide-svelte/icons/app-window"
|
import AppWindow from "lucide-svelte/icons/app-window"
|
||||||
|
import DB from "lucide-svelte/icons/database"
|
||||||
import Loader from "lucide-svelte/icons/loader"
|
import Loader from "lucide-svelte/icons/loader"
|
||||||
import Network from "lucide-svelte/icons/network"
|
import Network from "lucide-svelte/icons/network"
|
||||||
|
|
||||||
@ -25,6 +26,11 @@
|
|||||||
title: m.troubleshooters_sidebar_mdns_debugger_title(),
|
title: m.troubleshooters_sidebar_mdns_debugger_title(),
|
||||||
url: i18n.resolveRoute("/app/troubleshooters/mdns-debugger"),
|
url: i18n.resolveRoute("/app/troubleshooters/mdns-debugger"),
|
||||||
icon: Network
|
icon: Network
|
||||||
|
},
|
||||||
|
{
|
||||||
|
title: "ORM",
|
||||||
|
url: i18n.resolveRoute("/app/troubleshooters/orm"),
|
||||||
|
icon: DB
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
let currentItem = $state(items.find((item) => window.location.pathname === item.url))
|
let currentItem = $state(items.find((item) => window.location.pathname === item.url))
|
||||||
|
|||||||
@ -22,7 +22,7 @@
|
|||||||
"typescript": "^5.0.0",
|
"typescript": "^5.0.0",
|
||||||
"verify-package-export": "^0.0.3"
|
"verify-package-export": "^0.0.3"
|
||||||
},
|
},
|
||||||
"packageManager": "pnpm@9.15.2",
|
"packageManager": "pnpm@10.7.0",
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": ">=22"
|
"node": ">=22"
|
||||||
},
|
},
|
||||||
|
|||||||
@ -20,9 +20,10 @@ import type {
|
|||||||
IPath as ITauriPath
|
IPath as ITauriPath
|
||||||
} from "tauri-api-adapter"
|
} from "tauri-api-adapter"
|
||||||
import * as v from "valibot"
|
import * as v from "valibot"
|
||||||
import { KV, type JarvisExtDB } from "../commands/db"
|
|
||||||
import type { fileSearch } from "../commands/fileSearch"
|
import type { fileSearch } from "../commands/fileSearch"
|
||||||
import { type AppInfo } from "../models/apps"
|
import { type AppInfo } from "../models/apps"
|
||||||
|
import { type ExtData } from "../models/extension"
|
||||||
|
import { ExtDataField, SearchMode, SQLSortOrder } from "../models/sql"
|
||||||
import type { LightMode, Position, Radius, ThemeColor } from "../models/styles"
|
import type { LightMode, Position, Radius, ThemeColor } from "../models/styles"
|
||||||
import type { DenoSysOptions } from "../permissions/schema"
|
import type { DenoSysOptions } from "../permissions/schema"
|
||||||
|
|
||||||
@ -154,23 +155,34 @@ export interface IUiCustom {
|
|||||||
}
|
}
|
||||||
|
|
||||||
export interface IDb {
|
export interface IDb {
|
||||||
add: typeof JarvisExtDB.prototype.add
|
add: (data: { data: string; dataType?: string; searchText?: string }) => Promise<void>
|
||||||
delete: typeof JarvisExtDB.prototype.delete
|
delete: (dataId: number) => Promise<void>
|
||||||
search: typeof JarvisExtDB.prototype.search
|
search: (searchParams: {
|
||||||
retrieveAll: typeof JarvisExtDB.prototype.retrieveAll
|
dataId?: number
|
||||||
retrieveAllByType: typeof JarvisExtDB.prototype.retrieveAllByType
|
searchMode?: SearchMode
|
||||||
deleteAll: typeof JarvisExtDB.prototype.deleteAll
|
dataType?: string
|
||||||
update: typeof JarvisExtDB.prototype.update
|
searchText?: string
|
||||||
|
afterCreatedAt?: Date
|
||||||
|
beforeCreatedAt?: Date
|
||||||
|
limit?: number
|
||||||
|
orderByCreatedAt?: SQLSortOrder
|
||||||
|
orderByUpdatedAt?: SQLSortOrder
|
||||||
|
fields?: ExtDataField[]
|
||||||
|
}) => Promise<ExtData[]>
|
||||||
|
retrieveAll: (options: { fields?: ExtDataField[] }) => Promise<ExtData[]>
|
||||||
|
retrieveAllByType: (dataType: string) => Promise<ExtData[]>
|
||||||
|
deleteAll: () => Promise<void>
|
||||||
|
update: (data: { dataId: number; data: string; searchText?: string }) => Promise<void>
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* A key-value store built on top of the Database API (based on sqlite)
|
* A key-value store built on top of the Database API (based on sqlite)
|
||||||
*/
|
*/
|
||||||
export interface IKV {
|
export interface IKV {
|
||||||
get: typeof KV.prototype.get
|
get: <T = string>(key: string) => Promise<T | null | undefined>
|
||||||
set: typeof KV.prototype.set
|
set: (key: string, value: string) => Promise<void>
|
||||||
exists: typeof KV.prototype.exists
|
exists: (key: string) => Promise<boolean>
|
||||||
delete: typeof KV.prototype.delete
|
delete: (key: string) => Promise<void>
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface IFs {
|
export interface IFs {
|
||||||
|
|||||||
@ -1,437 +0,0 @@
|
|||||||
import { invoke } from "@tauri-apps/api/core"
|
|
||||||
import { array, literal, optional, parse, safeParse, union, type InferOutput } from "valibot"
|
|
||||||
import { KUNKUN_EXT_IDENTIFIER } from "../constants"
|
|
||||||
import { CmdType, Ext, ExtCmd, ExtData } from "../models/extension"
|
|
||||||
import { convertDateToSqliteString, SearchMode, SearchModeEnum, SQLSortOrder } from "../models/sql"
|
|
||||||
import { generateJarvisPluginCommand } from "./common"
|
|
||||||
|
|
||||||
/* -------------------------------------------------------------------------- */
|
|
||||||
/* Extension CRUD */
|
|
||||||
/* -------------------------------------------------------------------------- */
|
|
||||||
export function createExtension(ext: {
|
|
||||||
identifier: string
|
|
||||||
version: string
|
|
||||||
enabled?: boolean
|
|
||||||
path?: string
|
|
||||||
data?: any
|
|
||||||
}) {
|
|
||||||
return invoke<void>(generateJarvisPluginCommand("create_extension"), ext)
|
|
||||||
}
|
|
||||||
|
|
||||||
export function getAllExtensions() {
|
|
||||||
return invoke<Ext[]>(generateJarvisPluginCommand("get_all_extensions"))
|
|
||||||
}
|
|
||||||
|
|
||||||
export function getUniqueExtensionByIdentifier(identifier: string) {
|
|
||||||
return invoke<Ext | undefined>(
|
|
||||||
generateJarvisPluginCommand("get_unique_extension_by_identifier"),
|
|
||||||
{
|
|
||||||
identifier
|
|
||||||
}
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
export function getUniqueExtensionByPath(path: string) {
|
|
||||||
return invoke<Ext | undefined>(generateJarvisPluginCommand("get_unique_extension_by_path"), {
|
|
||||||
path
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
export function getAllExtensionsByIdentifier(identifier: string) {
|
|
||||||
return invoke<Ext[]>(generateJarvisPluginCommand("get_all_extensions_by_identifier"), {
|
|
||||||
identifier
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Use this function when you expect the extension to exist. Such as builtin extensions.
|
|
||||||
* @param identifier
|
|
||||||
* @returns
|
|
||||||
*/
|
|
||||||
export function getExtensionByIdentifierExpectExists(identifier: string): Promise<Ext> {
|
|
||||||
return getUniqueExtensionByIdentifier(identifier).then((ext) => {
|
|
||||||
if (!ext) {
|
|
||||||
throw new Error(`Unexpexted Error: Extension ${identifier} not found`)
|
|
||||||
}
|
|
||||||
return ext
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
// TODO: clean this up
|
|
||||||
// export function deleteExtensionByIdentifier(identifier: string) {
|
|
||||||
// return invoke<void>(generateJarvisPluginCommand("delete_extension_by_identifier"), { identifier })
|
|
||||||
// }
|
|
||||||
|
|
||||||
export function deleteExtensionByPath(path: string) {
|
|
||||||
return invoke<void>(generateJarvisPluginCommand("delete_extension_by_path"), {
|
|
||||||
path
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
export function deleteExtensionByExtId(extId: string) {
|
|
||||||
return invoke<void>(generateJarvisPluginCommand("delete_extension_by_ext_id"), { extId })
|
|
||||||
}
|
|
||||||
|
|
||||||
/* -------------------------------------------------------------------------- */
|
|
||||||
/* Extension Command CRUD */
|
|
||||||
/* -------------------------------------------------------------------------- */
|
|
||||||
export function createCommand(data: {
|
|
||||||
extId: number
|
|
||||||
name: string
|
|
||||||
cmdType: CmdType
|
|
||||||
data: string
|
|
||||||
alias?: string
|
|
||||||
hotkey?: string
|
|
||||||
enabled?: boolean
|
|
||||||
}) {
|
|
||||||
return invoke<void>(generateJarvisPluginCommand("create_command"), {
|
|
||||||
...data,
|
|
||||||
enabled: data.enabled ?? false
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
export function getCommandById(cmdId: number) {
|
|
||||||
return invoke<ExtCmd | undefined>(generateJarvisPluginCommand("get_command_by_id"), { cmdId })
|
|
||||||
}
|
|
||||||
|
|
||||||
export function getCommandsByExtId(extId: number) {
|
|
||||||
return invoke<ExtCmd[]>(generateJarvisPluginCommand("get_commands_by_ext_id"), { extId })
|
|
||||||
}
|
|
||||||
|
|
||||||
export function deleteCommandById(cmdId: number) {
|
|
||||||
return invoke<void>(generateJarvisPluginCommand("delete_command_by_id"), {
|
|
||||||
cmdId
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
export function updateCommandById(data: {
|
|
||||||
cmdId: number
|
|
||||||
name: string
|
|
||||||
cmdType: CmdType
|
|
||||||
data: string
|
|
||||||
alias?: string
|
|
||||||
hotkey?: string
|
|
||||||
enabled: boolean
|
|
||||||
}) {
|
|
||||||
return invoke<void>(generateJarvisPluginCommand("update_command_by_id"), data)
|
|
||||||
}
|
|
||||||
|
|
||||||
/* -------------------------------------------------------------------------- */
|
|
||||||
/* Extension Data CRUD */
|
|
||||||
/* -------------------------------------------------------------------------- */
|
|
||||||
export const ExtDataField = union([literal("data"), literal("search_text")])
|
|
||||||
export type ExtDataField = InferOutput<typeof ExtDataField>
|
|
||||||
|
|
||||||
function convertRawExtDataToExtData(rawData?: {
|
|
||||||
createdAt: string
|
|
||||||
updatedAt: string
|
|
||||||
data: null | string
|
|
||||||
searchText: null | string
|
|
||||||
}): ExtData | undefined {
|
|
||||||
if (!rawData) {
|
|
||||||
return rawData
|
|
||||||
}
|
|
||||||
const parsedRes = safeParse(ExtData, {
|
|
||||||
...rawData,
|
|
||||||
createdAt: new Date(rawData.createdAt),
|
|
||||||
updatedAt: new Date(rawData.updatedAt),
|
|
||||||
data: rawData.data ?? undefined,
|
|
||||||
searchText: rawData.searchText ?? undefined
|
|
||||||
})
|
|
||||||
if (parsedRes.success) {
|
|
||||||
return parsedRes.output
|
|
||||||
} else {
|
|
||||||
console.error("Extension Data Parse Failure", parsedRes.issues)
|
|
||||||
throw new Error("Fail to parse extension data")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
export function createExtensionData(data: {
|
|
||||||
extId: number
|
|
||||||
dataType: string
|
|
||||||
data: string
|
|
||||||
searchText?: string
|
|
||||||
}) {
|
|
||||||
return invoke<void>(generateJarvisPluginCommand("create_extension_data"), data)
|
|
||||||
}
|
|
||||||
|
|
||||||
export function getExtensionDataById(dataId: number, fields?: ExtDataField[]) {
|
|
||||||
return invoke<
|
|
||||||
| (ExtData & {
|
|
||||||
createdAt: string
|
|
||||||
updatedAt: string
|
|
||||||
data: null | string
|
|
||||||
searchText: null | string
|
|
||||||
})
|
|
||||||
| undefined
|
|
||||||
>(generateJarvisPluginCommand("get_extension_data_by_id"), {
|
|
||||||
dataId,
|
|
||||||
fields
|
|
||||||
}).then(convertRawExtDataToExtData)
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Fields option can be used to select optional fields. By default, if left empty, data and searchText are not returned.
|
|
||||||
* This is because data and searchText can be large and we don't want to return them by default.
|
|
||||||
* If you just want to get data ids in order to delete them, retrieving all data is not necessary.
|
|
||||||
* @param searchParams
|
|
||||||
*/
|
|
||||||
export async function searchExtensionData(searchParams: {
|
|
||||||
extId: number
|
|
||||||
searchMode: SearchMode
|
|
||||||
dataId?: number
|
|
||||||
dataType?: string
|
|
||||||
searchText?: string
|
|
||||||
afterCreatedAt?: string
|
|
||||||
beforeCreatedAt?: string
|
|
||||||
limit?: number
|
|
||||||
offset?: number
|
|
||||||
orderByCreatedAt?: SQLSortOrder
|
|
||||||
orderByUpdatedAt?: SQLSortOrder
|
|
||||||
fields?: ExtDataField[]
|
|
||||||
}): Promise<ExtData[]> {
|
|
||||||
const fields = parse(optional(array(ExtDataField), []), searchParams.fields)
|
|
||||||
let items = await invoke<
|
|
||||||
(ExtData & {
|
|
||||||
createdAt: string
|
|
||||||
updatedAt: string
|
|
||||||
data: null | string
|
|
||||||
searchText: null | string
|
|
||||||
})[]
|
|
||||||
>(generateJarvisPluginCommand("search_extension_data"), {
|
|
||||||
searchQuery: {
|
|
||||||
...searchParams,
|
|
||||||
fields
|
|
||||||
}
|
|
||||||
})
|
|
||||||
|
|
||||||
return items.map(convertRawExtDataToExtData).filter((item) => item) as ExtData[]
|
|
||||||
}
|
|
||||||
|
|
||||||
export function deleteExtensionDataById(dataId: number) {
|
|
||||||
return invoke<void>(generateJarvisPluginCommand("delete_extension_data_by_id"), { dataId })
|
|
||||||
}
|
|
||||||
|
|
||||||
export function updateExtensionDataById(data: {
|
|
||||||
dataId: number
|
|
||||||
data: string
|
|
||||||
searchText?: string
|
|
||||||
}) {
|
|
||||||
return invoke<void>(generateJarvisPluginCommand("update_extension_data_by_id"), data)
|
|
||||||
}
|
|
||||||
|
|
||||||
/* -------------------------------------------------------------------------- */
|
|
||||||
/* Built-in Extensions */
|
|
||||||
/* -------------------------------------------------------------------------- */
|
|
||||||
export function getExtClipboard() {
|
|
||||||
return getExtensionByIdentifierExpectExists(KUNKUN_EXT_IDENTIFIER.KUNKUN_CLIPBOARD_EXT_IDENTIFIER)
|
|
||||||
}
|
|
||||||
export function getExtQuickLinks() {
|
|
||||||
return getExtensionByIdentifierExpectExists(
|
|
||||||
KUNKUN_EXT_IDENTIFIER.KUNKUN_QUICK_LINKS_EXT_IDENTIFIER
|
|
||||||
)
|
|
||||||
}
|
|
||||||
export function getExtRemote() {
|
|
||||||
return getExtensionByIdentifierExpectExists(KUNKUN_EXT_IDENTIFIER.KUNKUN_REMOTE_EXT_IDENTIFIER)
|
|
||||||
}
|
|
||||||
export function getExtScriptCmd() {
|
|
||||||
return getExtensionByIdentifierExpectExists(
|
|
||||||
KUNKUN_EXT_IDENTIFIER.KUNKUN_SCRIPT_CMD_EXT_IDENTIFIER
|
|
||||||
)
|
|
||||||
}
|
|
||||||
export function getExtDev() {
|
|
||||||
return getExtensionByIdentifierExpectExists(KUNKUN_EXT_IDENTIFIER.KUNKUN_DEV_EXT_IDENTIFIER)
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Database API for extensions.
|
|
||||||
* Extensions shouldn't have full access to the database, they can only access their own data.
|
|
||||||
* When an extension is loaded, the main thread will create an instance of this class and
|
|
||||||
* expose it to the extension.
|
|
||||||
*/
|
|
||||||
export class JarvisExtDB {
|
|
||||||
extId: number
|
|
||||||
|
|
||||||
constructor(extId: number) {
|
|
||||||
this.extId = extId
|
|
||||||
}
|
|
||||||
|
|
||||||
async add(data: { data: string; dataType?: string; searchText?: string }) {
|
|
||||||
return createExtensionData({
|
|
||||||
data: data.data,
|
|
||||||
dataType: data.dataType ?? "default",
|
|
||||||
searchText: data.searchText,
|
|
||||||
extId: this.extId
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
async delete(dataId: number): Promise<void> {
|
|
||||||
// Verify if this data belongs to this extension
|
|
||||||
const d = await getExtensionDataById(dataId)
|
|
||||||
if (!d || d.extId !== this.extId) {
|
|
||||||
throw new Error("Extension Data not found")
|
|
||||||
}
|
|
||||||
return await deleteExtensionDataById(dataId)
|
|
||||||
}
|
|
||||||
|
|
||||||
async search(searchParams: {
|
|
||||||
dataId?: number
|
|
||||||
searchMode?: SearchMode
|
|
||||||
dataType?: string
|
|
||||||
searchText?: string
|
|
||||||
afterCreatedAt?: Date
|
|
||||||
beforeCreatedAt?: Date
|
|
||||||
limit?: number
|
|
||||||
orderByCreatedAt?: SQLSortOrder
|
|
||||||
orderByUpdatedAt?: SQLSortOrder
|
|
||||||
fields?: ExtDataField[]
|
|
||||||
}): Promise<ExtData[]> {
|
|
||||||
const beforeCreatedAt = searchParams.beforeCreatedAt
|
|
||||||
? convertDateToSqliteString(searchParams.beforeCreatedAt)
|
|
||||||
: undefined
|
|
||||||
const afterCreatedAt = searchParams.afterCreatedAt
|
|
||||||
? convertDateToSqliteString(searchParams.afterCreatedAt)
|
|
||||||
: undefined
|
|
||||||
return searchExtensionData({
|
|
||||||
...searchParams,
|
|
||||||
searchMode: searchParams.searchMode ?? SearchModeEnum.FTS,
|
|
||||||
extId: this.extId,
|
|
||||||
beforeCreatedAt,
|
|
||||||
afterCreatedAt
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Retrieve all data of this extension.
|
|
||||||
* Use `search()` method for more advanced search.
|
|
||||||
* @param options optional fields to retrieve. By default, data and searchText are not returned.
|
|
||||||
* @returns
|
|
||||||
*/
|
|
||||||
retrieveAll(options: { fields?: ExtDataField[] }): Promise<ExtData[]> {
|
|
||||||
return this.search({ fields: options.fields })
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Retrieve all data of this extension by type.
|
|
||||||
* Use `search()` method for more advanced search.
|
|
||||||
* @param dataType
|
|
||||||
* @returns
|
|
||||||
*/
|
|
||||||
retrieveAllByType(dataType: string): Promise<ExtData[]> {
|
|
||||||
return this.search({ dataType })
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Delete all data of this extension.
|
|
||||||
*/
|
|
||||||
deleteAll(): Promise<void> {
|
|
||||||
return this.search({})
|
|
||||||
.then((items) => {
|
|
||||||
return Promise.all(items.map((item) => this.delete(item.dataId)))
|
|
||||||
})
|
|
||||||
.then(() => {})
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Update data and searchText of this extension.
|
|
||||||
* @param dataId unique id of the data
|
|
||||||
* @param data
|
|
||||||
* @param searchText
|
|
||||||
* @returns
|
|
||||||
*/
|
|
||||||
async update(data: { dataId: number; data: string; searchText?: string }): Promise<void> {
|
|
||||||
const d = await getExtensionDataById(data.dataId)
|
|
||||||
if (!d || d.extId !== this.extId) {
|
|
||||||
throw new Error("Extension Data not found")
|
|
||||||
}
|
|
||||||
return updateExtensionDataById(data)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
export class KV {
|
|
||||||
extId: number
|
|
||||||
db: JarvisExtDB
|
|
||||||
private DataType: string = "kunkun_kv"
|
|
||||||
|
|
||||||
constructor(extId: number) {
|
|
||||||
this.extId = extId
|
|
||||||
this.db = new JarvisExtDB(extId)
|
|
||||||
}
|
|
||||||
|
|
||||||
get<T = string>(key: string): Promise<T | null | undefined> {
|
|
||||||
return this.db
|
|
||||||
.search({
|
|
||||||
dataType: this.DataType,
|
|
||||||
searchText: key,
|
|
||||||
searchMode: SearchModeEnum.ExactMatch,
|
|
||||||
fields: ["search_text", "data"]
|
|
||||||
})
|
|
||||||
.then((items) => {
|
|
||||||
if (items.length === 0) {
|
|
||||||
return null
|
|
||||||
} else if (items.length > 1) {
|
|
||||||
throw new Error("Multiple KVs with the same key")
|
|
||||||
}
|
|
||||||
return items[0].data ? (JSON.parse(items[0].data).value as T) : null
|
|
||||||
})
|
|
||||||
.catch((err) => {
|
|
||||||
console.warn(err)
|
|
||||||
return null
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
set(key: string, value: string): Promise<void> {
|
|
||||||
return this.db
|
|
||||||
.search({
|
|
||||||
dataType: this.DataType,
|
|
||||||
searchText: key,
|
|
||||||
searchMode: SearchModeEnum.ExactMatch
|
|
||||||
})
|
|
||||||
.then((items) => {
|
|
||||||
if (items.length === 0) {
|
|
||||||
return this.db.add({
|
|
||||||
data: JSON.stringify({ value: value }),
|
|
||||||
dataType: this.DataType,
|
|
||||||
searchText: key
|
|
||||||
})
|
|
||||||
} else if (items.length === 1) {
|
|
||||||
return this.db.update({
|
|
||||||
dataId: items[0].dataId,
|
|
||||||
data: JSON.stringify({ value: value }),
|
|
||||||
searchText: key
|
|
||||||
})
|
|
||||||
} else {
|
|
||||||
return Promise.all(items.map((item) => this.db.delete(item.dataId))).then(() =>
|
|
||||||
Promise.resolve()
|
|
||||||
)
|
|
||||||
}
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
delete(key: string): Promise<void> {
|
|
||||||
return this.db
|
|
||||||
.search({
|
|
||||||
dataType: this.DataType,
|
|
||||||
searchText: key,
|
|
||||||
searchMode: SearchModeEnum.ExactMatch
|
|
||||||
})
|
|
||||||
.then((items) => {
|
|
||||||
return Promise.all(items.map((item) => this.db.delete(item.dataId))).then(() =>
|
|
||||||
Promise.resolve()
|
|
||||||
)
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
exists(key: string): Promise<boolean> {
|
|
||||||
return this.db
|
|
||||||
.search({
|
|
||||||
dataType: this.DataType,
|
|
||||||
searchText: key,
|
|
||||||
searchMode: SearchModeEnum.ExactMatch,
|
|
||||||
fields: []
|
|
||||||
})
|
|
||||||
.then((items) => {
|
|
||||||
return items.length > 0
|
|
||||||
})
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -5,8 +5,7 @@ export * from "./tools"
|
|||||||
export * from "./extension"
|
export * from "./extension"
|
||||||
export * from "./system"
|
export * from "./system"
|
||||||
export * from "./store"
|
export * from "./store"
|
||||||
export * as db from "./db"
|
export * as sql from "./sql"
|
||||||
export { JarvisExtDB } from "./db"
|
|
||||||
export * from "./clipboard"
|
export * from "./clipboard"
|
||||||
export * from "./fileSearch"
|
export * from "./fileSearch"
|
||||||
export * from "./utils"
|
export * from "./utils"
|
||||||
|
|||||||
30
packages/api/src/commands/sql.ts
Normal file
30
packages/api/src/commands/sql.ts
Normal file
@ -0,0 +1,30 @@
|
|||||||
|
import { invoke } from "@tauri-apps/api/core"
|
||||||
|
import { generateJarvisPluginCommand } from "./common"
|
||||||
|
|
||||||
|
export interface QueryResult {
|
||||||
|
/** The number of rows affected by the query. */
|
||||||
|
rowsAffected: number
|
||||||
|
/**
|
||||||
|
* The last inserted `id`.
|
||||||
|
*
|
||||||
|
* This value is not set for Postgres databases. If the
|
||||||
|
* last inserted id is required on Postgres, the `select` function
|
||||||
|
* must be used, with a `RETURNING` clause
|
||||||
|
* (`INSERT INTO todos (title) VALUES ($1) RETURNING id`).
|
||||||
|
*/
|
||||||
|
lastInsertId?: number
|
||||||
|
}
|
||||||
|
|
||||||
|
export function select(query: string, values: any[]) {
|
||||||
|
return invoke<any[]>(generateJarvisPluginCommand("select"), {
|
||||||
|
query,
|
||||||
|
values
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
export function execute(query: string, values: any[]) {
|
||||||
|
return invoke<QueryResult>(generateJarvisPluginCommand("execute"), {
|
||||||
|
query,
|
||||||
|
values
|
||||||
|
})
|
||||||
|
}
|
||||||
@ -19,7 +19,7 @@ export const Ext = v.object({
|
|||||||
identifier: v.string(),
|
identifier: v.string(),
|
||||||
version: v.string(),
|
version: v.string(),
|
||||||
enabled: v.boolean(),
|
enabled: v.boolean(),
|
||||||
installed_at: v.string(),
|
installedAt: v.string(),
|
||||||
path: v.optional(v.nullable(v.string())),
|
path: v.optional(v.nullable(v.string())),
|
||||||
data: v.optional(v.any())
|
data: v.optional(v.any())
|
||||||
})
|
})
|
||||||
@ -48,6 +48,7 @@ export const ExtCmd = v.object({
|
|||||||
hotkey: v.optional(v.nullable(v.string())),
|
hotkey: v.optional(v.nullable(v.string())),
|
||||||
enabled: v.boolean()
|
enabled: v.boolean()
|
||||||
})
|
})
|
||||||
|
|
||||||
export type ExtCmd = v.InferOutput<typeof ExtCmd>
|
export type ExtCmd = v.InferOutput<typeof ExtCmd>
|
||||||
|
|
||||||
export const QuickLinkCmd = v.object({
|
export const QuickLinkCmd = v.object({
|
||||||
|
|||||||
@ -5,7 +5,7 @@ import { ExtPackageJson, KunkunExtManifest } from "./manifest"
|
|||||||
export const ExtPublishSourceTypeEnum = {
|
export const ExtPublishSourceTypeEnum = {
|
||||||
jsr: "jsr",
|
jsr: "jsr",
|
||||||
npm: "npm"
|
npm: "npm"
|
||||||
}
|
} as const
|
||||||
|
|
||||||
export const ExtPublishMetadata = v.object({
|
export const ExtPublishMetadata = v.object({
|
||||||
source: v.optional(v.string("Source of the extension (e.g. url to package)")),
|
source: v.optional(v.string("Source of the extension (e.g. url to package)")),
|
||||||
|
|||||||
@ -1,12 +1,12 @@
|
|||||||
import { enum_, type InferOutput } from "valibot"
|
import * as v from "valibot"
|
||||||
|
|
||||||
export enum SQLSortOrderEnum {
|
export enum SQLSortOrderEnum {
|
||||||
Asc = "ASC",
|
Asc = "ASC",
|
||||||
Desc = "DESC"
|
Desc = "DESC"
|
||||||
}
|
}
|
||||||
|
|
||||||
export const SQLSortOrder = enum_(SQLSortOrderEnum)
|
export const SQLSortOrder = v.enum_(SQLSortOrderEnum)
|
||||||
export type SQLSortOrder = InferOutput<typeof SQLSortOrder>
|
export type SQLSortOrder = v.InferOutput<typeof SQLSortOrder>
|
||||||
|
|
||||||
export enum SearchModeEnum {
|
export enum SearchModeEnum {
|
||||||
ExactMatch = "exact_match",
|
ExactMatch = "exact_match",
|
||||||
@ -14,8 +14,8 @@ export enum SearchModeEnum {
|
|||||||
FTS = "fts"
|
FTS = "fts"
|
||||||
}
|
}
|
||||||
|
|
||||||
export const SearchMode = enum_(SearchModeEnum)
|
export const SearchMode = v.enum_(SearchModeEnum)
|
||||||
export type SearchMode = InferOutput<typeof SearchMode>
|
export type SearchMode = v.InferOutput<typeof SearchMode>
|
||||||
|
|
||||||
export function convertDateToSqliteString(date: Date) {
|
export function convertDateToSqliteString(date: Date) {
|
||||||
const pad = (num: number) => num.toString().padStart(2, "0")
|
const pad = (num: number) => num.toString().padStart(2, "0")
|
||||||
@ -29,3 +29,6 @@ export function convertDateToSqliteString(date: Date) {
|
|||||||
|
|
||||||
return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`
|
return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export const ExtDataField = v.union([v.literal("data"), v.literal("search_text")])
|
||||||
|
export type ExtDataField = v.InferOutput<typeof ExtDataField>
|
||||||
|
|||||||
@ -4,7 +4,9 @@ version = "0.1.0"
|
|||||||
edition = "2021"
|
edition = "2021"
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
rusqlite = { version = "0.31.0", features = ["bundled-sqlcipher-vendored-openssl"] }
|
rusqlite = { version = "0.31.0", features = [
|
||||||
|
"bundled-sqlcipher-vendored-openssl",
|
||||||
|
] }
|
||||||
serde = { workspace = true, features = ["derive"] }
|
serde = { workspace = true, features = ["derive"] }
|
||||||
serde_json = { workspace = true }
|
serde_json = { workspace = true }
|
||||||
tempfile = "3.10.1"
|
tempfile = "3.10.1"
|
||||||
|
|||||||
@ -2,6 +2,7 @@ pub mod models;
|
|||||||
pub mod schema;
|
pub mod schema;
|
||||||
use models::{CmdType, ExtDataField, ExtDataSearchQuery, SearchMode};
|
use models::{CmdType, ExtDataField, ExtDataSearchQuery, SearchMode};
|
||||||
use rusqlite::{params, params_from_iter, Connection, Result, ToSql};
|
use rusqlite::{params, params_from_iter, Connection, Result, ToSql};
|
||||||
|
use serde_json::Value as JsonValue;
|
||||||
use serde_json::{json, Value};
|
use serde_json::{json, Value};
|
||||||
use std::path::Path;
|
use std::path::Path;
|
||||||
|
|
||||||
@ -122,6 +123,97 @@ impl JarvisDB {
|
|||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub fn select(&self, query: String, values: Vec<JsonValue>) -> Result<Vec<JsonValue>> {
|
||||||
|
println!("DB selecting: {}", query);
|
||||||
|
println!("DB selecting values: {:?}", values);
|
||||||
|
let mut stmt = self.conn.prepare(&query)?;
|
||||||
|
|
||||||
|
// Convert JsonValue parameters to appropriate types for rusqlite
|
||||||
|
let mut params: Vec<Box<dyn ToSql>> = Vec::new();
|
||||||
|
for value in values {
|
||||||
|
if value.is_null() {
|
||||||
|
params.push(Box::new(Option::<String>::None));
|
||||||
|
} else if value.is_string() {
|
||||||
|
params.push(Box::new(value.as_str().unwrap().to_owned()));
|
||||||
|
} else if let Some(number) = value.as_number() {
|
||||||
|
if number.is_i64() {
|
||||||
|
params.push(Box::new(number.as_i64().unwrap()));
|
||||||
|
} else if number.is_u64() {
|
||||||
|
params.push(Box::new(number.as_u64().unwrap() as i64));
|
||||||
|
} else {
|
||||||
|
params.push(Box::new(number.as_f64().unwrap()));
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
params.push(Box::new(value.to_string()));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Get column names from statement
|
||||||
|
let column_names: Vec<String> = (0..stmt.column_count())
|
||||||
|
.map(|i| stmt.column_name(i).unwrap().to_string())
|
||||||
|
.collect();
|
||||||
|
|
||||||
|
// Execute the query with the converted parameters and map results
|
||||||
|
let rows = stmt.query_map(params_from_iter(params.iter().map(|p| p.as_ref())), |row| {
|
||||||
|
let mut result = Vec::new();
|
||||||
|
for i in 0..column_names.len() {
|
||||||
|
let value: Value = match row.get_ref(i)? {
|
||||||
|
rusqlite::types::ValueRef::Null => Value::Null,
|
||||||
|
rusqlite::types::ValueRef::Integer(i) => Value::Number(i.into()),
|
||||||
|
rusqlite::types::ValueRef::Real(r) => Value::Number(
|
||||||
|
serde_json::Number::from_f64(r).unwrap_or(serde_json::Number::from(0)),
|
||||||
|
),
|
||||||
|
rusqlite::types::ValueRef::Text(t) => {
|
||||||
|
Value::String(String::from_utf8_lossy(t).into_owned())
|
||||||
|
}
|
||||||
|
rusqlite::types::ValueRef::Blob(b) => {
|
||||||
|
Value::String(String::from_utf8_lossy(b).into_owned())
|
||||||
|
}
|
||||||
|
};
|
||||||
|
result.push(value);
|
||||||
|
}
|
||||||
|
Ok(Value::Array(result))
|
||||||
|
})?;
|
||||||
|
|
||||||
|
let mut results = Vec::new();
|
||||||
|
for row in rows {
|
||||||
|
results.push(row?);
|
||||||
|
}
|
||||||
|
Ok(results)
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn execute(&self, query: &str, values: Vec<JsonValue>) -> Result<(u64, i64)> {
|
||||||
|
let mut stmt = self.conn.prepare(query)?;
|
||||||
|
|
||||||
|
// Convert JsonValue parameters to appropriate types for rusqlite
|
||||||
|
let mut params: Vec<Box<dyn ToSql>> = Vec::new();
|
||||||
|
for value in values {
|
||||||
|
if value.is_null() {
|
||||||
|
params.push(Box::new(Option::<String>::None));
|
||||||
|
} else if value.is_string() {
|
||||||
|
params.push(Box::new(value.as_str().unwrap().to_owned()));
|
||||||
|
} else if let Some(number) = value.as_number() {
|
||||||
|
if number.is_i64() {
|
||||||
|
params.push(Box::new(number.as_i64().unwrap()));
|
||||||
|
} else if number.is_u64() {
|
||||||
|
params.push(Box::new(number.as_u64().unwrap() as i64));
|
||||||
|
} else {
|
||||||
|
params.push(Box::new(number.as_f64().unwrap()));
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
params.push(Box::new(value.to_string()));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Execute the query with the converted parameters
|
||||||
|
let rows_affected = stmt.execute(params_from_iter(params.iter().map(|p| p.as_ref())))?;
|
||||||
|
|
||||||
|
// Get the last insert rowid
|
||||||
|
let last_insert_id = self.conn.last_insert_rowid();
|
||||||
|
|
||||||
|
Ok((rows_affected as u64, last_insert_id))
|
||||||
|
}
|
||||||
|
|
||||||
pub fn get_all_extensions(&self) -> Result<Vec<models::Ext>> {
|
pub fn get_all_extensions(&self) -> Result<Vec<models::Ext>> {
|
||||||
let mut stmt = self.conn.prepare(
|
let mut stmt = self.conn.prepare(
|
||||||
"SELECT ext_id, identifier, path, data, version, enabled, installed_at FROM extensions",
|
"SELECT ext_id, identifier, path, data, version, enabled, installed_at FROM extensions",
|
||||||
@ -983,4 +1075,72 @@ mod tests {
|
|||||||
|
|
||||||
fs::remove_file(&db_path).unwrap();
|
fs::remove_file(&db_path).unwrap();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_select_and_execute() {
|
||||||
|
let dir = tempdir().unwrap();
|
||||||
|
let db_path = dir.path().join("test.db");
|
||||||
|
let db = JarvisDB::new(&db_path, None).unwrap();
|
||||||
|
db.init().unwrap();
|
||||||
|
|
||||||
|
// Create a simple todo table
|
||||||
|
db.execute(
|
||||||
|
"CREATE TABLE todos (id INTEGER PRIMARY KEY, title TEXT, completed BOOLEAN)",
|
||||||
|
vec![],
|
||||||
|
)
|
||||||
|
.unwrap();
|
||||||
|
|
||||||
|
// Test execute with INSERT
|
||||||
|
let (rows_affected, last_id) = db
|
||||||
|
.execute(
|
||||||
|
"INSERT INTO todos (title, completed) VALUES (?1, ?2)",
|
||||||
|
vec![json!("Buy groceries"), json!(false)],
|
||||||
|
)
|
||||||
|
.unwrap();
|
||||||
|
assert_eq!(rows_affected, 1);
|
||||||
|
assert_eq!(last_id, 1);
|
||||||
|
|
||||||
|
// Test select with basic query
|
||||||
|
let results = db
|
||||||
|
.select(
|
||||||
|
"SELECT title, completed FROM todos WHERE id = ?1".to_string(),
|
||||||
|
vec![json!(1)],
|
||||||
|
)
|
||||||
|
.unwrap();
|
||||||
|
assert_eq!(results.len(), 1);
|
||||||
|
assert_eq!(results[0][0], "Buy groceries");
|
||||||
|
assert_eq!(results[0][1], "false");
|
||||||
|
|
||||||
|
// Test execute with UPDATE
|
||||||
|
let (rows_affected, _) = db
|
||||||
|
.execute(
|
||||||
|
"UPDATE todos SET completed = ?1 WHERE id = ?2",
|
||||||
|
vec![json!(true), json!(1)],
|
||||||
|
)
|
||||||
|
.unwrap();
|
||||||
|
assert_eq!(rows_affected, 1);
|
||||||
|
|
||||||
|
// Verify the update with select
|
||||||
|
let results = db
|
||||||
|
.select(
|
||||||
|
"SELECT completed FROM todos WHERE id = ?1".to_string(),
|
||||||
|
vec![json!(1)],
|
||||||
|
)
|
||||||
|
.unwrap();
|
||||||
|
assert_eq!(results[0][0], "true");
|
||||||
|
|
||||||
|
// Test execute with DELETE
|
||||||
|
let (rows_affected, _) = db
|
||||||
|
.execute("DELETE FROM todos WHERE id = ?1", vec![json!(1)])
|
||||||
|
.unwrap();
|
||||||
|
assert_eq!(rows_affected, 1);
|
||||||
|
|
||||||
|
// Verify the deletion
|
||||||
|
let results = db
|
||||||
|
.select("SELECT COUNT(*) as count FROM todos".to_string(), vec![])
|
||||||
|
.unwrap();
|
||||||
|
assert_eq!(results[0][0], 0);
|
||||||
|
|
||||||
|
fs::remove_file(&db_path).unwrap();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
34
packages/drizzle/.gitignore
vendored
Normal file
34
packages/drizzle/.gitignore
vendored
Normal file
@ -0,0 +1,34 @@
|
|||||||
|
# dependencies (bun install)
|
||||||
|
node_modules
|
||||||
|
|
||||||
|
# output
|
||||||
|
out
|
||||||
|
dist
|
||||||
|
*.tgz
|
||||||
|
|
||||||
|
# code coverage
|
||||||
|
coverage
|
||||||
|
*.lcov
|
||||||
|
|
||||||
|
# logs
|
||||||
|
logs
|
||||||
|
_.log
|
||||||
|
report.[0-9]_.[0-9]_.[0-9]_.[0-9]_.json
|
||||||
|
|
||||||
|
# dotenv environment variable files
|
||||||
|
.env
|
||||||
|
.env.development.local
|
||||||
|
.env.test.local
|
||||||
|
.env.production.local
|
||||||
|
.env.local
|
||||||
|
|
||||||
|
# caches
|
||||||
|
.eslintcache
|
||||||
|
.cache
|
||||||
|
*.tsbuildinfo
|
||||||
|
|
||||||
|
# IntelliJ based IDEs
|
||||||
|
.idea
|
||||||
|
|
||||||
|
# Finder (MacOS) folder config
|
||||||
|
.DS_Store
|
||||||
35
packages/drizzle/README.md
Normal file
35
packages/drizzle/README.md
Normal file
@ -0,0 +1,35 @@
|
|||||||
|
# drizzle
|
||||||
|
|
||||||
|
- Only use `pull` to generate the schema from existing database.
|
||||||
|
- Don't `migrate` or `push`.
|
||||||
|
|
||||||
|
```bash
|
||||||
|
export DB_FILE_NAME="~/Library/Application Support/sh.kunkun.desktop/kk.dev.sqlite"
|
||||||
|
bunx drizzle-kit pull
|
||||||
|
```
|
||||||
|
|
||||||
|
We are using sqlite with fts5, which drizzle doesn't support yet, so pushing the schema will destroy the existing schema.
|
||||||
|
|
||||||
|
We only use pulled schema to generate sql queries.
|
||||||
|
|
||||||
|
## Update Schema
|
||||||
|
|
||||||
|
After `drizzle-kit pull` the schema may have problem with JSON type and boolean type.
|
||||||
|
|
||||||
|
Will need to manually update the following
|
||||||
|
|
||||||
|
### JSON
|
||||||
|
|
||||||
|
```diff lang="ts"
|
||||||
|
+ data: text({ mode: "json" }).notNull(),
|
||||||
|
+ metadata: text({ mode: "json" }),
|
||||||
|
- data: numeric().notNull(),
|
||||||
|
- metadata: numeric(),
|
||||||
|
```
|
||||||
|
|
||||||
|
### Boolean
|
||||||
|
|
||||||
|
```diff lang="ts"
|
||||||
|
+ enabled: integer({ mode: "boolean" }),
|
||||||
|
- enabled: numeric().default(sql`(TRUE)`),
|
||||||
|
```
|
||||||
15
packages/drizzle/drizzle.config.ts
Normal file
15
packages/drizzle/drizzle.config.ts
Normal file
@ -0,0 +1,15 @@
|
|||||||
|
import "dotenv/config"
|
||||||
|
import { defineConfig } from "drizzle-kit"
|
||||||
|
|
||||||
|
if (!process.env.DB_FILE_NAME) {
|
||||||
|
throw new Error("DB_FILE_NAME is not set")
|
||||||
|
}
|
||||||
|
|
||||||
|
export default defineConfig({
|
||||||
|
out: "./drizzle",
|
||||||
|
// schema: "./src/db/schema.ts",
|
||||||
|
dialect: "sqlite",
|
||||||
|
dbCredentials: {
|
||||||
|
url: process.env.DB_FILE_NAME
|
||||||
|
}
|
||||||
|
})
|
||||||
71
packages/drizzle/drizzle/0000_colossal_jocasta.sql
Normal file
71
packages/drizzle/drizzle/0000_colossal_jocasta.sql
Normal file
@ -0,0 +1,71 @@
|
|||||||
|
-- Current sql file was generated after introspecting the database
|
||||||
|
-- If you want to run this migration please uncomment this code before executing migrations
|
||||||
|
/*
|
||||||
|
CREATE TABLE `schema_version` (
|
||||||
|
`version` integer NOT NULL
|
||||||
|
);
|
||||||
|
--> statement-breakpoint
|
||||||
|
CREATE TABLE `extensions` (
|
||||||
|
`ext_id` integer PRIMARY KEY AUTOINCREMENT,
|
||||||
|
`identifier` text NOT NULL,
|
||||||
|
`version` text NOT NULL,
|
||||||
|
`enabled` numeric DEFAULT (TRUE),
|
||||||
|
`path` text,
|
||||||
|
`data` numeric,
|
||||||
|
`installed_at` numeric DEFAULT (CURRENT_TIMESTAMP)
|
||||||
|
);
|
||||||
|
--> statement-breakpoint
|
||||||
|
CREATE TABLE `commands` (
|
||||||
|
`cmd_id` integer PRIMARY KEY AUTOINCREMENT,
|
||||||
|
`ext_id` integer NOT NULL,
|
||||||
|
`name` text NOT NULL,
|
||||||
|
`enabled` numeric DEFAULT (TRUE),
|
||||||
|
`alias` text,
|
||||||
|
`hotkey` text,
|
||||||
|
`type` text NOT NULL,
|
||||||
|
`data` numeric,
|
||||||
|
FOREIGN KEY (`ext_id`) REFERENCES `extensions`(`ext_id`) ON UPDATE no action ON DELETE cascade
|
||||||
|
);
|
||||||
|
--> statement-breakpoint
|
||||||
|
CREATE TABLE `extension_data` (
|
||||||
|
`data_id` integer PRIMARY KEY AUTOINCREMENT,
|
||||||
|
`ext_id` integer NOT NULL,
|
||||||
|
`data_type` text NOT NULL,
|
||||||
|
`data` numeric NOT NULL,
|
||||||
|
`metadata` numeric,
|
||||||
|
`search_text` text,
|
||||||
|
`created_at` numeric DEFAULT (CURRENT_TIMESTAMP),
|
||||||
|
`updated_at` numeric DEFAULT (CURRENT_TIMESTAMP),
|
||||||
|
FOREIGN KEY (`ext_id`) REFERENCES `extensions`(`ext_id`) ON UPDATE no action ON DELETE cascade
|
||||||
|
);
|
||||||
|
--> statement-breakpoint
|
||||||
|
CREATE TABLE `extension_data_fts` (
|
||||||
|
`data_id` numeric,
|
||||||
|
`search_text` numeric,
|
||||||
|
`extension_data_fts` numeric,
|
||||||
|
`rank` numeric
|
||||||
|
);
|
||||||
|
--> statement-breakpoint
|
||||||
|
CREATE TABLE `extension_data_fts_data` (
|
||||||
|
`id` integer PRIMARY KEY,
|
||||||
|
`block` blob
|
||||||
|
);
|
||||||
|
--> statement-breakpoint
|
||||||
|
CREATE TABLE `extension_data_fts_idx` (
|
||||||
|
`segid` numeric NOT NULL,
|
||||||
|
`term` numeric NOT NULL,
|
||||||
|
`pgno` numeric,
|
||||||
|
PRIMARY KEY(`segid`, `term`)
|
||||||
|
);
|
||||||
|
--> statement-breakpoint
|
||||||
|
CREATE TABLE `extension_data_fts_docsize` (
|
||||||
|
`id` integer PRIMARY KEY,
|
||||||
|
`sz` blob
|
||||||
|
);
|
||||||
|
--> statement-breakpoint
|
||||||
|
CREATE TABLE `extension_data_fts_config` (
|
||||||
|
`k` numeric PRIMARY KEY NOT NULL,
|
||||||
|
`v` numeric
|
||||||
|
);
|
||||||
|
|
||||||
|
*/
|
||||||
405
packages/drizzle/drizzle/meta/0000_snapshot.json
Normal file
405
packages/drizzle/drizzle/meta/0000_snapshot.json
Normal file
@ -0,0 +1,405 @@
|
|||||||
|
{
|
||||||
|
"id": "00000000-0000-0000-0000-000000000000",
|
||||||
|
"prevId": "",
|
||||||
|
"version": "6",
|
||||||
|
"dialect": "sqlite",
|
||||||
|
"tables": {
|
||||||
|
"schema_version": {
|
||||||
|
"name": "schema_version",
|
||||||
|
"columns": {
|
||||||
|
"version": {
|
||||||
|
"autoincrement": false,
|
||||||
|
"name": "version",
|
||||||
|
"type": "integer",
|
||||||
|
"primaryKey": false,
|
||||||
|
"notNull": true
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"compositePrimaryKeys": {},
|
||||||
|
"indexes": {},
|
||||||
|
"foreignKeys": {},
|
||||||
|
"uniqueConstraints": {},
|
||||||
|
"checkConstraints": {}
|
||||||
|
},
|
||||||
|
"extensions": {
|
||||||
|
"name": "extensions",
|
||||||
|
"columns": {
|
||||||
|
"ext_id": {
|
||||||
|
"autoincrement": true,
|
||||||
|
"name": "ext_id",
|
||||||
|
"type": "integer",
|
||||||
|
"primaryKey": true,
|
||||||
|
"notNull": false
|
||||||
|
},
|
||||||
|
"identifier": {
|
||||||
|
"autoincrement": false,
|
||||||
|
"name": "identifier",
|
||||||
|
"type": "text",
|
||||||
|
"primaryKey": false,
|
||||||
|
"notNull": true
|
||||||
|
},
|
||||||
|
"version": {
|
||||||
|
"autoincrement": false,
|
||||||
|
"name": "version",
|
||||||
|
"type": "text",
|
||||||
|
"primaryKey": false,
|
||||||
|
"notNull": true
|
||||||
|
},
|
||||||
|
"enabled": {
|
||||||
|
"default": "(TRUE)",
|
||||||
|
"autoincrement": false,
|
||||||
|
"name": "enabled",
|
||||||
|
"type": "numeric",
|
||||||
|
"primaryKey": false,
|
||||||
|
"notNull": false
|
||||||
|
},
|
||||||
|
"path": {
|
||||||
|
"autoincrement": false,
|
||||||
|
"name": "path",
|
||||||
|
"type": "text",
|
||||||
|
"primaryKey": false,
|
||||||
|
"notNull": false
|
||||||
|
},
|
||||||
|
"data": {
|
||||||
|
"autoincrement": false,
|
||||||
|
"name": "data",
|
||||||
|
"type": "numeric",
|
||||||
|
"primaryKey": false,
|
||||||
|
"notNull": false
|
||||||
|
},
|
||||||
|
"installed_at": {
|
||||||
|
"default": "(CURRENT_TIMESTAMP)",
|
||||||
|
"autoincrement": false,
|
||||||
|
"name": "installed_at",
|
||||||
|
"type": "numeric",
|
||||||
|
"primaryKey": false,
|
||||||
|
"notNull": false
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"compositePrimaryKeys": {},
|
||||||
|
"indexes": {},
|
||||||
|
"foreignKeys": {},
|
||||||
|
"uniqueConstraints": {},
|
||||||
|
"checkConstraints": {}
|
||||||
|
},
|
||||||
|
"commands": {
|
||||||
|
"name": "commands",
|
||||||
|
"columns": {
|
||||||
|
"cmd_id": {
|
||||||
|
"autoincrement": true,
|
||||||
|
"name": "cmd_id",
|
||||||
|
"type": "integer",
|
||||||
|
"primaryKey": true,
|
||||||
|
"notNull": false
|
||||||
|
},
|
||||||
|
"ext_id": {
|
||||||
|
"autoincrement": false,
|
||||||
|
"name": "ext_id",
|
||||||
|
"type": "integer",
|
||||||
|
"primaryKey": false,
|
||||||
|
"notNull": true
|
||||||
|
},
|
||||||
|
"name": {
|
||||||
|
"autoincrement": false,
|
||||||
|
"name": "name",
|
||||||
|
"type": "text",
|
||||||
|
"primaryKey": false,
|
||||||
|
"notNull": true
|
||||||
|
},
|
||||||
|
"enabled": {
|
||||||
|
"default": "(TRUE)",
|
||||||
|
"autoincrement": false,
|
||||||
|
"name": "enabled",
|
||||||
|
"type": "numeric",
|
||||||
|
"primaryKey": false,
|
||||||
|
"notNull": false
|
||||||
|
},
|
||||||
|
"alias": {
|
||||||
|
"autoincrement": false,
|
||||||
|
"name": "alias",
|
||||||
|
"type": "text",
|
||||||
|
"primaryKey": false,
|
||||||
|
"notNull": false
|
||||||
|
},
|
||||||
|
"hotkey": {
|
||||||
|
"autoincrement": false,
|
||||||
|
"name": "hotkey",
|
||||||
|
"type": "text",
|
||||||
|
"primaryKey": false,
|
||||||
|
"notNull": false
|
||||||
|
},
|
||||||
|
"type": {
|
||||||
|
"autoincrement": false,
|
||||||
|
"name": "type",
|
||||||
|
"type": "text",
|
||||||
|
"primaryKey": false,
|
||||||
|
"notNull": true
|
||||||
|
},
|
||||||
|
"data": {
|
||||||
|
"autoincrement": false,
|
||||||
|
"name": "data",
|
||||||
|
"type": "numeric",
|
||||||
|
"primaryKey": false,
|
||||||
|
"notNull": false
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"compositePrimaryKeys": {},
|
||||||
|
"indexes": {},
|
||||||
|
"foreignKeys": {
|
||||||
|
"commands_ext_id_extensions_ext_id_fk": {
|
||||||
|
"name": "commands_ext_id_extensions_ext_id_fk",
|
||||||
|
"tableFrom": "commands",
|
||||||
|
"tableTo": "extensions",
|
||||||
|
"columnsFrom": [
|
||||||
|
"ext_id"
|
||||||
|
],
|
||||||
|
"columnsTo": [
|
||||||
|
"ext_id"
|
||||||
|
],
|
||||||
|
"onDelete": "cascade",
|
||||||
|
"onUpdate": "no action"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"uniqueConstraints": {},
|
||||||
|
"checkConstraints": {}
|
||||||
|
},
|
||||||
|
"extension_data": {
|
||||||
|
"name": "extension_data",
|
||||||
|
"columns": {
|
||||||
|
"data_id": {
|
||||||
|
"autoincrement": true,
|
||||||
|
"name": "data_id",
|
||||||
|
"type": "integer",
|
||||||
|
"primaryKey": true,
|
||||||
|
"notNull": false
|
||||||
|
},
|
||||||
|
"ext_id": {
|
||||||
|
"autoincrement": false,
|
||||||
|
"name": "ext_id",
|
||||||
|
"type": "integer",
|
||||||
|
"primaryKey": false,
|
||||||
|
"notNull": true
|
||||||
|
},
|
||||||
|
"data_type": {
|
||||||
|
"autoincrement": false,
|
||||||
|
"name": "data_type",
|
||||||
|
"type": "text",
|
||||||
|
"primaryKey": false,
|
||||||
|
"notNull": true
|
||||||
|
},
|
||||||
|
"data": {
|
||||||
|
"autoincrement": false,
|
||||||
|
"name": "data",
|
||||||
|
"type": "numeric",
|
||||||
|
"primaryKey": false,
|
||||||
|
"notNull": true
|
||||||
|
},
|
||||||
|
"metadata": {
|
||||||
|
"autoincrement": false,
|
||||||
|
"name": "metadata",
|
||||||
|
"type": "numeric",
|
||||||
|
"primaryKey": false,
|
||||||
|
"notNull": false
|
||||||
|
},
|
||||||
|
"search_text": {
|
||||||
|
"autoincrement": false,
|
||||||
|
"name": "search_text",
|
||||||
|
"type": "text",
|
||||||
|
"primaryKey": false,
|
||||||
|
"notNull": false
|
||||||
|
},
|
||||||
|
"created_at": {
|
||||||
|
"default": "(CURRENT_TIMESTAMP)",
|
||||||
|
"autoincrement": false,
|
||||||
|
"name": "created_at",
|
||||||
|
"type": "numeric",
|
||||||
|
"primaryKey": false,
|
||||||
|
"notNull": false
|
||||||
|
},
|
||||||
|
"updated_at": {
|
||||||
|
"default": "(CURRENT_TIMESTAMP)",
|
||||||
|
"autoincrement": false,
|
||||||
|
"name": "updated_at",
|
||||||
|
"type": "numeric",
|
||||||
|
"primaryKey": false,
|
||||||
|
"notNull": false
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"compositePrimaryKeys": {},
|
||||||
|
"indexes": {},
|
||||||
|
"foreignKeys": {
|
||||||
|
"extension_data_ext_id_extensions_ext_id_fk": {
|
||||||
|
"name": "extension_data_ext_id_extensions_ext_id_fk",
|
||||||
|
"tableFrom": "extension_data",
|
||||||
|
"tableTo": "extensions",
|
||||||
|
"columnsFrom": [
|
||||||
|
"ext_id"
|
||||||
|
],
|
||||||
|
"columnsTo": [
|
||||||
|
"ext_id"
|
||||||
|
],
|
||||||
|
"onDelete": "cascade",
|
||||||
|
"onUpdate": "no action"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"uniqueConstraints": {},
|
||||||
|
"checkConstraints": {}
|
||||||
|
},
|
||||||
|
"extension_data_fts": {
|
||||||
|
"name": "extension_data_fts",
|
||||||
|
"columns": {
|
||||||
|
"data_id": {
|
||||||
|
"autoincrement": false,
|
||||||
|
"name": "data_id",
|
||||||
|
"type": "numeric",
|
||||||
|
"primaryKey": false,
|
||||||
|
"notNull": false
|
||||||
|
},
|
||||||
|
"search_text": {
|
||||||
|
"autoincrement": false,
|
||||||
|
"name": "search_text",
|
||||||
|
"type": "numeric",
|
||||||
|
"primaryKey": false,
|
||||||
|
"notNull": false
|
||||||
|
},
|
||||||
|
"extension_data_fts": {
|
||||||
|
"autoincrement": false,
|
||||||
|
"name": "extension_data_fts",
|
||||||
|
"type": "numeric",
|
||||||
|
"primaryKey": false,
|
||||||
|
"notNull": false
|
||||||
|
},
|
||||||
|
"rank": {
|
||||||
|
"autoincrement": false,
|
||||||
|
"name": "rank",
|
||||||
|
"type": "numeric",
|
||||||
|
"primaryKey": false,
|
||||||
|
"notNull": false
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"compositePrimaryKeys": {},
|
||||||
|
"indexes": {},
|
||||||
|
"foreignKeys": {},
|
||||||
|
"uniqueConstraints": {},
|
||||||
|
"checkConstraints": {}
|
||||||
|
},
|
||||||
|
"extension_data_fts_data": {
|
||||||
|
"name": "extension_data_fts_data",
|
||||||
|
"columns": {
|
||||||
|
"id": {
|
||||||
|
"autoincrement": false,
|
||||||
|
"name": "id",
|
||||||
|
"type": "integer",
|
||||||
|
"primaryKey": true,
|
||||||
|
"notNull": false
|
||||||
|
},
|
||||||
|
"block": {
|
||||||
|
"autoincrement": false,
|
||||||
|
"name": "block",
|
||||||
|
"type": "blob",
|
||||||
|
"primaryKey": false,
|
||||||
|
"notNull": false
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"compositePrimaryKeys": {},
|
||||||
|
"indexes": {},
|
||||||
|
"foreignKeys": {},
|
||||||
|
"uniqueConstraints": {},
|
||||||
|
"checkConstraints": {}
|
||||||
|
},
|
||||||
|
"extension_data_fts_idx": {
|
||||||
|
"name": "extension_data_fts_idx",
|
||||||
|
"columns": {
|
||||||
|
"segid": {
|
||||||
|
"autoincrement": false,
|
||||||
|
"name": "segid",
|
||||||
|
"type": "numeric",
|
||||||
|
"primaryKey": false,
|
||||||
|
"notNull": true
|
||||||
|
},
|
||||||
|
"term": {
|
||||||
|
"autoincrement": false,
|
||||||
|
"name": "term",
|
||||||
|
"type": "numeric",
|
||||||
|
"primaryKey": false,
|
||||||
|
"notNull": true
|
||||||
|
},
|
||||||
|
"pgno": {
|
||||||
|
"autoincrement": false,
|
||||||
|
"name": "pgno",
|
||||||
|
"type": "numeric",
|
||||||
|
"primaryKey": false,
|
||||||
|
"notNull": false
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"compositePrimaryKeys": {
|
||||||
|
"extension_data_fts_idx_segid_term_pk": {
|
||||||
|
"columns": [
|
||||||
|
"segid",
|
||||||
|
"term"
|
||||||
|
],
|
||||||
|
"name": "extension_data_fts_idx_segid_term_pk"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"indexes": {},
|
||||||
|
"foreignKeys": {},
|
||||||
|
"uniqueConstraints": {},
|
||||||
|
"checkConstraints": {}
|
||||||
|
},
|
||||||
|
"extension_data_fts_docsize": {
|
||||||
|
"name": "extension_data_fts_docsize",
|
||||||
|
"columns": {
|
||||||
|
"id": {
|
||||||
|
"autoincrement": false,
|
||||||
|
"name": "id",
|
||||||
|
"type": "integer",
|
||||||
|
"primaryKey": true,
|
||||||
|
"notNull": false
|
||||||
|
},
|
||||||
|
"sz": {
|
||||||
|
"autoincrement": false,
|
||||||
|
"name": "sz",
|
||||||
|
"type": "blob",
|
||||||
|
"primaryKey": false,
|
||||||
|
"notNull": false
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"compositePrimaryKeys": {},
|
||||||
|
"indexes": {},
|
||||||
|
"foreignKeys": {},
|
||||||
|
"uniqueConstraints": {},
|
||||||
|
"checkConstraints": {}
|
||||||
|
},
|
||||||
|
"extension_data_fts_config": {
|
||||||
|
"name": "extension_data_fts_config",
|
||||||
|
"columns": {
|
||||||
|
"k": {
|
||||||
|
"autoincrement": false,
|
||||||
|
"name": "k",
|
||||||
|
"type": "numeric",
|
||||||
|
"primaryKey": true,
|
||||||
|
"notNull": true
|
||||||
|
},
|
||||||
|
"v": {
|
||||||
|
"autoincrement": false,
|
||||||
|
"name": "v",
|
||||||
|
"type": "numeric",
|
||||||
|
"primaryKey": false,
|
||||||
|
"notNull": false
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"compositePrimaryKeys": {},
|
||||||
|
"indexes": {},
|
||||||
|
"foreignKeys": {},
|
||||||
|
"uniqueConstraints": {},
|
||||||
|
"checkConstraints": {}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"views": {},
|
||||||
|
"enums": {},
|
||||||
|
"_meta": {
|
||||||
|
"schemas": {},
|
||||||
|
"tables": {},
|
||||||
|
"columns": {}
|
||||||
|
}
|
||||||
|
}
|
||||||
13
packages/drizzle/drizzle/meta/_journal.json
Normal file
13
packages/drizzle/drizzle/meta/_journal.json
Normal file
@ -0,0 +1,13 @@
|
|||||||
|
{
|
||||||
|
"version": "7",
|
||||||
|
"dialect": "sqlite",
|
||||||
|
"entries": [
|
||||||
|
{
|
||||||
|
"idx": 0,
|
||||||
|
"version": "6",
|
||||||
|
"when": 1742544246324,
|
||||||
|
"tag": "0000_colossal_jocasta",
|
||||||
|
"breakpoints": true
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
21
packages/drizzle/drizzle/relations.ts
Normal file
21
packages/drizzle/drizzle/relations.ts
Normal file
@ -0,0 +1,21 @@
|
|||||||
|
import { relations } from "drizzle-orm/relations"
|
||||||
|
import { commands, extensionData, extensions } from "./schema"
|
||||||
|
|
||||||
|
export const commandsRelations = relations(commands, ({ one }) => ({
|
||||||
|
extension: one(extensions, {
|
||||||
|
fields: [commands.extId],
|
||||||
|
references: [extensions.extId]
|
||||||
|
})
|
||||||
|
}))
|
||||||
|
|
||||||
|
export const extensionsRelations = relations(extensions, ({ many }) => ({
|
||||||
|
commands: many(commands),
|
||||||
|
extensionData: many(extensionData)
|
||||||
|
}))
|
||||||
|
|
||||||
|
export const extensionDataRelations = relations(extensionData, ({ one }) => ({
|
||||||
|
extension: one(extensions, {
|
||||||
|
fields: [extensionData.extId],
|
||||||
|
references: [extensions.extId]
|
||||||
|
})
|
||||||
|
}))
|
||||||
88
packages/drizzle/drizzle/schema.ts
Normal file
88
packages/drizzle/drizzle/schema.ts
Normal file
@ -0,0 +1,88 @@
|
|||||||
|
import { sql } from "drizzle-orm"
|
||||||
|
import {
|
||||||
|
blob,
|
||||||
|
foreignKey,
|
||||||
|
integer,
|
||||||
|
numeric,
|
||||||
|
primaryKey,
|
||||||
|
sqliteTable,
|
||||||
|
text
|
||||||
|
} from "drizzle-orm/sqlite-core"
|
||||||
|
|
||||||
|
export const schemaVersion = sqliteTable("schema_version", {
|
||||||
|
version: integer().notNull()
|
||||||
|
})
|
||||||
|
|
||||||
|
export const extensions = sqliteTable("extensions", {
|
||||||
|
extId: integer("ext_id").primaryKey({ autoIncrement: true }),
|
||||||
|
identifier: text().notNull(),
|
||||||
|
version: text().notNull(),
|
||||||
|
// enabled: numeric().default(sql`(TRUE)`),
|
||||||
|
enabled: integer({ mode: "boolean" }),
|
||||||
|
path: text(),
|
||||||
|
data: numeric(),
|
||||||
|
installedAt: numeric("installed_at").default(sql`(CURRENT_TIMESTAMP)`)
|
||||||
|
})
|
||||||
|
|
||||||
|
export const commands = sqliteTable("commands", {
|
||||||
|
cmdId: integer("cmd_id").primaryKey({ autoIncrement: true }),
|
||||||
|
extId: integer("ext_id")
|
||||||
|
.notNull()
|
||||||
|
.references(() => extensions.extId, { onDelete: "cascade" }),
|
||||||
|
name: text().notNull(),
|
||||||
|
enabled: integer({ mode: "boolean" }),
|
||||||
|
// enabled: numeric().default(sql`(TRUE)`),
|
||||||
|
alias: text(),
|
||||||
|
hotkey: text(),
|
||||||
|
type: text().notNull(),
|
||||||
|
data: numeric()
|
||||||
|
})
|
||||||
|
|
||||||
|
export const extensionData = sqliteTable("extension_data", {
|
||||||
|
dataId: integer("data_id").primaryKey({ autoIncrement: true }),
|
||||||
|
extId: integer("ext_id")
|
||||||
|
.notNull()
|
||||||
|
.references(() => extensions.extId, { onDelete: "cascade" }),
|
||||||
|
dataType: text("data_type").notNull(),
|
||||||
|
// data: text({ mode: "json" }).notNull(),
|
||||||
|
// metadata: text({ mode: "json" }),
|
||||||
|
data: text("data").notNull(),
|
||||||
|
metadata: text("metadata"),
|
||||||
|
searchText: text("search_text"),
|
||||||
|
createdAt: numeric("created_at").default(sql`(CURRENT_TIMESTAMP)`),
|
||||||
|
updatedAt: numeric("updated_at").default(sql`(CURRENT_TIMESTAMP)`)
|
||||||
|
})
|
||||||
|
|
||||||
|
export const extensionDataFts = sqliteTable("extension_data_fts", {
|
||||||
|
dataId: numeric("data_id"),
|
||||||
|
searchText: numeric("search_text"),
|
||||||
|
extensionDataFts: numeric("extension_data_fts"),
|
||||||
|
rank: numeric()
|
||||||
|
})
|
||||||
|
|
||||||
|
export const extensionDataFtsData = sqliteTable("extension_data_fts_data", {
|
||||||
|
id: integer().primaryKey(),
|
||||||
|
block: blob()
|
||||||
|
})
|
||||||
|
|
||||||
|
export const extensionDataFtsIdx = sqliteTable(
|
||||||
|
"extension_data_fts_idx",
|
||||||
|
{
|
||||||
|
segid: numeric().notNull(),
|
||||||
|
term: numeric().notNull(),
|
||||||
|
pgno: numeric()
|
||||||
|
},
|
||||||
|
(table) => [
|
||||||
|
primaryKey({ columns: [table.segid, table.term], name: "extension_data_fts_idx_segid_term_pk" })
|
||||||
|
]
|
||||||
|
)
|
||||||
|
|
||||||
|
export const extensionDataFtsDocsize = sqliteTable("extension_data_fts_docsize", {
|
||||||
|
id: integer().primaryKey(),
|
||||||
|
sz: blob()
|
||||||
|
})
|
||||||
|
|
||||||
|
export const extensionDataFtsConfig = sqliteTable("extension_data_fts_config", {
|
||||||
|
k: numeric().primaryKey().notNull(),
|
||||||
|
v: numeric()
|
||||||
|
})
|
||||||
3
packages/drizzle/index.ts
Normal file
3
packages/drizzle/index.ts
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
export * as schema from "./drizzle/schema"
|
||||||
|
export * as relations from "./drizzle/relations"
|
||||||
|
export * as db from "./src/apis"
|
||||||
26
packages/drizzle/package.json
Normal file
26
packages/drizzle/package.json
Normal file
@ -0,0 +1,26 @@
|
|||||||
|
{
|
||||||
|
"name": "@kksh/drizzle",
|
||||||
|
"type": "module",
|
||||||
|
"private": true,
|
||||||
|
"exports": {
|
||||||
|
".": "./index.ts",
|
||||||
|
"./api": "./src/apis.ts",
|
||||||
|
"./schema": "./drizzle/schema.ts",
|
||||||
|
"./relations": "./drizzle/relations.ts"
|
||||||
|
},
|
||||||
|
"devDependencies": {
|
||||||
|
"@types/bun": "latest",
|
||||||
|
"drizzle-kit": "^0.30.5",
|
||||||
|
"tsx": "^4.19.3"
|
||||||
|
},
|
||||||
|
"peerDependencies": {
|
||||||
|
"typescript": "^5"
|
||||||
|
},
|
||||||
|
"dependencies": {
|
||||||
|
"@kksh/api": "workspace:*",
|
||||||
|
"@libsql/client": "^0.15.1",
|
||||||
|
"@tauri-apps/plugin-log": "^2.3.1",
|
||||||
|
"dotenv": "^16.4.7",
|
||||||
|
"drizzle-orm": "^0.41.0"
|
||||||
|
}
|
||||||
|
}
|
||||||
616
packages/drizzle/src/apis.ts
Normal file
616
packages/drizzle/src/apis.ts
Normal file
@ -0,0 +1,616 @@
|
|||||||
|
import { KUNKUN_EXT_IDENTIFIER, type IDb, type IKV } from "@kksh/api"
|
||||||
|
import {
|
||||||
|
CmdType,
|
||||||
|
convertDateToSqliteString,
|
||||||
|
Ext,
|
||||||
|
ExtCmd,
|
||||||
|
ExtData,
|
||||||
|
SearchMode,
|
||||||
|
SearchModeEnum,
|
||||||
|
SQLSortOrder,
|
||||||
|
SQLSortOrderEnum
|
||||||
|
} from "@kksh/api/models"
|
||||||
|
import * as relations from "@kksh/drizzle/relations"
|
||||||
|
import * as orm from "drizzle-orm"
|
||||||
|
import type { SelectedFields } from "drizzle-orm/sqlite-core"
|
||||||
|
import * as v from "valibot"
|
||||||
|
import * as schema from "../drizzle/schema"
|
||||||
|
import { db } from "./proxy"
|
||||||
|
|
||||||
|
/* -------------------------------------------------------------------------- */
|
||||||
|
/* Built-in Extensions */
|
||||||
|
/* -------------------------------------------------------------------------- */
|
||||||
|
export function getExtClipboard(): Promise<Ext> {
|
||||||
|
return getExtensionByIdentifierExpectExists(KUNKUN_EXT_IDENTIFIER.KUNKUN_CLIPBOARD_EXT_IDENTIFIER)
|
||||||
|
}
|
||||||
|
export function getExtQuickLinks(): Promise<Ext> {
|
||||||
|
return getExtensionByIdentifierExpectExists(
|
||||||
|
KUNKUN_EXT_IDENTIFIER.KUNKUN_QUICK_LINKS_EXT_IDENTIFIER
|
||||||
|
)
|
||||||
|
}
|
||||||
|
export function getExtRemote(): Promise<Ext> {
|
||||||
|
return getExtensionByIdentifierExpectExists(KUNKUN_EXT_IDENTIFIER.KUNKUN_REMOTE_EXT_IDENTIFIER)
|
||||||
|
}
|
||||||
|
export function getExtScriptCmd(): Promise<Ext> {
|
||||||
|
return getExtensionByIdentifierExpectExists(
|
||||||
|
KUNKUN_EXT_IDENTIFIER.KUNKUN_SCRIPT_CMD_EXT_IDENTIFIER
|
||||||
|
)
|
||||||
|
}
|
||||||
|
export function getExtDev(): Promise<Ext> {
|
||||||
|
return getExtensionByIdentifierExpectExists(KUNKUN_EXT_IDENTIFIER.KUNKUN_DEV_EXT_IDENTIFIER)
|
||||||
|
}
|
||||||
|
|
||||||
|
/* -------------------------------------------------------------------------- */
|
||||||
|
/* Extension CRUD */
|
||||||
|
/* -------------------------------------------------------------------------- */
|
||||||
|
export function createExtension(ext: {
|
||||||
|
identifier: string
|
||||||
|
version: string
|
||||||
|
enabled?: boolean
|
||||||
|
path?: string
|
||||||
|
data?: any
|
||||||
|
}) {
|
||||||
|
return db
|
||||||
|
.insert(schema.extensions)
|
||||||
|
.values({
|
||||||
|
identifier: ext.identifier,
|
||||||
|
version: ext.version,
|
||||||
|
enabled: ext.enabled,
|
||||||
|
path: ext.path,
|
||||||
|
data: ext.data
|
||||||
|
})
|
||||||
|
.run()
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function getUniqueExtensionByIdentifier(identifier: string): Promise<Ext | undefined> {
|
||||||
|
const ext = await db
|
||||||
|
.select()
|
||||||
|
.from(schema.extensions)
|
||||||
|
.where(orm.eq(schema.extensions.identifier, identifier))
|
||||||
|
.get()
|
||||||
|
const result = v.safeParse(v.optional(Ext), ext)
|
||||||
|
if (!result.success) {
|
||||||
|
console.error("Failed to parse extension:", v.flatten(result.issues))
|
||||||
|
return undefined
|
||||||
|
}
|
||||||
|
const parsed = result.output
|
||||||
|
return parsed
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Use this function when you expect the extension to exist. Such as builtin extensions.
|
||||||
|
* @param identifier
|
||||||
|
* @returns
|
||||||
|
*/
|
||||||
|
export function getExtensionByIdentifierExpectExists(identifier: string): Promise<Ext> {
|
||||||
|
return getUniqueExtensionByIdentifier(identifier).then((ext) => {
|
||||||
|
if (!ext) {
|
||||||
|
throw new Error(`Unexpexted Error: Extension ${identifier} not found`)
|
||||||
|
}
|
||||||
|
return ext
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function getAllExtensions(): Promise<Ext[]> {
|
||||||
|
const exts = await db.select().from(schema.extensions).all()
|
||||||
|
return v.parse(v.array(Ext), exts)
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* There can be duplicate extensions with the same identifier. Store and Dev extensions can have the same identifier.
|
||||||
|
* But install path must be unique.
|
||||||
|
* @param path
|
||||||
|
*/
|
||||||
|
export async function getUniqueExtensionByPath(path: string) {
|
||||||
|
const ext = await db
|
||||||
|
.select()
|
||||||
|
.from(schema.extensions)
|
||||||
|
.where(orm.eq(schema.extensions.path, path))
|
||||||
|
.get()
|
||||||
|
return v.parse(Ext, ext)
|
||||||
|
}
|
||||||
|
|
||||||
|
export function getAllExtensionsByIdentifier(identifier: string): Promise<Ext[]> {
|
||||||
|
return db
|
||||||
|
.select()
|
||||||
|
.from(schema.extensions)
|
||||||
|
.where(orm.eq(schema.extensions.identifier, identifier))
|
||||||
|
.all()
|
||||||
|
.then((exts) => v.parse(v.array(Ext), exts))
|
||||||
|
}
|
||||||
|
|
||||||
|
export function deleteExtensionByPath(path: string): Promise<void> {
|
||||||
|
return db
|
||||||
|
.delete(schema.extensions)
|
||||||
|
.where(orm.eq(schema.extensions.path, path))
|
||||||
|
.run()
|
||||||
|
.then(() => undefined)
|
||||||
|
}
|
||||||
|
|
||||||
|
export function deleteExtensionByExtId(extId: number): Promise<void> {
|
||||||
|
return db
|
||||||
|
.delete(schema.extensions)
|
||||||
|
.where(orm.eq(schema.extensions.extId, extId))
|
||||||
|
.run()
|
||||||
|
.then(() => undefined)
|
||||||
|
}
|
||||||
|
|
||||||
|
/* -------------------------------------------------------------------------- */
|
||||||
|
/* Extension Command CRUD */
|
||||||
|
/* -------------------------------------------------------------------------- */
|
||||||
|
export function createCommand(data: {
|
||||||
|
extId: number
|
||||||
|
name: string
|
||||||
|
cmdType: CmdType
|
||||||
|
data: string
|
||||||
|
alias?: string
|
||||||
|
hotkey?: string
|
||||||
|
enabled?: boolean
|
||||||
|
}) {
|
||||||
|
return db
|
||||||
|
.insert(schema.commands)
|
||||||
|
.values({
|
||||||
|
extId: data.extId,
|
||||||
|
name: data.name,
|
||||||
|
type: data.cmdType,
|
||||||
|
data: data.data,
|
||||||
|
alias: data.alias,
|
||||||
|
hotkey: data.hotkey,
|
||||||
|
enabled: data.enabled ?? true
|
||||||
|
})
|
||||||
|
.run()
|
||||||
|
.then(() => undefined)
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function getCmdById(cmdId: number): Promise<ExtCmd> {
|
||||||
|
const cmd = await db
|
||||||
|
.select()
|
||||||
|
.from(schema.commands)
|
||||||
|
.where(orm.eq(schema.commands.cmdId, cmdId))
|
||||||
|
.get()
|
||||||
|
return v.parse(ExtCmd, cmd)
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function getAllCmds(): Promise<ExtCmd[]> {
|
||||||
|
const cmds = await db.select().from(schema.commands).all()
|
||||||
|
return v.parse(v.array(ExtCmd), cmds)
|
||||||
|
}
|
||||||
|
|
||||||
|
export function getCommandsByExtId(extId: number) {
|
||||||
|
return db
|
||||||
|
.select()
|
||||||
|
.from(schema.commands)
|
||||||
|
.where(orm.eq(schema.commands.extId, extId))
|
||||||
|
.all()
|
||||||
|
.then((cmds) => v.parse(v.array(ExtCmd), cmds))
|
||||||
|
}
|
||||||
|
|
||||||
|
export function deleteCmdById(cmdId: number) {
|
||||||
|
return db
|
||||||
|
.delete(schema.commands)
|
||||||
|
.where(orm.eq(schema.commands.cmdId, cmdId))
|
||||||
|
.run()
|
||||||
|
.then(() => undefined)
|
||||||
|
}
|
||||||
|
|
||||||
|
export function updateCmdByID(data: {
|
||||||
|
cmdId: number
|
||||||
|
name: string
|
||||||
|
cmdType: CmdType
|
||||||
|
data: string
|
||||||
|
alias?: string
|
||||||
|
hotkey?: string
|
||||||
|
enabled: boolean
|
||||||
|
}) {
|
||||||
|
return db
|
||||||
|
.update(schema.commands)
|
||||||
|
.set({
|
||||||
|
name: data.name,
|
||||||
|
type: data.cmdType,
|
||||||
|
data: data.data,
|
||||||
|
alias: data.alias, // optional
|
||||||
|
hotkey: data.hotkey, // optional
|
||||||
|
enabled: data.enabled
|
||||||
|
// in drizzle schema, use integer({ mode: 'boolean' }) for boolean sqlite
|
||||||
|
// enabled: data.enabled ? String(data.enabled) : undefined
|
||||||
|
})
|
||||||
|
.where(orm.eq(schema.commands.cmdId, data.cmdId))
|
||||||
|
.run()
|
||||||
|
.then(() => undefined)
|
||||||
|
}
|
||||||
|
|
||||||
|
/* -------------------------------------------------------------------------- */
|
||||||
|
/* Extension Data CRUD */
|
||||||
|
/* -------------------------------------------------------------------------- */
|
||||||
|
export const ExtDataField = v.union([v.literal("data"), v.literal("search_text")])
|
||||||
|
export type ExtDataField = v.InferOutput<typeof ExtDataField>
|
||||||
|
|
||||||
|
function convertRawExtDataToExtData(rawData?: {
|
||||||
|
createdAt: string
|
||||||
|
updatedAt: string
|
||||||
|
data: null | string
|
||||||
|
searchText?: null | string
|
||||||
|
dataId: number
|
||||||
|
extId: number
|
||||||
|
dataType: string
|
||||||
|
}): ExtData | undefined {
|
||||||
|
if (!rawData) {
|
||||||
|
return rawData
|
||||||
|
}
|
||||||
|
const parsedRes = v.safeParse(ExtData, {
|
||||||
|
...rawData,
|
||||||
|
createdAt: new Date(rawData.createdAt),
|
||||||
|
updatedAt: new Date(rawData.updatedAt),
|
||||||
|
data: rawData.data ?? undefined,
|
||||||
|
searchText: rawData.searchText ?? undefined
|
||||||
|
})
|
||||||
|
if (parsedRes.success) {
|
||||||
|
return parsedRes.output
|
||||||
|
} else {
|
||||||
|
console.error("Extension Data Parse Failure", parsedRes.issues)
|
||||||
|
throw new Error("Fail to parse extension data")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export function createExtensionData(data: {
|
||||||
|
extId: number
|
||||||
|
dataType: string
|
||||||
|
data: string
|
||||||
|
searchText?: string
|
||||||
|
}) {
|
||||||
|
return db.insert(schema.extensionData).values(data).run()
|
||||||
|
}
|
||||||
|
|
||||||
|
export function getExtensionDataById(dataId: number, fields?: ExtDataField[]) {
|
||||||
|
const _fields = fields ?? []
|
||||||
|
const selectQuery: SelectedFields = {
|
||||||
|
dataId: schema.extensionData.dataId,
|
||||||
|
extId: schema.extensionData.extId,
|
||||||
|
dataType: schema.extensionData.dataType,
|
||||||
|
metadata: schema.extensionData.metadata,
|
||||||
|
createdAt: schema.extensionData.createdAt,
|
||||||
|
updatedAt: schema.extensionData.updatedAt
|
||||||
|
// data: schema.extensionData.data,
|
||||||
|
// searchText: schema.extensionData.searchText
|
||||||
|
}
|
||||||
|
if (_fields.includes("data")) {
|
||||||
|
selectQuery["data"] = schema.extensionData.data
|
||||||
|
}
|
||||||
|
if (_fields.includes("search_text")) {
|
||||||
|
selectQuery["searchText"] = schema.extensionData.searchText
|
||||||
|
}
|
||||||
|
return db
|
||||||
|
.select(selectQuery)
|
||||||
|
.from(schema.extensionData)
|
||||||
|
.where(orm.eq(schema.extensionData.dataId, dataId))
|
||||||
|
.get()
|
||||||
|
.then((rawData) => {
|
||||||
|
console.log("Raw Data", rawData)
|
||||||
|
// @ts-expect-error - rawData is unknown, but will be safe parsed with valibot
|
||||||
|
return convertRawExtDataToExtData(rawData)
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function searchExtensionData(searchParams: {
|
||||||
|
extId: number
|
||||||
|
searchMode: SearchMode
|
||||||
|
dataId?: number
|
||||||
|
dataType?: string
|
||||||
|
searchText?: string
|
||||||
|
afterCreatedAt?: string
|
||||||
|
beforeCreatedAt?: string
|
||||||
|
limit?: number
|
||||||
|
offset?: number
|
||||||
|
orderByCreatedAt?: SQLSortOrder
|
||||||
|
orderByUpdatedAt?: SQLSortOrder
|
||||||
|
fields?: ExtDataField[]
|
||||||
|
}): Promise<ExtData[]> {
|
||||||
|
const fields = v.parse(v.optional(v.array(ExtDataField), []), searchParams.fields)
|
||||||
|
const _fields = fields ?? []
|
||||||
|
|
||||||
|
// Build the select query based on fields
|
||||||
|
const selectQuery: SelectedFields = {
|
||||||
|
dataId: schema.extensionData.dataId,
|
||||||
|
extId: schema.extensionData.extId,
|
||||||
|
dataType: schema.extensionData.dataType,
|
||||||
|
createdAt: schema.extensionData.createdAt,
|
||||||
|
updatedAt: schema.extensionData.updatedAt
|
||||||
|
}
|
||||||
|
|
||||||
|
if (_fields.includes("data")) {
|
||||||
|
selectQuery["data"] = schema.extensionData.data
|
||||||
|
}
|
||||||
|
if (_fields.includes("search_text")) {
|
||||||
|
selectQuery["searchText"] = schema.extensionData.searchText
|
||||||
|
}
|
||||||
|
|
||||||
|
// Build the query
|
||||||
|
let baseQuery = db.select(selectQuery).from(schema.extensionData)
|
||||||
|
|
||||||
|
// Add FTS join if needed
|
||||||
|
if (searchParams.searchMode === SearchModeEnum.FTS && searchParams.searchText) {
|
||||||
|
// @ts-expect-error - The join type is correct but TypeScript can't infer it properly
|
||||||
|
baseQuery = baseQuery.innerJoin(
|
||||||
|
schema.extensionDataFts,
|
||||||
|
orm.eq(schema.extensionData.dataId, schema.extensionDataFts.dataId)
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Add conditions
|
||||||
|
const conditions = [orm.eq(schema.extensionData.extId, searchParams.extId)]
|
||||||
|
|
||||||
|
if (searchParams.dataId) {
|
||||||
|
conditions.push(orm.eq(schema.extensionData.dataId, searchParams.dataId))
|
||||||
|
}
|
||||||
|
|
||||||
|
if (searchParams.dataType) {
|
||||||
|
conditions.push(orm.eq(schema.extensionData.dataType, searchParams.dataType))
|
||||||
|
}
|
||||||
|
|
||||||
|
if (searchParams.searchText) {
|
||||||
|
switch (searchParams.searchMode) {
|
||||||
|
case SearchModeEnum.ExactMatch:
|
||||||
|
conditions.push(orm.eq(schema.extensionData.searchText, searchParams.searchText))
|
||||||
|
break
|
||||||
|
case SearchModeEnum.Like:
|
||||||
|
conditions.push(orm.like(schema.extensionData.searchText, `%${searchParams.searchText}%`))
|
||||||
|
break
|
||||||
|
case SearchModeEnum.FTS:
|
||||||
|
conditions.push(
|
||||||
|
orm.sql`${schema.extensionDataFts.searchText} MATCH ${searchParams.searchText}`
|
||||||
|
)
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (searchParams.afterCreatedAt) {
|
||||||
|
conditions.push(orm.gt(schema.extensionData.createdAt, searchParams.afterCreatedAt))
|
||||||
|
}
|
||||||
|
|
||||||
|
if (searchParams.beforeCreatedAt) {
|
||||||
|
conditions.push(orm.lt(schema.extensionData.createdAt, searchParams.beforeCreatedAt))
|
||||||
|
}
|
||||||
|
|
||||||
|
// Build the final query with all conditions and modifiers
|
||||||
|
const query = baseQuery
|
||||||
|
.where(orm.and(...conditions))
|
||||||
|
.orderBy(
|
||||||
|
searchParams.orderByCreatedAt
|
||||||
|
? searchParams.orderByCreatedAt === SQLSortOrderEnum.Asc
|
||||||
|
? orm.asc(schema.extensionData.createdAt)
|
||||||
|
: orm.desc(schema.extensionData.createdAt)
|
||||||
|
: searchParams.orderByUpdatedAt
|
||||||
|
? searchParams.orderByUpdatedAt === SQLSortOrderEnum.Asc
|
||||||
|
? orm.asc(schema.extensionData.updatedAt)
|
||||||
|
: orm.desc(schema.extensionData.updatedAt)
|
||||||
|
: orm.asc(schema.extensionData.createdAt) // Default ordering
|
||||||
|
)
|
||||||
|
.limit(searchParams.limit ?? 100) // Default limit
|
||||||
|
.offset(searchParams.offset ?? 0) // Default offset
|
||||||
|
|
||||||
|
// Execute query and convert results
|
||||||
|
const results = await query.all()
|
||||||
|
return results
|
||||||
|
.map((rawData) => {
|
||||||
|
// @ts-expect-error - rawData is unknown, but will be safe parsed with valibot
|
||||||
|
return convertRawExtDataToExtData(rawData)
|
||||||
|
})
|
||||||
|
.filter((item): item is ExtData => item !== undefined)
|
||||||
|
}
|
||||||
|
|
||||||
|
export function deleteExtensionDataById(dataId: number) {
|
||||||
|
return db
|
||||||
|
.delete(schema.extensionData)
|
||||||
|
.where(orm.eq(schema.extensionData.dataId, dataId))
|
||||||
|
.run()
|
||||||
|
.then(() => undefined)
|
||||||
|
}
|
||||||
|
|
||||||
|
export function updateExtensionDataById(data: {
|
||||||
|
dataId: number
|
||||||
|
data: string
|
||||||
|
searchText?: string
|
||||||
|
}): Promise<void> {
|
||||||
|
return db
|
||||||
|
.update(schema.extensionData)
|
||||||
|
.set({
|
||||||
|
data: data.data,
|
||||||
|
searchText: data.searchText
|
||||||
|
})
|
||||||
|
.where(orm.eq(schema.extensionData.dataId, data.dataId))
|
||||||
|
.run()
|
||||||
|
.then(() => undefined)
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Database API for extensions.
|
||||||
|
* Extensions shouldn't have full access to the database, they can only access their own data.
|
||||||
|
* When an extension is loaded, the main thread will create an instance of this class and
|
||||||
|
* expose it to the extension.
|
||||||
|
*/
|
||||||
|
export class JarvisExtDB implements IDb {
|
||||||
|
extId: number
|
||||||
|
|
||||||
|
constructor(extId: number) {
|
||||||
|
this.extId = extId
|
||||||
|
}
|
||||||
|
|
||||||
|
async add(data: { data: string; dataType?: string; searchText?: string }): Promise<void> {
|
||||||
|
return createExtensionData({
|
||||||
|
data: data.data,
|
||||||
|
dataType: data.dataType ?? "default",
|
||||||
|
searchText: data.searchText,
|
||||||
|
extId: this.extId
|
||||||
|
}).then(() => undefined)
|
||||||
|
}
|
||||||
|
|
||||||
|
async delete(dataId: number): Promise<void> {
|
||||||
|
// Verify if this data belongs to this extension
|
||||||
|
const d = await getExtensionDataById(dataId)
|
||||||
|
if (!d || d.extId !== this.extId) {
|
||||||
|
throw new Error("Extension Data not found")
|
||||||
|
}
|
||||||
|
return await deleteExtensionDataById(dataId)
|
||||||
|
}
|
||||||
|
|
||||||
|
async search(searchParams: {
|
||||||
|
dataId?: number
|
||||||
|
searchMode?: SearchMode
|
||||||
|
dataType?: string
|
||||||
|
searchText?: string
|
||||||
|
afterCreatedAt?: Date
|
||||||
|
beforeCreatedAt?: Date
|
||||||
|
limit?: number
|
||||||
|
orderByCreatedAt?: SQLSortOrder
|
||||||
|
orderByUpdatedAt?: SQLSortOrder
|
||||||
|
fields?: ExtDataField[]
|
||||||
|
}): Promise<ExtData[]> {
|
||||||
|
const beforeCreatedAt = searchParams.beforeCreatedAt
|
||||||
|
? convertDateToSqliteString(searchParams.beforeCreatedAt)
|
||||||
|
: undefined
|
||||||
|
const afterCreatedAt = searchParams.afterCreatedAt
|
||||||
|
? convertDateToSqliteString(searchParams.afterCreatedAt)
|
||||||
|
: undefined
|
||||||
|
return searchExtensionData({
|
||||||
|
...searchParams,
|
||||||
|
searchMode: searchParams.searchMode ?? SearchModeEnum.FTS,
|
||||||
|
extId: this.extId,
|
||||||
|
beforeCreatedAt,
|
||||||
|
afterCreatedAt
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Retrieve all data of this extension.
|
||||||
|
* Use `search()` method for more advanced search.
|
||||||
|
* @param options optional fields to retrieve. By default, data and searchText are not returned.
|
||||||
|
* @returns
|
||||||
|
*/
|
||||||
|
retrieveAll(options: { fields?: ExtDataField[] }): Promise<ExtData[]> {
|
||||||
|
return this.search({ fields: options.fields })
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Retrieve all data of this extension by type.
|
||||||
|
* Use `search()` method for more advanced search.
|
||||||
|
* @param dataType
|
||||||
|
* @returns
|
||||||
|
*/
|
||||||
|
retrieveAllByType(dataType: string): Promise<ExtData[]> {
|
||||||
|
return this.search({ dataType })
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Delete all data of this extension.
|
||||||
|
*/
|
||||||
|
deleteAll(): Promise<void> {
|
||||||
|
return this.search({})
|
||||||
|
.then((items) => {
|
||||||
|
return Promise.all(items.map((item) => this.delete(item.dataId)))
|
||||||
|
})
|
||||||
|
.then(() => {})
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Update data and searchText of this extension.
|
||||||
|
* @param dataId unique id of the data
|
||||||
|
* @param data
|
||||||
|
* @param searchText
|
||||||
|
* @returns
|
||||||
|
*/
|
||||||
|
async update(data: { dataId: number; data: string; searchText?: string }): Promise<void> {
|
||||||
|
const d = await getExtensionDataById(data.dataId)
|
||||||
|
if (!d || d.extId !== this.extId) {
|
||||||
|
throw new Error("Extension Data not found")
|
||||||
|
}
|
||||||
|
return updateExtensionDataById(data)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export class KV implements IKV {
|
||||||
|
extId: number
|
||||||
|
db: JarvisExtDB
|
||||||
|
private DataType: string = "kunkun_kv"
|
||||||
|
|
||||||
|
constructor(extId: number) {
|
||||||
|
this.extId = extId
|
||||||
|
this.db = new JarvisExtDB(extId)
|
||||||
|
}
|
||||||
|
|
||||||
|
get<T = string>(key: string): Promise<T | null | undefined> {
|
||||||
|
return this.db
|
||||||
|
.search({
|
||||||
|
dataType: this.DataType,
|
||||||
|
searchText: key,
|
||||||
|
searchMode: SearchModeEnum.ExactMatch,
|
||||||
|
fields: ["search_text", "data"]
|
||||||
|
})
|
||||||
|
.then((items) => {
|
||||||
|
if (items.length === 0) {
|
||||||
|
return null
|
||||||
|
} else if (items.length > 1) {
|
||||||
|
throw new Error("Multiple KVs with the same key")
|
||||||
|
}
|
||||||
|
return items[0]?.data ? (JSON.parse(items[0].data).value as T) : null
|
||||||
|
})
|
||||||
|
.catch((err) => {
|
||||||
|
console.warn(err)
|
||||||
|
return null
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
set(key: string, value: string): Promise<void> {
|
||||||
|
return this.db
|
||||||
|
.search({
|
||||||
|
dataType: this.DataType,
|
||||||
|
searchText: key,
|
||||||
|
searchMode: SearchModeEnum.ExactMatch
|
||||||
|
})
|
||||||
|
.then((items) => {
|
||||||
|
if (items.length === 0) {
|
||||||
|
return this.db.add({
|
||||||
|
data: JSON.stringify({ value: value }),
|
||||||
|
dataType: this.DataType,
|
||||||
|
searchText: key
|
||||||
|
})
|
||||||
|
} else if (items.length === 1) {
|
||||||
|
return this.db.update({
|
||||||
|
dataId: items[0]!.dataId,
|
||||||
|
data: JSON.stringify({ value: value }),
|
||||||
|
searchText: key
|
||||||
|
})
|
||||||
|
} else {
|
||||||
|
return Promise.all(items.map((item) => this.db.delete(item.dataId))).then(() =>
|
||||||
|
Promise.resolve()
|
||||||
|
)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
delete(key: string): Promise<void> {
|
||||||
|
return this.db
|
||||||
|
.search({
|
||||||
|
dataType: this.DataType,
|
||||||
|
searchText: key,
|
||||||
|
searchMode: SearchModeEnum.ExactMatch
|
||||||
|
})
|
||||||
|
.then((items) => {
|
||||||
|
return Promise.all(items.map((item) => this.db.delete(item.dataId))).then(() =>
|
||||||
|
Promise.resolve()
|
||||||
|
)
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
exists(key: string): Promise<boolean> {
|
||||||
|
return this.db
|
||||||
|
.search({
|
||||||
|
dataType: this.DataType,
|
||||||
|
searchText: key,
|
||||||
|
searchMode: SearchModeEnum.ExactMatch,
|
||||||
|
fields: []
|
||||||
|
})
|
||||||
|
.then((items) => {
|
||||||
|
return items.length > 0
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
55
packages/drizzle/src/proxy.ts
Normal file
55
packages/drizzle/src/proxy.ts
Normal file
@ -0,0 +1,55 @@
|
|||||||
|
/* eslint-disable @typescript-eslint/no-explicit-any */
|
||||||
|
import { sql } from "@kksh/api/commands"
|
||||||
|
import { error } from "@tauri-apps/plugin-log"
|
||||||
|
import { drizzle } from "drizzle-orm/sqlite-proxy"
|
||||||
|
import * as schema from "../drizzle/schema"
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The drizzle database instance.
|
||||||
|
*/
|
||||||
|
export const db = drizzle<typeof schema>(
|
||||||
|
async (sqlQuery, params, method) => {
|
||||||
|
let rows: any = []
|
||||||
|
let results = []
|
||||||
|
console.log({
|
||||||
|
sql: sqlQuery,
|
||||||
|
params,
|
||||||
|
method
|
||||||
|
})
|
||||||
|
console.log(sqlQuery)
|
||||||
|
// If the query is a SELECT, use the select method
|
||||||
|
if (isSelectQuery(sqlQuery)) {
|
||||||
|
rows = await sql.select(sqlQuery, params).catch((e) => {
|
||||||
|
error("SQL Error:", e)
|
||||||
|
return []
|
||||||
|
})
|
||||||
|
} else {
|
||||||
|
// Otherwise, use the execute method
|
||||||
|
rows = await sql.execute(sqlQuery, params).catch((e) => {
|
||||||
|
error("SQL Error:", e)
|
||||||
|
return []
|
||||||
|
})
|
||||||
|
return { rows: [] }
|
||||||
|
}
|
||||||
|
|
||||||
|
rows = rows.map((row: any) => {
|
||||||
|
return Object.values(row)
|
||||||
|
})
|
||||||
|
|
||||||
|
// If the method is "all", return all rows
|
||||||
|
results = method === "all" ? rows : rows[0]
|
||||||
|
return { rows: results }
|
||||||
|
},
|
||||||
|
// Pass the schema to the drizzle instance
|
||||||
|
{ schema: schema, logger: true }
|
||||||
|
)
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Checks if the given SQL query is a SELECT query.
|
||||||
|
* @param sql The SQL query to check.
|
||||||
|
* @returns True if the query is a SELECT query, false otherwise.
|
||||||
|
*/
|
||||||
|
function isSelectQuery(sql: string): boolean {
|
||||||
|
const selectRegex = /^\s*SELECT\b/i
|
||||||
|
return selectRegex.test(sql)
|
||||||
|
}
|
||||||
28
packages/drizzle/tsconfig.json
Normal file
28
packages/drizzle/tsconfig.json
Normal file
@ -0,0 +1,28 @@
|
|||||||
|
{
|
||||||
|
"compilerOptions": {
|
||||||
|
// Environment setup & latest features
|
||||||
|
"lib": ["esnext"],
|
||||||
|
"target": "ESNext",
|
||||||
|
"module": "ESNext",
|
||||||
|
"moduleDetection": "force",
|
||||||
|
"jsx": "react-jsx",
|
||||||
|
"allowJs": true,
|
||||||
|
|
||||||
|
// Bundler mode
|
||||||
|
"moduleResolution": "bundler",
|
||||||
|
"allowImportingTsExtensions": true,
|
||||||
|
"verbatimModuleSyntax": true,
|
||||||
|
"noEmit": true,
|
||||||
|
|
||||||
|
// Best practices
|
||||||
|
"strict": true,
|
||||||
|
"skipLibCheck": true,
|
||||||
|
"noFallthroughCasesInSwitch": true,
|
||||||
|
"noUncheckedIndexedAccess": true,
|
||||||
|
|
||||||
|
// Some stricter flags (disabled by default)
|
||||||
|
"noUnusedLocals": false,
|
||||||
|
"noUnusedParameters": false,
|
||||||
|
"noPropertyAccessFromIndexSignature": false
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -16,6 +16,7 @@
|
|||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@kksh/api": "workspace:*",
|
"@kksh/api": "workspace:*",
|
||||||
|
"@kksh/drizzle": "workspace:*",
|
||||||
"@std/semver": "npm:@jsr/std__semver@^1.0.4",
|
"@std/semver": "npm:@jsr/std__semver@^1.0.4",
|
||||||
"@tauri-apps/plugin-upload": "^2.2.1",
|
"@tauri-apps/plugin-upload": "^2.2.1",
|
||||||
"semver": "^7.7.1",
|
"semver": "^7.7.1",
|
||||||
|
|||||||
@ -1,14 +1,6 @@
|
|||||||
import { db } from "@kksh/api/commands"
|
import { CmdTypeEnum, ExtPackageJson, Icon, QuickLinkCmd } from "@kksh/api/models"
|
||||||
import {
|
import { db } from "@kksh/drizzle"
|
||||||
CmdTypeEnum,
|
|
||||||
ExtCmd,
|
|
||||||
ExtPackageJson,
|
|
||||||
ExtPackageJsonExtra,
|
|
||||||
Icon,
|
|
||||||
QuickLinkCmd
|
|
||||||
} from "@kksh/api/models"
|
|
||||||
import * as v from "valibot"
|
import * as v from "valibot"
|
||||||
import { isExtPathInDev } from "./utils"
|
|
||||||
|
|
||||||
export async function upsertExtension(extPkgJson: ExtPackageJson, extFullPath: string) {
|
export async function upsertExtension(extPkgJson: ExtPackageJson, extFullPath: string) {
|
||||||
const extInDb = await db.getUniqueExtensionByIdentifier(extPkgJson.kunkun.identifier)
|
const extInDb = await db.getUniqueExtensionByIdentifier(extPkgJson.kunkun.identifier)
|
||||||
@ -39,7 +31,7 @@ export async function createQuickLinkCommand(name: string, link: string, icon: I
|
|||||||
export async function getAllQuickLinkCommands(): Promise<QuickLinkCmd[]> {
|
export async function getAllQuickLinkCommands(): Promise<QuickLinkCmd[]> {
|
||||||
const extension = await db.getExtQuickLinks()
|
const extension = await db.getExtQuickLinks()
|
||||||
const cmds = await db.getCommandsByExtId(extension.extId)
|
const cmds = await db.getCommandsByExtId(extension.extId)
|
||||||
return cmds
|
const parsedCmds = cmds
|
||||||
.map((cmd) => {
|
.map((cmd) => {
|
||||||
try {
|
try {
|
||||||
cmd.data = JSON.parse(cmd.data)
|
cmd.data = JSON.parse(cmd.data)
|
||||||
@ -55,4 +47,5 @@ export async function getAllQuickLinkCommands(): Promise<QuickLinkCmd[]> {
|
|||||||
}
|
}
|
||||||
})
|
})
|
||||||
.filter((cmd) => cmd !== null)
|
.filter((cmd) => cmd !== null)
|
||||||
|
return parsedCmds
|
||||||
}
|
}
|
||||||
|
|||||||
@ -3,8 +3,9 @@
|
|||||||
* 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 { copy_dir_all, db, decompressTarball } from "@kksh/api/commands"
|
import { copy_dir_all, decompressTarball } from "@kksh/api/commands"
|
||||||
import type { ExtensionStoreListItem, ExtPackageJsonExtra } from "@kksh/api/models"
|
import type { ExtensionStoreListItem, ExtPackageJsonExtra } from "@kksh/api/models"
|
||||||
|
import { db } from "@kksh/drizzle"
|
||||||
import { greaterThan, parse as parseSemver } from "@std/semver"
|
import { greaterThan, parse as parseSemver } from "@std/semver"
|
||||||
import * as path from "@tauri-apps/api/path"
|
import * as path from "@tauri-apps/api/path"
|
||||||
import * as dialog from "@tauri-apps/plugin-dialog"
|
import * as dialog from "@tauri-apps/plugin-dialog"
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
import { db } from "@kksh/api/commands"
|
|
||||||
import { ExtPackageJson, ExtPackageJsonExtra, License } from "@kksh/api/models"
|
import { ExtPackageJson, ExtPackageJsonExtra, License } from "@kksh/api/models"
|
||||||
|
import { db } from "@kksh/drizzle"
|
||||||
import { basename, dirname, join } from "@tauri-apps/api/path"
|
import { basename, dirname, join } from "@tauri-apps/api/path"
|
||||||
import { readDir, readTextFile } from "@tauri-apps/plugin-fs"
|
import { readDir, readTextFile } from "@tauri-apps/plugin-fs"
|
||||||
import { debug, error } from "@tauri-apps/plugin-log"
|
import { debug, error } from "@tauri-apps/plugin-log"
|
||||||
@ -77,7 +77,7 @@ export function loadAllExtensionsFromDisk(
|
|||||||
* @returns loaded extensions
|
* @returns loaded extensions
|
||||||
*/
|
*/
|
||||||
export async function loadAllExtensionsFromDb(): Promise<ExtPackageJsonExtra[]> {
|
export async function loadAllExtensionsFromDb(): Promise<ExtPackageJsonExtra[]> {
|
||||||
const allDbExts = await (await db.getAllExtensions()).filter((ext) => ext.path)
|
const allDbExts = (await db.getAllExtensions()).filter((ext) => ext.path)
|
||||||
const results: ExtPackageJsonExtra[] = []
|
const results: ExtPackageJsonExtra[] = []
|
||||||
for (const ext of allDbExts) {
|
for (const ext of allDbExts) {
|
||||||
if (!ext.path) continue
|
if (!ext.path) continue
|
||||||
|
|||||||
@ -69,6 +69,6 @@ ico = "0.3.0"
|
|||||||
|
|
||||||
|
|
||||||
[build-dependencies]
|
[build-dependencies]
|
||||||
tauri-plugin = { version = "2.0.3", features = ["build"] }
|
tauri-plugin = { version = "2", features = ["build"] }
|
||||||
tonic-build = "0.11"
|
tonic-build = "0.11"
|
||||||
base64 = { workspace = true }
|
base64 = { workspace = true }
|
||||||
|
|||||||
@ -81,23 +81,25 @@ const COMMANDS: &[&str] = &[
|
|||||||
// "ext_store_wrapper_save",
|
// "ext_store_wrapper_save",
|
||||||
"get_server_port",
|
"get_server_port",
|
||||||
/* ----------------------------- sqlite database ---------------------------- */
|
/* ----------------------------- sqlite database ---------------------------- */
|
||||||
"create_extension",
|
// "create_extension",
|
||||||
"get_all_extensions",
|
// "get_all_extensions",
|
||||||
"get_unique_extension_by_identifier",
|
// "get_unique_extension_by_identifier",
|
||||||
"get_unique_extension_by_path",
|
// "get_unique_extension_by_path",
|
||||||
"get_all_extensions_by_identifier",
|
// "get_all_extensions_by_identifier",
|
||||||
"delete_extension_by_path",
|
// "delete_extension_by_path",
|
||||||
"delete_extension_by_ext_id",
|
// "delete_extension_by_ext_id",
|
||||||
"create_command",
|
// "create_command",
|
||||||
"get_command_by_id",
|
// "get_command_by_id",
|
||||||
"get_commands_by_ext_id",
|
// "get_commands_by_ext_id",
|
||||||
"delete_command_by_id",
|
// "delete_command_by_id",
|
||||||
"update_command_by_id",
|
// "update_command_by_id",
|
||||||
"create_extension_data",
|
// "create_extension_data",
|
||||||
"get_extension_data_by_id",
|
// "get_extension_data_by_id",
|
||||||
"search_extension_data",
|
// "search_extension_data",
|
||||||
"delete_extension_data_by_id",
|
// "delete_extension_data_by_id",
|
||||||
"update_extension_data_by_id",
|
// "update_extension_data_by_id",
|
||||||
|
"select",
|
||||||
|
"execute",
|
||||||
/* -------------------------------- Clipboard ------------------------------- */
|
/* -------------------------------- Clipboard ------------------------------- */
|
||||||
"add_to_history",
|
"add_to_history",
|
||||||
"get_history",
|
"get_history",
|
||||||
|
|||||||
@ -65,6 +65,8 @@ commands.allow = [
|
|||||||
"get_ext_label_map",
|
"get_ext_label_map",
|
||||||
"get_frontmost_app",
|
"get_frontmost_app",
|
||||||
# Database
|
# Database
|
||||||
|
"select",
|
||||||
|
"execute",
|
||||||
"create_extension",
|
"create_extension",
|
||||||
"get_all_extensions",
|
"get_all_extensions",
|
||||||
"get_unique_extension_by_identifier",
|
"get_unique_extension_by_identifier",
|
||||||
|
|||||||
@ -0,0 +1,13 @@
|
|||||||
|
# Automatically generated - DO NOT EDIT!
|
||||||
|
|
||||||
|
"$schema" = "../../schemas/schema.json"
|
||||||
|
|
||||||
|
[[permission]]
|
||||||
|
identifier = "allow-execute"
|
||||||
|
description = "Enables the execute command without any pre-configured scope."
|
||||||
|
commands.allow = ["execute"]
|
||||||
|
|
||||||
|
[[permission]]
|
||||||
|
identifier = "deny-execute"
|
||||||
|
description = "Denies the execute command without any pre-configured scope."
|
||||||
|
commands.deny = ["execute"]
|
||||||
@ -0,0 +1,13 @@
|
|||||||
|
# Automatically generated - DO NOT EDIT!
|
||||||
|
|
||||||
|
"$schema" = "../../schemas/schema.json"
|
||||||
|
|
||||||
|
[[permission]]
|
||||||
|
identifier = "allow-select"
|
||||||
|
description = "Enables the select command without any pre-configured scope."
|
||||||
|
commands.allow = ["select"]
|
||||||
|
|
||||||
|
[[permission]]
|
||||||
|
identifier = "deny-select"
|
||||||
|
description = "Denies the select command without any pre-configured scope."
|
||||||
|
commands.deny = ["select"]
|
||||||
@ -492,6 +492,32 @@ Denies the empty_trash command without any pre-configured scope.
|
|||||||
<tr>
|
<tr>
|
||||||
<td>
|
<td>
|
||||||
|
|
||||||
|
`jarvis:allow-execute`
|
||||||
|
|
||||||
|
</td>
|
||||||
|
<td>
|
||||||
|
|
||||||
|
Enables the execute command without any pre-configured scope.
|
||||||
|
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
|
||||||
|
<tr>
|
||||||
|
<td>
|
||||||
|
|
||||||
|
`jarvis:deny-execute`
|
||||||
|
|
||||||
|
</td>
|
||||||
|
<td>
|
||||||
|
|
||||||
|
Denies the execute command without any pre-configured scope.
|
||||||
|
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
|
||||||
|
<tr>
|
||||||
|
<td>
|
||||||
|
|
||||||
`jarvis:allow-file-search`
|
`jarvis:allow-file-search`
|
||||||
|
|
||||||
</td>
|
</td>
|
||||||
@ -1610,6 +1636,32 @@ Denies the search_extension_data command without any pre-configured scope.
|
|||||||
<tr>
|
<tr>
|
||||||
<td>
|
<td>
|
||||||
|
|
||||||
|
`jarvis:allow-select`
|
||||||
|
|
||||||
|
</td>
|
||||||
|
<td>
|
||||||
|
|
||||||
|
Enables the select command without any pre-configured scope.
|
||||||
|
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
|
||||||
|
<tr>
|
||||||
|
<td>
|
||||||
|
|
||||||
|
`jarvis:deny-select`
|
||||||
|
|
||||||
|
</td>
|
||||||
|
<td>
|
||||||
|
|
||||||
|
Denies the select command without any pre-configured scope.
|
||||||
|
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
|
||||||
|
<tr>
|
||||||
|
<td>
|
||||||
|
|
||||||
`jarvis:allow-server-is-running`
|
`jarvis:allow-server-is-running`
|
||||||
|
|
||||||
</td>
|
</td>
|
||||||
|
|||||||
@ -479,6 +479,16 @@
|
|||||||
"type": "string",
|
"type": "string",
|
||||||
"const": "deny-empty-trash"
|
"const": "deny-empty-trash"
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"description": "Enables the execute command without any pre-configured scope.",
|
||||||
|
"type": "string",
|
||||||
|
"const": "allow-execute"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"description": "Denies the execute command without any pre-configured scope.",
|
||||||
|
"type": "string",
|
||||||
|
"const": "deny-execute"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"description": "Enables the file_search command without any pre-configured scope.",
|
"description": "Enables the file_search command without any pre-configured scope.",
|
||||||
"type": "string",
|
"type": "string",
|
||||||
@ -909,6 +919,16 @@
|
|||||||
"type": "string",
|
"type": "string",
|
||||||
"const": "deny-search-extension-data"
|
"const": "deny-search-extension-data"
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"description": "Enables the select command without any pre-configured scope.",
|
||||||
|
"type": "string",
|
||||||
|
"const": "allow-select"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"description": "Denies the select command without any pre-configured scope.",
|
||||||
|
"type": "string",
|
||||||
|
"const": "deny-select"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"description": "Enables the server_is_running command without any pre-configured scope.",
|
"description": "Enables the server_is_running command without any pre-configured scope.",
|
||||||
"type": "string",
|
"type": "string",
|
||||||
|
|||||||
@ -2,6 +2,7 @@ use db::{
|
|||||||
models::{Cmd, CmdType, Ext, ExtData, ExtDataField, ExtDataSearchQuery, SQLSortOrder},
|
models::{Cmd, CmdType, Ext, ExtData, ExtDataField, ExtDataSearchQuery, SQLSortOrder},
|
||||||
JarvisDB,
|
JarvisDB,
|
||||||
};
|
};
|
||||||
|
use serde_json::{json, Value as JsonValue};
|
||||||
use std::{path::PathBuf, sync::Mutex};
|
use std::{path::PathBuf, sync::Mutex};
|
||||||
use tauri::State;
|
use tauri::State;
|
||||||
|
|
||||||
@ -21,227 +22,30 @@ impl DBState {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/* -------------------------------------------------------------------------- */
|
|
||||||
/* Extension CRUD */
|
|
||||||
/* -------------------------------------------------------------------------- */
|
|
||||||
#[tauri::command]
|
#[tauri::command]
|
||||||
pub async fn create_extension(
|
pub async fn select(
|
||||||
db: State<'_, DBState>,
|
db: State<'_, DBState>,
|
||||||
identifier: &str,
|
query: &str,
|
||||||
version: &str,
|
values: Vec<JsonValue>,
|
||||||
enabled: Option<bool>,
|
) -> Result<Vec<JsonValue>, String> {
|
||||||
path: Option<&str>,
|
|
||||||
data: Option<&str>,
|
|
||||||
) -> Result<(), String> {
|
|
||||||
db.db
|
db.db
|
||||||
.lock()
|
.lock()
|
||||||
.unwrap()
|
.unwrap()
|
||||||
.create_extension(identifier, version, enabled.unwrap_or(true), path, data)
|
.select(query.to_string(), values)
|
||||||
.map_err(|err| err.to_string())
|
.map_err(|err| err.to_string())
|
||||||
}
|
}
|
||||||
|
|
||||||
#[tauri::command]
|
#[tauri::command]
|
||||||
pub async fn get_all_extensions(db: State<'_, DBState>) -> Result<Vec<Ext>, String> {
|
pub async fn execute(
|
||||||
db.db
|
|
||||||
.lock()
|
|
||||||
.unwrap()
|
|
||||||
.get_all_extensions()
|
|
||||||
.map_err(|err| err.to_string())
|
|
||||||
}
|
|
||||||
|
|
||||||
#[tauri::command]
|
|
||||||
pub async fn get_all_extensions_by_identifier(
|
|
||||||
identifier: &str,
|
|
||||||
db: State<'_, DBState>,
|
db: State<'_, DBState>,
|
||||||
) -> Result<Vec<Ext>, String> {
|
query: &str,
|
||||||
db.db
|
values: Vec<JsonValue>,
|
||||||
.lock()
|
) -> Result<Vec<JsonValue>, String> {
|
||||||
.unwrap()
|
let (rows_affected, last_id) = db
|
||||||
.get_all_extensions_by_identifier(identifier)
|
|
||||||
.map_err(|err| err.to_string())
|
|
||||||
}
|
|
||||||
|
|
||||||
#[tauri::command]
|
|
||||||
pub async fn get_unique_extension_by_identifier(
|
|
||||||
identifier: &str,
|
|
||||||
db: State<'_, DBState>,
|
|
||||||
) -> Result<Option<Ext>, String> {
|
|
||||||
let ext = db
|
|
||||||
.db
|
.db
|
||||||
.lock()
|
.lock()
|
||||||
.unwrap()
|
.unwrap()
|
||||||
.get_unique_extension_by_identifier(identifier)
|
.execute(query, values)
|
||||||
.map_err(|err| err.to_string())?;
|
.map_err(|err| err.to_string())?;
|
||||||
Ok(ext)
|
Ok(vec![json!([rows_affected, last_id])])
|
||||||
}
|
|
||||||
|
|
||||||
#[tauri::command]
|
|
||||||
pub async fn get_unique_extension_by_path(
|
|
||||||
path: &str,
|
|
||||||
db: State<'_, DBState>,
|
|
||||||
) -> Result<Option<Ext>, String> {
|
|
||||||
let ext = db
|
|
||||||
.db
|
|
||||||
.lock()
|
|
||||||
.unwrap()
|
|
||||||
.get_unique_extension_by_path(path)
|
|
||||||
.map_err(|err| err.to_string())?;
|
|
||||||
Ok(ext)
|
|
||||||
}
|
|
||||||
|
|
||||||
#[tauri::command]
|
|
||||||
pub async fn delete_extension_by_path(path: &str, db: State<'_, DBState>) -> Result<(), String> {
|
|
||||||
db.db
|
|
||||||
.lock()
|
|
||||||
.unwrap()
|
|
||||||
.delete_extension_by_path(path)
|
|
||||||
.map_err(|err| err.to_string())
|
|
||||||
}
|
|
||||||
|
|
||||||
#[tauri::command]
|
|
||||||
pub async fn delete_extension_by_ext_id(ext_id: i32, db: State<'_, DBState>) -> Result<(), String> {
|
|
||||||
db.db
|
|
||||||
.lock()
|
|
||||||
.unwrap()
|
|
||||||
.delete_extension_by_ext_id(ext_id)
|
|
||||||
.map_err(|err| err.to_string())
|
|
||||||
}
|
|
||||||
|
|
||||||
/* -------------------------------------------------------------------------- */
|
|
||||||
/* Extension Command CRUD */
|
|
||||||
/* -------------------------------------------------------------------------- */
|
|
||||||
|
|
||||||
#[tauri::command]
|
|
||||||
pub async fn create_command(
|
|
||||||
db: State<'_, DBState>,
|
|
||||||
ext_id: i32,
|
|
||||||
name: &str,
|
|
||||||
cmd_type: CmdType,
|
|
||||||
data: &str,
|
|
||||||
enabled: bool,
|
|
||||||
alias: Option<&str>,
|
|
||||||
hotkey: Option<&str>,
|
|
||||||
) -> Result<(), String> {
|
|
||||||
db.db
|
|
||||||
.lock()
|
|
||||||
.unwrap()
|
|
||||||
.create_command(ext_id, name, cmd_type, data, enabled, alias, hotkey)
|
|
||||||
.map_err(|err| err.to_string())
|
|
||||||
}
|
|
||||||
|
|
||||||
#[tauri::command]
|
|
||||||
pub async fn get_command_by_id(db: State<'_, DBState>, cmd_id: i32) -> Result<Option<Cmd>, String> {
|
|
||||||
db.db
|
|
||||||
.lock()
|
|
||||||
.unwrap()
|
|
||||||
.get_command_by_id(cmd_id)
|
|
||||||
.map_err(|err| err.to_string())
|
|
||||||
}
|
|
||||||
|
|
||||||
#[tauri::command]
|
|
||||||
pub async fn get_commands_by_ext_id(
|
|
||||||
db: State<'_, DBState>,
|
|
||||||
ext_id: i32,
|
|
||||||
) -> Result<Vec<Cmd>, String> {
|
|
||||||
db.db
|
|
||||||
.lock()
|
|
||||||
.unwrap()
|
|
||||||
.get_commands_by_ext_id(ext_id)
|
|
||||||
.map_err(|err| err.to_string())
|
|
||||||
}
|
|
||||||
|
|
||||||
#[tauri::command]
|
|
||||||
pub async fn delete_command_by_id(db: State<'_, DBState>, cmd_id: i32) -> Result<(), String> {
|
|
||||||
db.db
|
|
||||||
.lock()
|
|
||||||
.unwrap()
|
|
||||||
.delete_command_by_id(cmd_id)
|
|
||||||
.map_err(|err| err.to_string())
|
|
||||||
}
|
|
||||||
|
|
||||||
#[tauri::command]
|
|
||||||
pub async fn update_command_by_id(
|
|
||||||
db: State<'_, DBState>,
|
|
||||||
cmd_id: i32,
|
|
||||||
name: &str,
|
|
||||||
cmd_type: CmdType,
|
|
||||||
data: &str,
|
|
||||||
enabled: bool,
|
|
||||||
alias: Option<&str>,
|
|
||||||
hotkey: Option<&str>,
|
|
||||||
) -> Result<(), String> {
|
|
||||||
db.db
|
|
||||||
.lock()
|
|
||||||
.unwrap()
|
|
||||||
.update_command_by_id(cmd_id, name, cmd_type, data, enabled, alias, hotkey)
|
|
||||||
.map_err(|err| err.to_string())
|
|
||||||
}
|
|
||||||
|
|
||||||
/* -------------------------------------------------------------------------- */
|
|
||||||
/* Extension Data CRUD */
|
|
||||||
/* -------------------------------------------------------------------------- */
|
|
||||||
#[tauri::command]
|
|
||||||
pub async fn create_extension_data(
|
|
||||||
ext_id: i32,
|
|
||||||
data_type: &str,
|
|
||||||
data: &str,
|
|
||||||
search_text: Option<&str>,
|
|
||||||
db: State<'_, DBState>,
|
|
||||||
) -> Result<(), String> {
|
|
||||||
db.db
|
|
||||||
.lock()
|
|
||||||
.unwrap()
|
|
||||||
.create_extension_data(ext_id, data_type, data, search_text, None)
|
|
||||||
.map_err(|err| err.to_string())
|
|
||||||
}
|
|
||||||
|
|
||||||
#[tauri::command]
|
|
||||||
pub async fn get_extension_data_by_id(
|
|
||||||
data_id: i32,
|
|
||||||
fields: Option<Vec<ExtDataField>>,
|
|
||||||
db: State<'_, DBState>,
|
|
||||||
) -> Result<Option<ExtData>, String> {
|
|
||||||
db.db
|
|
||||||
.lock()
|
|
||||||
.unwrap()
|
|
||||||
.get_extension_data_by_id(data_id, fields)
|
|
||||||
.map_err(|err| err.to_string())
|
|
||||||
}
|
|
||||||
|
|
||||||
#[tauri::command]
|
|
||||||
pub async fn search_extension_data(
|
|
||||||
db: State<'_, DBState>,
|
|
||||||
search_query: ExtDataSearchQuery,
|
|
||||||
) -> Result<Vec<ExtData>, String> {
|
|
||||||
db.db
|
|
||||||
.lock()
|
|
||||||
.unwrap()
|
|
||||||
.search_extension_data(search_query)
|
|
||||||
.map_err(|err| err.to_string())
|
|
||||||
}
|
|
||||||
|
|
||||||
#[tauri::command]
|
|
||||||
pub async fn delete_extension_data_by_id(
|
|
||||||
data_id: i32,
|
|
||||||
db: State<'_, DBState>,
|
|
||||||
) -> Result<(), String> {
|
|
||||||
db.db
|
|
||||||
.lock()
|
|
||||||
.unwrap()
|
|
||||||
.delete_extension_data_by_id(data_id)
|
|
||||||
.map_err(|err| err.to_string())
|
|
||||||
}
|
|
||||||
|
|
||||||
#[tauri::command]
|
|
||||||
pub async fn update_extension_data_by_id(
|
|
||||||
data_id: i32,
|
|
||||||
data: &str,
|
|
||||||
search_text: Option<&str>,
|
|
||||||
db: State<'_, DBState>,
|
|
||||||
) -> Result<(), String> {
|
|
||||||
db.db
|
|
||||||
.lock()
|
|
||||||
.unwrap()
|
|
||||||
.update_extension_data_by_id(data_id, data, search_text)
|
|
||||||
.map_err(|err| err.to_string())
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -140,23 +140,8 @@ pub fn init<R: Runtime>() -> TauriPlugin<R> {
|
|||||||
// commands::storage::ext_store_wrapper_load,
|
// commands::storage::ext_store_wrapper_load,
|
||||||
// commands::storage::ext_store_wrapper_save,
|
// commands::storage::ext_store_wrapper_save,
|
||||||
/* -------------------------------- database -------------------------------- */
|
/* -------------------------------- database -------------------------------- */
|
||||||
commands::db::create_extension,
|
commands::db::select,
|
||||||
commands::db::get_all_extensions,
|
commands::db::execute,
|
||||||
commands::db::get_unique_extension_by_identifier,
|
|
||||||
commands::db::get_unique_extension_by_path,
|
|
||||||
commands::db::get_all_extensions_by_identifier,
|
|
||||||
commands::db::delete_extension_by_path,
|
|
||||||
commands::db::delete_extension_by_ext_id,
|
|
||||||
commands::db::create_command,
|
|
||||||
commands::db::get_command_by_id,
|
|
||||||
commands::db::get_commands_by_ext_id,
|
|
||||||
commands::db::delete_command_by_id,
|
|
||||||
commands::db::update_command_by_id,
|
|
||||||
commands::db::create_extension_data,
|
|
||||||
commands::db::get_extension_data_by_id,
|
|
||||||
commands::db::search_extension_data,
|
|
||||||
commands::db::delete_extension_data_by_id,
|
|
||||||
commands::db::update_extension_data_by_id,
|
|
||||||
/* -------------------------------- Clipboard ------------------------------- */
|
/* -------------------------------- Clipboard ------------------------------- */
|
||||||
commands::clipboard::get_history,
|
commands::clipboard::get_history,
|
||||||
commands::clipboard::add_to_history,
|
commands::clipboard::add_to_history,
|
||||||
|
|||||||
@ -1,4 +1,3 @@
|
|||||||
|
|
||||||
pub struct AppState {
|
pub struct AppState {
|
||||||
// pub history: Mutex<Vec<Record>>,
|
// pub history: Mutex<Vec<Record>>,
|
||||||
// pub dev_extension_path: Mutex<Option<PathBuf>>,
|
// pub dev_extension_path: Mutex<Option<PathBuf>>,
|
||||||
|
|||||||
@ -2,10 +2,7 @@
|
|||||||
// use hello_world::{HelloReply, HelloRequest};
|
// use hello_world::{HelloReply, HelloRequest};
|
||||||
// use server_info«::server_info_server::ServerInfo;
|
// use server_info«::server_info_server::ServerInfo;
|
||||||
// use server_info::{InfoRequest, InfoResponse};
|
// use server_info::{InfoRequest, InfoResponse};
|
||||||
use grpc::kunkun::{
|
use grpc::kunkun::{kunkun_server::Kunkun, Empty, ServerInfoResponse};
|
||||||
kunkun_server::Kunkun,
|
|
||||||
Empty, ServerInfoResponse,
|
|
||||||
};
|
|
||||||
|
|
||||||
use tauri::{AppHandle, Emitter, Manager};
|
use tauri::{AppHandle, Emitter, Manager};
|
||||||
use tonic::{Request, Response, Status};
|
use tonic::{Request, Response, Status};
|
||||||
|
|||||||
@ -6,8 +6,7 @@ use axum::routing::{get, post};
|
|||||||
use axum_server::tls_rustls::RustlsConfig;
|
use axum_server::tls_rustls::RustlsConfig;
|
||||||
use base64::prelude::*;
|
use base64::prelude::*;
|
||||||
use grpc::{
|
use grpc::{
|
||||||
file_transfer::file_transfer_server::FileTransferServer,
|
file_transfer::file_transfer_server::FileTransferServer, kunkun::kunkun_server::KunkunServer,
|
||||||
kunkun::kunkun_server::KunkunServer,
|
|
||||||
};
|
};
|
||||||
/// This module is responsible for controlling the main server
|
/// This module is responsible for controlling the main server
|
||||||
use obfstr::obfstr as s;
|
use obfstr::obfstr as s;
|
||||||
|
|||||||
@ -3,10 +3,8 @@ use super::{
|
|||||||
model::{ServerInfo, ServerState},
|
model::{ServerInfo, ServerState},
|
||||||
};
|
};
|
||||||
use crate::{
|
use crate::{
|
||||||
constants::KUNKUN_REFRESH_WORKER_EXTENSION,
|
constants::KUNKUN_REFRESH_WORKER_EXTENSION, models::FileTransferState,
|
||||||
models::FileTransferState,
|
server::model::FileTransferProgressPayload, JarvisState,
|
||||||
server::model::FileTransferProgressPayload,
|
|
||||||
JarvisState,
|
|
||||||
};
|
};
|
||||||
use axum::{
|
use axum::{
|
||||||
body::StreamBody,
|
body::StreamBody,
|
||||||
|
|||||||
@ -96,7 +96,7 @@
|
|||||||
"remark-math": "^6.0.0",
|
"remark-math": "^6.0.0",
|
||||||
"shiki-magic-move": "^0.5.2",
|
"shiki-magic-move": "^0.5.2",
|
||||||
"svelte-exmarkdown": "^4.0.3",
|
"svelte-exmarkdown": "^4.0.3",
|
||||||
"svelte-inspect-value": "^0.3.0",
|
"svelte-inspect-value": "^0.5.0",
|
||||||
"svelte-motion": "^0.12.2",
|
"svelte-motion": "^0.12.2",
|
||||||
"valibot": "^1.0.0"
|
"valibot": "^1.0.0"
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,11 +1,9 @@
|
|||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
import autoAnimate from "@formkit/auto-animate"
|
|
||||||
import Icon from "@iconify/svelte"
|
import Icon from "@iconify/svelte"
|
||||||
import { Button, ButtonModule, Collapsible, ScrollArea } from "@kksh/svelte5"
|
import { Button, ButtonModule, Collapsible, ScrollArea } from "@kksh/svelte5"
|
||||||
import { Error, Layouts, Shiki } from "@kksh/ui"
|
import { Error, Layouts, Shiki } from "@kksh/ui"
|
||||||
import { ChevronsUpDown } from "lucide-svelte"
|
import { ChevronsUpDown } from "lucide-svelte"
|
||||||
import { type Snippet } from "svelte"
|
import { type Snippet } from "svelte"
|
||||||
import { fade, slide } from "svelte/transition"
|
|
||||||
|
|
||||||
const {
|
const {
|
||||||
title,
|
title,
|
||||||
|
|||||||
1187
pnpm-lock.yaml
generated
1187
pnpm-lock.yaml
generated
File diff suppressed because it is too large
Load Diff
2
vendors/tauri-plugin-network
vendored
2
vendors/tauri-plugin-network
vendored
@ -1 +1 @@
|
|||||||
Subproject commit dee36a97918089f698ab060152de6d13f627aa59
|
Subproject commit d7e55fbe23ddd2bd947c1d0a46c34edb2698e00c
|
||||||
2
vendors/tauri-plugin-user-input
vendored
2
vendors/tauri-plugin-user-input
vendored
@ -1 +1 @@
|
|||||||
Subproject commit 54399d9c196a79488560a546da055ec46ef9a55e
|
Subproject commit f62f393efad652dec9ec9c4c065aba637538a3ac
|
||||||
Loading…
x
Reference in New Issue
Block a user