From ae7755e84e0ed14065a0a33055f75c9c3fbf3b27 Mon Sep 17 00:00:00 2001 From: Charles Schleich Date: Tue, 10 Dec 2024 00:19:00 +0100 Subject: [PATCH] Fix spelling error, add undeclare in typescript --- zenoh-plugin-remote-api/src/handle_control_message.rs | 4 ++-- zenoh-plugin-remote-api/src/interface/mod.rs | 3 +-- zenoh-ts/src/querier.ts | 1 + zenoh-ts/src/remote_api/interface/ControlMsg.ts | 2 +- zenoh-ts/src/remote_api/querier.ts | 9 +++++++++ 5 files changed, 14 insertions(+), 5 deletions(-) diff --git a/zenoh-plugin-remote-api/src/handle_control_message.rs b/zenoh-plugin-remote-api/src/handle_control_message.rs index 2e207d5..a397e09 100644 --- a/zenoh-plugin-remote-api/src/handle_control_message.rs +++ b/zenoh-plugin-remote-api/src/handle_control_message.rs @@ -345,7 +345,7 @@ pub(crate) async fn handle_control_message( priority, consolidation, allowed_destination, - express + express, } => { let mut querier_builder = state_map.session.declare_querier(key_expr); let timeout = timeout.map(|millis| Duration::from_millis(millis)); @@ -363,7 +363,7 @@ pub(crate) async fn handle_control_message( let querier = querier_builder.await?; state_map.queriers.insert(id, querier); } - ControlMsg::UndDeclareQuerier(uuid) => { + ControlMsg::UndeclareQuerier(uuid) => { if let Some(querier) = state_map.queriers.remove(&uuid) { querier.undeclare().await?; } else { diff --git a/zenoh-plugin-remote-api/src/interface/mod.rs b/zenoh-plugin-remote-api/src/interface/mod.rs index 0eb5b6a..1ac3ac3 100644 --- a/zenoh-plugin-remote-api/src/interface/mod.rs +++ b/zenoh-plugin-remote-api/src/interface/mod.rs @@ -101,7 +101,6 @@ pub enum QueryableMsg { }, } - // ██████ ██████ ███ ██ ████████ ██████ ██████ ██ ███ ███ ███████ ███████ ███████ █████ ██████ ███████ // ██ ██ ██ ████ ██ ██ ██ ██ ██ ██ ██ ████ ████ ██ ██ ██ ██ ██ ██ ██ // ██ ██ ██ ██ ██ ██ ██ ██████ ██ ██ ██ ██ ████ ██ █████ ███████ ███████ ███████ ██ ███ █████ @@ -310,7 +309,7 @@ pub enum ControlMsg { #[ts(type = "boolean | undefined")] express: Option, }, - UndDeclareQuerier(Uuid), + UndeclareQuerier(Uuid), // Querier QuerierGet { querier_id: Uuid, diff --git a/zenoh-ts/src/querier.ts b/zenoh-ts/src/querier.ts index 6759ee6..a839a02 100644 --- a/zenoh-ts/src/querier.ts +++ b/zenoh-ts/src/querier.ts @@ -166,6 +166,7 @@ export class Querier { this.undeclared = true; // Finalization registry // Queryable.registry.unregister(this); + this._remote_querier.undeclare() } /** diff --git a/zenoh-ts/src/remote_api/interface/ControlMsg.ts b/zenoh-ts/src/remote_api/interface/ControlMsg.ts index 23bba51..9a534aa 100644 --- a/zenoh-ts/src/remote_api/interface/ControlMsg.ts +++ b/zenoh-ts/src/remote_api/interface/ControlMsg.ts @@ -4,4 +4,4 @@ import type { HandlerChannel } from "./HandlerChannel"; import type { LivelinessMsg } from "./LivelinessMsg"; import type { OwnedKeyExprWrapper } from "./OwnedKeyExprWrapper"; -export type ControlMsg = "OpenSession" | "CloseSession" | { "Session": string } | { "Get": { key_expr: OwnedKeyExprWrapper, parameters: string | null, handler: HandlerChannel, id: string, consolidation: number | undefined, timeout: number | undefined, congestion_control: number | undefined, priority: number | undefined, express: boolean | undefined, encoding: string | undefined, payload: string | undefined, attachment: string | undefined, } } | { "GetFinished": { id: string, } } | { "Put": { key_expr: OwnedKeyExprWrapper, payload: B64String, encoding: string | undefined, congestion_control: number | undefined, priority: number | undefined, express: boolean | undefined, attachment: string | undefined, } } | { "Delete": { key_expr: OwnedKeyExprWrapper, congestion_control: number | undefined, priority: number | undefined, express: boolean | undefined, attachment: string | undefined, } } | { "DeclareSubscriber": { key_expr: OwnedKeyExprWrapper, handler: HandlerChannel, id: string, } } | { "Subscriber": string } | { "UndeclareSubscriber": string } | { "DeclarePublisher": { key_expr: OwnedKeyExprWrapper, encoding: string | undefined, congestion_control: number | undefined, priority: number | undefined, reliability: number | undefined, express: boolean | undefined, id: string, } } | { "UndeclarePublisher": string } | { "DeclareQueryable": { key_expr: OwnedKeyExprWrapper, id: string, complete: boolean, } } | { "UndeclareQueryable": string } | { "DeclareQuerier": { id: string, key_expr: OwnedKeyExprWrapper, target: number | undefined, timeout: number | undefined, accept_replies: number | undefined, allowed_destination: number | undefined, congestion_control: number | undefined, priority: number | undefined, consolidation: number | undefined, express: boolean | undefined, } } | { "UndDeclareQuerier": string } | { "QuerierGet": { querier_id: string, get_id: string, encoding: string | undefined, payload: string | undefined, attachment: string | undefined, } } | { "Liveliness": LivelinessMsg }; +export type ControlMsg = "OpenSession" | "CloseSession" | { "Session": string } | { "Get": { key_expr: OwnedKeyExprWrapper, parameters: string | null, handler: HandlerChannel, id: string, consolidation: number | undefined, timeout: number | undefined, congestion_control: number | undefined, priority: number | undefined, express: boolean | undefined, encoding: string | undefined, payload: string | undefined, attachment: string | undefined, } } | { "GetFinished": { id: string, } } | { "Put": { key_expr: OwnedKeyExprWrapper, payload: B64String, encoding: string | undefined, congestion_control: number | undefined, priority: number | undefined, express: boolean | undefined, attachment: string | undefined, } } | { "Delete": { key_expr: OwnedKeyExprWrapper, congestion_control: number | undefined, priority: number | undefined, express: boolean | undefined, attachment: string | undefined, } } | { "DeclareSubscriber": { key_expr: OwnedKeyExprWrapper, handler: HandlerChannel, id: string, } } | { "Subscriber": string } | { "UndeclareSubscriber": string } | { "DeclarePublisher": { key_expr: OwnedKeyExprWrapper, encoding: string | undefined, congestion_control: number | undefined, priority: number | undefined, reliability: number | undefined, express: boolean | undefined, id: string, } } | { "UndeclarePublisher": string } | { "DeclareQueryable": { key_expr: OwnedKeyExprWrapper, id: string, complete: boolean, } } | { "UndeclareQueryable": string } | { "DeclareQuerier": { id: string, key_expr: OwnedKeyExprWrapper, target: number | undefined, timeout: number | undefined, accept_replies: number | undefined, allowed_destination: number | undefined, congestion_control: number | undefined, priority: number | undefined, consolidation: number | undefined, express: boolean | undefined, } } | { "UndeclareQuerier": string } | { "QuerierGet": { querier_id: string, get_id: string, encoding: string | undefined, payload: string | undefined, attachment: string | undefined, } } | { "Liveliness": LivelinessMsg }; diff --git a/zenoh-ts/src/remote_api/querier.ts b/zenoh-ts/src/remote_api/querier.ts index 7b985a5..47bec58 100644 --- a/zenoh-ts/src/remote_api/querier.ts +++ b/zenoh-ts/src/remote_api/querier.ts @@ -33,6 +33,15 @@ export class RemoteQuerier { this.session_ref = session_ref; } + undeclare() { + + let control_msg: ControlMsg = { + UndeclareQuerier: this.querier_id as string + }; + + this.session_ref.send_ctrl_message(control_msg); + } + get( _encoding?: string, _parameters?: string,