Skip to content

Multiple callbacks per topic #50

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
clarkbynum merged 6 commits into from
Sep 30, 2020
Merged

Multiple callbacks per topic #50

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b1c4420
allow multiple callbacks per topic and call all on message received
seschwartz8 Sep 29, 2020
92b279b
remove typo in ternary
seschwartz8 Sep 29, 2020
399940a
remove ES6
seschwartz8 Sep 29, 2020
add5945
add console logs for testing
seschwartz8 Sep 30, 2020
515056d
adjust type def file to include new callbackId parameter
seschwartz8 Sep 30, 2020
c2e4a9f
remove console logs
seschwartz8 Sep 30, 2020
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
9 changes: 7 additions & 2 deletions index.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -410,9 +410,14 @@ interface Messaging {
subscribe(
topic: string,
options: MessagingSubscribeOptions,
messageCallback: MessageCallback
messageCallback: MessageCallback,
callbackId?: string
): void;
unsubscribe(
topic: string,
options: MessagingSubscribeOptions,
callbackId?: string
): void;
unsubscribe(topic: string, options: MessagingSubscribeOptions): void;
disconnect(): void;
}

Expand Down
41 changes: 31 additions & 10 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2017,6 +2017,8 @@ if (!window.console) {
return user;
};

const DEFAULT_CALLBACK_ID = '__default_callback_id__';

/**
* Initializes the ClearBlade messaging object and connects to a server.
* @class ClearBlade.Messaging
Expand Down Expand Up @@ -2109,11 +2111,15 @@ if (!window.console) {
};

messaging.client.onMessageArrived = function (message) {
// messageCallback from Subscribe()

messageCallbacks[
ClearBlade.getMessageTopic(message.destinationName, messageCallbacks)
](message.payloadString, message);
// messageCallbacks from Subscribe() may contain multiple callbacks per topic
const callbacks = Object.values(
messageCallbacks[
ClearBlade.getMessageTopic(message.destinationName, messageCallbacks)
]
);
for (callback of callbacks) {
callback(message.payloadString, message);
}
};
// the mqtt websocket library uses "onConnect," but our terminology uses
// "onSuccess" and "onFailure"
Expand Down Expand Up @@ -2186,7 +2192,12 @@ if (!window.console) {
* var cb = ClearBlade.Messaging({}, callback);
* cb.subscribe("ClearBlade/is awesome!",{});
*/
messaging.subscribe = function (topic, options, messageCallback) {
messaging.subscribe = function (
topic,
options,
messageCallback,
callbackId
) {
var conf = {
qos: this._qos || 0,
};
Expand All @@ -2197,7 +2208,15 @@ if (!window.console) {

this.client.subscribe(topic, conf);

messageCallbacks[topic] = messageCallback;
if (messageCallbacks[topic]) {
messageCallbacks[topic] = Object.assign(messageCallbacks[topic], {
[callbackId || DEFAULT_CALLBACK_ID]: messageCallback,
});
} else {
messageCallbacks[topic] = {
[callbackId || DEFAULT_CALLBACK_ID]: messageCallback,
};
}
};

/**
Expand All @@ -2218,15 +2237,17 @@ if (!window.console) {
* var cb = ClearBlade.Messaging({}, callback);
* cb.unsubscribe("ClearBlade/is awesome!",{"onSuccess":function(){console.log("we unsubscribe");});
*/
messaging.unsubscribe = function (topic, options) {
messaging.unsubscribe = function (topic, options, callbackId) {
var conf = {};
conf['invocationContext'] = options['invocationContext'] || {};
conf['onSuccess'] = options['onSuccess'] || function () {}; //null;
conf['onFailure'] = options['onFailure'] || function () {}; //null;
conf['timeout'] = options['timeout'] || 60;

delete messageCallbacks[topic];
this.client.unsubscribe(topic, conf);
delete messageCallbacks[topic][callbackId || DEFAULT_CALLBACK_ID];
if (Object.keys(messageCallbacks[topic]).length === 0) {
this.client.unsubscribe(topic, conf);
}
};

/**
Expand Down