relayx-js 1.0.10 → 1.0.12

package/examples/example_chat.js

@@ -8,10 +8,10 @@ const rl = readline.createInterface({
 
 async function run(){
     var realtime = new Realtime({
-        api_key: process.env.user_key,
-        secret: process.env.secret
+        api_key: process.env.AUTH_JWT,
+        secret: process.env.AUTH_SECRET
     });
-    await realtime.init(false, {
+    await realtime.init(true, {
         max_retries: 2,
         debug: true
     });

package/examples/example_send_data_on_connect.js

@@ -2,8 +2,8 @@ import { Realtime, CONNECTED, RECONNECT, DISCONNECTED, MESSAGE_RESEND } from "..
 
 async function run(){
     var realtime = new Realtime({
-        api_key: process.env.user_key,
-        secret: process.env.secret
+        api_key: process.env.AUTH_JWT,
+        secret: process.env.AUTH_SECRET
     });
     await realtime.init(true, {
         max_retries: 2,

package/package.json

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

package/realtime/realtime.js

@@ -35,6 +35,11 @@ export class Realtime {
     // Offline messages
     #offlineMessageBuffer = [];
 
+    // Latency
+    #latency = [];
+    #latencyPush = null;
+    #isSendingLatency = false;
+
     #maxPublishRetries = 5; 
 
     constructor(config){
@@ -108,27 +113,18 @@ export class Realtime {
             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",
+                    "tls://api.relay-x.io:4221",
+                    "tls://api.relay-x.io:4222",
+                    "tls://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",
+                "tls://api.relay-x.io:4221",
+                "tls://api.relay-x.io:4222",
+                "tls://api.relay-x.io:4223"
             ];
         }
 
@@ -181,8 +177,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,
@@ -212,6 +208,8 @@ export class Realtime {
 
             this.#natsClient.closed().then(() => {
                 this.#log("the connection closed!");
+
+                this.#offlineMessageBuffer.length = 0;
             });
             
             (async () => {
@@ -286,6 +284,8 @@ export class Realtime {
         if(this.#natsClient !== null){
             this.reconnected = false;
             this.disconnected = true;
+            
+            this.#offlineMessageBuffer.length = 0;
 
             this.#natsClient.close();
         }else{
@@ -369,10 +369,10 @@ export class Realtime {
                     this.#topicMap.push(topic);
                 }
 
-            if(this.connected){
-                // Connected we need to create a topic in a stream
-                await this.#startConsumer(topic);
-            }
+                if(this.connected){
+                    // Connected we need to create a topic in a stream
+                    await this.#startConsumer(topic);
+                }
         }
 
         return true;
@@ -562,6 +562,8 @@ export class Realtime {
      * @param {string} topic 
      */
     async #startConsumer(topic){
+        this.#log(`Starting consumer for topic: ${topic}_${uuidv4()}`)
+
         var opts = { 
             name: `${topic}_${uuidv4()}`,
             filter_subjects: [this.#getStreamTopic(topic), this.#getStreamTopic(topic) + "_presence"],
@@ -577,16 +579,15 @@ export class Realtime {
         this.#consumerMap[topic] = consumer;
 
         await consumer.consume({
-            callback: (msg) => {
+            callback: async (msg) => {
                 try{
+                    const now = Date.now();
                     this.#log("Decoding msgpack message...")
                     var data = decode(msg.data);
 
                     var room = data.room;
 
                     this.#log(data);
-                    const latency = Date.now() - data.start
-                    this.#log(`Latency => ${latency}`)
 
                     // Push topic message to main thread
                     if (room in this.#event_func && data.client_id != this.#getClientId()){
@@ -597,6 +598,8 @@ export class Realtime {
                     }
 
                     msg.ack();
+
+                    await this.#logLatency(now, data);
                 }catch(err){
                     this.#log("Consumer err " + err);
                     msg.nack(5000);
@@ -626,11 +629,95 @@ export class Realtime {
         return del;
     }
 
+    async #logLatency(now, data){
+        if(data.client_id == this.#getClientId()){
+            this.#log("Skipping latency log for own message");
+            return;
+        }
+
+        if(this.#latency.length >= 100){
+            this.#log("Latency array is full, skipping log");
+            return;
+        }
+
+        const timeZone = Intl.DateTimeFormat().resolvedOptions().timeZone;
+
+        this.#log(`Timezone: ${timeZone}`);
+
+        const latency = now - data.start
+        this.#log(`Latency => ${latency}`)
+
+        this.#latency.push({
+            latency: latency,
+            timestamp: now
+        });
+
+        if(this.#latencyPush == null){
+            this.#latencyPush = setTimeout(async () => {
+                this.#log("setTimeout called");
+
+                if(this.#latency.length > 0){
+                    this.#log("Push from setTimeout")
+                    await this.#pushLatencyData({
+                        timezone: timeZone,
+                        history: this.#latency,
+                    });
+                }else{
+                    this.#log("No latency data to push");
+                }
+                    
+            }, 30000);
+        }
+
+        if(this.#latency.length == 100 && !this.#isSendingLatency){
+            this.#log("Push from Length Check: " + this.#latency.length);
+            await this.#pushLatencyData({
+                        timezone: timeZone,
+                        history: this.#latency,
+                    });
+        }
+    }
+
     // Utility functions
     #getClientId(){
         return this.#natsClient?.info?.client_id
     }
 
+    async #pushLatencyData(data){
+        this.#isSendingLatency = true;
+
+        try{
+            var res = await this.#natsClient.request("accounts.user.log_latency", 
+            JSONCodec().encode({
+                    api_key: this.api_key,
+                    payload: data
+                }),
+                {
+                    timeout: 5000
+                }
+            )
+
+            var data = res.json()
+
+            this.#log(data)
+            this.#resetLatencyTracker();
+        }catch(err){
+            this.#log("Error getting pushing latency data")
+            this.#log(err);
+        }
+
+        this.#isSendingLatency = false;
+    }
+
+    #resetLatencyTracker(){
+        this.#latency = [];
+
+        if(this.#latencyPush != null){
+            clearTimeout(this.#latencyPush);
+            this.#latencyPush = null;
+        }
+    }
+
     /**
      * Checks if a topic can be used to send messages to.
      * @param {string} topic - Name of event
@@ -716,7 +803,6 @@ export class Realtime {
 
             output = await func(...args); 
             success = output.success; 
-            // this.#log(output);
 
             methodDataOutput = output.output;