diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 05aafb1..0000000 --- a/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -* -!.gitignore -!/api/ -!/cli/ -!Cargo.toml -!/*/src/ -!/*/src/**/ -!/*/src/**/*.rs diff --git a/Cargo.lock b/Cargo.lock deleted file mode 100644 index 9ea0a82..0000000 --- a/Cargo.lock +++ /dev/null @@ -1,2004 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 4 - -[[package]] -name = "aho-corasick" -version = "1.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddd31a130427c27518df266943a5308ed92d4b226cc639f5a8f1002816174301" -dependencies = [ - "memchr", -] - -[[package]] -name = "android_system_properties" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" -dependencies = [ - "libc", -] - -[[package]] -name = "anstream" -version = "0.6.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43d5b281e737544384e969a5ccad3f1cdd24b48086a0fc1b2a5262a26b8f4f4a" -dependencies = [ - "anstyle", - "anstyle-parse", - "anstyle-query", - "anstyle-wincon", - "colorchoice", - "is_terminal_polyfill", - "utf8parse", -] - -[[package]] -name = "anstyle" -version = "1.0.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5192cca8006f1fd4f7237516f40fa183bb07f8fbdfedaa0036de5ea9b0b45e78" - -[[package]] -name = "anstyle-parse" -version = "0.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e7644824f0aa2c7b9384579234ef10eb7efb6a0deb83f9630a49594dd9c15c2" -dependencies = [ - "utf8parse", -] - -[[package]] -name = "anstyle-query" -version = "1.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40c48f72fd53cd289104fc64099abca73db4166ad86ea0b4341abe65af83dadc" -dependencies = [ - "windows-sys 0.61.2", -] - -[[package]] -name = "anstyle-wincon" -version = "3.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291e6a250ff86cd4a820112fb8898808a366d8f9f58ce16d1f538353ad55747d" -dependencies = [ - "anstyle", - "once_cell_polyfill", - "windows-sys 0.61.2", -] - -[[package]] -name = "anyhow" -version = "1.0.102" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f202df86484c868dbad7eaa557ef785d5c66295e41b460ef922eca0723b842c" - -[[package]] -name = "autocfg" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8" - -[[package]] -name = "base64" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" - -[[package]] -name = "bitflags" -version = "2.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "843867be96c8daad0d758b57df9392b6d8d271134fce549de6ce169ff98a92af" - -[[package]] -name = "bon" -version = "3.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d13a61f2963b88eef9c1be03df65d42f6996dfeac1054870d950fcf66686f83" -dependencies = [ - "bon-macros", - "rustversion", -] - -[[package]] -name = "bon-macros" -version = "3.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d314cc62af2b6b0c65780555abb4d02a03dd3b799cd42419044f0c38d99738c0" -dependencies = [ - "darling", - "ident_case", - "prettyplease", - "proc-macro2", - "quote", - "rustversion", - "syn", -] - -[[package]] -name = "bumpalo" -version = "3.20.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d20789868f4b01b2f2caec9f5c4e0213b41e3e5702a50157d699ae31ced2fcb" - -[[package]] -name = "bytes" -version = "1.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e748733b7cbc798e1434b6ac524f0c1ff2ab456fe201501e6497c8417a4fc33" - -[[package]] -name = "cc" -version = "1.2.56" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aebf35691d1bfb0ac386a69bac2fde4dd276fb618cf8bf4f5318fe285e821bb2" -dependencies = [ - "find-msvc-tools", - "shlex", -] - -[[package]] -name = "cfg-if" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801" - -[[package]] -name = "chacha20" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f8d983286843e49675a4b7a2d174efe136dc93a18d69130dd18198a6c167601" -dependencies = [ - "cfg-if", - "cpufeatures", - "rand_core", -] - -[[package]] -name = "chrono" -version = "0.4.44" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c673075a2e0e5f4a1dde27ce9dee1ea4558c7ffe648f576438a20ca1d2acc4b0" -dependencies = [ - "iana-time-zone", - "js-sys", - "num-traits", - "serde", - "wasm-bindgen", - "windows-link", -] - -[[package]] -name = "clap" -version = "4.5.60" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2797f34da339ce31042b27d23607e051786132987f595b02ba4f6a6dffb7030a" -dependencies = [ - "clap_builder", - "clap_derive", -] - -[[package]] -name = "clap_builder" -version = "4.5.60" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24a241312cea5059b13574bb9b3861cabf758b879c15190b37b6d6fd63ab6876" -dependencies = [ - "anstream", - "anstyle", - "clap_lex", - "strsim", -] - -[[package]] -name = "clap_derive" -version = "4.5.55" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a92793da1a46a5f2a02a6f4c46c6496b28c43638adea8306fcb0caa1634f24e5" -dependencies = [ - "heck", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "clap_lex" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a822ea5bc7590f9d40f1ba12c0dc3c2760f3482c6984db1573ad11031420831" - -[[package]] -name = "colorchoice" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b05b61dc5112cbb17e4b6cd61790d9845d13888356391624cbe7e41efeac1e75" - -[[package]] -name = "core-foundation" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2a6cd9ae233e7f62ba4e9353e81a88df7fc8a5987b8d445b4d90c879bd156f6" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "core-foundation-sys" -version = "0.8.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" - -[[package]] -name = "cpufeatures" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b2a41393f66f16b0823bb79094d54ac5fbd34ab292ddafb9a0456ac9f87d201" -dependencies = [ - "libc", -] - -[[package]] -name = "darling" -version = "0.23.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25ae13da2f202d56bd7f91c25fba009e7717a1e4a1cc98a76d844b65ae912e9d" -dependencies = [ - "darling_core", - "darling_macro", -] - -[[package]] -name = "darling_core" -version = "0.23.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9865a50f7c335f53564bb694ef660825eb8610e0a53d3e11bf1b0d3df31e03b0" -dependencies = [ - "ident_case", - "proc-macro2", - "quote", - "strsim", - "syn", -] - -[[package]] -name = "darling_macro" -version = "0.23.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3984ec7bd6cfa798e62b4a642426a5be0e68f9401cfc2a01e3fa9ea2fcdb8d" -dependencies = [ - "darling_core", - "quote", - "syn", -] - -[[package]] -name = "displaydoc" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "env_filter" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a1c3cc8e57274ec99de65301228b537f1e4eedc1b8e0f9411c6caac8ae7308f" -dependencies = [ - "log", - "regex", -] - -[[package]] -name = "env_logger" -version = "0.11.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2daee4ea451f429a58296525ddf28b45a3b64f1acf6587e2067437bb11e218d" -dependencies = [ - "anstream", - "anstyle", - "env_filter", - "jiff", - "log", -] - -[[package]] -name = "equivalent" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f" - -[[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 = "fastrand" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be" - -[[package]] -name = "find-msvc-tools" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5baebc0774151f905a1a2cc41989300b1e6fbb29aff0ceffa1064fdd3088d582" - -[[package]] -name = "fnv" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" - -[[package]] -name = "foldhash" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2" - -[[package]] -name = "foreign-types" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" -dependencies = [ - "foreign-types-shared", -] - -[[package]] -name = "foreign-types-shared" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" - -[[package]] -name = "form_urlencoded" -version = "1.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb4cb245038516f5f85277875cdaa4f7d2c9a0fa0468de06ed190163b1581fcf" -dependencies = [ - "percent-encoding", -] - -[[package]] -name = "futures" -version = "0.3.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b147ee9d1f6d097cef9ce628cd2ee62288d963e16fb287bd9286455b241382d" -dependencies = [ - "futures-channel", - "futures-core", - "futures-executor", - "futures-io", - "futures-sink", - "futures-task", - "futures-util", -] - -[[package]] -name = "futures-channel" -version = "0.3.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07bbe89c50d7a535e539b8c17bc0b49bdb77747034daa8087407d655f3f7cc1d" -dependencies = [ - "futures-core", - "futures-sink", -] - -[[package]] -name = "futures-core" -version = "0.3.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e3450815272ef58cec6d564423f6e755e25379b217b0bc688e295ba24df6b1d" - -[[package]] -name = "futures-executor" -version = "0.3.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf29c38818342a3b26b5b923639e7b1f4a61fc5e76102d4b1981c6dc7a7579d" -dependencies = [ - "futures-core", - "futures-task", - "futures-util", -] - -[[package]] -name = "futures-io" -version = "0.3.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cecba35d7ad927e23624b22ad55235f2239cfa44fd10428eecbeba6d6a717718" - -[[package]] -name = "futures-macro" -version = "0.3.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e835b70203e41293343137df5c0664546da5745f82ec9b84d40be8336958447b" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "futures-sink" -version = "0.3.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c39754e157331b013978ec91992bde1ac089843443c49cbc7f46150b0fad0893" - -[[package]] -name = "futures-task" -version = "0.3.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "037711b3d59c33004d3856fbdc83b99d4ff37a24768fa1be9ce3538a1cde4393" - -[[package]] -name = "futures-util" -version = "0.3.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "389ca41296e6190b48053de0321d02a77f32f8a5d2461dd38762c0593805c6d6" -dependencies = [ - "futures-channel", - "futures-core", - "futures-io", - "futures-macro", - "futures-sink", - "futures-task", - "memchr", - "pin-project-lite", - "slab", -] - -[[package]] -name = "getrandom" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "139ef39800118c7683f2fd3c98c1b23c09ae076556b435f8e9064ae108aaeeec" -dependencies = [ - "cfg-if", - "libc", - "r-efi", - "rand_core", - "wasip2", - "wasip3", -] - -[[package]] -name = "h2" -version = "0.3.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0beca50380b1fc32983fc1cb4587bfa4bb9e78fc259aad4a0032d2080309222d" -dependencies = [ - "bytes", - "fnv", - "futures-core", - "futures-sink", - "futures-util", - "http 0.2.12", - "indexmap", - "slab", - "tokio", - "tokio-util", - "tracing", -] - -[[package]] -name = "hashbrown" -version = "0.15.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1" -dependencies = [ - "foldhash", -] - -[[package]] -name = "hashbrown" -version = "0.16.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "841d1cc9bed7f9236f321df977030373f4a4163ae1a7dbfe1a51a2c1a51d9100" - -[[package]] -name = "heck" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" - -[[package]] -name = "http" -version = "0.2.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" -dependencies = [ - "bytes", - "fnv", - "itoa", -] - -[[package]] -name = "http" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3ba2a386d7f85a81f119ad7498ebe444d2e22c2af0b86b069416ace48b3311a" -dependencies = [ - "bytes", - "itoa", -] - -[[package]] -name = "http-body" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" -dependencies = [ - "bytes", - "http 0.2.12", - "pin-project-lite", -] - -[[package]] -name = "httparse" -version = "1.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6dbf3de79e51f3d586ab4cb9d5c3e2c14aa28ed23d180cf89b4df0454a69cc87" - -[[package]] -name = "httpdate" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" - -[[package]] -name = "hyper" -version = "0.14.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41dfc780fdec9373c01bae43289ea34c972e40ee3c9f6b3c8801a35f35586ce7" -dependencies = [ - "bytes", - "futures-channel", - "futures-core", - "futures-util", - "h2", - "http 0.2.12", - "http-body", - "httparse", - "httpdate", - "itoa", - "pin-project-lite", - "socket2 0.5.10", - "tokio", - "tower-service", - "tracing", - "want", -] - -[[package]] -name = "hyper-tls" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" -dependencies = [ - "bytes", - "hyper", - "native-tls", - "tokio", - "tokio-native-tls", -] - -[[package]] -name = "iana-time-zone" -version = "0.1.65" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e31bc9ad994ba00e440a8aa5c9ef0ec67d5cb5e5cb0cc7f8b744a35b389cc470" -dependencies = [ - "android_system_properties", - "core-foundation-sys", - "iana-time-zone-haiku", - "js-sys", - "log", - "wasm-bindgen", - "windows-core", -] - -[[package]] -name = "iana-time-zone-haiku" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" -dependencies = [ - "cc", -] - -[[package]] -name = "icu_collections" -version = "2.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c6b649701667bbe825c3b7e6388cb521c23d88644678e83c0c4d0a621a34b43" -dependencies = [ - "displaydoc", - "potential_utf", - "yoke", - "zerofrom", - "zerovec", -] - -[[package]] -name = "icu_locale_core" -version = "2.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edba7861004dd3714265b4db54a3c390e880ab658fec5f7db895fae2046b5bb6" -dependencies = [ - "displaydoc", - "litemap", - "tinystr", - "writeable", - "zerovec", -] - -[[package]] -name = "icu_normalizer" -version = "2.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f6c8828b67bf8908d82127b2054ea1b4427ff0230ee9141c54251934ab1b599" -dependencies = [ - "icu_collections", - "icu_normalizer_data", - "icu_properties", - "icu_provider", - "smallvec", - "zerovec", -] - -[[package]] -name = "icu_normalizer_data" -version = "2.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7aedcccd01fc5fe81e6b489c15b247b8b0690feb23304303a9e560f37efc560a" - -[[package]] -name = "icu_properties" -version = "2.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "020bfc02fe870ec3a66d93e677ccca0562506e5872c650f893269e08615d74ec" -dependencies = [ - "icu_collections", - "icu_locale_core", - "icu_properties_data", - "icu_provider", - "zerotrie", - "zerovec", -] - -[[package]] -name = "icu_properties_data" -version = "2.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "616c294cf8d725c6afcd8f55abc17c56464ef6211f9ed59cccffe534129c77af" - -[[package]] -name = "icu_provider" -version = "2.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85962cf0ce02e1e0a629cc34e7ca3e373ce20dda4c4d7294bbd0bf1fdb59e614" -dependencies = [ - "displaydoc", - "icu_locale_core", - "writeable", - "yoke", - "zerofrom", - "zerotrie", - "zerovec", -] - -[[package]] -name = "id-arena" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d3067d79b975e8844ca9eb072e16b31c3c1c36928edf9c6789548c524d0d954" - -[[package]] -name = "ident_case" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" - -[[package]] -name = "idna" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b0875f23caa03898994f6ddc501886a45c7d3d62d04d2d90788d47be1b1e4de" -dependencies = [ - "idna_adapter", - "smallvec", - "utf8_iter", -] - -[[package]] -name = "idna_adapter" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3acae9609540aa318d1bc588455225fb2085b9ed0c4f6bd0d9d5bcd86f1a0344" -dependencies = [ - "icu_normalizer", - "icu_properties", -] - -[[package]] -name = "indexmap" -version = "2.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7714e70437a7dc3ac8eb7e6f8df75fd8eb422675fc7678aff7364301092b1017" -dependencies = [ - "equivalent", - "hashbrown 0.16.1", - "serde", - "serde_core", -] - -[[package]] -name = "is_terminal_polyfill" -version = "1.70.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6cb138bb79a146c1bd460005623e142ef0181e3d0219cb493e02f7d08a35695" - -[[package]] -name = "itoa" -version = "1.0.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92ecc6618181def0457392ccd0ee51198e065e016d1d527a7ac1b6dc7c1f09d2" - -[[package]] -name = "jiff" -version = "0.2.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3e3d65f018c6ae946ab16e80944b97096ed73c35b221d1c478a6c81d8f57940" -dependencies = [ - "jiff-static", - "log", - "portable-atomic", - "portable-atomic-util", - "serde_core", -] - -[[package]] -name = "jiff-static" -version = "0.2.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a17c2b211d863c7fde02cbea8a3c1a439b98e109286554f2860bdded7ff83818" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "js-sys" -version = "0.3.90" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14dc6f6450b3f6d4ed5b16327f38fed626d375a886159ca555bd7822c0c3a5a6" -dependencies = [ - "once_cell", - "wasm-bindgen", -] - -[[package]] -name = "leb128fmt" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09edd9e8b54e49e587e4f6295a7d29c3ea94d469cb40ab8ca70b288248a81db2" - -[[package]] -name = "libc" -version = "0.2.182" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6800badb6cb2082ffd7b6a67e6125bb39f18782f793520caee8cb8846be06112" - -[[package]] -name = "linux-raw-sys" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32a66949e030da00e8c7d4434b251670a91556f4144941d37452769c25d58a53" - -[[package]] -name = "litemap" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6373607a59f0be73a39b6fe456b8192fcc3585f602af20751600e974dd455e77" - -[[package]] -name = "log" -version = "0.4.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897" - -[[package]] -name = "memchr" -version = "2.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8ca58f447f06ed17d5fc4043ce1b10dd205e060fb3ce5b979b8ed8e59ff3f79" - -[[package]] -name = "mio" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a69bcab0ad47271a0234d9422b131806bf3968021e5dc9328caf2d4cd58557fc" -dependencies = [ - "libc", - "wasi", - "windows-sys 0.61.2", -] - -[[package]] -name = "native-tls" -version = "0.2.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "465500e14ea162429d264d44189adc38b199b62b1c21eea9f69e4b73cb03bbf2" -dependencies = [ - "libc", - "log", - "openssl", - "openssl-probe", - "openssl-sys", - "schannel", - "security-framework", - "security-framework-sys", - "tempfile", -] - -[[package]] -name = "num-traits" -version = "0.2.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" -dependencies = [ - "autocfg", -] - -[[package]] -name = "once_cell" -version = "1.21.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d" - -[[package]] -name = "once_cell_polyfill" -version = "1.70.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "384b8ab6d37215f3c5301a95a4accb5d64aa607f1fcb26a11b5303878451b4fe" - -[[package]] -name = "openssl" -version = "0.10.75" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08838db121398ad17ab8531ce9de97b244589089e290a384c900cb9ff7434328" -dependencies = [ - "bitflags", - "cfg-if", - "foreign-types", - "libc", - "once_cell", - "openssl-macros", - "openssl-sys", -] - -[[package]] -name = "openssl-macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "openssl-probe" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c87def4c32ab89d880effc9e097653c8da5d6ef28e6b539d313baaacfbafcbe" - -[[package]] -name = "openssl-sys" -version = "0.9.111" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82cab2d520aa75e3c58898289429321eb788c3106963d0dc886ec7a5f4adc321" -dependencies = [ - "cc", - "libc", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "percent-encoding" -version = "2.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220" - -[[package]] -name = "pin-project-lite" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b" - -[[package]] -name = "pkg-config" -version = "0.3.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c" - -[[package]] -name = "portable-atomic" -version = "1.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c33a9471896f1c69cecef8d20cbe2f7accd12527ce60845ff44c153bb2a21b49" - -[[package]] -name = "portable-atomic-util" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a9db96d7fa8782dd8c15ce32ffe8680bbd1e978a43bf51a34d39483540495f5" -dependencies = [ - "portable-atomic", -] - -[[package]] -name = "potential_utf" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b73949432f5e2a09657003c25bca5e19a0e9c84f8058ca374f49e0ebe605af77" -dependencies = [ - "zerovec", -] - -[[package]] -name = "prettyplease" -version = "0.2.37" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "479ca8adacdd7ce8f1fb39ce9ecccbfe93a3f1344b3d0d97f20bc0196208f62b" -dependencies = [ - "proc-macro2", - "syn", -] - -[[package]] -name = "proc-macro2" -version = "1.0.106" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fd00f0bb2e90d81d1044c2b32617f68fcb9fa3bb7640c23e9c748e53fb30934" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "quote" -version = "1.0.44" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21b2ebcf727b7760c461f091f9f0f539b77b8e87f2fd88131e7f1b433b3cece4" -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 = "rand" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc266eb313df6c5c09c1c7b1fbe2510961e5bcd3add930c1e31f7ed9da0feff8" -dependencies = [ - "chacha20", - "getrandom", - "rand_core", -] - -[[package]] -name = "rand_core" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c8d0fd677905edcbeedbf2edb6494d676f0e98d54d5cf9bda0b061cb8fb8aba" - -[[package]] -name = "regex" -version = "1.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e10754a14b9137dd7b1e3e5b0493cc9171fdd105e0ab477f51b72e7f3ac0e276" -dependencies = [ - "aho-corasick", - "memchr", - "regex-automata", - "regex-syntax", -] - -[[package]] -name = "regex-automata" -version = "0.4.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e1dd4122fc1595e8162618945476892eefca7b88c52820e74af6262213cae8f" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax", -] - -[[package]] -name = "regex-syntax" -version = "0.8.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc897dd8d9e8bd1ed8cdad82b5966c3e0ecae09fb1907d58efaa013543185d0a" - -[[package]] -name = "restson" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4e434e0167dbe869e2da4836921fcfbba4a3537716e110ea478350b25434c18" -dependencies = [ - "base64", - "futures", - "hyper", - "hyper-tls", - "log", - "serde", - "serde_json", - "tokio", - "url", -] - -[[package]] -name = "rpassword" -version = "7.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66d4c8b64f049c6721ec8ccec37ddfc3d641c4a7fca57e8f2a89de509c73df39" -dependencies = [ - "libc", - "rtoolbox", - "windows-sys 0.59.0", -] - -[[package]] -name = "rtoolbox" -version = "0.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7cc970b249fbe527d6e02e0a227762c9108b2f49d81094fe357ffc6d14d7f6f" -dependencies = [ - "libc", - "windows-sys 0.52.0", -] - -[[package]] -name = "rustix" -version = "1.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6fe4565b9518b83ef4f91bb47ce29620ca828bd32cb7e408f0062e9930ba190" -dependencies = [ - "bitflags", - "errno", - "libc", - "linux-raw-sys", - "windows-sys 0.61.2", -] - -[[package]] -name = "rustversion" -version = "1.0.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d" - -[[package]] -name = "ryu" -version = "1.0.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9774ba4a74de5f7b1c1451ed6cd5285a32eddb5cccb8cc655a4e50009e06477f" - -[[package]] -name = "schannel" -version = "0.1.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "891d81b926048e76efe18581bf793546b4c0eaf8448d72be8de2bbee5fd166e1" -dependencies = [ - "windows-sys 0.61.2", -] - -[[package]] -name = "security-framework" -version = "3.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7f4bc775c73d9a02cde8bf7b2ec4c9d12743edf609006c7facc23998404cd1d" -dependencies = [ - "bitflags", - "core-foundation", - "core-foundation-sys", - "libc", - "security-framework-sys", -] - -[[package]] -name = "security-framework-sys" -version = "2.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ce2691df843ecc5d231c0b14ece2acc3efb62c0a398c7e1d875f3983ce020e3" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "semver" -version = "1.0.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d767eb0aabc880b29956c35734170f26ed551a859dbd361d140cdbeca61ab1e2" - -[[package]] -name = "serde" -version = "1.0.228" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e" -dependencies = [ - "serde_core", - "serde_derive", -] - -[[package]] -name = "serde_core" -version = "1.0.228" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde_derive" -version = "1.0.228" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "serde_json" -version = "1.0.149" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83fc039473c5595ace860d8c4fafa220ff474b3fc6bfdb4293327f1a37e94d86" -dependencies = [ - "itoa", - "memchr", - "serde", - "serde_core", - "zmij", -] - -[[package]] -name = "serde_qs" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac22439301a0b6f45a037681518e3169e8db1db76080e2e9600a08d1027df037" -dependencies = [ - "itoa", - "percent-encoding", - "ryu", - "serde", -] - -[[package]] -name = "shlex" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" - -[[package]] -name = "slab" -version = "0.4.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c790de23124f9ab44544d7ac05d60440adc586479ce501c1d6d7da3cd8c9cf5" - -[[package]] -name = "smallvec" -version = "1.15.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03" - -[[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.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86f4aa3ad99f2088c990dfa82d367e19cb29268ed67c574d10d0a4bfe71f07e0" -dependencies = [ - "libc", - "windows-sys 0.60.2", -] - -[[package]] -name = "spond-api" -version = "0.1.0" -dependencies = [ - "bon", - "chrono", - "restson", - "serde", - "serde_json", - "thiserror", -] - -[[package]] -name = "spond-choose" -version = "0.1.0" -dependencies = [ - "anyhow", - "bon", - "chrono", - "clap", - "env_logger", - "futures", - "http 1.4.0", - "log", - "rand", - "restson", - "rpassword", - "serde", - "serde_json", - "serde_qs", - "spond-api", - "thiserror", - "tokio", - "url", - "xdg", -] - -[[package]] -name = "spond-macros" -version = "0.1.0" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "stable_deref_trait" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ce2be8dc25455e1f91df71bfa12ad37d7af1092ae736f3a6cd0e37bc7810596" - -[[package]] -name = "strsim" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" - -[[package]] -name = "syn" -version = "2.0.117" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e665b8803e7b1d2a727f4023456bbbbe74da67099c585258af0ad9c5013b9b99" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "synstructure" -version = "0.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "tempfile" -version = "3.26.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82a72c767771b47409d2345987fda8628641887d5466101319899796367354a0" -dependencies = [ - "fastrand", - "getrandom", - "once_cell", - "rustix", - "windows-sys 0.61.2", -] - -[[package]] -name = "thiserror" -version = "2.0.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4288b5bcbc7920c07a1149a35cf9590a2aa808e0bc1eafaade0b80947865fbc4" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "2.0.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebc4ee7f67670e9b64d05fa4253e753e016c6c95ff35b89b7941d6b856dec1d5" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "tinystr" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42d3e9c45c09de15d06dd8acf5f4e0e399e85927b7f00711024eb7ae10fa4869" -dependencies = [ - "displaydoc", - "zerovec", -] - -[[package]] -name = "tokio" -version = "1.49.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72a2903cd7736441aac9df9d7688bd0ce48edccaadf181c3b90be801e81d3d86" -dependencies = [ - "bytes", - "libc", - "mio", - "pin-project-lite", - "socket2 0.6.2", - "tokio-macros", - "windows-sys 0.61.2", -] - -[[package]] -name = "tokio-macros" -version = "2.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af407857209536a95c8e56f8231ef2c2e2aff839b22e07a1ffcbc617e9db9fa5" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "tokio-native-tls" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2" -dependencies = [ - "native-tls", - "tokio", -] - -[[package]] -name = "tokio-util" -version = "0.7.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ae9cec805b01e8fc3fd2fe289f89149a9b66dd16786abd8b19cfa7b48cb0098" -dependencies = [ - "bytes", - "futures-core", - "futures-sink", - "pin-project-lite", - "tokio", -] - -[[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 = [ - "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 = "unicode-ident" -version = "1.0.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6e4313cd5fcd3dad5cafa179702e2b244f760991f45397d14d4ebf38247da75" - -[[package]] -name = "unicode-xid" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853" - -[[package]] -name = "url" -version = "2.5.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff67a8a4397373c3ef660812acab3268222035010ab8680ec4215f38ba3d0eed" -dependencies = [ - "form_urlencoded", - "idna", - "percent-encoding", - "serde", -] - -[[package]] -name = "utf8_iter" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" - -[[package]] -name = "utf8parse" -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 = "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 = "wasip2" -version = "1.0.2+wasi-0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9517f9239f02c069db75e65f174b3da828fe5f5b945c4dd26bd25d89c03ebcf5" -dependencies = [ - "wit-bindgen", -] - -[[package]] -name = "wasip3" -version = "0.4.0+wasi-0.3.0-rc-2026-01-06" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5428f8bf88ea5ddc08faddef2ac4a67e390b88186c703ce6dbd955e1c145aca5" -dependencies = [ - "wit-bindgen", -] - -[[package]] -name = "wasm-bindgen" -version = "0.2.113" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60722a937f594b7fde9adb894d7c092fc1bb6612897c46368d18e7a20208eff2" -dependencies = [ - "cfg-if", - "once_cell", - "rustversion", - "wasm-bindgen-macro", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-macro" -version = "0.2.113" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fac8c6395094b6b91c4af293f4c79371c163f9a6f56184d2c9a85f5a95f3950" -dependencies = [ - "quote", - "wasm-bindgen-macro-support", -] - -[[package]] -name = "wasm-bindgen-macro-support" -version = "0.2.113" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab3fabce6159dc20728033842636887e4877688ae94382766e00b180abac9d60" -dependencies = [ - "bumpalo", - "proc-macro2", - "quote", - "syn", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-shared" -version = "0.2.113" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de0e091bdb824da87dc01d967388880d017a0a9bc4f3bdc0d86ee9f9336e3bb5" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "wasm-encoder" -version = "0.244.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "990065f2fe63003fe337b932cfb5e3b80e0b4d0f5ff650e6985b1048f62c8319" -dependencies = [ - "leb128fmt", - "wasmparser", -] - -[[package]] -name = "wasm-metadata" -version = "0.244.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb0e353e6a2fbdc176932bbaab493762eb1255a7900fe0fea1a2f96c296cc909" -dependencies = [ - "anyhow", - "indexmap", - "wasm-encoder", - "wasmparser", -] - -[[package]] -name = "wasmparser" -version = "0.244.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47b807c72e1bac69382b3a6fb3dbe8ea4c0ed87ff5629b8685ae6b9a611028fe" -dependencies = [ - "bitflags", - "hashbrown 0.15.5", - "indexmap", - "semver", -] - -[[package]] -name = "windows-core" -version = "0.62.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8e83a14d34d0623b51dce9581199302a221863196a1dde71a7663a4c2be9deb" -dependencies = [ - "windows-implement", - "windows-interface", - "windows-link", - "windows-result", - "windows-strings", -] - -[[package]] -name = "windows-implement" -version = "0.60.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "053e2e040ab57b9dc951b72c264860db7eb3b0200ba345b4e4c3b14f67855ddf" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "windows-interface" -version = "0.59.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f316c4a2570ba26bbec722032c4099d8c8bc095efccdc15688708623367e358" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "windows-link" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5" - -[[package]] -name = "windows-result" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7781fa89eaf60850ac3d2da7af8e5242a5ea78d1a11c49bf2910bb5a73853eb5" -dependencies = [ - "windows-link", -] - -[[package]] -name = "windows-strings" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7837d08f69c77cf6b07689544538e017c1bfcf57e34b4c0ff58e6c2cd3b37091" -dependencies = [ - "windows-link", -] - -[[package]] -name = "windows-sys" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" -dependencies = [ - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-sys" -version = "0.59.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" -dependencies = [ - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-sys" -version = "0.60.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb" -dependencies = [ - "windows-targets 0.53.5", -] - -[[package]] -name = "windows-sys" -version = "0.61.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae137229bcbd6cdf0f7b80a31df61766145077ddf49416a728b02cb3921ff3fc" -dependencies = [ - "windows-link", -] - -[[package]] -name = "windows-targets" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" -dependencies = [ - "windows_aarch64_gnullvm 0.52.6", - "windows_aarch64_msvc 0.52.6", - "windows_i686_gnu 0.52.6", - "windows_i686_gnullvm 0.52.6", - "windows_i686_msvc 0.52.6", - "windows_x86_64_gnu 0.52.6", - "windows_x86_64_gnullvm 0.52.6", - "windows_x86_64_msvc 0.52.6", -] - -[[package]] -name = "windows-targets" -version = "0.53.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4945f9f551b88e0d65f3db0bc25c33b8acea4d9e41163edf90dcd0b19f9069f3" -dependencies = [ - "windows-link", - "windows_aarch64_gnullvm 0.53.1", - "windows_aarch64_msvc 0.53.1", - "windows_i686_gnu 0.53.1", - "windows_i686_gnullvm 0.53.1", - "windows_i686_msvc 0.53.1", - "windows_x86_64_gnu 0.53.1", - "windows_x86_64_gnullvm 0.53.1", - "windows_x86_64_msvc 0.53.1", -] - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.53.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9d8416fa8b42f5c947f8482c43e7d89e73a173cead56d044f6a56104a6d1b53" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.53.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9d782e804c2f632e395708e99a94275910eb9100b2114651e04744e9b125006" - -[[package]] -name = "windows_i686_gnu" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" - -[[package]] -name = "windows_i686_gnu" -version = "0.53.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "960e6da069d81e09becb0ca57a65220ddff016ff2d6af6a223cf372a506593a3" - -[[package]] -name = "windows_i686_gnullvm" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" - -[[package]] -name = "windows_i686_gnullvm" -version = "0.53.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa7359d10048f68ab8b09fa71c3daccfb0e9b559aed648a8f95469c27057180c" - -[[package]] -name = "windows_i686_msvc" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" - -[[package]] -name = "windows_i686_msvc" -version = "0.53.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e7ac75179f18232fe9c285163565a57ef8d3c89254a30685b57d83a38d326c2" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.53.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c3842cdd74a865a8066ab39c8a7a473c0778a3f29370b5fd6b4b9aa7df4a499" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.53.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ffa179e2d07eee8ad8f57493436566c7cc30ac536a3379fdf008f47f6bb7ae1" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.53.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650" - -[[package]] -name = "wit-bindgen" -version = "0.51.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7249219f66ced02969388cf2bb044a09756a083d0fab1e566056b04d9fbcaa5" -dependencies = [ - "wit-bindgen-rust-macro", -] - -[[package]] -name = "wit-bindgen-core" -version = "0.51.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea61de684c3ea68cb082b7a88508a8b27fcc8b797d738bfc99a82facf1d752dc" -dependencies = [ - "anyhow", - "heck", - "wit-parser", -] - -[[package]] -name = "wit-bindgen-rust" -version = "0.51.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7c566e0f4b284dd6561c786d9cb0142da491f46a9fbed79ea69cdad5db17f21" -dependencies = [ - "anyhow", - "heck", - "indexmap", - "prettyplease", - "syn", - "wasm-metadata", - "wit-bindgen-core", - "wit-component", -] - -[[package]] -name = "wit-bindgen-rust-macro" -version = "0.51.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c0f9bfd77e6a48eccf51359e3ae77140a7f50b1e2ebfe62422d8afdaffab17a" -dependencies = [ - "anyhow", - "prettyplease", - "proc-macro2", - "quote", - "syn", - "wit-bindgen-core", - "wit-bindgen-rust", -] - -[[package]] -name = "wit-component" -version = "0.244.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d66ea20e9553b30172b5e831994e35fbde2d165325bec84fc43dbf6f4eb9cb2" -dependencies = [ - "anyhow", - "bitflags", - "indexmap", - "log", - "serde", - "serde_derive", - "serde_json", - "wasm-encoder", - "wasm-metadata", - "wasmparser", - "wit-parser", -] - -[[package]] -name = "wit-parser" -version = "0.244.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecc8ac4bc1dc3381b7f59c34f00b67e18f910c2c0f50015669dde7def656a736" -dependencies = [ - "anyhow", - "id-arena", - "indexmap", - "log", - "semver", - "serde", - "serde_derive", - "serde_json", - "unicode-xid", - "wasmparser", -] - -[[package]] -name = "writeable" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9edde0db4769d2dc68579893f2306b26c6ecfbe0ef499b013d731b7b9247e0b9" - -[[package]] -name = "xdg" -version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fb433233f2df9344722454bc7e96465c9d03bff9d77c248f9e7523fe79585b5" - -[[package]] -name = "yoke" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72d6e5c6afb84d73944e5cedb052c4680d5657337201555f9f2a16b7406d4954" -dependencies = [ - "stable_deref_trait", - "yoke-derive", - "zerofrom", -] - -[[package]] -name = "yoke-derive" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b659052874eb698efe5b9e8cf382204678a0086ebf46982b79d6ca3182927e5d" -dependencies = [ - "proc-macro2", - "quote", - "syn", - "synstructure", -] - -[[package]] -name = "zerofrom" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50cc42e0333e05660c3587f3bf9d0478688e15d870fab3346451ce7f8c9fbea5" -dependencies = [ - "zerofrom-derive", -] - -[[package]] -name = "zerofrom-derive" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502" -dependencies = [ - "proc-macro2", - "quote", - "syn", - "synstructure", -] - -[[package]] -name = "zerotrie" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a59c17a5562d507e4b54960e8569ebee33bee890c70aa3fe7b97e85a9fd7851" -dependencies = [ - "displaydoc", - "yoke", - "zerofrom", -] - -[[package]] -name = "zerovec" -version = "0.11.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c28719294829477f525be0186d13efa9a3c602f7ec202ca9e353d310fb9a002" -dependencies = [ - "yoke", - "zerofrom", - "zerovec-derive", -] - -[[package]] -name = "zerovec-derive" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eadce39539ca5cb3985590102671f2567e659fca9666581ad3411d59207951f3" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "zmij" -version = "1.0.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8848ee67ecc8aedbaf3e4122217aff892639231befc6a1b58d29fff4c2cabaa" diff --git a/Cargo.toml b/Cargo.toml deleted file mode 100644 index 67a02f0..0000000 --- a/Cargo.toml +++ /dev/null @@ -1,4 +0,0 @@ -[workspace] -resolver = "3" -#members = ["api","cli","schema"] -members = ["api", "cli" , "macros"] diff --git a/api/Cargo.toml b/api/Cargo.toml deleted file mode 100644 index 83284c8..0000000 --- a/api/Cargo.toml +++ /dev/null @@ -1,12 +0,0 @@ -[package] -name = "spond-api" -version = "0.1.0" -edition = "2024" - -[dependencies] -bon = "3.9.0" -chrono = { version = "0.4.44", features = ["serde"] } -restson = "1.5.0" -serde = { version = "1.0.228", features = ["derive"] } -serde_json = "1.0.149" -thiserror = "2.0.18" diff --git a/api/src/authentication.rs b/api/src/authentication.rs deleted file mode 100644 index a8c4c6b..0000000 --- a/api/src/authentication.rs +++ /dev/null @@ -1,138 +0,0 @@ -use restson::{Error, Response, RestClient, RestPath}; -use serde::{Deserialize, Serialize}; - -#[derive(Debug, Copy, Clone, Serialize)] -struct Email<'a> { - email: &'a str, - password: &'a str, -} - -impl<'a> RestPath<()> for Email<'a> { - fn get_path(_: ()) -> Result { - Ok(String::from("auth2/login")) - } -} - -#[derive(Debug, Copy, Clone, Serialize)] -struct Phone<'a> { - phone: &'a str, - password: &'a str, -} - -impl<'a> RestPath<()> for Phone<'a> { - fn get_path(_: ()) -> Result { - Ok(String::from("auth2/login")) - } -} - -#[derive(Debug, Copy, Clone, Serialize)] -struct Token<'a> { - token: &'a str, -} - -impl<'a> RestPath<()> for Token<'a> { - fn get_path(_: ()) -> Result { - Ok(String::from("auth2/login/refresh")) - } -} - -pub mod token { - use crate::util::DateTime; - use serde::{Deserialize, Serialize}; - use std::ops::Deref; - - #[derive(Debug, Clone, Serialize, Deserialize)] - pub struct Token { - token: String, - } - - impl AsRef for Token { - fn as_ref(&self) -> &str { - &self.token - } - } - - #[derive(Debug, Deserialize, Serialize)] - pub struct WithExpiration { - #[serde(flatten)] - pub token: Token, - #[allow(unused)] - pub expiration: DateTime, - } - - #[derive(Debug, Deserialize)] - #[serde(transparent)] - pub struct Access(WithExpiration); - - impl Deref for Access { - type Target = WithExpiration; - - fn deref(&self) -> &WithExpiration { - &self.0 - } - } - - #[derive(Debug, Deserialize)] - #[serde(transparent)] - pub struct Refresh(WithExpiration); - - impl Deref for Refresh { - type Target = WithExpiration; - fn deref(&self) -> &WithExpiration { - &self.0 - } - } - - #[derive(Debug, Deserialize)] - #[serde(transparent)] - pub struct Password(WithExpiration); - - impl Deref for Password { - type Target = WithExpiration; - fn deref(&self) -> &WithExpiration { - &self.0 - } - } -} - -#[derive(Debug, Deserialize)] -pub struct Tokens { - #[serde(rename = "accessToken")] - pub access: token::Access, - #[serde(rename = "refreshToken")] - pub refresh: token::Refresh, - #[serde(rename = "passwordToken")] - pub password: token::Password, -} - -async fn authenticate(client: &RestClient, request: R) -> Result -where - R: RestPath<()>, - R: Serialize, -{ - let tokens: Response = client.post_capture((), &request).await?; - Ok(tokens.into_inner()) -} - -pub fn email<'a>( - client: &'a RestClient, - email: &'a str, - password: &'a str, -) -> impl Future> + 'a { - authenticate(client, Email { email, password }) -} - -pub fn phone<'a>( - client: &'a RestClient, - phone: &'a str, - password: &'a str, -) -> impl Future> + 'a { - authenticate(client, Phone { phone, password }) -} - -pub fn token<'a>( - client: &'a RestClient, - token: &'a str, -) -> impl Future> + 'a { - authenticate(client, Token { token }) -} diff --git a/api/src/group.rs b/api/src/group.rs deleted file mode 100644 index 22b014b..0000000 --- a/api/src/group.rs +++ /dev/null @@ -1,39 +0,0 @@ -use super::GroupId as Id; -use super::MemberId; -use restson::{Error, RestPath}; -use serde::Deserialize; - -#[derive(Debug, Deserialize)] -pub struct Group { - pub id: Id, - - #[serde(flatten)] - unknown: serde_json::Value, -} - -impl std::fmt::Display for Group { - fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - write!( - f, - "{}", - serde_json::to_string_pretty(&self.unknown).unwrap() - ) - } -} - -impl RestPath for Group { - fn get_path(id: Id) -> std::result::Result { - Ok(format!("groups/{id}")) - } -} - -#[derive(Debug, Deserialize)] -pub struct Member { - pub id: MemberId, - - #[serde(flatten)] - pub unknown: serde_json::Value, -} -impl super::util::id::Type for Member { - type Type = super::util::X128; -} diff --git a/api/src/lib.rs b/api/src/lib.rs deleted file mode 100644 index 2799b99..0000000 --- a/api/src/lib.rs +++ /dev/null @@ -1,120 +0,0 @@ -use std::collections::{ - HashMap as Map, - //HashSet as Set, -}; - -pub mod util; - -pub mod authentication; - -pub mod profile; -pub use profile::Profile; -pub type ProfileId = util::Id; - -pub mod spond; -pub use spond::Spond; -pub type SpondId = util::Id; - -pub mod series; -pub use series::Series; -pub type SeriesId = util::Id; - -pub mod group; -pub use group::Group; -pub type GroupId = util::Id; -pub type MemberId = util::Id; - -impl>> util::id::Type for T { - type Type = util::X128; -} - -//impl,)> + serde::de::DeserializeOwned + util::id::Type> -// util::Id -//{ -// pub async fn load(&self, client: &restson::RestClient) -> Result { -// Ok(client.get_with::<_, T>((*self,), &[]).await?.into_inner()) -// } -//} - -use serde::{Deserialize, Serialize}; - -#[derive(Default)] -struct Query<'a>(Vec<(&'a str, String)>); - -impl<'a> Query<'a> { - pub fn add(&mut self, key: &'a str, value: impl std::fmt::Display) { - self.0.push((key, value.to_string())); - } - - pub fn maybe_add(&mut self, key: &'a str, value: Option) { - if let Some(value) = value { - self.add(key, value); - } - } - - fn as_slice(&self) -> Vec<(&'a str, &str)> { - self.0.iter().map(|(k, v)| (*k, v.as_str())).collect() - } -} - -#[derive(Serialize)] -#[derive(Default)] -pub enum Order { - #[default] - Ascending, - Descending, -} - - -impl std::fmt::Display for Order { - fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - write!(f, "{}", self.as_ref()) - } -} - -impl AsRef for Order { - fn as_ref(&self) -> &str { - match self { - Self::Ascending => "asc", - Self::Descending => "desc", - } - } -} - -impl From for Order { - fn from(ascending: bool) -> Self { - if ascending { - Self::Ascending - } else { - Self::Descending - } - } -} - -#[derive(Debug, Deserialize)] -#[serde(rename_all = "camelCase")] -pub struct DeclineMessage { - pub message: String, - pub profile_id: MemberId, -} - -#[derive(Debug, Deserialize)] -#[serde(rename_all = "camelCase")] -pub struct Responses { - #[serde(default)] - pub accepted_ids: Vec, - #[serde(default)] - pub declined_ids: Vec, - #[serde(default)] - pub waitinglist_ids: Vec, - #[serde(default)] - pub unanswered_ids: Vec, - #[serde(default)] - pub unconfirmed_ids: Vec, - #[serde(default)] - pub participant_ids: Vec, - #[serde(default)] - pub decline_messages: Map, - #[serde(flatten)] - pub unknown: Map, -} diff --git a/api/src/profile.rs b/api/src/profile.rs deleted file mode 100644 index 7953ce9..0000000 --- a/api/src/profile.rs +++ /dev/null @@ -1,41 +0,0 @@ -use super::ProfileId as Id; -use restson::{Error, RestClient, RestPath}; -use serde::Deserialize; - -#[derive(Debug, Deserialize)] -pub struct Profile { - pub id: Id, - - #[serde(flatten)] - unknown: serde_json::Value, -} - -impl std::fmt::Display for Profile { - fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - write!( - f, - "{}", - serde_json::to_string_pretty(&self.unknown).unwrap() - ) - } -} - -impl RestPath for Profile { - fn get_path(id: Id) -> std::result::Result { - Ok(format!("profile/{id}")) - } -} - -impl RestPath<()> for Profile { - fn get_path(_: ()) -> std::result::Result { - Ok("profile".to_string()) - } -} - -pub async fn identity(client: &RestClient) -> Result { - Ok(client.get_with::<_, Profile>((), &[]).await?.into_inner()) -} - -pub async fn with_id(client: &RestClient, id: Id) -> Result { - Ok(client.get_with::<_, Profile>(id, &[]).await?.into_inner()) -} diff --git a/api/src/series.rs b/api/src/series.rs deleted file mode 100644 index da4c130..0000000 --- a/api/src/series.rs +++ /dev/null @@ -1,18 +0,0 @@ -use restson::{Error, RestPath}; -use serde::Deserialize; - -use super::SeriesId as Id; - -#[derive(Debug, Deserialize)] -pub struct Series { - pub id: Id, - - #[serde(flatten)] - pub unknown: serde_json::Value, -} - -impl RestPath for Series { - fn get_path(id: Id) -> std::result::Result { - Ok(format!("series/{id}")) - } -} diff --git a/api/src/spond.rs b/api/src/spond.rs deleted file mode 100644 index 61cb802..0000000 --- a/api/src/spond.rs +++ /dev/null @@ -1,228 +0,0 @@ -use super::{ - MemberId, Order, ProfileId, Query, Responses, SeriesId, SpondId as Id, - util::{DateTime, Timestamp, Visibility}, -}; -use restson::{Error, RestClient, RestPath}; -use serde::Deserialize; -use std::collections::HashMap; -use std::future::Future; - -#[derive(Debug, Deserialize)] -#[serde(rename_all = "camelCase")] -pub struct Group { - #[serde(flatten)] - pub unknown: HashMap, -} - -#[derive(Debug, Deserialize)] -#[serde(rename_all = "camelCase")] -pub struct Recipients { - pub group: HashMap, - pub guardians: std::vec::Vec, - pub profiles: std::vec::Vec, -} - -#[derive(Debug, Deserialize)] -#[serde(rename_all = "camelCase")] -pub struct Comment { - pub id: crate::util::Id, - pub children: std::vec::Vec, - pub from_profile_id: ProfileId, - pub reactions: HashMap>, - pub text: String, - pub timestamp: DateTime, -} - -impl crate::util::id::Type for Comment { - type Type = crate::util::X128; -} - -#[derive(Debug, Deserialize)] -#[serde(rename_all = "camelCase")] -pub struct Spond { - pub id: Id, - pub heading: String, - pub series_id: Option, - pub responses: Responses, - pub updated: Timestamp, - pub recipients: Recipients, - pub hidden: bool, - pub comments: Vec, - pub auto_accept: bool, - pub start_timestamp: DateTime, - pub end_timestamp: DateTime, - pub creator_id: ProfileId, - pub visibility: Visibility, - pub behalf_of_ids: Vec, - - #[serde(flatten)] - pub unknown: HashMap, -} - -#[bon::bon] -impl Spond { - #[builder] - pub fn response( - &self, - #[builder(start_fn)] member: MemberId, - #[builder(finish_fn)] client: &RestClient, - #[builder(default = true)] accepted: bool, - ) -> impl Future> { - response(self.id) - .member(member) - .accepted(accepted) - .call(client) - } - - #[builder] - pub fn accept( - &self, - #[builder(start_fn)] member: MemberId, - #[builder(finish_fn)] client: &RestClient, - ) -> impl Future> { - self.response(member).accepted(true).call(client) - } - - #[builder] - pub fn decline( - &self, - #[builder(start_fn)] member: MemberId, - #[builder(finish_fn)] client: &RestClient, - ) -> impl Future> { - self.response(member).accepted(false).call(client) - } -} - -impl std::fmt::Display for Spond { - fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - write!( - f, - "{}", - serde_json::to_string_pretty(&self.unknown).unwrap() - ) - } -} - -#[derive(Debug, serde::Deserialize)] -struct Sponds(Vec); - -impl RestPath<()> for Sponds { - fn get_path(_: ()) -> std::result::Result { - Ok(String::from("sponds")) - } -} - -impl RestPath for Spond { - fn get_path(id: Id) -> std::result::Result { - Ok(format!("sponds/{id}")) - } -} - -impl RestPath<()> for Spond { - fn get_path(_: ()) -> std::result::Result { - Ok("sponds".to_string()) - } -} - -#[bon::builder] -pub async fn spond( - #[builder(finish_fn)] client: &RestClient, - #[builder(finish_fn)] id: Id, - - // query flags - include_comments: Option, - add_profile_info: Option, -) -> Result { - let mut q = Query::default(); - q.maybe_add("includeComments", include_comments); - q.maybe_add("addProfileInfo", add_profile_info); - - Ok(client - .get_with::<_, Spond>(id, &q.as_slice()) - .await? - .into_inner()) -} - -#[bon::builder] -pub async fn search( - #[builder(finish_fn)] client: &RestClient, - - // query flags - include_comments: Option, - comments: Option, - hidden: Option, - add_profile_info: Option, - scheduled: Option, - #[builder(default, into)] order: Order, - #[builder(default = 20)] max: usize, - #[builder(into)] min_end_timestamp: Option, - #[builder(into)] max_end_timestamp: Option, - #[builder(into)] min_start_timestamp: Option, - #[builder(into)] max_start_timestamp: Option, - prev_id: Option, - series_id: Option, -) -> Result, Error> { - let mut q = Query::default(); - q.maybe_add("seriesId", series_id); - q.maybe_add("includeComments", include_comments); - q.maybe_add("comments", comments); - q.maybe_add("addProfileInfo", add_profile_info); - q.maybe_add("scheduled", scheduled); - q.maybe_add("hidden", hidden); - q.maybe_add("minEndTimestamp", min_end_timestamp); - q.maybe_add("maxEndTimestamp", max_end_timestamp); - q.maybe_add("minStartTimestamp", min_start_timestamp); - q.maybe_add("maxStartTimestamp", max_start_timestamp); - q.maybe_add("prevId", prev_id); - q.add("order", order); - q.add("max", max); - - Ok(client - .get_with::<_, Sponds>((), &q.as_slice()) - .await? - .into_inner() - .0) -} - -#[bon::builder] -pub fn decline( - #[builder(start_fn)] spond: Id, - #[builder(finish_fn)] client: &RestClient, - member: MemberId, -) -> impl std::future::Future> { - response(spond).member(member).accepted(false).call(client) -} - -#[bon::builder] -pub fn accept( - #[builder(start_fn)] spond: Id, - #[builder(finish_fn)] client: &RestClient, - member: MemberId, -) -> impl std::future::Future> { - response(spond).member(member).accepted(true).call(client) -} - -#[bon::builder] -pub async fn response( - #[builder(start_fn)] spond: Id, - #[builder(finish_fn)] client: &RestClient, - member: MemberId, - accepted: bool, -) -> Result { - #[derive(Debug, serde::Serialize)] - struct Request { - accepted: bool, - } - - impl RestPath<(Id, MemberId)> for Request { - fn get_path(args: (Id, MemberId)) -> std::result::Result { - let (spond, member) = args; - Ok(format!("sponds/{spond}/responses/{member}")) - } - } - - let request = Request { accepted }; - let response: restson::Response = - client.put_capture((spond, member), &request).await?; - Ok(response.into_inner()) -} diff --git a/api/src/user.rs b/api/src/user.rs deleted file mode 100644 index c41e186..0000000 --- a/api/src/user.rs +++ /dev/null @@ -1,41 +0,0 @@ -use serde::Deserialize; -use restson::{RestClient, RestPath, Error}; - -use super::{ - UserId as Id, -}; - -#[derive(Debug, Deserialize)] -pub struct User { - pub id: Id, - - #[serde(flatten)] - unknown: serde_json::Value, -} - -impl std::fmt::Display for User { - fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - write!(f, "{}", serde_json::to_string_pretty(&self.unknown).unwrap()) - } -} - -impl RestPath<()> for User { - fn get_path(_: ()) -> std::result::Result { - Ok(format!("user")) - } -} - -impl RestPath<(Id, )> for User { - fn get_path(args: (Id, )) -> std::result::Result { - let (id, ) = args; - Ok(format!("user/{id}")) - } -} - -pub async fn identity(client: &RestClient) -> Result { - Ok(client.get_with::<_, User>((), &[]).await?.into_inner()) -} - -pub async fn with_id(client: &RestClient, id: Id) -> Result { - Ok(client.get_with::<_, User>((id, ), &[]).await?.into_inner()) -} diff --git a/api/src/util/chrono/datetime.rs b/api/src/util/chrono/datetime.rs deleted file mode 100644 index 7c746d8..0000000 --- a/api/src/util/chrono/datetime.rs +++ /dev/null @@ -1,33 +0,0 @@ -use serde::{Deserialize, Serialize, Serializer}; - -#[derive(Debug, Copy, Clone, Deserialize)] -#[serde(transparent)] -pub struct DateTime(chrono::DateTime); - -impl Serialize for DateTime { - fn serialize(&self, serializer: S) -> Result { - serializer.serialize_str(&self.to_string()) - } -} - -impl Default for DateTime { - fn default() -> Self { - chrono::Utc::now().into() - } -} - -impl std::fmt::Display for DateTime { - fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - write!( - f, - "{}", - self.0.to_rfc3339_opts(chrono::SecondsFormat::Secs, true,) - ) - } -} - -impl From> for DateTime { - fn from(dt: chrono::DateTime) -> Self { - Self(dt) - } -} diff --git a/api/src/util/chrono/mod.rs b/api/src/util/chrono/mod.rs deleted file mode 100644 index 4bf8d6a..0000000 --- a/api/src/util/chrono/mod.rs +++ /dev/null @@ -1,5 +0,0 @@ -mod datetime; -pub use datetime::DateTime; - -mod timestamp; -pub use timestamp::Timestamp; diff --git a/api/src/util/chrono/timestamp.rs b/api/src/util/chrono/timestamp.rs deleted file mode 100644 index 6246c58..0000000 --- a/api/src/util/chrono/timestamp.rs +++ /dev/null @@ -1,51 +0,0 @@ -use chrono::TimeZone; -use serde::{Deserialize, Deserializer, Serialize, Serializer}; // for timestamp_millis_opt - -#[derive(Debug, Clone, Copy)] -pub struct Timestamp(chrono::DateTime); - -impl Serialize for Timestamp { - fn serialize(&self, serializer: S) -> Result - where - S: Serializer, - { - serializer.serialize_i64(self.0.timestamp_millis()) - } -} - -impl<'de> Deserialize<'de> for Timestamp { - fn deserialize(deserializer: D) -> Result - where - D: Deserializer<'de>, - { - let millis = i64::deserialize(deserializer)?; - let dt = chrono::Utc - .timestamp_millis_opt(millis) - .single() - .ok_or_else(|| serde::de::Error::custom("invalid timestamp"))?; - - Ok(Timestamp(dt)) - } -} - -impl Default for Timestamp { - fn default() -> Self { - chrono::Utc::now().into() - } -} - -impl std::fmt::Display for Timestamp { - fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - write!( - f, - "{}", - self.0.to_rfc3339_opts(chrono::SecondsFormat::Secs, true,) - ) - } -} - -impl>> From for Timestamp { - fn from(dt: I) -> Self { - Self(dt.into()) - } -} diff --git a/api/src/util/id.rs b/api/src/util/id.rs deleted file mode 100644 index 5524db4..0000000 --- a/api/src/util/id.rs +++ /dev/null @@ -1,114 +0,0 @@ -use serde::{Deserialize, Deserializer, Serialize, Serializer}; -use std::fmt; -use std::hash::{Hash, Hasher}; - -fn short_type_name(full: &str) -> &str { - let generic = full.find('<').unwrap_or(full.len()); - let last_colon = full[..generic].rfind("::").map_or(0, |idx| idx + 2); - - &full[last_colon..] -} - -pub trait Type: Sized { - type Type: fmt::Display + Copy; - - fn name() -> &'static str { - short_type_name(std::any::type_name::()) - } -} - -pub struct Id(T::Type); - -impl AsRef for Id { - fn as_ref(&self) -> &T::Type { - &self.0 - } -} - -impl Copy for Id {} - -impl Clone for Id { - fn clone(&self) -> Self { - *self - } -} - -impl Id { - pub fn new(src: T::Type) -> Self { - Self(src) - } - - pub async fn load( - &self, - client: &restson::RestClient, - ) -> Result - where - T: restson::RestPath>, - T: serde::de::DeserializeOwned, - { Ok(client.get_with::<_, T>(*self, &[]).await?.into_inner()) } -} - -impl fmt::Debug for Id -where - T::Type: fmt::Debug, -{ - fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { - write!(f, "ID<{}:{}>", T::name(), self.0) - } -} - -impl fmt::Display for Id { - fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { - write!(f, "{}", self.0) - } -} - -impl Serialize for Id -where - T: Type, - T::Type: Serialize, -{ - fn serialize(&self, serializer: S) -> Result { - self.0.serialize(serializer) - } -} - -impl<'de, T> Deserialize<'de> for Id -where - T: Type, - T::Type: Deserialize<'de>, -{ - fn deserialize(deserializer: D) -> Result - where - D: Deserializer<'de>, - { - Ok(Self(T::Type::deserialize(deserializer)?)) - } -} - -impl PartialEq for Id -where - T: Type, - T::Type: PartialEq, -{ - fn eq(&self, other: &Self) -> bool { - self.0 == other.0 - } -} - -impl Eq for Id -where - T: Type, - T::Type: Eq, -{ -} - -impl Hash for Id -where - T: Type, - T::Type: Hash, -{ - fn hash(&self, state: &mut H) { - self.0.hash(state) - } -} diff --git a/api/src/util/mod.rs b/api/src/util/mod.rs deleted file mode 100644 index 47f33d4..0000000 --- a/api/src/util/mod.rs +++ /dev/null @@ -1,11 +0,0 @@ -pub mod chrono; -pub use chrono::{DateTime, Timestamp}; - -pub mod x128; -pub use x128::X128; - -pub mod id; -pub use id::Id; - -pub mod visibility; -pub use visibility::Visibility; diff --git a/api/src/util/visibility.rs b/api/src/util/visibility.rs deleted file mode 100644 index f968528..0000000 --- a/api/src/util/visibility.rs +++ /dev/null @@ -1,36 +0,0 @@ -use serde::{Deserialize, Deserializer, Serialize, Serializer}; - -#[derive(Debug, Clone, PartialEq, Eq)] -pub enum Visibility { - Invitees, - Unknown(String), -} - -impl Serialize for Visibility { - fn serialize(&self, serializer: S) -> Result - where - S: Serializer, - { - let s = match self { - Visibility::Invitees => "INVITEES", - Visibility::Unknown(other) => other, - }; - - serializer.serialize_str(s) - } -} - -impl<'de> Deserialize<'de> for Visibility { - fn deserialize(deserializer: D) -> Result - where - D: Deserializer<'de>, - { - // Borrow when possible - let s = <&str>::deserialize(deserializer)?; - - Ok(match s { - "INVITEES" => Visibility::Invitees, - other => Visibility::Unknown(other.to_owned()), - }) - } -} diff --git a/api/src/util/x128.rs b/api/src/util/x128.rs deleted file mode 100644 index 2a0789d..0000000 --- a/api/src/util/x128.rs +++ /dev/null @@ -1,84 +0,0 @@ -use serde::{Deserialize, Deserializer, Serialize, Serializer}; -use std::fmt; -use std::ops::Deref; -use std::str::FromStr; - -/// Wrapper for u128 that serializes/deserializes as 32-charachter hex -#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash, Default)] -pub struct X128(u128); - -#[derive(Debug, thiserror::Error)] -pub enum Error { - #[error("invalid length: {0}")] - Length(usize), - - #[error("parser error: {0}")] - Parser(#[from] std::num::ParseIntError), -} - -impl X128 { - /// construct a new value - pub fn new(value: u128) -> Self { - Self(value) - } - - /// access the inner value explicitely - pub fn value(&self) -> u128 { - self.0 - } -} - -impl> From for X128 { - fn from(src: T) -> Self { - Self::new(src.into()) - } -} - -impl FromStr for X128 { - type Err = Error; - - fn from_str(s: &str) -> Result { - match s.len() { - 32 => u128::from_str_radix(s, 16) - .map(Self::new) - .map_err(Error::Parser), - len => Err(Error::Length(len)), - } - } -} - -//impl TryFrom<&str> for X128 { -// type Error = Error; -// -// fn try_from(s: &str) -> Result { -// Self::from_str(s) -// } -//} - -impl Deref for X128 { - type Target = u128; - - fn deref(&self) -> &u128 { - &self.0 - } -} - -impl fmt::Display for X128 { - fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { - write!(f, "{:032X}", self.0) - } -} - -impl Serialize for X128 { - fn serialize(&self, serializer: S) -> Result { - serializer.serialize_str(&self.to_string()) - } -} - -impl<'de> Deserialize<'de> for X128 { - fn deserialize>(deserializer: D) -> Result { - let s = String::deserialize(deserializer)?; - - Self::from_str(&s).map_err(serde::de::Error::custom) - } -} diff --git a/cli/Cargo.toml b/cli/Cargo.toml index 617acc8..f9349f9 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "tb-spond-rs" +name = "tb-rs" version = "0.1.0" edition = "2024" @@ -9,17 +9,10 @@ bon = "3.9.0" chrono = { version = "0.4.44", features = ["serde"] } clap = { version = "4.5.60", features = ["cargo", "derive", "env" ] } env_logger = "0.11.9" -futures = "0.3.32" http = "1.4.0" -log = "0.4.29" -rand = "0.10.0" restson = "1.5.0" rpassword = "7.4.0" serde = { version = "1.0.228", features = ["derive"] } serde_json = "1.0.149" -serde_qs = "1.0.0" -spond-api = { version = "0.1.0", path = "../api" } -thiserror = "2.0.18" tokio = { version = "1.49.0", features = ["macros", "rt-multi-thread"] } url = "2.5.8" -xdg = "3.0.0" diff --git a/cli/src/api/mod.rs b/cli/src/api/mod.rs new file mode 100644 index 0000000..34d9acb --- /dev/null +++ b/cli/src/api/mod.rs @@ -0,0 +1,88 @@ +//use bon::Builder; +//use chrono::{DateTime,Utc}; +//use restson::{RestClient, RestPath, Error}; +// +//pub enum Order { +// Ascending, +// Descending, +//} +// +//impl AsRef for Order { +// fn as_ref(&self) -> &str { +// match self { +// Self::Ascending => "asc", +// Self::Descending => "desc", +// } +// } +//} +// +//impl From for Order { +// fn from(ascending: bool) -> Self { +// if ascending { +// Self::Ascending +// } else { +// Self::Descending +// } +// } +//} +// +#[derive(serde::Deserialize)] +pub struct Spond { + id: String, + +} +// +//#[bon::builder] +//#[builder(on(bool, default=false))] +//fn sponds( +// comments: bool, +// hidden: bool, +// add_profile_info: bool, +// scheduled=bool, +// #[builder(into)] +// order=Order, +// #[builder(default = 20)] +// max=usize, +// min_end_timestamp=Option>, +// max_end_timestamp=Option>, +//) -> Get<(), Vec> { +// +//} +// +//struct Sponds(Query); +// +//async pub fn sponds( +// #[builder(finish_fn)] +// client: &restson::RestClient, E +// +// + +crate::get!(search( + comments: bool, + hidden: bool, + add_profile_info: bool, + scheduled: bool, + #[builder(into)] order: Order, + #[builder(default=20)]max: usize, + ), + min_end_timestamp: Option>, + max_end_timestamp: Option>, + () => "sponds" -> Vec); + +//impl Search { +// with_comments( +//#[bon::builder] +//#[builder(on(bool, default=false))] +//fn sponds( +// comments: bool, +// hidden: bool, +// add_profile_info: bool, +// scheduled=bool, +// #[builder(into)] +// order=Order, +// #[builder(default = 20)] +// max=usize, +// min_end_timestamp=Option>, +// max_end_timestamp=Option>, +//) -> Search { +//} diff --git a/cli/src/authentication.rs b/cli/src/authentication.rs index a8aef19..2f0c42b 100644 --- a/cli/src/authentication.rs +++ b/cli/src/authentication.rs @@ -1,7 +1,11 @@ -use anyhow::{Error, Result}; -use clap::{ArgGroup, Args}; -use restson::RestClient; -use std::str::FromStr; +use clap::{Args, ArgGroup}; +use restson::{RestClient, RestPath, Response}; +use anyhow::{Result, Error}; +use serde::{ + ser::{Serialize, Serializer, SerializeMap}, + Deserialize, +}; +use chrono::{DateTime, Utc}; #[derive(Args, Debug)] #[command(group( @@ -10,10 +14,10 @@ use std::str::FromStr; ))] pub struct Authentication { #[arg(long)] - access: Option, + access: Option, #[arg(long)] - refresh: Option, + refresh: Option, #[arg(long)] email: Option, @@ -22,119 +26,140 @@ pub struct Authentication { phone: Option, } -fn bearer(mut client: RestClient, token: &str) -> Result { - client.set_header("Authorization", &format!("Bearer {}", token))?; - Ok(client) -} - impl Authentication { - pub async fn apply(&self, client: RestClient) -> Result { - let client = match ( - self.access.as_ref(), - self.refresh.as_ref(), - self.email.as_ref(), - self.phone.as_ref(), - ) { + pub async fn apply(self, client: RestClient) -> Result { + let client = match (self.access, self.refresh, self.email, self.phone) { (Some(v), None, None, None) => v.apply(client)?, - (None, Some(v), None, None) => v.apply(client).await?, - (None, None, Some(v), None) => v.apply(client).await?, - (None, None, None, Some(v)) => v.apply(client).await?, + (None, Some(v), None, None) => Tokens::authenticate(client, v).await?, + (None, None, Some(v), None) => Tokens::authenticate(client, v).await?, + (None, None, None, Some(v)) => Tokens::authenticate(client, v).await?, (None, None, None, None) => client, - (a, b, c, d) => anyhow::bail!( - "invalid authentication: {} + {} + {} + {}", - a.is_some(), - b.is_some(), - c.is_some(), - d.is_some() - ), + (a, b, c, d) => anyhow::bail!("invalid authentication: {} + {} + {} + {}", a.is_some(), b.is_some(), c.is_some(), d.is_some()), }; Ok(client) } } +mod identifier { + #[derive(Debug, Clone)] + pub struct Email; + #[derive(Debug, Clone)] + pub struct Phone; +} + +trait Identifier: Clone { + const NAME: &'static str; + type Value: std::str::FromStr + std::fmt::Debug + Clone + serde::Serialize; + type Error: std::error::Error + Send + Sync + 'static; +} + +impl Identifier for identifier::Email { + const NAME: &'static str = "email"; + type Value = String; + type Error = ::Err; +} + +impl Identifier for identifier::Phone { + const NAME: &'static str = "phone"; + type Value = String; + type Error = ::Err; +} + #[derive(Debug, Clone)] -struct WithPassword { - value: String, +struct WithPassword { + value: I::Value, password: String, } -impl FromStr for WithPassword { - type Err = Error; + +impl Serialize for WithPassword { + fn serialize(&self, serializer: S) -> Result + { + let mut map = serializer.serialize_map(Some(2))?; + map.serialize_entry(I::NAME, &self.value)?; + map.serialize_entry("password", &self.password)?; + map.end() + } +} + +impl RestPath<()> for WithPassword { + fn get_path(_: ()) -> std::result::Result { + Ok(String::from("auth2/login")) + } +} + +type Email = WithPassword; +type Phone = WithPassword; + +impl std::str::FromStr for WithPassword { + type Err= Error; fn from_str(s: &str) -> Result { let password = match std::env::var("SPOND_PASSWORD") { Ok(password) => password, Err(_) => rpassword::prompt_password("Password: ")?, }; - let value = String::from_str(s)?; + let value = I::Value::from_str(s)?; Ok(Self { value, password }) } } -#[derive(Debug, Clone)] -struct Email(WithPassword); -impl Email { - async fn apply(&self, client: RestClient) -> Result { - let tokens = - spond_api::authentication::email(&client, &self.0.value, &self.0.password).await?; - bearer(client, tokens.access.token.as_ref()) +#[derive(Debug, Deserialize)] +struct Tokens { + #[serde(rename = "accessToken")] + access: TokenWithExpiration, + #[serde(rename = "refreshToken")] + refresh: TokenWithExpiration, +} + +impl Tokens { + async fn authenticate>(client: RestClient, request: R) -> Result { + let tokens: Response = client.post_capture((), &request).await?; + tokens.into_inner().apply(client) + } + + fn apply(self, client: RestClient) -> Result { + println!("refresh: {self:?}"); + self.access.token.apply(client) + } + +} + +#[derive(Debug, Deserialize)] +struct TokenWithExpiration { + token: Token, + #[allow(unused)] + expiration: DateTime +} + +#[derive(Debug, Clone, Deserialize)] +struct Token(String); + +impl Serialize for Token { + fn serialize(&self, serializer: S) -> Result + { + let mut map = serializer.serialize_map(Some(1))?; + map.serialize_entry("token", &self.0)?; + map.end() } } -impl FromStr for Email { - type Err = ::Err; + +impl Token { + fn apply(self, mut client: RestClient) -> Result { + client.set_header("Authorization", &format!("Bearer {}", self.0))?; + Ok(client) + } +} + +impl RestPath<()> for Token { + fn get_path(_: ()) -> std::result::Result { + Ok(String::from("auth2/login/refresh")) + } +} + +impl std::str::FromStr for Token { + type Err = std::convert::Infallible; fn from_str(s: &str) -> Result { - Ok(Self(WithPassword::from_str(s)?)) - } -} - -#[derive(Debug, Clone)] -struct Phone(WithPassword); -impl Phone { - async fn apply(&self, client: RestClient) -> Result { - let tokens = - spond_api::authentication::phone(&client, &self.0.value, &self.0.password).await?; - bearer(client, tokens.access.token.as_ref()) - } -} -impl FromStr for Phone { - type Err = ::Err; - - fn from_str(s: &str) -> Result { - Ok(Self(WithPassword::from_str(s)?)) - } -} - -#[derive(Debug, Clone)] -struct Access(String); - -impl Access { - fn apply(&self, client: RestClient) -> Result { - bearer(client, &self.0) - } -} - -impl FromStr for Access { - type Err = std::convert::Infallible; // parsing a String never fails - - fn from_str(s: &str) -> Result { - Ok(Access(s.to_string())) - } -} - -#[derive(Debug, Clone)] -struct Refresh(String); - -impl Refresh { - async fn apply(&self, client: RestClient) -> Result { - let tokens = spond_api::authentication::token(&client, &self.0).await?; - bearer(client, tokens.access.token.as_ref()) - } -} - -impl FromStr for Refresh { - type Err = std::convert::Infallible; // parsing a String never fails - - fn from_str(s: &str) -> Result { - Ok(Refresh(s.to_string())) + Ok(Self(s.to_string())) } } diff --git a/cli/src/history.rs b/cli/src/history.rs deleted file mode 100644 index 73e5888..0000000 --- a/cli/src/history.rs +++ /dev/null @@ -1,26 +0,0 @@ -use std::fd::{File, OpenOptions}; -use std::io::{BufReader, BufWriter, Read, Write}; -use xdg::BaseDirectories; - -pub struct History(File); - -impl History { - pub fn open(serie: spond_api::SeriesId) -> std::io::Result { - let xdg_dirs = BaseDirectories::with_prefix(env!("CARGO_PKG_NAME")); - let path = xdg_dirs.place_state_file(format!("{}.bin", serie))?; - - let file = OpenOptions::new() - .create(true) - .append(true) - .read(true) - .open(&path)?; - - Ok(Self(file)) - } - - pub fn append(&mut self, selected: usize, ids: I) -> io::Result<()> - where - I: IntoIterator, - I::Item: Into, - I::IntoIter: ExactSizeIterator, -} diff --git a/cli/src/main.rs b/cli/src/main.rs index 8fff792..452bc17 100644 --- a/cli/src/main.rs +++ b/cli/src/main.rs @@ -1,11 +1,12 @@ -use anyhow::Result; use clap::Parser; use restson::RestClient; -use spond_api as api; +use anyhow::Result; use url::Url; -use xdg::BaseDirectories as xdg; mod authentication; +mod api; + +mod request; #[derive(Parser, Debug)] #[command(author, version, about)] @@ -13,173 +14,27 @@ struct Cli { #[command(flatten)] authentication: authentication::Authentication, - #[arg(long, default_value_t)] - seed: Seed, - - #[arg(long)] - vip: Option>, - - #[arg(long)] - series: Option, - - #[arg(long)] - heading: Option, - #[arg(long, default_value = "https://api.spond.com/")] base: Url, } impl Cli { - pub async fn client(&self) -> Result { + pub async fn client(self) -> Result { let base = self.base.join("/core/v1/")?; let client = RestClient::new(base.as_str())?; - self.authentication.apply(client).await + Ok(self.authentication.apply(client).await?) } } -#[derive(Debug, Clone, Copy)] -struct Seed(u64); +#[derive(Debug, serde::Deserialize)] +struct Spond(serde_json::Value); -impl Default for Seed { - fn default() -> Self { - use rand::{RngExt, rng}; - Self(rng().random()) - } -} +#[derive(Debug, serde::Deserialize)] +struct Sponds(Vec); -impl std::str::FromStr for Seed { - type Err = ::Err; - - fn from_str(s: &str) -> std::result::Result { - u64::from_str_radix(s, 16).map(Seed) - } -} - -impl> From for Seed { - fn from(seed: T) -> Self { - Self(seed.into()) - } -} - -impl std::fmt::Display for Seed { - fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - write!(f, "{:016X}", self.0) - } -} - -impl Seed { - pub fn shuffle(&self, input: &[T], weight: F) -> Result> - where - F: Fn(T) -> W, - W: Into, - T: Copy, - { - use rand::{SeedableRng, rngs::StdRng}; - let len = input.len(); - - let sample = rand::seq::index::sample_weighted( - &mut StdRng::seed_from_u64(self.0), - len, - |idx| weight(input[idx]), - len, - )?; - - log::debug!("sample: {:?}", sample); - Ok(sample.into_iter().map(move |idx| input[idx]).collect()) - } -} - -#[derive(Debug)] -struct Weights(std::collections::HashMap); - -use std::hash::Hash; - -impl Default for Weights -where - Id: Eq + Hash + Copy, -{ - fn default() -> Self { - Self(std::collections::HashMap::default()) - } -} - -impl Weights -where - Id: Eq + Hash + Copy, -{ - fn path(serie: api::SeriesId) -> Result { - let dirs = xdg::with_prefix(env!("CARGO_PKG_NAME")); - Ok(dirs.place_state_file(format!("{serie}.json"))?) - } - - pub fn update(&mut self, keep: &[Id]) -> &mut Self { - // remove keys not in keep - self.0.retain(|key, _| keep.contains(key)); - - // adjust weights - for &key in keep { - let val = self.0.entry(key).or_insert(0); - *val = val.saturating_add(1); - } - - self - } - - pub fn weight(&self, index: impl Into) -> f64 { - let extra = self.0.get(&index.into()).copied().unwrap_or(0); - let sum = 1f64 + (extra as f64); - if sum.is_infinite() { f64::MAX } else { sum } - } -} - -impl Weights -where - Id: Eq + Hash + Copy + serde::de::DeserializeOwned, -{ - pub fn load(serie: api::SeriesId) -> Result { - let path = Self::path(serie)?; - log::debug!("load {path:?}"); - let file = std::fs::OpenOptions::new().read(true).open(path)?; - - let data: std::collections::HashMap = serde_json::from_reader(file)?; - Ok(Self(data)) - } -} - -impl Weights -where - Id: Eq + Hash + Copy + serde::Serialize, -{ - pub fn store(&self, serie: api::SeriesId) -> Result<()> { - use std::fs::{File, rename}; - use std::io::{BufWriter, Write}; - - let path = Self::path(serie)?; - log::debug!("store {path:?}"); - let tmp = path.with_extension("json.tmp"); - log::trace!("temporary: {tmp:?}"); - - // create temporary file - let file = File::create(&tmp)?; - let mut writer = BufWriter::new(file); - - // write data to temporary file - serde_json::to_writer_pretty(&mut writer, &self.0)?; - - // flush write buffer - writer.flush()?; - - // sync to disc - writer.get_ref().sync_all()?; - - // close file - drop(writer); - - // atomic replace old file - log::trace!("rename {tmp:?} -> {path:?}"); - rename(&tmp, &path)?; - - Ok(()) +impl restson::RestPath<()> for Sponds { + fn get_path(_: ()) -> std::result::Result { + Ok(String::from("sponds")) } } @@ -187,152 +42,20 @@ where async fn main() -> Result<()> { env_logger::init(); - let cli = Cli::parse(); - let seed = cli.seed; - let series = cli.series.map(api::SeriesId::new); - let heading = cli.heading.as_ref(); - let vip: Vec = if let Some(ref vip) = cli.vip { - vip.iter().map(|id| api::MemberId::new(*id)).collect() - } else { - [ - 0xEB07B45E45E6449386E70A7411816B6Fu128, - 0xD05F8574AC544C8DB1A7DC5B6347AA49u128, - ] - .map(|x| api::MemberId::new(x.into())) - .into() - }; - let client = cli.client().await?; - let client = &client; + let client = Cli::parse().client().await?; - log::info!("seed: {seed}"); - if let Some(series) = series { - log::info!("series: {series}"); - } - if let Some(heading) = heading { - log::info!("heading: {heading}"); - } + // https://api.spond.com/core/v1/sponds?includeComments=true&includeHidden=false&addProfileInfo=true&scheduled=true&order=asc&max=20&prevId=F94829E35A9B4A48A042646C8B658B01&minStartTimestamp=2026-04-11T09:45:00Z&minEndTimestamp=2026-02-26T23:00:00.001Z + let query = [ + ("includeComments", "true"), + ("includeHidden", "false"), + ("addProfileInfo", "true"), + ("scheduled", "true"), + ("order", "asc"), + ("max", "20"), + ]; - let now = chrono::Utc::now(); - let sponds = api::spond::search() - .include_comments(true) - .order(api::Order::Ascending) - .max(1000) - .min_start_timestamp(now) - .max_end_timestamp(now + chrono::Duration::weeks(1)) - .call(client) - .await?; - - for spond in sponds.iter().filter(|spond| { - let result = series - .is_none_or(|series| spond.series_id.is_some_and(|remote| remote == series)) - && heading.is_none_or(|heading| spond.heading == *heading); - log::trace!( - "{}: {:?} == {:?} => {:?}", - spond.heading, - spond.series_id, - series, - result - ); - result - }) { - log::debug!("{:?}", spond.responses); - - if spond.responses.waitinglist_ids.is_empty() { - log::info!("nobody on the waiting list"); - continue; - } - - let spond = &spond; - let decline = |id: &api::MemberId| { - log::info!("remove {0}", *id); - spond.decline(*id).call(client) - }; - let accept = |id: &api::MemberId| { - log::info!("accept {0}", *id); - spond.accept(*id).call(client) - }; - - let mut weights = spond - .series_id - .and_then(|series| Weights::load(series).ok()) - .unwrap_or_else(Weights::default); - log::info!("{weights:?}"); - - let (vip, interested) = { - let mut r = (Vec::new(), Vec::new()); - for id in spond - .responses - .accepted_ids - .iter() - .chain(spond.responses.waitinglist_ids.iter()) - { - (if vip.contains(id) { &mut r.0 } else { &mut r.1 }).push(*id); - } - (r.0, seed.shuffle(&r.1, |idx| weights.weight(idx))?) - }; - - // remove all registered participants - let results = futures::future::join_all(interested.iter().map(&decline)).await; - log::debug!("{results:?}"); - - // register them in order - let mut responses = None; - for id in interested.iter() { - responses = Some(accept(id).await?); - } - - if let Some(responses) = responses { - log::debug!("{responses:?}"); - - let reorder = |mut responses: api::Responses| async move { - // someone might have been registered right now - let mut extra = Vec::new(); - loop { - log::debug!("vip: {vip:?}"); - log::debug!("interested: {interested:?}"); - log::debug!("extra: {extra:?}"); - let reorder = responses - .accepted_ids - .iter() - .chain(responses.waitinglist_ids.iter()) - .filter(|id| { - !(vip.contains(*id) - || interested.contains(*id) - || extra.contains(*id)) - }) - .cloned() - .collect::>(); - if reorder.is_empty() { - let update = interested - .iter() - .filter(|id| responses.waitinglist_ids.contains(id)) - .cloned() - .collect::>(); - break Ok::, anyhow::Error>(update); - } - let futures = - futures::future::join_all(reorder.iter().map(&decline)).await; - log::debug!("{futures:?}"); - - for id in reorder.into_iter() { - responses = accept(&id).await?; - extra.push(id); - } - tokio::time::sleep(tokio::time::Duration::from_secs(5)).await; - } - }; - - let update = reorder(responses).await?; - weights.update(&update); - } else { - weights = Weights::default(); - }; - - log::debug!("{weights:?}"); - - if let Some(series) = spond.series_id { - weights.store(series)?; - } + for spond in client.get_with::<_, Sponds>((), &query).await?.into_inner().0 { + println!("{spond:?}"); } Ok(()) diff --git a/cli/src/request/get.rs b/cli/src/request/get.rs index 4817767..0c9ff3b 100644 --- a/cli/src/request/get.rs +++ b/cli/src/request/get.rs @@ -3,7 +3,7 @@ macro_rules! get { // Case 1: no query ( $name:ident, - ( $( $arg:ident : $arg_ty:ty ),* $(,)? ) => $path:literal -> $out:ty + ( $( $arg:ident : $arg_ty:ty ),* ) => $path:literal -> $out:ty $(,)? ) => { get!($name(), ( $( $arg : $arg_ty ),* ) => $path -> $out); }; @@ -11,7 +11,7 @@ macro_rules! get { // Case 2: empty query () ( $name:ident (), - ( $( $arg:ident : $arg_ty:ty ),* $(,)? ) => $path:literal -> $out:ty + ( $( $arg:ident : $arg_ty:ty ),* ) => $path:literal -> $out:ty $(,)? ) => { #[bon::builder] pub fn $name( @@ -35,30 +35,42 @@ macro_rules! get { } }; - // Case 3: query with optional attributes + // Case 3: query with flags / mixed types ( - $name:ident ( $( $(#[$attr:meta])* $query_ident:ident $(: $query_ty:ty )? ),* $(,)? ), - ( $( $arg:ident : $arg_ty:ty ),* $(,)? ) => $path:literal -> $out:ty + $name:ident ( $( $query:tt ),* $(,)? ), + ( $( $arg:ident : $arg_ty:ty ),* ) => $path:literal -> $out:ty $(,)? ) => { #[bon::builder] pub fn $name( #[builder(finish_fn)] client: &restson::RestClient, $( #[builder(finish_fn)] $arg: $arg_ty, )* $( - $(#[$attr])* $query_ident : $crate::get!( @query_type $( $query_ty )? ) , + get!(@query_field $query) )* ) -> impl std::future::Future> + '_ { - - // Build Vec<(String,String)> dynamically using serde_json::to_string - let query_pairs: Vec<(String, String)> = vec![ + #[derive(serde::Serialize)] + #[serde(rename_all = "camelCase")] + struct Query<'a> { $( - { - let val = serde_json::to_string(&$query_ident) - .expect("failed to serialize query param"); - (stringify!($query_ident).to_string(), val) - } - ),* - ]; + get!(@query_field_struct $query) + )* + } + + impl Query<'_> { + fn as_pairs(&self) -> Vec<(&str, String)> { + let mut out = Vec::new(); + $( + get!(@push_pair out, self, $query) + )* + out + } + } + + let query = Query { + $( + get!(@query_field_init $query) + )* + }; #[derive(serde::Deserialize)] struct RP($out); @@ -71,18 +83,28 @@ macro_rules! get { } async move { - // Convert Vec<(String,String)> to Vec<(&str,&str)> - let ref_pairs: Vec<(&str, &str)> = query_pairs - .iter() - .map(|(k, v)| (k.as_str(), v.as_str())) - .collect(); - - let result = client.get_with::<_, RP>(( $( $arg ),* ), &ref_pairs).await?; + let result = client.get_with::<_, RP>(( $( $arg ),* ), &query.as_pairs()).await?; Ok(result.into_inner().0) } } }; - ( @query_type ) => { Option }; - ( @query_type $ty:ty) => { $ty }; + // Query helpers + (@query_field $field:ident) => { $field: Option, }; + (@query_field $field:ident = $ty:ty) => { $field: $ty, }; + + (@query_field_struct $field:ident) => { $field: Option, }; + (@query_field_struct $field:ident = $ty:ty) => { $field: $ty, }; + + (@query_field_init $field:ident) => { $field, }; + (@query_field_init $field:ident = $ty:ty) => { $field, }; + + (@push_pair $vec:ident, $self:ident, $field:ident = $ty:ty) => { + $vec.push((stringify!($field), $self.$field.to_string())); + }; + (@push_pair $vec:ident, $self:ident, $field:ident) => { + if let Some(v) = &$self.$field { + $vec.push((stringify!($field), v.to_string())); + } + }; } diff --git a/flake.lock b/flake.lock deleted file mode 100644 index dc8a583..0000000 --- a/flake.lock +++ /dev/null @@ -1,25 +0,0 @@ -{ - "nodes": { - "nixpkgs": { - "locked": { - "lastModified": 1772615108, - "narHash": "sha256-lC0KbklwgeSqS+sTkaYpnSYr/HDeVMzYUZqV/dT31Lo=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "0c39f3b5a9a234421d4ad43ab9c7cf64840172d0", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, - "root": { - "inputs": { - "nixpkgs": "nixpkgs" - } - } - }, - "root": "root", - "version": 7 -} diff --git a/flake.nix b/flake.nix deleted file mode 100644 index 8c4379f..0000000 --- a/flake.nix +++ /dev/null @@ -1,105 +0,0 @@ -{ - outputs = { nixpkgs, ... }: let - spond = { rustPlatform, rustfmt, clippy, pkg-config, openssl, ... }: rustPlatform.buildRustPackage { - pname = "tb-spond-rs"; - version = "0.1.0"; - - src = ./.; - cargoLock.lockFile = ./Cargo.lock; - nativeBuildInputs = [ - pkg-config - ]; - propagatedBuildInputs = [ - openssl.dev - ]; - }; - - allpkgs = pkgs: pkgs.extend (_: _: nixpkgs.lib.attrsets.filterAttrs (name: _: name != "default") (packages' pkgs)); - - packages = system: packages'; - packages' = pkgs': let - pkgs = allpkgs pkgs'; - in { - default = pkgs.spond; - spond = pkgs.callPackage spond {}; - }; - - devShells = system: pkgs': let - pkgs = allpkgs pkgs'; - in builtins.mapAttrs (devShell pkgs) (packages pkgs'); - - devShell = pkgs: name: pkg: pkgs.mkShell { - buildInputs = with pkgs; [ - cargo - cargo-bloat - cargo-machete - cargo-workspaces - cargo-unused-features - cargo-udeps - cargo-audit - cargo-diet - cargo-duplicates - cargo-expand - cargo-flamegraph - clippy - lldb - gdb - - (python3.withPackages (py: [ py.pyyaml ])) - - rustc - rustfmt - openssl.dev - ] ++ pkg.buildInputs; - - nativeBuildInputs = pkg.nativeBuildInputs; - - shellHook = '' - printf 'Dev shell for %s ready!\n' '${pkg.name}' - ''; - }; - - nixosModule = { pkgs, lib, config, ... }: let - cli = lib.getExe (packages' pkgs).spond; - in { - config.systemd.timers."tb-spond-rs" = { - description = "[TB] choose who is allowed to participate this week."; - timerConfig.OnCalendar = "Sat 18:00:00"; - wantedBy = [ "timers.target" ]; - }; - config.systemd.services."tb-spond-rs" = { - description = "[TB] choose who is allowed to participate this week."; - after = [ "network.target" ]; - wants = [ "network.target" ]; - - serviceConfig = { - Type = "simple"; - ExecStart = lib.escapeShellArgs [ - cli - "--email" "jonas.rabenstein@web.de" - "--heading" "Schwimmtraining Donnerstag" - ]; - EnvironmentFile=[ "%d/environment" ]; - User = "tb-spond-rs"; - Group = "tb-spond-rs"; - DynamicUser = true; - RuntimeDirectory = "tb-spond-rs"; - StateDirectory = "tb-spond-rs"; - ProtectSystem = "full"; - ProtectHome = true; - NoNewPrivileges = true; - PrivateTmp = true; - PrivateDevices = true; - }; - }; - }; - in { - packages = builtins.mapAttrs packages nixpkgs.legacyPackages; - devShells = builtins.mapAttrs devShells nixpkgs.legacyPackages; - - nixosModules = { - default = nixosModule; - spond = nixosModule; - } - }; -} diff --git a/macros/src/lib.rs b/macros/src/lib.rs index d73b224..4b489f0 100644 --- a/macros/src/lib.rs +++ b/macros/src/lib.rs @@ -1,132 +1,109 @@ use proc_macro::TokenStream; -use quote::quote; -use syn::{parse_macro_input, ItemFn, LitStr}; +use quote::{quote, ToTokens}; +use syn::{ + parse_macro_input, Attribute, FnArg, ItemFn, Lit, Meta, Pat, PatType, Type, spanned::Spanned, +}; -use syn::{punctuated::Punctuated, token::Comma}; +/// Endpoint macro +#[proc_macro_attribute] +pub fn endpoint(attr: TokenStream, item: TokenStream) -> TokenStream { + // parse the endpoint attribute + let attr = proc_macro2::TokenStream::from(attr); + let func = parse_macro_input!(item as ItemFn); -#[derive(Copy, Clone, PartialEq)] -enum Class { - Query, - Path, - Body, -} + let vis = &func.vis; + let name = &func.sig.ident; + let inputs = &func.sig.inputs; + let output = &func.sig.output; -impl Class { - fn classify(pat_type: &syn::PatType, default: Self) -> Self { - let mut result = None; - for a in pat_type.attrs.iter() { - let class = if a.path().is_ident("path") { - Some(Self::Path) - } else if a.path().is_ident("query") { - Some(Self::Query) - } else if a.path().is_ident("body") { - Some(Self::Body) - } else { - None - }; - if class.is_some() { - if result.is_some() && result != class { - panic!("can only have one class!"); - } - result = class; + // must be async + if func.sig.asyncness.is_none() { + return syn::Error::new(name.span(), "endpoint function must be async") + .to_compile_error() + .into(); + } + + // defaults + let mut method = quote! { GET }; + let mut path = None; + + // parse #[endpoint(...)] + if !attr.is_empty() { + let attr_str = attr.to_string(); + // simple heuristic: if contains "POST", switch + if attr_str.contains("POST") { + method = quote! { POST }; + } + // simple heuristic: extract path in quotes + if let Some(start) = attr_str.find('"') { + if let Some(end) = attr_str[start+1..].find('"') { + path = Some(attr_str[start+1..start+1+end].to_string()); } } - - if let Some(result) = result { - result - } else { - default - } } -} -fn extract_args(inputs: &Punctuated, class: Class, default: Class) -> (Vec, Vec, Vec) { - let mut idents = Vec::new(); - let mut types = Vec::new(); - let mut attrs = Vec::new(); - for arg in inputs.iter().skip(1) { - if let syn::FnArg::Typed(pat_type) = arg { - //if pat_type.attrs.iter().any(|a| a.path().is_ident(path)) { - if Class::classify(pat_type, default) == class - && let syn::Pat::Ident(pat_ident) = &*pat_type.pat { - idents.push(pat_ident.ident.clone()); - types.push((*pat_type.ty).clone()); - let meta = pat_type.attrs.iter() - .filter(|a| !["path", "query", "body"].iter().any(|p| a.path().is_ident(p))); - let meta = quote! { - #( #meta )* - }; - attrs.push(meta); - } - } - } - (idents, types, attrs) -} - -fn generate_endpoint(attr: TokenStream, item: TokenStream, method: &str) -> TokenStream { - let item_fn = parse_macro_input!(item as ItemFn); - let path_lit = parse_macro_input!(attr as LitStr); - - let fn_name = &item_fn.sig.ident; - let vis = &item_fn.vis; - let generics = &item_fn.sig.generics; - - let default = Class::Body; - let (path_idents, path_types, path_attrs) = extract_args(&item_fn.sig.inputs, Class::Path, default); - let (query_idents, query_types, query_attrs) = extract_args(&item_fn.sig.inputs, Class::Query, default); - let (body_idents, body_types, body_attrs) = extract_args(&item_fn.sig.inputs, Class::Body, default); - - let ret_type = match &item_fn.sig.output { - syn::ReturnType::Default => quote! { () }, - syn::ReturnType::Type(_, ty) => quote! { #ty }, + let path = match path { + Some(p) => p, + None => return syn::Error::new(name.span(), "endpoint path must be provided") + .to_compile_error() + .into(), }; - let queries = query_idents.len(); + // process arguments + let mut client_arg = None; + let mut other_args = Vec::new(); + + for input in inputs { + match input { + FnArg::Receiver(_) => continue, // skip self + FnArg::Typed(PatType { pat, ty, .. }) => { + if let Pat::Ident(ident) = &**pat { + if ident.ident == "client" { + client_arg = Some((ident.ident.clone(), ty)); + } else { + other_args.push((ident.ident.clone(), ty)); + } + } + } + } + } + + // generate tokens for function with builder + let arg_defs: Vec = other_args.iter().map(|(id, ty)| { + // wrap Option with #[builder(default)] + if let Type::Path(tp) = ty.as_ref() { + let is_option = tp.path.segments.last().map(|seg| seg.ident == "Option").unwrap_or(false); + if is_option { + quote! { #[builder(default)] #id: #ty } + } else { + quote! { #id: #ty } + } + } else { + quote! { #id: #ty } + } + }).collect(); + + let client_def = match client_arg { + Some((id, ty)) => quote! { #[builder(finish_fn)] #id: #ty }, + None => quote! { #[builder(finish_fn)] client: &restson::RestClient }, + }; + + let call_args: Vec = other_args.iter().map(|(id, _)| { + quote! { #id } + }).collect(); + let expanded = quote! { #[bon::builder] - #vis async fn #fn_name #generics( - #[builder(finish_fn)] client: &restson::RestClient, - #( #[builder(finish_fn)] #path_attrs #path_idents: #path_types, )* - #( #query_attrs #query_idents: #query_types, )* - #( #body_attrs #body_idents: #body_types, )* - ) -> Result<#ret_type, restson::Error> { - let path = format!(#path_lit, #( #path_idents = #path_idents, )* ); - - let mut query = Vec::with_capacity(#queries); - - - - #[derive(serde::Serialize)] - #[serde(rename_all = "camelCase")] - struct Q { - #( - #query_attrs #query_idents: #query_types, - )* + #vis fn #name( + #client_def, + #(#arg_defs),* + ) -> impl std::future::Future> + '_ { + async move { + let result = client.get::<_, serde_json::Value>(#path).await?; + Ok(result) } - let q = Q { #( #query_idents, )* }; - let s = serde_qs::to_string(&q).expect("serde_qs serialization"); - for pair in s.split('&') { - let mut kv = pair.splitn(2, '='); - match (kv.next(), kv.next()) { - (Some(k), Some(v)) => query.push((k, v)), - (Some(k), None) => query.push((k, "")), - _ => panic!("should never happen!"), - } - } - - todo!("client.{}({path}, {query:?})", #method) } }; - TokenStream::from(expanded) -} - -#[proc_macro_attribute] -pub fn get(attr: TokenStream, item: TokenStream) -> TokenStream { - generate_endpoint(attr, item, "get_with") -} - -#[proc_macro_attribute] -pub fn post(attr: TokenStream, item: TokenStream) -> TokenStream { - generate_endpoint(attr, item, "post_capture_with") + expanded.into() }