GH-39: Calling off on ResModel or ResCollection now only logs warning…

… if resource is not in cache, but still removes listener from eventBus. Added debug trace logging.
resgateio · Mar 31, 2021 · 2ca2e50 · 2ca2e50
1 parent 7144c8a
commit 2ca2e50
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 14 deletions.
diff --git a/src/class/ResClient.js b/src/class/ResClient.js
@@ -385,24 +385,36 @@ class ResClient {
 		return this._send('call', modelId, 'set', props);
 	}
 
-	resourceOn(rid, events, handler) {
+	resourceOn(rid, events, handler, item) {
 		let cacheItem = this.cache[rid];
-		if (!cacheItem) {
-			throw new Error("Resource " + rid + " not found in cache");
+		if (cacheItem) {
+			if (!item || cacheItem.item === item) {
+				cacheItem.addDirect();
+			}
+			item = cacheItem.item;
+		} else {
+			console.warn("Resource " + rid + " not found in cache");
 		}
 
-		cacheItem.addDirect();
-		this.eventBus.on(cacheItem.item, events, handler, this.namespace + '.resource.' + rid);
+		if (item) {
+			this.eventBus.on(item, events, handler, this.namespace + '.resource.' + rid);
+		}
 	}
 
-	resourceOff(rid, events, handler) {
+	resourceOff(rid, events, handler, item) {
 		let cacheItem = this.cache[rid];
-		if (!cacheItem) {
-			throw new Error("Resource " + rid + " not found in cache");
+		if (cacheItem) {
+			if (!item || cacheItem.item === item) {
+				cacheItem.removeDirect();
+			}
+			item = cacheItem.item;
+		} else {
+			console.warn("Resource " + rid + " not found in cache");
 		}
 
-		cacheItem.removeDirect();
-		this.eventBus.off(cacheItem.item, events, handler, this.namespace + '.resource.' + rid);
+		if (item) {
+			this.eventBus.off(item, events, handler, this.namespace + '.resource.' + rid);
+		}
 	}
 
 	/**
@@ -446,6 +458,7 @@ class ResClient {
 
 			var json = JSON.stringify(req);
 			this.ws.send(json);
+			console.debug("RC > ", json);
 		});
 	}
 
@@ -724,6 +737,7 @@ class ResClient {
 	 * @private
 	 */
 	_handleOnopen(e) {
+		console.debug("RC : open");
 		this._sendNow('version', { protocol: this.supportedProtocol })
 			.then(ver => {
 				this.protocol = versionToInt(ver.protocol) || legacyProtocol;
@@ -764,6 +778,7 @@ class ResClient {
 	 * @private
 	 */
 	_handleOnerror(e) {
+		console.debug("RC error: ", e);
 		this._connectReject({ code: 'system.connectionError', message: "Connection error", data: e });
 	}
 
@@ -773,6 +788,7 @@ class ResClient {
 	 * @private
 	 */
 	_handleOnmessage(e) {
+		console.debug("RC < ", e.data);
 		this._receive(e.data);
 	}
 
@@ -782,6 +798,7 @@ class ResClient {
 	 * @private
 	 */
 	_handleOnclose(e) {
+		console.debug("RC close: ", e);
 		this.connectPromise = null;
 		this.ws = null;
 		if (this.connected) {

diff --git a/src/class/ResCollection.js b/src/class/ResCollection.js
@@ -91,7 +91,7 @@ class ResCollection {
 	 * @returns {this}
 	 */
 	on(events, handler) {
-		this._api.resourceOn(this._rid, events, handler);
+		this._api.resourceOn(this._rid, events, handler, this);
 		return this;
 	}
 
@@ -103,7 +103,7 @@ class ResCollection {
 	 * @returns {this}
 	 */
 	off(events, handler) {
-		this._api.resourceOff(this._rid, events, handler);
+		this._api.resourceOff(this._rid, events, handler, this);
 		return this;
 	}
 

diff --git a/src/class/ResModel.js b/src/class/ResModel.js
@@ -67,7 +67,7 @@ class ResModel {
 	 * @returns {this}
 	 */
 	on(events, handler) {
-		this._api.resourceOn(this._rid, events, handler);
+		this._api.resourceOn(this._rid, events, handler, this);
 		return this;
 	}
 
@@ -79,7 +79,7 @@ class ResModel {
 	 * @returns {this}
 	 */
 	off(events, handler) {
-		this._api.resourceOff(this._rid, events, handler);
+		this._api.resourceOff(this._rid, events, handler, this);
 		return this;
 	}