Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions examples/pubsub.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use std::error::Error;
use wamp_async::{Client, ClientConfig};
use wamp_async::{Client, ClientConfig, WampDict};

#[tokio::main]
async fn main() -> Result<(), Box<dyn Error>> {
Expand Down Expand Up @@ -44,7 +44,7 @@ async fn main() -> Result<(), Box<dyn Error>> {
println!(
"Subscribing to peer.heartbeat events. Start another instance with a 'pub' argument"
);
let (sub_id, mut heartbeat_queue) = client.subscribe("peer.heartbeat").await?;
let (sub_id, mut heartbeat_queue) = client.subscribe("peer.heartbeat", WampDict::new()).await?;
println!("Waiting for {} heartbeats...", max_events);

while cur_event_num < max_events {
Expand Down
2 changes: 2 additions & 0 deletions src/client.rs
Original file line number Diff line number Diff line change
Expand Up @@ -397,11 +397,13 @@ impl<'a> Client<'a> {
pub async fn subscribe<T: AsRef<str>>(
&self,
topic: T,
options: WampDict,
) -> Result<(WampId, SubscriptionQueue), WampError> {
// Send the request
let (res, result) = oneshot::channel();
if let Err(e) = self.ctl_channel.send(Request::Subscribe {
uri: topic.as_ref().to_string(),
options,
res,
}) {
return Err(From::from(format!(
Expand Down
2 changes: 1 addition & 1 deletion src/core/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -320,7 +320,7 @@ impl<'a> Core<'a> {
.await
}
Request::Leave { res } => send::leave_realm(self, res).await,
Request::Subscribe { uri, res } => send::subscribe(self, uri, res).await,
Request::Subscribe { uri, options, res } => send::subscribe(self, uri, options, res).await,
Request::Unsubscribe { sub_id, res } => send::unsubscribe(self, sub_id, res).await,
Request::Publish {
uri,
Expand Down
5 changes: 3 additions & 2 deletions src/core/send.rs
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ pub enum Request<'a> {
},
Subscribe {
uri: WampString,
options: WampDict,
res: PendingSubResult,
},
Unsubscribe {
Expand Down Expand Up @@ -187,14 +188,14 @@ pub async fn leave_realm(core: &mut Core<'_>, res: Sender<Result<(), WampError>>
Status::Ok
}

pub async fn subscribe(core: &mut Core<'_>, topic: WampString, res: PendingSubResult) -> Status {
pub async fn subscribe(core: &mut Core<'_>, topic: WampString, options: WampDict, res: PendingSubResult) -> Status {
let request = core.create_request();

if let Err(e) = core
.send(&Msg::Subscribe {
request,
topic,
options: WampDict::new(),
options,
})
.await
{
Expand Down