relayx-webjs 1.0.2 → 1.0.4

package/CHANGELOG.md

@@ -1,3 +1,6 @@
+V1.0.4
+- Removed DNS Spoofing for testing
+
 V1.0.2
 - Wildcard topics for pub / sub fixes
 - Unit tests added for wildcard pattern matching

package/example/chat-app/package.json

@@ -5,7 +5,8 @@
   "scripts": {
     "dev": "vite",
     "build": "vite build",
-    "preview": "vite preview"
+    "preview": "vite preview",
+    "preview-proxy": "PROXY=true vite preview"
   },
   "dependencies": {
     "react": "^18.2.0",

package/example/stand-alone/example_chat.js

@@ -0,0 +1,111 @@
+import { Realtime, CONNECTED, RECONNECT, DISCONNECTED, MESSAGE_RESEND } from "../../realtime/realtime.js"
+import * as readline from 'readline';
+
+const rl = readline.createInterface({
+    input: process.stdin,
+    output: process.stdout
+});
+
+async function run(){
+    var realtime = new Realtime({
+        api_key: process.env.AUTH_JWT,
+        secret: process.env.AUTH_SECRET
+    });
+    await realtime.init(false, {
+        max_retries: 2,
+        debug: true
+    });
+
+    realtime.on(CONNECTED, async () => {
+        console.log("[IMPL] => CONNECTED!");
+    });
+
+    realtime.on(RECONNECT, (status) => {
+        console.log(`[IMPL] RECONNECT => ${status}`)
+    });
+
+    realtime.on(DISCONNECTED, () => {
+        console.log(`[IMPL] DISONNECT`)
+    });
+
+    await realtime.on("power-telemetry", (data) => {
+        console.log("power-telemetry", data);
+    });
+
+    await realtime.on("hello.>", async (data) => {
+        console.log("hello.>", data);
+    });
+
+    // await realtime.on("hello.hey.*", (data) => {
+    //     console.log("hell.hey.*", data);
+    // });
+
+    // await realtime.on("hello.hey.>", (data) => {
+    //     console.log("hello.hey.>", data);
+    // });
+
+    realtime.on(MESSAGE_RESEND, (data) => {
+        console.log(`[MSG RESEND] => ${data}`)
+    });
+
+    rl.on('line', async (input) => {
+        console.log(`You entered: ${input}`);
+
+        if(input == "exit"){
+            var output = await realtime.off("hello"); 
+            console.log(output);
+
+            realtime.close();
+
+            process.exit();
+        }else if(input == "history"){
+            rl.question("topic: ", async (topic) => {
+                var start = new Date();
+                var past = start.setDate(start.getDate() - 4)
+                var pastDate = new Date(past)
+
+                var end = new Date();
+                var past = end.setDate(end.getDate())
+                var endDate = new Date(past)
+
+                var history = await realtime.history(topic, pastDate)
+                console.log(history)
+            })
+        }else if(input == "off"){
+            rl.question("topic to off(): ", async (topic) => {
+                await realtime.off(topic);
+                console.log("off() executed")
+            })
+
+            
+        }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) => {
+                    console.log(topic, data);
+                });
+            })
+        }else{
+            rl.question("topic: ", async (topic) => {
+                var output = await realtime.publish(topic, input);
+            })
+        }
+    });
+
+    realtime.connect();
+
+    process.on('SIGINT', async () => {
+        console.log('Keyboard interrupt detected (Ctrl+C). Cleaning up...');
+        // Perform any necessary cleanup here
+    
+        // Exit the process
+        process.exit();
+    });
+    
+}
+
+await run();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "relayx-webjs",
-  "version": "1.0.2",
+  "version": "1.0.4",
   "description": "A powerful library for integrating real-time communication into your webapps, powered by the Relay Network.",
   "main": "realtime/realtime.js",
   "type": "module",

package/realtime/realtime.js

@@ -21,6 +21,8 @@ export class Realtime {
     #RECONNECTED = "RECONNECTED";
     #RECONN_FAIL = "RECONN_FAIL";
 
+    #reservedSystemTopics = [CONNECTED, DISCONNECTED, RECONNECT, this.#RECONNECTED, this.#RECONNECTING, this.#RECONN_FAIL, MESSAGE_RESEND, SERVER_DISCONNECT];
+
     setRemoteUserAttempts = 0;
     setRemoteUserRetries = 5; 
 
@@ -40,6 +42,8 @@ export class Realtime {
 
     #maxPublishRetries = 5; 
 
+    #connectCalled = false;
+
     constructor(config){
         if(typeof config != "object"){
             throw new Error("Realtime($config). $config not object => {}")
@@ -95,10 +99,13 @@ export class Realtime {
             if(arguments[0] instanceof Object){
                 opts = arguments[0];
                 staging = false;
-            }else{
+            }else if(typeof arguments[0] == "boolean"){
                 opts = {};
                 staging = arguments[0];
                 this.#log(staging)
+            }else{
+                opts = {};
+                staging = false
             }
         }else{
             staging = false;
@@ -108,23 +115,27 @@ export class Realtime {
         this.staging = staging; 
         this.opts = opts;
 
-        if (staging !== undefined || staging !== null){
-            this.#baseUrl = staging ? [
-                "nats://0.0.0.0:4421",
-                "nats://0.0.0.0:4422",
-                "nats://0.0.0.0:4423"
-                ] : 
-                [
+        if(process.env.PROXY){
+            this.#baseUrl = ["wss://api2.relay-x.io:8666"];
+        }else{
+            if (staging !== undefined || staging !== null){
+                this.#baseUrl = staging ? [
+                    "nats://0.0.0.0:4421",
+                    "nats://0.0.0.0:4422",
+                    "nats://0.0.0.0:4423"
+                    ] : 
+                    [
+                        `wss://api.relay-x.io:4421`,
+                        `wss://api.relay-x.io:4422`,
+                        `wss://api.relay-x.io:4423`
+                    ];
+            }else{
+                this.#baseUrl = [
                     `wss://api.relay-x.io:4421`,
                     `wss://api.relay-x.io:4422`,
                     `wss://api.relay-x.io:4423`
                 ];
-        }else{
-            this.#baseUrl = [
-                `wss://api.relay-x.io:4421`,
-                `wss://api.relay-x.io:4422`,
-                `wss://api.relay-x.io:4423`
-            ];
+            }
         }
 
         this.#log(this.#baseUrl);
@@ -164,6 +175,10 @@ export class Realtime {
      * Connects to the relay network
      */
     async connect(){
+        if(this.#connectCalled){
+            return;
+        }
+
         this.SEVER_URL = this.#baseUrl;
 
         var credsFile = this.#getUserCreds(this.api_key, this.secret)
@@ -178,7 +193,7 @@ export class Realtime {
                 maxReconnectAttempts: 1200,
                 reconnectTimeWait: 1000,
                 authenticator: credsAuth,
-                token: this.api_key,
+                token: this.api_key
             });
 
             this.#jetstream = await jetstream(this.#natsClient);
@@ -186,6 +201,7 @@ export class Realtime {
             await this.#getNameSpace()
 
             this.connected = true;
+            this.#connectCalled = true;
         }catch(err){
             this.#log("ERR")
             this.#log(err);
@@ -196,17 +212,13 @@ export class Realtime {
         if (this.connected == true){
             this.#log("Connected to server!");
 
-            // Callback on client side
-            if (CONNECTED in this.#event_func){
-                if (this.#event_func[CONNECTED] !== null || this.#event_func[CONNECTED] !== undefined){
-                    this.#event_func[CONNECTED]()
-                }
-            }
-
             this.#natsClient.closed().then(() => {
                 this.#log("the connection closed!");
 
                 this.#offlineMessageBuffer.length = 0;
+                this.connected = false;
+                this.reconnecting = false;
+                this.#connectCalled = false;
 
                 if (DISCONNECTED in this.#event_func){
                     if (this.#event_func[DISCONNECTED] !== null || this.#event_func[DISCONNECTED] !== undefined){
@@ -224,12 +236,6 @@ export class Realtime {
                         this.#log(`client disconnected - ${s.data}`);
 
                         this.connected = false;
-
-                        if (DISCONNECTED in this.#event_func){
-                            if (this.#event_func[DISCONNECTED] !== null || this.#event_func[DISCONNECTED] !== undefined){
-                                this.#event_func[DISCONNECTED]()
-                            }
-                        }
                     break;
                     case Events.LDM:
                         this.#log("client has been requested to reconnect");
@@ -259,6 +265,7 @@ export class Realtime {
                         this.#log("client is attempting to reconnect");
 
                         this.reconnecting = true;
+                        this.connected = false;
 
                         if(RECONNECT in this.#event_func && this.reconnecting){
                             this.#event_func[RECONNECT](this.#RECONNECTING);   
@@ -276,6 +283,13 @@ export class Realtime {
             // Subscribe to topics
             this.#subscribeToTopics();
             this.#log("Subscribed to topics");
+
+            // Callback on client side
+            if (CONNECTED in this.#event_func){
+                if (this.#event_func[CONNECTED] !== null || this.#event_func[CONNECTED] !== undefined){
+                    this.#event_func[CONNECTED]()
+                }
+            }
         }
     }
 
@@ -286,10 +300,11 @@ export class Realtime {
         if(this.#natsClient !== null){
             this.reconnected = false;
             this.disconnected = true;
+            this.#connectCalled = false;
             
             this.#offlineMessageBuffer.length = 0;
 
-            await this.#deleteConsumer();
+            await this.#deleteAllConsumers();
 
             this.#natsClient.close();
         }else{
@@ -301,8 +316,20 @@ export class Realtime {
      * Start consumers for topics initialized by user
      */
     async #subscribeToTopics(){
-        if(this.#topicMap.length > 0){
-            await this.#startConsumer(); 
+        this.#topicMap.forEach(async (topic) => {
+            // Subscribe to stream
+            await this.#startConsumer(topic); 
+        });
+    }
+    
+    /**
+     * Delete consumers for topics initialized by user
+     */
+    async #deleteAllConsumers(){
+        for(let i = 0; i < this.#topicMap.length; i++){
+            let topic = this.#topicMap[i];
+
+            await this.#deleteConsumer(topic); 
         }
     }
 
@@ -324,6 +351,8 @@ export class Realtime {
         this.#topicMap = this.#topicMap.filter(item => item !== topic);
 
         delete this.#event_func[topic];
+
+        return await this.#deleteConsumer(topic);
     }
 
     /**
@@ -349,31 +378,23 @@ export class Realtime {
             throw new Error(`Expected $topic type -> string. Instead receieved -> ${typeof topic}`);
         }
 
-        if(!(topic in this.#event_func)){
-            this.#event_func[topic] = func;
-        }else{
+        if(topic in this.#event_func || this.#topicMap.includes(topic)){
             return false
         }
 
-        if (![CONNECTED, DISCONNECTED, RECONNECT, this.#RECONNECTED,
-            this.#RECONNECTING, this.#RECONN_FAIL, MESSAGE_RESEND, SERVER_DISCONNECT].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];
-                    }
+        this.#event_func[topic] = func;
 
-                    throw new Error("Invalid topic, use isTopicValid($topic) to validate topic")
-                }
+        if (!this.#reservedSystemTopics.includes(topic)){
+            if(!this.isTopicValid(topic)){
+                throw new Error("Invalid topic, use isTopicValid($topic) to validate topic")
+            }
 
-                if(!this.#topicMap.includes(topic)){
-                    this.#topicMap.push(topic);
-                }
+            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;
@@ -403,7 +424,7 @@ export class Realtime {
             throw new Error("Invalid topic, use isTopicValid($topic) to validate topic")
         }
 
-        if(!this.#isMessageValid(data)){
+        if(!this.isMessageValid(data)){
             throw new Error("$message must be JSON, string or number")
         }
 
@@ -418,15 +439,9 @@ export class Realtime {
             "start": Date.now()
         }
 
-        this.#log("Encoding message via msg pack...")
-        var encodedMessage = encode(message);
-
         if(this.connected){
-            if(!this.#topicMap.includes(topic)){
-                this.#topicMap.push(topic);
-            }else{
-                this.#log(`${topic} exists locally, moving on...`)
-            }
+            this.#log("Encoding message via msg pack...")
+            var encodedMessage = encode(message);
 
             this.#log(`Publishing to topic => ${this.#getStreamTopic(topic)}`)
     
@@ -453,7 +468,6 @@ export class Realtime {
      * @param {string} topic 
      */
     async history(topic, start, end){
-        this.#log(start)
         if(topic == null || topic == undefined){
             throw new Error("$topic is null or undefined");
         }
@@ -490,11 +504,16 @@ export class Realtime {
             end = end.toISOString();
         }
 
+        if(!this.connected){
+            return [];
+        }
+
         var opts = { 
-            name: `${topic}_${uuidv4()}_history`,
+            name: `webjs_${topic}_${uuidv4()}_history_consumer`,
             filter_subjects: [this.#getStreamTopic(topic)],
             replay_policy: ReplayPolicy.Instant,
             opt_start_time: start,
+            delivery_policy: DeliverPolicy.StartTime,
             ack_policy: AckPolicy.Explicit,
         }
 
@@ -523,7 +542,12 @@ export class Realtime {
             var data = decode(msg.data);
             this.#log(data);
             
-            history.push(data.message);
+            history.push({
+                "id": data.id,
+                "topic": data.room,
+                "message": data.message,
+                "timestamp": msg.timestamp
+            });
         }
 
         var del = await consumer.delete();
@@ -571,46 +595,42 @@ export class Realtime {
      * @param {string} topic 
      */
     async #startConsumer(topic){
-        if(this.#consumer != null){
-            return;
-        }
-
-        this.#log(`Starting consumer for topic: ${topic}_${uuidv4()}`)
+        const consumerName = `webjs_${topic}_${uuidv4()}_consumer`;
 
         var opts = { 
-            name: `${uuidv4()}`,
-            filter_subjects: [this.#getStreamTopic(">")],
+            name: consumerName,
+            filter_subjects: [this.#getStreamTopic(topic)],
             replay_policy: ReplayPolicy.Instant,
             opt_start_time: new Date(),
             ack_policy: AckPolicy.Explicit,
             delivery_policy: DeliverPolicy.New
         }
 
-        this.#consumer = await this.#jetstream.consumers.get(this.#getStreamName(), opts);
+        const consumer = await this.#jetstream.consumers.get(this.#getStreamName(), opts);
         this.#log(this.#topicMap)
 
-        await this.#consumer.consume({
+        this.#consumerMap[topic] = consumer;
+
+        await consumer.consume({
             callback: async (msg) => {
                 try{
                     const now = Date.now();
+                    msg.working()
                     this.#log("Decoding msgpack message...")
                     var data = decode(msg.data);
 
-                    var room = this.#stripStreamHash(msg.subject);
+                    var msgTopic = this.#stripStreamHash(msg.subject);
 
                     this.#log(data);
 
                     // Push topic message to main thread
                     if (data.client_id != this.#getClientId()){
-                        var topics = this.#getCallbackTopics(room);
-                        this.#log(topics)
-
-                        for(let i = 0; i < topics.length; i++){
-                            var top = topics[i];
+                        var topicMatch = this.#topicPatternMatcher(topic, msgTopic)
 
-                            this.#event_func[top]({
+                        if(topicMatch){
+                            this.#event_func[topic]({
                                 "id": data.id,
-                                "topic": room,
+                                "topic": msgTopic,
                                 "data": data.message
                             });
                         }
@@ -632,15 +652,20 @@ export class Realtime {
      * Deletes consumer
      * @param {string} topic 
      */
-    async #deleteConsumer(){
+    async #deleteConsumer(topic){
+        this.#log(topic)
+        const consumer = this.#consumerMap[topic]
+
         var del = false;
 
-        if (this.#consumer != null && this.#consumer != undefined){
-            del = await this.#consumer.delete();
+        if (consumer != null && consumer != undefined){
+            del = await consumer.delete();
         }else{
             del = false
         }
 
+        delete this.#consumerMap[topic];
+
         return del;
     }
 
@@ -650,11 +675,6 @@ export class Realtime {
             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}`);
@@ -671,7 +691,7 @@ export class Realtime {
             this.#latencyPush = setTimeout(async () => {
                 this.#log("setTimeout called");
 
-                if(this.#latency.length > 0){
+                if(this.#latency.length > 0 && this.connected && !this.#isSendingLatency){
                     this.#log("Push from setTimeout")
                     await this.#pushLatencyData({
                         timezone: timeZone,
@@ -684,7 +704,7 @@ export class Realtime {
             }, 30000);
         }
 
-        if(this.#latency.length == 100 && !this.#isSendingLatency){
+        if(this.#latency.length >= 100 && !this.#isSendingLatency){
             this.#log("Push from Length Check: " + this.#latency.length);
             await this.#pushLatencyData({
                         timezone: timeZone,
@@ -740,8 +760,7 @@ export class Realtime {
      */
     isTopicValid(topic){
         if(topic !== null && topic !== undefined && (typeof topic) == "string"){
-            var arrayCheck = ![CONNECTED, DISCONNECTED, RECONNECT, this.#RECONNECTED,
-                this.#RECONNECTING, this.#RECONN_FAIL, MESSAGE_RESEND, SERVER_DISCONNECT].includes(topic);
+            var arrayCheck = !this.#reservedSystemTopics.includes(topic);
 
             const TOPIC_REGEX = /^(?!.*\$)(?:[A-Za-z0-9_*~-]+(?:\.[A-Za-z0-9_*~-]+)*(?:\.>)?|>)$/u;
 
@@ -753,7 +772,7 @@ export class Realtime {
         }
     }
 
-    #isMessageValid(message){
+    isMessageValid(message){
         if(message == null || message == undefined){
             throw new Error("$message cannot be null / undefined")
         }