akulij/gongbotrs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dev #25

Merged
akulij merged 38 commits from dev into main 2025-06-18 17:10:44 +00:00
Conversation 0 Commits 38 Files Changed 19 +664 -1047
8 changed files with 664 additions and 1047 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 3d9e0f7ee7 - Show all commits

538
Cargo.lock generated
View File

@ -106,6 +106,12 @@ version = "1.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
[[package]]
name = "az"
version = "1.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7b7e4c2464d97fe331d41de9d5db0def0a96f4d823b8b32a2efd503578988973"
[[package]] [[package]]
name = "backtrace" name = "backtrace"
version = "0.3.74" version = "0.3.74"
@ -139,6 +145,25 @@ version = "0.22.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
[[package]]
name = "base64-simd"
version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "339abbe78e73178762e23bea9dfd08e697eb3f3301cd4be981c0f78ba5859195"
dependencies = [
"outref",
"vsimd",
]
[[package]]
name = "bincode"
version = "1.3.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad"
dependencies = [
"serde",
]
[[package]] [[package]]
name = "bindgen" name = "bindgen"
version = "0.71.1" version = "0.71.1"
@ -159,6 +184,21 @@ dependencies = [
"syn 2.0.100", "syn 2.0.100",
] ]
[[package]]
name = "bit-set"
version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "08807e080ed7f9d5433fa9b275196cfc35414f66a0c79d864dc51a0d825231a3"
dependencies = [
"bit-vec",
]
[[package]]
name = "bit-vec"
version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5e764a1d40d510daf35e07be9eb06e75770908c27d411ee6c92109c9840eaaf7"
[[package]] [[package]]
name = "bitflags" name = "bitflags"
version = "1.3.2" version = "1.3.2"
@ -216,6 +256,16 @@ dependencies = [
"uuid", "uuid",
] ]
[[package]]
name = "bstr"
version = "1.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "234113d19d0d7d613b40e86fb654acf958910802bcceab913a4f9e7cda03b1a4"
dependencies = [
"memchr",
"serde",
]
[[package]] [[package]]
name = "build-time" name = "build-time"
version = "0.1.3" version = "0.1.3"
@ -253,6 +303,26 @@ version = "1.10.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d71b6127be86fdcfddb610f7182ac57211d4b18a3e9c82eb2d17662f2227ad6a" checksum = "d71b6127be86fdcfddb610f7182ac57211d4b18a3e9c82eb2d17662f2227ad6a"
[[package]]
name = "capacity_builder"
version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8f2d24a6dcf0cd402a21b65d35340f3a49ff3475dc5fdac91d22d2733e6641c6"
dependencies = [
"capacity_builder_macros",
"itoa",
]
[[package]]
name = "capacity_builder_macros"
version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3b4a6cae9efc04cc6cbb8faf338d2c497c165c83e74509cf4dbedea948bbf6e5"
dependencies = [
"quote",
"syn 2.0.100",
]
[[package]] [[package]]
name = "cc" name = "cc"
version = "1.2.17" version = "1.2.17"
@ -370,6 +440,12 @@ dependencies = [
"unicode-segmentation", "unicode-segmentation",
] ]
[[package]]
name = "cooked-waker"
version = "5.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "147be55d677052dabc6b22252d5dd0fd4c29c8c27aa4f2fbef0f94aa003b406f"
[[package]] [[package]]
name = "copy_dir" name = "copy_dir"
version = "0.1.3" version = "0.1.3"
@ -419,6 +495,15 @@ version = "2.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5" checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5"
[[package]]
name = "crc32fast"
version = "1.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3"
dependencies = [
"cfg-if",
]
[[package]] [[package]]
name = "crossbeam-queue" name = "crossbeam-queue"
version = "0.3.12" version = "0.3.12"
@ -491,6 +576,126 @@ version = "2.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2a2330da5de22e8a3cb63252ce2abb30116bf5265e89c0e01bc17015ce30a476" checksum = "2a2330da5de22e8a3cb63252ce2abb30116bf5265e89c0e01bc17015ce30a476"
[[package]]
name = "debugid"
version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bef552e6f588e446098f6ba40d89ac146c8c7b64aade83c051ee00bb5d2bc18d"
dependencies = [
"serde",
"uuid",
]
[[package]]
name = "deno_core"
version = "0.350.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e273b731fce500130790e777cb2631dc451db412975304d23816c1e444a10c5b"
dependencies = [
"anyhow",
"az",
"bincode",
"bit-set",
"bit-vec",
"bytes",
"capacity_builder",
"cooked-waker",
"deno_core_icudata",
"deno_error",
"deno_ops",
"deno_path_util",
"deno_unsync",
"futures",
"indexmap 2.8.0",
"libc",
"parking_lot",
"percent-encoding",
"pin-project",
"serde",
"serde_json",
"serde_v8",
"smallvec",
"sourcemap",
"static_assertions",
"thiserror 2.0.12",
"tokio",
"url",
"v8",
"wasm_dep_analyzer",
]
[[package]]
name = "deno_core_icudata"
version = "0.74.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fe4dccb6147bb3f3ba0c7a48e993bfeb999d2c2e47a81badee80e2b370c8d695"
[[package]]
name = "deno_error"
version = "0.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "612ec3fc481fea759141b0c57810889b0a4fb6fee8f10748677bfe492fd30486"
dependencies = [
"deno_error_macro",
"libc",
"serde",
"serde_json",
"tokio",
"url",
]
[[package]]
name = "deno_error_macro"
version = "0.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8380a4224d5d2c3f84da4d764c4326cac62e9a1e3d4960442d29136fc07be863"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.100",
]
[[package]]
name = "deno_ops"
version = "0.226.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c28b12489187c71fa123731cc783d48beb17ae5df04da991909cc2ae5a3d0ef9"
dependencies = [
"indexmap 2.8.0",
"proc-macro-rules",
"proc-macro2",
"quote",
"stringcase",
"strum",
"strum_macros",
"syn 2.0.100",
"thiserror 2.0.12",
]
[[package]]
name = "deno_path_util"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "516f813389095889776b81cc9108ff6f336fd9409b4b12fc0138aea23d2708e1"
dependencies = [
"deno_error",
"percent-encoding",
"sys_traits",
"thiserror 2.0.12",
"url",
]
[[package]]
name = "deno_unsync"
version = "0.4.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6742a724e8becb372a74c650a1aefb8924a5b8107f7d75b3848763ea24b27a87"
dependencies = [
"futures-util",
"parking_lot",
"tokio",
]
[[package]] [[package]]
name = "deranged" name = "deranged"
version = "0.4.1" version = "0.4.1"
@ -676,6 +881,16 @@ dependencies = [
"scopeguard", "scopeguard",
] ]
[[package]]
name = "erased-serde"
version = "0.4.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e004d887f51fcb9fef17317a2f3525c887d8aa3f4f50fed920816a688284a5b7"
dependencies = [
"serde",
"typeid",
]
[[package]] [[package]]
name = "errno" name = "errno"
version = "0.3.10" version = "0.3.10"
@ -761,6 +976,16 @@ dependencies = [
"percent-encoding", "percent-encoding",
] ]
[[package]]
name = "fslock"
version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "04412b8935272e3a9bae6f48c7bfff74c2911f60525404edfdd28e49884c3bfb"
dependencies = [
"libc",
"winapi",
]
[[package]] [[package]]
name = "funty" name = "funty"
version = "2.0.0" version = "2.0.0"
@ -926,11 +1151,13 @@ checksum = "a8d1add55171497b4705a648c6b583acafb01d58050a51727785f0b2c8e0a2b2"
name = "gongbotrs" name = "gongbotrs"
version = "0.1.0" version = "0.1.0"
dependencies = [ dependencies = [
"anyhow",
"async-trait", "async-trait",
"bson", "bson",
"build-time", "build-time",
"chrono", "chrono",
"chrono-tz", "chrono-tz",
"deno_core",
"dotenvy", "dotenvy",
"enum_stringify", "enum_stringify",
"envconfig", "envconfig",
@ -939,14 +1166,26 @@ dependencies = [
"itertools 0.14.0", "itertools 0.14.0",
"lazy_static", "lazy_static",
"log", "log",
"mlua",
"mongodb", "mongodb",
"pretty_env_logger", "pretty_env_logger",
"quickjs-rusty", "quickjs-rusty",
"serde", "serde",
"serde_json", "serde_json",
"serde_v8",
"teloxide", "teloxide",
"thiserror 2.0.12", "thiserror 2.0.12",
"tokio", "tokio",
"v8",
]
[[package]]
name = "gzip-header"
version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "95cc527b92e6029a62960ad99aa8a6660faa4555fe5f731aab13aa6a921795a2"
dependencies = [
"crc32fast",
] ]
[[package]] [[package]]
@ -1345,6 +1584,12 @@ dependencies = [
"icu_properties", "icu_properties",
] ]
[[package]]
name = "if_chain"
version = "1.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cb56e1aa765b4b4f3aadfab769793b7087bb03a4ea4920644a6d238e2df5b9ed"
[[package]] [[package]]
name = "include_dir" name = "include_dir"
version = "0.7.4" version = "0.7.4"
@ -1508,6 +1753,12 @@ version = "0.5.6"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f"
[[package]]
name = "linux-raw-sys"
version = "0.4.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab"
[[package]] [[package]]
name = "linux-raw-sys" name = "linux-raw-sys"
version = "0.9.3" version = "0.9.3"
@ -1545,6 +1796,15 @@ dependencies = [
"linked-hash-map", "linked-hash-map",
] ]
[[package]]
name = "luau0-src"
version = "0.12.3+luau663"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "76ae337c644bbf86a8d8e9ce3ee023311833d41741baf5e51acc31b37843aba1"
dependencies = [
"cc",
]
[[package]] [[package]]
name = "macro_magic" name = "macro_magic"
version = "0.5.1" version = "0.5.1"
@ -1633,9 +1893,9 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
[[package]] [[package]]
name = "miniz_oxide" name = "miniz_oxide"
version = "0.8.5" version = "0.8.8"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8e3e04debbb59698c15bacbb6d93584a8c0ca9cc3213cb423d31f760d8843ce5" checksum = "3be647b768db090acb35d5ec5db2b0e1f1de11133ca123b9eacf5137868f892a"
dependencies = [ dependencies = [
"adler2", "adler2",
] ]
@ -1651,6 +1911,37 @@ dependencies = [
"windows-sys 0.52.0", "windows-sys 0.52.0",
] ]
[[package]]
name = "mlua"
version = "0.10.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c1f5f8fbebc7db5f671671134b9321c4b9aa9adeafccfd9a8c020ae45c6a35d0"
dependencies = [
"bstr",
"either",
"erased-serde",
"libloading",
"mlua-sys",
"num-traits",
"parking_lot",
"rustc-hash",
"rustversion",
"serde",
"serde-value",
]
[[package]]
name = "mlua-sys"
version = "0.6.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "380c1f7e2099cafcf40e51d3a9f20a346977587aa4d012eae1f043149a728a93"
dependencies = [
"cc",
"cfg-if",
"luau0-src",
"pkg-config",
]
[[package]] [[package]]
name = "mongodb" name = "mongodb"
version = "3.2.3" version = "3.2.3"
@ -1747,6 +2038,7 @@ checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9"
dependencies = [ dependencies = [
"num-integer", "num-integer",
"num-traits", "num-traits",
"rand 0.8.5",
] ]
[[package]] [[package]]
@ -1832,6 +2124,21 @@ dependencies = [
"vcpkg", "vcpkg",
] ]
[[package]]
name = "ordered-float"
version = "2.10.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "68f19d67e5a2795c94e73e0bb1cc1a7edeb2e28efd39e2e1c9b7a40c1108b11c"
dependencies = [
"num-traits",
]
[[package]]
name = "outref"
version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1a80800c0488c3a21695ea981a54918fbb37abf04f4d0720c453632255e2ff0e"
[[package]] [[package]]
name = "parking" name = "parking"
version = "2.2.1" version = "2.2.1"
@ -1870,6 +2177,12 @@ dependencies = [
"regex", "regex",
] ]
[[package]]
name = "paste"
version = "1.0.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
[[package]] [[package]]
name = "pbkdf2" name = "pbkdf2"
version = "0.11.0" version = "0.11.0"
@ -2017,6 +2330,29 @@ dependencies = [
"quote", "quote",
] ]
[[package]]
name = "proc-macro-rules"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "07c277e4e643ef00c1233393c673f655e3672cf7eb3ba08a00bdd0ea59139b5f"
dependencies = [
"proc-macro-rules-macros",
"proc-macro2",
"syn 2.0.100",
]
[[package]]
name = "proc-macro-rules-macros"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "207fffb0fe655d1d47f6af98cc2793405e85929bdbc420d685554ff07be27ac7"
dependencies = [
"once_cell",
"proc-macro2",
"quote",
"syn 2.0.100",
]
[[package]] [[package]]
name = "proc-macro2" name = "proc-macro2"
version = "1.0.94" version = "1.0.94"
@ -2275,6 +2611,19 @@ dependencies = [
"semver", "semver",
] ]
[[package]]
name = "rustix"
version = "0.38.44"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154"
dependencies = [
"bitflags 2.9.0",
"errno",
"libc",
"linux-raw-sys 0.4.15",
"windows-sys 0.59.0",
]
[[package]] [[package]]
name = "rustix" name = "rustix"
version = "1.0.3" version = "1.0.3"
@ -2284,7 +2633,7 @@ dependencies = [
"bitflags 2.9.0", "bitflags 2.9.0",
"errno", "errno",
"libc", "libc",
"linux-raw-sys", "linux-raw-sys 0.9.3",
"windows-sys 0.59.0", "windows-sys 0.59.0",
] ]
@ -2418,6 +2767,16 @@ dependencies = [
"serde_derive", "serde_derive",
] ]
[[package]]
name = "serde-value"
version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f3a1a3341211875ef120e117ea7fd5228530ae7e7036a779fdc9117be6b3282c"
dependencies = [
"ordered-float",
"serde",
]
[[package]] [[package]]
name = "serde_bytes" name = "serde_bytes"
version = "0.11.17" version = "0.11.17"
@ -2463,6 +2822,20 @@ dependencies = [
"serde", "serde",
] ]
[[package]]
name = "serde_v8"
version = "0.259.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c7e4c5f439cffc03021c8bfd380cd1ef6acb4788a72b7e54bf4a83c73f91f8a0"
dependencies = [
"deno_error",
"num-bigint",
"serde",
"smallvec",
"thiserror 2.0.12",
"v8",
]
[[package]] [[package]]
name = "serde_with" name = "serde_with"
version = "3.12.0" version = "3.12.0"
@ -2564,6 +2937,24 @@ dependencies = [
"windows-sys 0.52.0", "windows-sys 0.52.0",
] ]
[[package]]
name = "sourcemap"
version = "9.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e22afbcb92ce02d23815b9795523c005cb9d3c214f8b7a66318541c240ea7935"
dependencies = [
"base64-simd",
"bitvec",
"data-encoding",
"debugid",
"if_chain",
"rustc-hash",
"serde",
"serde_json",
"unicode-id-start",
"url",
]
[[package]] [[package]]
name = "spin" name = "spin"
version = "0.9.8" version = "0.9.8"
@ -2723,6 +3114,18 @@ version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
[[package]]
name = "static_assertions"
version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
[[package]]
name = "stringcase"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "72abeda133c49d7bddece6c154728f83eec8172380c80ab7096da9487e20d27c"
[[package]] [[package]]
name = "stringprep" name = "stringprep"
version = "0.1.5" version = "0.1.5"
@ -2740,6 +3143,28 @@ version = "0.11.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
[[package]]
name = "strum"
version = "0.27.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f64def088c51c9510a8579e3c5d67c65349dcf755e5479ad3d010aa6454e2c32"
dependencies = [
"strum_macros",
]
[[package]]
name = "strum_macros"
version = "0.27.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c77a8c5abcaf0f9ce05d62342b7d298c346515365c36b673df4ebe3ced01fde8"
dependencies = [
"heck",
"proc-macro2",
"quote",
"rustversion",
"syn 2.0.100",
]
[[package]] [[package]]
name = "subtle" name = "subtle"
version = "2.6.1" version = "2.6.1"
@ -2788,6 +3213,26 @@ dependencies = [
"syn 2.0.100", "syn 2.0.100",
] ]
[[package]]
name = "sys_traits"
version = "0.1.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dc4707edf3196e8037ee45018d1bb1bfb233b0e4fc440fa3d3f25bc69bfdaf26"
dependencies = [
"sys_traits_macros",
]
[[package]]
name = "sys_traits_macros"
version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "181f22127402abcf8ee5c83ccd5b408933fec36a6095cf82cda545634692657e"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.100",
]
[[package]] [[package]]
name = "take_mut" name = "take_mut"
version = "0.2.2" version = "0.2.2"
@ -2885,7 +3330,7 @@ dependencies = [
"fastrand", "fastrand",
"getrandom 0.3.2", "getrandom 0.3.2",
"once_cell", "once_cell",
"rustix", "rustix 1.0.3",
"windows-sys 0.59.0", "windows-sys 0.59.0",
] ]
@ -3013,6 +3458,7 @@ dependencies = [
"bytes", "bytes",
"libc", "libc",
"mio", "mio",
"parking_lot",
"pin-project-lite", "pin-project-lite",
"signal-hook-registry", "signal-hook-registry",
"socket2", "socket2",
@ -3152,6 +3598,12 @@ dependencies = [
"syn 1.0.109", "syn 1.0.109",
] ]
[[package]]
name = "typeid"
version = "1.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bc7d623258602320d5c55d1bc22793b57daff0ec7efc270ea7d55ce1d5f5471c"
[[package]] [[package]]
name = "typenum" name = "typenum"
version = "1.18.0" version = "1.18.0"
@ -3170,6 +3622,12 @@ version = "0.3.18"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5c1cb5db39152898a79168971543b1cb5020dff7fe43c8dc468b0885f5e29df5" checksum = "5c1cb5db39152898a79168971543b1cb5020dff7fe43c8dc468b0885f5e29df5"
[[package]]
name = "unicode-id-start"
version = "1.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2f322b60f6b9736017344fa0635d64be2f458fbc04eef65f6be22976dd1ffd5b"
[[package]] [[package]]
name = "unicode-ident" name = "unicode-ident"
version = "1.0.18" version = "1.0.18"
@ -3245,6 +3703,22 @@ dependencies = [
"wasm-bindgen", "wasm-bindgen",
] ]
[[package]]
name = "v8"
version = "137.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d2b387c1c5731284e756c03280032068e68e5b52f6c4714492403c30f650ad52"
dependencies = [
"bindgen",
"bitflags 2.9.0",
"fslock",
"gzip-header",
"home",
"miniz_oxide",
"paste",
"which",
]
[[package]] [[package]]
name = "vcpkg" name = "vcpkg"
version = "0.2.15" version = "0.2.15"
@ -3257,6 +3731,12 @@ version = "0.9.5"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
[[package]]
name = "vsimd"
version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5c3082ca00d5a5ef149bb8b555a72ae84c9c59f7250f013ac822ac2e49b19c64"
[[package]] [[package]]
name = "walkdir" name = "walkdir"
version = "2.5.0" version = "2.5.0"
@ -3381,6 +3861,16 @@ dependencies = [
"web-sys", "web-sys",
] ]
[[package]]
name = "wasm_dep_analyzer"
version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e51cf5f08b357e64cd7642ab4bbeb11aecab9e15520692129624fb9908b8df2c"
dependencies = [
"deno_error",
"thiserror 2.0.12",
]
[[package]] [[package]]
name = "web-sys" name = "web-sys"
version = "0.3.77" version = "0.3.77"
@ -3397,6 +3887,18 @@ version = "0.25.4"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1" checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1"
[[package]]
name = "which"
version = "6.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b4ee928febd44d98f2f459a4a79bd4d928591333a494a10a868418ac1b39cf1f"
dependencies = [
"either",
"home",
"rustix 0.38.44",
"winsafe",
]
[[package]] [[package]]
name = "whoami" name = "whoami"
version = "1.6.0" version = "1.6.0"
@ -3413,6 +3915,22 @@ version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dd7cf3379ca1aac9eea11fba24fd7e315d621f8dfe35c8d7d2be8b793726e07d" checksum = "dd7cf3379ca1aac9eea11fba24fd7e315d621f8dfe35c8d7d2be8b793726e07d"
[[package]]
name = "winapi"
version = "0.3.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
dependencies = [
"winapi-i686-pc-windows-gnu",
"winapi-x86_64-pc-windows-gnu",
]
[[package]]
name = "winapi-i686-pc-windows-gnu"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
[[package]] [[package]]
name = "winapi-util" name = "winapi-util"
version = "0.1.9" version = "0.1.9"
@ -3422,6 +3940,12 @@ dependencies = [
"windows-sys 0.59.0", "windows-sys 0.59.0",
] ]
[[package]]
name = "winapi-x86_64-pc-windows-gnu"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
[[package]] [[package]]
name = "windows-core" name = "windows-core"
version = "0.52.0" version = "0.52.0"
@ -3688,6 +4212,12 @@ dependencies = [
"windows-sys 0.48.0", "windows-sys 0.48.0",
] ]
[[package]]
name = "winsafe"
version = "0.0.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d135d17ab770252ad95e9a872d365cf3090e3be864a34ab46f48555993efc904"
[[package]] [[package]]
name = "wit-bindgen-rt" name = "wit-bindgen-rt"
version = "0.39.0" version = "0.39.0"

5
Cargo.toml
View File

@ -6,11 +6,13 @@ edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies] [dependencies]
anyhow = "1.0.98"
async-trait = "0.1.88" async-trait = "0.1.88"
bson = { version = "2.14.0", features = ["chrono-0_4"] } bson = { version = "2.14.0", features = ["chrono-0_4"] }
build-time = "0.1.3" build-time = "0.1.3"
chrono = { version = "0.4.40", features = ["serde"] } chrono = { version = "0.4.40", features = ["serde"] }
chrono-tz = "0.10.3" chrono-tz = "0.10.3"
deno_core = "0.350.0"
dotenvy = "0.15.7" dotenvy = "0.15.7"
enum_stringify = "0.6.3" enum_stringify = "0.6.3"
envconfig = "0.11.0" envconfig = "0.11.0"
@ -19,14 +21,17 @@ git-const = "1.1.0"
itertools = "0.14.0" itertools = "0.14.0"
lazy_static = "1.5.0" lazy_static = "1.5.0"
log = "0.4.27" log = "0.4.27"
mlua = { version = "0.10.5", features = ["luau", "serialize"] }
mongodb = "3.2.3" mongodb = "3.2.3"
pretty_env_logger = "0.5.0" pretty_env_logger = "0.5.0"
quickjs-rusty = { git = "https://github.com/akulij/quickjs-rusty.git", rev = "549f830" } quickjs-rusty = { git = "https://github.com/akulij/quickjs-rusty.git", rev = "549f830" }
serde = { version = "1.0.219", features = ["derive", "serde_derive"] } serde = { version = "1.0.219", features = ["derive", "serde_derive"] }
serde_json = "1.0.140" serde_json = "1.0.140"
serde_v8 = "0.259.0"
teloxide = { version = "0.14.0", features = ["macros", "postgres-storage-nativetls"] } teloxide = { version = "0.14.0", features = ["macros", "postgres-storage-nativetls"] }
thiserror = "2.0.12" thiserror = "2.0.12"
tokio = { version = "1.44.1", features = ["rt-multi-thread", "macros"] } tokio = { version = "1.44.1", features = ["rt-multi-thread", "macros"] }
v8 = "137.2.0"
[lints.clippy] [lints.clippy]
print_stdout = "warn" print_stdout = "warn"

14
mainbot.js
View File

@ -93,14 +93,22 @@ print(JSON.stringify(dialog.buttons))
const config = { const config = {
version: 1.1, version: 1.1,
timezone: 3, timezone: 5,
} }
const notifications = [ const notifications = [
{
// time: "17:38",
time: {once: "17:49"},
message: {literal: "show_projects"},
},
// { // {
// time: "18:14", // time: {
// message: {literal: "show_projects"}, // hour: 0,
// delta_minutes: 2,
// }, // },
// message: {literal: "show_projects"},
// }
] ]
// {config, dialog} // {config, dialog}

104
src/bot_handler.rs
View File

@ -15,8 +15,13 @@ use teloxide::{
}; };
use crate::{ use crate::{
botscript::{self, message_info::MessageInfoBuilder, BotMessage, ScriptError}, botscript::{self, message_info::MessageInfoBuilder, ScriptError},
commands::BotCommand, commands::BotCommand,
config::{
dialog::{button::ButtonLayout, message::BotMessage},
traits::ProviderSerialize,
Provider,
},
db::{callback_info::CallbackInfo, CallDB, DB}, db::{callback_info::CallbackInfo, CallDB, DB},
message_answerer::MessageAnswerer, message_answerer::MessageAnswerer,
notify_admin, update_user_tg, notify_admin, update_user_tg,
@ -29,7 +34,7 @@ pub type BotHandler =
type CallbackStore = CallbackInfo<Value>; type CallbackStore = CallbackInfo<Value>;
pub fn script_handler(r: Arc<Mutex<BotRuntime>>) -> BotHandler { pub fn script_handler<P: Provider + Send + Sync>(r: Arc<Mutex<BotRuntime<P>>>) -> BotHandler {
let cr = r.clone(); let cr = r.clone();
dptree::entry() dptree::entry()
.branch( .branch(
@ -91,8 +96,13 @@ pub fn script_handler(r: Arc<Mutex<BotRuntime>>) -> BotHandler {
) )
} }
async fn handle_botmessage(bot: Bot, mut db: DB, bm: BotMessage, msg: Message) -> BotResult<()> { async fn handle_botmessage<P: Provider>(
info!("Eval BM: {:?}", bm); bot: Bot,
mut db: DB,
bm: BotMessage<P>,
msg: Message,
) -> BotResult<()> {
// info!("Eval BM: {:?}", bm);
let tguser = match msg.from.clone() { let tguser = match msg.from.clone() {
Some(user) => user, Some(user) => user,
None => return Ok(()), // do nothing, cause its not usecase of function None => return Ok(()), // do nothing, cause its not usecase of function
@ -116,31 +126,34 @@ async fn handle_botmessage(bot: Bot, mut db: DB, bm: BotMessage, msg: Message) -
let is_propagate: bool = match bm.get_handler() { let is_propagate: bool = match bm.get_handler() {
Some(handler) => 'prop: { Some(handler) => 'prop: {
let ctx = match handler.context() { // let ctx = match handler.context() {
Some(ctx) => ctx, // Some(ctx) => ctx,
// falling back to propagation // // falling back to propagation
None => break 'prop true, // None => break 'prop true,
}; // };
let jsuser = to_js(ctx, &tguser).map_err(ScriptError::from)?; // let jsuser = to_js(ctx, &tguser).map_err(ScriptError::from)?;
let puser = <P::Value as ProviderSerialize>::se_from(&tguser).unwrap();
let mi = MessageInfoBuilder::new() let mi = MessageInfoBuilder::new()
.set_variant(variant.clone()) .set_variant(variant.clone())
.build(); .build();
let mi = to_js(ctx, &mi).map_err(ScriptError::from)?; // let mi = to_js(ctx, &mi).map_err(ScriptError::from)?;
info!( let pmi = <P::Value as ProviderSerialize>::se_from(&mi).unwrap();
"Calling handler {:?} with msg literal: {:?}", // info!(
handler, // "Calling handler {:?} with msg literal: {:?}",
bm.literal() // handler,
); // bm.literal()
match handler.call_args(vec![jsuser, mi]) { // );
match handler.call_args(vec![puser, pmi]) {
Ok(v) => { Ok(v) => {
if v.is_bool() { todo!()
v.to_bool().unwrap_or(true) // if v.is_bool() {
} else if v.is_int() { // v.to_bool().unwrap_or(true)
v.to_int().unwrap_or(1) != 0 // } else if v.is_int() {
} else { // v.to_int().unwrap_or(1) != 0
// falling back to propagation // } else {
true // // falling back to propagation
} // true
// }
} }
Err(err) => { Err(err) => {
error!("Failed to get return of handler, err: {err}"); error!("Failed to get return of handler, err: {err}");
@ -161,7 +174,7 @@ async fn handle_botmessage(bot: Bot, mut db: DB, bm: BotMessage, msg: Message) -
join_all(buttons.iter().map(async |r| { join_all(buttons.iter().map(async |r| {
join_all(r.iter().map(async |b| { join_all(r.iter().map(async |b| {
match b { match b {
botscript::ButtonLayout::Callback { ButtonLayout::Callback {
name, name,
literal: _, literal: _,
callback, callback,
@ -198,9 +211,14 @@ async fn handle_botmessage(bot: Bot, mut db: DB, bm: BotMessage, msg: Message) -
Ok(()) Ok(())
} }
async fn handle_callback(bot: Bot, mut db: DB, bm: BotMessage, q: CallbackQuery) -> BotResult<()> { async fn handle_callback<P: Provider>(
bot: Bot,
mut db: DB,
bm: BotMessage<P>,
q: CallbackQuery,
) -> BotResult<()> {
bot.answer_callback_query(&q.id).await?; bot.answer_callback_query(&q.id).await?;
info!("Eval BM: {:?}", bm); // info!("Eval BM: {:?}", bm);
let tguser = q.from.clone(); let tguser = q.from.clone();
let user = db let user = db
.get_or_init_user(tguser.id.0 as i64, &tguser.first_name) .get_or_init_user(tguser.id.0 as i64, &tguser.first_name)
@ -210,24 +228,20 @@ async fn handle_callback(bot: Bot, mut db: DB, bm: BotMessage, q: CallbackQuery)
let is_propagate: bool = match bm.get_handler() { let is_propagate: bool = match bm.get_handler() {
Some(handler) => 'prop: { Some(handler) => 'prop: {
let ctx = match handler.context() { let puser = <P::Value as ProviderSerialize>::se_from(&tguser).unwrap();
Some(ctx) => ctx,
// falling back to propagation
None => break 'prop true,
};
let jsuser = to_js(ctx, &tguser).map_err(ScriptError::from)?;
let mi = MessageInfoBuilder::new().build(); let mi = MessageInfoBuilder::new().build();
let mi = to_js(ctx, &mi).map_err(ScriptError::from)?; let pmi = <P::Value as ProviderSerialize>::se_from(&mi).unwrap();
match handler.call_args(vec![jsuser, mi]) { match handler.call_args(vec![puser, pmi]) {
Ok(v) => { Ok(v) => {
if v.is_bool() { todo!()
v.to_bool().unwrap_or(true) // if v.is_bool() {
} else if v.is_int() { // v.to_bool().unwrap_or(true)
v.to_int().unwrap_or(1) != 0 // } else if v.is_int() {
} else { // v.to_int().unwrap_or(1) != 0
// falling back to propagation // } else {
true // // falling back to propagation
} // true
// }
} }
Err(err) => { Err(err) => {
error!("Failed to get return of handler, err: {err}"); error!("Failed to get return of handler, err: {err}");
@ -248,7 +262,7 @@ async fn handle_callback(bot: Bot, mut db: DB, bm: BotMessage, q: CallbackQuery)
join_all(buttons.iter().map(async |r| { join_all(buttons.iter().map(async |r| {
join_all(r.iter().map(async |b| { join_all(r.iter().map(async |b| {
match b { match b {
botscript::ButtonLayout::Callback { ButtonLayout::Callback {
name, name,
literal: _, literal: _,
callback, callback,

32
src/bot_manager.rs
View File

@ -40,32 +40,28 @@ pub struct BotInfo {
pub static DEFAULT_SCRIPT: &str = pub static DEFAULT_SCRIPT: &str =
include_str!(concat!(env!("CARGO_MANIFEST_DIR"), "/default_script.js")); include_str!(concat!(env!("CARGO_MANIFEST_DIR"), "/default_script.js"));
pub struct BotManager<BIG, HM, BIS, HI, FBIS, FHI> pub struct BotManager<BIG, BHG, BII, BHI>
where where
BIG: FnMut() -> FBIS, BIG: AsyncFnMut() -> BII, // BotInstance Getter
FBIS: Future<Output = BIS>, BII: Iterator<Item = BotInstance>, // BotInstance Iterator
BIS: Iterator<Item = BotInstance>, BHG: AsyncFnMut(BotInstance) -> BHI, // BotHandler Getter
HM: FnMut(BotInstance) -> FHI, BHI: Iterator<Item = BotHandler>, // BotHandler Iterator
FHI: Future<Output = HI>,
HI: Iterator<Item = BotHandler>,
{ {
bot_pool: HashMap<String, BotRunner>, bot_pool: HashMap<String, BotRunner>,
bi_getter: BIG, bi_getter: BIG,
h_mapper: HM, h_mapper: BHG,
} }
impl<BIG, HM, BIS, HI, FBIS, FHI> BotManager<BIG, HM, BIS, HI, FBIS, FHI> impl<BIG, BHG, BII, BHI> BotManager<BIG, BHG, BII, BHI>
where where
BIG: FnMut() -> FBIS, BIG: AsyncFnMut() -> BII, // BotInstance Getter
FBIS: Future<Output = BIS>, BII: Iterator<Item = BotInstance>, // BotInstance Iterator
BIS: Iterator<Item = BotInstance>, BHG: AsyncFnMut(BotInstance) -> BHI, // BotHandler Getter
HM: FnMut(BotInstance) -> FHI, BHI: Iterator<Item = BotHandler>, // BotHandler Iterator
FHI: Future<Output = HI>,
HI: Iterator<Item = BotHandler>,
{ {
/// bi_getter - fnmut that returns iterator over BotInstance /// bi_getter - async fnmut that returns iterator over BotInstance
/// h_map - fnmut that returns iterator over handlers by BotInstance /// h_map - async fnmut that returns iterator over handlers by BotInstance
pub fn with(bi_getter: BIG, h_mapper: HM) -> Self { pub fn with(bi_getter: BIG, h_mapper: BHG) -> Self {
Self { Self {
bot_pool: Default::default(), bot_pool: Default::default(),
bi_getter, bi_getter,

992
src/botscript.rs
View File

File diff suppressed because it is too large Load Diff

11
src/db/mod.rs
View File

@ -253,6 +253,17 @@ pub trait CallDB {
Ok(users.find(doc! {}).await?.try_collect().await?) Ok(users.find(doc! {}).await?.try_collect().await?)
} }
async fn get_users_by_ids(&self, ids: Vec<i64>) -> DbResult<Vec<User>> {
let db = self.get_database_immut().await;
let users = db.collection::<User>("users");
Ok(users
.find(doc! {"id": {"$in": ids}})
.await?
.try_collect()
.await?)
}
async fn get_random_users(&self, n: u32) -> DbResult<Vec<User>> { async fn get_random_users(&self, n: u32) -> DbResult<Vec<User>> {
let db = self.get_database_immut().await; let db = self.get_database_immut().await;
let users = db.collection::<User>("users"); let users = db.collection::<User>("users");

15
src/main.rs
View File

@ -3,15 +3,19 @@ pub mod bot_handler;
pub mod bot_manager; pub mod bot_manager;
pub mod botscript; pub mod botscript;
pub mod commands; pub mod commands;
pub mod config;
pub mod db; pub mod db;
pub mod handlers; pub mod handlers;
pub mod message_answerer; pub mod message_answerer;
pub mod mongodb_storage; pub mod mongodb_storage;
pub mod runtimes;
pub mod utils; pub mod utils;
use bot_manager::BotManager; use bot_manager::BotManager;
use botscript::application::attach_user_application; use botscript::application::attach_user_application;
use botscript::{Runner, RunnerConfig, ScriptError, ScriptResult}; use botscript::{Runner, ScriptError, ScriptResult};
use config::result::ConfigError;
use config::{Provider, RunnerConfig};
use db::application::Application; use db::application::Application;
use db::bots::BotInstance; use db::bots::BotInstance;
use db::callback_info::CallbackInfo; use db::callback_info::CallbackInfo;
@ -91,11 +95,11 @@ pub struct BotController {
pub runtime: Arc<Mutex<BotRuntime>>, pub runtime: Arc<Mutex<BotRuntime>>,
} }
pub struct BotRuntime { pub struct BotRuntime<P: Provider> {
pub rc: RunnerConfig, pub rc: RunnerConfig<P>,
pub runner: Runner, pub runner: Runner,
} }
unsafe impl Send for BotRuntime {} unsafe impl<P: Provider> Send for BotRuntime<P> {}
impl Drop for BotController { impl Drop for BotController {
fn drop(&mut self) { fn drop(&mut self) {
@ -126,7 +130,7 @@ impl BotController {
let bot = Bot::new(token); let bot = Bot::new(token);
let mut runner = Runner::init_with_db(&mut db)?; let mut runner = Runner::init_with_db(&mut db)?;
runner.call_attacher(|c, o| attach_user_application(c, o, db.clone(), bot.clone()))??; // runner.call_attacher(|c, o| attach_user_application(c, o, db.clone(), bot.clone()))??;
let rc = runner.init_config(script)?; let rc = runner.init_config(script)?;
let runtime = Arc::new(Mutex::new(BotRuntime { rc, runner })); let runtime = Arc::new(Mutex::new(BotRuntime { rc, runner }));
@ -147,6 +151,7 @@ pub enum BotError {
IoError(#[from] std::io::Error), IoError(#[from] std::io::Error),
RwLockError(String), RwLockError(String),
MAError(#[from] MessageAnswererError), MAError(#[from] MessageAnswererError),
ConfigError(#[from] ConfigError),
} }
pub type BotResult<T> = Result<T, BotError>; pub type BotResult<T> = Result<T, BotError>;