Skip to content

RPPL-3821: Backporting fb marketplace app api changes. #943

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kvfasil merged 2 commits into from
Feb 5, 2026
Merged

RPPL-3821: Backporting fb marketplace app api changes. #943

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2d8c3a3
RPPL-3821: Backporting fb marketplace app api changes.
kvfasil Feb 3, 2026
ff3b353
RPPL-3821: remove unused variable.
kvfasil Feb 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
193 changes: 71 additions & 122 deletions core/main/src/firebolt/handlers/discovery_rpc.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ use ripple_sdk::{
firebolt::{
fb_capabilities::FireboltCap,
fb_discovery::{
AgePolicy, LaunchRequest, DISCOVERY_EVENT_ON_NAVIGATE_TO, ENTITY_INFO_CAPABILITY,
LaunchRequest, DISCOVERY_EVENT_ON_NAVIGATE_TO, ENTITY_INFO_CAPABILITY,
ENTITY_INFO_EVENT, EVENT_DISCOVERY_POLICY_CHANGED, PURCHASED_CONTENT_CAPABILITY,
PURCHASED_CONTENT_EVENT,
},
Expand Down Expand Up @@ -256,7 +256,7 @@ impl DiscoveryServer for DiscoveryImpl {
DiscoveryImpl::get_content_policy(&ctx, &self.state, &ctx.app_id).await
}

async fn launch(&self, ctx: CallContext, request: LaunchRequest) -> RpcResult<bool> {
async fn launch(&self, _ctx: CallContext, request: LaunchRequest) -> RpcResult<bool> {
let app_defaults_configuration = self.state.get_device_manifest().applications.defaults;

let intent_validation_config = self
Expand All @@ -265,18 +265,6 @@ impl DiscoveryServer for DiscoveryImpl {
.get_features()
.intent_validation;
validate_navigation_intent(intent_validation_config, request.intent.clone()).await?;
let policy_ids = self
.state
.policy_state
.policy_identifiers_alias
.read()
.unwrap()
.clone();
let req_updated_source = update_intent(ctx.app_id.clone(), policy_ids, request.clone());
info!(
"Discovery.launch: req_updated_source: {:?}",
&req_updated_source
);

if let Some(reserved_app_id) =
app_defaults_configuration.get_reserved_application_id(&request.app_id)
Expand All @@ -294,9 +282,9 @@ impl DiscoveryServer for DiscoveryImpl {
match BrokerUtils::process_internal_main_request(
&self.state.clone(),
"discovery.launch.internal",
Some(serde_json::to_value(req_updated_source).map_err(|e| {
Some(serde_json::to_value(request).map_err(|e| {
error!("Serialization error: {:?}", e);
rpc_err("Failed to serialize SectionIntent")
rpc_err("Failed to serialize LaunchIntent")
})?),
)
.await
Expand All @@ -310,47 +298,7 @@ impl DiscoveryServer for DiscoveryImpl {
return Err(rpc_err("Internal subscription launch failed"));
}
}

// Not validating the intent, pass-through to app as is.
// if !AppEvents::is_app_registered_for_event(
// &self.state,
// reserved_app_id.to_string(),
// DISCOVERY_EVENT_ON_NAVIGATE_TO,
// ) {
// return Err(rpc_navigate_reserved_app_err(
// format!("Discovery.launch: reserved app id {} is not registered for discovery.onNavigateTo event",
// reserved_app_id).as_str(),
// ));
// }
// emit EVENT_ON_NAVIGATE_TO to the reserved app.
// AppEvents::emit_to_app(
// &self.state,
// reserved_app_id.to_string(),
// DISCOVERY_EVENT_ON_NAVIGATE_TO,
// &serde_json::to_value(req_updated_source.intent).unwrap(),
// )
// .await;
// info!(
// "emit_to_app called for app {} event {}",
// reserved_app_id.to_string(),
// DISCOVERY_EVENT_ON_NAVIGATE_TO
// );
// return Ok(true);
}
// let (app_resp_tx, app_resp_rx) = oneshot::channel::<AppResponse>();

// let app_request =
// AppRequest::new(AppMethod::Launch(req_updated_source.clone()), app_resp_tx);

// if self
// .state
// .get_client()
// .send_app_request(app_request)
// .is_ok()
// && app_resp_rx.await.is_ok()
// {
// return Ok(true);
// }

Err(jsonrpsee::core::Error::Custom(String::from(
"Discovery.launch: some failure",
Expand Down Expand Up @@ -528,73 +476,74 @@ impl DiscoveryServer for DiscoveryImpl {
Ok(true)
}
}
fn update_intent(
source: String,
_policy_ids: Vec<AgePolicy>,
request: LaunchRequest,
) -> LaunchRequest {
match request.intent.clone() {
Some(NavigationIntent::NavigationIntentStrict(navigation_intent)) => {
let updated_navigation_intent = match navigation_intent {
NavigationIntentStrict::Home(mut home_intent) => {
home_intent.context.source = source;
NavigationIntentStrict::Home(home_intent)
}
NavigationIntentStrict::Launch(mut launch_intent) => {
launch_intent.context.source = source;
NavigationIntentStrict::Launch(launch_intent)
}
NavigationIntentStrict::Entity(mut entity_intent) => {
entity_intent.context.source = source;
NavigationIntentStrict::Entity(entity_intent)
}
NavigationIntentStrict::Playback(mut playback_intent) => {
playback_intent.context.source = source;
NavigationIntentStrict::Playback(playback_intent)
}
NavigationIntentStrict::Search(mut search_intent) => {
search_intent.context.source = source;
NavigationIntentStrict::Search(search_intent)
}
NavigationIntentStrict::Section(mut section_intent) => {
section_intent.context.source = source;
NavigationIntentStrict::Section(section_intent)
}
NavigationIntentStrict::Tune(mut tune_intent) => {
tune_intent.context.source = source;
NavigationIntentStrict::Tune(tune_intent)
}
NavigationIntentStrict::ProviderRequest(mut provider_request_intent) => {
provider_request_intent.context.source = source;
NavigationIntentStrict::ProviderRequest(provider_request_intent)
}
NavigationIntentStrict::PlayEntity(mut p) => {
p.context.source = source;
NavigationIntentStrict::PlayEntity(p)
}
NavigationIntentStrict::PlayQuery(mut p) => {
p.context.source = source;
NavigationIntentStrict::PlayQuery(p)
}
};

LaunchRequest {
app_id: request.app_id,
intent: Some(NavigationIntent::NavigationIntentStrict(
updated_navigation_intent,
)),
}
}
Some(NavigationIntent::NavigationIntentLoose(mut loose_intent)) => {
loose_intent.context.source = source;
LaunchRequest {
app_id: request.app_id,
intent: Some(NavigationIntent::NavigationIntentLoose(loose_intent)),
}
}
_ => request,
}
}
// fn update_intent(
// source: String,
// _policy_ids: Vec<AgePolicy>,
// request: LaunchRequest,
// ) -> LaunchRequest {
// match request.intent.clone() {
// Some(NavigationIntent::NavigationIntentStrict(navigation_intent)) => {
// let updated_navigation_intent = match navigation_intent {
// NavigationIntentStrict::Home(mut home_intent) => {
// home_intent.context.source = source;
// NavigationIntentStrict::Home(home_intent)
// }
// NavigationIntentStrict::Launch(mut launch_intent) => {
// launch_intent.context.source = source;
// NavigationIntentStrict::Launch(launch_intent)
// }
// NavigationIntentStrict::Entity(mut entity_intent) => {
// entity_intent.context.source = source;
// NavigationIntentStrict::Entity(entity_intent)
// }
// NavigationIntentStrict::Playback(mut playback_intent) => {
// playback_intent.context.source = source;
// NavigationIntentStrict::Playback(playback_intent)
// }
// NavigationIntentStrict::Search(mut search_intent) => {
// search_intent.context.source = source;
// NavigationIntentStrict::Search(search_intent)
// }
// NavigationIntentStrict::Section(mut section_intent) => {
// section_intent.context.source = source;
// NavigationIntentStrict::Section(section_intent)
// }
// NavigationIntentStrict::Tune(mut tune_intent) => {
// tune_intent.context.source = source;
// NavigationIntentStrict::Tune(tune_intent)
// }
// NavigationIntentStrict::ProviderRequest(mut provider_request_intent) => {
// provider_request_intent.context.source = source;
// NavigationIntentStrict::ProviderRequest(provider_request_intent)
// }
// NavigationIntentStrict::PlayEntity(mut p) => {
// p.context.source = source;
// NavigationIntentStrict::PlayEntity(p)
// }
// NavigationIntentStrict::PlayQuery(mut p) => {
// p.context.source = source;
// NavigationIntentStrict::PlayQuery(p)
// }
// };

// LaunchRequest {
// app_id: request.app_id,
// intent: Some(NavigationIntent::NavigationIntentStrict(
// updated_navigation_intent,
// )),
// }
// }
// Some(NavigationIntent::NavigationIntentLoose(mut loose_intent)) => {
// loose_intent.context.source = source;
// LaunchRequest {
// app_id: request.app_id,
// intent: Some(NavigationIntent::NavigationIntentLoose(loose_intent)),
// }
// }
// _ => request,
// }
// }

pub async fn validate_navigation_intent(
intent_validation_config: IntentValidation,
Expand Down