relayx-js 1.0.7 → 1.0.9

package/CHANGELOG.md

@@ -1,3 +1,6 @@
+V1.0.8
+- History API fetch() to consume()
+
 V1.0.7
 - History API added
 - README updated to explain history API usage

package/README.md

@@ -66,7 +66,7 @@ Unsubscribe from a topic:<br>
     }
     ```
 4. <b>History</b><br>
-Get previously published messages between a start date and end date
+Get previously published messages between a start date and end date. Dates are in UTC.
     ```javascript
     var start = new Date();
     var past = start.setDate(start.getDate() - 4) // Get start date from 4 days ago

package/examples/example_chat.js

@@ -8,8 +8,8 @@ const rl = readline.createInterface({
 
 async function run(){
     var realtime = new Realtime({
-        api_key: process.env.user_key,
-        secret: process.env.secret
+        api_key: "eyJ0eXAiOiJKV1QiLCJhbGciOiJlZDI1NTE5LW5rZXkifQ.eyJhdWQiOiJOQVRTIiwibmFtZSI6IjY3ZmZhMWVkMzk0NDRlODMwOGIxMDBiNCIsInN1YiI6IlVENUtRN0hNU01IMlNVWklCTTNCU1IyMjdQNUw3NFZKVTNUS0tPMk5XT1U2Qkg2S0pEV0JCNEFNIiwibmF0cyI6eyJkYXRhIjotMSwicGF5bG9hZCI6LTEsInN1YnMiOi0xLCJwdWIiOnsiZGVueSI6WyI-Il19LCJzdWIiOnsiZGVueSI6WyI-Il19LCJvcmdfZGF0YSI6eyJvcmdfaWQiOiI2N2ZmYTFkMzRmMDQ5MTAzNGQ5ZWJiNzIiLCJvcmdfbmFtZSI6IlNwYWNlWCIsInZhbGlkaXR5X2tleSI6IjU3NjUyM2UwLWM3ZGMtNGVlMS04OTFjLTAzNTFmMDgxOTkzYyIsInJvbGUiOiJ1c2VyIiwicHJvamVjdF9pZCI6IjY3ZmZhMWVkMzk0NDRlODMwOGIxMDBiNCJ9LCJpc3N1ZXJfYWNjb3VudCI6IkFCMzczR0JSWkVMNEhLNUdXWkJNNFNVTEFLVUhZSTVNUE9UWVNKQUpCVVVNU01KT09XREhFMjVYIiwidHlwZSI6InVzZXIiLCJ2ZXJzaW9uIjoyfSwiaXNzIjoiQUIzNzNHQlJaRUw0SEs1R1daQk00U1VMQUtVSFlJNU1QT1RZU0pBSkJVVU1TTUpPT1dESEUyNVgiLCJpYXQiOjE3NDQ4MDYzOTQsImp0aSI6Im5ZczM4MEZxa1dnNis3eGl4Wnl6VjJWS0ZLSVFNOEJrOG9ESFFzTjdBcW1YaUNmd05HTnNkQnVNK21YMW8xN0dFM2YxeEJXSFFGU1VUSmFrTmN1MGNnPT0ifQ.FVRHylWkCyIN0Axed0Z-H2Zgfh3HjEHGkjWQfUe70O3hl3OQYkQa1Ka-IYilGPB2fpd272t3VJarMvF1e5OSCw",
+        secret: "SUAC7MP5AIOVJJTV2DCKRQRVAANBETTVYP26O4YE2BXELFOCURXLMEX5YE"
     });
     await realtime.init(true, {
         max_retries: 2,
@@ -28,8 +28,8 @@ async function run(){
         console.log(`[IMPL] DISONNECT`)
     });
 
-    await realtime.on("hello", (data) => {
-        console.log("hello", data);
+    await realtime.on("power-telemetry", (data) => {
+        console.log("power-telemetry", data);
     });
 
     await realtime.on("hello1", (data) => {
@@ -61,7 +61,7 @@ async function run(){
                 var endDate = new Date(past)
 
                 var history = await realtime.history(topic, pastDate, endDate)
-                console.log(history)
+                // console.log(history)
             })
         }else if(input == "off"){
             rl.question("topic to off(): ", async (topic) => {

package/examples/example_send_data_on_connect.js

@@ -2,12 +2,12 @@ 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: "eyJ0eXAiOiJKV1QiLCJhbGciOiJlZDI1NTE5LW5rZXkifQ.eyJhdWQiOiJOQVRTIiwibmFtZSI6IjY3ZmY5OGEwMTQ4NTgwYTcwY2U4ZThjMiIsInN1YiI6IlVBRlc1MkU0TEZDNERSSDI2M0M3SUlNS1ZTWU1WU1hYTjZSMkxMUDNBUVI0RExIQTI1WFc1RlpZIiwibmF0cyI6eyJkYXRhIjotMSwicGF5bG9hZCI6LTEsInN1YnMiOi0xLCJwdWIiOnsiZGVueSI6WyI-Il19LCJzdWIiOnsiZGVueSI6WyI-Il19LCJvcmdfZGF0YSI6eyJvcmdfaWQiOiI2N2ZmOTg3YzE1NDU5ZDc3MTAzMDVlY2IiLCJvcmdfbmFtZSI6IlNwYWNlWCIsInZhbGlkaXR5X2tleSI6IjY1NWU3N2ZhLTgxZTEtNDNhOS1hZTdhLWIyODA0M2MxNGFjMSIsInJvbGUiOiJ1c2VyIiwicHJvamVjdF9pZCI6IjY3ZmY5OGEwMTQ4NTgwYTcwY2U4ZThjMiJ9LCJpc3N1ZXJfYWNjb3VudCI6IkFCMzczR0JSWkVMNEhLNUdXWkJNNFNVTEFLVUhZSTVNUE9UWVNKQUpCVVVNU01KT09XREhFMjVYIiwidHlwZSI6InVzZXIiLCJ2ZXJzaW9uIjoyfSwiaXNzIjoiQUIzNzNHQlJaRUw0SEs1R1daQk00U1VMQUtVSFlJNU1QT1RZU0pBSkJVVU1TTUpPT1dESEUyNVgiLCJpYXQiOjE3NDQ4MDQwOTYsImp0aSI6Im5SdnRiUkhFWEtZVjhQRXoxeXhZQjFMRUVHNkU0ZlRndCs3cmZRWGdEZUNGM1ZSNXlsbGFiR3ZsaWxBSGR6dThkeXQvM3lxcVl3MDg1eUhSS1ZHT1R3PT0ifQ.tGj1iL8537ttVqQlTrW3qLrpYOb19I5VFZYurEltIA2aKgRrFLhz08qRtO1tm-GKVwgonM_10P_Aj1MnhzbeCw",
+        secret: "SUALQKYAGDY6HHMW7NCHMKV6RAWSZPS2USQD6MIWIZWW6DATMSZ7MOCLUM"
     });
     await realtime.init(true, {
         max_retries: 2,
-        // debug: true
+        debug: true
     });
 
     realtime.on(CONNECTED, async () => {
@@ -16,9 +16,9 @@ async function run(){
         for (let angle = 0; angle <= 18000; angle++){
 
             var value = Math.floor(Math.random() * (100 + 1))
-            console.log(value)
+            // console.log(value)
 
-            // await realtime.publish("test-power-1", {
+            // await realtime.publish("test-power", {
             //     "value": value,
             //     "time": Date.now() + 2000
             // })
@@ -28,7 +28,7 @@ async function run(){
                 "time": Date.now()
             });
 
-            console.log(`Message sent => ${sent}`);
+            // console.log(`Message sent => ${sent}`);
 
             await realtime.sleep(100)
         }

package/package.json

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

package/realtime/realtime.js

@@ -114,7 +114,8 @@ export class Realtime {
                 "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:4226"
+                ] : 
                 [
                     "nats://api.relay-x.io:4221",
                     "nats://api.relay-x.io:4222",
@@ -185,7 +186,7 @@ export class Realtime {
                 reconnect: true,
                 reconnectTimeWait: 1000,
                 authenticator: credsAuth,
-                token: this.api_key
+                token: this.api_key,
             });
 
             this.#jsManager = await jetstreamManager(this.#natsClient);
@@ -279,6 +280,7 @@ export class Realtime {
 
             // Subscribe to topics
             this.#subscribeToTopics();
+            this.#log("Subscribed to topics");
         }
     }
 
@@ -358,7 +360,7 @@ export class Realtime {
         }
 
         if (![CONNECTED, DISCONNECTED, RECONNECT, this.#RECONNECTED,
-            this.#RECONNECTING, this.#RECONN_FAIL, MESSAGE_RESEND].includes(topic)){
+            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){
@@ -485,6 +487,8 @@ export class Realtime {
             end = end.toISOString();
         }
 
+        console.log(`END => ${end}`)
+
         await this.#createOrGetStream();
 
         var opts = { 
@@ -501,9 +505,7 @@ export class Realtime {
 
         this.#consumerMap[topic] = consumer;
 
-        const msgs = await consumer.fetch({
-            expires: 10000
-        });
+        const msgs = await consumer.consume();
 
         var history = [];
 
@@ -516,6 +518,8 @@ export class Realtime {
                 }
             }
 
+            console.log(m.timestamp)
+
             var data = m.json();
             history.push(data.message);
         }
@@ -578,12 +582,12 @@ export class Realtime {
 
         const consumer = await this.#jetstream.consumers.get(this.#getStreamName(), opts);
         this.#log(this.#topicMap)
-        this.#log("Consumer is consuming");
 
         this.#consumerMap[topic] = consumer;
 
         await consumer.consume({
             callback: (msg) => {
+                console.log("TIMESTAMP", msg.info)
 
                 msg.ack();
                 try{
@@ -607,6 +611,7 @@ export class Realtime {
                 }
             }
         });
+        this.#log("Consumer is consuming");
     }
 
     /**
@@ -650,6 +655,7 @@ export class Realtime {
             await this.#jsManager.streams.add({
                 name: streamName,
                 subjects: [...this.#getStreamTopicList(), ...this.#getPresenceTopics()],
+                num_replicas: 3
             });
 
             this.#log(`${streamName} created`);
@@ -675,9 +681,9 @@ 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].includes(topic);
+                this.#RECONNECTING, this.#RECONN_FAIL, MESSAGE_RESEND, SERVER_DISCONNECT].includes(topic);
 
-            var spaceStarCheck = !topic.includes(" ") && !topic.includes("*");
+            var spaceStarCheck = !topic.includes(" ") && !topic.includes("*") && !topic.includes(".");
 
             return arrayCheck && spaceStarCheck;
         }else{
@@ -859,4 +865,5 @@ export class Realtime {
 export const CONNECTED = "CONNECTED";
 export const RECONNECT = "RECONNECT";
 export const MESSAGE_RESEND = "MESSAGE_RESEND";
-export const DISCONNECTED = "DISCONNECTED";
+export const DISCONNECTED = "DISCONNECTED";
+export const SERVER_DISCONNECT = "SERVER_DISCONNECT";