atmosx-nwws-parser 1.0.2023 → 1.0.2031

package/dist/cjs/{helper.cjs → index.cjs}

@@ -75,9 +75,9 @@ var __async = (__this, __arguments, generator) => {
   });
 };
 
-// src/helper.ts
-var helper_exports = {};
-__export(helper_exports, {
+// src/index.ts
+var index_exports = {};
+__export(index_exports, {
   AlertManager: () => AlertManager,
   Database: () => database_default,
   EAS: () => eas_default,
@@ -86,10 +86,10 @@ __export(helper_exports, {
   TextParser: () => text_default,
   UGCParser: () => ugc_default,
   VtecParser: () => vtec_default,
-  default: () => helper_default,
+  default: () => index_default,
   types: () => types_exports
 });
-module.exports = __toCommonJS(helper_exports);
+module.exports = __toCommonJS(index_exports);
 
 // src/bootstrap.ts
 var fs = __toESM(require("fs"));
@@ -941,6 +941,7 @@ var cache = {
 var settings = {
   database: path.join(process.cwd(), "shapefiles.db"),
   isNWWS: true,
+  catchUnhandledExceptions: false,
   NoaaWeatherWireService: {
     clientReconnections: {
       canReconnect: true,
@@ -1516,7 +1517,7 @@ var VTECAlerts = class {
             const getBaseProperties = yield events_default.getBaseProperties(message, validated, getUGC, vtec);
             const getHeader = events_default.getHeader(__spreadValues(__spreadValues({}, validated.attributes), getBaseProperties.attributes), getBaseProperties, vtec);
             processed.push({
-              preformance: performance.now() - tick,
+              performance: performance.now() - tick,
               tracking: vtec.tracking,
               header: getHeader,
               vtec: vtec.raw,
@@ -1584,7 +1585,7 @@ var UGCAlerts = class {
           const getHeader = events_default.getHeader(__spreadValues(__spreadValues({}, validated.attributes), getBaseProperties.attributes), getBaseProperties);
           const getEvent = this.getEvent(message, getBaseProperties.attributes.getAwip);
           processed.push({
-            preformance: performance.now() - tick,
+            performance: performance.now() - tick,
             tracking: this.getTracking(getBaseProperties, getUGC.zones),
             header: getHeader,
             vtec: `N/A`,
@@ -1622,7 +1623,7 @@ var UGCAlerts2 = class {
         const getHeader = events_default.getHeader(__spreadValues(__spreadValues({}, validated.attributes), getBaseProperties.attributes), getBaseProperties);
         const getEvent = this.getEvent(message, getBaseProperties.attributes.getAwip);
         processed.push({
-          preformance: performance.now() - tick,
+          performance: performance.now() - tick,
           tracking: this.getTracking(getBaseProperties),
           header: getHeader,
           vtec: `N/A`,
@@ -1680,7 +1681,7 @@ var CapAlerts = class {
         const getHeader = events_default.getHeader(__spreadValues({}, validated.attributes));
         const getSource = text_default.textProductToString(extracted.description, `SOURCE...`, [`.`]) || `N/A`;
         processed.push({
-          preformance: performance.now() - tick,
+          performance: performance.now() - tick,
           tracking: this.getTracking(extracted),
           header: getHeader,
           vtec: extracted.vtec || `N/A`,
@@ -1711,7 +1712,13 @@ var CapAlerts = class {
               discussion_wind_intensity: `N/A`,
               discussion_hail_intensity: `N/A`
             },
-            geometry: extracted.polygon ? { type: `Polygon`, coordinates: extracted.polygon.split(` `).map((coord) => coord.split(`,`).map((num) => parseFloat(num))) } : null
+            geometry: extracted.polygon ? {
+              type: `Polygon`,
+              coordinates: extracted.polygon.split(` `).map((coord) => {
+                const [lon, lat] = coord.split(`,`).map((num) => parseFloat(num));
+                return [lat, lon];
+              })
+            } : null
           }
         });
       }
@@ -1738,7 +1745,7 @@ var APIAlerts = class {
   }
   static event(validated) {
     return __async(this, null, function* () {
-      var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _A, _B, _C, _D, _E, _F, _G, _H, _I, _J, _K, _L, _M, _N, _O, _P, _Q, _R, _S, _T, _U, _V, _W, _X, _Y, _Z, __, _$, _aa, _ba, _ca;
+      var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _A, _B, _C, _D, _E, _F, _G, _H, _I, _J, _K, _L, _M, _N, _O, _P, _Q, _R, _S, _T, _U, _V, _W, _X, _Y, _Z, __, _$, _aa, _ba, _ca, _da, _ea, _fa, _ga, _ha, _ia;
       let processed = [];
       const messages = Object.values(JSON.parse(validated.message).features);
       for (let feature of messages) {
@@ -1753,7 +1760,7 @@ var APIAlerts = class {
         const getSource = text_default.textProductToString(getDescription, `SOURCE...`, [`.`]) || `N/A`;
         const getOffice = this.getICAO(getVTEC || ``);
         processed.push({
-          preformance: performance.now() - tick,
+          performance: performance.now() - tick,
           tracking: this.getTracking({ vtec: getVTEC, wmoidentifier: getWmo, ugc: getUgc ? getUgc.join(`,`) : null }),
           header: getHeader,
           vtec: getVTEC || `N/A`,
@@ -1788,7 +1795,13 @@ var APIAlerts = class {
               peakWindGust: `N/A`,
               peakHailSize: `N/A`
             },
-            geometry: (_ca = feature == null ? void 0 : feature.geometry) != null ? _ca : null
+            geometry: ((_ea = (_da = (_ca = feature == null ? void 0 : feature.geometry) == null ? void 0 : _ca.coordinates) == null ? void 0 : _da[0]) == null ? void 0 : _ea.length) ? {
+              type: ((_fa = feature == null ? void 0 : feature.geometry) == null ? void 0 : _fa.type) || "Polygon",
+              coordinates: (_ia = (_ha = (_ga = feature == null ? void 0 : feature.geometry) == null ? void 0 : _ga.coordinates) == null ? void 0 : _ha[0]) == null ? void 0 : _ia.map((coord) => {
+                const [lon, lat] = Array.isArray(coord) ? coord : [0, 0];
+                return [lon, lat];
+              })
+            } : null
           }
         });
       }
@@ -2342,16 +2355,17 @@ var EventParser = class {
       }
     }
     const filtered = events2.filter((alert) => {
-      var _a2, _b2, _c2, _d2;
+      var _a2, _b2, _d2, _e2;
       const originalEvent = alert;
       const props = originalEvent == null ? void 0 : originalEvent.properties;
       const ugcs = (_b2 = (_a2 = props == null ? void 0 : props.geocode) == null ? void 0 : _a2.UGC) != null ? _b2 : [];
+      const _c2 = originalEvent, { performance: performance2, header } = _c2, eventWithoutPerformance = __objRest(_c2, ["performance", "header"]);
       if (bools == null ? void 0 : bools.betterEventParsing) {
         const { eventName, tags } = this.enhanceEvent(originalEvent);
         originalEvent.properties.event = eventName;
         originalEvent.properties.tags = tags;
       }
-      const eventCheck = (bools == null ? void 0 : bools.useParentEvents) ? (_c2 = props.parent) == null ? void 0 : _c2.toLowerCase() : (_d2 = props.event) == null ? void 0 : _d2.toLowerCase();
+      const eventCheck = (bools == null ? void 0 : bools.useParentEvents) ? (_d2 = props.parent) == null ? void 0 : _d2.toLowerCase() : (_e2 = props.event) == null ? void 0 : _e2.toLowerCase();
       const statusCorrelation = definitions.correlations.find((c) => c.type === originalEvent.properties.action_type);
       for (const key in sets) {
         const setting = sets[key];
@@ -2370,17 +2384,15 @@ var EventParser = class {
         if (key === "checkExpired" && setting && new Date(props == null ? void 0 : props.expires).getTime() < (/* @__PURE__ */ new Date()).getTime()) return false;
       }
       originalEvent.properties.action_type = statusCorrelation ? statusCorrelation.forward : originalEvent.properties.action_type;
-      originalEvent.properties.is_updated = statusCorrelation ? statusCorrelation.update == true && bools.checkExpired : false;
-      originalEvent.properties.is_issued = statusCorrelation ? statusCorrelation.new == true && bools.checkExpired : false;
-      originalEvent.properties.is_cancelled = statusCorrelation ? statusCorrelation.cancel == true && bools.checkExpired : false;
-      const _e2 = originalEvent, { performance: performance2 } = _e2, eventWithoutPerformance = __objRest(_e2, ["performance"]);
+      originalEvent.properties.is_updated = statusCorrelation ? statusCorrelation.update == true : false;
+      originalEvent.properties.is_issued = statusCorrelation ? statusCorrelation.new == true : false;
+      originalEvent.properties.is_cancelled = statusCorrelation ? statusCorrelation.cancel == true : false;
       originalEvent.hash = packages.crypto.createHash("md5").update(JSON.stringify(eventWithoutPerformance)).digest("hex");
       if (props.description) {
         const detectedPhrase = definitions.cancelSignatures.find((sig) => props.description.toLowerCase().includes(sig.toLowerCase()));
-        if (detectedPhrase && bools.checkExpired) {
+        if (detectedPhrase) {
           originalEvent.properties.action_type = "Cancel";
           originalEvent.properties.is_cancelled = true;
-          return false;
         }
       }
       if (originalEvent.vtec) {
@@ -2390,6 +2402,7 @@ var EventParser = class {
           return false;
         }
       }
+      if (bools.checkExpired && originalEvent.properties.is_cancelled == true) return false;
       cache.events.emit(`on${originalEvent.properties.parent.replace(/\s+/g, "")}`);
       return true;
     });
@@ -2754,8 +2767,8 @@ var Utils = class {
    * @static
    */
   static detectUncaughtExceptions() {
-    if (process.listeners("uncaughtException").some((l) => l.name === "uncaughtExceptionHandler")) return;
-    process.on(`uncaughtException`, (error) => {
+    if (cache.events.listenerCount("uncaughtException") > 0) return;
+    cache.events.on("uncaughtException", (error) => {
       cache.events.emit(`onError`, { message: `Uncaught Exception: ${error.message}`, code: `error-uncaught-exception`, stack: error.stack });
     });
   }
@@ -2873,7 +2886,7 @@ var Utils = class {
 };
 var utils_default = Utils;
 
-// src/helper.ts
+// src/index.ts
 var AlertManager = class {
   constructor(metadata) {
     this.start(metadata);
@@ -2978,7 +2991,9 @@ var AlertManager = class {
         return Promise.resolve();
       }
       this.setSettings(metadata);
-      utils_default.detectUncaughtExceptions();
+      if (settings.catchUnhandledExceptions) {
+        utils_default.detectUncaughtExceptions();
+      }
       const settings2 = settings;
       this.isNoaaWeatherWireService = settings.isNWWS;
       cache.isReady = false;
@@ -3014,7 +3029,7 @@ var AlertManager = class {
     });
   }
 };
-var helper_default = AlertManager;
+var index_default = AlertManager;
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   AlertManager,

package/dist/esm/{helper.mjs → index.mjs}

@@ -900,6 +900,7 @@ var cache = {
 var settings = {
   database: path.join(process.cwd(), "shapefiles.db"),
   isNWWS: true,
+  catchUnhandledExceptions: false,
   NoaaWeatherWireService: {
     clientReconnections: {
       canReconnect: true,
@@ -1475,7 +1476,7 @@ var VTECAlerts = class {
             const getBaseProperties = yield events_default.getBaseProperties(message, validated, getUGC, vtec);
             const getHeader = events_default.getHeader(__spreadValues(__spreadValues({}, validated.attributes), getBaseProperties.attributes), getBaseProperties, vtec);
             processed.push({
-              preformance: performance.now() - tick,
+              performance: performance.now() - tick,
               tracking: vtec.tracking,
               header: getHeader,
               vtec: vtec.raw,
@@ -1543,7 +1544,7 @@ var UGCAlerts = class {
           const getHeader = events_default.getHeader(__spreadValues(__spreadValues({}, validated.attributes), getBaseProperties.attributes), getBaseProperties);
           const getEvent = this.getEvent(message, getBaseProperties.attributes.getAwip);
           processed.push({
-            preformance: performance.now() - tick,
+            performance: performance.now() - tick,
             tracking: this.getTracking(getBaseProperties, getUGC.zones),
             header: getHeader,
             vtec: `N/A`,
@@ -1581,7 +1582,7 @@ var UGCAlerts2 = class {
         const getHeader = events_default.getHeader(__spreadValues(__spreadValues({}, validated.attributes), getBaseProperties.attributes), getBaseProperties);
         const getEvent = this.getEvent(message, getBaseProperties.attributes.getAwip);
         processed.push({
-          preformance: performance.now() - tick,
+          performance: performance.now() - tick,
           tracking: this.getTracking(getBaseProperties),
           header: getHeader,
           vtec: `N/A`,
@@ -1639,7 +1640,7 @@ var CapAlerts = class {
         const getHeader = events_default.getHeader(__spreadValues({}, validated.attributes));
         const getSource = text_default.textProductToString(extracted.description, `SOURCE...`, [`.`]) || `N/A`;
         processed.push({
-          preformance: performance.now() - tick,
+          performance: performance.now() - tick,
           tracking: this.getTracking(extracted),
           header: getHeader,
           vtec: extracted.vtec || `N/A`,
@@ -1670,7 +1671,13 @@ var CapAlerts = class {
               discussion_wind_intensity: `N/A`,
               discussion_hail_intensity: `N/A`
             },
-            geometry: extracted.polygon ? { type: `Polygon`, coordinates: extracted.polygon.split(` `).map((coord) => coord.split(`,`).map((num) => parseFloat(num))) } : null
+            geometry: extracted.polygon ? {
+              type: `Polygon`,
+              coordinates: extracted.polygon.split(` `).map((coord) => {
+                const [lon, lat] = coord.split(`,`).map((num) => parseFloat(num));
+                return [lat, lon];
+              })
+            } : null
           }
         });
       }
@@ -1697,7 +1704,7 @@ var APIAlerts = class {
   }
   static event(validated) {
     return __async(this, null, function* () {
-      var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _A, _B, _C, _D, _E, _F, _G, _H, _I, _J, _K, _L, _M, _N, _O, _P, _Q, _R, _S, _T, _U, _V, _W, _X, _Y, _Z, __, _$, _aa, _ba, _ca;
+      var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _A, _B, _C, _D, _E, _F, _G, _H, _I, _J, _K, _L, _M, _N, _O, _P, _Q, _R, _S, _T, _U, _V, _W, _X, _Y, _Z, __, _$, _aa, _ba, _ca, _da, _ea, _fa, _ga, _ha, _ia;
       let processed = [];
       const messages = Object.values(JSON.parse(validated.message).features);
       for (let feature of messages) {
@@ -1712,7 +1719,7 @@ var APIAlerts = class {
         const getSource = text_default.textProductToString(getDescription, `SOURCE...`, [`.`]) || `N/A`;
         const getOffice = this.getICAO(getVTEC || ``);
         processed.push({
-          preformance: performance.now() - tick,
+          performance: performance.now() - tick,
           tracking: this.getTracking({ vtec: getVTEC, wmoidentifier: getWmo, ugc: getUgc ? getUgc.join(`,`) : null }),
           header: getHeader,
           vtec: getVTEC || `N/A`,
@@ -1747,7 +1754,13 @@ var APIAlerts = class {
               peakWindGust: `N/A`,
               peakHailSize: `N/A`
             },
-            geometry: (_ca = feature == null ? void 0 : feature.geometry) != null ? _ca : null
+            geometry: ((_ea = (_da = (_ca = feature == null ? void 0 : feature.geometry) == null ? void 0 : _ca.coordinates) == null ? void 0 : _da[0]) == null ? void 0 : _ea.length) ? {
+              type: ((_fa = feature == null ? void 0 : feature.geometry) == null ? void 0 : _fa.type) || "Polygon",
+              coordinates: (_ia = (_ha = (_ga = feature == null ? void 0 : feature.geometry) == null ? void 0 : _ga.coordinates) == null ? void 0 : _ha[0]) == null ? void 0 : _ia.map((coord) => {
+                const [lon, lat] = Array.isArray(coord) ? coord : [0, 0];
+                return [lon, lat];
+              })
+            } : null
           }
         });
       }
@@ -2301,16 +2314,17 @@ var EventParser = class {
       }
     }
     const filtered = events2.filter((alert) => {
-      var _a2, _b2, _c2, _d2;
+      var _a2, _b2, _d2, _e2;
       const originalEvent = alert;
       const props = originalEvent == null ? void 0 : originalEvent.properties;
       const ugcs = (_b2 = (_a2 = props == null ? void 0 : props.geocode) == null ? void 0 : _a2.UGC) != null ? _b2 : [];
+      const _c2 = originalEvent, { performance: performance2, header } = _c2, eventWithoutPerformance = __objRest(_c2, ["performance", "header"]);
       if (bools == null ? void 0 : bools.betterEventParsing) {
         const { eventName, tags } = this.enhanceEvent(originalEvent);
         originalEvent.properties.event = eventName;
         originalEvent.properties.tags = tags;
       }
-      const eventCheck = (bools == null ? void 0 : bools.useParentEvents) ? (_c2 = props.parent) == null ? void 0 : _c2.toLowerCase() : (_d2 = props.event) == null ? void 0 : _d2.toLowerCase();
+      const eventCheck = (bools == null ? void 0 : bools.useParentEvents) ? (_d2 = props.parent) == null ? void 0 : _d2.toLowerCase() : (_e2 = props.event) == null ? void 0 : _e2.toLowerCase();
       const statusCorrelation = definitions.correlations.find((c) => c.type === originalEvent.properties.action_type);
       for (const key in sets) {
         const setting = sets[key];
@@ -2329,17 +2343,15 @@ var EventParser = class {
         if (key === "checkExpired" && setting && new Date(props == null ? void 0 : props.expires).getTime() < (/* @__PURE__ */ new Date()).getTime()) return false;
       }
       originalEvent.properties.action_type = statusCorrelation ? statusCorrelation.forward : originalEvent.properties.action_type;
-      originalEvent.properties.is_updated = statusCorrelation ? statusCorrelation.update == true && bools.checkExpired : false;
-      originalEvent.properties.is_issued = statusCorrelation ? statusCorrelation.new == true && bools.checkExpired : false;
-      originalEvent.properties.is_cancelled = statusCorrelation ? statusCorrelation.cancel == true && bools.checkExpired : false;
-      const _e2 = originalEvent, { performance: performance2 } = _e2, eventWithoutPerformance = __objRest(_e2, ["performance"]);
+      originalEvent.properties.is_updated = statusCorrelation ? statusCorrelation.update == true : false;
+      originalEvent.properties.is_issued = statusCorrelation ? statusCorrelation.new == true : false;
+      originalEvent.properties.is_cancelled = statusCorrelation ? statusCorrelation.cancel == true : false;
       originalEvent.hash = packages.crypto.createHash("md5").update(JSON.stringify(eventWithoutPerformance)).digest("hex");
       if (props.description) {
         const detectedPhrase = definitions.cancelSignatures.find((sig) => props.description.toLowerCase().includes(sig.toLowerCase()));
-        if (detectedPhrase && bools.checkExpired) {
+        if (detectedPhrase) {
           originalEvent.properties.action_type = "Cancel";
           originalEvent.properties.is_cancelled = true;
-          return false;
         }
       }
       if (originalEvent.vtec) {
@@ -2349,6 +2361,7 @@ var EventParser = class {
           return false;
         }
       }
+      if (bools.checkExpired && originalEvent.properties.is_cancelled == true) return false;
       cache.events.emit(`on${originalEvent.properties.parent.replace(/\s+/g, "")}`);
       return true;
     });
@@ -2713,8 +2726,8 @@ var Utils = class {
    * @static
    */
   static detectUncaughtExceptions() {
-    if (process.listeners("uncaughtException").some((l) => l.name === "uncaughtExceptionHandler")) return;
-    process.on(`uncaughtException`, (error) => {
+    if (cache.events.listenerCount("uncaughtException") > 0) return;
+    cache.events.on("uncaughtException", (error) => {
       cache.events.emit(`onError`, { message: `Uncaught Exception: ${error.message}`, code: `error-uncaught-exception`, stack: error.stack });
     });
   }
@@ -2832,7 +2845,7 @@ var Utils = class {
 };
 var utils_default = Utils;
 
-// src/helper.ts
+// src/index.ts
 var AlertManager = class {
   constructor(metadata) {
     this.start(metadata);
@@ -2937,7 +2950,9 @@ var AlertManager = class {
         return Promise.resolve();
       }
       this.setSettings(metadata);
-      utils_default.detectUncaughtExceptions();
+      if (settings.catchUnhandledExceptions) {
+        utils_default.detectUncaughtExceptions();
+      }
       const settings2 = settings;
       this.isNoaaWeatherWireService = settings.isNWWS;
       cache.isReady = false;
@@ -2973,7 +2988,7 @@ var AlertManager = class {
     });
   }
 };
-var helper_default = AlertManager;
+var index_default = AlertManager;
 export {
   AlertManager,
   database_default as Database,
@@ -2983,6 +2998,6 @@ export {
   text_default as TextParser,
   ugc_default as UGCParser,
   vtec_default as VtecParser,
-  helper_default as default,
+  index_default as default,
   types_exports as types
 };

package/package.json

@@ -1,8 +1,8 @@
 {
 	"name": "atmosx-nwws-parser",
-	"version": "1.0.2023",
+	"version": "1.0.2031",
 	"description": "NOAA Weather Wire Parser - Built for standalone and Project AtmosphericX Integration.",
-	"main": "dist/cjs/helper.cjs",
+	"main": "dist/cjs/index.cjs",
 	"repository": {
 		"type": "git",
 		"url": "git+https://github.com/K3YOMI/atmosx-nwws-parser.git",

package/src/bootstrap.ts

@@ -66,6 +66,7 @@ export const cache = {
 export const settings = { 
     database: path.join(process.cwd(), 'shapefiles.db'),
     isNWWS: true,
+    catchUnhandledExceptions: false,
     NoaaWeatherWireService: {
         clientReconnections: {
             canReconnect: true,

package/src/{helper.ts → index.ts}

@@ -128,7 +128,7 @@ export class AlertManager {
             return Promise.resolve();
         }
         this.setSettings(metadata);
-        Utils.detectUncaughtExceptions();
+        if (loader.settings.catchUnhandledExceptions) { Utils.detectUncaughtExceptions(); }
         const settings = loader.settings as types.ClientSettings;
         this.isNoaaWeatherWireService = loader.settings.isNWWS
         loader.cache.isReady = false;

package/src/parsers/events.ts

@@ -158,6 +158,7 @@ export class EventParser {
             const originalEvent = alert
             const props = originalEvent?.properties;
             const ugcs = props?.geocode?.UGC ?? [];
+            const { performance, header, ...eventWithoutPerformance } = originalEvent;
             if (bools?.betterEventParsing) {
                 const { eventName, tags } = this.enhanceEvent(originalEvent);
                 originalEvent.properties.event = eventName;
@@ -180,20 +181,20 @@ export class EventParser {
                 if (key === 'checkExpired' && setting && new Date(props?.expires).getTime() < new Date().getTime()) return false;   
             }
             originalEvent.properties.action_type = statusCorrelation ? statusCorrelation.forward : originalEvent.properties.action_type;
-            originalEvent.properties.is_updated = statusCorrelation ? (statusCorrelation.update == true && bools.checkExpired) : false;
-            originalEvent.properties.is_issued = statusCorrelation ? (statusCorrelation.new == true && bools.checkExpired) : false;
-            originalEvent.properties.is_cancelled = statusCorrelation ? (statusCorrelation.cancel == true && bools.checkExpired) : false;
-            const { performance, ...eventWithoutPerformance } = originalEvent;
+            originalEvent.properties.is_updated = statusCorrelation ? (statusCorrelation.update == true) : false;
+            originalEvent.properties.is_issued = statusCorrelation ? (statusCorrelation.new == true) : false;
+            originalEvent.properties.is_cancelled = statusCorrelation ? (statusCorrelation.cancel == true) : false;
             originalEvent.hash = loader.packages.crypto.createHash('md5').update(JSON.stringify(eventWithoutPerformance)).digest('hex');
             if (props.description) { 
                 const detectedPhrase = loader.definitions.cancelSignatures.find(sig => props.description.toLowerCase().includes(sig.toLowerCase()));
-                if (detectedPhrase && bools.checkExpired) { originalEvent.properties.action_type = 'Cancel'; originalEvent.properties.is_cancelled = true; return false; } 
+                if (detectedPhrase) { originalEvent.properties.action_type = 'Cancel'; originalEvent.properties.is_cancelled = true; } 
             }
             if (originalEvent.vtec) { 
                 const getType = originalEvent.vtec.split(`.`)[0];
                 const isTestProduct = loader.definitions.productTypes[getType] == `Test Product`
                 if (isTestProduct) { return false; }
             }
+            if (bools.checkExpired && originalEvent.properties.is_cancelled == true) return false;
             loader.cache.events.emit(`on${originalEvent.properties.parent.replace(/\s+/g, '')}`)
             return true;
         })

package/src/parsers/types/api.ts

@@ -48,7 +48,7 @@ export class APIAlerts {
             const getSource = TextParser.textProductToString(getDescription, `SOURCE...`, [`.`]) || `N/A`;
             const getOffice = this.getICAO(getVTEC || ``);
             processed.push({
-                preformance: performance.now() - tick,
+                performance: performance.now() - tick,
                 tracking: this.getTracking({ vtec: getVTEC, wmoidentifier: getWmo, ugc: getUgc ? getUgc.join(`,`) : null }),
                 header: getHeader,
                 vtec: getVTEC || `N/A`,
@@ -83,7 +83,13 @@ export class APIAlerts {
                         peakWindGust: `N/A`,
                         peakHailSize: `N/A`,
                     },
-                    geometry: feature?.geometry ?? null,
+                    geometry: feature?.geometry?.coordinates?.[0]?.length ? {
+                        type: feature?.geometry?.type || 'Polygon',
+                        coordinates: feature?.geometry?.coordinates?.[0]?.map((coord: number) => {
+                            const [lon, lat] = Array.isArray(coord) ? coord : [0, 0];
+                            return [lon, lat];
+                        })
+                    } : null
                 }
             })
         }

package/src/parsers/types/cap.ts

@@ -47,7 +47,7 @@ export class CapAlerts {
             const getHeader = EventParser.getHeader({ ...validated.attributes,} as types.TypeAttributes);
             const getSource = TextParser.textProductToString(extracted.description, `SOURCE...`, [`.`]) || `N/A`;
             processed.push({
-                preformance: performance.now() - tick,
+                performance: performance.now() - tick,
                 tracking: this.getTracking(extracted),
                 header: getHeader,
                 vtec: extracted.vtec || `N/A`,
@@ -78,7 +78,13 @@ export class CapAlerts {
                         discussion_wind_intensity: `N/A`,
                         discussion_hail_intensity: `N/A`,
                     },
-                    geometry: extracted.polygon ? { type: `Polygon`, coordinates: extracted.polygon.split(` `).map((coord: string) => coord.split(`,`).map((num: string) => parseFloat(num))) } : null,
+                    geometry: extracted.polygon ? { 
+                        type: `Polygon`, 
+                        coordinates: extracted.polygon.split(` `).map((coord: string) => {
+                            const [lon, lat] = coord.split(`,`).map((num: string) => parseFloat(num));
+                            return [lat, lon];
+                        }) 
+                    } : null,
                 }
             })
         }

package/src/parsers/types/text.ts

@@ -39,7 +39,7 @@ export class UGCAlerts {
             const getHeader = EventParser.getHeader({ ...validated.attributes, ...getBaseProperties.attributes } as types.TypeAttributes, getBaseProperties);
             const getEvent = this.getEvent(message, getBaseProperties.attributes.getAwip);
             processed.push({
-                preformance: performance.now() - tick,
+                performance: performance.now() - tick,
                 tracking: this.getTracking(getBaseProperties),
                 header: getHeader,
                 vtec: `N/A`,

package/src/parsers/types/ugc.ts

@@ -69,7 +69,7 @@ export class UGCAlerts {
                 const getHeader = EventParser.getHeader({ ...validated.attributes, ...getBaseProperties.attributes } as types.TypeAttributes, getBaseProperties);
                 const getEvent = this.getEvent(message, getBaseProperties.attributes.getAwip);
                 processed.push({
-                    preformance: performance.now() - tick,
+                    performance: performance.now() - tick,
                     tracking: this.getTracking(getBaseProperties, getUGC.zones),
                     header: getHeader,
                     vtec: `N/A`,

package/src/parsers/types/vtec.ts

@@ -43,7 +43,7 @@ export class VTECAlerts {
                     const getBaseProperties = await EventParser.getBaseProperties(message, validated, getUGC, vtec) as types.BaseProperties;
                     const getHeader = EventParser.getHeader({ ...validated.attributes, ...getBaseProperties.attributes } as types.TypeAttributes, getBaseProperties, vtec);
                     processed.push({
-                        preformance: performance.now() - tick,
+                        performance: performance.now() - tick,
                         tracking: vtec.tracking,
                         header: getHeader,
                         vtec: vtec.raw,

package/src/types.ts

@@ -164,6 +164,7 @@ export interface TypeAlert {
 export interface ClientSettings {
     database?: string,
     isNWWS: boolean,
+    catchUnhandledExceptions: boolean,
     NoaaWeatherWireService: NoaaWeatherWireServiceSettings,
     NationalWeatherService: NationalWeatherServiceSettings,
     global: GlobalSettings,

package/src/utils.ts

@@ -92,10 +92,10 @@ export class Utils {
      * @static
      */
     public static detectUncaughtExceptions(): void {
-        if (process.listeners('uncaughtException').some(l => l.name === 'uncaughtExceptionHandler')) return;
-        process.on(`uncaughtException`, (error: Error) => {
+        if (loader.cache.events.listenerCount('uncaughtException') > 0) return;
+        loader.cache.events.on('uncaughtException', (error: Error) => {
             loader.cache.events.emit(`onError`, {message: `Uncaught Exception: ${error.message}`, code: `error-uncaught-exception`, stack: error.stack});
-        })
+        });
     }
     
     /**

package/tsup.config.ts

@@ -1,11 +1,14 @@
-import { defineConfig } from 'tsup';
+import { defineConfig } from 'tsup'
 
 export default defineConfig({
-	entry: ['src/**/*.ts'],
-	format: ['esm', 'cjs'],
+	entry: ['src/index.ts'],
 	outDir: 'dist',
-	splitting: false,
+	format: ['esm', 'cjs'],
 	clean: true,
-	outExtension({ format }) {return {js: format === 'esm' ? '.mjs' : '.cjs',};},
-	esbuildOptions(options, context) { options.outdir = `dist/${context.format}`; },
-});
+	outExtension({ format }) {
+		return { js: format === 'esm' ? '.mjs' : '.cjs' }
+	},
+	esbuildOptions(options, context) {
+		options.outdir = `dist/${context.format}`
+	},
+})