Merge pull request #21 from azuqua/add-subscribe-callback

feat: add subscribe callback
azuqua · Oct 19, 2021 · dac71f1 · dac71f1
2 parents 46625eb + 4de4814
commit dac71f1
Show file tree

Hide file tree

Showing 4 changed files with 4,183 additions and 6 deletions.
diff --git a/clients/browser/tokensockjs.js b/clients/browser/tokensockjs.js
@@ -95,7 +95,7 @@
 		this._socket.send(JSON.stringify(data));
 	};
 
-	Monitor.prototype.handleResponse = function(data){
+	Monitor.prototype.callCallback = function(data){
 		var fn = null;
 		if(data.rpc && data.uuid)
 			fn = this._inTransit[data.rpc][data.uuid];
@@ -107,7 +107,12 @@
 			delete this._inTransit[data.rpc][data.uuid];
 			if(Object.size(this._inTransit[data.rpc]) === 0)
 				delete this._inTransit[data.rpc];
-		}if(data.channel){
+		}
+	};
+
+	Monitor.prototype.handleResponse = function(data){
+		this.callCallback(data);
+		if (data.channel) {
 			this._emitter.emit("message", data.channel, data.message);
 		}
 	};
@@ -129,6 +134,7 @@
 	var handleInternal = function(instance, command, data){
 		if(command === "subscribe"){
 			instance._channels[data.channel] = true;
+			instance._monitor.callCallback(data);
 		}else if(command === "unsubscribe"){
 			delete instance._channels[data.channel];
 		}else if(command === "rpc"){

diff --git a/clients/browser/tokensockjs.min.js b/clients/browser/tokensockjs.min.js