diff --git a/core/launcher/src/manager/app_launcher.rs b/core/launcher/src/manager/app_launcher.rs index ea3ce7e77..3426ef415 100644 --- a/core/launcher/src/manager/app_launcher.rs +++ b/core/launcher/src/manager/app_launcher.rs @@ -25,7 +25,7 @@ use ripple_sdk::{ api::{ apps::{ AppBasicInfo, AppError, AppLaunchInfo, AppManagerResponse, AppResponse, AppRuntime, - AppRuntimeTransport, AppSession, CloseReason, Dimensions, StateChange, + AppSession, CloseReason, Dimensions, StateChange, }, device::{ device_browser::{BrowserNameRequestParams, BrowserRequest}, @@ -540,14 +540,6 @@ impl AppLauncher { } } - fn get_transport(contract_permited: bool, url: &str) -> AppRuntimeTransport { - if !url.contains("__firebolt_endpoint") && contract_permited { - AppRuntimeTransport::Bridge - } else { - AppRuntimeTransport::Websocket - } - } - pub async fn pre_launch( state: &LauncherState, manifest: AppManifest, @@ -564,10 +556,7 @@ impl AppLauncher { catalog: manifest.content_catalog.clone(), url: Some(manifest.start_page.clone()), }, - runtime: Some(AppRuntime { - id: Some(callsign), - transport: Self::get_transport(bool_contract, &manifest.start_page), - }), + runtime: Some(AppRuntime { id: Some(callsign) }), launch: AppLaunchInfo { intent: Some(intent), second_screen: None, diff --git a/core/main/src/broker/endpoint_broker.rs b/core/main/src/broker/endpoint_broker.rs index 9ba446946..d1ac4939a 100644 --- a/core/main/src/broker/endpoint_broker.rs +++ b/core/main/src/broker/endpoint_broker.rs @@ -49,8 +49,7 @@ use crate::{ service::extn::ripple_client::RippleClient, state::{metrics_state::MetricsState, platform_state::PlatformState}, utils::router_utils::{ - add_telemetry_status_code, capture_stage, get_rpc_header, return_api_message_for_transport, - return_extn_response, + add_telemetry_status_code, capture_stage, get_rpc_header, return_extn_response, }, }; @@ -977,12 +976,7 @@ impl BrokerOutputForwarder { .session_state .get_session_for_connection_id(&session_id) { - return_api_message_for_transport( - session, - message, - platform_state_c, - ) - .await + let _ = session.send_json_rpc(message).await; } }); continue; @@ -1128,12 +1122,7 @@ impl BrokerOutputForwarder { .session_state .get_session_for_connection_id(&session_id) { - return_api_message_for_transport( - session, - message, - platform_state.clone(), - ) - .await + let _ = session.send_json_rpc(message).await; } } } else { @@ -1182,7 +1171,7 @@ impl BrokerOutputForwarder { .session_state .get_session_for_connection_id(&session_id) { - return_api_message_for_transport(session, message, platform_state.clone()).await; + let _ = session.send_json_rpc(message).await; } } diff --git a/core/main/src/firebolt/firebolt_gateway.rs b/core/main/src/firebolt/firebolt_gateway.rs index a26020e8e..2b987d480 100644 --- a/core/main/src/firebolt/firebolt_gateway.rs +++ b/core/main/src/firebolt/firebolt_gateway.rs @@ -20,7 +20,6 @@ use std::collections::HashMap; use jsonrpsee::{core::server::rpc_module::Methods, types::TwoPointZero}; use ripple_sdk::{ api::{ - apps::EffectiveTransport, firebolt::{ fb_capabilities::JSON_RPC_STANDARD_ERROR_INVALID_PARAMS, fb_openrpc::FireboltOpenRpcMethod, @@ -460,23 +459,11 @@ async fn send_json_rpc_error( get_rpc_header_with_status(request, status_code), ); - match session.get_transport() { - EffectiveTransport::Websocket => { - if let Err(e) = session.send_json_rpc(api_message).await { - error!( - "send_json_rpc_error: Error sending websocket message: e={:?}", - e - ) - } - } - EffectiveTransport::Bridge(id) => { - if let Err(e) = platform_state.send_to_bridge(id, api_message).await { - error!( - "send_json_rpc_error: Error sending bridge message: e={:?}", - e - ) - } - } + if let Err(e) = session.send_json_rpc(api_message).await { + error!( + "send_json_rpc_error: Error sending websocket message: e={:?}", + e + ) } } else { error!("send_json_rpc_error: Could not serialize error message"); diff --git a/core/main/src/firebolt/firebolt_ws.rs b/core/main/src/firebolt/firebolt_ws.rs index 05bbdda24..83a286644 100644 --- a/core/main/src/firebolt/firebolt_ws.rs +++ b/core/main/src/firebolt/firebolt_ws.rs @@ -217,11 +217,7 @@ impl FireboltWs { app_id: app_id.clone(), gateway_secure, }; - let session = Session::new( - identity.app_id.clone(), - Some(session_tx.clone()), - ripple_sdk::api::apps::EffectiveTransport::Websocket, - ); + let session = Session::new(identity.app_id.clone(), Some(session_tx.clone())); let app_id_c = app_id.clone(); let session_id_c = identity.session_id.clone(); @@ -337,21 +333,12 @@ impl FireboltWs { .session_state .get_session_for_connection_id(&connection_id) { - use ripple_sdk::api::apps::EffectiveTransport; let err = ErrorResponse::new(ErrorCode::InvalidRequest.into(), Id::Null); let msg = serde_json::to_string(&err).unwrap(); let api_msg = ApiMessage::new(ApiProtocol::JsonRpc, msg, req_id.clone()); - // No Stats here its an invalid RPC request - match session.get_transport() { - EffectiveTransport::Bridge(id) => { - let _ = state.send_to_bridge(id, api_msg).await; - } - EffectiveTransport::Websocket => { - let _ = session.send_json_rpc(api_msg).await; - } - } + let _ = session.send_json_rpc(api_msg).await; } error!("invalid message {}", req_text) } diff --git a/core/main/src/firebolt/rpc_router.rs b/core/main/src/firebolt/rpc_router.rs index 52cc6ee44..404cf6c17 100644 --- a/core/main/src/firebolt/rpc_router.rs +++ b/core/main/src/firebolt/rpc_router.rs @@ -46,8 +46,7 @@ use crate::{ service::telemetry_builder::TelemetryBuilder, state::{platform_state::PlatformState, session_state::Session}, utils::router_utils::{ - add_telemetry_status_code, capture_stage, get_rpc_header, return_api_message_for_transport, - return_extn_response, + add_telemetry_status_code, capture_stage, get_rpc_header, return_extn_response, }, }; @@ -198,7 +197,7 @@ impl RpcRouter { let now = Utc::now().timestamp_millis(); let success = !msg.is_error(); TelemetryBuilder::send_fb_tt(&state, req.clone(), now - start, success, &msg); - return_api_message_for_transport(session, msg, state).await; + let _ = session.send_json_rpc(msg).await; } }); } diff --git a/core/main/src/service/apps/app_events.rs b/core/main/src/service/apps/app_events.rs index d905c420c..c1da75b5e 100644 --- a/core/main/src/service/apps/app_events.rs +++ b/core/main/src/service/apps/app_events.rs @@ -21,10 +21,9 @@ use jsonrpsee::{ }; use ripple_sdk::{ api::{ - apps::{AppEventRequest, EffectiveTransport}, + apps::AppEventRequest, firebolt::fb_general::ListenRequest, gateway::rpc_gateway_api::{ApiMessage, CallContext}, - protocol::BridgeProtocolRequest, }, log::error, serde_json::{json, Value}, @@ -127,7 +126,6 @@ pub struct EventListener { pub call_ctx: CallContext, // Keep the session_tx package private session_tx: Option>, - transport: EffectiveTransport, decorator: Option>, } @@ -252,7 +250,6 @@ impl AppEvents { event_listeners.push(EventListener { call_ctx, session_tx: session.get_sender(), - transport: session.get_transport(), decorator, }); } else if let Some(entry) = listeners.get_mut(&event_name) { @@ -262,7 +259,7 @@ impl AppEvents { } } - pub async fn send_event(state: &PlatformState, listener: &EventListener, data: &Value) { + pub async fn send_event(listener: &EventListener, data: &Value) { let protocol = listener.call_ctx.protocol.clone(); let event = Response { jsonrpc: TwoPointZero, @@ -277,25 +274,10 @@ impl AppEvents { listener.call_ctx.request_id.clone(), ); - match listener.transport.clone() { - EffectiveTransport::Websocket => { - if let Some(session_tx) = listener.session_tx.clone() { - mpsc_send_and_log(&session_tx, api_message, "GatewayResponse").await; - } else { - error!("JsonRPC sender missing"); - } - } - EffectiveTransport::Bridge(id) => { - if state.supports_bridge() { - let client = state.get_client(); - let request = BridgeProtocolRequest::Send(id, api_message); - if let Err(e) = client.send_extn_request(request).await { - error!("Error sending event to bridge {:?}", e); - } - } else { - error!("Bridge not supported"); - } - } + if let Some(session_tx) = listener.session_tx.clone() { + mpsc_send_and_log(&session_tx, api_message, "GatewayResponse").await; + } else { + error!("JsonRPC sender missing"); } } @@ -351,7 +333,6 @@ impl AppEvents { } if context.is_some() { AppEvents::send_event( - state, &i, &json!({ "context": context.clone(), @@ -360,7 +341,7 @@ impl AppEvents { ) .await; } else { - AppEvents::send_event(state, &i, &decorated_res.unwrap()).await; + AppEvents::send_event(&i, &decorated_res.unwrap()).await; } } @@ -373,7 +354,7 @@ impl AppEvents { event_ctx_string.clone(), ); for i in listeners { - AppEvents::send_event(state, &i, result).await; + AppEvents::send_event(&i, result).await; } } } @@ -392,7 +373,7 @@ impl AppEvents { for i in listeners_vec { let decorated_res = i.decorate(state, event_name, result).await; if let Ok(res) = decorated_res { - AppEvents::send_event(state, &i, &res).await; + AppEvents::send_event(&i, &res).await; } else { error!("could not generate event for '{}'", event_name); } @@ -445,16 +426,8 @@ pub mod tests { let platform_state = PlatformState::mock(); let call_context = CallContext::mock(); let listen_request = ListenRequest { listen: true }; - Session::new( - call_context.clone().app_id, - None, - EffectiveTransport::Websocket, - ); - let session = Session::new( - call_context.clone().app_id, - None, - EffectiveTransport::Websocket, - ); + Session::new(call_context.clone().app_id, None); + let session = Session::new(call_context.clone().app_id, None); platform_state .session_state .add_session(call_context.clone().session_id, session); diff --git a/core/main/src/service/apps/delegated_launcher_handler.rs b/core/main/src/service/apps/delegated_launcher_handler.rs index d784b5910..68c301f54 100644 --- a/core/main/src/service/apps/delegated_launcher_handler.rs +++ b/core/main/src/service/apps/delegated_launcher_handler.rs @@ -23,9 +23,7 @@ use std::{ use ripple_sdk::{ api::{ - apps::{ - AppError, AppManagerResponse, AppMethod, AppSession, EffectiveTransport, StateChange, - }, + apps::{AppError, AppManagerResponse, AppMethod, AppSession, StateChange}, device::{device_user_grants_data::EvaluateAt, entertainment_data::NavigationIntent}, firebolt::{ fb_capabilities::{DenyReason, DenyReasonWithCap, FireboltPermission}, @@ -66,7 +64,6 @@ use ripple_sdk::{ LCM_EVENT_ON_REQUEST_READY, }, }, - protocol::{BridgeProtocolRequest, BridgeSessionParams}, }, log::info, tokio::{self, sync::mpsc::Receiver}, @@ -84,10 +81,8 @@ use crate::{ user_grants::{GrantHandler, GrantPolicyEnforcer, GrantState}, }, state::{ - bootstrap_state::ChannelsState, - cap::permitted_state::PermissionHandler, - platform_state::PlatformState, - session_state::{PendingSessionInfo, Session}, + bootstrap_state::ChannelsState, cap::permitted_state::PermissionHandler, + platform_state::PlatformState, session_state::PendingSessionInfo, }, utils::rpc_utils::rpc_await_oneshot, SEMVER_LIGHTWEIGHT, @@ -622,14 +617,6 @@ impl DelegatedLauncherHandler { &mut self, mut session: AppSession, ) -> Result { - let transport = session.get_transport(); - if let EffectiveTransport::Bridge(_) = transport.clone() { - if !self.platform_state.supports_bridge() { - error!("Bridge is not a supported contract"); - return Err(AppError::NotSupported); - } - } - let app_id = session.app.id.clone(); if let Some(app_title) = session.app.title.as_ref() { @@ -881,40 +868,7 @@ impl DelegatedLauncherHandler { emit_event: bool, ) -> CompletedSessionResponse { let app_id = session.app.id.clone(); - let transport = session.get_transport(); let session_id = Uuid::new_v4().to_string(); - if let EffectiveTransport::Bridge(container_id) = transport.clone() { - if platform_state.supports_bridge() { - // Step 1: Add the session of the app to the state if bridge - let session_state = Session::new(app_id.clone(), None, transport); - platform_state - .session_state - .add_session(session_id.clone(), session_state); - let id = container_id.clone(); - debug!( - "App session details: appId: {} session: {}", - app_id, session_id - ); - // Step 2: Start the session using contract - let request = BridgeSessionParams { - container_id, - session_id: session_id.clone(), - app_id: app_id.clone(), - }; - let request = BridgeProtocolRequest::StartSession(request); - let client = platform_state.get_client(); - // After processing the session response the launcher will launch the app - // Below thread is going to wait for the app to be launched and create a connection - tokio::spawn(async move { - if let Err(e) = client.send_extn_request(request).await { - error!("Error sending request to bridge {:?}", e); - } else { - info!("Bridge connected for {}", id); - } - }); - } - } - let loaded_session_id = Uuid::new_v4().to_string(); let mut active_session_id = None; if !session.launch.inactive { @@ -1062,23 +1016,10 @@ impl DelegatedLauncherHandler { async fn end_session(&mut self, app_id: &str) -> Result { debug!("end_session: entry: app_id={}", app_id); let app = self.platform_state.app_manager_state.remove(app_id); - if let Some(app) = app { + if app.is_some() { if let Some(timer) = self.timer_map.remove(app_id) { timer.cancel(); } - let transport = app.initial_session.get_transport(); - if let EffectiveTransport::Bridge(container_id) = transport { - AppEvents::remove_session(&self.platform_state, app.session_id.clone()); - let request = BridgeProtocolRequest::EndSession(container_id); - if let Err(e) = self - .platform_state - .get_client() - .send_extn_request(request) - .await - { - error!("Error sending event to bridge {:?}", e); - } - } } else { error!("end_session app_id={} Not found", app_id); return Err(AppError::NotFound); diff --git a/core/main/src/service/user_grants.rs b/core/main/src/service/user_grants.rs index 4a2f4967e..4186f5fc5 100644 --- a/core/main/src/service/user_grants.rs +++ b/core/main/src/service/user_grants.rs @@ -1979,7 +1979,6 @@ mod tests { }; use ripple_sdk::{ api::{ - apps::EffectiveTransport, device::device_user_grants_data::GrantRequirements, firebolt::{ fb_general::ListenRequest, @@ -2008,8 +2007,7 @@ mod tests { ack_response: ChallengeResponse, ) { let (tx, mut rx) = tokio::sync::mpsc::channel(32); - let sample_app_session = - Session::new("app_id".to_owned(), Some(tx), EffectiveTransport::Websocket); + let sample_app_session = Session::new("app_id".to_owned(), Some(tx)); let state_c = state.clone(); let ctx_c = ctx.clone(); state diff --git a/core/main/src/state/cap/cap_state.rs b/core/main/src/state/cap/cap_state.rs index 37e8cb8fb..fdb9e14ce 100644 --- a/core/main/src/state/cap/cap_state.rs +++ b/core/main/src/state/cap/cap_state.rs @@ -188,7 +188,7 @@ impl CapState { if let Ok(data) = serde_json::to_value(cap_info) { debug!("data={:?}", data); // Step 4: Send exclusive cap info data for each listener - AppEvents::send_event(ps, &listener, &data).await; + AppEvents::send_event(&listener, &data).await; } } } diff --git a/core/main/src/state/platform_state.rs b/core/main/src/state/platform_state.rs index 634e5a249..55e80370a 100644 --- a/core/main/src/state/platform_state.rs +++ b/core/main/src/state/platform_state.rs @@ -17,21 +17,20 @@ use ripple_sdk::{ api::{ - gateway::rpc_gateway_api::{ApiMessage, RpcRequest}, + gateway::rpc_gateway_api::RpcRequest, manifest::{ app_library::AppLibraryState, device_manifest::{AppLibraryEntry, DeviceManifest}, exclusory::ExclusoryImpl, extn_manifest::ExtnManifest, }, - protocol::BridgeProtocolRequest, session::SessionAdjective, }, extn::{ extn_client_message::{ExtnMessage, ExtnPayloadProvider}, extn_id::ExtnId, }, - framework::{ripple_contract::RippleContract, RippleResponse}, + framework::ripple_contract::RippleContract, utils::error::RippleError, uuid::Uuid, }; @@ -184,11 +183,6 @@ impl PlatformState { self.get_client().respond(msg).await } - pub fn supports_bridge(&self) -> bool { - let contract = RippleContract::BridgeProtocol.as_clear_string(); - self.extn_manifest.required_contracts.contains(&contract) - } - pub fn supports_cloud_sync(&self) -> bool { let contract = RippleContract::CloudSync.as_clear_string(); self.extn_manifest.required_contracts.contains(&contract) @@ -209,12 +203,6 @@ impl PlatformState { self.extn_manifest.required_contracts.contains(&contract) } - pub async fn send_to_bridge(&self, id: String, msg: ApiMessage) -> RippleResponse { - let request = BridgeProtocolRequest::Send(id, msg); - self.get_client().send_extn_request(request).await?; - Ok(()) - } - pub fn supports_device_tokens(&self) -> bool { let contract = RippleContract::Session(SessionAdjective::Device).as_clear_string(); self.extn_manifest.required_contracts.contains(&contract) diff --git a/core/main/src/state/session_state.rs b/core/main/src/state/session_state.rs index a9bf28d95..088c0b5fc 100644 --- a/core/main/src/state/session_state.rs +++ b/core/main/src/state/session_state.rs @@ -22,7 +22,7 @@ use std::{ use ripple_sdk::{ api::{ - apps::{AppSession, EffectiveTransport}, + apps::AppSession, gateway::rpc_gateway_api::{ApiMessage, CallContext}, session::{AccountSession, ProvisionRequest}, }, @@ -33,7 +33,6 @@ use ripple_sdk::{ #[derive(Debug, Clone)] pub struct SessionData { app_id: String, - transport: EffectiveTransport, } #[derive(Debug, Clone)] @@ -43,14 +42,10 @@ pub struct Session { } impl Session { - pub fn new( - app_id: String, - sender: Option>, - transport: EffectiveTransport, - ) -> Session { + pub fn new(app_id: String, sender: Option>) -> Session { Session { sender, - data: SessionData { app_id, transport }, + data: SessionData { app_id }, } } @@ -70,10 +65,6 @@ impl Session { fn get_app_id(&self) -> String { self.data.app_id.clone() } - - pub fn get_transport(&self) -> EffectiveTransport { - self.data.transport.clone() - } } /// Session state encapsulates the session table with mappings to Application identifier and diff --git a/core/main/src/utils/router_utils.rs b/core/main/src/utils/router_utils.rs index bd50e5ac7..87737878d 100644 --- a/core/main/src/utils/router_utils.rs +++ b/core/main/src/utils/router_utils.rs @@ -15,38 +15,14 @@ // SPDX-License-Identifier: Apache-2.0 // use ripple_sdk::{ - api::{ - apps::EffectiveTransport, - gateway::rpc_gateway_api::{ApiMessage, JsonRpcApiResponse, RpcRequest}, - }, + api::gateway::rpc_gateway_api::{ApiMessage, JsonRpcApiResponse, RpcRequest}, extn::extn_client_message::{ExtnMessage, ExtnResponse}, log::{error, trace}, serde_json::{self, Result as SResult}, utils::error::RippleError, }; -use crate::state::{ - metrics_state::MetricsState, platform_state::PlatformState, session_state::Session, -}; - -pub async fn return_api_message_for_transport( - session: Session, - msg: ApiMessage, - state: PlatformState, -) { - match session.get_transport() { - EffectiveTransport::Websocket => { - if let Err(e) = session.send_json_rpc(msg).await { - error!("Error while responding back message {:?}", e) - } - } - EffectiveTransport::Bridge(container_id) => { - if let Err(e) = state.send_to_bridge(container_id, msg).await { - error!("Error sending event to bridge {:?}", e); - } - } - } -} +use crate::state::metrics_state::MetricsState; pub fn return_extn_response(msg: ApiMessage, extn_msg: ExtnMessage) { let callback = match extn_msg.clone().callback { diff --git a/core/main/src/utils/test_utils.rs b/core/main/src/utils/test_utils.rs index 40cefb9b1..32d82d61e 100644 --- a/core/main/src/utils/test_utils.rs +++ b/core/main/src/utils/test_utils.rs @@ -73,11 +73,7 @@ pub async fn cap_state_listener( ) -> Receiver { let ctx = CallContext::mock(); let (session_tx, resp_rx) = mpsc::channel(32); - let session = Session::new( - ctx.app_id.clone(), - Some(session_tx.clone()), - ripple_sdk::api::apps::EffectiveTransport::Websocket, - ); + let session = Session::new(ctx.app_id.clone(), Some(session_tx.clone())); state .session_state .add_session(ctx.session_id.clone(), session); diff --git a/core/sdk/src/api/apps.rs b/core/sdk/src/api/apps.rs index 55d1b8ab7..4f4245d9e 100644 --- a/core/sdk/src/api/apps.rs +++ b/core/sdk/src/api/apps.rs @@ -47,22 +47,6 @@ pub struct AppSession { } impl AppSession { - // Gets the actual transport that will be used based on fallbacks - // If no runtime or runtime.id is given, use Websocket - // Otherwise use the transport given in the runtime - pub fn get_transport(&self) -> EffectiveTransport { - match &self.runtime { - Some(rt) => match rt.transport { - AppRuntimeTransport::Bridge => match &rt.id { - Some(id) => EffectiveTransport::Bridge(id.clone()), - None => EffectiveTransport::Websocket, - }, - AppRuntimeTransport::Websocket => EffectiveTransport::Websocket, - }, - None => EffectiveTransport::Websocket, - } - } - pub fn update_intent(&mut self, intent: NavigationIntent) { let _ = self.launch.intent.insert(intent); } @@ -76,22 +60,9 @@ pub struct AppBasicInfo { pub title: Option, } -#[derive(Debug, PartialEq, Serialize, Deserialize, Clone)] -#[serde(rename_all = "lowercase")] -pub enum AppRuntimeTransport { - Bridge, - Websocket, -} - -fn runtime_transport_default() -> AppRuntimeTransport { - AppRuntimeTransport::Websocket -} - #[derive(Debug, PartialEq, Serialize, Deserialize, Clone)] pub struct AppRuntime { pub id: Option, - #[serde(default = "runtime_transport_default")] - pub transport: AppRuntimeTransport, } #[derive(Debug, PartialEq, Default, Serialize, Deserialize, Clone)] @@ -108,22 +79,6 @@ pub struct AppLaunchInfo { pub inactive: bool, } -#[derive(Debug, Serialize, Deserialize, Clone)] -#[cfg_attr(test, derive(PartialEq))] -pub enum EffectiveTransport { - Bridge(String), - Websocket, -} - -impl std::fmt::Display for EffectiveTransport { - fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result { - match self { - EffectiveTransport::Bridge(id) => write!(f, "bridge_{}", id), - EffectiveTransport::Websocket => write!(f, "websocket"), - } - } -} - pub type AppResponse = Result; impl ExtnPayloadProvider for AppResponse { @@ -323,82 +278,6 @@ mod tests { utils::test_utils::test_extn_payload_provider, }; - #[test] - fn test_get_transport_with_bridge_runtime_and_id() { - let app = AppSession { - app: AppBasicInfo { - id: "app_id".to_string(), - catalog: None, - url: None, - title: None, - }, - runtime: Some(AppRuntime { - id: Some("runtime_id".to_string()), - transport: AppRuntimeTransport::Bridge, - }), - launch: AppLaunchInfo::default(), - }; - - assert_eq!( - app.get_transport(), - EffectiveTransport::Bridge("runtime_id".to_string()) - ); - } - - #[test] - fn test_get_transport_with_bridge_runtime_and_no_id() { - let app = AppSession { - app: AppBasicInfo { - id: "app_id".to_string(), - catalog: None, - url: None, - title: None, - }, - runtime: Some(AppRuntime { - id: None, - transport: AppRuntimeTransport::Bridge, - }), - launch: AppLaunchInfo::default(), - }; - - assert_eq!(app.get_transport(), EffectiveTransport::Websocket); - } - - #[test] - fn test_get_transport_with_websocket_runtime() { - let app = AppSession { - app: AppBasicInfo { - id: "app_id".to_string(), - catalog: None, - url: None, - title: None, - }, - runtime: Some(AppRuntime { - id: Some("runtime_id".to_string()), - transport: AppRuntimeTransport::Websocket, - }), - launch: AppLaunchInfo::default(), - }; - - assert_eq!(app.get_transport(), EffectiveTransport::Websocket); - } - - #[test] - fn test_get_transport_with_no_runtime() { - let app = AppSession { - app: AppBasicInfo { - id: "app_id".to_string(), - catalog: None, - url: None, - title: None, - }, - runtime: None, - launch: AppLaunchInfo::default(), - }; - - assert_eq!(app.get_transport(), EffectiveTransport::Websocket); - } - #[test] fn test_update_intent() { let mut app = AppSession { diff --git a/core/sdk/src/api/firebolt/fb_lifecycle_management.rs b/core/sdk/src/api/firebolt/fb_lifecycle_management.rs index e530e8c0e..ebc24b9a3 100644 --- a/core/sdk/src/api/firebolt/fb_lifecycle_management.rs +++ b/core/sdk/src/api/firebolt/fb_lifecycle_management.rs @@ -207,9 +207,7 @@ pub struct AppSessionRequest { #[cfg(test)] mod tests { use super::*; - use crate::api::apps::{ - AppBasicInfo, AppLaunchInfo, AppRuntime, AppRuntimeTransport, AppSession, - }; + use crate::api::apps::{AppBasicInfo, AppLaunchInfo, AppRuntime, AppSession}; use crate::api::device::entertainment_data::{ HomeIntent, InternalNavigationIntent, InternalNavigationIntentStrict, NavigationIntentLoose, NavigationIntentStrict, @@ -291,7 +289,6 @@ mod tests { }, runtime: Some(AppRuntime { id: Some("sample_runtime_id".to_string()), - transport: AppRuntimeTransport::Bridge, }), launch: AppLaunchInfo::default(), }, diff --git a/device/thunder_ripple_sdk/src/bootstrap/setup_thunder_processors.rs b/device/thunder_ripple_sdk/src/bootstrap/setup_thunder_processors.rs index 94e883420..e041b586c 100644 --- a/device/thunder_ripple_sdk/src/bootstrap/setup_thunder_processors.rs +++ b/device/thunder_ripple_sdk/src/bootstrap/setup_thunder_processors.rs @@ -26,13 +26,9 @@ use crate::processors::thunder_telemetry::ThunderTelemetryProcessor; use crate::thunder_state::ThunderBootstrapStateWithClient; use crate::processors::{ - thunder_browser::ThunderBrowserRequestProcessor, thunder_device_info::ThunderDeviceInfoRequestProcessor, thunder_events::ThunderOpenEventsProcessor, thunder_persistent_store::ThunderStorageRequestProcessor, - thunder_remote::ThunderRemoteAccessoryRequestProcessor, - thunder_wifi::ThunderWifiRequestProcessor, - thunder_window_manager::ThunderWindowManagerRequestProcessor, }; pub struct SetupThunderProcessor; @@ -46,15 +42,7 @@ impl SetupThunderProcessor { let mut extn_client = state.state.get_client(); extn_client .add_request_processor(ThunderDeviceInfoRequestProcessor::new(state.clone().state)); - extn_client.add_request_processor(ThunderBrowserRequestProcessor::new(state.clone().state)); - extn_client.add_request_processor(ThunderWifiRequestProcessor::new(state.clone().state)); extn_client.add_request_processor(ThunderStorageRequestProcessor::new(state.clone().state)); - extn_client.add_request_processor(ThunderWindowManagerRequestProcessor::new( - state.state.clone(), - )); - extn_client.add_request_processor(ThunderRemoteAccessoryRequestProcessor::new( - state.clone().state, - )); extn_client.add_request_processor(ThunderOpenEventsProcessor::new(state.clone().state)); let package_manager_processor = diff --git a/device/thunder_ripple_sdk/src/lib.rs b/device/thunder_ripple_sdk/src/lib.rs index 03a9a3cc9..33f41e5ab 100644 --- a/device/thunder_ripple_sdk/src/lib.rs +++ b/device/thunder_ripple_sdk/src/lib.rs @@ -35,7 +35,6 @@ pub mod events { } pub mod processors { - pub mod thunder_browser; pub mod thunder_device_info; pub mod thunder_events; pub mod events { @@ -44,11 +43,8 @@ pub mod processors { pub mod thunder_analytics; pub mod thunder_package_manager; pub mod thunder_persistent_store; - pub mod thunder_remote; pub mod thunder_rfc; pub mod thunder_telemetry; - pub mod thunder_wifi; - pub mod thunder_window_manager; } pub mod utils; @@ -65,8 +61,6 @@ pub mod tests { pub mod thunder_device_info_pacts; pub mod thunder_package_manager_pacts; pub mod thunder_persistent_store_pacts; - pub mod thunder_remote_pacts; - pub mod thunder_wifi_pacts; } pub mod mock_thunder_controller; pub mod thunder_client_pool_test_utility;