From 67ebb3733a2f23d7e6ba5b19ec880608d56e3221 Mon Sep 17 00:00:00 2001
From: Dima Dorezyuk <ddo@qwello.eu>
Date: Thu, 6 Feb 2025 11:40:19 +0100
Subject: [PATCH] Rust: fix optinal connection and add tests

Signed-off-by: Dima Dorezyuk <ddo@qwello.eu>
---
 everestrs/everestrs-build/src/codegen.rs      |  2 +-
 .../modules/RsOptionalConnection/BUILD.bazel  | 35 ++++++++++++
 .../RsOptionalConnection/manifest.yaml        | 15 +++++
 .../modules/RsOptionalConnection/src/main.rs  | 57 +++++++++++++++++++
 4 files changed, 108 insertions(+), 1 deletion(-)
 create mode 100644 everestrs/tests/modules/RsOptionalConnection/BUILD.bazel
 create mode 100644 everestrs/tests/modules/RsOptionalConnection/manifest.yaml
 create mode 100644 everestrs/tests/modules/RsOptionalConnection/src/main.rs

diff --git a/everestrs/everestrs-build/src/codegen.rs b/everestrs/everestrs-build/src/codegen.rs
index ef4ea680..d0a8930d 100644
--- a/everestrs/everestrs-build/src/codegen.rs
+++ b/everestrs/everestrs-build/src/codegen.rs
@@ -791,7 +791,7 @@ pub fn emit(manifest_path: PathBuf, everest_core: Vec<PathBuf>) -> Result<String
     let module_config = emit_config(manifest.config);
     let requires_with_generics = requires
         .iter()
-        .any(|elem| elem.min_connections != 0 || elem.max_connections != 1);
+        .any(|elem| elem.min_connections != 1 || elem.max_connections != 1);
 
     let involved_errors = provided_interfaces
         .iter()
diff --git a/everestrs/tests/modules/RsOptionalConnection/BUILD.bazel b/everestrs/tests/modules/RsOptionalConnection/BUILD.bazel
new file mode 100644
index 00000000..847690c2
--- /dev/null
+++ b/everestrs/tests/modules/RsOptionalConnection/BUILD.bazel
@@ -0,0 +1,35 @@
+load("@rules_rust//rust:defs.bzl", "rust_binary", "rust_test")
+load("@rules_rust//cargo:defs.bzl", "cargo_build_script")
+
+cargo_build_script(
+    name = "build_script",
+    srcs = ["build.rs"],
+    edition="2021",
+    build_script_env = {
+        "EVEREST_CORE_ROOT": "../..",
+    },
+    deps = [
+        "@everest-framework//everestrs/everestrs-build",
+    ],
+    data= [
+        "//everestrs/tests/types",
+        "//everestrs/tests/interfaces",
+        "//everestrs/tests/errors",
+        "manifest.yaml",
+    ],
+)
+
+# For now just a compilation test
+rust_binary(
+    name = "RsOptionalConnection",
+    srcs = glob(["src/**/*.rs"]),
+    visibility = ["//visibility:public"],
+    edition = "2021",
+    deps = [
+        "@crate_index//:log",
+        "@everest-framework//everestrs/everestrs",
+        "@everest-framework//everestrs/everestrs:everestrs_sys",
+        "@everest-framework//everestrs/everestrs:everestrs_bridge",
+        ":build_script",
+    ],
+)
diff --git a/everestrs/tests/modules/RsOptionalConnection/manifest.yaml b/everestrs/tests/modules/RsOptionalConnection/manifest.yaml
new file mode 100644
index 00000000..d0e5755f
--- /dev/null
+++ b/everestrs/tests/modules/RsOptionalConnection/manifest.yaml
@@ -0,0 +1,15 @@
+description: The tests how to use optinal connections in Rust
+provides:
+  foobar:
+    interface: example
+    description: An example interface.
+requires:
+  optional_connection:
+    interface: example
+    min_connections: 0
+    max_connections: 1
+metadata:
+  license: https://opensource.org/licenses/Apache-2.0
+  authors:
+    - Everest authors
+enable_external_mqtt: false
diff --git a/everestrs/tests/modules/RsOptionalConnection/src/main.rs b/everestrs/tests/modules/RsOptionalConnection/src/main.rs
new file mode 100644
index 00000000..4901d9d1
--- /dev/null
+++ b/everestrs/tests/modules/RsOptionalConnection/src/main.rs
@@ -0,0 +1,57 @@
+#![allow(non_snake_case)]
+include!(concat!(env!("OUT_DIR"), "/generated.rs"));
+
+use generated::{
+    Context, ExampleClientSubscriber, ExampleServiceSubscriber, Module,
+    ModulePublisher, OnReadySubscriber,
+};
+use std::sync::Arc;
+use std::{thread, time};
+
+pub struct OptionalConnection {}
+
+impl ExampleServiceSubscriber for OptionalConnection {
+    fn uses_something(&self, _context: &Context, key: String) -> ::everestrs::Result<bool> {
+        log::info!("Received {key}");
+        Ok(&key == "hello")
+    }
+}
+
+impl ExampleClientSubscriber for OptionalConnection {
+    fn on_max_current(&self, _context: &Context, value: f64) {
+        log::info!("Received {value}");
+    }
+
+    fn on_error_raised(&self, _context: &Context, error: crate::generated::errors::example::Error) {
+        log::info!("Recieved an error {error:?}");
+    }
+
+    fn on_error_cleared(
+        &self,
+        _context: &Context,
+        error: crate::generated::errors::example::Error,
+    ) {
+        log::info!("Cleared an error {error:?} - what a relief");
+    }
+}
+
+impl OnReadySubscriber for OptionalConnection {
+    fn on_ready(&self, publishers: &ModulePublisher) {
+        log::info!("Ready");
+        if let Some(publisher) = publishers.optional_connection_slots.get(0) {
+            let res = publisher.uses_something("hello".to_string()).unwrap();
+            assert!(res);
+        }
+    }
+}
+
+fn main() {
+    let one_class = Arc::new(OptionalConnection {});
+    let _module = Module::new(one_class.clone(), one_class.clone(), |_index| {one_class.clone()});
+    log::info!("Module initialized");
+
+    loop {
+        let dt = time::Duration::from_millis(250);
+        thread::sleep(dt);
+    }
+}