From c4a726397d983f210e47c23c2785dc6b69505e04 Mon Sep 17 00:00:00 2001 From: cflmy Date: Thu, 10 Sep 2026 20:18:41 +0800 Subject: [PATCH] feat(web): W-G13 default to Go libweb in CLI, gold, and release Switch ext add / gold / release builds to scripts/build-web-plugin.sh, drop the Rust archive from the Cargo workspace, and resolve libweb from plugins/web/build (and target copies) without MARQDO_WEB_PLUGIN. Co-authored-by: Cursor --- .github/workflows/release.yml | 22 +- Cargo.lock | 1413 +--------------------------- Cargo.toml | 3 +- doc/design/ext-cli.md | 6 +- doc/design/ext-web-go-rewrite.md | 22 +- doc/design/ext-web.md | 2 +- plugins/web-rust-archive/README.md | 9 + plugins/web/README.md | 14 +- scripts/build-web-plugin.sh | 17 +- src/ext_cli.rs | 77 +- tests/gold.rs | 251 ++--- 11 files changed, 222 insertions(+), 1614 deletions(-) create mode 100644 plugins/web-rust-archive/README.md diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ad51472..68673b0 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -20,15 +20,26 @@ jobs: - name: Install Rust uses: dtolnay/rust-toolchain@stable + - name: Install Go (web plugin) + uses: actions/setup-go@v5 + with: + go-version: "1.23.x" + - name: Install Node (VS Code extension) uses: actions/setup-node@v4 with: node-version: "20" + - name: Install MinGW for cgo (web.dll) + run: choco install mingw -y + - name: Build release CLI + official plugins + shell: bash run: | + export PATH="/c/ProgramData/mingw64/mingw64/bin:/c/ProgramData/chocolatey/lib/mingw/tools/install/mingw64/bin:$PATH" cargo build --release - cargo build --release -p marqdo_plugin_web -p marqdo_plugin_agent -p marqdo_plugin_quantum -p marqdo_plugin_linalg + cargo build --release -p marqdo_plugin_agent -p marqdo_plugin_quantum -p marqdo_plugin_linalg + bash ./scripts/build-web-plugin.sh - name: Checkout extension sources (branch vscode-extension only) run: git fetch origin vscode-extension && git checkout origin/vscode-extension -- vscode-extension @@ -153,8 +164,15 @@ jobs: - name: Install Rust uses: dtolnay/rust-toolchain@stable + - name: Install Go (web plugin) + uses: actions/setup-go@v5 + with: + go-version: "1.23.x" + - name: Build official plugins (release) - run: cargo build --release -p marqdo_plugin_web -p marqdo_plugin_agent -p marqdo_plugin_quantum -p marqdo_plugin_linalg + run: | + cargo build --release -p marqdo_plugin_agent -p marqdo_plugin_quantum -p marqdo_plugin_linalg + bash ./scripts/build-web-plugin.sh - name: Package native zip run: | diff --git a/Cargo.lock b/Cargo.lock index 5a8f6f3..d78106b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -8,18 +8,6 @@ version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa" -[[package]] -name = "ahash" -version = "0.8.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a15f179cd60c4584b8a8c596927aadc462e27f2ca70c04e0071964a73ba7a75" -dependencies = [ - "cfg-if", - "once_cell", - "version_check", - "zerocopy", -] - [[package]] name = "aho-corasick" version = "1.1.5" @@ -94,27 +82,6 @@ version = "1.0.104" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "330a5ed07fa54e4702c9d6c4174f74427fc0ef6e214bbd677ae50a5099946470" -[[package]] -name = "arc-swap" -version = "1.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c049c0be4daef0b145cb3555416b3b8ef5b7888a38aea1a3a155801fe7b0810b" -dependencies = [ - "rustversion", -] - -[[package]] -name = "argon2" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c3610892ee6e0cbce8ae2700349fcf8f98adb0dbfbee85aec3c9179d29cc072" -dependencies = [ - "base64ct", - "blake2", - "cpufeatures 0.2.17", - "password-hash", -] - [[package]] name = "ascii" version = "1.1.0" @@ -136,124 +103,24 @@ dependencies = [ "wait-timeout", ] -[[package]] -name = "async-compression" -version = "0.4.43" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3976abdc8fe7d1133d43d304afd42abdf5bc3e1319d263d223bde07b5efc4be8" -dependencies = [ - "compression-codecs", - "compression-core", - "pin-project-lite", - "tokio", -] - -[[package]] -name = "async-trait" -version = "0.1.92" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82f6aeea286b8eb4dd3431a1be1b59d290ace00f5bfd8e2a159bc2a05e2c1667" -dependencies = [ - "proc-macro2", - "quote", - "syn 3.0.3", -] - -[[package]] -name = "atomic-waker" -version = "1.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" - [[package]] name = "autocfg" version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f2032f911046de80f0a198e0901378627c33f59ea0ac00e363d481118bd70a53" -[[package]] -name = "axum" -version = "0.8.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31b698c5f9a010f6573133b09e0de5408834d0c82f8d7475a89fc1867a71cd90" -dependencies = [ - "axum-core", - "base64", - "bytes", - "form_urlencoded", - "futures-util", - "http", - "http-body", - "http-body-util", - "hyper", - "hyper-util", - "itoa", - "matchit", - "memchr", - "mime", - "multer", - "percent-encoding", - "pin-project-lite", - "serde_core", - "serde_json", - "serde_path_to_error", - "serde_urlencoded", - "sha1", - "sync_wrapper", - "tokio", - "tokio-tungstenite 0.29.0", - "tower", - "tower-layer", - "tower-service", - "tracing", -] - -[[package]] -name = "axum-core" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08c78f31d7b1291f7ee735c1c6780ccde7785daae9a9206026862dab7d8792d1" -dependencies = [ - "bytes", - "futures-core", - "http", - "http-body", - "http-body-util", - "mime", - "pin-project-lite", - "sync_wrapper", - "tower-layer", - "tower-service", - "tracing", -] - [[package]] name = "base64" version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" -[[package]] -name = "base64ct" -version = "1.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2af50177e190e07a26ab74f8b1efbfe2ef87da2116221318cb1c2e82baf7de06" - [[package]] name = "bitflags" version = "2.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b588b76d00fde79687d7646a9b5bdf3cc0f655e0bbd080335a95d7e96f3587da" -[[package]] -name = "blake2" -version = "0.10.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46502ad458c9a52b69d4d4d32775c788b7a1b85e8bc9d482d92250fc0e3f8efe" -dependencies = [ - "digest 0.10.7", -] - [[package]] name = "block-buffer" version = "0.10.4" @@ -263,15 +130,6 @@ dependencies = [ "generic-array", ] -[[package]] -name = "block-buffer" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2f6c7dbe95a6ed67ad9f18e57daf93a2f034c524b99fd2b76d18fdfeb6660aa" -dependencies = [ - "hybrid-array", -] - [[package]] name = "bstr" version = "1.13.0" @@ -317,23 +175,6 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801" -[[package]] -name = "cfg_aliases" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f079e83a288787bcd14a6aea84cee5c87a67c5a3e660c30f557a3d24761b3527" - -[[package]] -name = "chacha20" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65c35e4b699c7e15ccbe7ee35c005e4fc0a278d22238a2857e6ce2dadeda1b06" -dependencies = [ - "cfg-if", - "cpufeatures 0.3.1", - "rand_core 0.10.1", -] - [[package]] name = "chrono" version = "0.4.45" @@ -391,51 +232,12 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" -[[package]] -name = "cmov" -version = "0.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c9ea0ac24bc397ab3c98583a3c9ba74fa56b09a4449bbe172b9b1ddb016027a" - [[package]] name = "colorchoice" version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1d07550c9036bf2ae0c684c4297d503f838287c83c53686d05370d0e139ae570" -[[package]] -name = "combine" -version = "4.6.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfc320937d09e6de266b31b9afb480f197d7a861be86be7cb2ea7e5d1bfffc5e" -dependencies = [ - "bytes", - "memchr", -] - -[[package]] -name = "compression-codecs" -version = "0.4.38" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce2548391e9c1929c21bf6aa2680af86fe4c1b33e6cea9ac1cfeec0bd11218cf" -dependencies = [ - "compression-core", - "flate2", - "memchr", -] - -[[package]] -name = "compression-core" -version = "0.4.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc14f565cf027a105f7a44ccf9e5b424348421a1d8952a8fc9d499d313107789" - -[[package]] -name = "const-oid" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6ef517f0926dd24a1582492c791b6a4818a4d94e789a334894aa15b0d12f55c" - [[package]] name = "core-foundation-sys" version = "0.8.7" @@ -451,15 +253,6 @@ dependencies = [ "libc", ] -[[package]] -name = "cpufeatures" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ca28b0ae3115b884660db4118d803791fd6756b6e88f39c0f3f7859060d7566" -dependencies = [ - "libc", -] - [[package]] name = "crc32fast" version = "1.5.0" @@ -485,24 +278,6 @@ dependencies = [ "typenum", ] -[[package]] -name = "crypto-common" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce6e4c961d6cd6c9a86db418387425e8bdeaf05b3c8bc1411e6dca4c252f1453" -dependencies = [ - "hybrid-array", -] - -[[package]] -name = "ctutils" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d5515a3834141de9eafb9717ad39eea8247b5674e6066c404e8c4b365d2a29e" -dependencies = [ - "cmov", -] - [[package]] name = "data-encoding" version = "2.11.1" @@ -521,72 +296,17 @@ version = "0.10.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" dependencies = [ - "block-buffer 0.10.4", - "crypto-common 0.1.7", + "block-buffer", + "crypto-common", "subtle", ] -[[package]] -name = "digest" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1dd6dbb5841937940781866fa1281a1ff7bd3bf827091440879f9994983d5c2" -dependencies = [ - "block-buffer 0.12.1", - "const-oid", - "crypto-common 0.2.2", - "ctutils", -] - [[package]] name = "doc-comment" version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "780955b8b195a21ab8e4ac6b60dd1dbdcec1dc6c51c0617964b08c81785e12c9" -[[package]] -name = "either" -version = "1.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "252afb9ae5eaa683babdc6a068b3f5726eb19e05070c731f9b2a23a7c3e8ed34" - -[[package]] -name = "encoding_rs" -version = "0.8.35" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75030f3c4f45dafd7586dd6780965a8c7e8e285a5ecb86713e63a79c5b2766f3" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "errno" -version = "0.3.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" -dependencies = [ - "libc", - "windows-sys 0.61.2", -] - -[[package]] -name = "fallible-iterator" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7" - -[[package]] -name = "fallible-iterator" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2acce4a10f12dc2fb14a218589d4f1f62ef011b2d0cc4b3cb1bba8e94da14649" - -[[package]] -name = "fallible-streaming-iterator" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a" - [[package]] name = "find-msvc-tools" version = "0.1.10" @@ -621,28 +341,12 @@ dependencies = [ "percent-encoding", ] -[[package]] -name = "futures-channel" -version = "0.3.33" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "262590f4fe6afeb0bc83be1daa64e52657fe185690a958af7f3ad0e92085c5ae" -dependencies = [ - "futures-core", - "futures-sink", -] - [[package]] name = "futures-core" version = "0.3.33" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2cd50c473c80f6d7c3670a752354b8e569b1a7cbfdc0419ec88e5edad85e0dc7" -[[package]] -name = "futures-io" -version = "0.3.34" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53c0fa8157de1303bfffdaa1cc2a673bfffb60102f76b0ef4441659124373fed" - [[package]] name = "futures-macro" version = "0.3.33" @@ -673,11 +377,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a77a90a256fce34da66415271e30f94ee91c57b04b8a2c042d9cf3220179deaa" dependencies = [ "futures-core", - "futures-io", "futures-macro", "futures-sink", "futures-task", - "memchr", "pin-project-lite", "slab", ] @@ -708,54 +410,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ff2abc00be7fca6ebc474524697ae276ad847ad0a6b3faa4bcb027e9a4614ad0" dependencies = [ "cfg-if", - "js-sys", "libc", - "wasi 0.11.1+wasi-snapshot-preview1", - "wasm-bindgen", -] - -[[package]] -name = "getrandom" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd" -dependencies = [ - "cfg-if", - "libc", - "r-efi 5.3.0", - "wasip2", -] - -[[package]] -name = "getrandom" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "300e883d756b2e4ec94e02791f39b04b522276138852cfc41d9fb7e904106099" -dependencies = [ - "cfg-if", - "js-sys", - "libc", - "r-efi 6.0.0", - "rand_core 0.10.1", - "wasm-bindgen", -] - -[[package]] -name = "hashbrown" -version = "0.14.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" -dependencies = [ - "ahash", -] - -[[package]] -name = "hashlink" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ba4ff7128dee98c7dc9794b6a411377e1404dba1c97deb8d1a55297bd25d8af" -dependencies = [ - "hashbrown", + "wasi", ] [[package]] @@ -764,28 +420,13 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" -[[package]] -name = "hex" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" - [[package]] name = "hmac" version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" dependencies = [ - "digest 0.10.7", -] - -[[package]] -name = "hmac" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6303bc9732ae41b04cb554b844a762b4115a61bfaa81e3e83050991eeb56863f" -dependencies = [ - "digest 0.11.3", + "digest", ] [[package]] @@ -798,35 +439,6 @@ dependencies = [ "itoa", ] -[[package]] -name = "http-body" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca2a8f2913ee65f60facd6a5905613afaa448497a0230cc41ce022d93290bc2c" -dependencies = [ - "bytes", - "http", -] - -[[package]] -name = "http-body-util" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9f41fd6a08e4d4ec69df65976da761afd5ad5e58a9d4acb46bd1c953a9e3ff2" -dependencies = [ - "bytes", - "futures-core", - "http", - "http-body", - "pin-project-lite", -] - -[[package]] -name = "http-range-header" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9171a2ea8a68358193d15dd5d70c1c10a2afc3e7e4c5bc92bc9f025cebd7359c" - [[package]] name = "httparse" version = "1.10.1" @@ -839,75 +451,6 @@ version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" -[[package]] -name = "hybrid-array" -version = "0.4.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "707114b52a152fa7bdb290cd7cd5912d9467273b6d74e21b8d81aca1f8533f6b" -dependencies = [ - "typenum", -] - -[[package]] -name = "hyper" -version = "1.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d22053281f852e11534f5198498373cbb59295120a20771d90f7ed1897490a72" -dependencies = [ - "atomic-waker", - "bytes", - "futures-channel", - "futures-core", - "http", - "http-body", - "httparse", - "httpdate", - "itoa", - "pin-project-lite", - "smallvec", - "tokio", - "want", -] - -[[package]] -name = "hyper-rustls" -version = "0.27.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33ca68d021ef39cf6463ab54c1d0f5daf03377b70561305bb89a8f83aab66e0f" -dependencies = [ - "http", - "hyper", - "hyper-util", - "rustls 0.23.44", - "tokio", - "tokio-rustls", - "tower-service", - "webpki-roots 1.0.9", -] - -[[package]] -name = "hyper-util" -version = "0.1.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96547c2556ec9d12fb1578c4eaf448b04993e7fb79cbaad930a656880a6bdfa0" -dependencies = [ - "base64", - "bytes", - "futures-channel", - "futures-util", - "http", - "http-body", - "hyper", - "ipnet", - "libc", - "percent-encoding", - "pin-project-lite", - "socket2 0.6.5", - "tokio", - "tower-service", - "tracing", -] - [[package]] name = "iana-time-zone" version = "0.1.65" @@ -982,27 +525,12 @@ dependencies = [ "quote", ] -[[package]] -name = "ipnet" -version = "2.12.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "791930b43c0d5973160d90a8f3894509f2b273430f5c5c73b668636d0287c5c0" - [[package]] name = "is_terminal_polyfill" version = "1.70.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a6cb138bb79a146c1bd460005623e142ef0181e3d0219cb493e02f7d08a35695" -[[package]] -name = "itertools" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" -dependencies = [ - "either", -] - [[package]] name = "itoa" version = "1.0.18" @@ -1036,47 +564,12 @@ dependencies = [ "windows-targets", ] -[[package]] -name = "libredox" -version = "0.1.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7955dfc218a8afb29dfeffd540e3a6e96baeb94fe7138228dd7cc6937fbbf96" -dependencies = [ - "libc", -] - -[[package]] -name = "libsqlite3-sys" -version = "0.30.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e99fb7a497b1e3339bc746195567ed8d3e24945ecd636e3619d20b9de9e9149" -dependencies = [ - "cc", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "lock_api" -version = "0.4.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "224399e74b87b5f3557511d98dff8b14089b3dadafcab6bb93eab67d3aace965" -dependencies = [ - "scopeguard", -] - [[package]] name = "log" version = "0.4.33" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0ceec5bc11778974d1bcb055b18002eba7f4b3518b6a0081b3af5f21666da9ad" -[[package]] -name = "lru-slab" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "112b39cec0b298b6c1999fee3e31427f74f676e4cb9879ed1a121b43661a4154" - [[package]] name = "marqdo" version = "0.3.9" @@ -1086,23 +579,23 @@ dependencies = [ "chrono", "clap", "futures-util", - "getrandom 0.2.17", - "hmac 0.12.1", + "getrandom", + "hmac", "idna_adapter", "include_dir", "libc", "libloading", - "md-5 0.10.6", + "md-5", "predicates", "pulldown-cmark", "regex", "serde_json", "sha1", - "sha2 0.10.9", - "thiserror 1.0.69", + "sha2", + "thiserror", "tiny_http", "tokio", - "tokio-tungstenite 0.24.0", + "tokio-tungstenite", "ureq", "zeroize", "zip", @@ -1147,37 +640,6 @@ dependencies = [ "serde_json", ] -[[package]] -name = "marqdo_plugin_web" -version = "0.1.0" -dependencies = [ - "argon2", - "axum", - "bytes", - "futures-util", - "getrandom 0.2.17", - "hex", - "hmac 0.12.1", - "postgres", - "pulldown-cmark", - "redis", - "reqwest", - "rusqlite", - "serde", - "serde_json", - "sha2 0.10.9", - "tokio", - "tokio-tungstenite 0.24.0", - "tower-http", - "ureq", -] - -[[package]] -name = "matchit" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47e1ffaa40ddd1f3ed91f717a33c8c0ee23fff369e3aa8772b9605cc1d22f4c3" - [[package]] name = "md-5" version = "0.10.6" @@ -1185,17 +647,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf" dependencies = [ "cfg-if", - "digest 0.10.7", -] - -[[package]] -name = "md-5" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69b6441f590336821bb897fb28fc622898ccceb1d6cea3fde5ea86b090c4de98" -dependencies = [ - "cfg-if", - "digest 0.11.3", + "digest", ] [[package]] @@ -1204,22 +656,6 @@ version = "2.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cf8baf1c55e62ffcace7a9f06f4bd9cd3f0c4beb022d3b367256b91b87513d98" -[[package]] -name = "mime" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" - -[[package]] -name = "mime_guess" -version = "2.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7c44f8e672c00fe5308fa235f821cb4198414e1c77935c1ab6948d3fd78550e" -dependencies = [ - "mime", - "unicase", -] - [[package]] name = "miniz_oxide" version = "0.8.9" @@ -1237,52 +673,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "30d65c71f1ce40ab09135ce117d742b9f8a19ff91a41a8b57ed50bc2de59c427" dependencies = [ "libc", - "wasi 0.11.1+wasi-snapshot-preview1", + "wasi", "windows-sys 0.61.2", ] -[[package]] -name = "multer" -version = "3.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83e87776546dc87511aa5ee218730c92b666d7264ab6ed41f9d215af9cd5224b" -dependencies = [ - "bytes", - "encoding_rs", - "futures-util", - "http", - "httparse", - "memchr", - "mime", - "spin", - "version_check", -] - [[package]] name = "normalize-line-endings" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be" -[[package]] -name = "num-bigint" -version = "0.4.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c89e69e7e0f03bea5ef08013795c25018e101932225a656383bd384495ecc367" -dependencies = [ - "num-integer", - "num-traits", -] - -[[package]] -name = "num-integer" -version = "0.1.47" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ce2d95d4b3734dc35aa2f45e1aa22cd416814592a4f9d9205e11affd5b8e10b" -dependencies = [ - "num-traits", -] - [[package]] name = "num-traits" version = "0.2.19" @@ -1292,24 +692,6 @@ dependencies = [ "autocfg", ] -[[package]] -name = "objc2-core-foundation" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a180dd8642fa45cdb7dd721cd4c11b1cadd4929ce112ebd8b9f5803cc79d536" -dependencies = [ - "bitflags", -] - -[[package]] -name = "objc2-system-configuration" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7216bd11cbda54ccabcab84d523dc93b858ec75ecfb3a7d89513fa22464da396" -dependencies = [ - "objc2-core-foundation", -] - [[package]] name = "once_cell" version = "1.21.4" @@ -1322,122 +704,18 @@ version = "1.70.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "384b8ab6d37215f3c5301a95a4accb5d64aa607f1fcb26a11b5303878451b4fe" -[[package]] -name = "parking_lot" -version = "0.12.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93857453250e3077bd71ff98b6a65ea6621a19bb0f559a85248955ac12c45a1a" -dependencies = [ - "lock_api", - "parking_lot_core", -] - -[[package]] -name = "parking_lot_core" -version = "0.9.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2621685985a2ebf1c516881c026032ac7deafcda1a2c9b7850dc81e3dfcb64c1" -dependencies = [ - "cfg-if", - "libc", - "redox_syscall", - "smallvec", - "windows-link", -] - -[[package]] -name = "password-hash" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "346f04948ba92c43e8469c1ee6736c7563d71012b17d40745260fe106aac2166" -dependencies = [ - "base64ct", - "rand_core 0.6.4", - "subtle", -] - [[package]] name = "percent-encoding" version = "2.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220" -[[package]] -name = "phf" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1562dc717473dbaa4c1f85a36410e03c047b2e7df7f45ee938fbef64ae7fadf" -dependencies = [ - "phf_shared", - "serde", -] - -[[package]] -name = "phf_shared" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e57fef6bc5981e38c2ce2d63bfa546861309f875b8a75f092d1d54ae2d64f266" -dependencies = [ - "siphasher", -] - [[package]] name = "pin-project-lite" version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a89322df9ebe1c1578d689c92318e070967d1042b512afbe49518723f4e6d5cd" -[[package]] -name = "pkg-config" -version = "0.3.33" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19f132c84eca552bf34cab8ec81f1c1dcc229b811638f9d283dceabe58c5569e" - -[[package]] -name = "postgres" -version = "0.19.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33ad20e0aa0b24f5a394eab4f78c781d248982b22b25cecc7e3aa46a681605bd" -dependencies = [ - "bytes", - "fallible-iterator 0.2.0", - "futures-util", - "log", - "tokio", - "tokio-postgres", -] - -[[package]] -name = "postgres-protocol" -version = "0.6.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08808e3c483c46e999108051c78334f473d5adb59d78bb80a1268c7e6aa6c514" -dependencies = [ - "base64", - "byteorder", - "bytes", - "fallible-iterator 0.2.0", - "hmac 0.13.0", - "md-5 0.11.0", - "memchr", - "rand 0.10.2", - "sha2 0.11.0", - "stringprep", -] - -[[package]] -name = "postgres-types" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "851ca9db4932932d69f3ea811b1abe63087a0f740a47692619dd40d4899b68be" -dependencies = [ - "bytes", - "fallible-iterator 0.2.0", - "postgres-protocol", - "serde_core", - "serde_json", -] - [[package]] name = "ppv-lite86" version = "0.2.21" @@ -1505,62 +783,6 @@ version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "007d8adb5ddab6f8e3f491ac63566a7d5002cc7ed73901f72057943fa71ae1ae" -[[package]] -name = "quinn" -version = "0.11.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c1a41e437b6bbd489372cd4971de128e85c855f56c57f283d20ff016cf7c0a8" -dependencies = [ - "bytes", - "cfg_aliases", - "pin-project-lite", - "quinn-proto", - "quinn-udp", - "rustc-hash", - "rustls 0.23.44", - "socket2 0.6.5", - "thiserror 2.0.20", - "tokio", - "tracing", - "web-time", -] - -[[package]] -name = "quinn-proto" -version = "0.11.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04759210543be93709136e28212294a659ef5001836ff4eab4d663e4529bba83" -dependencies = [ - "bytes", - "getrandom 0.4.3", - "lru-slab", - "rand 0.10.2", - "rand_pcg", - "ring", - "rustc-hash", - "rustls 0.23.44", - "rustls-pki-types", - "slab", - "thiserror 2.0.20", - "tinyvec", - "tracing", - "web-time", -] - -[[package]] -name = "quinn-udp" -version = "0.5.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35a133f956daabe89a61a685c2649f13d82d5aa4bd5d12d1277e1072a21c0694" -dependencies = [ - "cfg_aliases", - "libc", - "once_cell", - "socket2 0.6.5", - "tracing", - "windows-sys 0.61.2", -] - [[package]] name = "quote" version = "1.0.47" @@ -1570,18 +792,6 @@ dependencies = [ "proc-macro2", ] -[[package]] -name = "r-efi" -version = "5.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f" - -[[package]] -name = "r-efi" -version = "6.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8dcc9c7d52a811697d2151c701e0d08956f92b0e24136cf4cf27b57a6a0d9bf" - [[package]] name = "rand" version = "0.8.7" @@ -1589,29 +799,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "22f6172bdec972074665ed81ed53b71da00bfc44b65a753cfde883ec4c702a1a" dependencies = [ "libc", - "rand_chacha 0.3.1", - "rand_core 0.6.4", -] - -[[package]] -name = "rand" -version = "0.9.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9ef1d0d795eb7d84685bca4f72f3649f064e6641543d3a8c415898726a57b41" -dependencies = [ - "rand_chacha 0.9.0", - "rand_core 0.9.5", -] - -[[package]] -name = "rand" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7f5fa3a058cd35567ef9bfa5e75732bee0f9e4c55fa90477bef2dfcdbc4be80" -dependencies = [ - "chacha20", - "getrandom 0.4.3", - "rand_core 0.10.1", + "rand_chacha", + "rand_core", ] [[package]] @@ -1621,17 +810,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" dependencies = [ "ppv-lite86", - "rand_core 0.6.4", -] - -[[package]] -name = "rand_chacha" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb" -dependencies = [ - "ppv-lite86", - "rand_core 0.9.5", + "rand_core", ] [[package]] @@ -1640,58 +819,7 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.2.17", -] - -[[package]] -name = "rand_core" -version = "0.9.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76afc826de14238e6e8c374ddcc1fa19e374fd8dd986b0d2af0d02377261d83c" -dependencies = [ - "getrandom 0.3.4", -] - -[[package]] -name = "rand_core" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63b8176103e19a2643978565ca18b50549f6101881c443590420e4dc998a3c69" - -[[package]] -name = "rand_pcg" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "caa0f4137e1c0a72f4c651489402276c8e8e1cf081f3b0ba156d2cbeef09e86a" -dependencies = [ - "rand_core 0.10.1", -] - -[[package]] -name = "redis" -version = "0.27.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09d8f99a4090c89cc489a94833c901ead69bfbf3877b4867d5482e321ee875bc" -dependencies = [ - "arc-swap", - "combine", - "itertools", - "itoa", - "num-bigint", - "percent-encoding", - "ryu", - "sha1_smol", - "socket2 0.5.10", - "url", -] - -[[package]] -name = "redox_syscall" -version = "0.5.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed2bf2547551a7053d6fdfafda3f938979645c44812fbfcda098faae3f1a362d" -dependencies = [ - "bitflags", + "getrandom", ] [[package]] @@ -1723,47 +851,6 @@ version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d6f6ff9a378485b298a5286656da665ba74413d36db0979633275d2e708145d4" -[[package]] -name = "reqwest" -version = "0.12.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eddd3ca559203180a307f12d114c268abf583f59b03cb906fd0b3ff8646c1147" -dependencies = [ - "base64", - "bytes", - "futures-core", - "futures-util", - "http", - "http-body", - "http-body-util", - "hyper", - "hyper-rustls", - "hyper-util", - "js-sys", - "log", - "percent-encoding", - "pin-project-lite", - "quinn", - "rustls 0.23.44", - "rustls-pki-types", - "serde", - "serde_json", - "serde_urlencoded", - "sync_wrapper", - "tokio", - "tokio-rustls", - "tokio-util", - "tower", - "tower-http", - "tower-service", - "url", - "wasm-bindgen", - "wasm-bindgen-futures", - "wasm-streams", - "web-sys", - "webpki-roots 1.0.9", -] - [[package]] name = "ring" version = "0.17.14" @@ -1772,32 +859,12 @@ checksum = "a4689e6c2294d81e88dc6261c768b63bc4fcdb852be6d1352498b114f61383b7" dependencies = [ "cc", "cfg-if", - "getrandom 0.2.17", + "getrandom", "libc", "untrusted", "windows-sys 0.52.0", ] -[[package]] -name = "rusqlite" -version = "0.32.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7753b721174eb8ff87a9a0e799e2d7bc3749323e773db92e0984debb00019d6e" -dependencies = [ - "bitflags", - "fallible-iterator 0.3.0", - "fallible-streaming-iterator", - "hashlink", - "libsqlite3-sys", - "smallvec", -] - -[[package]] -name = "rustc-hash" -version = "2.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b1e7f9a428571be2dc5bc0505c13fb6bf936822b894ec87abf8a08a4e51742d" - [[package]] name = "rustls" version = "0.22.4" @@ -1807,21 +874,7 @@ dependencies = [ "log", "ring", "rustls-pki-types", - "rustls-webpki 0.102.8", - "subtle", - "zeroize", -] - -[[package]] -name = "rustls" -version = "0.23.44" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6725596c3f2c3a0aef021139e145d4eafe314a6623e4680ca83852b2c67ab2ba" -dependencies = [ - "once_cell", - "ring", - "rustls-pki-types", - "rustls-webpki 0.103.15", + "rustls-webpki", "subtle", "zeroize", ] @@ -1832,7 +885,6 @@ version = "1.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2f4925028c7eb5d1fcdaf196971378ed9d2c1c4efc7dc5d011256f76c99c0a96" dependencies = [ - "web-time", "zeroize", ] @@ -1847,35 +899,12 @@ dependencies = [ "untrusted", ] -[[package]] -name = "rustls-webpki" -version = "0.103.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3c3cf1d8b1e7d4927e2d154c3fcb02979afb9939629c62cd9048d4f07b60ac2" -dependencies = [ - "ring", - "rustls-pki-types", - "untrusted", -] - [[package]] name = "rustversion" version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cf54715a573b99ac80df0bc206da022bcd442c974952c7b9720069370852e21f" -[[package]] -name = "ryu" -version = "1.0.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9774ba4a74de5f7b1c1451ed6cd5285a32eddb5cccb8cc655a4e50009e06477f" - -[[package]] -name = "scopeguard" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" - [[package]] name = "serde" version = "1.0.229" @@ -1919,29 +948,6 @@ dependencies = [ "zmij", ] -[[package]] -name = "serde_path_to_error" -version = "0.1.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10a9ff822e371bb5403e391ecd83e182e0e77ba7f6fe0160b795797109d1b457" -dependencies = [ - "itoa", - "serde", - "serde_core", -] - -[[package]] -name = "serde_urlencoded" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" -dependencies = [ - "form_urlencoded", - "itoa", - "ryu", - "serde", -] - [[package]] name = "sha1" version = "0.10.6" @@ -1949,16 +955,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" dependencies = [ "cfg-if", - "cpufeatures 0.2.17", - "digest 0.10.7", + "cpufeatures", + "digest", ] -[[package]] -name = "sha1_smol" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbfa15b3dddfee50a0fff136974b3e1bde555604ba463834a7eb7deb6417705d" - [[package]] name = "sha2" version = "0.10.9" @@ -1966,19 +966,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283" dependencies = [ "cfg-if", - "cpufeatures 0.2.17", - "digest 0.10.7", -] - -[[package]] -name = "sha2" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "446ba717509524cb3f22f17ecc096f10f4822d76ab5c0b9822c5f9c284e825f4" -dependencies = [ - "cfg-if", - "cpufeatures 0.3.1", - "digest 0.11.3", + "cpufeatures", + "digest", ] [[package]] @@ -1987,28 +976,12 @@ version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f8fadd59c855ef2080decdef8ff161eb6661b86933c9d82e5ba29dc602a55aba" -[[package]] -name = "signal-hook-registry" -version = "1.4.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4db69cba1110affc0e9f7bcd48bbf87b3f4fc7c61fc9155afd4c469eb3d6c1b" -dependencies = [ - "errno", - "libc", -] - [[package]] name = "simd-adler32" version = "0.3.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3a219298ac11a56ea9a6d2120044824d6f01aeb034955e7af7bc16858527deea" -[[package]] -name = "siphasher" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ee5873ec9cce0195efcb7a4e9507a04cd49aec9c83d0389df45b1ef7ba2e649" - [[package]] name = "slab" version = "0.4.12" @@ -2021,16 +994,6 @@ version = "1.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ed6a63f02c8539c91a8685a86f4099661ba3da017932f6ebbea6de3f0fa7c90" -[[package]] -name = "socket2" -version = "0.5.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e22376abed350d73dd1cd119b57ffccad95b4e585a7cda43e286245ce23c0678" -dependencies = [ - "libc", - "windows-sys 0.52.0", -] - [[package]] name = "socket2" version = "0.6.5" @@ -2041,23 +1004,6 @@ dependencies = [ "windows-sys 0.61.2", ] -[[package]] -name = "spin" -version = "0.9.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3763264f6b73151db08c50ff20d7d8a0b8796e021cdea7ceedad07b80155fa0e" - -[[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]] name = "strsim" version = "0.10.0" @@ -2092,15 +1038,6 @@ dependencies = [ "unicode-ident", ] -[[package]] -name = "sync_wrapper" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bf256ce5efdfa370213c1dabab5935a12e49f2c58d15e9eac2870d3b4f27263" -dependencies = [ - "futures-core", -] - [[package]] name = "termtree" version = "0.5.1" @@ -2113,16 +1050,7 @@ version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" dependencies = [ - "thiserror-impl 1.0.69", -] - -[[package]] -name = "thiserror" -version = "2.0.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec86235f5fcc2a73650310756d2ac5b138a5780bbbdfae3eeccec992c435ba4f" -dependencies = [ - "thiserror-impl 2.0.20", + "thiserror-impl", ] [[package]] @@ -2136,17 +1064,6 @@ dependencies = [ "syn 2.0.119", ] -[[package]] -name = "thiserror-impl" -version = "2.0.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc04cd3e1236dd4a98afca4569f2deb3f120e5422a4023be2cb683f8486292af" -dependencies = [ - "proc-macro2", - "quote", - "syn 3.0.3", -] - [[package]] name = "tiny_http" version = "0.12.0" @@ -2184,8 +1101,7 @@ dependencies = [ "libc", "mio", "pin-project-lite", - "signal-hook-registry", - "socket2 0.6.5", + "socket2", "tokio-macros", "windows-sys 0.61.2", ] @@ -2201,42 +1117,6 @@ dependencies = [ "syn 3.0.3", ] -[[package]] -name = "tokio-postgres" -version = "0.7.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a528f7d280f6d5b9cd149635c8705b0dd049754bc67d81d31fa25169a93809d3" -dependencies = [ - "async-trait", - "byteorder", - "bytes", - "fallible-iterator 0.2.0", - "futures-channel", - "futures-util", - "log", - "parking_lot", - "percent-encoding", - "phf", - "pin-project-lite", - "postgres-protocol", - "postgres-types", - "rand 0.10.2", - "socket2 0.6.5", - "tokio", - "tokio-util", - "whoami", -] - -[[package]] -name = "tokio-rustls" -version = "0.26.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0c85f2c3ef0b1cd58b36682f4b17aaa995f0e5db534d85692b4903abce21f67" -dependencies = [ - "rustls 0.23.44", - "tokio", -] - [[package]] name = "tokio-tungstenite" version = "0.24.0" @@ -2246,118 +1126,9 @@ dependencies = [ "futures-util", "log", "tokio", - "tungstenite 0.24.0", + "tungstenite", ] -[[package]] -name = "tokio-tungstenite" -version = "0.29.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f72a05e828585856dacd553fba484c242c46e391fb0e58917c942ee9202915c" -dependencies = [ - "futures-util", - "log", - "tokio", - "tungstenite 0.29.0", -] - -[[package]] -name = "tokio-util" -version = "0.7.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "494815d09bf52b5548659851081238f0ca39ff638363907596da739561c62c52" -dependencies = [ - "bytes", - "futures-core", - "futures-sink", - "libc", - "pin-project-lite", - "tokio", -] - -[[package]] -name = "tower" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebe5ef63511595f1344e2d5cfa636d973292adc0eec1f0ad45fae9f0851ab1d4" -dependencies = [ - "futures-core", - "futures-util", - "pin-project-lite", - "sync_wrapper", - "tokio", - "tower-layer", - "tower-service", - "tracing", -] - -[[package]] -name = "tower-http" -version = "0.6.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cfcf7e2740e6fc6d4d688b4ef00650406bb94adf4731e43c096c3a19fe40840" -dependencies = [ - "async-compression", - "bitflags", - "bytes", - "futures-core", - "futures-util", - "http", - "http-body", - "http-body-util", - "http-range-header", - "httpdate", - "mime", - "mime_guess", - "percent-encoding", - "pin-project-lite", - "tokio", - "tokio-util", - "tower", - "tower-layer", - "tower-service", - "tracing", - "url", -] - -[[package]] -name = "tower-layer" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e" - -[[package]] -name = "tower-service" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" - -[[package]] -name = "tracing" -version = "0.1.44" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63e71662fa4b2a2c3a26f570f037eb95bb1f85397f3cd8076caed2f026a6d100" -dependencies = [ - "log", - "pin-project-lite", - "tracing-core", -] - -[[package]] -name = "tracing-core" -version = "0.1.36" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db97caf9d906fbde555dd62fa95ddba9eecfd14cb388e4f491a66d74cd5fb79a" -dependencies = [ - "once_cell", -] - -[[package]] -name = "try-lock" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" - [[package]] name = "tungstenite" version = "0.24.0" @@ -2370,28 +1141,12 @@ dependencies = [ "http", "httparse", "log", - "rand 0.8.7", + "rand", "sha1", - "thiserror 1.0.69", + "thiserror", "utf-8", ] -[[package]] -name = "tungstenite" -version = "0.29.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c01152af293afb9c7c2a57e4b559c5620b421f6d133261c60dd2d0cdb38e6b8" -dependencies = [ - "bytes", - "data-encoding", - "http", - "httparse", - "log", - "rand 0.9.5", - "sha1", - "thiserror 2.0.20", -] - [[package]] name = "typenum" version = "1.20.1" @@ -2431,12 +1186,6 @@ dependencies = [ "tinyvec", ] -[[package]] -name = "unicode-properties" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7df058c713841ad818f1dc5d3fd88063241cc61f49f5fbea4b951e8cf5a8d71d" - [[package]] name = "unicode-width" version = "0.2.2" @@ -2459,9 +1208,9 @@ dependencies = [ "flate2", "log", "once_cell", - "rustls 0.22.4", + "rustls", "rustls-pki-types", - "rustls-webpki 0.102.8", + "rustls-webpki", "url", "webpki-roots 0.26.11", ] @@ -2496,12 +1245,6 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" -[[package]] -name = "vcpkg" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" - [[package]] name = "version_check" version = "0.9.5" @@ -2517,48 +1260,12 @@ dependencies = [ "libc", ] -[[package]] -name = "want" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" -dependencies = [ - "try-lock", -] - [[package]] name = "wasi" version = "0.11.1+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b" -[[package]] -name = "wasi" -version = "0.14.7+wasi-0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "883478de20367e224c0090af9cf5f9fa85bed63a95c1abf3afc5c083ebc06e8c" -dependencies = [ - "wasip2", -] - -[[package]] -name = "wasip2" -version = "1.0.4+wasi-0.2.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b67efb37e106e55ce722a510d6b5f9c17f083e5fc79afc2badeb12cc313d9487" -dependencies = [ - "wit-bindgen", -] - -[[package]] -name = "wasite" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66fe902b4a6b8028a753d5424909b764ccf79b7a209eac9bf97e59cda9f71a42" -dependencies = [ - "wasi 0.14.7+wasi-0.2.4", -] - [[package]] name = "wasm-bindgen" version = "0.2.127" @@ -2572,16 +1279,6 @@ dependencies = [ "wasm-bindgen-shared", ] -[[package]] -name = "wasm-bindgen-futures" -version = "0.4.77" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b7777d5cc23d0e91404e53ce2d5e8ec7acae3026b16233dba62cd3246457950" -dependencies = [ - "js-sys", - "wasm-bindgen", -] - [[package]] name = "wasm-bindgen-macro" version = "0.2.127" @@ -2614,39 +1311,6 @@ dependencies = [ "unicode-ident", ] -[[package]] -name = "wasm-streams" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15053d8d85c7eccdbefef60f06769760a563c7f0a9d6902a13d35c7800b0ad65" -dependencies = [ - "futures-util", - "js-sys", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", -] - -[[package]] -name = "web-sys" -version = "0.3.104" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c435338968042f4f59a557f690a253676d47ce13ceb55d70100e7facf6620a30" -dependencies = [ - "js-sys", - "wasm-bindgen", -] - -[[package]] -name = "web-time" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb" -dependencies = [ - "js-sys", - "wasm-bindgen", -] - [[package]] name = "webpki-roots" version = "0.26.11" @@ -2665,19 +1329,6 @@ dependencies = [ "rustls-pki-types", ] -[[package]] -name = "whoami" -version = "2.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "626c4bac6755d76ffc12cb01b2eac751db1996b9e0041de9aa02c8c211ddc82c" -dependencies = [ - "libc", - "libredox", - "objc2-system-configuration", - "wasite", - "web-sys", -] - [[package]] name = "windows-core" version = "0.62.2" @@ -2819,12 +1470,6 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" -[[package]] -name = "wit-bindgen" -version = "0.57.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ebf944e87a7c253233ad6766e082e3cd714b5d03812acc24c318f549614536e" - [[package]] name = "zerocopy" version = "0.8.56" diff --git a/Cargo.toml b/Cargo.toml index 363ef6d..01f2ad9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -57,11 +57,12 @@ chrono = { version = "0.4", default-features = false, features = ["alloc", "std" members = [ "plugins/demo", "plugins/agent", - "plugins/web-rust-archive", "plugins/quantum", "plugins/linalg", "crates/marqdo-wasm", ] +# Official web plugin is Go (`plugins/web/`); Rust sources kept as +# `plugins/web-rust-archive/` for reference (not a workspace member). resolver = "2" [dev-dependencies] diff --git a/doc/design/ext-cli.md b/doc/design/ext-cli.md index e04eb94..5533676 100644 --- a/doc/design/ext-cli.md +++ b/doc/design/ext-cli.md @@ -35,9 +35,11 @@ and get both L1 `.mq.md` **and** the matching native plugin (`.dll` / `.so`) **w ### Resolution order (`add` with native crate) -1. Local artifact (`MARQDO_*_PLUGIN`, `target/{debug,release}`, beside `marqdo`, `MARQDO_EXT_SOURCE/native`, …) +1. Local artifact (`MARQDO_*_PLUGIN`, `plugins/web/build` for **web**, `target/{debug,release}`, beside `marqdo`, `MARQDO_EXT_SOURCE/native`, …) 2. **Download** `marqdo-{VER}-native-{target}.zip` from the GitHub Release for this CLI version → cache under `~/.marqdo/cache/` -3. If Rust/`cargo` is available → `cargo build -p marqdo_plugin_*` (developers) +3. Local rebuild fallback: + - **web** → `./scripts/build-web-plugin.sh` (Go c-shared `libweb`; requires Go 1.22+ / cgo) + - other plugins → `cargo build -p marqdo_plugin_*` when Rust/`cargo` is available 4. Else fail with a clear message pointing at the Release assets L1 sources: diff --git a/doc/design/ext-web-go-rewrite.md b/doc/design/ext-web-go-rewrite.md index 6d93808..719e7ee 100644 --- a/doc/design/ext-web-go-rewrite.md +++ b/doc/design/ext-web-go-rewrite.md @@ -347,7 +347,7 @@ plugins/web/ # Go module(替换原 Rust crate) scripts/build-web-plugin.sh # go build -buildmode=c-shared -o …/libweb.so ``` -原 Rust 源码:迁移期可暂存 `plugins/web-rust-archive/` 或 git 历史保留;**默认构建不再 `cargo build -p marqdo_plugin_web`**。 +原 Rust 源码:`plugins/web-rust-archive/`(**已移出 Cargo workspace**;参考用,默认不构建)。 ### 9.2 产物与解析 @@ -367,7 +367,9 @@ scripts/build-web-plugin.sh # go build -buildmode=c-shared -o …/libweb.so | 组件 | 变更 | |------|------| | 根 `Cargo.toml` workspace | 移除 `plugins/web` Rust member | -| `tests/gold.rs` | `cargo build -p marqdo_plugin_web` → 调用 `scripts/build-web-plugin.sh` | +| `tests/gold.rs` | `ensure_web_plugin_built()` → `scripts/build-web-plugin.sh` | +| Release 脚本 | Go:`scripts/build-web-plugin.sh`;其它插件仍 `cargo build -p …` | + | `marqdo ext add web` | 构建回退:有 Go 则 `go build`;Release 仍下发预编译 native zip | | Release 脚本 | 增加 Go 交叉/本机编译 `libweb` 打包步骤 | | [ext-cli.md](ext-cli.md) / [ext-abi.md](ext-abi.md) | 注明 web 插件实现语言为 Go | @@ -398,7 +400,7 @@ scripts/build-web-plugin.sh # go build -buildmode=c-shared -o …/libweb.so | **W-G10** | proxy + invoke + nested plugin | ✅ `web-proxy-invoke` / hosting live | | **W-G11** | 定制 C2–C4 shell/layout/style/nav | ✅ `web-c2`–`c4` | | **W-G12** | G 增强 WS rooms + Redis session/pubsub + API key 原语 | ✅ 单测 + `web-g12-api-key-smoke` | -| **W-G13** | 默认切换 Go `libweb`;归档 Rust;更新发版与 ext CLI | 全量 `tests/ext/web-*` 绿 | +| **W-G13** | 默认切换 Go `libweb`;归档 Rust;更新发版与 ext CLI | ✅ 离线 `tests/ext/web-*`(有 `# main`)全绿;`ext add`/`gold`/`release` 走 `scripts/build-web-plugin.sh`;Rust 移出 workspace | | **W-G14** | anlian Marqdo 重写主路径(可分仓或 `examples/anlian-mq/`) | §8 矩阵主路径可演示 | 每波次:**先补 Go 实现 → 跑对应 gold → 再进入下一波**。禁止跨波次留下「注册了但返回 stub 错误」的 ABI(除 W-G0 明确的未实现探测)。 @@ -433,14 +435,14 @@ scripts/build-web-plugin.sh # go build -buildmode=c-shared -o …/libweb.so 实现推进时同步: -- [ ] 本文状态行随波次更新 -- [ ] [ext-abi.md](ext-abi.md) Demo/Web 节:实现语言 Go -- [ ] [ext-cli.md](ext-cli.md):构建回退含 `go build` -- [ ] [ext-web.md](ext-web.md):链到本文;C5 落实说明 +- [x] 本文状态行随波次更新 +- [x] [ext-abi.md](ext-abi.md) Demo/Web 节:实现语言 Go +- [x] [ext-cli.md](ext-cli.md):构建回退含 `go build` / `scripts/build-web-plugin.sh` +- [x] [ext-web.md](ext-web.md):链到本文;C5 落实说明 - [ ] [web-asgi-servers-and-marqdo.md](web-asgi-servers-and-marqdo.md):axum → Go `net/http` -- [ ] [doc/README.md](../README.md) 索引行 -- [ ] ADR:`doc/adr/0004-web-plugin-go.md`(Accepted) -- [ ] `plugins/web/README.md` 开发者构建说明 +- [ ] [doc/README.md](../README.md) 索引行(若尚未链到本文) +- [x] ADR:`doc/adr/0004-web-plugin-go.md`(Accepted) +- [x] `plugins/web/README.md` 开发者构建说明 --- diff --git a/doc/design/ext-web.md b/doc/design/ext-web.md index 964e45b..828e0ca 100644 --- a/doc/design/ext-web.md +++ b/doc/design/ext-web.md @@ -541,7 +541,7 @@ submit → action=insert → db.insert;action=update → db.update |----|----|------| | Marqdo 核心 | 表→Value、类/方法、import | 不识别 web 路径语法 | | `ext/web/*.mq.md` | 作者 API、中英面、委托插件 | 不直接 `host_*` | -| `plugins/web` | 路径解析辅助、装配结果、listen、SQL、渲染 | 不要求作者写袋 | +| `plugins/web` | **Go** `libweb`(HTTP / SQL / HTML 壳;见 [ext-web-go-rewrite.md](ext-web-go-rewrite.md)) | 不要求作者写袋 | **实现要点(评审通过后再做):** diff --git a/plugins/web-rust-archive/README.md b/plugins/web-rust-archive/README.md new file mode 100644 index 0000000..cc5100e --- /dev/null +++ b/plugins/web-rust-archive/README.md @@ -0,0 +1,9 @@ +# web-rust-archive + +Former Rust/axum implementation of the Marqdo web plugin (`marqdo_plugin_web`). + +**Status (W-G13):** archived reference only. The official plugin is Go under +[`plugins/web/`](../web/). This crate is **not** a Cargo workspace member and is +not built by CI or `marqdo ext add web`. + +Do not evolve features here — see [ext-web-go-rewrite.md](../../doc/design/ext-web-go-rewrite.md) C5 / ADR 0004. diff --git a/plugins/web/README.md b/plugins/web/README.md index e56c1a2..b2fb0bd 100644 --- a/plugins/web/README.md +++ b/plugins/web/README.md @@ -2,22 +2,26 @@ 施工图:[doc/design/ext-web-go-rewrite.md](../../doc/design/ext-web-go-rewrite.md) · ADR:[0004](../../doc/adr/0004-web-plugin-go.md) +**Default native web plugin (W-G13).** `plugin.native_path name=web` resolves `plugins/web/build/libweb.so` (and copies under `target/{debug,release}/`). + ## Build ```bash ./scripts/build-web-plugin.sh -# → plugins/web/build/libweb.so (also copied to target/debug|release) -export MARQDO_WEB_PLUGIN=$PWD/plugins/web/build/libweb.so +# → plugins/web/build/libweb.so +# → also copied to target/debug|release/libweb.so ``` Requires **Go 1.22+** with cgo (`CGO_ENABLED=1`) and a C toolchain. +Override path: `export MARQDO_WEB_PLUGIN=$PWD/plugins/web/build/libweb.so` + ## Layout | Path | Role | |------|------| -| `plugin.go` | `//export` ABI entry + registration | -| `abi/marqdo_abi.h` | C contract (from `include/`) | +| `plugin.go` / `abi_*.go` | `//export` ABI entry + registration | +| `abi/marqdo_abi_cgo.h` | C contract for cgo | | `internal/*` | page / db / http / ws / … | -迁移期 Rust 参考实现:`plugins/web-rust-archive/`(勿再演进)。 +Rust reference (not built by default): `plugins/web-rust-archive/`. diff --git a/scripts/build-web-plugin.sh b/scripts/build-web-plugin.sh index 13a781d..2d25291 100755 --- a/scripts/build-web-plugin.sh +++ b/scripts/build-web-plugin.sh @@ -1,6 +1,7 @@ #!/usr/bin/env bash # Build Marqdo web plugin (Go → C shared library). -# Output: plugins/web/build/libweb.so (Linux) / libweb.dylib / web.dll +# Canonical output: plugins/web/build/libweb.so (Linux) / libweb.dylib / web.dll +# Also copies into target/{debug,release}/ for ext CLI and release packaging. set -euo pipefail ROOT="$(cd "$(dirname "$0")/.." && pwd)" cd "$ROOT/plugins/web" @@ -17,8 +18,12 @@ case "$(uname -s)" in esac echo "building $OUT (go $(go version | awk '{print $3}'))…" CGO_ENABLED=1 go build -buildmode=c-shared -o "$OUT" . -# Do NOT copy over target/{debug,release}/libweb.so — rust archive crate still -# builds there during migration. Canonical Go artifact is plugins/web/build/. -echo "ok: $ROOT/plugins/web/$OUT" -echo "hint: export MARQDO_WEB_PLUGIN=$ROOT/plugins/web/$OUT" -echo " (or use plugins/web/build before ~/.marqdo/ext/native in resolution)" +ABS="$ROOT/plugins/web/$OUT" +BASE="$(basename "$OUT")" +for dir in "$ROOT/target/debug" "$ROOT/target/release"; do + mkdir -p "$dir" + cp -f "$ABS" "$dir/$BASE" +done +echo "ok: $ABS" +echo "also: $ROOT/target/debug/$BASE $ROOT/target/release/$BASE" +echo "hint: plugin.native_path name=web resolves these; override with MARQDO_WEB_PLUGIN=$ABS" diff --git a/src/ext_cli.rs b/src/ext_cli.rs index 8005c0e..3202a81 100644 --- a/src/ext_cli.rs +++ b/src/ext_cli.rs @@ -32,7 +32,7 @@ pub const CATALOG: &[ExtPackage] = &[ }, ExtPackage { id: "web", - description: "Dynamic website toolkit (ext/web) — page/db/bind/admin", + description: "Dynamic website toolkit (ext/web) — Go libweb (page/db/bind/admin)", mq_files: &["web/web.mq.md", "web/网页.mq.md"], native_crate: Some("marqdo_plugin_web"), }, @@ -274,11 +274,73 @@ fn find_native_plugin(short: &str) -> Result { } } bail!( - "cannot find native plugin `{name}` (run `cargo build -p marqdo_plugin_{short}`, or set {env_key})" + "cannot find native plugin `{name}` (for `web`: `./scripts/build-web-plugin.sh`; \ + else `cargo build -p marqdo_plugin_{short}`; or set {env_key})" ) } -/// Locate a built native plugin: local artifact → GitHub Release prebuild → optional cargo build. +/// Walk from cwd (and common anchors) to find the Marqdo repo root that contains +/// `scripts/build-web-plugin.sh`. +fn find_web_plugin_build_script() -> Option { + let mut starts = Vec::new(); + if let Ok(cwd) = env::current_dir() { + starts.push(cwd); + } + if let Ok(exe) = env::current_exe() { + if let Some(dir) = exe.parent() { + starts.push(dir.to_path_buf()); + } + } + for start in starts { + let mut dir = start; + for _ in 0..8 { + let script = dir.join("scripts").join("build-web-plugin.sh"); + if script.is_file() { + return Some(script); + } + if !dir.pop() { + break; + } + } + } + None +} + +fn build_go_web_plugin() -> Result { + let script = find_web_plugin_build_script().ok_or_else(|| { + anyhow::anyhow!( + "cannot locate scripts/build-web-plugin.sh (run from the Marqdo repo, \ + or set {} to a built libweb path)", + native_env_var("web") + ) + })?; + let root = script + .parent() + .and_then(|p| p.parent()) + .ok_or_else(|| anyhow::anyhow!("invalid build-web-plugin.sh path"))?; + println!("native plugin for `web` not found; building Go libweb via scripts/build-web-plugin.sh…"); + let status = std::process::Command::new("bash") + .arg(&script) + .current_dir(root) + .status() + .with_context(|| format!("spawn {}", script.display()))?; + if !status.success() { + bail!( + "scripts/build-web-plugin.sh failed (status {status}); \ + install Go 1.22+ with cgo, or set {} to a built libweb path", + native_env_var("web") + ); + } + find_native_plugin("web").with_context(|| { + format!( + "built Go libweb but still cannot find {}; set {} to the .so/.dll path", + native_lib_filename("web"), + native_env_var("web") + ) + }) +} + +/// Locate a built native plugin: local artifact → GitHub Release prebuild → optional build. fn ensure_native_plugin(crate_name: &str) -> Result { let short = native_short_name(crate_name); if let Ok(p) = find_native_plugin(short) { @@ -296,6 +358,11 @@ fn ensure_native_plugin(crate_name: &str) -> Result { } } + // Official web plugin is Go (W-G13); do not cargo-build the Rust archive. + if short == "web" { + return build_go_web_plugin(); + } + #[cfg(feature = "net-host")] let have_cargo = crate::ext_fetch::cargo_available(); #[cfg(not(feature = "net-host"))] @@ -434,10 +501,10 @@ pub fn remove_ext(id: &str) -> Result<()> { } /// Resolve installed native plugin path for `name` (`agent`, `web`, …). -/// Also falls back to cargo `target/{debug,release}` artifacts for local runs. +/// Also falls back to cargo `target/{debug,release}` and Go `plugins/web/build`. /// /// `MARQDO_*_PLUGIN` env overrides installed `~/.marqdo/ext` so developers can -/// point at a freshly built Go `libweb.so` during the web rewrite. +/// point at a freshly built plugin path. pub fn installed_native_path(name: &str) -> Option { let short = native_short_name(name); if !matches!(short, "agent" | "web" | "quantum" | "linalg") { diff --git a/tests/gold.rs b/tests/gold.rs index 3390b97..dd1dcb3 100644 --- a/tests/gold.rs +++ b/tests/gold.rs @@ -37,6 +37,26 @@ fn assert_out(path: &str, expect: &str) { assert_eq!(stdout.trim_end(), expect.trim_end(), "{path}"); } +/// Build Go `plugins/web/build/libweb.so` once per test process (W-G13). +fn ensure_web_plugin_built() { + use std::sync::Once; + static ONCE: Once = Once::new(); + ONCE.call_once(|| { + let root = std::path::PathBuf::from(env!("CARGO_MANIFEST_DIR")); + let script = root.join("scripts").join("build-web-plugin.sh"); + let status = Command::new("bash") + .arg(&script) + .current_dir(&root) + .status() + .expect("run scripts/build-web-plugin.sh"); + assert!( + status.success(), + "failed to build Go libweb via scripts/build-web-plugin.sh" + ); + }); +} + + /// Assert failure with `path:line:col:` prefix and message substring (both backends). fn assert_err(path: &str, line_col: &str, substr: &str) { for backend in ["tree", "bytecode"] { @@ -1513,12 +1533,7 @@ fn ext_cli_add_agent() { #[test] fn ext_cli_add_web() { - let status = Command::new("cargo") - .args(["build", "-p", "marqdo_plugin_web"]) - .current_dir(env!("CARGO_MANIFEST_DIR")) - .status() - .expect("build web plugin"); - assert!(status.success(), "failed to build marqdo_plugin_web"); + ensure_web_plugin_built(); let tmp = tempfile_dir("marqdo-ext-web"); let src = std::path::PathBuf::from(env!("CARGO_MANIFEST_DIR")).join("ext"); @@ -1550,12 +1565,7 @@ fn ext_cli_add_web() { #[test] fn ext_web_smoke() { - let status = Command::new("cargo") - .args(["build", "-p", "marqdo_plugin_web"]) - .current_dir(env!("CARGO_MANIFEST_DIR")) - .status() - .expect("build web plugin"); - assert!(status.success(), "failed to build marqdo_plugin_web"); + ensure_web_plugin_built(); assert_out( "tests/ext/web-smoke.mq.md", "render-ok @@ -1573,12 +1583,7 @@ fn ext_web_entrydir_smoke() { // not the process cwd (host_query("entry_dir")). We run from the repo // root while the script lives in tests/ext, so the sqlite file must // land under tests/ext/entrydir-fixtures/data/ and NOT repo-root/. - let status = Command::new("cargo") - .args(["build", "-p", "marqdo_plugin_web"]) - .current_dir(env!("CARGO_MANIFEST_DIR")) - .status() - .expect("build web plugin"); - assert!(status.success(), "failed to build marqdo_plugin_web"); + ensure_web_plugin_built(); let script = "tests/ext/web-entrydir-smoke.mq.md"; let fixture_data = std::path::Path::new("tests/ext/entrydir-fixtures/data"); @@ -1615,12 +1620,7 @@ fn ext_web_entrydir_smoke() { #[test] fn ext_web_form_smoke() { - let status = Command::new("cargo") - .args(["build", "-p", "marqdo_plugin_web"]) - .current_dir(env!("CARGO_MANIFEST_DIR")) - .status() - .expect("build web plugin"); - assert!(status.success(), "failed to build marqdo_plugin_web"); + ensure_web_plugin_built(); assert_out( "tests/ext/web-form-smoke.mq.md", "validate-ok @@ -1632,12 +1632,7 @@ render-ok", #[test] fn ext_web_admin_smoke() { - let status = Command::new("cargo") - .args(["build", "-p", "marqdo_plugin_web"]) - .current_dir(env!("CARGO_MANIFEST_DIR")) - .status() - .expect("build web plugin"); - assert!(status.success(), "failed to build marqdo_plugin_web"); + ensure_web_plugin_built(); assert_out( "tests/ext/web-admin-smoke.mq.md", "schema-ok @@ -1653,12 +1648,7 @@ errors-echoed-ok", #[test] fn ext_web_net_smoke() { - let status = Command::new("cargo") - .args(["build", "-p", "marqdo_plugin_web"]) - .current_dir(env!("CARGO_MANIFEST_DIR")) - .status() - .expect("build web plugin"); - assert!(status.success(), "failed to build marqdo_plugin_web"); + ensure_web_plugin_built(); assert_out( "tests/ext/web-net-smoke.mq.md", "session-new-ok @@ -1681,12 +1671,7 @@ ws-connect-error-ok", #[test] fn ext_web_route_smoke() { - let status = Command::new("cargo") - .args(["build", "-p", "marqdo_plugin_web"]) - .current_dir(env!("CARGO_MANIFEST_DIR")) - .status() - .expect("build web plugin"); - assert!(status.success(), "failed to build marqdo_plugin_web"); + ensure_web_plugin_built(); assert_out( "tests/ext/web-route-smoke.mq.md", "about-ok @@ -1697,12 +1682,7 @@ render-ok", #[test] fn ext_web_form_embed_smoke() { - let status = Command::new("cargo") - .args(["build", "-p", "marqdo_plugin_web"]) - .current_dir(env!("CARGO_MANIFEST_DIR")) - .status() - .expect("build web plugin"); - assert!(status.success(), "failed to build marqdo_plugin_web"); + ensure_web_plugin_built(); assert_out( "tests/ext/web-form-embed-smoke.mq.md", "form-id-ok @@ -1712,12 +1692,7 @@ render-ok", #[test] fn ext_web_form_slot_smoke() { - let status = Command::new("cargo") - .args(["build", "-p", "marqdo_plugin_web"]) - .current_dir(env!("CARGO_MANIFEST_DIR")) - .status() - .expect("build web plugin"); - assert!(status.success(), "failed to build marqdo_plugin_web"); + ensure_web_plugin_built(); assert_out( "tests/ext/web-form-slot-smoke.mq.md", "target-ok @@ -1727,12 +1702,7 @@ slot-ok", #[test] fn ext_web_part_smoke() { - let status = Command::new("cargo") - .args(["build", "-p", "marqdo_plugin_web"]) - .current_dir(env!("CARGO_MANIFEST_DIR")) - .status() - .expect("build web plugin"); - assert!(status.success(), "failed to build marqdo_plugin_web"); + ensure_web_plugin_built(); assert_out( "tests/ext/web-part-smoke.mq.md", "route-stamp-ok @@ -1743,12 +1713,7 @@ route-part-ok", #[test] fn ext_web_select_smoke() { - let status = Command::new("cargo") - .args(["build", "-p", "marqdo_plugin_web"]) - .current_dir(env!("CARGO_MANIFEST_DIR")) - .status() - .expect("build web plugin"); - assert!(status.success(), "failed to build marqdo_plugin_web"); + ensure_web_plugin_built(); assert_out( "tests/ext/web-select-smoke.mq.md", "map-where-ok @@ -1759,12 +1724,7 @@ all-ok", #[test] fn ext_web_zh_smoke() { - let status = Command::new("cargo") - .args(["build", "-p", "marqdo_plugin_web"]) - .current_dir(env!("CARGO_MANIFEST_DIR")) - .status() - .expect("build web plugin"); - assert!(status.success(), "failed to build marqdo_plugin_web"); + ensure_web_plugin_built(); assert_out( "tests/ext/web-zh-smoke.mq.md", "render-ok @@ -1776,12 +1736,7 @@ route-ok", #[test] fn ext_web_static_smoke() { - let status = Command::new("cargo") - .args(["build", "-p", "marqdo_plugin_web"]) - .current_dir(env!("CARGO_MANIFEST_DIR")) - .status() - .expect("build web plugin"); - assert!(status.success(), "failed to build marqdo_plugin_web"); + ensure_web_plugin_built(); assert_out( "tests/ext/web-static-smoke.mq.md", "dir-ok @@ -1792,12 +1747,7 @@ custom-ok", #[test] fn ext_web_assets_smoke() { - let status = Command::new("cargo") - .args(["build", "-p", "marqdo_plugin_web"]) - .current_dir(env!("CARGO_MANIFEST_DIR")) - .status() - .expect("build web plugin"); - assert!(status.success(), "failed to build marqdo_plugin_web"); + ensure_web_plugin_built(); assert_out( "tests/ext/web-assets-smoke.mq.md", "images-ok @@ -1812,12 +1762,7 @@ make-head-ok", #[test] fn ext_web_assets_live() { - let status = Command::new("cargo") - .args(["build", "-p", "marqdo_plugin_web"]) - .current_dir(env!("CARGO_MANIFEST_DIR")) - .status() - .expect("build web plugin"); - assert!(status.success(), "failed to build marqdo_plugin_web"); + ensure_web_plugin_built(); let script = "tests/ext/web-assets-live-server.mq.md"; let bin = env!("CARGO_BIN_EXE_marqdo"); @@ -1888,12 +1833,7 @@ fn ext_web_assets_live() { #[test] fn ext_web_middleware_smoke() { - let status = Command::new("cargo") - .args(["build", "-p", "marqdo_plugin_web"]) - .current_dir(env!("CARGO_MANIFEST_DIR")) - .status() - .expect("build web plugin"); - assert!(status.success(), "failed to build marqdo_plugin_web"); + ensure_web_plugin_built(); assert_out( "tests/ext/web-middleware-smoke.mq.md", "cors-origin-ok @@ -1916,12 +1856,7 @@ json-post-ok", fn ext_web_middleware_live() { // Boots a real HTTP server and verifies CORS / security headers / // gzip / JSON API / body limit over the wire. - let status = Command::new("cargo") - .args(["build", "-p", "marqdo_plugin_web"]) - .current_dir(env!("CARGO_MANIFEST_DIR")) - .status() - .expect("build web plugin"); - assert!(status.success(), "failed to build marqdo_plugin_web"); + ensure_web_plugin_built(); let script = "tests/ext/web-middleware-live-server.mq.md"; let bin = env!("CARGO_BIN_EXE_marqdo"); @@ -2054,12 +1989,7 @@ fn ext_web_middleware_live() { #[test] fn ext_web_proxy_invoke_smoke() { - let status = Command::new("cargo") - .args(["build", "-p", "marqdo_plugin_web"]) - .current_dir(env!("CARGO_MANIFEST_DIR")) - .status() - .expect("build web plugin"); - assert!(status.success(), "failed to build marqdo_plugin_web"); + ensure_web_plugin_built(); assert_out( "tests/ext/web-proxy-invoke-smoke.mq.md", "proxy-table-ok @@ -2074,12 +2004,7 @@ invoke-method-ok", #[test] fn ext_web_hosting_live() { // Mock upstream SSE on 18142 + Marqdo web proxy/invoke on 18141. - let status = Command::new("cargo") - .args(["build", "-p", "marqdo_plugin_web"]) - .current_dir(env!("CARGO_MANIFEST_DIR")) - .status() - .expect("build web plugin"); - assert!(status.success(), "failed to build marqdo_plugin_web"); + ensure_web_plugin_built(); use std::io::{Read, Write}; use std::net::TcpListener; @@ -2194,12 +2119,7 @@ fn ext_web_hosting_live() { #[test] fn ext_web_db_cross_module_smoke() { - let status = Command::new("cargo") - .args(["build", "-p", "marqdo_plugin_web"]) - .current_dir(env!("CARGO_MANIFEST_DIR")) - .status() - .expect("build web plugin"); - assert!(status.success(), "failed to build marqdo_plugin_web"); + ensure_web_plugin_built(); assert_out("tests/ext/web-db-cross-module-smoke.mq.md", "cross-db-ok"); } @@ -2220,12 +2140,7 @@ mcp-fn-ok", #[test] fn ext_web_security_smoke() { - let status = Command::new("cargo") - .args(["build", "-p", "marqdo_plugin_web"]) - .current_dir(env!("CARGO_MANIFEST_DIR")) - .status() - .expect("build web plugin"); - assert!(status.success(), "failed to build marqdo_plugin_web"); + ensure_web_plugin_built(); assert_out( "tests/ext/web-security-smoke.mq.md", "hash-ok @@ -2236,12 +2151,7 @@ auth-bad-reject-ok", #[test] fn ext_web_content_smoke() { - let status = Command::new("cargo") - .args(["build", "-p", "marqdo_plugin_web"]) - .current_dir(env!("CARGO_MANIFEST_DIR")) - .status() - .expect("build web plugin"); - assert!(status.success(), "failed to build marqdo_plugin_web"); + ensure_web_plugin_built(); assert_out( "tests/ext/web-content-smoke.mq.md", "meta-ok @@ -2253,12 +2163,7 @@ rss-ok", #[test] fn ext_web_drivers_smoke() { // W4 drivers: memory cache, file storage, postgres/s3 URL shape (offline). - let status = Command::new("cargo") - .args(["build", "-p", "marqdo_plugin_web"]) - .current_dir(env!("CARGO_MANIFEST_DIR")) - .status() - .expect("build web plugin"); - assert!(status.success(), "failed to build marqdo_plugin_web"); + ensure_web_plugin_built(); let root = std::path::PathBuf::from(env!("CARGO_MANIFEST_DIR")) .join("tests/ext/web-fixtures/data/drivers-blobs"); @@ -2277,12 +2182,7 @@ s3-open-ok", #[test] fn ext_web_upload_smoke() { - let status = Command::new("cargo") - .args(["build", "-p", "marqdo_plugin_web"]) - .current_dir(env!("CARGO_MANIFEST_DIR")) - .status() - .expect("build web plugin"); - assert!(status.success(), "failed to build marqdo_plugin_web"); + ensure_web_plugin_built(); let root = std::path::PathBuf::from(env!("CARGO_MANIFEST_DIR")) .join("tests/ext/web-fixtures/data/upload-blobs"); @@ -2301,12 +2201,7 @@ form-file-ok", #[test] fn ext_web_upload_live() { - let status = Command::new("cargo") - .args(["build", "-p", "marqdo_plugin_web"]) - .current_dir(env!("CARGO_MANIFEST_DIR")) - .status() - .expect("build web plugin"); - assert!(status.success(), "failed to build marqdo_plugin_web"); + ensure_web_plugin_built(); let root = std::path::PathBuf::from(env!("CARGO_MANIFEST_DIR")) .join("tests/ext/web-fixtures/data/upload-live-blobs"); @@ -2450,12 +2345,7 @@ fn ext_web_upload_live() { #[test] fn ext_web_db_w6_smoke() { // W6: versioned migrate, FTS5 search, published filter + comments table. - let status = Command::new("cargo") - .args(["build", "-p", "marqdo_plugin_web"]) - .current_dir(env!("CARGO_MANIFEST_DIR")) - .status() - .expect("build web plugin"); - assert!(status.success(), "failed to build marqdo_plugin_web"); + ensure_web_plugin_built(); let db = std::path::PathBuf::from(env!("CARGO_MANIFEST_DIR")) .join("tests/ext/web-fixtures/data/w6-smoke.db"); @@ -2475,12 +2365,7 @@ fts-row-ok", #[test] fn ext_web_ws_broadcast_smoke() { - let status = Command::new("cargo") - .args(["build", "-p", "marqdo_plugin_web"]) - .current_dir(env!("CARGO_MANIFEST_DIR")) - .status() - .expect("build web plugin"); - assert!(status.success(), "failed to build marqdo_plugin_web"); + ensure_web_plugin_built(); assert_out( "tests/ext/web-ws-broadcast-smoke.mq.md", "ws-broadcast-route-ok @@ -2490,12 +2375,7 @@ access-log-ok", #[test] fn ext_web_w7_finish_smoke() { - let status = Command::new("cargo") - .args(["build", "-p", "marqdo_plugin_web"]) - .current_dir(env!("CARGO_MANIFEST_DIR")) - .status() - .expect("build web plugin"); - assert!(status.success(), "failed to build marqdo_plugin_web"); + ensure_web_plugin_built(); assert_out( "tests/ext/web-w7-finish-smoke.mq.md", "unique-ok @@ -2509,12 +2389,7 @@ error-page-ok", #[test] fn ext_web_w7_live() { - let status = Command::new("cargo") - .args(["build", "-p", "marqdo_plugin_web"]) - .current_dir(env!("CARGO_MANIFEST_DIR")) - .status() - .expect("build web plugin"); - assert!(status.success(), "failed to build marqdo_plugin_web"); + ensure_web_plugin_built(); let script = "tests/ext/web-w7-live-server.mq.md"; let bin = env!("CARGO_BIN_EXE_marqdo"); @@ -2625,12 +2500,7 @@ fn ext_web_w7_live() { #[test] fn ext_web_p3_smoke() { - let status = Command::new("cargo") - .args(["build", "-p", "marqdo_plugin_web"]) - .current_dir(env!("CARGO_MANIFEST_DIR")) - .status() - .expect("build web plugin"); - assert!(status.success(), "failed to build marqdo_plugin_web"); + ensure_web_plugin_built(); assert_out( "tests/ext/web-p3-smoke.mq.md", "audit-insert-ok @@ -2644,12 +2514,7 @@ gallery-ok", #[test] fn ext_web_p3_live() { - let status = Command::new("cargo") - .args(["build", "-p", "marqdo_plugin_web"]) - .current_dir(env!("CARGO_MANIFEST_DIR")) - .status() - .expect("build web plugin"); - assert!(status.success(), "failed to build marqdo_plugin_web"); + ensure_web_plugin_built(); let script = "tests/ext/web-p3-live-server.mq.md"; let bin = env!("CARGO_BIN_EXE_marqdo"); @@ -2743,12 +2608,7 @@ fn ext_web_ws_broadcast_live() { use futures_util::{SinkExt, StreamExt}; use tokio_tungstenite::tungstenite::Message; - let status = Command::new("cargo") - .args(["build", "-p", "marqdo_plugin_web"]) - .current_dir(env!("CARGO_MANIFEST_DIR")) - .status() - .expect("build web plugin"); - assert!(status.success(), "failed to build marqdo_plugin_web"); + ensure_web_plugin_built(); let script = "tests/ext/web-ws-broadcast-live-server.mq.md"; let bin = env!("CARGO_BIN_EXE_marqdo"); @@ -2847,12 +2707,7 @@ fn ext_web_ws_broadcast_live() { fn ext_web_db_w2_smoke() { // W2 data layer: transactions, connection pooling, pagination, query // expressiveness (IN/BETWEEN/OR), and row counting. - let status = Command::new("cargo") - .args(["build", "-p", "marqdo_plugin_web"]) - .current_dir(env!("CARGO_MANIFEST_DIR")) - .status() - .expect("build web plugin"); - assert!(status.success(), "failed to build marqdo_plugin_web"); + ensure_web_plugin_built(); let db = std::path::PathBuf::from(env!("CARGO_MANIFEST_DIR")) .join("tests/ext/web-fixtures/data/w2-smoke.db");