atmosx-nwws-parser 1.0.182 → 1.0.184

package/bootstrap.js

@@ -103,6 +103,7 @@ module.exports.settings = {
 module.exports.cache = { 
     lastStanza: new Date().getTime(), 
     session: null, 
+    sigHault: false,
     isConnected: false, 
     attemptingReconnect: false, 
     totalReconnects: 0 

package/index.js

@@ -135,8 +135,10 @@ class NoaaWeatherWireServiceCore {
                     await loader.static.session.stop().catch(() => {});
                     await loader.static.session.start().catch(() => {});
                 }, 2 * 1000);
+                loader.cache.sigHault = true;
                 throw new Error(`rapid-reconnect`);
             }
+            loader.cache.sigHault = false;
             loader.static.lastConnect = new Date().getTime();
             loader.cache.isConnected = true;
             loader.static.session.send(loader.packages.xmpp.xml('presence', { to: `nwws@conference.nwws-oi.weather.gov/${this.metadata.authentication.display}`, xmlns: 'http://jabber.org/protocol/muc' }))
@@ -147,11 +149,12 @@ class NoaaWeatherWireServiceCore {
             }
         })
         loader.static.session.on(`offline`, () => {
-            loader.static.session.stop().catch(() => {});
             loader.cache.isConnected = false;
+            loader.cache.sigHault = true;
             throw new Error(`unreachable-host`);
         })
         loader.static.session.on(`error`, async (error) => {
+            loader.cache.sigHault = true;
             throw new Error(error.message || `service-error`);
         })
         loader.static.session.on(`stanza`, (stanza) => {
@@ -182,7 +185,7 @@ class NoaaWeatherWireServiceCore {
       */
 
     isReconnectEligible = async function(minSeconds=60) {
-        if (loader.cache.isConnected && loader.static.session) {
+        if ((loader.cache.isConnected || loader.cache.sigHault == true) && loader.static.session) {
             let lastStanza = new Date().getTime() - loader.cache.lastStanza;
             if (lastStanza > minSeconds * 1000) {
                 if (!loader.cache.attemptingReconnect) {
@@ -190,8 +193,8 @@ class NoaaWeatherWireServiceCore {
                     loader.cache.isConnected = false;
                     loader.cache.totalReconnects += 1;
                     loader.static.events.emit(`onReconnect`, { reconnects: loader.cache.totalReconnects, lastStanza: lastStanza / 1000, lastName: this.metadata.authentication.display});
-                    await loader.static.session.stop().catch(() => {});
-                    await loader.static.session.start().catch(() => {});
+                    await loader.static.session.stop().catch(() => {})
+                    await loader.static.session.start().catch(() => {})
                 } 
             }
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "atmosx-nwws-parser",
-  "version": "1.0.182",
+  "version": "1.0.184",
   "description": "NOAA Weather Wire Parser",
   "main": "index.js",
   "scripts": {

package/src/events.js

@@ -172,11 +172,11 @@ class NoaaWeatherWireServiceEvents {
                         id: `Wire-${vtec.tracking}`,
                         tracking: vtec.tracking,
                         action: vtec.status,
-                        history: [{description: getDescription, action: vtec.status, issued: new Date(getTempIssue)}],
+                        history: [{description: getDescription, action: vtec.status, issued: getTempIssue}],
                         properties: {
                             areaDesc: mUgc.locations.join(`; `) || `N/A`,
                             expires: new Date(vtec.expires) == `Invalid Date` ? new Date(9999, 0, 1) : new Date(vtec.expires),
-                            sent: new Date(vtec.issued) == `Invalid Date` ? getTempIssue ? new Date(getTempIssue) : new Date(vtec.issued) : new Date(vtec.issued),
+                            sent: new Date(vtec.issued) == `Invalid Date` ? getTempIssue : new Date(vtec.issued),
                             messageType: vtec.status, 
                             event: vtec.event || `Unknown Event`,
                             sender: senderOffice,
@@ -227,20 +227,22 @@ class NoaaWeatherWireServiceEvents {
                 let getHail = loader.packages.mText.getString(msg, `MAX HAIL SIZE...`, [`IN`]) || loader.packages.mText.getString(msg, `HAIL...`, [`IN`]);
                 let getGusts = loader.packages.mText.getString(msg, `MAX WIND GUST...`) || loader.packages.mText.getString(msg, `WIND...`);
                 let getThreat = loader.packages.mText.getString(msg, `DAMAGE THREAT...`); 
-                let getTempIssue = loader.packages.mText.getString(msg, `ISSUED TIME...`) || new Date();
+                let getTempIssue = loader.packages.mText.getString(msg, `ISSUED TIME...`);
                 let senderOffice = loader.packages.mText.getOffice(msg) || `NWS`;
                 let getCoordinates = loader.packages.mText.getPolygonCoordinates(msg);
                 let getDescription = loader.packages.mText.getCleanDescription(msg, null);
+                let issuedDate = new Date(stanza.attributes.issue) == `Invalid Date` ? getTempIssue : new Date(stanza.attributes.issue);
                 let alert = { 
                     hitch: `${new Date().getTime() - startTime}ms`,
                     id: `Wire-${defaultWMO ? defaultWMO[0] : `N/A`}-${mUgc.zones.join(`-`)}`,
                     tracking: `${defaultWMO ? defaultWMO[0] : `N/A`}-${mUgc.zones.join(`-`)}`,
                     action: `Issued`,
-                    history: [{description: getDescription, action: `Issued`, issued: new Date(getTempIssue)}],
+                    history: [{description: getDescription, action: `Issued`, issued: getTempIssue}],
                     properties: {
                         areaDesc: mUgc.locations.join(`; `) || `N/A`,
-                        expires: new Date(new Date().getTime() + 1 * 60 * 60 * 1000),
-                        sent: new Date(getTempIssue) == `Invalid Date` ? new Date(stanza.attributes.issue) : new Date(getTempIssue),
+                        // expieres is based off issuedDate
+                        expires: new Date(issuedDate.getTime() + 1 * 60 * 60 * 1000),
+                        sent: issuedDate,
                         messageType: `Issued`,
                         event: `Special Weather Statement`,
                         sender: senderOffice,