atmosx-nwws-parser 1.0.1916 → 1.0.1917

package/bootstrap.ts

@@ -81,6 +81,7 @@ export const definitions = {
         wmo: `[A-Z0-9]{6}\\s[A-Z]{4}\\s\\d{6}`,
         ugc1: `(\\w{2}[CZ](\\d{3}((-|>)\\s?(\n\n)?))+)`,
         ugc2: `(\\d{6}(-|>)\\s?(\n\n)?)`,
+        ugc3: `(\\d{6})(?=-|$)`,
         dateline: `/\d{3,4}\s*(AM|PM)?\s*[A-Z]{2,4}\s+[A-Z]{3,}\s+[A-Z]{3,}\s+\d{1,2}\s+\d{4}`
     },
     tags: {

package/dist/bootstrap.js

@@ -112,6 +112,7 @@ exports.definitions = {
         wmo: "[A-Z0-9]{6}\\s[A-Z]{4}\\s\\d{6}",
         ugc1: "(\\w{2}[CZ](\\d{3}((-|>)\\s?(\n\n)?))+)",
         ugc2: "(\\d{6}(-|>)\\s?(\n\n)?)",
+        ugc3: "(\\d{6})(?=-|$)",
         dateline: "/d{3,4}s*(AM|PM)?s*[A-Z]{2,4}s+[A-Z]{3,}s+[A-Z]{3,}s+d{1,2}s+d{4}"
     },
     tags: {

package/dist/src/events.js

@@ -438,7 +438,7 @@ var mEvents = /** @class */ (function () {
                                                 history: [{ description: getDescription, action: "Issued", issued: getTimeIssued }],
                                                 properties: {
                                                     areaDesc: mUgc.locations.join("; ") || 'N/A',
-                                                    expires: new Date(new Date().getTime() + 1 * 60 * 60 * 1000),
+                                                    expires: new Date(mUgc.expiry != null ? mUgc.expiry : new Date().getTime() + 1 * 60 * 60 * 1000),
                                                     sent: new Date(getTimeIssued),
                                                     messageType: "Issued",
                                                     event: Object.keys(loader.definitions.offshore).find(function (event) { return message.toLowerCase().includes(event.toLowerCase()); }) || 'Unknown Event',
@@ -545,7 +545,7 @@ var mEvents = /** @class */ (function () {
                                 history: [{ description: getDescription, action: "Issued", issued: getTimeIssued }],
                                 properties: {
                                     areaDesc: mUgc.locations.join("; ") || 'N/A',
-                                    expires: new Date(new Date().getTime() + 1 * 60 * 60 * 1000),
+                                    expires: new Date(mUgc.expiry != null ? mUgc.expiry : new Date().getTime() + 1 * 60 * 60 * 1000),
                                     sent: new Date(getTimeIssued),
                                     messageType: "Issued",
                                     event: "Special Weather Statement",

package/dist/src/ugc.js

@@ -94,16 +94,17 @@ var mUgcParser = /** @class */ (function () {
       */
     mUgcParser.getUGC = function (message) {
         return __awaiter(this, void 0, void 0, function () {
-            var header, zones, locations, ugc;
+            var header, zones, expiry, locations, ugc;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         header = this.getHeader(message);
                         zones = this.getZones(header);
+                        expiry = this.getExpiry(message);
                         return [4 /*yield*/, this.getLocations(zones)];
                     case 1:
                         locations = _a.sent();
-                        ugc = zones.length > 0 ? { zones: zones, locations: locations } : null;
+                        ugc = zones.length > 0 ? { zones: zones, locations: locations, expiry: expiry } : null;
                         return [2 /*return*/, ugc];
                 }
             });
@@ -121,6 +122,18 @@ var mUgcParser = /** @class */ (function () {
         var full = message.substring(start, start + end).replace(/\s+/g, '').slice(0, -1);
         return full;
     };
+    mUgcParser.getExpiry = function (message) {
+        var start = message.match(new RegExp(loader.definitions.expressions.ugc3, "gimu"));
+        if (start != null) {
+            var day = parseInt(start[0].substring(0, 2), 10);
+            var hour = parseInt(start[0].substring(2, 4), 10);
+            var minute = parseInt(start[0].substring(4, 6), 10);
+            var now = new Date();
+            var expires = new Date(now.getUTCFullYear(), now.getUTCMonth(), day, hour, minute, 0);
+            return expires;
+        }
+        return null;
+    };
     /**
       * @function getLocations
       * @description Retrieves location names from a database based on UGC zone codes.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "atmosx-nwws-parser",
-  "version": "1.0.1916",
+  "version": "1.0.1917",
   "description": "NOAA Weather Wire Parser - Built for standalone and Project AtmosphericX Integration.",
   "main": "dist/src/helper.js",
   "types": "src/helper.d.ts",

package/src/events.ts

@@ -282,7 +282,7 @@ export class mEvents {
                     history: [{description: getDescription, action: `Issued`, issued: getTimeIssued}],
                     properties: {
                         areaDesc: mUgc.locations.join(`; `) || 'N/A',
-                        expires: new Date(new Date().getTime() + 1 * 60 * 60 * 1000),
+                        expires: new Date(mUgc.expiry != null ? mUgc.expiry : new Date().getTime() + 1 * 60 * 60 * 1000),
                         sent: new Date(getTimeIssued),
                         messageType: `Issued`,
                         event: Object.keys(loader.definitions.offshore).find(event => message.toLowerCase().includes(event.toLowerCase())) || 'Unknown Event',
@@ -354,7 +354,7 @@ export class mEvents {
                     history: [{description: getDescription, action: `Issued`, issued: getTimeIssued}],
                     properties: {
                         areaDesc: mUgc.locations.join(`; `) || 'N/A',
-                        expires: new Date(new Date().getTime() + 1 * 60 * 60 * 1000),
+                        expires: new Date(mUgc.expiry != null ? mUgc.expiry : new Date().getTime() + 1 * 60 * 60 * 1000),
                         sent: new Date(getTimeIssued),
                         messageType: `Issued`,
                         event: `Special Weather Statement`,

package/src/ugc.ts

@@ -26,8 +26,9 @@ export class mUgcParser {
     static async getUGC (message: string) {
         const header = this.getHeader(message);
         const zones = this.getZones(header);
+        const expiry = this.getExpiry(message)
         const locations = await this.getLocations(zones);
-        const ugc = zones.length > 0 ? { zones, locations} : null;
+        const ugc = zones.length > 0 ? { zones, locations, expiry } : null;
         return ugc;
     }
 
@@ -39,12 +40,25 @@ export class mUgcParser {
       */
 
     static getHeader (message: string) {
-        let start = message.search(new RegExp(loader.definitions.expressions.ugc1, "gimu"));
-        let end = message.substring(start).search(new RegExp(loader.definitions.expressions.ugc2, "gimu"));
-        let full = message.substring(start, start + end).replace(/\s+/g, '').slice(0, -1);
+        const start = message.search(new RegExp(loader.definitions.expressions.ugc1, "gimu"));
+        const end = message.substring(start).search(new RegExp(loader.definitions.expressions.ugc2, "gimu"));
+        const full = message.substring(start, start + end).replace(/\s+/g, '').slice(0, -1);
         return full;
     }
 
+    static getExpiry (message: string) {
+        const start = message.match(new RegExp(loader.definitions.expressions.ugc3, "gimu"));
+        if (start != null) { 
+            const day = parseInt(start[0].substring(0, 2), 10);
+            const hour = parseInt(start[0].substring(2, 4), 10);
+            const minute = parseInt(start[0].substring(4, 6), 10);
+            const now = new Date();
+            const expires = new Date(now.getUTCFullYear(), now.getUTCMonth(), day, hour, minute, 0);
+            return expires;
+        }
+        return null;
+    }
+
     /**
       * @function getLocations
       * @description Retrieves location names from a database based on UGC zone codes.