relayx-js 1.0.3 → 1.0.4

package/examples/example_chat.js

@@ -65,6 +65,8 @@ async function run(){
         }else if(input == "close"){
             realtime.close();
             console.log("Connection closed");
+        }else if(input == "init"){
+            await realtime.connect()
         }else if(input == "on"){
             rl.question("topic: ", async (topic) => {
                 await realtime.on(topic, (data) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "relayx-js",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "main": "realtime/realtime.js",
   "type": "module",
   "scripts": {

package/realtime/realtime.js

@@ -251,7 +251,7 @@ export class Realtime {
                         this.reconnecting = false;
                         this.connected = true;
 
-                        this.#subscribeToTopics();
+                        // this.#subscribeToTopics();
 
                         if(RECONNECT in this.#event_func){
                             this.#event_func[RECONNECT](this.#RECONNECTED);   
@@ -356,11 +356,22 @@ export class Realtime {
         }
 
         if(!(topic in this.#event_func)){
-            this.#event_func[topic] = func; 
+            this.#event_func[topic] = func;
+        }else{
+            return false
         }
 
         if (![CONNECTED, DISCONNECTED, RECONNECT, this.#RECONNECTED,
             this.#RECONNECTING, this.#RECONN_FAIL, MESSAGE_RESEND].includes(topic)){
+                if(!this.isTopicValid(topic)){
+                    // We have an invalid topic, lets remove it
+                    if(topic in this.#event_func){
+                        delete this.#event_func[topic];
+                    }
+
+                    throw new Error("Invalid topic, use isTopicValid($topic) to validate topic")
+                }
+
                 if(!this.#topicMap.includes(topic)){
                     this.#topicMap.push(topic);
                 }
@@ -370,6 +381,8 @@ export class Realtime {
                 await this.#startConsumer(topic);
             }
         }
+
+        return true;
     }
 
     /**
@@ -533,7 +546,7 @@ export class Realtime {
         if (consumer != null && consumer != undefined){
             del = await consumer.delete();
         }else{
-            del = true
+            del = false
         }
 
         delete this.#consumerMap[topic];
@@ -586,8 +599,12 @@ export class Realtime {
      */
     isTopicValid(topic){
         if(topic !== null && topic !== undefined && (typeof topic) == "string"){
-            return ![CONNECTED, DISCONNECTED, RECONNECT, this.#RECONNECTED,
+            var arrayCheck = ![CONNECTED, DISCONNECTED, RECONNECT, this.#RECONNECTED,
                 this.#RECONNECTING, this.#RECONN_FAIL, MESSAGE_RESEND].includes(topic);
+
+            var spaceStarCheck = !topic.includes(" ") && !topic.includes("*");
+
+            return arrayCheck && spaceStarCheck;
         }else{
             return false;
         }

package/tests/test.js

@@ -322,7 +322,8 @@ test("on() test", async () => {
 
     //---------------------------------------------------------------
 
-    await realtime.on("hello_world", () => {});
+    var res = await realtime.on("hello_world", () => {});
+    assert.strictEqual(res, true)
 
     var eventFunc = realtime.testGetEventMap();
     var topicMap = realtime.testGetTopicMap();
@@ -333,6 +334,16 @@ test("on() test", async () => {
     assert.notStrictEqual(eventFunc["hello_world"], null)
     assert.notStrictEqual(eventFunc["hello_world"], undefined)
     assert.strictEqual(typeof eventFunc["hello_world"], "function")
+
+    // Realtime already has a reference of this topic, so the return val will be false
+    res = await realtime.on("hello_world", () => {});
+    assert.strictEqual(res, false)
+
+    res = await realtime.on("hello_world", () => {});
+    assert.strictEqual(res, false)
+
+    res = await realtime.on("hello_world", () => {});
+    assert.strictEqual(res, false)
 });
 
 test("off() test", async () => {
@@ -370,6 +381,21 @@ test("off() test", async () => {
     assert.strictEqual(!topicMap.includes("hello"), true)
     assert.strictEqual(eventFunc["hello"], undefined)
     assert.strictEqual(consumerMap["hello"], undefined)
+
+    // Turning off topic multiple times to check for crashes.
+    // Since it is off already, output will be false
+    var status = await realtime.off("hello");
+    assert.strictEqual(status, false)
+
+    var status = await realtime.off("hello");
+    assert.strictEqual(status, false)
+
+    var status = await realtime.off("hello");
+    assert.strictEqual(status, false)
+
+    var status = await realtime.off("hello");
+    assert.strictEqual(status, false)
+
 });
 
 test("Get stream name test", () => {