feat: Adding features for SystemD and RPC (#195)

* feat: Adding features for SystemD and RPC

* fix: patch examples

Author: satlead

Cargo.toml

@@ -27,4 +27,4 @@ members = [
 ]
 
 [workspace.package]
-version = "0.7.0"
+version = "0.8.0"

core/launcher/Cargo.toml

@@ -17,7 +17,7 @@
 
 [package]
 name = "launcher"
-version = "0.7.0"
+version = "0.8.0"
 edition = "2021"
 
 # See more keys and their definitions at https:#doc.rust-lang.org/cargo/reference/manifest.html

core/main/Cargo.toml

@@ -17,7 +17,7 @@
 
 [package]
 name = "main"
-version = "0.7.0"
+version = "0.8.0"
 edition = "2021"
 repository = "https://github.com/rdkcentral/Ripple"
 build = "build.rs"
@@ -28,8 +28,12 @@ build = "build.rs"
 name = "ripple"
 path = "src/main.rs"
 
+[features]
+local_dev=[]
+sysd=["dep:sd-notify"]
+
 [dependencies]
-ripple_sdk = { path = "../sdk" }
+ripple_sdk = { path = "../sdk", features = ["full"] }
 jsonrpsee = { version = "0.9.0", features = ["macros", "ws-server"] }
 futures-channel = "0.3.21"
 futures = "0.3.21"
@@ -40,6 +44,7 @@ arrayvec = "0.7.2"
 regex = "=1.7.3"
 serde_json = "1.0"
 base64 = "0.13.0"
+sd-notify = { version = "0.4.1", optional = true }
 
 [build-dependencies]
 vergen = "1"

core/main/src/bootstrap/start_fbgateway_step.rs

@@ -100,8 +100,14 @@ impl Bootstep<BootstrapState> for FireboltGatewayStep {
             .get_client()
             .add_request_processor(RpcGatewayProcessor::new(state.platform_state.get_client()));
         debug!("Adding RPC gateway processor");
+        #[cfg(feature = "sysd")]
+        if let Ok(_) = sd_notify::booted() {
+            if let Err(_) = sd_notify::notify(false, &[sd_notify::NotifyState::Ready]) {
+                return Err(RippleError::BootstrapError);
+            }
+        }
+
         gateway.start().await;
-        debug!("Handlers initialized");
         Ok(())
     }
 }

core/sdk/Cargo.toml

@@ -17,11 +17,17 @@
 
 [package]
 name = "ripple_sdk"
-version = "0.7.0"
+version = "0.8.0"
 edition = "2021"
 repository = "https://github.com/rdkcentral/Ripple"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
+[features]
+default=[]
+rpc=["dep:jsonrpsee-core"]
+full=["rpc"]
+sysd=[]
+
 [dependencies]
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
@@ -36,5 +42,5 @@ crossbeam = "0.8.2"
 tokio = { version = "1.16.1", features = ["macros", "sync", "rt-multi-thread", "signal", "time"] }
 uuid = { version = "1.1.2", features = ["serde", "v5", "v4"] }
 futures = "0.3.21"
-jsonrpsee-core = { version = "0.9.0", features = ["server"] }
+jsonrpsee-core = { version = "0.9.0", features = ["server"], optional = true }
 regex = "=1.7.3"

core/sdk/src/api/apps.rs

@@ -199,12 +199,6 @@ pub enum AppError {
     AppNotReady,
 }
 
-impl From<AppError> for jsonrpsee_core::Error {
-    fn from(err: AppError) -> Self {
-        jsonrpsee_core::Error::Custom(format!("Internal failure: {:?}", err))
-    }
-}
-
 #[derive(Debug, Clone)]
 pub enum AppMethod {
     Launch(LaunchRequest),

core/sdk/src/api/device/device_peristence.rs

@@ -20,8 +20,7 @@ use crate::{
     framework::ripple_contract::RippleContract,
 };
 use chrono::Utc;
-use jsonrpsee_core::Serialize;
-use serde::Deserialize;
+use serde::{Deserialize, Serialize};
 use serde_json::Value;
 
 use super::device_request::DeviceRequest;

core/sdk/src/api/firebolt/fb_authentication.rs

@@ -15,8 +15,7 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
-use jsonrpsee_core::Serialize;
-use serde::Deserialize;
+use serde::{Deserialize, Serialize};
 
 use crate::{
     api::session::TokenType,

core/sdk/src/extn/ffi/ffi_jsonrpsee.rs

@@ -15,7 +15,7 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
-use crate::extn::client::extn_sender::ExtnSender;
+use crate::{api::apps::AppError, extn::client::extn_sender::ExtnSender};
 use crossbeam::channel::Receiver as CReceiver;
 use jsonrpsee_core::server::rpc_module::Methods;
 use libloading::{Library, Symbol};
@@ -57,3 +57,9 @@ pub unsafe fn load_jsonrpsee_methods(lib: &Library) -> Option<Box<JsonRpseeExtnB
     }
     None
 }
+
+impl From<AppError> for jsonrpsee_core::Error {
+    fn from(err: AppError) -> Self {
+        jsonrpsee_core::Error::Custom(format!("Internal failure: {:?}", err))
+    }
+}

core/sdk/src/extn/ffi/mod.rs

@@ -16,6 +16,7 @@
 //
 
 pub mod ffi_channel;
+#[cfg(feature = "rpc")]
 pub mod ffi_jsonrpsee;
 pub mod ffi_library;
 pub mod ffi_message;