atmosx-nwws-parser 1.0.1915 → 1.0.1917

package/bootstrap.ts

@@ -63,12 +63,25 @@ export const definitions = {
     events: { "AF": "Ashfall", "AS": "Air Stagnation", "BH": "Beach Hazard", "BW": "Brisk Wind", "BZ": "Blizzard", "CF": "Coastal Flood", "DF": "Debris Flow", "DS": "Dust Storm", "EC": "Extreme Cold", "EH": "Excessive Heat", "XH": "Extreme Heat", "EW": "Extreme Wind", "FA": "Areal Flood", "FF": "Flash Flood", "FG": "Dense Fog", "FL": "Flood", "FR": "Frost", "FW": "Fire Weather", "FZ": "Freeze", "GL": "Gale", "HF": "Hurricane Force Wind", "HT": "Heat", "HU": "Hurricane", "HW": "High Wind", "HY": "Hydrologic", "HZ": "Hard Freeze", "IS": "Ice Storm", "LE": "Lake Effect Snow", "LO": "Low Water", "LS": "Lakeshore Flood", "LW": "Lake Wind", "MA": "Special Marine", "MF": "Dense Fog", "MH": "Ashfall", "MS": "Dense Smoke", "RB": "Small Craft for Rough Bar", "RP": "Rip Current Risk", "SC": "Small Craft", "SE": "Hazardous Seas", "SI": "Small Craft for Winds", "SM": "Dense Smoke", "SQ": "Snow Squall", "SR": "Storm", "SS": "Storm Surge", "SU": "High Surf", "SV": "Severe Thunderstorm", "SW": "Small Craft for Hazardous Seas", "TO": "Tornado", "TR": "Tropical Storm", "TS": "Tsunami", "TY": "Typhoon", "UP": "Heavy Freezing Spray", "WC": "Wind Chill", "WI": "Wind", "WS": "Winter Storm", "WW": "Winter Weather", "ZF": "Freezing Fog", "ZR": "Freezing Rain", "ZY": "Freezing Spray" },
     actions: { "W": "Warning", "F": "Forecast", "A": "Watch", "O": "Outlook", "Y": "Advisory", "N": "Synopsis", "S": "Statement"},
     status: { "NEW": "Issued", "CON": "Updated", "EXT": "Extended", "EXA": "Extended", "EXB": "Extended", "UPG": "Upgraded", "COR": "Correction", "ROU": "Routine", "CAN": "Cancelled", "EXP": "Expired" },
+    offshore: {
+        "Special Weather Statement": "Special Weather Statement",
+        "Hurricane Warning": "Hurricane Warning",
+        "Hurricane Force Wind Warning": "Hurricane Force Wind Warning",
+        "Hurricane Watch": "Hurricane Watch",
+        "Tropical Storm Warning": "Tropical Storm Warning",
+        "Tropical Storm Watch": "Tropical Storm Watch",
+        "High Wind Warning": "High Wind Warning",
+        "Gale Warning": "Gale Warning",
+        "Small Craft Advisory": "Small Craft Advisory",
+        "Small Craft Warning": "Small Craft Warning",
+    },
     awips: { SWOMCD: `mesoscale-discussion`, LSR: `local-storm-report`, SPS: `special-weather-statement`},
     expressions: {
         vtec: `[OTEX].(NEW|CON|EXT|EXA|EXB|UPG|CAN|EXP|COR|ROU).[A-Z]{4}.[A-Z]{2}.[WAYSFON].[0-9]{4}.[0-9]{6}T[0-9]{4}Z-[0-9]{6}T[0-9]{4}Z`,
         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

@@ -94,12 +94,25 @@ exports.definitions = {
     events: { "AF": "Ashfall", "AS": "Air Stagnation", "BH": "Beach Hazard", "BW": "Brisk Wind", "BZ": "Blizzard", "CF": "Coastal Flood", "DF": "Debris Flow", "DS": "Dust Storm", "EC": "Extreme Cold", "EH": "Excessive Heat", "XH": "Extreme Heat", "EW": "Extreme Wind", "FA": "Areal Flood", "FF": "Flash Flood", "FG": "Dense Fog", "FL": "Flood", "FR": "Frost", "FW": "Fire Weather", "FZ": "Freeze", "GL": "Gale", "HF": "Hurricane Force Wind", "HT": "Heat", "HU": "Hurricane", "HW": "High Wind", "HY": "Hydrologic", "HZ": "Hard Freeze", "IS": "Ice Storm", "LE": "Lake Effect Snow", "LO": "Low Water", "LS": "Lakeshore Flood", "LW": "Lake Wind", "MA": "Special Marine", "MF": "Dense Fog", "MH": "Ashfall", "MS": "Dense Smoke", "RB": "Small Craft for Rough Bar", "RP": "Rip Current Risk", "SC": "Small Craft", "SE": "Hazardous Seas", "SI": "Small Craft for Winds", "SM": "Dense Smoke", "SQ": "Snow Squall", "SR": "Storm", "SS": "Storm Surge", "SU": "High Surf", "SV": "Severe Thunderstorm", "SW": "Small Craft for Hazardous Seas", "TO": "Tornado", "TR": "Tropical Storm", "TS": "Tsunami", "TY": "Typhoon", "UP": "Heavy Freezing Spray", "WC": "Wind Chill", "WI": "Wind", "WS": "Winter Storm", "WW": "Winter Weather", "ZF": "Freezing Fog", "ZR": "Freezing Rain", "ZY": "Freezing Spray" },
     actions: { "W": "Warning", "F": "Forecast", "A": "Watch", "O": "Outlook", "Y": "Advisory", "N": "Synopsis", "S": "Statement" },
     status: { "NEW": "Issued", "CON": "Updated", "EXT": "Extended", "EXA": "Extended", "EXB": "Extended", "UPG": "Upgraded", "COR": "Correction", "ROU": "Routine", "CAN": "Cancelled", "EXP": "Expired" },
+    offshore: {
+        "Special Weather Statement": "Special Weather Statement",
+        "Hurricane Warning": "Hurricane Warning",
+        "Hurricane Force Wind Warning": "Hurricane Force Wind Warning",
+        "Hurricane Watch": "Hurricane Watch",
+        "Tropical Storm Warning": "Tropical Storm Warning",
+        "Tropical Storm Watch": "Tropical Storm Watch",
+        "High Wind Warning": "High Wind Warning",
+        "Gale Warning": "Gale Warning",
+        "Small Craft Advisory": "Small Craft Advisory",
+        "Small Craft Warning": "Small Craft Warning",
+    },
     awips: { SWOMCD: "mesoscale-discussion", LSR: "local-storm-report", SPS: "special-weather-statement" },
     expressions: {
         vtec: "[OTEX].(NEW|CON|EXT|EXA|EXB|UPG|CAN|EXP|COR|ROU).[A-Z]{4}.[A-Z]{2}.[WAYSFON].[0-9]{4}.[0-9]{6}T[0-9]{4}Z-[0-9]{6}T[0-9]{4}Z",
         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

@@ -385,6 +385,110 @@ var mEvents = /** @class */ (function () {
             });
         });
     };
+    /**
+      * @function newUnknownAlert
+      * @description Emits the 'onAlert' event with parsed unknown alert objects. (Non-CAP, Non-VTEC)
+      * The alert objects contain various properties such as id, tracking, action, area description, expiration time,
+      * issue time, event type, sender information, description, geocode, and parameters like WMO identifier,
+      * tornado detection, max hail size, max wind gust, and thunderstorm damage threat.
+      *
+      * @param {Object} stanza - The XMPP stanza containing the raw alert message.
+      *
+      * @emits onAlert - Emitted when a new raw alert is received and parsed.
+      */
+    mEvents.newUnknownAlert = function (stanza) {
+        return __awaiter(this, void 0, void 0, function () {
+            var messages, defaultWMO, alerts, _loop_1, i;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        messages = stanza.message.split(/(?=\$\$)/g).map(function (msg) { return msg.trim(); });
+                        defaultWMO = stanza.message.match(new RegExp(loader.definitions.expressions.wmo, 'gimu'));
+                        alerts = [];
+                        _loop_1 = function (i) {
+                            var pStartTime, message, mUgc, isOffshoreEvent, getForecastOffice, getPolygonCoordinates, getDescription, getTimeIssued, alert_3, ugcCoordinates;
+                            return __generator(this, function (_b) {
+                                switch (_b.label) {
+                                    case 0:
+                                        pStartTime = new Date().getTime();
+                                        message = messages[i];
+                                        return [4 /*yield*/, ugc_1.default.getUGC(message)];
+                                    case 1:
+                                        mUgc = _b.sent();
+                                        isOffshoreEvent = Object.keys(loader.definitions.offshore).some(function (event) { return message.toLowerCase().includes(event.toLowerCase()); });
+                                        if (mUgc != null && isOffshoreEvent != false) {
+                                            getForecastOffice = text_parser_1.default.getForecastOffice(message) || "NWS";
+                                            getPolygonCoordinates = text_parser_1.default.getPolygonCoordinates(message);
+                                            getDescription = text_parser_1.default.getCleanDescription(message, null);
+                                            getTimeIssued = text_parser_1.default.getString(message, "ISSUED TIME...");
+                                            if (getTimeIssued == null) {
+                                                getTimeIssued = new Date(stanza.attributes.issue).getTime();
+                                            }
+                                            if (getTimeIssued == null) {
+                                                getTimeIssued = new Date().getTime();
+                                            }
+                                            if (getTimeIssued != null) {
+                                                getTimeIssued = new Date(getTimeIssued).toLocaleString();
+                                            }
+                                            alert_3 = {
+                                                hitch: "".concat(new Date().getTime() - pStartTime, "ms"),
+                                                id: defaultWMO ? "".concat(defaultWMO[0], "-").concat(mUgc.zones.join("-")) : "N/A",
+                                                tracking: defaultWMO ? "".concat(defaultWMO[0], "-").concat(mUgc.zones.join("-")) : "N/A",
+                                                action: "Issued",
+                                                history: [{ description: getDescription, action: "Issued", issued: getTimeIssued }],
+                                                properties: {
+                                                    areaDesc: mUgc.locations.join("; ") || 'N/A',
+                                                    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',
+                                                    sender: getForecastOffice,
+                                                    senderName: getForecastOffice,
+                                                    description: getDescription || 'No description available.',
+                                                    geocode: {
+                                                        UGC: mUgc.zones || [],
+                                                    },
+                                                    parameters: {
+                                                        WMOidentifier: (defaultWMO === null || defaultWMO === void 0 ? void 0 : defaultWMO[0]) ? [defaultWMO[0]] : ["N/A"],
+                                                        tornadoDetection: "N/A",
+                                                        maxHailSize: "N/A",
+                                                        maxWindGust: "N/A",
+                                                        thunderstormDamageThreat: ["N/A"],
+                                                    },
+                                                },
+                                                geometry: { type: 'Polygon', coordinates: [getPolygonCoordinates] }
+                                            };
+                                            if (loader.settings.alertSettings.ugcPolygons) {
+                                                ugcCoordinates = ugc_1.default.getCoordinates(mUgc.zones);
+                                                if (ugcCoordinates.length > 0) {
+                                                    alert_3.geometry = { type: 'Polygon', coordinates: [ugcCoordinates] };
+                                                }
+                                                ;
+                                            }
+                                            alerts.push(alert_3);
+                                        }
+                                        return [2 /*return*/];
+                                }
+                            });
+                        };
+                        i = 0;
+                        _a.label = 1;
+                    case 1:
+                        if (!(i < messages.length)) return [3 /*break*/, 4];
+                        return [5 /*yield**/, _loop_1(i)];
+                    case 2:
+                        _a.sent();
+                        _a.label = 3;
+                    case 3:
+                        i++;
+                        return [3 /*break*/, 1];
+                    case 4:
+                        this.onFinished(alerts);
+                        return [2 /*return*/];
+                }
+            });
+        });
+    };
     /**
       * @function newSpecialWeatherStatement
       * @description Emits the 'onAlert' event with parsed special weather statement alert objects.
@@ -399,7 +503,7 @@ var mEvents = /** @class */ (function () {
       */
     mEvents.newSpecialWeatherStatement = function (stanza) {
         return __awaiter(this, void 0, void 0, function () {
-            var messages, defaultWMO, alerts, i, pStartTime, message, mUgc, getTornado, getHailSize, getWindGusts, getDamageThreat, getForecastOffice, getPolygonCoordinates, getDescription, getTimeIssued, alert_3, ugcCoordinates;
+            var messages, defaultWMO, alerts, i, pStartTime, message, mUgc, getTornado, getHailSize, getWindGusts, getDamageThreat, getForecastOffice, getPolygonCoordinates, getDescription, getTimeIssued, alert_4, ugcCoordinates;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -433,7 +537,7 @@ var mEvents = /** @class */ (function () {
                             if (getTimeIssued != null) {
                                 getTimeIssued = new Date(getTimeIssued).toLocaleString();
                             }
-                            alert_3 = {
+                            alert_4 = {
                                 hitch: "".concat(new Date().getTime() - pStartTime, "ms"),
                                 id: defaultWMO ? "".concat(defaultWMO[0], "-").concat(mUgc.zones.join("-")) : "N/A",
                                 tracking: defaultWMO ? "".concat(defaultWMO[0], "-").concat(mUgc.zones.join("-")) : "N/A",
@@ -441,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",
@@ -464,11 +568,11 @@ var mEvents = /** @class */ (function () {
                             if (loader.settings.alertSettings.ugcPolygons) {
                                 ugcCoordinates = ugc_1.default.getCoordinates(mUgc.zones);
                                 if (ugcCoordinates.length > 0) {
-                                    alert_3.geometry = { type: 'Polygon', coordinates: [ugcCoordinates] };
+                                    alert_4.geometry = { type: 'Polygon', coordinates: [ugcCoordinates] };
                                 }
                                 ;
                             }
-                            alerts.push(alert_3);
+                            alerts.push(alert_4);
                         }
                         _a.label = 3;
                     case 3:
@@ -494,7 +598,7 @@ var mEvents = /** @class */ (function () {
       */
     mEvents.newMesoscaleDiscussion = function (stanza) {
         return __awaiter(this, void 0, void 0, function () {
-            var messages, defaultWMO, i, pStartTime, message, mUgc, getForecastOffice, getDescription, getTornadoIntensity, getPeakWindGust, getPeakHailSize, getTimeIssued, alert_4;
+            var messages, defaultWMO, i, pStartTime, message, mUgc, getForecastOffice, getDescription, getTornadoIntensity, getPeakWindGust, getPeakHailSize, getTimeIssued, alert_5;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -525,7 +629,7 @@ var mEvents = /** @class */ (function () {
                             if (getTimeIssued != null) {
                                 getTimeIssued = new Date(getTimeIssued).toLocaleString();
                             }
-                            alert_4 = {
+                            alert_5 = {
                                 hitch: "".concat(new Date().getTime() - pStartTime, "ms"),
                                 id: defaultWMO ? "".concat(defaultWMO[0], "-").concat(mUgc.zones.join("-")) : "N/A",
                                 tracking: defaultWMO ? "".concat(defaultWMO[0], "-").concat(mUgc.zones.join("-")) : "N/A",
@@ -551,7 +655,7 @@ var mEvents = /** @class */ (function () {
                                     },
                                 }
                             };
-                            loader.statics.events.emit('onMesoscaleDiscussion', alert_4);
+                            loader.statics.events.emit('onMesoscaleDiscussion', alert_5);
                         }
                         _a.label = 3;
                     case 3:

package/dist/src/helper.js

@@ -313,6 +313,7 @@ var AtmosXWireParser = /** @class */ (function () {
                 var dict = [
                     { file: "".concat(dir, "/category-defaults-raw-vtec.bin"), attributes: { awipsid: 'alert', isCap: false, raw: true, issue: undefined } },
                     { file: "".concat(dir, "/category-defaults-cap-vtec.bin"), attributes: { awipsid: 'alert', isCap: true, raw: false, issue: undefined } },
+                    { file: "".concat(dir, "/category-defaults-raw.bin"), attributes: { awipsid: 'alert', isCap: false, raw: true, issue: undefined } },
                     { file: "".concat(dir, "/category-special-weather-statements-raw.bin"), attributes: { awipsid: 'SPS001', isCap: false, raw: true, issue: undefined } },
                     { file: "".concat(dir, "/category-mesoscale-discussions-raw.bin"), attributes: { awipsid: 'SWOMCD001', isCap: false, raw: true, issue: undefined } },
                     { file: "".concat(dir, "/category-local-storm-reports.bin"), attributes: { awipsid: 'LSR001', isCap: false, raw: true, issue: undefined } },

package/dist/src/stanza.js

@@ -114,19 +114,22 @@ var mStanza = /** @class */ (function () {
       */
     mStanza.create = function (stanzaData) {
         if (stanzaData.getAwipsType == "default" && stanzaData.hasVTEC && stanzaData.isCap) {
-            events_1.default.newCapAlerts(stanzaData);
+            return events_1.default.newCapAlerts(stanzaData);
         } // Default alert - CAP Only
         if (stanzaData.getAwipsType == "default" && stanzaData.hasVTEC && !stanzaData.isCap) {
-            events_1.default.newRawAlerts(stanzaData);
+            return events_1.default.newRawAlerts(stanzaData);
         } // Default alert - NonCAP
+        if (stanzaData.getAwipsType == "default" && !stanzaData.hasVTEC && !stanzaData.isCap) {
+            return events_1.default.newUnknownAlert(stanzaData);
+        } // Default alert - NonCAP, NonVTEC
         if (stanzaData.getAwipsType == "special-weather-statement") {
-            events_1.default.newSpecialWeatherStatement(stanzaData);
+            return events_1.default.newSpecialWeatherStatement(stanzaData);
         } // SPW (Special Weather Statement)
         if (stanzaData.getAwipsType == "mesoscale-discussion") {
-            events_1.default.newMesoscaleDiscussion(stanzaData);
+            return events_1.default.newMesoscaleDiscussion(stanzaData);
         } // MD (Mesoscale Discussion)
         if (stanzaData.getAwipsType == "local-storm-report") {
-            events_1.default.newLocalStormReport(stanzaData);
+            return events_1.default.newLocalStormReport(stanzaData);
         } // LSR (Local Storm Report)
     };
     /**

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.1915",
+  "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

@@ -244,6 +244,75 @@ export class mEvents {
         this.onFinished(alerts);
     }
 
+
+    /**
+      * @function newUnknownAlert
+      * @description Emits the 'onAlert' event with parsed unknown alert objects. (Non-CAP, Non-VTEC)
+      * The alert objects contain various properties such as id, tracking, action, area description, expiration time,
+      * issue time, event type, sender information, description, geocode, and parameters like WMO identifier,
+      * tornado detection, max hail size, max wind gust, and thunderstorm damage threat.
+      * 
+      * @param {Object} stanza - The XMPP stanza containing the raw alert message.
+      * 
+      * @emits onAlert - Emitted when a new raw alert is received and parsed.
+      */
+
+    static async newUnknownAlert (stanza: any) {
+        const messages = stanza.message.split(/(?=\$\$)/g).map(msg => msg.trim());
+        let defaultWMO = stanza.message.match(new RegExp(loader.definitions.expressions.wmo, 'gimu'));
+        let alerts: any[] = [];
+        for (let i = 0; i < messages.length; i++) {
+            const pStartTime = new Date().getTime()
+            const message = messages[i];
+            const mUgc = await mUgcParser.getUGC(message);
+            const isOffshoreEvent = Object.keys(loader.definitions.offshore).some(event => message.toLowerCase().includes(event.toLowerCase()));
+            if (mUgc != null && isOffshoreEvent != false) {
+                const getForecastOffice = mTextParser.getForecastOffice(message) || `NWS`;
+                const getPolygonCoordinates = mTextParser.getPolygonCoordinates(message);
+                const getDescription = mTextParser.getCleanDescription(message, null);
+                let getTimeIssued : any = mTextParser.getString(message, `ISSUED TIME...`)
+                if (getTimeIssued == null) { getTimeIssued = new Date(stanza.attributes.issue).getTime(); }
+                if (getTimeIssued == null) { getTimeIssued = new Date().getTime(); }
+                if (getTimeIssued != null) { getTimeIssued = new Date(getTimeIssued).toLocaleString(); }
+                let alert = {
+                    hitch: `${new Date().getTime() - pStartTime}ms`,
+                    id: defaultWMO ? `${defaultWMO[0]}-${mUgc.zones.join(`-`)}` : `N/A`,
+                    tracking: defaultWMO ? `${defaultWMO[0]}-${mUgc.zones.join(`-`)}` : `N/A`,
+                    action: `Issued`,
+                    history: [{description: getDescription, action: `Issued`, issued: getTimeIssued}],
+                    properties: {
+                        areaDesc: mUgc.locations.join(`; `) || 'N/A',
+                        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',
+                        sender: getForecastOffice,
+                        senderName: getForecastOffice,
+                        description: getDescription || 'No description available.',
+                        geocode: {
+                            UGC: mUgc.zones || [],
+                        },
+                        parameters: {
+                            WMOidentifier: defaultWMO?.[0] ? [defaultWMO[0]] : [`N/A`],
+                            tornadoDetection: `N/A`,
+                            maxHailSize: `N/A`,
+                            maxWindGust: `N/A`,
+                            thunderstormDamageThreat: [`N/A`],
+                        },
+                    },
+                    geometry: { type: 'Polygon', coordinates: [getPolygonCoordinates] }
+                };
+                if (loader.settings.alertSettings.ugcPolygons) {
+                    const ugcCoordinates = mUgcParser.getCoordinates(mUgc.zones);
+                    if (ugcCoordinates.length > 0) { alert.geometry = { type: 'Polygon', coordinates: [ugcCoordinates] }; };
+                }
+                alerts.push(alert);
+            }
+        }
+        this.onFinished(alerts);
+    }
+
+
     /** 
       * @function newSpecialWeatherStatement
       * @description Emits the 'onAlert' event with parsed special weather statement alert objects.
@@ -285,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/helper.ts

@@ -183,6 +183,7 @@ export class AtmosXWireParser {
             let dict = [
                 { file: `${dir}/category-defaults-raw-vtec.bin`, attributes: { awipsid: 'alert', isCap: false, raw: true, issue: undefined }},
                 { file: `${dir}/category-defaults-cap-vtec.bin`, attributes: { awipsid: 'alert', isCap: true, raw: false, issue: undefined }},
+                { file: `${dir}/category-defaults-raw.bin`, attributes: { awipsid: 'alert', isCap: false, raw: true, issue: undefined }},
                 { file: `${dir}/category-special-weather-statements-raw.bin`, attributes: { awipsid: 'SPS001', isCap: false, raw: true, issue: undefined }},
                 { file: `${dir}/category-mesoscale-discussions-raw.bin`, attributes:  { awipsid: 'SWOMCD001', isCap: false, raw: true, issue: undefined }},
                 { file: `${dir}/category-local-storm-reports.bin`, attributes: { awipsid: 'LSR001', isCap: false, raw: true, issue: undefined }},

package/src/stanza.ts

@@ -77,11 +77,12 @@ export class mStanza {
       */
 
     static create (stanzaData: any) {
-        if (stanzaData.getAwipsType == `default` && stanzaData.hasVTEC && stanzaData.isCap) { mEvents.newCapAlerts(stanzaData) } // Default alert - CAP Only
-        if (stanzaData.getAwipsType == `default` && stanzaData.hasVTEC && !stanzaData.isCap) { mEvents.newRawAlerts(stanzaData) } // Default alert - NonCAP
-        if (stanzaData.getAwipsType == `special-weather-statement`) { mEvents.newSpecialWeatherStatement(stanzaData) } // SPW (Special Weather Statement)
-        if (stanzaData.getAwipsType == `mesoscale-discussion`) { mEvents.newMesoscaleDiscussion(stanzaData) } // MD (Mesoscale Discussion)
-        if (stanzaData.getAwipsType == `local-storm-report`) { mEvents.newLocalStormReport(stanzaData) } // LSR (Local Storm Report)
+        if (stanzaData.getAwipsType == `default` && stanzaData.hasVTEC && stanzaData.isCap) { return mEvents.newCapAlerts(stanzaData) } // Default alert - CAP Only
+        if (stanzaData.getAwipsType == `default` && stanzaData.hasVTEC && !stanzaData.isCap) { return mEvents.newRawAlerts(stanzaData) } // Default alert - NonCAP
+        if (stanzaData.getAwipsType == `default` && !stanzaData.hasVTEC && !stanzaData.isCap) { return mEvents.newUnknownAlert(stanzaData) } // Default alert - NonCAP, NonVTEC
+        if (stanzaData.getAwipsType == `special-weather-statement`) { return mEvents.newSpecialWeatherStatement(stanzaData) } // SPW (Special Weather Statement)
+        if (stanzaData.getAwipsType == `mesoscale-discussion`) { return mEvents.newMesoscaleDiscussion(stanzaData) } // MD (Mesoscale Discussion)
+        if (stanzaData.getAwipsType == `local-storm-report`) { return mEvents.newLocalStormReport(stanzaData) } // LSR (Local Storm Report)
     }
 
     /** 

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.