relayx-js 1.0.11 → 1.0.13

package/README.md

@@ -22,7 +22,9 @@ Install the relay library by running the command below in your terminal<br>
         api_key: process.env.api_key,
         secret: process.env.secret,
     });
-    realtime.init();
+    realtime.init({
+        browser_mode: true // Enable when using in webapps
+    });
 
     // Initialization of topic listeners go here... (look at examples/example_chat.js for full implementation)
 
@@ -156,7 +158,9 @@ This event is fired when the library resends the messages upon reconnection to t
 
 ## API Reference
 1. init()<br>
-Initializes library with configuration options
+Initializes library with configuration options.
+    * debug (boolean): enables library level logging
+    * browser_mode (boolean): Allows websocket connections to be made from a browser. Default is TCP
 2. connect()<br>
 Connects the library to the Relay Network. This is an async function.
 3. close()<br>

package/package.json

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

package/realtime/realtime.js

@@ -108,39 +108,36 @@ export class Realtime {
         }
 
         this.staging = staging; 
+        this.opts = opts;
+
+        var browserMode = this.opts["browser_mode"];
+        var protocol = "tls"
+
+        if(browserMode != null && browserMode != undefined && (typeof browserMode == "boolean")){
+            protocol = browserMode ? "wss" : "tls"
+        }
 
         if (staging !== undefined || staging !== null){
             this.#baseUrl = staging ? [
                 "nats://0.0.0.0:4221",
                 "nats://0.0.0.0:4222",
-                "nats://0.0.0.0:4223",
-                "nats://0.0.0.0:4224",
-                "nats://0.0.0.0:4225",
-                "nats://0.0.0.0:4226"
+                "nats://0.0.0.0:4223"
                 ] : 
                 [
-                    "nats://api.relay-x.io:4221",
-                    "nats://api.relay-x.io:4222",
-                    "nats://api.relay-x.io:4223",
-                    "nats://api.relay-x.io:4224",
-                    "nats://api.relay-x.io:4225",
-                    "nats://api.relay-x.io:4226",
+                    `${protocol}://api.relay-x.io:4221`,
+                    `${protocol}://api.relay-x.io:4222`,
+                    `${protocol}://api.relay-x.io:4223`
                 ];
         }else{
             this.#baseUrl = [
-                "nats://api.relay-x.io:4221",
-                "nats://api.relay-x.io:4222",
-                "nats://api.relay-x.io:4223",
-                "nats://api.relay-x.io:4224",
-                "nats://api.relay-x.io:4225",
-                "nats://api.relay-x.io:4226",
+                `${protocol}://api.relay-x.io:4221`,
+                `${protocol}://api.relay-x.io:4222`,
+                `${protocol}://api.relay-x.io:4223`
             ];
         }
 
         this.#log(this.#baseUrl);
         this.#log(opts);
-
-        this.opts = opts;
     }
 
     /**
@@ -186,8 +183,8 @@ export class Realtime {
             this.#natsClient = await connect({ 
                 servers: this.SEVER_URL,
                 noEcho: true,
-                maxReconnectAttempts: 1200,
                 reconnect: true,
+                maxReconnectAttempts: 1200,
                 reconnectTimeWait: 1000,
                 authenticator: credsAuth,
                 token: this.api_key,
@@ -217,6 +214,8 @@ export class Realtime {
 
             this.#natsClient.closed().then(() => {
                 this.#log("the connection closed!");
+
+                this.#offlineMessageBuffer.length = 0;
             });
             
             (async () => {
@@ -291,6 +290,8 @@ export class Realtime {
         if(this.#natsClient !== null){
             this.reconnected = false;
             this.disconnected = true;
+            
+            this.#offlineMessageBuffer.length = 0;
 
             this.#natsClient.close();
         }else{
@@ -407,6 +408,10 @@ export class Realtime {
             throw new Error("Invalid topic, use isTopicValid($topic) to validate topic")
         }
 
+        if(!this.#isMessageValid(data)){
+            throw new Error("$message must be JSON, string or number")
+        }
+
         var start = Date.now()
         var messageId = crypto.randomUUID();
 
@@ -741,6 +746,35 @@ export class Realtime {
         }
     }
 
+    #isMessageValid(message){
+        if(message == null || message == undefined){
+            throw new Error("$message cannot be null / undefined")
+        }
+
+        if(typeof message == "string"){
+            return true;
+        }
+
+        if(typeof message == "number"){
+            return true;
+        }
+
+        if(this.#isJSON(message)){
+            return true;
+        }
+
+        return false;
+    }
+
+    #isJSON(data){
+        try{
+            JSON.stringify(data?.toString())
+            return true;
+        }catch(err){
+            return false
+        }
+    }
+
     #getStreamName(){
         if(this.namespace != null){
             return this.namespace + "_stream"