diff --git a/src/addins/http_server/Cargo.lock b/src/addins/http_server/Cargo.lock index c6d9d8b53f..21ebf36331 100644 --- a/src/addins/http_server/Cargo.lock +++ b/src/addins/http_server/Cargo.lock @@ -46,7 +46,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b52af3cb4058c895d37317bb27508dccc8e5f2d39454016b297bf4a400597b8" dependencies = [ "axum-core", - "base64", "bytes", "form_urlencoded", "futures-util", @@ -65,10 +64,8 @@ dependencies = [ "serde_json", "serde_path_to_error", "serde_urlencoded", - "sha1", "sync_wrapper", "tokio", - "tokio-tungstenite", "tower", "tower-layer", "tower-service", @@ -106,15 +103,6 @@ version = "2.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "843867be96c8daad0d758b57df9392b6d8d271134fce549de6ce169ff98a92af" -[[package]] -name = "block-buffer" -version = "0.10.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" -dependencies = [ - "generic-array", -] - [[package]] name = "bumpalo" version = "3.20.2" @@ -208,41 +196,6 @@ version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" -[[package]] -name = "cpufeatures" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59ed5838eebb26a2bb2e58f6d5b5316989ae9d08bab10e0e6d103e656d1b0280" -dependencies = [ - "libc", -] - -[[package]] -name = "crypto-common" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78c8292055d1c1df0cce5d180393dc8cce0abec0a7102adb6c7b1eef6016d60a" -dependencies = [ - "generic-array", - "typenum", -] - -[[package]] -name = "data-encoding" -version = "2.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7a1e2f27636f116493b8b860f5546edb47c8d8f8ea73e1d2a20be88e28d1fea" - -[[package]] -name = "digest" -version = "0.10.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" -dependencies = [ - "block-buffer", - "crypto-common", -] - [[package]] name = "equivalent" version = "1.0.2" @@ -306,12 +259,6 @@ dependencies = [ "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" @@ -326,34 +273,11 @@ checksum = "389ca41296e6190b48053de0321d02a77f32f8a5d2461dd38762c0593805c6d6" dependencies = [ "futures-core", "futures-macro", - "futures-sink", "futures-task", "pin-project-lite", "slab", ] -[[package]] -name = "generic-array" -version = "0.14.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" -dependencies = [ - "typenum", - "version_check", -] - -[[package]] -name = "getrandom" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd" -dependencies = [ - "cfg-if", - "libc", - "r-efi 5.3.0", - "wasip2", -] - [[package]] name = "getrandom" version = "0.4.2" @@ -362,7 +286,7 @@ checksum = "0de51e6874e94e7bf76d726fc5d13ba782deca734ff60d5bb2fb2607c7406555" dependencies = [ "cfg-if", "libc", - "r-efi 6.0.0", + "r-efi", "wasip2", "wasip3", ] @@ -608,7 +532,6 @@ dependencies = [ "common-logs", "common-server", "common-utils", - "futures-util", "indexmap", "serde", "serde_json", @@ -659,15 +582,6 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" -[[package]] -name = "ppv-lite86" -version = "0.2.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9" -dependencies = [ - "zerocopy", -] - [[package]] name = "prettyplease" version = "0.2.37" @@ -696,47 +610,12 @@ dependencies = [ "proc-macro2", ] -[[package]] -name = "r-efi" -version = "5.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f" - [[package]] name = "r-efi" version = "6.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f8dcc9c7d52a811697d2151c701e0d08956f92b0e24136cf4cf27b57a6a0d9bf" -[[package]] -name = "rand" -version = "0.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1" -dependencies = [ - "rand_chacha", - "rand_core", -] - -[[package]] -name = "rand_chacha" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb" -dependencies = [ - "ppv-lite86", - "rand_core", -] - -[[package]] -name = "rand_core" -version = "0.9.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76afc826de14238e6e8c374ddcc1fa19e374fd8dd986b0d2af0d02377261d83c" -dependencies = [ - "getrandom 0.3.4", -] - [[package]] name = "redox_syscall" version = "0.5.18" @@ -836,17 +715,6 @@ dependencies = [ "serde", ] -[[package]] -name = "sha1" -version = "0.10.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" -dependencies = [ - "cfg-if", - "cpufeatures", - "digest", -] - [[package]] name = "shlex" version = "1.3.0" @@ -902,26 +770,6 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0bf256ce5efdfa370213c1dabab5935a12e49f2c58d15e9eac2870d3b4f27263" -[[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 = "tokio" version = "1.50.0" @@ -950,18 +798,6 @@ dependencies = [ "syn", ] -[[package]] -name = "tokio-tungstenite" -version = "0.28.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d25a406cddcc431a75d3d9afc6a7c0f7428d4891dd973e4d54c56b46127bf857" -dependencies = [ - "futures-util", - "log", - "tokio", - "tungstenite", -] - [[package]] name = "tower" version = "0.5.3" @@ -1026,29 +862,6 @@ dependencies = [ "once_cell", ] -[[package]] -name = "tungstenite" -version = "0.28.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8628dcc84e5a09eb3d8423d6cb682965dea9133204e8fb3efee74c2a0c259442" -dependencies = [ - "bytes", - "data-encoding", - "http", - "httparse", - "log", - "rand", - "sha1", - "thiserror", - "utf-8", -] - -[[package]] -name = "typenum" -version = "1.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "562d481066bde0658276a35467c4af00bdc6ee726305698a55b86e61d7ad82bb" - [[package]] name = "unicode-ident" version = "1.0.24" @@ -1061,12 +874,6 @@ version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853" -[[package]] -name = "utf-8" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" - [[package]] name = "utf16_lit" version = "2.0.2" @@ -1079,17 +886,11 @@ version = "1.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5ac8b6f42ead25368cf5b098aeb3dc8a1a2c05a3eee8a9a1a68c640edbfc79d9" dependencies = [ - "getrandom 0.4.2", + "getrandom", "js-sys", "wasm-bindgen", ] -[[package]] -name = "version_check" -version = "0.9.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" - [[package]] name = "wasi" version = "0.11.1+wasi-snapshot-preview1" @@ -1349,26 +1150,6 @@ dependencies = [ "wasmparser", ] -[[package]] -name = "zerocopy" -version = "0.8.47" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efbb2a062be311f2ba113ce66f697a4dc589f85e78a4aea276200804cea0ed87" -dependencies = [ - "zerocopy-derive", -] - -[[package]] -name = "zerocopy-derive" -version = "0.8.47" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e8bc7269b54418e7aeeef514aa68f8690b8c0489a06b0136e5f57c4c5ccab89" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "zmij" version = "1.0.21" diff --git a/src/addins/http_server/Cargo.toml b/src/addins/http_server/Cargo.toml index f2b5a7e55d..88e0d6e86b 100644 --- a/src/addins/http_server/Cargo.toml +++ b/src/addins/http_server/Cargo.toml @@ -24,9 +24,8 @@ common-server = { path = "../commons/common-server" } serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" tokio = { version = "1.0", features = ["full"] } -axum = { version = "0.8.8", features = ["ws"] } +axum = "0.8.8" tower = "0.5" tower-http = { version = "0.6", features = ["cors", "trace"] } uuid = { version = "1.17.0", features = ["v4"] } indexmap = "2.7.0" -futures-util = "0.3" diff --git a/src/addins/http_server/dependencies.log b/src/addins/http_server/dependencies.log new file mode 100644 index 0000000000..57204936b2 --- /dev/null +++ b/src/addins/http_server/dependencies.log @@ -0,0 +1,17 @@ +"MAIN ---" + linux-vdso.so.1 (0x00007ffe67db7000) + libm.so.6 => /lib64/libm.so.6 (0x0000778121000000) + libpthread.so.0 => /lib64/libpthread.so.0 (0x0000778120c00000) + libc.so.6 => /lib64/libc.so.6 (0x0000778120800000) + libdl.so.2 => /lib64/libdl.so.2 (0x0000778120400000) + /lib64/ld-linux-x86-64.so.2 (0x0000778121400000) +GLIBC_2.2.5 +GLIBC_2.12 +GLIBC_2.3 +GLIBC_2.3.2 +GLIBC_2.3.4 +GLIBC_2.7 +GLIBC_2.9 +GLIBC_2.10 +GLIBC_2.14 +GLIBC_2.17 diff --git a/src/addins/http_server/release.bat b/src/addins/http_server/release.bat new file mode 100644 index 0000000000..906e4addf6 --- /dev/null +++ b/src/addins/http_server/release.bat @@ -0,0 +1,9 @@ +@echo off + +:: Установить переменную +set CARGO_NAME=opi_httpserver +set LIB_NAME=OPI_HTTPServer +set ADDIN_DIR=%~dp0 +set FOLV=true + +call ../build.bat \ No newline at end of file diff --git a/src/addins/http_server/src/http/backend.rs b/src/addins/http_server/src/backend.rs similarity index 99% rename from src/addins/http_server/src/http/backend.rs rename to src/addins/http_server/src/backend.rs index e6109d1b35..390a14476b 100644 --- a/src/addins/http_server/src/http/backend.rs +++ b/src/addins/http_server/src/backend.rs @@ -4,7 +4,7 @@ use common_utils::utils::{json_error, json_success}; use common_binary::vault::BinaryVault; use common_logs::Logger; use common_server::{Backend, send_command, handle_async_command, handle_sync_command}; -use super::HttpServerState; +use crate::server::HttpServerState; pub struct HttpServerBackend { backend: Backend, diff --git a/src/addins/http_server/src/http/mod.rs b/src/addins/http_server/src/http/mod.rs deleted file mode 100644 index b63716da18..0000000000 --- a/src/addins/http_server/src/http/mod.rs +++ /dev/null @@ -1,7 +0,0 @@ -mod backend; -mod server; -mod wrapper; - -pub use backend::HttpServerBackend; -pub use server::HttpServerState; -pub use wrapper::HttpServer; diff --git a/src/addins/http_server/src/lib.rs b/src/addins/http_server/src/lib.rs index 7e230b8282..ee35171057 100644 --- a/src/addins/http_server/src/lib.rs +++ b/src/addins/http_server/src/lib.rs @@ -1,54 +1,38 @@ -mod http; -mod websocket; +mod backend; +mod server; +mod wrapper; use std::sync::Arc; use common_core::*; use common_utils::utils::json_error; use common_binary::vault::BinaryVault; use common_logs::Logger; -use crate::http::HttpServer; -use crate::websocket::WebSocketServer; +use wrapper::HttpServer; impl_addin_exports!(AddIn); impl_raw_addin!(AddIn, METHODS, PROPS, get_params_amount, cal_func); pub const METHODS: &[&[u16]] = &[ - name!("StartHTTP"), // 0 - name!("StopHTTP"), // 1 - name!("GetNextMessageHTTP"), // 2 - name!("GetMessageHTTP"), // 3 - name!("SendMessageHTTP"), // 4 - name!("ListConnectionsHTTP"), // 5 - - name!("StartWS"), // 6 - name!("StopWS"), // 7 - name!("GetNextMessageWS"), // 8 - name!("GetMessageWS"), // 9 - name!("SendMessageWS"), // 10 - name!("CloseConnectionWS"), // 11 - name!("ListConnectionsWS"), // 12 - - name!("RetrieveBinaryFromVault"), // 13 - name!("GetLogs"), // 14 + name!("Start"), // 0 + name!("Stop"), // 1 + name!("GetNextMessage"), // 2 + name!("GetMessage"), // 3 + name!("SendMessage"), // 4 + name!("ListConnections"), // 5 + name!("RetrieveBinaryFromVault"), // 6 + name!("GetLogs"), // 7 ]; pub fn get_params_amount(num: usize) -> usize { match num { - 0 => 3, // StartHTTP(port, config_json, logger_config_json) - 1 => 0, // StopHTTP() - 2 => 1, // GetNextMessageHTTP(timeout_ms) - 3 => 1, // GetMessageHTTP(request_id) - 4 => 3, // SendMessageHTTP(request_id, status_code, body) - 5 => 0, // ListConnectionsHTTP() - 6 => 3, // StartWS(port, config_json, logger_config_json) - 7 => 0, // StopWS() - 8 => 1, // GetNextMessageWS(timeout_ms) - 9 => 2, // GetMessageWS(connection_id, timeout_ms) - 10 => 2, // SendMessageWS(connection_id, message) - 11 => 1, // CloseConnectionWS(connection_id) - 12 => 0, // ListConnectionsWS() - 13 => 1, // RetrieveBinaryFromVault(vault_key) - 14 => 1, // GetLogs(count) + 0 => 3, // Start(port, config_json, logger_config_json) + 1 => 0, // Stop() + 2 => 1, // GetNextMessage(timeout_ms) + 3 => 1, // GetMessage(request_id) + 4 => 3, // SendMessage(request_id, status_code, body) + 5 => 0, // ListConnections() + 6 => 1, // RetrieveBinaryFromVault(vault_key) + 7 => 1, // GetLogs(count) _ => 0, } } @@ -58,6 +42,7 @@ pub fn cal_func(obj: &mut AddIn, num: usize, params: &mut [Variant]) -> Box { + // Start(port, config_json, logger_config_json) let port = params[0].get_i32().unwrap_or(8080) as u16; let config = params[1].get_string().unwrap_or_default(); let logger_config = params[2].get_string().unwrap_or_default(); @@ -65,67 +50,40 @@ pub fn cal_func(obj: &mut AddIn, num: usize, params: &mut [Variant]) -> Box { - Box::new(obj.http_server.stop()) + // Stop() + Box::new(obj.server.stop()) }, 2 => { + // GetNextMessage(timeout_ms) let timeout_ms = params[0].get_i32().unwrap_or(1000) as u64; - Box::new(obj.http_server.handle_request(timeout_ms)) + Box::new(obj.server.handle_request(timeout_ms)) }, 3 => { + // GetMessage(request_id) let request_id = params[0].get_string().unwrap_or_default(); - Box::new(obj.http_server.handle_request_by_id(&request_id)) + Box::new(obj.server.handle_request_by_id(&request_id)) }, 4 => { + // SendMessage(request_id, status_code, body) let request_id = params[0].get_string().unwrap_or_default(); let status_code = params[1].get_i32().unwrap_or(200) as u16; let body = params[2].get_blob().unwrap_or(&empty_array); - Box::new(obj.http_server.send_response(&request_id, status_code, body.to_vec())) + Box::new(obj.server.send_response(&request_id, status_code, body.to_vec())) }, 5 => { - Box::new(obj.http_server.get_pending_requests()) + // ListConnections() + Box::new(obj.server.get_pending_requests()) }, 6 => { - let port = params[0].get_i32().unwrap_or(8080) as u16; - let config = params[1].get_string().unwrap_or_default(); - let logger_config = params[2].get_string().unwrap_or_default(); - - if let Err(e) = obj.init_logger_if_needed(&logger_config) { - return Box::new(json_error(&e)); - }; - Box::new(obj.ws_server.start(port, &config)) - }, - 7 => { - Box::new(obj.ws_server.stop()) - }, - 8 => { - let timeout_ms = params[0].get_i32().unwrap_or(1000) as u64; - Box::new(obj.ws_server.get_next_message(timeout_ms)) - }, - 9 => { - let connection_id = params[0].get_string().unwrap_or_default(); - let timeout_ms = params[1].get_i32().unwrap_or(1000) as u64; - Box::new(obj.ws_server.get_message(&connection_id, timeout_ms)) - }, - 10 => { - let connection_id = params[0].get_string().unwrap_or_default(); - let message = params[1].get_blob().unwrap_or(&empty_array); - Box::new(obj.ws_server.send_message(&connection_id, message.to_vec())) - }, - 11 => { - let connection_id = params[0].get_string().unwrap_or_default(); - Box::new(obj.ws_server.close_connection(&connection_id)) - }, - 12 => { - Box::new(obj.ws_server.get_connections_list()) - }, - 13 => { + // RetrieveBinaryFromVault(vault_key) let vault_key = params[0].get_string().unwrap_or_default(); Box::new(obj.retrieve_binary_from_vault(&vault_key)) }, - 14 => { + 7 => { + // GetLogs(count) let count = params[0].get_i32().unwrap_or(0) as usize; Box::new(obj.get_logs(count)) }, @@ -136,8 +94,7 @@ pub fn cal_func(obj: &mut AddIn, num: usize, params: &mut [Variant]) -> Box>, } @@ -146,8 +103,7 @@ impl AddIn { pub fn new() -> Self { let vault = BinaryVault::new(); AddIn { - http_server: HttpServer::new(vault.clone()), - ws_server: WebSocketServer::new(vault.clone()), + server: HttpServer::new(vault.clone()), vault, logger: None, } @@ -163,9 +119,7 @@ impl AddIn { let logger_arc = Arc::new(logger); self.logger = Some(logger_arc.clone()); - - self.http_server.set_logger(logger_arc.clone()); - self.ws_server.set_logger(logger_arc); + self.server.set_logger(logger_arc); Ok(()) } @@ -201,11 +155,8 @@ impl AddIn { impl Drop for AddIn { fn drop(&mut self) { - if self.http_server.is_started() { - let _ = self.http_server.stop(); - } - if self.ws_server.is_started() { - let _ = self.ws_server.stop(); + if self.server.is_started() { + let _ = self.server.stop(); } } } diff --git a/src/addins/http_server/src/http/server.rs b/src/addins/http_server/src/server.rs similarity index 100% rename from src/addins/http_server/src/http/server.rs rename to src/addins/http_server/src/server.rs diff --git a/src/addins/http_server/src/websocket/mod.rs b/src/addins/http_server/src/websocket/mod.rs deleted file mode 100644 index 0876e72503..0000000000 --- a/src/addins/http_server/src/websocket/mod.rs +++ /dev/null @@ -1,7 +0,0 @@ -mod backend; -mod server; -mod wrapper; - -pub use backend::WebSocketServerBackend; -pub use server::WebSocketServerState; -pub use wrapper::WebSocketServer; diff --git a/src/addins/http_server/src/http/wrapper.rs b/src/addins/http_server/src/wrapper.rs similarity index 98% rename from src/addins/http_server/src/http/wrapper.rs rename to src/addins/http_server/src/wrapper.rs index 7fd596b83f..dbc0b257c8 100644 --- a/src/addins/http_server/src/http/wrapper.rs +++ b/src/addins/http_server/src/wrapper.rs @@ -2,7 +2,7 @@ use std::sync::{Arc, Mutex}; use common_utils::utils::{json_error, json_success}; use common_binary::vault::BinaryVault; use common_logs::Logger; -use super::HttpServerBackend; +use crate::backend::HttpServerBackend; pub struct HttpServer { backend: Arc>, diff --git a/src/addins/ws_server/Cargo.lock b/src/addins/ws_server/Cargo.lock new file mode 100644 index 0000000000..74f3c1d8b2 --- /dev/null +++ b/src/addins/ws_server/Cargo.lock @@ -0,0 +1,1356 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 4 + +[[package]] +name = "addin1c" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef34e8b7ff4c43e87491a4cc30a4779a9f67c50db43378a36362c7a56246e05b" +dependencies = [ + "smallvec", + "utf16_lit", +] + +[[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 = "anyhow" +version = "1.0.102" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f202df86484c868dbad7eaa557ef785d5c66295e41b460ef922eca0723b842c" + +[[package]] +name = "atomic-waker" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" + +[[package]] +name = "autocfg" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8" + +[[package]] +name = "axum" +version = "0.8.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b52af3cb4058c895d37317bb27508dccc8e5f2d39454016b297bf4a400597b8" +dependencies = [ + "axum-core", + "base64", + "bytes", + "form_urlencoded", + "futures-util", + "http", + "http-body", + "http-body-util", + "hyper", + "hyper-util", + "itoa", + "matchit", + "memchr", + "mime", + "percent-encoding", + "pin-project-lite", + "serde_core", + "serde_json", + "serde_path_to_error", + "serde_urlencoded", + "sha1", + "sync_wrapper", + "tokio", + "tokio-tungstenite", + "tower", + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "axum-core" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08c78f31d7b1291f7ee735c1c6780ccde7785daae9a9206026862dab7d8792d1" +dependencies = [ + "bytes", + "futures-core", + "http", + "http-body", + "http-body-util", + "mime", + "pin-project-lite", + "sync_wrapper", + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "base64" +version = "0.22.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" + +[[package]] +name = "bitflags" +version = "2.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "843867be96c8daad0d758b57df9392b6d8d271134fce549de6ce169ff98a92af" + +[[package]] +name = "block-buffer" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" +dependencies = [ + "generic-array", +] + +[[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.58" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1e928d4b69e3077709075a938a05ffbedfa53a84c8f766efbf8220bb1ff60e1" +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 = "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", + "wasm-bindgen", + "windows-link", +] + +[[package]] +name = "common-binary" +version = "0.1.0" +dependencies = [ + "base64", + "serde_json", + "uuid", +] + +[[package]] +name = "common-core" +version = "0.1.0" +dependencies = [ + "addin1c", +] + +[[package]] +name = "common-logs" +version = "0.1.0" +dependencies = [ + "chrono", + "serde", + "serde_json", +] + +[[package]] +name = "common-server" +version = "0.1.0" +dependencies = [ + "common-binary", + "common-logs", + "common-utils", + "futures-util", + "indexmap", + "serde_json", + "tokio", + "uuid", +] + +[[package]] +name = "common-utils" +version = "0.1.0" +dependencies = [ + "serde_json", +] + +[[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.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59ed5838eebb26a2bb2e58f6d5b5316989ae9d08bab10e0e6d103e656d1b0280" +dependencies = [ + "libc", +] + +[[package]] +name = "crypto-common" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78c8292055d1c1df0cce5d180393dc8cce0abec0a7102adb6c7b1eef6016d60a" +dependencies = [ + "generic-array", + "typenum", +] + +[[package]] +name = "data-encoding" +version = "2.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d7a1e2f27636f116493b8b860f5546edb47c8d8f8ea73e1d2a20be88e28d1fea" + +[[package]] +name = "digest" +version = "0.10.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" +dependencies = [ + "block-buffer", + "crypto-common", +] + +[[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", +] + +[[package]] +name = "find-msvc-tools" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5baebc0774151f905a1a2cc41989300b1e6fbb29aff0ceffa1064fdd3088d582" + +[[package]] +name = "foldhash" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2" + +[[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-channel" +version = "0.3.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07bbe89c50d7a535e539b8c17bc0b49bdb77747034daa8087407d655f3f7cc1d" +dependencies = [ + "futures-core", +] + +[[package]] +name = "futures-core" +version = "0.3.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e3450815272ef58cec6d564423f6e755e25379b217b0bc688e295ba24df6b1d" + +[[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-core", + "futures-macro", + "futures-sink", + "futures-task", + "pin-project-lite", + "slab", +] + +[[package]] +name = "generic-array" +version = "0.14.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" +dependencies = [ + "typenum", + "version_check", +] + +[[package]] +name = "getrandom" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd" +dependencies = [ + "cfg-if", + "libc", + "r-efi 5.3.0", + "wasip2", +] + +[[package]] +name = "getrandom" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0de51e6874e94e7bf76d726fc5d13ba782deca734ff60d5bb2fb2607c7406555" +dependencies = [ + "cfg-if", + "libc", + "r-efi 6.0.0", + "wasip2", + "wasip3", +] + +[[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 = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3ba2a386d7f85a81f119ad7498ebe444d2e22c2af0b86b069416ace48b3311a" +dependencies = [ + "bytes", + "itoa", +] + +[[package]] +name = "http-body" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" +dependencies = [ + "bytes", + "http", +] + +[[package]] +name = "http-body-util" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b021d93e26becf5dc7e1b75b1bed1fd93124b374ceb73f43d4d4eafec896a64a" +dependencies = [ + "bytes", + "futures-core", + "http", + "http-body", + "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 = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2ab2d4f250c3d7b1c9fcdff1cece94ea4e2dfbec68614f7b87cb205f24ca9d11" +dependencies = [ + "atomic-waker", + "bytes", + "futures-channel", + "futures-core", + "http", + "http-body", + "httparse", + "httpdate", + "itoa", + "pin-project-lite", + "pin-utils", + "smallvec", + "tokio", +] + +[[package]] +name = "hyper-util" +version = "0.1.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96547c2556ec9d12fb1578c4eaf448b04993e7fb79cbaad930a656880a6bdfa0" +dependencies = [ + "bytes", + "http", + "http-body", + "hyper", + "pin-project-lite", + "tokio", + "tower-service", +] + +[[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 = "id-arena" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d3067d79b975e8844ca9eb072e16b31c3c1c36928edf9c6789548c524d0d954" + +[[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 = "itoa" +version = "1.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f42a60cbdf9a97f5d2305f08a87dc4e09308d1276d28c869c684d7777685682" + +[[package]] +name = "js-sys" +version = "0.3.91" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b49715b7073f385ba4bc528e5747d02e66cb39c6146efb66b781f131f0fb399c" +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.183" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5b646652bf6661599e1da8901b3b9522896f01e736bad5f723fe7a3a27f899d" + +[[package]] +name = "lock_api" +version = "0.4.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "224399e74b87b5f3557511d98dff8b14089b3dadafcab6bb93eab67d3aace965" +dependencies = [ + "scopeguard", +] + +[[package]] +name = "log" +version = "0.4.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897" + +[[package]] +name = "matchit" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "47e1ffaa40ddd1f3ed91f717a33c8c0ee23fff369e3aa8772b9605cc1d22f4c3" + +[[package]] +name = "memchr" +version = "2.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8ca58f447f06ed17d5fc4043ce1b10dd205e060fb3ce5b979b8ed8e59ff3f79" + +[[package]] +name = "mime" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" + +[[package]] +name = "mio" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a69bcab0ad47271a0234d9422b131806bf3968021e5dc9328caf2d4cd58557fc" +dependencies = [ + "libc", + "wasi", + "windows-sys", +] + +[[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.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f7c3e4beb33f85d45ae3e3a1792185706c8e16d043238c593331cc7cd313b50" + +[[package]] +name = "opi_wsserver" +version = "0.1.0" +dependencies = [ + "axum", + "common-binary", + "common-core", + "common-logs", + "common-server", + "common-utils", + "futures-util", + "serde", + "serde_json", + "tokio", +] + +[[package]] +name = "parking_lot" +version = "0.12.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93857453250e3077bd71ff98b6a65ea6621a19bb0f559a85248955ac12c45a1a" +dependencies = [ + "lock_api", + "parking_lot_core", +] + +[[package]] +name = "parking_lot_core" +version = "0.9.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2621685985a2ebf1c516881c026032ac7deafcda1a2c9b7850dc81e3dfcb64c1" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall", + "smallvec", + "windows-link", +] + +[[package]] +name = "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.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a89322df9ebe1c1578d689c92318e070967d1042b512afbe49518723f4e6d5cd" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "ppv-lite86" +version = "0.2.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9" +dependencies = [ + "zerocopy", +] + +[[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.45" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41f2619966050689382d2b44f664f4bc593e129785a36d6ee376ddf37259b924" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "r-efi" +version = "5.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f" + +[[package]] +name = "r-efi" +version = "6.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8dcc9c7d52a811697d2151c701e0d08956f92b0e24136cf4cf27b57a6a0d9bf" + +[[package]] +name = "rand" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1" +dependencies = [ + "rand_chacha", + "rand_core", +] + +[[package]] +name = "rand_chacha" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb" +dependencies = [ + "ppv-lite86", + "rand_core", +] + +[[package]] +name = "rand_core" +version = "0.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76afc826de14238e6e8c374ddcc1fa19e374fd8dd986b0d2af0d02377261d83c" +dependencies = [ + "getrandom 0.3.4", +] + +[[package]] +name = "redox_syscall" +version = "0.5.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed2bf2547551a7053d6fdfafda3f938979645c44812fbfcda098faae3f1a362d" +dependencies = [ + "bitflags", +] + +[[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 = "scopeguard" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" + +[[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_path_to_error" +version = "0.1.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "10a9ff822e371bb5403e391ecd83e182e0e77ba7f6fe0160b795797109d1b457" +dependencies = [ + "itoa", + "serde", + "serde_core", +] + +[[package]] +name = "serde_urlencoded" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" +dependencies = [ + "form_urlencoded", + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "sha1" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + +[[package]] +name = "shlex" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" + +[[package]] +name = "signal-hook-registry" +version = "1.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4db69cba1110affc0e9f7bcd48bbf87b3f4fc7c61fc9155afd4c469eb3d6c1b" +dependencies = [ + "errno", + "libc", +] + +[[package]] +name = "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.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a766e1110788c36f4fa1c2b71b387a7815aa65f88ce0229841826633d93723e" +dependencies = [ + "libc", + "windows-sys", +] + +[[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 = "sync_wrapper" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0bf256ce5efdfa370213c1dabab5935a12e49f2c58d15e9eac2870d3b4f27263" + +[[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 = "tokio" +version = "1.50.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "27ad5e34374e03cfffefc301becb44e9dc3c17584f414349ebe29ed26661822d" +dependencies = [ + "bytes", + "libc", + "mio", + "parking_lot", + "pin-project-lite", + "signal-hook-registry", + "socket2", + "tokio-macros", + "windows-sys", +] + +[[package]] +name = "tokio-macros" +version = "2.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c55a2eff8b69ce66c84f85e1da1c233edc36ceb85a2058d11b0d6a3c7e7569c" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "tokio-tungstenite" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d25a406cddcc431a75d3d9afc6a7c0f7428d4891dd973e4d54c56b46127bf857" +dependencies = [ + "futures-util", + "log", + "tokio", + "tungstenite", +] + +[[package]] +name = "tower" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ebe5ef63511595f1344e2d5cfa636d973292adc0eec1f0ad45fae9f0851ab1d4" +dependencies = [ + "futures-core", + "futures-util", + "pin-project-lite", + "sync_wrapper", + "tokio", + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "tower-layer" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e" + +[[package]] +name = "tower-service" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" + +[[package]] +name = "tracing" +version = "0.1.44" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "63e71662fa4b2a2c3a26f570f037eb95bb1f85397f3cd8076caed2f026a6d100" +dependencies = [ + "log", + "pin-project-lite", + "tracing-core", +] + +[[package]] +name = "tracing-core" +version = "0.1.36" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db97caf9d906fbde555dd62fa95ddba9eecfd14cb388e4f491a66d74cd5fb79a" +dependencies = [ + "once_cell", +] + +[[package]] +name = "tungstenite" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8628dcc84e5a09eb3d8423d6cb682965dea9133204e8fb3efee74c2a0c259442" +dependencies = [ + "bytes", + "data-encoding", + "http", + "httparse", + "log", + "rand", + "sha1", + "thiserror", + "utf-8", +] + +[[package]] +name = "typenum" +version = "1.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "562d481066bde0658276a35467c4af00bdc6ee726305698a55b86e61d7ad82bb" + +[[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 = "utf-8" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" + +[[package]] +name = "utf16_lit" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14706d2a800ee8ff38c1d3edb873cd616971ea59eb7c0d046bb44ef59b06a1ae" + +[[package]] +name = "uuid" +version = "1.23.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ac8b6f42ead25368cf5b098aeb3dc8a1a2c05a3eee8a9a1a68c640edbfc79d9" +dependencies = [ + "getrandom 0.4.2", + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "version_check" +version = "0.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" + +[[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.114" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6532f9a5c1ece3798cb1c2cfdba640b9b3ba884f5db45973a6f442510a87d38e" +dependencies = [ + "cfg-if", + "once_cell", + "rustversion", + "wasm-bindgen-macro", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.114" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18a2d50fcf105fb33bb15f00e7a77b772945a2ee45dcf454961fd843e74c18e6" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.114" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03ce4caeaac547cdf713d280eda22a730824dd11e6b8c3ca9e42247b25c631e3" +dependencies = [ + "bumpalo", + "proc-macro2", + "quote", + "syn", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.114" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75a326b8c223ee17883a4251907455a2431acc2791c98c26279376490c378c16" +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.61.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae137229bcbd6cdf0f7b80a31df61766145077ddf49416a728b02cb3921ff3fc" +dependencies = [ + "windows-link", +] + +[[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 = "zerocopy" +version = "0.8.47" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "efbb2a062be311f2ba113ce66f697a4dc589f85e78a4aea276200804cea0ed87" +dependencies = [ + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.8.47" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e8bc7269b54418e7aeeef514aa68f8690b8c0489a06b0136e5f57c4c5ccab89" +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/src/addins/ws_server/Cargo.toml b/src/addins/ws_server/Cargo.toml new file mode 100644 index 0000000000..25edd6e016 --- /dev/null +++ b/src/addins/ws_server/Cargo.toml @@ -0,0 +1,28 @@ +[package] +name = "opi_wsserver" +version = "0.1.0" +license = "MIT" +edition = "2021" + +[lib] +crate-type = ["cdylib"] + +[profile.release] +lto = "fat" +codegen-units = 1 +panic = "unwind" +strip = true +opt-level = "z" + +[dependencies] +common-core = { path = "../commons/common-core" } +common-utils = { path = "../commons/common-utils" } +common-binary = { path = "../commons/common-binary" } +common-logs = { path = "../commons/common-logs" } +common-server = { path = "../commons/common-server" } + +serde = { version = "1.0", features = ["derive"] } +serde_json = "1.0" +tokio = { version = "1.0", features = ["full"] } +axum = { version = "0.8.8", features = ["ws"] } +futures-util = "0.3" diff --git a/src/addins/ws_server/deny.toml b/src/addins/ws_server/deny.toml new file mode 100644 index 0000000000..a831dc72bf --- /dev/null +++ b/src/addins/ws_server/deny.toml @@ -0,0 +1,2 @@ +[advisories] +version = 2 diff --git a/src/addins/ws_server/dependencies.log b/src/addins/ws_server/dependencies.log new file mode 100644 index 0000000000..da7e959eb4 --- /dev/null +++ b/src/addins/ws_server/dependencies.log @@ -0,0 +1,17 @@ +"MAIN ---" + linux-vdso.so.1 (0x00007ffdd3db9000) + libm.so.6 => /lib64/libm.so.6 (0x000072fded200000) + libpthread.so.0 => /lib64/libpthread.so.0 (0x000072fdece00000) + libc.so.6 => /lib64/libc.so.6 (0x000072fdeca00000) + libdl.so.2 => /lib64/libdl.so.2 (0x000072fdec600000) + /lib64/ld-linux-x86-64.so.2 (0x000072fded600000) +GLIBC_2.2.5 +GLIBC_2.12 +GLIBC_2.3 +GLIBC_2.3.2 +GLIBC_2.3.4 +GLIBC_2.7 +GLIBC_2.9 +GLIBC_2.10 +GLIBC_2.14 +GLIBC_2.17 diff --git a/src/addins/ws_server/release.bat b/src/addins/ws_server/release.bat new file mode 100644 index 0000000000..885a7471e6 --- /dev/null +++ b/src/addins/ws_server/release.bat @@ -0,0 +1,9 @@ +@echo off + +:: Установить переменную +set CARGO_NAME=opi_wsserver +set LIB_NAME=OPI_WSServer +set ADDIN_DIR=%~dp0 +set FOLV=true + +call ../build.bat \ No newline at end of file diff --git a/src/addins/http_server/src/websocket/backend.rs b/src/addins/ws_server/src/backend.rs similarity index 99% rename from src/addins/http_server/src/websocket/backend.rs rename to src/addins/ws_server/src/backend.rs index 40a8540ff6..47011f3399 100644 --- a/src/addins/http_server/src/websocket/backend.rs +++ b/src/addins/ws_server/src/backend.rs @@ -4,7 +4,7 @@ use common_utils::utils::{json_error, json_success}; use common_binary::vault::BinaryVault; use common_logs::Logger; use common_server::{Backend, send_command, handle_async_command, handle_sync_command}; -use super::WebSocketServerState; +use crate::server::WebSocketServerState; pub struct WebSocketServerBackend { backend: Backend, diff --git a/src/addins/ws_server/src/lib.rs b/src/addins/ws_server/src/lib.rs new file mode 100644 index 0000000000..1a95ad85d2 --- /dev/null +++ b/src/addins/ws_server/src/lib.rs @@ -0,0 +1,160 @@ +mod backend; +mod server; +mod wrapper; + +use std::sync::Arc; +use common_core::*; +use common_utils::utils::json_error; +use common_binary::vault::BinaryVault; +use common_logs::Logger; +use wrapper::WebSocketServer; + +impl_addin_exports!(AddIn); +impl_raw_addin!(AddIn, METHODS, PROPS, get_params_amount, cal_func); + +pub const METHODS: &[&[u16]] = &[ + name!("Start"), // 0 + name!("Stop"), // 1 + name!("GetNextMessage"), // 2 + name!("GetMessage"), // 3 + name!("SendMessage"), // 4 + name!("CloseConnection"), // 5 + name!("ListConnections"), // 6 + name!("RetrieveBinaryFromVault"), // 7 + name!("GetLogs"), // 8 +]; + +pub fn get_params_amount(num: usize) -> usize { + match num { + 0 => 3, // Start(port, config_json, logger_config_json) + 1 => 0, // Stop() + 2 => 1, // GetNextMessage(timeout_ms) + 3 => 2, // GetMessage(connection_id, timeout_ms) + 4 => 2, // SendMessage(connection_id, message) + 5 => 1, // CloseConnection(connection_id) + 6 => 0, // ListConnections() + 7 => 1, // RetrieveBinaryFromVault(vault_key) + 8 => 1, // GetLogs(count) + _ => 0, + } +} + +pub fn cal_func(obj: &mut AddIn, num: usize, params: &mut [Variant]) -> Box { + let empty_array: [u8; 0] = []; + + match num { + 0 => { + let port = params[0].get_i32().unwrap_or(8080) as u16; + let config = params[1].get_string().unwrap_or_default(); + let logger_config = params[2].get_string().unwrap_or_default(); + + if let Err(e) = obj.init_logger_if_needed(&logger_config) { + return Box::new(json_error(&e)); + }; + Box::new(obj.server.start(port, &config)) + }, + 1 => { + Box::new(obj.server.stop()) + }, + 2 => { + let timeout_ms = params[0].get_i32().unwrap_or(1000) as u64; + Box::new(obj.server.get_next_message(timeout_ms)) + }, + 3 => { + let connection_id = params[0].get_string().unwrap_or_default(); + let timeout_ms = params[1].get_i32().unwrap_or(1000) as u64; + Box::new(obj.server.get_message(&connection_id, timeout_ms)) + }, + 4 => { + let connection_id = params[0].get_string().unwrap_or_default(); + let message = params[1].get_blob().unwrap_or(&empty_array); + Box::new(obj.server.send_message(&connection_id, message.to_vec())) + }, + 5 => { + let connection_id = params[0].get_string().unwrap_or_default(); + Box::new(obj.server.close_connection(&connection_id)) + }, + 6 => { + Box::new(obj.server.get_connections_list()) + }, + 7 => { + let vault_key = params[0].get_string().unwrap_or_default(); + Box::new(obj.retrieve_binary_from_vault(&vault_key)) + }, + 8 => { + let count = params[0].get_i32().unwrap_or(0) as usize; + Box::new(obj.get_logs(count)) + }, + _ => Box::new(false), + } +} + +pub const PROPS: &[&[u16]] = &[]; + +pub struct AddIn { + server: WebSocketServer, + vault: BinaryVault, + logger: Option>, +} + +impl AddIn { + pub fn new() -> Self { + let vault = BinaryVault::new(); + AddIn { + server: WebSocketServer::new(vault.clone()), + vault, + logger: None, + } + } + + fn init_logger_if_needed(&mut self, logger_config: &str) -> Result<(), String> { + if logger_config.is_empty() || self.logger.is_some() { + return Ok(()); + } + + let logger = Logger::from_json(logger_config) + .map_err(|e| format!("Failed to initialize logger: {}", e))?; + + let logger_arc = Arc::new(logger); + self.logger = Some(logger_arc.clone()); + self.server.set_logger(logger_arc); + + Ok(()) + } + + pub fn get_logs(&self, count: usize) -> String { + if let Some(ref logger) = self.logger { + let logs = logger.get_last_logs(count); + let total = logger.len(); + + serde_json::json!({ + "result": true, + "logs": logs, + "total": total, + "returned": logs.len() + }).to_string() + } else { + json_error("Logger not initialized") + } + } + + pub fn retrieve_binary_from_vault(&self, vault_key: &str) -> Vec { + self.vault.retrieve(&vault_key.to_string()).unwrap_or_else(|_| Vec::new()) + } + + pub fn get_field_ptr(&self, _index: usize) -> *const dyn getset::ValueType { + panic!("Index out of bounds") + } + + pub fn get_field_ptr_mut(&mut self, index: usize) -> *mut dyn getset::ValueType { + self.get_field_ptr(index) as *mut _ + } +} + +impl Drop for AddIn { + fn drop(&mut self) { + if self.server.is_started() { + let _ = self.server.stop(); + } + } +} diff --git a/src/addins/http_server/src/websocket/server.rs b/src/addins/ws_server/src/server.rs similarity index 95% rename from src/addins/http_server/src/websocket/server.rs rename to src/addins/ws_server/src/server.rs index c72f024945..5887893e34 100644 --- a/src/addins/http_server/src/websocket/server.rs +++ b/src/addins/ws_server/src/server.rs @@ -138,17 +138,14 @@ impl WebSocketServerState { let message_handler = MessageHandler::new(self.vault.clone()); let result = waiter.wait_for(|| { - // First check for new connections if let Some(ref mut conn_rx) = self.connection_rx { if let Ok(connection_id) = conn_rx.try_recv() { - return Some((connection_id, None)); // New connection, no message yet + return Some((connection_id, None)); } } - - // Then check for messages from existing connections + if let Some(ref mut msg_rx) = self.message_rx { if let Ok((conn_id, msg)) = msg_rx.try_recv() { - // Check if connection still exists by trying to get it let exists = self.manager.get_mut(&conn_id, |_| {}).is_some(); if exists { return Some((conn_id, Some(msg))); @@ -278,16 +275,13 @@ async fn handle_websocket(socket: WebSocket, state: Arc {}, _ = recv_task => {}, diff --git a/src/addins/http_server/src/websocket/wrapper.rs b/src/addins/ws_server/src/wrapper.rs similarity index 98% rename from src/addins/http_server/src/websocket/wrapper.rs rename to src/addins/ws_server/src/wrapper.rs index 93d8738a27..9e74d2171c 100644 --- a/src/addins/http_server/src/websocket/wrapper.rs +++ b/src/addins/ws_server/src/wrapper.rs @@ -2,7 +2,7 @@ use std::sync::{Arc, Mutex}; use common_utils::utils::{json_error, json_success}; use common_binary::vault::BinaryVault; use common_logs::Logger; -use super::WebSocketServerBackend; +use crate::backend::WebSocketServerBackend; pub struct WebSocketServer { backend: Arc>, diff --git a/src/ru/OPI/src/CommonTemplates/OPI_HTTPServer/OPI_HTTPServer.mdo b/src/ru/OPI/src/CommonTemplates/OPI_HTTPServer/OPI_HTTPServer.mdo new file mode 100644 index 0000000000..a1efa3a91c --- /dev/null +++ b/src/ru/OPI/src/CommonTemplates/OPI_HTTPServer/OPI_HTTPServer.mdo @@ -0,0 +1,9 @@ + + + OPI_HTTPServer + + ru + Компонента HTTP-сервера (ОПИ) + + AddIn + diff --git a/src/ru/OPI/src/CommonTemplates/OPI_HTTPServer/Template.addin b/src/ru/OPI/src/CommonTemplates/OPI_HTTPServer/Template.addin new file mode 100644 index 0000000000..3aad49dcd3 --- /dev/null +++ b/src/ru/OPI/src/CommonTemplates/OPI_HTTPServer/Template.addin @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:474175e80ac4c75ac6730fe4fd1583c922a22ffd7a39c255b43cc83b3f32e90d +size 1966227 diff --git a/src/ru/OPI/src/CommonTemplates/OPI_WSServer/OPI_WSServer.mdo b/src/ru/OPI/src/CommonTemplates/OPI_WSServer/OPI_WSServer.mdo new file mode 100644 index 0000000000..30b94fa092 --- /dev/null +++ b/src/ru/OPI/src/CommonTemplates/OPI_WSServer/OPI_WSServer.mdo @@ -0,0 +1,9 @@ + + + OPI_WSServer + + ru + Компонента Websocket-сервера (ОПИ) + + AddIn + diff --git a/src/ru/OPI/src/CommonTemplates/OPI_WSServer/Template.addin b/src/ru/OPI/src/CommonTemplates/OPI_WSServer/Template.addin new file mode 100644 index 0000000000..ab49ebf3a3 --- /dev/null +++ b/src/ru/OPI/src/CommonTemplates/OPI_WSServer/Template.addin @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d90e5e9f3eeec8226255880f549e4d51762a2282e63d1c55d4fbbaca73008ddb +size 2124255 diff --git a/src/ru/OPI/src/Configuration/Configuration.mdo b/src/ru/OPI/src/Configuration/Configuration.mdo index d846b01f72..b4ab532cc6 100644 --- a/src/ru/OPI/src/Configuration/Configuration.mdo +++ b/src/ru/OPI/src/Configuration/Configuration.mdo @@ -47,6 +47,7 @@ CommonTemplate.OPI_Cryptography CommonTemplate.OPI_FTP CommonTemplate.OPI_GRPC + CommonTemplate.OPI_HTTPServer CommonTemplate.OPI_MongoDB CommonTemplate.OPI_MSSQL CommonTemplate.OPI_MySQL @@ -56,6 +57,7 @@ CommonTemplate.OPI_SSH CommonTemplate.OPI_TCPClient CommonTemplate.OPI_TCPServer + CommonTemplate.OPI_WSServer CommonTemplate.OPI_Text_ClickHouseProto CommonTemplate.OPI_Text_MethodSettings CommonModule.OPI_Airtable