@atmosx/event-product-parser 3.0.54 → 3.0.61

package/dist/cjs/index.cjs

@@ -299,13 +299,13 @@ var require_Element = __commonJS({
         return result;
       }
       getText() {
-        let text2 = "";
+        let text = "";
         for (const child of this.children) {
           if (typeof child === "string" || typeof child === "number") {
-            text2 += child;
+            text += child;
           }
         }
-        return text2;
+        return text;
       }
       getChildText(name, xmlns) {
         const child = this.getChild(name, xmlns);
@@ -364,8 +364,8 @@ var require_Element = __commonJS({
         }
       }
       /** add text node and return element */
-      t(text2) {
-        this.children.push(text2);
+      t(text) {
+        this.children.push(text);
         return this;
       }
       /* Manipulation */
@@ -578,9 +578,9 @@ var require_ltx = __commonJS({
             switch (state) {
               case STATE_TEXT:
                 if (c === 60) {
-                  const text2 = endRecording();
-                  if (text2) {
-                    this.emit("text", escape2.unescapeXML(text2));
+                  const text = endRecording();
+                  if (text) {
+                    this.emit("text", escape2.unescapeXML(text));
                   }
                   state = STATE_TAG_NAME;
                   recordStart = pos + 1;
@@ -813,10 +813,10 @@ var require_bitops = __commonJS({
       }
       return new Uint8Array(res);
     };
-    exports2.H = function(text2) {
+    exports2.H = function(text) {
       return __async(this, null, function* () {
         return new Uint8Array(
-          yield crypto.subtle.digest("SHA-1", text2)
+          yield crypto.subtle.digest("SHA-1", text)
         );
       });
     };
@@ -838,9 +838,9 @@ var require_bitops = __commonJS({
         ));
       });
     };
-    exports2.Hi = function(text2, salt, iterations) {
+    exports2.Hi = function(text, salt, iterations) {
       return __async(this, null, function* () {
-        const key = new TextEncoder().encode(text2);
+        const key = new TextEncoder().encode(text);
         var concat = new Uint8Array(salt.length + 4);
         concat.set(salt);
         concat.set(new Uint8Array([0, 0, 0, 1]), salt.length);
@@ -1102,21 +1102,21 @@ var require_main3 = __commonJS({
 // src/index.ts
 var index_exports = {};
 __export(index_exports, {
+  ClearEvents: () => ClearEvents,
+  GenerateEASMessage: () => GenerateEASMessage,
+  GetCleanedEvent: () => GetCleanedEvent,
+  GetEventGeometry: () => GetEventGeometry,
+  GetEvents: () => GetEvents,
+  GetNodes: () => GetNodes,
+  GetRandomEvent: () => GetRandomEvent,
   Manager: () => Manager,
-  clearEvents: () => clearEvents,
-  default: () => index_default,
-  getCleanedEvent: () => getCleanedEvent,
-  getEventGeometry: () => getEventGeometry,
-  getEvents: () => getEvents,
-  getNodes: () => getNodes,
-  getRandomEvent: () => getRandomEvent,
-  manualEvent: () => manualEvent,
-  query: () => query,
-  setEasTone: () => setEasTone,
-  setNode: () => setNode,
-  setSettings: () => setSettings,
-  startService: () => startService,
-  stopService: () => stopService
+  ManualEvent: () => ManualEvent,
+  QueryStanza: () => QueryStanza,
+  SetNode: () => SetNode,
+  SetSettings: () => SetSettings,
+  StartService: () => StartService,
+  StopService: () => StopService,
+  default: () => index_default
 });
 module.exports = __toCommonJS(index_exports);
 
@@ -1124,7 +1124,7 @@ module.exports = __toCommonJS(index_exports);
 var import_path = __toESM(require("path"));
 var import_node_events = require("events");
 var bootstrap = {
-  version: `3.0.54`,
+  version: `3.0.61`,
   isReady: true,
   ratelimits: {},
   session_xmpp: null,
@@ -1191,22 +1191,26 @@ var bootstrap = {
     NotifyServer: {
       Enabled: false,
       Server: `https://ntfy.sh`,
-      Attachments: null,
+      Timezone: "UTC",
+      MediaStorage: {
+        EAS: null,
+        TEXT: null,
+        JSON: null
+      },
       Credentials: {
         Username: null,
         Password: null
       }
     },
-    ListenerSettings: [],
+    ActionSettings: [],
     GlobalSettings: {
       EventManagement: true,
-      BetterEventNames: true,
       DisableGeometryParsing: false,
       UseShapefileCoordinates: true,
       SPCWatchesOnly: true,
       ShapefileSkipPoints: 15,
       NodeTTL: 60,
-      NodeMinDistance: 120,
+      NodeMaxDistance: 120,
       EventFiltering: {
         ListeningEvents: [],
         ListeningICAO: [],
@@ -1219,7 +1223,7 @@ var bootstrap = {
       },
       ArchiveSettings: {
         TTL: 60,
-        EventDirectory: null,
+        JSONDirectory: null,
         TextDirectory: null,
         EasDirectory: null,
         EasToneout: null
@@ -1228,8 +1232,8 @@ var bootstrap = {
   }
 };
 
-// src/@modules/@utilities/utilities.setSettings.ts
-var setSettings = (newSettings) => {
+// src/@modules/@utilities/SetSettings.ts
+var SetSettings = (newSettings) => {
   const settings = bootstrap.settings;
   const merge = (target, source) => {
     for (const key in source) {
@@ -1250,12 +1254,12 @@ var setSettings = (newSettings) => {
   return settings;
 };
 
-// src/@modules/@utilities/utilities.getSettings.ts
-var getSettings = () => {
+// src/@modules/@utilities/GetSettings.ts
+var GetSettings = () => {
   return bootstrap.settings;
 };
 
-// src/@parsers/@ugc/ugc.coordinates.ts
+// src/@parsers/@ugc/GetZonePolygon.ts
 var import_polygon_clipping = require("polygon-clipping");
 var getZonePolygon = (options) => {
   var _a, _b;
@@ -1333,18 +1337,18 @@ var getZonePolygon = (options) => {
   }
 };
 
-// src/@building/building.geometry.ts
-var getEventGeometry = (event) => {
+// src/@building/GetEventGeometry.ts
+var GetEventGeometry = (event) => {
   var _a, _b, _c, _d, _e, _f;
-  const settings = getSettings();
+  const settings = GetSettings();
   const generated = (_c = (_b = (_a = event == null ? void 0 : event.properties) == null ? void 0 : _a.geocode) == null ? void 0 : _b.polygon) != null ? _c : null;
-  const ugc2 = (_f = (_e = (_d = event == null ? void 0 : event.properties) == null ? void 0 : _d.geocode) == null ? void 0 : _e.ugc) != null ? _f : null;
+  const ugc = (_f = (_e = (_d = event == null ? void 0 : event.properties) == null ? void 0 : _d.geocode) == null ? void 0 : _e.ugc) != null ? _f : null;
   let geo = {
     type: `Polygon`,
     coordinates: generated != null ? JSON.parse(Buffer.from(generated, "base64").toString("utf-8")) : null
   };
-  if (settings.GlobalSettings.UseShapefileCoordinates && generated == null && ugc2 != null) {
-    geo = getZonePolygon({ zones: ugc2, isUnion: false });
+  if (settings.GlobalSettings.UseShapefileCoordinates && generated == null && ugc != null) {
+    geo = getZonePolygon({ zones: ugc, isUnion: false });
     if (geo == null) {
       geo = {
         type: `Polygon`,
@@ -1355,21 +1359,21 @@ var getEventGeometry = (event) => {
   return geo;
 };
 
-// src/@building/building.clean.ts
-var getCleanedEvent = (event) => {
+// src/@building/GetCleanedEvent.ts
+var GetCleanedEvent = (event) => {
   for (const key of Object.keys(event)) {
     const value = event[key];
     if (value === null || value === void 0) {
       delete event[key];
     } else if (typeof value === "object" && value !== null && !Array.isArray(value)) {
-      event[key] = getCleanedEvent(value);
+      event[key] = GetCleanedEvent(value);
     }
   }
   return event;
 };
 
-// src/@modules/@utilities/utilities.setTimeoutAction.ts
-var setTimeoutAction = (options) => {
+// src/@modules/@utilities/SetTimeoutAction.ts
+var SetTimeoutAction = (options) => {
   var _a, _b, _c;
   let target = (_b = (_a = bootstrap) == null ? void 0 : _a.ratelimits) == null ? void 0 : _b[options == null ? void 0 : options.identifier];
   if (!target) {
@@ -1378,6 +1382,7 @@ var setTimeoutAction = (options) => {
   }
   if (options == null ? void 0 : options.expire) {
     delete bootstrap.ratelimits[options == null ? void 0 : options.identifier];
+    return { limited: false };
   }
   if ((target == null ? void 0 : target.length) > 0) {
     bootstrap.ratelimits[options == null ? void 0 : options.identifier] = target.filter((ts) => Date.now() - ts < (options == null ? void 0 : options.interval) * 1e3);
@@ -1397,8 +1402,8 @@ var setTimeoutAction = (options) => {
   return { limited: false };
 };
 
-// src/@modules/@utilities/utilities.setWarning.ts
-var setWarning = (options) => {
+// src/@modules/@utilities/SetWarning.ts
+var SetWarning = (options) => {
   var _a, _b;
   const settings = bootstrap.settings;
   bootstrap.listener.emit(`log`, `${(_a = options.title) != null ? _a : `[${bootstrap.ansi_colors.YELLOW}@atmosx/product-parser${bootstrap.ansi_colors.RESET}]`} ${options.message}`);
@@ -1407,10 +1412,10 @@ var setWarning = (options) => {
   }
 };
 
-// src/@modules/@utilities/utilities.setEventEmit.ts
-var setEventEmit = (options) => {
+// src/@modules/@utilities/SetEventEmit.ts
+var SetEventEmit = (options) => {
   if (options.limited) {
-    const isTimeout = setTimeoutAction({ identifier: `event.${options.event}`, addTime: true, max: 1, interval: 1 });
+    const isTimeout = SetTimeoutAction({ identifier: `event.${options.event}`, addTime: true, max: 1, interval: 1 });
     if (isTimeout.limited) return;
   }
   bootstrap.listener.emit(options.event, options.metadata);
@@ -1418,21 +1423,21 @@ var setEventEmit = (options) => {
     bootstrap.listener.emit(`*`, { event: options.event, data: options.metadata });
   }
   if (options.message) {
-    setWarning({ message: options.message });
+    SetWarning({ message: options.message });
   }
 };
 
-// src/@modules/@utilities/utilities.setListener.ts
-var setListener = (options) => {
+// src/@modules/@utilities/SetListener.ts
+var SetListener = (options) => {
   bootstrap.listener.on(options.event, options.callback);
   return () => {
     void bootstrap.listener.off(options.event, options.callback);
   };
 };
 
-// src/@core/core.createListener.ts
-var createListener = (event, callback) => {
-  setListener({ event, callback });
+// src/@core/CreateListener.ts
+var CreateListener = (event, callback) => {
+  SetListener({ event, callback });
 };
 
 // node_modules/@xmpp/xml/index.js
@@ -1821,20 +1826,20 @@ var jid_default = j;
 
 // node_modules/@xmpp/error/index.js
 var XMPPError = class extends Error {
-  constructor(condition, text2, application) {
-    super(condition + (text2 ? ` - ${text2}` : ""));
+  constructor(condition, text, application) {
+    super(condition + (text ? ` - ${text}` : ""));
     this.name = "XMPPError";
     this.condition = condition;
-    this.text = text2;
+    this.text = text;
     this.application = application;
   }
   static fromElement(element) {
     const [condition, second, third] = element.getChildElements();
-    let text2;
+    let text;
     let application;
     if (second) {
       if (second.is("text")) {
-        text2 = second;
+        text = second;
       } else if (second) {
         application = second;
       }
@@ -1842,7 +1847,7 @@ var XMPPError = class extends Error {
     }
     const error = new this(
       condition.name,
-      text2 ? text2.text() : "",
+      text ? text.text() : "",
       application
     );
     error.element = element;
@@ -2760,8 +2765,8 @@ function id() {
 
 // node_modules/@xmpp/middleware/lib/StanzaError.js
 var StanzaError = class extends error_default {
-  constructor(condition, text2, application, type) {
-    super(condition, text2, application);
+  constructor(condition, text, application, type) {
+    super(condition, text, application);
     this.type = type;
     this.name = "StanzaError";
   }
@@ -4190,8 +4195,8 @@ function setupIfAvailable(module2, ...args) {
   return module2(...args);
 }
 
-// src/@modules/@xmpp/xmpp.xOnline.ts
-var xOnline = () => {
+// src/@modules/@xmpp/OnlineXMPP.ts
+var OnlineXMPP = () => {
   const settings = bootstrap.settings;
   bootstrap.session_xmpp.on(`online`, (address) => __async(null, null, function* () {
     bootstrap.cache.sigHault = false;
@@ -4202,7 +4207,7 @@ var xOnline = () => {
       to: `nwws@conference.nwws-oi.weather.gov/${nickname}`,
       xmlns: "http://jabber.org/protocol/muc"
     }));
-    setEventEmit({
+    SetEventEmit({
       event: `onServiceStatus`,
       metadata: {
         message: `Succesfully connected to NOAA Weather Wire Service as "${nickname}"`,
@@ -4215,12 +4220,12 @@ var xOnline = () => {
   }));
 };
 
-// src/@modules/@xmpp/xmpp.xOffline.ts
-var xOffline = () => {
+// src/@modules/@xmpp/OfflineXMPP.ts
+var OfflineXMPP = () => {
   bootstrap.session_xmpp.on(`offline`, () => __async(null, null, function* () {
     bootstrap.cache.isConnected = false;
     bootstrap.cache.sigHault = true;
-    setEventEmit({
+    SetEventEmit({
       event: `onServiceStatus`,
       metadata: {
         message: `Client has gone offline`,
@@ -4232,16 +4237,16 @@ var xOffline = () => {
   }));
 };
 
-// src/@modules/@xmpp/xmpp.xError.ts
-var xError = () => {
+// src/@modules/@xmpp/ErrorXMPP.ts
+var ErrorXMPP = () => {
   bootstrap.session_xmpp.on(`error`, (error) => __async(null, null, function* () {
     bootstrap.cache.isConnected = false;
     bootstrap.cache.sigHault = true;
   }));
 };
 
-// src/@dictionaries/dictionaries.expressions.ts
-var dict_expressions = {
+// src/@enums/Expressions.ts
+var EnumExpressions = {
   location: new RegExp(/^([A-Za-z.\-' ]+),\s*([A-Z]{2})$/),
   pvtec: new RegExp(`[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`, "g"),
   hvtec: new RegExp(`[a-zA-Z0-9]{4}.[A-Z0-9].[A-Z]{2}.[0-9]{6}T[0-9]{4}Z.[0-9]{6}T[0-9]{4}Z.[0-9]{6}T[0-9]{4}Z.[A-Z]{2}`, "imu"),
@@ -4252,372 +4257,375 @@ var dict_expressions = {
   dateline: new RegExp(`\\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}`, "gim")
 };
 
-// src/@dictionaries/dictionaries.awips.ts
-var dict_awips = {
-  ABV: `rawinsonde-data-above-100-millibars`,
-  ADA: `alarm-alert-administrative-message`,
-  ADM: `alert-administrative-message`,
-  ADR: `nws-administrative-message`,
-  ADV: `space-environment-advisory`,
-  AFD: `area-forecast-discussion`,
-  AFM: `area-forecast-matrices`,
-  AFP: `area-forecast-product`,
-  AFW: `fire-weather-matrix`,
-  AGF: `agricultural-forecast`,
-  AGO: `agricultural-observations`,
-  ALT: `space-environment-alert`,
-  AQA: `air-quality-alert`,
-  AQI: `air-quality-index-statement`,
-  ASA: `air-stagnation-advisory`,
-  AVA: `avalanche-watch`,
-  AVG: `avalanche-weather-guidance`,
-  AVW: `avalanche-warning`,
-  AWO: `area-weather-outlook`,
-  AWS: `area-weather-summary`,
-  AWU: `area-weather-update`,
-  AWW: `airport-weather-warning`,
-  BLU: `blue-alert`,
-  BOY: `buoy-report`,
-  BRG: `coast-guard-observations`,
-  BRT: `hourly-roundup-for-weather-radio`,
-  CAE: `child-abduction-emergency`,
-  CCF: `coded-city-forecast`,
-  CDW: `civil-danger-warning`,
-  CEM: `civil-emergency-message`,
-  CF6: `monthly-daily-climate-data`,
-  CFP: `convective-forecast-product`,
-  CFW: `coastal-flood-warnings-watches-statements`,
-  CGR: `coast-guard-surface-report`,
-  CHG: `computer-hurricane-guidance`,
-  CLA: `climatological-report-annual`,
-  CLI: `climatological-report-daily`,
-  CLM: `climatological-report-monthly`,
-  CLQ: `climatological-report-quarterly`,
-  CLS: `climatological-report-seasonal`,
-  CLT: `climate-report`,
-  CMM: `coded-climatological-monthly-means`,
-  COD: `coded-analysis-and-forecasts`,
-  CPF: `great-lakes-port-forecast`,
-  CUR: `space-environment-products-routine`,
-  CWA: `center-weather-advisory`,
-  CWF: `coastal-waters-forecast`,
-  CWS: `center-weather-statement`,
-  DAY: `space-environment-product-daily`,
-  DDO: `daily-dispersion-outlook`,
-  DGT: `drought-information-statement`,
-  DMO: `practice-demo-warning`,
-  DSA: `unnumbered-depression-advisory`,
-  DSM: `asos-daily-summary`,
-  DSW: `dust-storm-warning`,
-  EFP: `extended-forecast-3-to-5-day`,
-  EOL: `six-to-ten-day-weather-outlook-local`,
-  EQI: `tsunami-bulletin`,
-  EQR: `earthquake-report`,
-  EQW: `earthquake-warning`,
-  ESF: `flood-potential-outlook`,
-  ESG: `extended-streamflow-guidance`,
-  ESP: `extended-streamflow-prediction`,
-  ESS: `water-supply-outlook`,
-  EVI: `evacuation-immediate`,
-  EWW: `extreme-wind-warning`,
-  FA0: `aviation-area-forecast-pacific`,
-  FA1: `aviation-area-forecast-northeast`,
-  FA2: `aviation-area-forecast-southeast`,
-  FA3: `aviation-area-forecast-north-central`,
-  FA4: `aviation-area-forecast-south-central`,
-  FA5: `aviation-area-forecast-rocky-mountains`,
-  FA6: `aviation-area-forecast-west-coast`,
-  FA7: `aviation-area-forecast-juneau-ak`,
-  FA8: `aviation-area-forecast-anchorage-ak`,
-  FA9: `aviation-area-forecast-fairbanks-ak`,
-  FD0: `winds-aloft-forecast-24hr-high-altitude`,
-  FD1: `winds-aloft-forecast-6hr`,
-  FD2: `winds-aloft-forecast-12hr`,
-  FD3: `winds-aloft-forecast-24hr`,
-  FD4: `winds-aloft-forecast`,
-  FD5: `winds-aloft-forecast`,
-  FD6: `winds-aloft-forecast`,
-  FD7: `winds-aloft-forecast`,
-  FD8: `winds-aloft-forecast-6hr-high-altitude`,
-  FD9: `winds-aloft-forecast-12hr-high-altitude`,
-  FDI: `fire-danger-indices`,
-  FFA: `flash-flood-watch`,
-  FFG: `flash-flood-guidance`,
-  FFH: `headwater-guidance`,
-  FFS: `flash-flood-statement`,
-  FFW: `flash-flood-warning`,
-  FLN: `national-flood-summary`,
-  FLS: `flood-statement`,
-  FLW: `flood-warning`,
-  FOF: `upper-wind-fallout-forecast`,
-  FRW: `fire-warning`,
-  FSH: `marine-fisheries-service-message`,
-  FTM: `radar-outage-notification`,
-  FTP: `temp-pop-guidance`,
-  FWA: `fire-weather-administrative-message`,
-  FWD: `fire-weather-outlook-discussion`,
-  FWF: `fire-weather-forecast`,
-  FWL: `land-management-forecast`,
-  FWM: `miscellaneous-fire-weather-product`,
-  FWN: `fire-weather-notification`,
-  FWO: `fire-weather-observation`,
-  FWS: `fire-weather-spot-forecast`,
-  FZL: `freezing-level-data`,
-  GLF: `great-lakes-forecast`,
-  GLS: `great-lakes-storm-summary`,
-  GRE: `green`,
-  HD1: `rfc-qpf-data-product`,
-  HD2: `rfc-qpf-data-product`,
-  HD3: `rfc-qpf-data-product`,
-  HD4: `rfc-qpf-data-product`,
-  HD7: `rfc-qpf-data-product`,
-  HD8: `rfc-qpf-data-product`,
-  HD9: `rfc-qpf-data-product`,
-  HLS: `hurricane-local-statement`,
-  HMD: `hydrometeorological-discussion`,
-  HML: `ahps-xml-product`,
-  HMW: `hazardous-materials-warning`,
-  HP1: `rfc-qpf-verification-product`,
-  HP2: `rfc-qpf-verification-product`,
-  HP3: `rfc-qpf-verification-product`,
-  HP4: `rfc-qpf-verification-product`,
-  HP5: `rfc-qpf-verification-product`,
-  HP6: `rfc-qpf-verification-product`,
-  HP7: `rfc-qpf-verification-product`,
-  HP8: `rfc-qpf-verification-product`,
-  HRR: `weather-roundup`,
-  HSF: `high-seas-forecast`,
-  HWO: `hazardous-weather-outlook`,
-  HWR: `hourly-weather-roundup`,
-  HYD: `daily-hydrometeorological-products`,
-  HYM: `monthly-hydrometeorological-product`,
-  ICE: `ice-forecast`,
-  IDM: `ice-drift-vectors`,
-  INI: `administrative-message`,
-  IOB: `ice-observation`,
-  KPA: `keep-alive-message`,
-  LAE: `local-area-emergency`,
-  LCD: `preliminary-local-climatological-data`,
-  LCO: `local-cooperative-observation`,
-  LEW: `law-enforcement-warning`,
-  LFP: `local-forecast`,
-  LKE: `lake-stages`,
-  LLS: `low-level-sounding`,
-  LOW: `low-temperatures`,
-  LSR: `local-storm-report`,
-  LTG: `lightning-data`,
-  MAN: `rawinsonde-mandatory-levels`,
-  MAP: `mean-areal-precipitation`,
-  MAW: `amended-marine-forecast`,
-  MFM: `marine-forecast-matrix`,
-  MIM: `marine-interpretation-message`,
-  MIS: `miscellaneous-local-product`,
-  MOB: `marine-observations`,
-  MON: `space-environment-product-monthly`,
-  MRP: `marine-product-techniques-development`,
-  MSM: `asos-monthly-summary-message`,
-  MTR: `metar-observation`,
-  MTT: `metar-test-message`,
-  MVF: `marine-verification-coded-message`,
-  MWS: `marine-weather-statement`,
-  MWW: `marine-weather-message`,
-  NOU: `weather-reconnaissance-flights`,
-  NOW: `short-term-forecast`,
-  NOX: `data-management-message`,
-  NPW: `non-precipitation-warning`,
-  NSH: `nearshore-marine-forecast`,
-  NUW: `nuclear-power-plant-warning`,
-  NWR: `noaa-weather-radio-forecast`,
-  OAV: `other-aviation-products`,
-  OBS: `observations`,
-  OFA: `offshore-aviation-forecast`,
-  OFF: `offshore-forecast`,
-  OMR: `other-marine-products`,
-  OPU: `other-public-products`,
-  OSO: `other-surface-observations`,
-  OSW: `ocean-surface-winds`,
-  OUA: `other-upper-air-data`,
-  OZF: `zone-forecast`,
-  PFM: `point-forecast-matrices`,
-  PFW: `fire-weather-point-forecast-matrices`,
-  PLS: `plain-language-ship-report`,
-  PMD: `prognostic-meteorological-discussion`,
-  PNS: `public-information-statement`,
-  POE: `probability-of-exceedance`,
-  PRB: `heat-index-forecast-tables`,
-  PRC: `pilot-report-collective`,
-  PRE: `preliminary-forecasts`,
-  PSH: `post-storm-hurricane-report`,
-  PTS: `probabilistic-outlook-points`,
-  PWO: `public-severe-weather-outlook`,
-  PWS: `tropical-cyclone-probabilities`,
-  QPF: `quantitative-precipitation-forecast`,
-  QPS: `quantitative-precipitation-statement`,
-  RDF: `revised-digital-forecast`,
-  REC: `recreational-report`,
-  RER: `record-report`,
-  RET: `eas-activation-request`,
-  RFD: `rangeland-fire-danger-forecast`,
-  RFI: `rfi-observation`,
-  RFR: `route-forecast`,
-  RFW: `red-flag-warning`,
-  RHW: `radiological-hazard-warning`,
-  RMT: `required-monthly-test`,
-  RNS: `rain-information-statement`,
-  RR1: `hydro-met-data-report-part-1`,
-  RR2: `hydro-met-data-report-part-2`,
-  RR3: `hydro-met-data-report-part-3`,
-  RR4: `hydro-met-data-report-part-4`,
-  RR5: `hydro-met-data-report-part-5`,
-  RR6: `hydro-met-data-report-part-6`,
-  RR7: `hydro-met-data-report-part-7`,
-  RR8: `hydro-met-data-report-part-8`,
-  RR9: `hydro-met-data-report-part-9`,
-  RRA: `automated-hydrologic-observation-report`,
-  RRM: `miscellaneous-hydrologic-data`,
-  RRS: `hads-data`,
-  RRY: `asos-hourly-test-message`,
-  RSD: `daily-snotel-data`,
-  RSM: `monthly-snotel-data`,
-  RTP: `regional-temp-precip-table`,
-  RVA: `river-summary`,
-  RVD: `daily-river-forecast`,
-  RVF: `river-forecast`,
-  RVI: `river-ice-statement`,
-  RVM: `miscellaneous-river-product`,
-  RVR: `river-recreation-statement`,
-  RVS: `river-statement`,
-  RWR: `regional-weather-roundup`,
-  RWS: `regional-weather-summary`,
-  RWT: `required-weekly-test`,
-  SAB: `special-avalanche-bulletin`,
-  SAF: `agricultural-weather-forecast`,
-  SAG: `snow-avalanche-guidance`,
-  SAT: `apt-prediction`,
-  SAW: `preliminary-notice-of-watch`,
-  SCC: `storm-summary`,
-  SCD: `supplementary-climatological-data`,
-  SCN: `soil-climate-analysis-network`,
-  SCP: `satellite-cloud-product`,
-  SCS: `selected-cities-summary`,
-  SDO: `supplementary-data-observation`,
-  SDS: `special-dispersion-statement`,
-  SEL: `severe-local-storm-watch`,
-  SEV: `spc-watch-point-information`,
-  SFP: `state-forecast`,
-  SFT: `tabular-state-forecast`,
-  SGL: `rawinsonde-significant-levels`,
-  SHP: `surface-ship-report`,
-  SIG: `international-sigmet`,
-  SIM: `satellite-interpretation-message`,
-  SLS: `severe-local-storm-outline`,
-  SMF: `smoke-management-weather-forecast`,
-  SMW: `special-marine-warning`,
-  SOO: `science-operations-officer-product`,
-  SPE: `satellite-precipitation-estimates`,
-  SPF: `storm-strike-probability-bulletin`,
-  SPS: `special-weather-statement`,
-  SPW: `shelter-in-place-warning`,
-  SQW: `snow-squall-warning`,
-  SRD: `surf-discussion`,
-  SRF: `surf-forecast`,
-  SRG: `soaring-guidance`,
-  SSM: `synoptic-surface-observation`,
-  STA: `weather-statistical-summary`,
-  STD: `satellite-tropical-disturbance-summary`,
-  STO: `road-condition-report`,
-  STP: `state-temp-precip-table`,
-  STQ: `spot-forecast-request`,
-  SUM: `space-weather-message`,
-  SVR: `severe-thunderstorm-warning`,
-  SVS: `severe-weather-statement`,
-  SWOMCD: `mesoscale-discussion`,
-  SWODY1: `storm-prediction-center-day-1-outlook`,
-  SWODY2: `storm-prediction-center-day-2-outlook`,
-  SWODY3: `storm-prediction-center-day-3-outlook`,
-  SWS: `state-weather-summary`,
-  SYN: `regional-weather-synopsis`,
-  TAF: `terminal-aerodrome-forecast`,
-  TAP: `terminal-alerting-products`,
-  TAV: `travelers-forecast-table`,
-  TCA: `tropical-cyclone-advisory`,
-  TCD: `tropical-cyclone-discussion`,
-  TCE: `tropical-cyclone-position-estimate`,
-  TCM: `tropical-cyclone-marine-aviation-advisory`,
-  TCP: `public-tropical-cyclone-advisory`,
-  TCS: `satellite-tropical-cyclone-summary`,
-  TCU: `tropical-cyclone-update`,
-  TCV: `tropical-cyclone-break-points`,
-  TIB: `tsunami-bulletin`,
-  TID: `tide-report`,
-  TMA: `tsunami-tide-seismic-acknowledgement`,
-  TOE: `telephone-outage-emergency`,
-  TOR: `tornado-warning`,
-  TPT: `temperature-precipitation-table`,
-  TSU: `tsunami-information-statement`,
-  TUV: `ultraviolet-index`,
-  TVL: `travelers-forecast`,
-  TWB: `transcribed-weather-broadcast`,
-  TWD: `tropical-weather-discussion`,
-  TWO: `tropical-weather-outlook`,
-  TWS: `tropical-weather-summary`,
-  URN: `aircraft-reconnaissance`,
-  UVI: `ultraviolet-index`,
-  VAA: `volcanic-activity-advisory`,
-  VER: `forecast-verification-statistics`,
-  VFT: `taf-verification-product`,
-  VOW: `volcano-warning`,
-  WA0: `airmet-pacific`,
-  WA1: `airmet-northeast`,
-  WA2: `airmet-southeast`,
-  WA3: `airmet-north-central`,
-  WA4: `airmet-south-central`,
-  WA5: `airmet-rocky-mountains`,
-  WA6: `airmet-west-coast`,
-  WA7: `airmet-juneau-ak`,
-  WA8: `airmet-anchorage-ak`,
-  WA9: `airmet-fairbanks-ak`,
-  WAR: `space-environment-warning`,
-  WAT: `space-environment-watch`,
-  WCN: `weather-watch-clearance-notification`,
-  WCR: `weekly-weather-and-crop-report`,
-  WDA: `weekly-data-for-agriculture`,
-  WDU: `warning-decision-update`,
-  WEK: `space-environment-product-weekly`,
-  WOU: `watch-outline-update`,
-  WS1: `sigmet-northeast`,
-  WS2: `sigmet-southeast`,
-  WS3: `sigmet-north-central`,
-  WS4: `sigmet-south-central`,
-  WS5: `sigmet-rocky-mountains`,
-  WS6: `sigmet-west-coast`,
-  WST: `tropical-cyclone-sigmet`,
-  WSV: `volcanic-activity-sigmet`,
-  WSW: `winter-weather-warning`,
-  WWA: `watch-status-report`,
-  WWP: `watch-probabilities`,
-  ZFP: `zone-forecast-product`
+// src/@enums/AWIPS.ts
+var EnumAWIPS = {
+  ABV: `Rawinsonde Data Above 100 Millibars`,
+  ADA: `Alarm Alert Administrative Message`,
+  ADM: `Alert Administrative Message`,
+  ADR: `NWS Administrative Message`,
+  ADV: `Space Environment Advisory`,
+  AFD: `Area Forecast Discussion`,
+  AFM: `Area Forecast Matrices`,
+  AFP: `Area Forecast Product`,
+  AFW: `Fire Weather Matrix`,
+  AGF: `Agricultural Forecast`,
+  AGO: `Agricultural Observations`,
+  ALT: `Space Environment Alert`,
+  AQA: `Air Quality Alert`,
+  AQI: `Air Quality Index Statement`,
+  ASA: `Air Stagnation Advisory`,
+  AVA: `Avalanche Watch`,
+  AVG: `Avalanche Weather Guidance`,
+  AVW: `Avalanche Warning`,
+  AWO: `Area Weather Outlook`,
+  AWS: `Area Weather Summary`,
+  AWU: `Area Weather Update`,
+  AWW: `Airport Weather Warning`,
+  BLU: `Blue Alert`,
+  BOY: `Buoy Report`,
+  BRG: `Coast Guard Observations`,
+  BRT: `Hourly Roundup for Weather Radio`,
+  CAE: `Child Abduction Emergency`,
+  CCF: `Coded City Forecast`,
+  CDW: `Civil Danger Warning`,
+  CEM: `Civil Emergency Message`,
+  CF6: `Monthly Daily Climate Data`,
+  CFP: `Convective Forecast Product`,
+  CFW: `Coastal Flood Warnings, Watches, and Statements`,
+  CGR: `Coast Guard Surface Report`,
+  CHG: `Computer Hurricane Guidance`,
+  CLA: `Climatological Report Annual`,
+  CLI: `Climatological Report Daily`,
+  CLM: `Climatological Report Monthly`,
+  CLQ: `Climatological Report Quarterly`,
+  CLS: `Climatological Report Seasonal`,
+  CLT: `Climate Report`,
+  CMM: `Coded Climatological Monthly Means`,
+  COD: `Coded Analysis and Forecasts`,
+  CPF: `Great Lakes Port Forecast`,
+  CUR: `Space Environment Products Routine`,
+  CWA: `Center Weather Advisory`,
+  CWF: `Coastal Waters Forecast`,
+  CWS: `Center Weather Statement`,
+  DAY: `Space Environment Product Daily`,
+  DDO: `Daily Dispersion Outlook`,
+  DGT: `Drought Information Statement`,
+  DMO: `Practice Demo Warning`,
+  DSA: `Unnumbered Depression Advisory`,
+  DSM: `ASOS Daily Summary`,
+  DSW: `Dust Storm Warning`,
+  EFP: `Extended Forecast (3 to 5 Day)`,
+  EOL: `Six to Ten Day Weather Outlook (Local)`,
+  EQI: `Tsunami Bulletin`,
+  EQR: `Earthquake Report`,
+  EQW: `Earthquake Warning`,
+  ESF: `Flood Potential Outlook`,
+  ESG: `Extended Streamflow Guidance`,
+  ESP: `Extended Streamflow Prediction`,
+  ESS: `Water Supply Outlook`,
+  EVI: `Evacuation Immediate`,
+  EWW: `Extreme Wind Warning`,
+  FA0: `Aviation Area Forecast (Pacific)`,
+  FA1: `Aviation Area Forecast (Northeast)`,
+  FA2: `Aviation Area Forecast (Southeast)`,
+  FA3: `Aviation Area Forecast (North Central)`,
+  FA4: `Aviation Area Forecast (South Central)`,
+  FA5: `Aviation Area Forecast (Rocky Mountains)`,
+  FA6: `Aviation Area Forecast (West Coast)`,
+  FA7: `Aviation Area Forecast (Juneau, AK)`,
+  FA8: `Aviation Area Forecast (Anchorage, AK)`,
+  FA9: `Aviation Area Forecast (Fairbanks, AK)`,
+  FD0: `Winds Aloft Forecast (24-Hour High Altitude)`,
+  FD1: `Winds Aloft Forecast (6-Hour)`,
+  FD2: `Winds Aloft Forecast (12-Hour)`,
+  FD3: `Winds Aloft Forecast (24-Hour)`,
+  FD4: `Winds Aloft Forecast`,
+  FD5: `Winds Aloft Forecast`,
+  FD6: `Winds Aloft Forecast`,
+  FD7: `Winds Aloft Forecast`,
+  FD8: `Winds Aloft Forecast (6-Hour High Altitude)`,
+  FD9: `Winds Aloft Forecast (12-Hour High Altitude)`,
+  FDI: `Fire Danger Indices`,
+  FFA: `Flash Flood Watch`,
+  FFG: `Flash Flood Guidance`,
+  FFH: `Headwater Guidance`,
+  FFS: `Flash Flood Statement`,
+  FFW: `Flash Flood Warning`,
+  FLN: `National Flood Summary`,
+  FLS: `Flood Statement`,
+  FLW: `Flood Warning`,
+  FOF: `Upper Wind Fallout Forecast`,
+  FRW: `Fire Warning`,
+  FSH: `Marine Fisheries Service Message`,
+  FTM: `Radar Outage Notification`,
+  FTP: `Temp POP Guidance`,
+  FWA: `Fire Weather Administrative Message`,
+  FWD: `Fire Weather Outlook Discussion`,
+  FWF: `Fire Weather Forecast`,
+  FWL: `Land Management Forecast`,
+  FWM: `Miscellaneous Fire Weather Product`,
+  FWN: `Fire Weather Notification`,
+  FWO: `Fire Weather Observation`,
+  FWS: `Fire Weather Spot Forecast`,
+  FZL: `Freezing Level Data`,
+  GLF: `Great Lakes Forecast`,
+  GLS: `Great Lakes Storm Summary`,
+  GRE: `Green`,
+  HD1: `RFC QPF Data Product`,
+  HD2: `RFC QPF Data Product`,
+  HD3: `RFC QPF Data Product`,
+  HD4: `RFC QPF Data Product`,
+  HD7: `RFC QPF Data Product`,
+  HD8: `RFC QPF Data Product`,
+  HD9: `RFC QPF Data Product`,
+  HLS: `Hurricane Local Statement`,
+  HMD: `Hydrometeorological Discussion`,
+  HML: `AHPS XML Product`,
+  HMW: `Hazardous Materials Warning`,
+  HP1: `RFC QPF Verification Product`,
+  HP2: `RFC QPF Verification Product`,
+  HP3: `RFC QPF Verification Product`,
+  HP4: `RFC QPF Verification Product`,
+  HP5: `RFC QPF Verification Product`,
+  HP6: `RFC QPF Verification Product`,
+  HP7: `RFC QPF Verification Product`,
+  HP8: `RFC QPF Verification Product`,
+  HRR: `Weather Roundup`,
+  HSF: `High Seas Forecast`,
+  HWO: `Hazardous Weather Outlook`,
+  HWR: `Hourly Weather Roundup`,
+  HYD: `Daily Hydrometeorological Products`,
+  HYM: `Monthly Hydrometeorological Product`,
+  ICE: `Ice Forecast`,
+  IDM: `Ice Drift Vectors`,
+  INI: `Administrative Message`,
+  IOB: `Ice Observation`,
+  KPA: `Keep Alive Message`,
+  LAE: `Local Area Emergency`,
+  LCD: `Preliminary Local Climatological Data`,
+  LCO: `Local Cooperative Observation`,
+  LEW: `Law Enforcement Warning`,
+  LFP: `Local Forecast`,
+  LKE: `Lake Stages`,
+  LLS: `Low Level Sounding`,
+  LOW: `Low Temperatures`,
+  LSR: `Local Storm Report`,
+  LTG: `Lightning Data`,
+  MAN: `Rawinsonde Mandatory Levels`,
+  MAP: `Mean Areal Precipitation`,
+  MAW: `Amended Marine Forecast`,
+  MFM: `Marine Forecast Matrix`,
+  MIM: `Marine Interpretation Message`,
+  MIS: `Miscellaneous Local Product`,
+  MOB: `Marine Observations`,
+  MON: `Space Environment Product Monthly`,
+  MRP: `Marine Product Techniques Development`,
+  MSM: `ASOS Monthly Summary Message`,
+  MTR: `METAR Observation`,
+  MTT: `METAR Test Message`,
+  MVF: `Marine Verification Coded Message`,
+  MWS: `Marine Weather Statement`,
+  MWW: `Marine Weather Message`,
+  NOU: `Weather Reconnaissance Flights`,
+  NOW: `Short-Term Forecast`,
+  NOX: `Data Management Message`,
+  NPW: `Non-Precipitation Warning`,
+  NSH: `Nearshore Marine Forecast`,
+  NUW: `Nuclear Power Plant Warning`,
+  NWR: `NOAA Weather Radio Forecast`,
+  OAV: `Other Aviation Products`,
+  OBS: `Observations`,
+  OFA: `Offshore Aviation Forecast`,
+  OFF: `Offshore Forecast`,
+  OMR: `Other Marine Products`,
+  OPU: `Other Public Products`,
+  OSO: `Other Surface Observations`,
+  OSW: `Ocean Surface Winds`,
+  OUA: `Other Upper Air Data`,
+  OZF: `Zone Forecast`,
+  PFM: `Point Forecast Matrices`,
+  PFW: `Fire Weather Point Forecast Matrices`,
+  PLS: `Plain Language Ship Report`,
+  PMD: `Prognostic Meteorological Discussion`,
+  PNS: `Public Information Statement`,
+  POE: `Probability of Exceedance`,
+  PRB: `Heat Index Forecast Tables`,
+  PRC: `Pilot Report Collective`,
+  PRE: `Preliminary Forecasts`,
+  PSH: `Post-Storm Hurricane Report`,
+  PTS: `Probabilistic Outlook Points`,
+  AAG: `Aviation Area Forecast`,
+  PWO: `Public Severe Weather Outlook`,
+  PWS: `Tropical Cyclone Probabilities`,
+  QPF: `Quantitative Precipitation Forecast`,
+  QPS: `Quantitative Precipitation Statement`,
+  RDF: `Revised Digital Forecast`,
+  REC: `Recreational Report`,
+  RER: `Record Report`,
+  RET: `EAS Activation Request`,
+  RFD: `Rangeland Fire Danger Forecast`,
+  RFI: `RFI Observation`,
+  RFR: `Route Forecast`,
+  RFW: `Red Flag Warning`,
+  RHW: `Radiological Hazard Warning`,
+  RMT: `Required Monthly Test`,
+  RNS: `Rain Information Statement`,
+  RR1: `Hydro-Met Data Report Part 1`,
+  RR2: `Hydro-Met Data Report Part 2`,
+  RR3: `Hydro-Met Data Report Part 3`,
+  RR4: `Hydro-Met Data Report Part 4`,
+  RR5: `Hydro-Met Data Report Part 5`,
+  RR6: `Hydro-Met Data Report Part 6`,
+  RR7: `Hydro-Met Data Report Part 7`,
+  RR8: `Hydro-Met Data Report Part 8`,
+  RR9: `Hydro-Met Data Report Part 9`,
+  RRA: `Automated Hydrologic Observation Report`,
+  RRM: `Miscellaneous Hydrologic Data`,
+  RRS: `HADS Data`,
+  RRY: `ASOS Hourly Test Message`,
+  RSD: `Daily SNOTEL Data`,
+  RSM: `Monthly SNOTEL Data`,
+  RTP: `Regional Temperature and Precipitation Table`,
+  RVA: `River Summary`,
+  RVD: `Daily River Forecast`,
+  RVF: `River Forecast`,
+  RVI: `River Ice Statement`,
+  RVM: `Miscellaneous River Product`,
+  RVR: `River Recreation Statement`,
+  RVS: `River Statement`,
+  RWR: `Regional Weather Roundup`,
+  RWS: `Regional Weather Summary`,
+  RWT: `Required Weekly Test`,
+  SAB: `Special Avalanche Bulletin`,
+  SAF: `Agricultural Weather Forecast`,
+  SAG: `Snow Avalanche Guidance`,
+  SAT: `APT Prediction`,
+  SAW: `Preliminary Notice of Watch`,
+  SCC: `Storm Summary`,
+  SCD: `Supplementary Climatological Data`,
+  SCN: `Soil Climate Analysis Network`,
+  SCP: `Satellite Cloud Product`,
+  SCS: `Selected Cities Summary`,
+  SDO: `Supplementary Data Observation`,
+  SDS: `Special Dispersion Statement`,
+  SEL: `Severe Local Storm Watch`,
+  SEV: `SPC Watch Point Information`,
+  SFP: `State Forecast`,
+  SFT: `Tabular State Forecast`,
+  SGL: `Rawinsonde Significant Levels`,
+  SHP: `Surface Ship Report`,
+  SIG: `International SIGMET`,
+  SIM: `Satellite Interpretation Message`,
+  SLS: `Severe Local Storm Outline`,
+  SMF: `Smoke Management Weather Forecast`,
+  SMW: `Special Marine Warning`,
+  SOO: `Science Operations Officer Product`,
+  SPE: `Satellite Precipitation Estimates`,
+  SPF: `Storm Strike Probability Bulletin`,
+  SPS: `Special Weather Statement`,
+  SPW: `Shelter in Place Warning`,
+  SQW: `Snow Squall Warning`,
+  SRD: `Surf Discussion`,
+  SRF: `Surf Forecast`,
+  SRG: `Soaring Guidance`,
+  SSM: `Synoptic Surface Observation`,
+  STA: `Weather Statistical Summary`,
+  STD: `Satellite Tropical Disturbance Summary`,
+  STO: `Road Condition Report`,
+  STP: `State Temperature and Precipitation Table`,
+  STQ: `Spot Forecast Request`,
+  SUM: `Space Weather Message`,
+  SVR: `Severe Thunderstorm Warning`,
+  SVS: `Severe Weather Statement`,
+  SWOMCD: `Mesoscale Discussion`,
+  SWODY1: `Storm Prediction Center Day 1 Outlook`,
+  SWODY2: `Storm Prediction Center Day 2 Outlook`,
+  SWODY3: `Storm Prediction Center Day 3 Outlook`,
+  SWOD48: `Storm Prediction Center Day 4 to 8 Outlook`,
+  SWS: `State Weather Summary`,
+  SYN: `Regional Weather Synopsis`,
+  TAF: `Terminal Aerodrome Forecast`,
+  TAP: `Terminal Alerting Products`,
+  TAV: `Travelers Forecast Table`,
+  TCA: `Tropical Cyclone Advisory`,
+  TCD: `Tropical Cyclone Discussion`,
+  TCE: `Tropical Cyclone Position Estimate`,
+  TCM: `Tropical Cyclone Marine Aviation Advisory`,
+  TCP: `Public Tropical Cyclone Advisory`,
+  TCS: `Satellite Tropical Cyclone Summary`,
+  TCU: `Tropical Cyclone Update`,
+  TCV: `Tropical Cyclone Break Points`,
+  TIB: `Tsunami Bulletin`,
+  TID: `Tide Report`,
+  TMA: `Tsunami Tide Seismic Acknowledgement`,
+  TOE: `Telephone Outage Emergency`,
+  TOR: `Tornado Warning`,
+  TPT: `Temperature Precipitation Table`,
+  TSU: `Tsunami Information Statement`,
+  TUV: `Ultraviolet Index`,
+  TVL: `Travelers Forecast`,
+  TWB: `Transcribed Weather Broadcast`,
+  TWD: `Tropical Weather Discussion`,
+  TWO: `Tropical Weather Outlook`,
+  TWS: `Tropical Weather Summary`,
+  URN: `Aircraft Reconnaissance`,
+  UVI: `Ultraviolet Index`,
+  VAA: `Volcanic Activity Advisory`,
+  VER: `Forecast Verification Statistics`,
+  VFT: `TAF Verification Product`,
+  VOW: `Volcano Warning`,
+  WA0: `AIRMET Pacific`,
+  WA1: `AIRMET Northeast`,
+  WA2: `AIRMET Southeast`,
+  WA3: `AIRMET North Central`,
+  WA4: `AIRMET South Central`,
+  WA5: `AIRMET Rocky Mountains`,
+  WA6: `AIRMET West Coast`,
+  WA7: `AIRMET Juneau, AK`,
+  WA8: `AIRMET Anchorage, AK`,
+  WA9: `AIRMET Fairbanks, AK`,
+  WAR: `Space Environment Warning`,
+  WAT: `Space Environment Watch`,
+  WCN: `Weather Watch Clearance Notification`,
+  WCR: `Weekly Weather and Crop Report`,
+  WDA: `Weekly Data for Agriculture`,
+  WDU: `Warning Decision Update`,
+  WEK: `Space Environment Product Weekly`,
+  WOU: `Watch Outline Update`,
+  WS1: `SIGMET Northeast`,
+  WS2: `SIGMET Southeast`,
+  WS3: `SIGMET North Central`,
+  WS4: `SIGMET South Central`,
+  WS5: `SIGMET Rocky Mountains`,
+  WS6: `SIGMET West Coast`,
+  WST: `Tropical Cyclone SIGMET`,
+  WSV: `Volcanic Activity SIGMET`,
+  WSW: `Winter Weather Warning`,
+  WWA: `Watch Status Report`,
+  WWP: `Watch Probabilities`,
+  ZFP: `Zone Forecast Product`
 };
 
-// src/@modules/@stanza/stanza.getAwipsType.ts
-var getAwipsType = (options) => {
+// src/@modules/@stanza/GetAwipsType.ts
+var GetAwipsType = (options) => {
   const attributes = options.attributes;
   if (!attributes.awipsid) {
     return {
       type: null,
-      prefix: null
+      prefix: null,
+      discovered: false
     };
   }
-  for (const [prefix, type] of Object.entries(dict_awips)) {
+  for (const [prefix, type] of Object.entries(EnumAWIPS)) {
     if (attributes.awipsid.startsWith(prefix)) {
-      return { type, prefix };
+      return { type, prefix, discovered: true };
     }
   }
-  return { type: null, prefix: null };
+  return { type: options.attributes.awipsid, prefix: options.attributes.awipsid, discovered: false };
 };
 
-// src/@modules/@stanza/stanza.validate.ts
-var validate = (options) => {
+// src/@modules/@stanza/ValidateStanza.ts
+var ValidateStanza = (options) => {
   if (options.stanza.is(`message`)) {
     const cb = options.stanza.getChild(`x`);
     if (cb && cb.children) {
@@ -4626,9 +4634,9 @@ var validate = (options) => {
       if (attributes.awipsid && attributes.awipsid.length > 1) {
         const isCapEvent = message.includes(`<?xml`);
         const isCapAreaDescription = message.includes(`<areaDesc>`);
-        const isVTEC = message.match(dict_expressions.pvtec) != null;
-        const isUGC = message.match(dict_expressions.ugc1) != null;
-        const getType = getAwipsType({ attributes });
+        const isVTEC = message.match(EnumExpressions.pvtec) != null;
+        const isUGC = message.match(EnumExpressions.ugc1) != null;
+        const getType = GetAwipsType({ attributes });
         if (getType.type != null) {
           return {
             message,
@@ -4648,8 +4656,8 @@ var validate = (options) => {
   return { isIgnored: true };
 };
 
-// src/@dictionaries/dictionaries.matches.ts
-var dict_matches = {
+// src/@enums/Matches.ts
+var EnumMatches = {
   SPS: [
     { match: /STRONG THUNDERSTORM/i, label: "Convective Special Weather Statement", statement: false },
     { match: /SPECIAL WEATHER STATEMENT/i, label: "Special Weather Statement", statement: false }
@@ -4685,15 +4693,20 @@ var dict_matches = {
   ]
 };
 
-// src/@parsers/@text/text.getDescriptionFromProduct.ts
-var getDescriptionFromProduct = (options) => {
+// src/@parsers/@text/GetDescriptionFromProduct.ts
+var GetDescriptionFromProduct = (options) => {
   let message = options.message;
-  const dates = Array.from(message.matchAll(dict_expressions.dateline));
+  const predefinedEndMarkers = ["&&", "LAT..."];
+  const getEndIndex = (text, fromIndex = 0) => {
+    const indices = predefinedEndMarkers.map((marker) => text.indexOf(marker, fromIndex)).filter((idx) => idx !== -1);
+    return indices.length ? Math.min(...indices) : -1;
+  };
+  const dates = Array.from(message.matchAll(EnumExpressions.dateline));
   if (dates.length) {
     const lastMatch = dates[dates.length - 1][0];
     const sIndx = message.lastIndexOf(lastMatch);
     if (sIndx !== -1) {
-      const endIndx = message.indexOf("&&", sIndx);
+      const endIndx = getEndIndex(message, sIndx);
       message = message.substring(sIndx + lastMatch.length, endIndx !== -1 ? endIndx : void 0).trimStart();
       if (message.startsWith("/")) message = message.slice(1).trimStart();
       if (options.handle && message.includes(options.handle)) {
@@ -4707,22 +4720,22 @@ var getDescriptionFromProduct = (options) => {
     if (handleIndx !== -1) {
       let afterHandle = message.substring(handleIndx + options.handle.length).trimStart();
       if (afterHandle.startsWith("/")) afterHandle = afterHandle.slice(1).trimStart();
-      const latEnd = afterHandle.indexOf("&&");
+      const latEnd = getEndIndex(afterHandle);
       message = latEnd !== -1 ? afterHandle.substring(0, latEnd).trim() : afterHandle.trim();
     }
   }
   return message.trim();
 };
 
-// src/@parsers/@text/text.getPolygonFromProduct.ts
+// src/@parsers/@text/GetPolygonFromProduct.ts
 var getPolygonFromProduct = (message) => {
   const coordinates = [];
   const match = message.match(
     /LAT\.\.\.LON\s+([\s\S]*?)(?=\n[A-Z]{2,}(?:\.\.\.|:)|\$\$|&&|$)/i
   );
   if (!match) return coordinates;
-  const text2 = match[1];
-  const values = text2.match(/\d{4,8}/g);
+  const text = match[1];
+  const values = text.match(/\d{4,8}/g);
   if (!values) return coordinates;
   if (values.every((v) => v.length === 8)) {
     for (const value of values) {
@@ -4747,8 +4760,8 @@ var getPolygonFromProduct = (message) => {
   return coordinates;
 };
 
-// src/@parsers/@text/text.getTextFromProduct.ts
-var getTextFromProduct = (options) => {
+// src/@parsers/@text/GetTextFromProduct.ts
+var GetTextFromProduct = (options) => {
   var _a;
   const lines = options.message.split(`
 `);
@@ -4768,8 +4781,8 @@ var getTextFromProduct = (options) => {
   return null;
 };
 
-// src/@dictionaries/dictionaries.icao.ts
-var dict_icao = {
+// src/@enums/ICAO.ts
+var EnumICAO = {
   "KLUB": "Lubbock, TX",
   "KLCH": "Lake Charles, LA",
   "TSTL": "St. Louis, MO",
@@ -5010,180 +5023,251 @@ var dict_icao = {
   "PAJK": "Juneau, AK"
 };
 
-// src/@building/building.office.ts
-var getEventOffice = (options) => {
+// src/@building/GetEventOffice.ts
+var GetEventOffice = (options) => {
   var _a, _b, _c, _d, _e, _f, _g;
   const office = options.pVtec != null ? (_b = (_a = options.pVtec) == null ? void 0 : _a.tracking) == null ? void 0 : _b.split(`.`)[0] : (_e = (_c = options.attributes) == null ? void 0 : _c.cccc) != null ? _e : options.organization != null ? Array.isArray(options.organization) ? (_d = options.organization) == null ? void 0 : _d[0] : options.organization : null;
-  const name = (_g = (_f = dict_icao) == null ? void 0 : _f[office]) != null ? _g : null;
+  const name = (_g = (_f = EnumICAO) == null ? void 0 : _f[office]) != null ? _g : null;
   return { office, name };
 };
 
-// src/@dictionaries/dictionaries.tags.ts
-var dict_tags = {
-  "FROSTBITE AND HYPOTHERMIA ARE LIKELY": "Frostbite and Hypothermia Likely",
-  "LICKELY BECOME SLICK AND HAZARDOUS": "Slick and Hazardous Roads",
-  "SLIPPERY ROAD CONDITIONS": "Slippery Roads",
-  "BLOWING SNOW WHICH COULD REDUCE VISIBILITY": "Blowing Snow Reducing Visibility",
-  "TRAVEL COULD BE VERY DIFFICULT": "Difficult Travel Conditions",
-  "DIFFICULT TRAVEL CONDITIONS": "Difficult Travel Conditions",
-  "EXPECT DISRUPTIONS": "Expect Disruptions to Travel",
-  "A LARGE AND EXTREMELY DANGEROUS TORNADO": "Large and Dangerous Tornado",
-  "THIS IS A PARTICULARLY DANGEROUS SITUATION": "Particularly Dangerous Situation",
-  "RADAR INDICATED ROTATION": "Radar Indicated Tornado",
-  "WEATHER SPOTTERS CONFIRMED TORNADO": "Confirmed by Storm Spotters",
-  "A SEVERE THUNDERSTORM CAPABLE OF PRODUCING A TORNADO": "Developing Tornado",
-  "LAW ENFORCEMENT CONFIRMED TORNADO": "Reported by Law Enforcement",
-  "A TORNADO IS ON THE GROUND": "Confirmed Tornado",
-  "WEATHER SPOTTERS REPORTED FUNNEL CLOUD": "Confirmed Funnel Cloud by Storm Spotters",
-  "PUBLIC CONFIRMED TORNADO": "Public reports of Tornado",
-  "RADAR CONFIRMED": "Radar Confirmed",
-  "TORNADO WAS REPORTED BRIEFLY ON THE GROUND": "Tornado no longer on ground",
-  "SPOTTERS INDICATE THAT A FUNNEL CLOUD CONTINUES WITH THIS STORM": "Funnel Cloud Continues",
-  "A TORNADO MAY DEVELOP AT ANY TIME": "Potentional still exists for Tornado to form",
-  "LIFE-THREATENING SITUATION": "Life Threating Situation",
-  "COMPLETE DESTRUCTION IS POSSIBLE": "Extremly Damaging Tornado",
-  "POTENTIALLY DEADLY TORNADO": "Deadly Tornado",
-  "RADAR INDICATED": "Radar Indicated",
-  "HAIL DAMAGE TO VEHICLES IS EXPECTED": "Damaging to Vehicles",
-  "EXPECT WIND DAMAGE": "Wind Damage",
-  "FREQUENT LIGHTNING": "Frequent Lightning",
-  "PEOPLE AND ANIMALS OUTDOORS WILL BE INJURED": "Capable of Injuring People and Animals",
-  "TRAINED WEATHER SPOTTERS": "Confirmed by Storm Spotters",
-  "SOURCE...PUBLIC": "Confirmed by Public",
-  "SMALL CRAFT COULD BE DAMAGED": "Potential Damage to Small Craft",
-  "A TORNADO WATCH REMAINS IN EFFECT": "Active Tornado Watch",
-  "TENNIS BALL SIZE HAIL": "Tennis Ball Size Hail",
-  "BASEBALL SIZE HAIL": "Baseball Size Hail",
-  "GOLF BALL SIZE HAIL": "Golf Ball Size Hail",
-  "QUARTER SIZE HAIL": "Quarter Size Hail",
-  "PING PONG BALL SIZE HAIL": "Ping Pong Ball Size Hail",
-  "NICKEL SIZE HAIL": "Nickel Size Hail",
-  "DOPPLER RADAR.": "Confirmed by Radar",
-  "DOPPLER RADAR AND AUTOMATED GAUGES.": "Confirmed by Radar and Gauges",
-  "FLASH FLOODING CAUSED BY THUNDERSTORMS.": "Caused by Thunderstorm",
-  "SOURCE...EMERGENCY MANAGEMENT.": "Confirmed by Emergency Management",
-  "FLASH FLOODING CAUSED BY HEAVY RAIN.": "Caused by heavy rain",
-  "SOURCE...LAW ENFORCEMENT REPORTED.": "Confirmed by Law Enforcement",
-  "MINOR FLOODING IS OCCURING": "Minor Flooding Occurring",
-  "VERY COLD TEMPERATURES CAN LEAD TO HYPOTHERMIA": "Hypothermia Risk",
-  "SENSITIVE VEGETATION AND POSSIBLY DAMAGE UNPROTECTED OUTDOOR": "Vegetation and Outdoor Plumbing Risk",
-  "RIP CURRENTS CAN SWEEP EVEN THE BEST SWIMMER": "Hazardous to All Swimmers",
-  "HYPOTHERMIA IF PRECAUTIONS ARE NOT TAKEN.": "Hypothermia Risk",
-  "FROSTBITE AND HYPOTHERMIA WILL OCCUR IF UNPROTECTED SKIN": "Frostbite and Hypothermia Risk on Unprotected Skin",
-  "TEMPERATURES COULD CAUSE RUPTURED WATER PIPES": "Risk of Ruptured Water Pipes",
-  "COULD RESULT IN HYPOTHERMIA OR FROSTBITE ON EXPOSED SKIN IF": "Hypothermia or Frostbite Risk on Exposed Skin",
-  "WINDS WILL STRENGTHEN": "Strengthening Winds",
-  "EXPECT ROADS TO RE-FREEZE": "Roads May Re-Freeze",
-  "SLICK AND ICY SPOTS ON ROADS": "Slick and Icy Roads",
-  "ICY PATCHES MAY BE MORE COMMON ON BRIDGES": "Icy Patches Likely on Bridges",
-  "SLICK SPOTS ON UNTREATED ROADS": "Slick Spots on Untreated Roads",
-  "TEMPERATURES ARE EXPECTED TO FALL BELOW FREEZING": "Temperatures Expected Below Freezing",
-  "HAZARDOUS ROADWAYS AND BLACK ICE": "Hazardous Roadways and Black Ice",
-  "SLOW DOWN AND ALLOW EXTRA TIME": "Slow Down and Allow Extra Time",
-  "SHOULD EXERCISE CAUTION": "Should Exercise Caution",
-  "LAKE EFFECT SNOW EXPECTED": "Lake Effect Snow Expected",
-  "MODERATE LAKE EFFECT SNOWFALL RATES AND BLOWING SNOW": "Moderate Lake Effect Snowfall and Blowing Snow",
-  "NO TSUNAMI THREAT": "No Active Tsunami Threat",
-  "NO SIGNIFICANT TSUNAMI THREAT": "No Significant Tsunami Threat",
-  "NO TSUNAMI IMPACTS ARE EXPECTED": "No Tsunami Impacts Expected",
-  "A TSUNAMI THREAT EXISTS": "Tsunami Threat Exists",
-  "TSUNAMI THREAT": "Active Tsunami Threat",
-  "HEAT ILLNESSES": "Can cause heat illness",
-  "WATCH POSSIBLE": "Watch Possible",
-  "INTENSIFYING": "Intensifying",
-  "CAPABLE OF PRODUCING A LANDSPOUT": "Landspout Possible"
+// src/@enums/Tags.ts
+var EnumTags = {
+  SEVERE_WEATHER: [
+    { match: /A Large And Extremely Dangerous Tornado/i, tag: "Large and Dangerous Tornado" },
+    { match: /This Is A Particularly Dangerous Situation/i, tag: "Particularly Dangerous Situation" },
+    { match: /Weather Spotters Confirmed Tornado/i, tag: "Weather Spotters Confirmed Tornado" },
+    { match: /Law Enforcement Confirmed Tornado/i, tag: "Law Enforcement Confirmed Tornado" },
+    { match: /Radar Confirmed/i, tag: "Radar Confirmed" },
+    { match: /Radar Indicated Rotation/i, tag: "Radar Indicated Rotation" },
+    { match: /Radar Indicated(?! Rotation)/i, tag: "Radar Indicated" },
+    { match: /A Tornado Is On The Ground/i, tag: "Tornado On The Ground" },
+    { match: /Tornado Was Reported Briefly On The Ground/i, tag: "Tornado Briefly On Ground" },
+    { match: /Weather Spotters Reported Funnel Cloud/i, tag: "Confirmed Funnel Cloud" },
+    { match: /Spotters Indicate That A Funnel Cloud Continues With This Storm/i, tag: "Funnel Cloud Continues" },
+    { match: /A Severe Thunderstorm Capable Of Producing A Tornado/i, tag: "Tornado Possible" },
+    { match: /A Tornado May Develop At Any Time/i, tag: "Tornado May Develop" },
+    { match: /A Tornado Watch Remains In Effect/i, tag: "Active Tornado Watch" },
+    { match: /Complete Destruction Is Possible/i, tag: "Extremely Damaging Tornado" },
+    { match: /Potentially Deadly Tornado/i, tag: "Deadly Tornado" },
+    { match: /Life-Threatening Situation/i, tag: "Life Threatening Situation" },
+    { match: /Capable Of Producing A Landspout/i, tag: "Landspout Possible" },
+    { match: /Public Confirmed Tornado/i, tag: "Public Confirmed Tornado" },
+    { match: /Expect Wind Damage/i, tag: "Wind Damage" },
+    { match: /Destructive Winds/i, tag: "Destructive Winds" },
+    { match: /Wind Damage With This Storm Will Occur/i, tag: "Immediate Wind Damage Threat" },
+    { match: /Widespread Wind Damage/i, tag: "Widespread Wind Damage" },
+    { match: /Significant Wind Damage/i, tag: "Significant Wind Damage" },
+    { match: /Tornado Like Wind Speeds/i, tag: "Tornado-Like Wind Speeds" },
+    { match: /Winds Will Strengthen/i, tag: "Strengthening Winds" },
+    { match: /Gusty Winds/i, tag: "Gusty Winds" },
+    { match: /Could Knock Down Tree Limbs/i, tag: "Tree Damage Possible" },
+    { match: /Blow Around Unsecured Objects/i, tag: "Loose Object Damage Possible" },
+    { match: /Unsecured lightweight objects blown about/i, tag: "Loose Objects May Blow Around" },
+    { match: /Many large tree limbs broken off/i, tag: "Tree Limb Damage Possible" },
+    { match: /Some fences and roadway signs blown over/i, tag: "Fence and Sign Damage Possible" },
+    { match: /Hazardous driving conditions on bridges/i, tag: "Hazardous Bridge Travel" },
+    { match: /Scattered power and communications outages/i, tag: "Power Outages Possible" },
+    { match: /Hail Damage To Vehicles Is Expected/i, tag: "Vehicle Damaging Hail" },
+    { match: /Extremely Large Hail/i, tag: "Extremely Large Hail" },
+    { match: new RegExp("(?<!Extremely )Large Hail", "i"), tag: "Large Hail" },
+    { match: /Tennis Ball Size Hail/i, tag: "Tennis Ball Size Hail" },
+    { match: /Baseball Size Hail/i, tag: "Baseball Size Hail" },
+    { match: /Golf Ball Size Hail/i, tag: "Golf Ball Size Hail" },
+    { match: /Quarter Size Hail/i, tag: "Quarter Size Hail" },
+    { match: /Ping Pong Ball Size Hail/i, tag: "Ping Pong Ball Size Hail" },
+    { match: /Nickel Size Hail/i, tag: "Nickel Size Hail" },
+    { match: /Hail Driven By Severe Winds/i, tag: "Wind Driven Hail" },
+    { match: /Prepare Immediately For Large Hail/i, tag: "Large Hail" },
+    { match: /Half Inch Hail/i, tag: "Half Inch Hail" },
+    { match: /Frequent Lightning/i, tag: "Frequent Lightning" },
+    { match: /Deadly Cloud To Ground Lightning/i, tag: "Deadly Cloud To Ground Lightning" },
+    { match: /Continuous Cloud To Ground Lightning/i, tag: "Continuous Cloud To Ground Lightning" },
+    { match: /Frequent Cloud To Ground Lightning/i, tag: "Frequent Cloud To Ground Lightning" },
+    { match: /Lightning Can Strike \d+ Miles Away/i, tag: "Lightning Safety Threat" },
+    { match: /Showers and thunderstorms with gusty winds may still occur/i, tag: "Gusty Thunderstorms Possible" }
+  ],
+  FLOOD: [
+    { match: /Flash Flooding Caused By Thunderstorms/i, tag: "Thunderstorm Flash Flooding" },
+    { match: /Flash Flooding Caused By Heavy Rain/i, tag: "Heavy Rain Flash Flooding" },
+    { match: /Torrential Rainfall/i, tag: "Torrential Rainfall" },
+    { match: /May Lead To Flash Flooding/i, tag: "Flash Flooding Possible" },
+    { match: /Minor Flooding Is Occurring/i, tag: "Minor Flooding Occurring" },
+    { match: /Localized Flooding/i, tag: "Localized Flooding Possible" },
+    { match: /Do Not Drive Your Vehicle Through Flooded Roadways/i, tag: "Flooded Roadways" },
+    { match: /No storm surge inundation forecast/i, tag: "No Storm Surge Inundation" },
+    { match: /Localized storm surge possible/i, tag: "Localized Storm Surge Possible" },
+    { match: /Peak Storm Surge Inundation/i, tag: "Storm Surge Inundation Risk" },
+    { match: /Potential for storm surge flooding/i, tag: "Storm Surge Flooding Possible" },
+    { match: /Small streams, creeks, and ditches may become swollen/i, tag: "Small Stream Flooding Risk" },
+    { match: /Rivers and tributaries may quickly rise/i, tag: "Rapid River Rise Possible" },
+    { match: /Flood waters can enter a few structures/i, tag: "Flood Damage Possible" },
+    { match: /Rapid ponding of water occurs/i, tag: "Water Ponding Possible" },
+    { match: /Brief road and bridge closures/i, tag: "Road Closures Possible" }
+  ],
+  WINTER_WEATHER: [
+    { match: /Frostbite And Hypothermia Are Likely/i, tag: "Frostbite and Hypothermia Likely" },
+    { match: /Very Cold Temperatures Can Lead To Hypothermia/i, tag: "Hypothermia Risk" },
+    { match: /Hypothermia If Precautions Are Not Taken/i, tag: "Hypothermia Risk" },
+    { match: /Frostbite And Hypothermia Will Occur If Unprotected Skin/i, tag: "Frostbite Risk" },
+    { match: /Temperatures Could Cause Ruptured Water Pipes/i, tag: "Ruptured Water Pipes Possible" },
+    { match: /Blowing Snow Which Could Reduce Visibility/i, tag: "Reduced Visibility From Blowing Snow" },
+    { match: /Lake Effect Snow Expected/i, tag: "Lake Effect Snow" },
+    { match: /Slick And Icy Spots On Roads/i, tag: "Icy Roads" },
+    { match: /Hazardous Roadways And Black Ice/i, tag: "Black Ice" },
+    { match: /Icy Patches May Be More Common On Bridges/i, tag: "Bridge Icing" }
+  ],
+  COASTAL_MARINE: [
+    { match: /Rip Currents Can Sweep Even The Best Swimmer/i, tag: "Dangerous Rip Currents" },
+    { match: /Small Craft Could Be Damaged/i, tag: "Small Craft Damage Possible" },
+    { match: /No Tsunami Threat/i, tag: "No Tsunami Threat" },
+    { match: /Tsunami Threat Exists/i, tag: "Tsunami Threat Exists" },
+    { match: /TROPICAL STORM WARNING IN EFFECT/i, tag: "Tropical Storm Warning" },
+    { match: /TROPICAL STORM WARNING REMAINS IN EFFECT/i, tag: "Tropical Storm Warning Continues" },
+    { match: /Tropical storm[- ]force winds/i, tag: "Tropical Storm Force Winds" },
+    { match: /hazardous wind/i, tag: "Hazardous Winds" },
+    { match: /hazardous seas/i, tag: "Hazardous Seas" },
+    { match: /could capsize or damage vessels/i, tag: "Vessel Damage Risk" },
+    { match: /reduce visibility/i, tag: "Reduced Visibility" },
+    { match: /Mariners should alter plans/i, tag: "Marine Travel Disruption" },
+    { match: /Remain in port/i, tag: "Remain In Port" },
+    { match: /seek safe harbor/i, tag: "Seek Safe Harbor" },
+    { match: /secure the vessel for severe conditions/i, tag: "Secure Vessel" }
+  ],
+  SAFETY_INFO: [
+    { match: /Seek Shelter Now/i, tag: "Seek Shelter Now" },
+    { match: /Seek Shelter Immediately/i, tag: "Seek Shelter Immediately" },
+    { match: /Move To An Interior Room/i, tag: "Move To Interior Room" },
+    { match: /Move To Safe Shelter Now/i, tag: "Move To Safe Shelter" },
+    { match: /Potentially Deadly Storm/i, tag: "Potentially Deadly Storm" },
+    { match: /Serious Injury And Significant Property Damage/i, tag: "Serious Damage Possible" },
+    { match: /People And Animals Outdoors Will Be Injured/i, tag: "Outdoor Injury Risk" },
+    { match: /IMMINENT DANGEROUS WEATHER CONDITIONS/i, tag: "Imminent Dangerous Weather" },
+    { match: /Follow the instructions of local officials/i, tag: "Follow Local Officials" },
+    { match: /Monitor forecasts/i, tag: "Monitor Forecast Updates" },
+    { match: /Complete preparations.*before conditions become unsafe/i, tag: "Complete Preparations Early" },
+    { match: /Leave immediately if evacuation orders are given/i, tag: "Evacuate If Ordered" },
+    { match: /Heed any flood watches and warnings/i, tag: "Monitor Flood Alerts" },
+    { match: /Listen for changes in the forecast/i, tag: "Stay Weather Aware" },
+    { match: /Travel Could Be Very Difficult/i, tag: "Difficult Travel Conditions" },
+    { match: /Expect Disruptions/i, tag: "Travel Disruptions Expected" },
+    { match: /Trained Weather Spotters/i, tag: "Confirmed By Storm Spotters" },
+    { match: /Doppler Radar/i, tag: "Confirmed By Radar" },
+    { match: /Source\.\.\.Storm Spotters/i, tag: "Confirmed By Storm Spotters" },
+    { match: /Source\.\.\.Doppler Radar/i, tag: "Confirmed By Radar" },
+    { match: /Source\.\.\.Automated Gauges/i, tag: "Confirmed By Automated Gauges" },
+    { match: /Source\.\.\.Radar Confirmed/i, tag: "Confirmed By Radar" },
+    { match: /Source\.\.\.Radar Indicated/i, tag: "Indicated By Radar" },
+    { match: /Source\.\.\.Public/i, tag: "Confirmed By Public" },
+    { match: /Source\.\.\.Amateur Radio/i, tag: "Confirmed By Amateur Radio" },
+    { match: /Source\.\.\.Emergency Management/i, tag: "Confirmed By Emergency Management" },
+    { match: /Source\.\.\.Law Enforcement Reported/i, tag: "Confirmed By Law Enforcement" },
+    { match: /Source\.\.\.Broadcast Media/i, tag: "Confirmed By Broadcast Media" },
+    { match: /Source\.\.\.Media/i, tag: "Confirmed By Media" },
+    { match: /Source\.\.\.Media Reported/i, tag: "Confirmed By Media" },
+    { match: /Doppler Radar And Automated Gauges/i, tag: "Confirmed By Radar and Gauges" },
+    { match: /Potential Impacts:\s*Limited/i, tag: "Limited Impacts Expected" },
+    { match: /Potential Impacts:\s*Little to None/i, tag: "Minimal Impacts Expected" },
+    { match: /Slow Down And Allow Extra Time/i, tag: "Allow Extra Travel Time" },
+    { match: /Should Exercise Caution/i, tag: "Exercise Caution" },
+    { match: /Heat Illnesses/i, tag: "Heat Illness Risk" },
+    { match: /\bIntensifying\b/i, tag: "Intensifying Conditions" }
+  ]
 };
 
-// src/@building/building.tags.ts
-var getEventTags = (message) => {
-  return Object.entries(dict_tags).filter(([key]) => message == null ? void 0 : message.toLowerCase().includes(key.toLowerCase())).map(([, value]) => value);
+// src/@building/GetEventTags.ts
+var GetEventTags = (message) => {
+  if (!message) return [];
+  return [...new Set(
+    Object.values(EnumTags).flat().filter(({ match }) => match.test(message)).map(({ tag }) => tag)
+  )];
 };
 
-// src/@building/building.properties.ts
-var properties = (options) => {
+// src/@building/GetEventProperties.ts
+var GetEventProperties = (options) => {
   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;
-  const organization = (_b = (_a = options.message.match(dict_expressions.wmo)) == null ? void 0 : _a[0]) != null ? _b : null;
+  const organization = (_b = (_a = options.message.match(EnumExpressions.wmo)) == null ? void 0 : _a[0]) != null ? _b : null;
   const polygons = getPolygonFromProduct(options.message);
-  const properties2 = {
+  const properties = {
     locations: (_e = (_d = (_c = options == null ? void 0 : options.ugc) == null ? void 0 : _c.locations) == null ? void 0 : _d.join(`; `)) != null ? _e : null,
     locations_array: (_g = (_f = options == null ? void 0 : options.ugc) == null ? void 0 : _f.locations) != null ? _g : [],
-    description: getDescriptionFromProduct({ message: options.message, handle: (_i = (_h = options == null ? void 0 : options.pVtec) == null ? void 0 : _h.vtec) != null ? _i : null }),
+    description: GetDescriptionFromProduct({ message: options.message, handle: (_i = (_h = options == null ? void 0 : options.pVtec) == null ? void 0 : _h.vtec) != null ? _i : null }),
     attributes: options.attributes,
     geocode: {
-      office: getEventOffice({ attributes: options.attributes, organization, pVtec: options.pVtec }),
+      office: GetEventOffice({ attributes: options.attributes, organization, pVtec: options.pVtec }),
       organization,
       ugc: (_k = (_j = options == null ? void 0 : options.ugc) == null ? void 0 : _j.zones) != null ? _k : [],
       polygon: polygons.length > 0 ? Buffer.from(JSON.stringify([polygons])).toString("base64") : null,
       polygon_generated: polygons.length > 0 ? true : false
     },
     parameters: {
-      tags: getEventTags(options.message),
-      instructions: (_l = getTextFromProduct({ message: options.message, find: [`For your protection`, `do not`, `use extreme caution`], append: `...`, removal: [`.`] })) != null ? _l : null,
-      source: (_m = getTextFromProduct({ message: options.message, find: [`SOURCE...`], removal: [`.`] })) != null ? _m : null,
-      hazards: (_n = getTextFromProduct({ message: options.message, find: [`HAZARD...`], removal: [`.`] })) != null ? _n : null,
-      impacts: (_o = getTextFromProduct({ message: options.message, find: [`IMPACT...`], removal: [`.`] })) != null ? _o : null,
-      estimated_hail_size: (_p = getTextFromProduct({ message: options.message, find: [`MAX HAIL SIZE...`, `HAIL...`], removal: ["in"] })) != null ? _p : null,
-      estimated_wind_gusts: (_q = getTextFromProduct({ message: options.message, find: [`MAX WIND GUST...`, `WIND...`] })) != null ? _q : null,
-      damage_threat: (_r = getTextFromProduct({ message: options.message, find: [`DAMAGE THREAT...`], removal: [] })) != null ? _r : null,
-      tornado_threat: (_s = getTextFromProduct({ message: options.message, find: [`TORNADO...`, `WATERSPOUT...`] })) != null ? _s : null,
-      flood_threat: (_t = getTextFromProduct({ message: options.message, find: [`FLASH FLOOD...`] })) != null ? _t : null,
-      wind_threat: (_u = getTextFromProduct({ message: options.message, find: [`WIND THREAT...`] })) != null ? _u : null,
-      hail_threat: (_v = getTextFromProduct({ message: options.message, find: [`HAIL THREAT...`], removal: [] })) != null ? _v : null
+      tags: GetEventTags(options.message),
+      instructions: (_l = GetTextFromProduct({ message: options.message, find: [`For your protection`, `do not`, `use extreme caution`], append: `...`, removal: [`.`] })) != null ? _l : null,
+      source: (_m = GetTextFromProduct({ message: options.message, find: [`SOURCE...`], removal: [`.`] })) != null ? _m : null,
+      hazards: (_n = GetTextFromProduct({ message: options.message, find: [`HAZARD...`], removal: [`.`] })) != null ? _n : null,
+      impacts: (_o = GetTextFromProduct({ message: options.message, find: [`IMPACT...`], removal: [`.`] })) != null ? _o : null,
+      estimated_hail_size: (_p = GetTextFromProduct({ message: options.message, find: [`MAX HAIL SIZE...`, `HAIL...`], removal: ["in"] })) != null ? _p : null,
+      estimated_wind_gusts: (_q = GetTextFromProduct({ message: options.message, find: [`MAX WIND GUST...`, `WIND...`] })) != null ? _q : null,
+      damage_threat: (_r = GetTextFromProduct({ message: options.message, find: [`DAMAGE THREAT...`], removal: [] })) != null ? _r : null,
+      tornado_threat: (_s = GetTextFromProduct({ message: options.message, find: [`TORNADO...`, `WATERSPOUT...`] })) != null ? _s : null,
+      flood_threat: (_t = GetTextFromProduct({ message: options.message, find: [`FLASH FLOOD...`] })) != null ? _t : null,
+      wind_threat: (_u = GetTextFromProduct({ message: options.message, find: [`WIND THREAT...`] })) != null ? _u : null,
+      hail_threat: (_v = GetTextFromProduct({ message: options.message, find: [`HAIL THREAT...`], removal: [] })) != null ? _v : null
     },
     discussion_parameters: {
-      discussion_number: (_y = (_x = (_w = getTextFromProduct({ message: options.message, find: [`Mesoscale Discussion `], removal: [`Mesoscale Discussion`, `Number`, `...`] })) == null ? void 0 : _w.toString()) == null ? void 0 : _x.padStart(4, "0")) != null ? _y : null,
-      discussion_concerning: (_z = getTextFromProduct({ message: options.message, find: [`Concerning...`] })) != null ? _z : null,
-      discussion_max_tornado: (_A = getTextFromProduct({ message: options.message, find: [`MOST PROBABLE PEAK TORNADO INTENSITY...`] })) != null ? _A : null,
-      discussion_max_hail: (_B = getTextFromProduct({ message: options.message, find: [`MOST PROBABLE PEAK HAIL SIZE...`] })) != null ? _B : null,
-      discussion_max_wind: (_C = getTextFromProduct({ message: options.message, find: [`MOST PROBABLE PEAK WIND GUST...`] })) != null ? _C : null,
-      discussion_watch_issuance: (_D = getTextFromProduct({ message: options.message, find: [`Probability of Watch Issuance...`], removal: [`percent`] })) != null ? _D : null
+      discussion_number: (_y = (_x = (_w = GetTextFromProduct({ message: options.message, find: [`Mesoscale Discussion `], removal: [`Mesoscale Discussion`, `Number`, `...`] })) == null ? void 0 : _w.toString()) == null ? void 0 : _x.padStart(4, "0")) != null ? _y : null,
+      discussion_concerning: (_z = GetTextFromProduct({ message: options.message, find: [`Concerning...`] })) != null ? _z : null,
+      discussion_max_tornado: (_A = GetTextFromProduct({ message: options.message, find: [`MOST PROBABLE PEAK TORNADO INTENSITY...`] })) != null ? _A : null,
+      discussion_max_hail: (_B = GetTextFromProduct({ message: options.message, find: [`MOST PROBABLE PEAK HAIL SIZE...`] })) != null ? _B : null,
+      discussion_max_wind: (_C = GetTextFromProduct({ message: options.message, find: [`MOST PROBABLE PEAK WIND GUST...`] })) != null ? _C : null,
+      discussion_watch_issuance: (_D = GetTextFromProduct({ message: options.message, find: [`Probability of Watch Issuance...`], removal: [`percent`] })) != null ? _D : null
     },
     watch_parameters: {
-      watch_number: ((_E = options == null ? void 0 : options.pVtec) == null ? void 0 : _E.is_watch) && ((_O = (_N = (_I = (_H = (_G = (_F = getTextFromProduct({ message: options.message, find: [`ITIES FOR`, `UPDATE FOR`, `Watch Number `], removal: [`%`, `<`, `:`] })) == null ? void 0 : _F.replace(/(WT|WS|)/g, "")) == null ? void 0 : _G.trim()) == null ? void 0 : _H.toString()) == null ? void 0 : _I.padStart(4, "0")) != null ? _N : (_M = (_L = (_K = (_J = options == null ? void 0 : options.pVtec) == null ? void 0 : _J.tracking) == null ? void 0 : _K.slice(-4)) == null ? void 0 : _L.toString()) == null ? void 0 : _M.padStart(4, "0")) != null ? _O : null),
+      watch_number: ((_E = options == null ? void 0 : options.pVtec) == null ? void 0 : _E.is_watch) ? (_O = (_N = (_I = (_H = (_G = (_F = GetTextFromProduct({ message: options.message, find: [`ITIES FOR`, `UPDATE FOR`, `Watch Number `], removal: [`%`, `<`, `:`] })) == null ? void 0 : _F.replace(/(WT|WS|)/g, "")) == null ? void 0 : _G.trim()) == null ? void 0 : _H.toString()) == null ? void 0 : _I.padStart(4, "0")) != null ? _N : (_M = (_L = (_K = (_J = options == null ? void 0 : options.pVtec) == null ? void 0 : _J.tracking) == null ? void 0 : _K.slice(-4)) == null ? void 0 : _L.toString()) == null ? void 0 : _M.padStart(4, "0")) != null ? _O : null : null,
       watch_type: options.message.includes(`TORNADO WATCH`) ? `Tornado` : (options == null ? void 0 : options.message.includes(`SEVERE`)) ? `Severe` : null,
-      additional_tornadoes_probability: (_P = getTextFromProduct({ message: options.message, find: [`PROB OF 2 OR MORE TORNADOES`], removal: [`%`, `<`, `:`] })) != null ? _P : null,
-      strong_tornadoes_probability: (_Q = getTextFromProduct({ message: options.message, find: [`PROB OF 1 OR MORE STRONG /EF2-EF5/ TORNADOES`], removal: [`%`, `<`, `:`] })) != null ? _Q : null,
-      severe_wind_probability: (_R = getTextFromProduct({ message: options.message, find: [`PROB OF 10 OR MORE SEVERE WIND EVENTS`], removal: [`%`, `<`, `:`] })) != null ? _R : null,
-      severe_hail_probability: (_S = getTextFromProduct({ message: options.message, find: [`PROB OF 10 OR MORE SEVERE HAIL EVENTS`], removal: [`%`, `<`, `:`] })) != null ? _S : null,
-      hail_2in_probability: (_T = getTextFromProduct({ message: options.message, find: [`PROB OF 1 OR MORE HAIL EVENTS >= 2 INCHES`], removal: [`%`, `<`, `:`] })) != null ? _T : null,
-      combined_hail_wind_probability: (_U = getTextFromProduct({ message: options.message, find: [`PROB OF 6 OR MORE COMBINED SEVERE HAIL/WIND EVENTS`], removal: [`%`, `<`, `:`] })) != null ? _U : null,
-      max_hail_in: (_V = getTextFromProduct({ message: options.message, find: [`MAX HAIL /INCHES/`], removal: [`%`, `<`, `:`] })) != null ? _V : null,
-      max_wind_surface: (_W = getTextFromProduct({ message: options.message, find: [`MAX WIND GUSTS SURFACE /KNOTS/`], removal: [`%`, `<`, `:`] })) != null ? _W : null,
-      max_tops_x100feet: (_X = getTextFromProduct({ message: options.message, find: [`MAX TOPS /X 100 FEET/`], removal: [`%`, `<`, `:`] })) != null ? _X : null,
-      pds_watch: getTextFromProduct({ message: options.message, find: [`PARTICULARLY DANGEROUS SITUATION`], removal: [`%`, `<`, `:`] }) === `YES` ? true : null
+      additional_tornadoes_probability: (_P = GetTextFromProduct({ message: options.message, find: [`PROB OF 2 OR MORE TORNADOES`], removal: [`%`, `<`, `:`] })) != null ? _P : null,
+      strong_tornadoes_probability: (_Q = GetTextFromProduct({ message: options.message, find: [`PROB OF 1 OR MORE STRONG /EF2-EF5/ TORNADOES`], removal: [`%`, `<`, `:`] })) != null ? _Q : null,
+      severe_wind_probability: (_R = GetTextFromProduct({ message: options.message, find: [`PROB OF 10 OR MORE SEVERE WIND EVENTS`], removal: [`%`, `<`, `:`] })) != null ? _R : null,
+      severe_hail_probability: (_S = GetTextFromProduct({ message: options.message, find: [`PROB OF 10 OR MORE SEVERE HAIL EVENTS`], removal: [`%`, `<`, `:`] })) != null ? _S : null,
+      hail_2in_probability: (_T = GetTextFromProduct({ message: options.message, find: [`PROB OF 1 OR MORE HAIL EVENTS >= 2 INCHES`], removal: [`%`, `<`, `:`] })) != null ? _T : null,
+      combined_hail_wind_probability: (_U = GetTextFromProduct({ message: options.message, find: [`PROB OF 6 OR MORE COMBINED SEVERE HAIL/WIND EVENTS`], removal: [`%`, `<`, `:`] })) != null ? _U : null,
+      max_hail_in: (_V = GetTextFromProduct({ message: options.message, find: [`MAX HAIL /INCHES/`], removal: [`%`, `<`, `:`] })) != null ? _V : null,
+      max_wind_surface: (_W = GetTextFromProduct({ message: options.message, find: [`MAX WIND GUSTS SURFACE /KNOTS/`], removal: [`%`, `<`, `:`] })) != null ? _W : null,
+      max_tops_x100feet: (_X = GetTextFromProduct({ message: options.message, find: [`MAX TOPS /X 100 FEET/`], removal: [`%`, `<`, `:`] })) != null ? _X : null,
+      pds_watch: GetTextFromProduct({ message: options.message, find: [`PARTICULARLY DANGEROUS SITUATION`], removal: [`%`, `<`, `:`] }) === `YES` ? true : null
     }
   };
-  if (isNaN(Number(properties2.watch_parameters.watch_number))) {
-    properties2.watch_parameters.watch_number = null;
+  if (isNaN(Number(properties.watch_parameters.watch_number))) {
+    properties.watch_parameters.watch_number = null;
   }
-  return properties2;
+  return properties;
 };
 
-// src/@building/building.headers.ts
-var getEventHeader = (options) => {
+// src/@building/GetEventHeader.ts
+var GetEventHeader = (options) => {
   var _a, _b, _c;
-  const properties2 = options.properties;
-  const vtec2 = (_a = options.vtec) != null ? _a : null;
-  const ugc2 = properties2.geocode.ugc != null ? properties2.geocode.ugc.join(`-`) : `0`;
-  return `ZCZC-ATMOSX-${options.getType.prefix}-${ugc2}-${(_b = vtec2 == null ? void 0 : vtec2.status) != null ? _b : `Issued`}-${(/* @__PURE__ */ new Date()).toISOString().replace(/[-:]/g, "").split(".")[0]}-${(_c = properties2.geocode.office.office) != null ? _c : `KWNS`}`;
+  const properties = options.properties;
+  const vtec = (_a = options.vtec) != null ? _a : null;
+  const ugc = properties.geocode.ugc != null ? properties.geocode.ugc.join(`-`) : `0`;
+  return `ZCZC-ATMOSX-${options.getType.prefix}-${ugc}-${(_b = vtec == null ? void 0 : vtec.status) != null ? _b : `Issued`}-${(/* @__PURE__ */ new Date()).toISOString().replace(/[-:]/g, "").split(".")[0]}-${(_c = properties.geocode.office.office) != null ? _c : `KWNS`}`;
 };
 
-// src/@building/building.tracking.ts
-var getEventTracking = (options) => {
+// src/@building/GetEventTracking.ts
+var GetEventTracking = (options) => {
   var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
-  const properties2 = options.properties;
+  const properties = options.properties;
   const attributes = options.attributes;
   const stanza = options.stanza;
-  const vtec2 = options.vtec;
+  const vtec = options.vtec;
   if (options.type === `RAW`) {
-    const getWatchNumber = (_a = properties2.watch_parameters.watch_number) != null ? _a : null;
+    const getWatchNumber = (_a = properties.watch_parameters.watch_number) != null ? _a : null;
     if (getWatchNumber) {
-      return `${properties2.geocode.office.office}.${stanza.getType.prefix}.A.${getWatchNumber}`;
+      return `${properties.geocode.office.office}.${stanza.getType.prefix}.A.${getWatchNumber}`;
     }
-    return `${properties2.geocode.office.office}.${attributes.ttaaii}.${(_b = attributes.id.slice(-4).replace(`.`, ``)) != null ? _b : "0"}`;
+    return `${properties.geocode.office.office}.${attributes.ttaaii}.${(_b = attributes.id.slice(-4).replace(`.`, ``)) != null ? _b : "0"}`;
   }
   if (options.type === `VTEC`) {
-    return vtec2.tracking;
+    return vtec.tracking;
   }
   if (options.type === `API`) {
     if (options.vtec) {
@@ -5202,37 +5286,39 @@ var getEventTracking = (options) => {
   }
 };
 
-// src/@modules/@utilities/utilities.setDebug.ts
-var setDebug = (options) => {
-  var _a, _b, _c, _d;
+// src/@modules/@utilities/SetDebug.ts
+var SetDebug = (options) => {
+  var _a, _b;
   const settings = bootstrap.settings;
   bootstrap.listener.emit(`debug`, {
     message: options.message,
-    parent: (_b = (_a = options == null ? void 0 : options.title) == null ? void 0 : _a.split(`.`)[0]) == null ? void 0 : _b.replace(`@`, ``),
-    function: (_c = options == null ? void 0 : options.title) == null ? void 0 : _c.split(`.`)[1]
+    function: (_a = options.title) != null ? _a : `debug`
   });
   if (settings.EnableDebugging) {
-    console.log(`[${bootstrap.ansi_colors.BLUE}${(_d = options.title) != null ? _d : `debug`}${bootstrap.ansi_colors.RESET}] ${options.message}`);
+    console.log(`[${bootstrap.ansi_colors.BLUE}${(_b = options.title) != null ? _b : `debug`}${bootstrap.ansi_colors.RESET}] ${options.message}`);
   }
 };
 
-// src/@events/events.text.ts
-var text = (stanza) => __async(null, null, function* () {
+// src/@events/ParseText.ts
+var ParseText = (stanza) => __async(null, null, function* () {
   var _a, _b, _c, _d, _e;
   const getMessages = (_c = (_b = (_a = stanza == null ? void 0 : stanza.message) == null ? void 0 : _a.split(/(?=\$\$)/g)) == null ? void 0 : _b.map((message) => message.trim())) == null ? void 0 : _c.filter((message) => message && message !== "$$");
   if (!getMessages || (getMessages == null ? void 0 : getMessages.length) == 0) return;
   for (const message of getMessages) {
     const tick = performance.now();
     const attributes = stanza == null ? void 0 : stanza.attributes;
-    const props = properties({ message, attributes });
-    const header = getEventHeader({ properties: props, getType: stanza.getType });
+    const props = GetEventProperties({ message, attributes });
+    const header = GetEventHeader({ properties: props, getType: stanza.getType });
     const issued = new Date(attributes.issue);
     const expires = new Date(issued.getTime() + 12 * 60 * 60 * 1e3);
-    const matches = (_d = dict_matches[stanza.getType.prefix]) == null ? void 0 : _d.find((match) => match.match.test(message.toUpperCase()));
+    const matches = (_d = EnumMatches[stanza.getType.prefix]) == null ? void 0 : _d.find((match) => match.match.test(message.toUpperCase()));
     let event = matches == null ? void 0 : matches.label;
     let isStatement = (_e = matches == null ? void 0 : matches.statement) != null ? _e : false;
     if (!event) {
-      event = stanza.getType.type.split(`-`).map((word) => word.charAt(0).toUpperCase() + word.slice(1).toLowerCase()).join(` `);
+      event = stanza.getType.type;
+      if (!stanza.getType.discovered) {
+        event += ` (AWIPSID)`;
+      }
       isStatement = true;
     }
     bootstrap.cache.processed.push({
@@ -5251,7 +5337,7 @@ var text = (stanza) => __async(null, null, function* () {
         metadata: {
           ms: performance.now() - tick,
           source: `events.text`,
-          tracking: getEventTracking({ type: `RAW`, stanza, attributes, properties: props }),
+          tracking: GetEventTracking({ type: `RAW`, stanza, attributes, properties: props }),
           header,
           vtec: null,
           hvtec: null,
@@ -5266,20 +5352,20 @@ var text = (stanza) => __async(null, null, function* () {
         }
       })
     });
-    setDebug({ title: `@events.text`, message: `Event process took ${performance.now() - tick} ms` });
+    SetDebug({ title: `ParseText`, message: `${Math.round(performance.now() - tick)}ms` });
   }
 });
 
-// src/@parsers/@ugc/ugc.header.ts
+// src/@parsers/@ugc/GetUGCHeader.ts
 var getUGCHeader = (message) => {
-  const start = message.search(dict_expressions.ugc1);
+  const start = message.search(EnumExpressions.ugc1);
   const sub = message.substring(start);
-  const end = sub.search(dict_expressions.ugc2);
+  const end = sub.search(EnumExpressions.ugc2);
   const fin = sub.substring(0, end).replace(/\s+/g, "").slice(0, -1);
   return fin != null ? fin : null;
 };
 
-// src/@parsers/@ugc/ugc.zones.ts
+// src/@parsers/@ugc/GetZones.ts
 var getZones = (header) => {
   const splits = header.split("-");
   const zones = [];
@@ -5314,8 +5400,8 @@ var getZones = (header) => {
   return zones.filter((item) => item !== "");
 };
 
-// src/@parsers/@ugc/ugc.expiry.ts
-var getExpiry = (message) => {
+// src/@parsers/@ugc/GetExpiry.ts
+var GetExpiry = (message) => {
   const match = message.match(/\b(\d{6})-/);
   if (!match) {
     return null;
@@ -5329,12 +5415,12 @@ var getExpiry = (message) => {
   return expires.toISOString();
 };
 
-// src/@parsers/@ugc/ugc.getCache.ts
+// src/@parsers/@ugc/GetCache.ts
 var getCache = (key) => {
   return bootstrap.cache.ugc.get(key);
 };
 
-// src/@parsers/@ugc/ugc.setCache.ts
+// src/@parsers/@ugc/SetCache.ts
 var setCache = (key, value) => {
   if (bootstrap.cache.ugc.size >= 5e3) {
     const firstKey = bootstrap.cache.ugc.keys().next().value;
@@ -5343,7 +5429,7 @@ var setCache = (key, value) => {
   bootstrap.cache.ugc.set(key, value);
 };
 
-// src/@parsers/@ugc/ugc.locations.ts
+// src/@parsers/@ugc/GetLocations.ts
 var getLocations = (zones) => __async(null, null, function* () {
   const uniqueZones = Array.from(new Set(zones));
   const results = [];
@@ -5372,11 +5458,11 @@ var getLocations = (zones) => __async(null, null, function* () {
   return results;
 });
 
-// src/@parsers/@ugc/ugc.extract.ts
+// src/@parsers/@ugc/UGCExtract.ts
 var ugcExtract = (message) => __async(null, null, function* () {
   const head = getUGCHeader(message);
   const ugcs = getZones(head);
-  const expires = getExpiry(message);
+  const expires = GetExpiry(message);
   const areas = yield getLocations(ugcs);
   if (!head || (ugcs == null ? void 0 : ugcs.length) == 0) return;
   return {
@@ -5386,25 +5472,28 @@ var ugcExtract = (message) => __async(null, null, function* () {
   };
 });
 
-// src/@events/events.ugc.ts
-var ugc = (stanza) => __async(null, null, function* () {
+// src/@events/ParseUGC.ts
+var ParseUGC = (stanza) => __async(null, null, function* () {
   var _a, _b, _c, _d, _e;
   const getMessages = (_c = (_b = (_a = stanza == null ? void 0 : stanza.message) == null ? void 0 : _a.split(/(?=\$\$)/g)) == null ? void 0 : _b.map((message) => message.trim())) == null ? void 0 : _c.filter((message) => message && message !== "$$");
   if (!getMessages || (getMessages == null ? void 0 : getMessages.length) == 0) return;
   for (const message of getMessages) {
     const tick = performance.now();
     const attributes = stanza == null ? void 0 : stanza.attributes;
-    const ugc2 = yield ugcExtract(message);
-    if (ugc2 != null) {
-      const props = properties({ message, attributes, ugc: ugc2 });
+    const ugc = yield ugcExtract(message);
+    if (ugc != null) {
+      const props = GetEventProperties({ message, attributes, ugc });
       const issued = new Date(attributes.issue);
-      const expires = new Date(ugc2.expires);
-      const header = getEventHeader({ properties: props, getType: stanza.getType });
-      const matches = (_d = dict_matches[stanza.getType.prefix]) == null ? void 0 : _d.find((match) => match.match.test(message.toUpperCase()));
+      const expires = new Date(ugc.expires);
+      const header = GetEventHeader({ properties: props, getType: stanza.getType });
+      const matches = (_d = EnumMatches[stanza.getType.prefix]) == null ? void 0 : _d.find((match) => match.match.test(message.toUpperCase()));
       let event = matches == null ? void 0 : matches.label;
       let isStatement = (_e = matches == null ? void 0 : matches.statement) != null ? _e : false;
       if (!event) {
-        event = stanza.getType.type.split(`-`).map((word) => word.charAt(0).toUpperCase() + word.slice(1).toLowerCase()).join(` `);
+        event = stanza.getType.type;
+        if (!stanza.getType.discovered) {
+          event += ` (AWIPSID)`;
+        }
         isStatement = true;
       }
       bootstrap.cache.processed.push({
@@ -5423,7 +5512,7 @@ var ugc = (stanza) => __async(null, null, function* () {
           metadata: {
             ms: performance.now() - tick,
             source: `events.ugc`,
-            tracking: getEventTracking({ type: `RAW`, stanza, attributes, properties: props }),
+            tracking: GetEventTracking({ type: `RAW`, stanza, attributes, properties: props }),
             header,
             vtec: null,
             hvtec: null,
@@ -5438,21 +5527,21 @@ var ugc = (stanza) => __async(null, null, function* () {
           }
         })
       });
-      setDebug({ title: `@events.ugc`, message: `Event process took ${performance.now() - tick} ms` });
+      SetDebug({ title: `ParseUGC`, message: `${Math.round(performance.now() - tick)}ms` });
     }
   }
 });
 
-// src/@dictionaries/dictionaries.products.ts
-var dict_products = {
+// src/@enums/Products.ts
+var EnumProducts = {
   "O": "Operational Product",
   "T": "Test Product",
   "E": "Experimental Product",
   "X": "Experimental Product (Non-Operational)"
 };
 
-// src/@dictionaries/dictionaries.events.ts
-var dict_events = {
+// src/@enums/Events.ts
+var EnumEvents = {
   "AF": "Ashfall",
   "AS": "Air Stagnation",
   "BH": "Beach Hazard",
@@ -5516,8 +5605,8 @@ var dict_events = {
   "ZY": "Freezing Spray"
 };
 
-// src/@dictionaries/dictionaries.actions.ts
-var dict_actions = {
+// src/@enums/Actions.ts
+var EnumActions = {
   "W": "Warning",
   "F": "Forecast",
   "A": "Watch",
@@ -5527,8 +5616,8 @@ var dict_actions = {
   "S": "Statement"
 };
 
-// src/@dictionaries/dictionaries.status.ts
-var dict_status = {
+// src/@enums/Status.ts
+var EnumStatus = {
   "NEW": "Issued",
   "CON": "Updated",
   "EXT": "Extended",
@@ -5541,8 +5630,8 @@ var dict_status = {
   "EXP": "Expired"
 };
 
-// src/@parsers/@pvtec/pvtec.expires.ts
-var getExpiry2 = (dates) => {
+// src/@parsers/@pvtec/GetExpiry.ts
+var GetExpiry2 = (dates) => {
   if ((dates == null ? void 0 : dates[1]) == `000000T0000Z`) return "Invalid Date Format";
   const expires = `${(/* @__PURE__ */ new Date()).getFullYear().toString().substring(0, 2)}${dates[1].substring(0, 2)}-${dates[1].substring(2, 4)}-${dates[1].substring(4, 6)}T${dates[1].substring(7, 9)}:${dates[1].substring(9, 11)}:00`;
   const local = new Date(new Date(expires).getTime() - 4 * 60 * 6e4);
@@ -5550,24 +5639,24 @@ var getExpiry2 = (dates) => {
   return `${local.getFullYear()}-${pad(local.getMonth() + 1)}-${pad(local.getDate())}T${pad(local.getHours())}:${pad(local.getMinutes())}:00.000-04:00`;
 };
 
-// src/@parsers/@pvtec/pvtec.extract.ts
-var pvExtract = (message) => {
+// src/@parsers/@pvtec/VTECExtract.ts
+var VTECExtract = (message) => {
   var _a, _b, _c, _d;
   if (!message) return null;
-  const getVTECs = (_a = message.match(dict_expressions.pvtec)) != null ? _a : [];
+  const getVTECs = (_a = message.match(EnumExpressions.pvtec)) != null ? _a : [];
   const vtecs = [];
-  for (const vtec2 of getVTECs) {
-    const sub = vtec2.split(`.`);
+  for (const vtec of getVTECs) {
+    const sub = vtec.split(`.`);
     if ((sub == null ? void 0 : sub.length) < 7) continue;
     const dates = (_b = sub[6]) == null ? void 0 : _b.split(`-`);
     vtecs.push({
-      vtec: vtec2,
-      product: dict_products[sub[0]],
+      vtec,
+      product: EnumProducts[sub[0]],
       tracking: `${sub[2]}.${sub[3]}.${sub[4]}.${sub[5]}`,
-      event: `${dict_events[sub[3]]} ${dict_actions[sub[4]]}`,
-      status: dict_status[sub[1]],
-      organization: (_d = (_c = message.match(dict_expressions.wmo)) == null ? void 0 : _c[0]) != null ? _d : null,
-      expires: getExpiry2(dates),
+      event: `${EnumEvents[sub[3]]} ${EnumActions[sub[4]]}`,
+      status: EnumStatus[sub[1]],
+      organization: (_d = (_c = message.match(EnumExpressions.wmo)) == null ? void 0 : _c[0]) != null ? _d : null,
+      expires: GetExpiry2(dates),
       is_watch: (sub[4] == `A` || sub[4] == `Y`) && (sub[3] == `TO` || sub[3] == `SV`),
       prediction_center: sub[2] == `KWNS` ? true : false
     });
@@ -5575,8 +5664,8 @@ var pvExtract = (message) => {
   return vtecs.length > 0 ? vtecs : null;
 };
 
-// src/@dictionaries/dictionaries.causes.ts
-var dict_causes = {
+// src/@enums/Causes.ts
+var EnumCauses = {
   "SM": "Snow Melt",
   "RS": "Rain/Snow Melt",
   "ER": "Excessive Rain",
@@ -5594,16 +5683,16 @@ var dict_causes = {
   "OT": "Other Effects"
 };
 
-// src/@dictionaries/dictionaries.records.ts
-var dict_records = {
+// src/@enums/Records.ts
+var EnumRecords = {
   "NO": "No Record Expected",
   "NR": "Near Record or possible record",
   "UU": "Unknown history of records",
   "OO": "Other"
 };
 
-// src/@dictionaries/dictionaries.severity.ts
-var dict_severity = {
+// src/@enums/Severity.ts
+var EnumSeverity = {
   N: "Not Expected",
   0: "Areal Flood or FF Product",
   1: "Minor",
@@ -5612,42 +5701,42 @@ var dict_severity = {
   U: "Unknown"
 };
 
-// src/@parsers/@hvtec/hvtec.extract.ts
-var hvExtract = (message) => {
+// src/@parsers/@hvtec/HVExtract.ts
+var HVExtract = (message) => {
   var _a;
-  const getHVTECs = (_a = message.match(dict_expressions.hvtec)) != null ? _a : [];
+  const getHVTECs = (_a = message.match(EnumExpressions.hvtec)) != null ? _a : [];
   const vtecs = [];
-  for (const vtec2 of getHVTECs) {
-    const sub = vtec2.split(`.`);
+  for (const vtec of getHVTECs) {
+    const sub = vtec.split(`.`);
     if (sub.length < 7) continue;
     vtecs.push({
-      hvtec: vtec2,
-      severity: dict_severity[sub[1]],
-      cause: dict_causes[sub[2]],
-      record: dict_records[sub[6]]
+      hvtec: vtec,
+      severity: EnumSeverity[sub[1]],
+      cause: EnumCauses[sub[2]],
+      record: EnumRecords[sub[6]]
     });
   }
   return vtecs.length > 0 ? vtecs : null;
 };
 
-// src/@events/events.vtec.ts
-var vtec = (stanza) => __async(null, null, function* () {
+// src/@events/ParseVTEC.ts
+var ParseVTEC = (stanza) => __async(null, null, function* () {
   var _a, _b, _c, _d, _e;
   const getMessages = (_c = (_b = (_a = stanza == null ? void 0 : stanza.message) == null ? void 0 : _a.split(/(?=\$\$)/g)) == null ? void 0 : _b.map((message) => message.trim())) == null ? void 0 : _c.filter((message) => message && message !== "$$");
   if (!getMessages || (getMessages == null ? void 0 : getMessages.length) == 0) return;
   for (const message of getMessages) {
     const tick = performance.now();
     const attributes = stanza == null ? void 0 : stanza.attributes;
-    const pVtec = pvExtract(message);
-    const hVtec = hvExtract(message);
-    const ugc2 = yield ugcExtract(message);
-    if (pVtec != null && ugc2 != null) {
+    const pVtec = VTECExtract(message);
+    const hVtec = HVExtract(message);
+    const ugc = yield ugcExtract(message);
+    if (pVtec != null && ugc != null) {
       for (const pv of pVtec) {
-        const vtec2 = pv;
-        const props = properties({ message, attributes, ugc: ugc2, pVtec: vtec2 });
-        const header = getEventHeader({ properties: props, getType: stanza.getType, vtec: vtec2 });
+        const vtec = pv;
+        const props = GetEventProperties({ message, attributes, ugc, pVtec: vtec });
+        const header = GetEventHeader({ properties: props, getType: stanza.getType, vtec });
         const issued = (_d = new Date(attributes.issue)) != null ? _d : /* @__PURE__ */ new Date();
-        const expires = new Date(vtec2.expires);
+        const expires = new Date(vtec.expires);
         bootstrap.cache.processed.push({
           type: `Feature`,
           geometry: {
@@ -5659,12 +5748,12 @@ var vtec = (stanza) => __async(null, null, function* () {
             parent: pv.event,
             status: pv.status,
             issued: !isNaN(issued.getTime()) ? issued.toISOString() : (/* @__PURE__ */ new Date()).toISOString(),
-            expires: !isNaN(expires.getTime()) ? expires.toISOString() : (_e = ugc2.expires) != null ? _e : new Date(issued.getTime() + 60 * 60 * 1e3).toISOString()
+            expires: !isNaN(expires.getTime()) ? expires.toISOString() : (_e = ugc.expires) != null ? _e : new Date(issued.getTime() + 60 * 60 * 1e3).toISOString()
           }, props), {
             metadata: {
               ms: performance.now() - tick,
               source: `events.vtec`,
-              tracking: getEventTracking({ type: `VTEC`, stanza, attributes, properties: props, vtec: vtec2 }),
+              tracking: GetEventTracking({ type: `VTEC`, stanza, attributes, properties: props, vtec }),
               header,
               vtec: pv,
               hvtec: hVtec,
@@ -5679,19 +5768,19 @@ var vtec = (stanza) => __async(null, null, function* () {
             }
           })
         });
-        setDebug({ title: `@events.vtec`, message: `Event process took ${performance.now() - tick} ms` });
+        SetDebug({ title: `ParseVTEC`, message: `${Math.round(performance.now() - tick)}ms` });
       }
     }
   }
 });
 
-// src/@events/events.api.ts
-var api = (stanza) => __async(null, null, function* () {
+// src/@events/ParseAPI.ts
+var ParseAPI = (stanza) => __async(null, 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, _da, _ea, _fa, _ga, _ha, _ia, _ja, _ka, _la, _ma, _na, _oa, _pa, _qa, _ra, _sa, _ta, _ua, _va, _wa, _xa, _ya, _za, _Aa, _Ba, _Ca, _Da, _Ea, _Fa, _Ga, _Ha, _Ia, _Ja, _Ka, _La, _Ma, _Na, _Oa, _Pa, _Qa, _Ra, _Sa, _Ta, _Ua, _Va, _Wa, _Xa, _Ya, _Za, __a, _$a, _ab, _bb, _cb, _db, _eb, _fb, _gb, _hb, _ib, _jb, _kb, _lb, _mb, _nb, _ob, _pb, _qb, _rb, _sb, _tb, _ub;
   const messages = Object.values(JSON.parse(stanza.message).features);
   for (const feature of messages) {
     const tick = performance.now();
-    const pVtec = (_d = pvExtract((_c = (_b = (_a = feature == null ? void 0 : feature.properties) == null ? void 0 : _a.parameters) == null ? void 0 : _b.VTEC) == null ? void 0 : _c[0])) != null ? _d : null;
+    const pVtec = (_d = VTECExtract((_c = (_b = (_a = feature == null ? void 0 : feature.properties) == null ? void 0 : _a.parameters) == null ? void 0 : _b.VTEC) == null ? void 0 : _c[0])) != null ? _d : null;
     bootstrap.cache.processed.push({
       type: `Feature`,
       geometry: {
@@ -5711,7 +5800,7 @@ var api = (stanza) => __async(null, null, function* () {
         geocode: {
           office: {
             office: pVtec ? (_w = pVtec == null ? void 0 : pVtec[0]) == null ? void 0 : _w.tracking.split(`.`)[0] : null,
-            name: (_y = dict_icao[pVtec ? (_x = pVtec == null ? void 0 : pVtec[0]) == null ? void 0 : _x.tracking.split(`.`)[0] : null]) != null ? _y : null
+            name: (_y = EnumICAO[pVtec ? (_x = pVtec == null ? void 0 : pVtec[0]) == null ? void 0 : _x.tracking.split(`.`)[0] : null]) != null ? _y : null
           },
           organization: (_B = (_A = (_z = feature == null ? void 0 : feature.properties) == null ? void 0 : _z.parameters) == null ? void 0 : _A.WMOidentifier) == null ? void 0 : _B[0],
           ugc: (_E = (_D = (_C = feature == null ? void 0 : feature.properties) == null ? void 0 : _C.geocode) == null ? void 0 : _D.UGC) != null ? _E : [],
@@ -5719,11 +5808,11 @@ var api = (stanza) => __async(null, null, function* () {
           polygon_generated: ((_H = feature == null ? void 0 : feature.geometry) == null ? void 0 : _H.coordinates.length) > 0 ? true : false
         },
         parameters: {
-          tags: getEventTags((_I = feature == null ? void 0 : feature.properties) == null ? void 0 : _I.description),
+          tags: GetEventTags((_I = feature == null ? void 0 : feature.properties) == null ? void 0 : _I.description),
           instructions: (_K = (_J = feature == null ? void 0 : feature.properties) == null ? void 0 : _J.instruction) != null ? _K : null,
-          source: (_M = getTextFromProduct({ message: (_L = feature == null ? void 0 : feature.properties) == null ? void 0 : _L.description, find: [`SOURCE...`], removal: [`.`] })) != null ? _M : null,
-          hazards: (_O = getTextFromProduct({ message: (_N = feature == null ? void 0 : feature.properties) == null ? void 0 : _N.description, find: [`HAZARD...`], removal: [`.`] })) != null ? _O : null,
-          impacts: (_Q = getTextFromProduct({ message: (_P = feature == null ? void 0 : feature.properties) == null ? void 0 : _P.description, find: [`IMPACT...`], removal: [`.`] })) != null ? _Q : null,
+          source: (_M = GetTextFromProduct({ message: (_L = feature == null ? void 0 : feature.properties) == null ? void 0 : _L.description, find: [`SOURCE...`], removal: [`.`] })) != null ? _M : null,
+          hazards: (_O = GetTextFromProduct({ message: (_N = feature == null ? void 0 : feature.properties) == null ? void 0 : _N.description, find: [`HAZARD...`], removal: [`.`] })) != null ? _O : null,
+          impacts: (_Q = GetTextFromProduct({ message: (_P = feature == null ? void 0 : feature.properties) == null ? void 0 : _P.description, find: [`IMPACT...`], removal: [`.`] })) != null ? _Q : null,
           estimated_hail_size: (_U = (_T = (_S = (_R = feature == null ? void 0 : feature.properties) == null ? void 0 : _R.parameters) == null ? void 0 : _S.maxHailSize) == null ? void 0 : _T[0]) != null ? _U : null,
           estimated_wind_gusts: (_Y = (_X = (_W = (_V = feature == null ? void 0 : feature.properties) == null ? void 0 : _V.parameters) == null ? void 0 : _W.maxWindGust) == null ? void 0 : _X[0]) != null ? _Y : null,
           damage_threat: (_aa = (_$ = (__ = (_Z = feature == null ? void 0 : feature.properties) == null ? void 0 : _Z.parameters) == null ? void 0 : __.thunderstormDamageThreat) == null ? void 0 : _$[0]) != null ? _aa : null,
@@ -5733,31 +5822,31 @@ var api = (stanza) => __async(null, null, function* () {
           hail_threat: (_qa = (_pa = (_oa = (_na = feature == null ? void 0 : feature.properties) == null ? void 0 : _na.parameters) == null ? void 0 : _oa.hailThreat) == null ? void 0 : _pa[0]) != null ? _qa : null
         },
         discussion_parameters: {
-          discussion_number: (_ua = (_ta = (_sa = getTextFromProduct({ message: (_ra = feature == null ? void 0 : feature.properties) == null ? void 0 : _ra.description, find: [`Mesoscale Discussion `], removal: [`Mesoscale Discussion`, `Number`, `...`] })) == null ? void 0 : _sa.toString()) == null ? void 0 : _ta.padStart(4, "0")) != null ? _ua : null,
-          discussion_concerning: (_wa = getTextFromProduct({ message: (_va = feature == null ? void 0 : feature.properties) == null ? void 0 : _va.description, find: [`Concerning...`] })) != null ? _wa : null,
-          discussion_max_tornado: (_ya = getTextFromProduct({ message: (_xa = feature == null ? void 0 : feature.properties) == null ? void 0 : _xa.description, find: [`MOST PROBABLE PEAK TORNADO INTENSITY...`] })) != null ? _ya : null,
-          discussion_max_hail: (_Aa = getTextFromProduct({ message: (_za = feature == null ? void 0 : feature.properties) == null ? void 0 : _za.description, find: [`MOST PROBABLE PEAK HAIL SIZE...`] })) != null ? _Aa : null,
-          discussion_max_wind: (_Ca = getTextFromProduct({ message: (_Ba = feature == null ? void 0 : feature.properties) == null ? void 0 : _Ba.description, find: [`MOST PROBABLE PEAK WIND GUST...`] })) != null ? _Ca : null,
-          discussion_watch_issuance: (_Ea = getTextFromProduct({ message: (_Da = feature == null ? void 0 : feature.properties) == null ? void 0 : _Da.description, find: [`Probability of Watch Issuance...`], removal: [`percent`] })) != null ? _Ea : null
+          discussion_number: (_ua = (_ta = (_sa = GetTextFromProduct({ message: (_ra = feature == null ? void 0 : feature.properties) == null ? void 0 : _ra.description, find: [`Mesoscale Discussion `], removal: [`Mesoscale Discussion`, `Number`, `...`] })) == null ? void 0 : _sa.toString()) == null ? void 0 : _ta.padStart(4, "0")) != null ? _ua : null,
+          discussion_concerning: (_wa = GetTextFromProduct({ message: (_va = feature == null ? void 0 : feature.properties) == null ? void 0 : _va.description, find: [`Concerning...`] })) != null ? _wa : null,
+          discussion_max_tornado: (_ya = GetTextFromProduct({ message: (_xa = feature == null ? void 0 : feature.properties) == null ? void 0 : _xa.description, find: [`MOST PROBABLE PEAK TORNADO INTENSITY...`] })) != null ? _ya : null,
+          discussion_max_hail: (_Aa = GetTextFromProduct({ message: (_za = feature == null ? void 0 : feature.properties) == null ? void 0 : _za.description, find: [`MOST PROBABLE PEAK HAIL SIZE...`] })) != null ? _Aa : null,
+          discussion_max_wind: (_Ca = GetTextFromProduct({ message: (_Ba = feature == null ? void 0 : feature.properties) == null ? void 0 : _Ba.description, find: [`MOST PROBABLE PEAK WIND GUST...`] })) != null ? _Ca : null,
+          discussion_watch_issuance: (_Ea = GetTextFromProduct({ message: (_Da = feature == null ? void 0 : feature.properties) == null ? void 0 : _Da.description, find: [`Probability of Watch Issuance...`], removal: [`percent`] })) != null ? _Ea : null
         },
         watch_parameters: {
-          watch_number: ((_Fa = pVtec == null ? void 0 : pVtec[0]) == null ? void 0 : _Fa.is_watch) && ((_Qa = (_Pa = (_Ka = (_Ja = (_Ia = (_Ha = getTextFromProduct({ message: (_Ga = feature == null ? void 0 : feature.properties) == null ? void 0 : _Ga.description, find: [`ITIES FOR`, `UPDATE FOR`, `Watch Number `], removal: [`%`, `<`, `:`] })) == null ? void 0 : _Ha.replace(/(WT|WS|)/g, "")) == null ? void 0 : _Ia.trim()) == null ? void 0 : _Ja.toString()) == null ? void 0 : _Ka.padStart(4, "0")) != null ? _Pa : (_Oa = (_Na = (_Ma = (_La = pVtec == null ? void 0 : pVtec[0]) == null ? void 0 : _La.tracking) == null ? void 0 : _Ma.slice(-4)) == null ? void 0 : _Na.toString()) == null ? void 0 : _Oa.padStart(4, "0")) != null ? _Qa : null),
+          watch_number: ((_Fa = pVtec == null ? void 0 : pVtec[0]) == null ? void 0 : _Fa.is_watch) && ((_Qa = (_Pa = (_Ka = (_Ja = (_Ia = (_Ha = GetTextFromProduct({ message: (_Ga = feature == null ? void 0 : feature.properties) == null ? void 0 : _Ga.description, find: [`ITIES FOR`, `UPDATE FOR`, `Watch Number `], removal: [`%`, `<`, `:`] })) == null ? void 0 : _Ha.replace(/(WT|WS|)/g, "")) == null ? void 0 : _Ia.trim()) == null ? void 0 : _Ja.toString()) == null ? void 0 : _Ka.padStart(4, "0")) != null ? _Pa : (_Oa = (_Na = (_Ma = (_La = pVtec == null ? void 0 : pVtec[0]) == null ? void 0 : _La.tracking) == null ? void 0 : _Ma.slice(-4)) == null ? void 0 : _Na.toString()) == null ? void 0 : _Oa.padStart(4, "0")) != null ? _Qa : null),
           watch_type: ((_Ra = feature == null ? void 0 : feature.properties) == null ? void 0 : _Ra.description.includes(`TORNADO WATCH`)) ? `Tornado` : ((_Sa = feature == null ? void 0 : feature.properties) == null ? void 0 : _Sa.description.includes(`SEVERE`)) ? `Severe` : null,
-          additional_tornadoes_probability: (_Ua = getTextFromProduct({ message: (_Ta = feature == null ? void 0 : feature.properties) == null ? void 0 : _Ta.description, find: [`PROB OF 2 OR MORE TORNADOES`], removal: [`%`, `<`, `:`] })) != null ? _Ua : null,
-          strong_tornadoes_probability: (_Wa = getTextFromProduct({ message: (_Va = feature == null ? void 0 : feature.properties) == null ? void 0 : _Va.description, find: [`PROB OF 1 OR MORE STRONG /EF2-EF5/ TORNADOES`], removal: [`%`, `<`, `:`] })) != null ? _Wa : null,
-          severe_wind_probability: (_Ya = getTextFromProduct({ message: (_Xa = feature == null ? void 0 : feature.properties) == null ? void 0 : _Xa.description, find: [`PROB OF 10 OR MORE SEVERE WIND EVENTS`], removal: [`%`, `<`, `:`] })) != null ? _Ya : null,
-          severe_hail_probability: (__a = getTextFromProduct({ message: (_Za = feature == null ? void 0 : feature.properties) == null ? void 0 : _Za.description, find: [`PROB OF 10 OR MORE SEVERE HAIL EVENTS`], removal: [`%`, `<`, `:`] })) != null ? __a : null,
-          hail_2in_probability: (_ab = getTextFromProduct({ message: (_$a = feature == null ? void 0 : feature.properties) == null ? void 0 : _$a.description, find: [`PROB OF 1 OR MORE HAIL EVENTS >= 2 INCHES`], removal: [`%`, `<`, `:`] })) != null ? _ab : null,
-          combined_hail_wind_probability: (_cb = getTextFromProduct({ message: (_bb = feature == null ? void 0 : feature.properties) == null ? void 0 : _bb.description, find: [`PROB OF 6 OR MORE COMBINED SEVERE HAIL/WIND EVENTS`], removal: [`%`, `<`, `:`] })) != null ? _cb : null,
-          max_hail_in: (_eb = getTextFromProduct({ message: (_db = feature == null ? void 0 : feature.properties) == null ? void 0 : _db.description, find: [`MAX HAIL /INCHES/`], removal: [`%`, `<`, `:`] })) != null ? _eb : null,
-          max_wind_surface: (_gb = getTextFromProduct({ message: (_fb = feature == null ? void 0 : feature.properties) == null ? void 0 : _fb.description, find: [`MAX WIND GUSTS SURFACE /KNOTS/`], removal: [`%`, `<`, `:`] })) != null ? _gb : null,
-          max_tops_x100feet: (_ib = getTextFromProduct({ message: (_hb = feature == null ? void 0 : feature.properties) == null ? void 0 : _hb.description, find: [`MAX TOPS /X 100 FEET/`], removal: [`%`, `<`, `:`] })) != null ? _ib : null,
-          pds_watch: getTextFromProduct({ message: (_jb = feature == null ? void 0 : feature.properties) == null ? void 0 : _jb.description, find: [`PARTICULARLY DANGEROUS SITUATION`], removal: [`%`, `<`, `:`] }) === `YES`
+          additional_tornadoes_probability: (_Ua = GetTextFromProduct({ message: (_Ta = feature == null ? void 0 : feature.properties) == null ? void 0 : _Ta.description, find: [`PROB OF 2 OR MORE TORNADOES`], removal: [`%`, `<`, `:`] })) != null ? _Ua : null,
+          strong_tornadoes_probability: (_Wa = GetTextFromProduct({ message: (_Va = feature == null ? void 0 : feature.properties) == null ? void 0 : _Va.description, find: [`PROB OF 1 OR MORE STRONG /EF2-EF5/ TORNADOES`], removal: [`%`, `<`, `:`] })) != null ? _Wa : null,
+          severe_wind_probability: (_Ya = GetTextFromProduct({ message: (_Xa = feature == null ? void 0 : feature.properties) == null ? void 0 : _Xa.description, find: [`PROB OF 10 OR MORE SEVERE WIND EVENTS`], removal: [`%`, `<`, `:`] })) != null ? _Ya : null,
+          severe_hail_probability: (__a = GetTextFromProduct({ message: (_Za = feature == null ? void 0 : feature.properties) == null ? void 0 : _Za.description, find: [`PROB OF 10 OR MORE SEVERE HAIL EVENTS`], removal: [`%`, `<`, `:`] })) != null ? __a : null,
+          hail_2in_probability: (_ab = GetTextFromProduct({ message: (_$a = feature == null ? void 0 : feature.properties) == null ? void 0 : _$a.description, find: [`PROB OF 1 OR MORE HAIL EVENTS >= 2 INCHES`], removal: [`%`, `<`, `:`] })) != null ? _ab : null,
+          combined_hail_wind_probability: (_cb = GetTextFromProduct({ message: (_bb = feature == null ? void 0 : feature.properties) == null ? void 0 : _bb.description, find: [`PROB OF 6 OR MORE COMBINED SEVERE HAIL/WIND EVENTS`], removal: [`%`, `<`, `:`] })) != null ? _cb : null,
+          max_hail_in: (_eb = GetTextFromProduct({ message: (_db = feature == null ? void 0 : feature.properties) == null ? void 0 : _db.description, find: [`MAX HAIL /INCHES/`], removal: [`%`, `<`, `:`] })) != null ? _eb : null,
+          max_wind_surface: (_gb = GetTextFromProduct({ message: (_fb = feature == null ? void 0 : feature.properties) == null ? void 0 : _fb.description, find: [`MAX WIND GUSTS SURFACE /KNOTS/`], removal: [`%`, `<`, `:`] })) != null ? _gb : null,
+          max_tops_x100feet: (_ib = GetTextFromProduct({ message: (_hb = feature == null ? void 0 : feature.properties) == null ? void 0 : _hb.description, find: [`MAX TOPS /X 100 FEET/`], removal: [`%`, `<`, `:`] })) != null ? _ib : null,
+          pds_watch: GetTextFromProduct({ message: (_jb = feature == null ? void 0 : feature.properties) == null ? void 0 : _jb.description, find: [`PARTICULARLY DANGEROUS SITUATION`], removal: [`%`, `<`, `:`] }) === `YES`
         },
         metadata: {
           ms: performance.now() - tick,
           source: `events.api`,
-          tracking: getEventTracking({ type: `API`, organization: { wmoidentifier: (_mb = (_lb = (_kb = feature == null ? void 0 : feature.properties) == null ? void 0 : _kb.parameters) == null ? void 0 : _lb.WMOidentifier) == null ? void 0 : _mb[0], featureId: feature == null ? void 0 : feature.id }, vtec: pVtec == null ? void 0 : pVtec[0] }),
+          tracking: GetEventTracking({ type: `API`, organization: { wmoidentifier: (_mb = (_lb = (_kb = feature == null ? void 0 : feature.properties) == null ? void 0 : _kb.parameters) == null ? void 0 : _lb.WMOidentifier) == null ? void 0 : _mb[0], featureId: feature == null ? void 0 : feature.id }, vtec: pVtec == null ? void 0 : pVtec[0] }),
           header: `ZCZC-ATMOSX-${(_ob = (_nb = feature == null ? void 0 : feature.properties) == null ? void 0 : _nb.parameters) == null ? void 0 : _ob.WMOidentifier}`,
           vtec: pVtec == null ? void 0 : pVtec[0],
           hvtec: null,
@@ -5772,12 +5861,12 @@ var api = (stanza) => __async(null, null, function* () {
         }
       }
     });
-    setDebug({ title: `@events.api`, message: `Event process took ${performance.now() - tick} ms` });
+    SetDebug({ title: `ParseAPI`, message: `${Math.round(performance.now() - tick)}ms` });
   }
 });
 
-// src/@dictionaries/dictionaries.enhanced.ts
-var dict_enhanced = {
+// src/@enums/Enhanced.ts
+var EnumEnhanced = {
   "Tornado Warning": {
     "Tornado Emergency": { description: "tornado emergency" },
     "PDS Tornado Warning": { description: "particularly dangerous situation", damage: `CONSIDERABLE` },
@@ -5815,22 +5904,21 @@ var dict_enhanced = {
     "Considerable Severe Thunderstorm Warning (TPROB)": { damage: `CONSIDERABLE`, tornado: `POSSIBLE` },
     "Considerable Severe Thunderstorm Warning": { damage: `CONSIDERABLE` },
     "Severe Thunderstorm Warning (TPROB)": { tornado: `POSSIBLE` }
+  },
+  "Special Weather Statement": {
+    "Convective Special Weather Statement": { description: "strong thunderstorm" }
   }
 };
 
-// src/@building/building.enhance.ts
-var getEventEnhancedName = (event) => {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
-  const configurations = bootstrap.settings;
+// src/@building/GetEventEnhancedName.ts
+var GetEventEnhancedName = (event) => {
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i;
   let name = (_a = event == null ? void 0 : event.properties) == null ? void 0 : _a.event;
-  if (!((_b = configurations == null ? void 0 : configurations.GlobalSettings) == null ? void 0 : _b.BetterEventNames)) {
-    return name;
-  }
-  const damage = (_d = (_c = event == null ? void 0 : event.properties) == null ? void 0 : _c.parameters) == null ? void 0 : _d.damage_threat;
-  const tornado = (_f = (_e = event == null ? void 0 : event.properties) == null ? void 0 : _e.parameters) == null ? void 0 : _f.tornado_threat;
-  const pdswatch = (_h = (_g = event == null ? void 0 : event.properties) == null ? void 0 : _g.watch_parameters) == null ? void 0 : _h.pds_watch;
-  const description = (_j = (_i = event == null ? void 0 : event.properties) == null ? void 0 : _i.description) == null ? void 0 : _j.toLowerCase();
-  for (const [eventKey, eventConfig] of Object.entries(dict_enhanced)) {
+  const damage = (_c = (_b = event == null ? void 0 : event.properties) == null ? void 0 : _b.parameters) == null ? void 0 : _c.damage_threat;
+  const tornado = (_e = (_d = event == null ? void 0 : event.properties) == null ? void 0 : _d.parameters) == null ? void 0 : _e.tornado_threat;
+  const pdswatch = (_g = (_f = event == null ? void 0 : event.properties) == null ? void 0 : _f.watch_parameters) == null ? void 0 : _g.pds_watch;
+  const description = (_i = (_h = event == null ? void 0 : event.properties) == null ? void 0 : _h.description) == null ? void 0 : _i.toLowerCase();
+  for (const [eventKey, eventConfig] of Object.entries(EnumEnhanced)) {
     if (eventKey !== name) continue;
     for (const [paramKey, paramValue] of Object.entries(eventConfig)) {
       let matches = true;
@@ -5855,8 +5943,8 @@ var getEventEnhancedName = (event) => {
   return name;
 };
 
-// src/@dictionaries/dictionaries.correlations.ts
-var dict_correlations = [
+// src/@enums/Correlations.ts
+var EnumCorrelations = [
   { type: "Statement", name: "Statement", isCancel: false, isUpdate: false, isIssued: true, isStatement: true },
   { type: "Update", name: "Updated", isCancel: false, isUpdate: true, isIssued: false, isStatement: false },
   { type: "Cancel", name: "Cancelled", isCancel: true, isUpdate: false, isIssued: false, isStatement: false },
@@ -5871,8 +5959,8 @@ var dict_correlations = [
   { type: "Routine", name: "Routine", isCancel: false, isUpdate: true, isIssued: false, isStatement: false }
 ];
 
-// src/@dictionaries/dictionaries.cancellation.ts
-var dict_cancellation = [
+// src/@enums/Cancellation.ts
+var EnumCancellation = [
   "has been cancelled",
   "subsided sufficiently for the advisory to be cancelled",
   "has been cancelled",
@@ -5885,22 +5973,24 @@ var dict_cancellation = [
   "has weakened below severe"
 ];
 
-// src/@dictionaries/dictionaries.testing.ts
-var dict_testing = [
+// src/@enums/Testing.ts
+var EnumTesting = [
   `This is a test message`,
   `Monitoring message only.`,
   `THIS_MESSAGE_IS_FOR_TEST_PURPOSES_ONLY`,
   "TEST MESSAGE"
 ];
 
-// src/@dictionaries/dictionaries.hail.ts
-var dict_hail = {
+// src/@enums/Hail.ts
+var EnumHail = {
+  "0.25": "Pea",
   ".25": "Pea",
+  "0.50": "Penny",
   ".50": "Penny",
   ".75": "Penny",
   "Up to .75": "Penny",
-  ".88": "Nickel",
   "0.75": "Penny",
+  ".88": "Nickel",
   "0.88": "Nickel",
   "1.00": "Quarter",
   "1.25": "Half Dollar",
@@ -5912,62 +6002,62 @@ var dict_hail = {
   "4.00": "CD/DVD"
 };
 
-// src/@building/building.signature.ts
-var getEventSignature = (event) => {
+// src/@building/GetEventSignature.ts
+var GetEventSignature = (event) => {
   var _a, _b, _c, _d, _e, _f, _g, _h;
-  const properties2 = event == null ? void 0 : event.properties;
-  const vtec2 = (_b = (_a = event == null ? void 0 : event.properties) == null ? void 0 : _a.metadata) == null ? void 0 : _b.vtec;
-  const status = dict_correlations.find((c) => c.type === (properties2 == null ? void 0 : properties2.status));
-  const csig = dict_cancellation.find((sig) => properties2.description.toLowerCase().includes(sig.toLowerCase()));
-  properties2.status_metadata = __spreadProps(__spreadValues({}, properties2.status_metadata), { is_issued: true, is_test: false });
-  if ((_c = properties2 == null ? void 0 : properties2.parameters) == null ? void 0 : _c.estimated_hail_size) {
-    properties2.parameters.estimated_hail_size += ` (${(_e = dict_hail[(_d = properties2 == null ? void 0 : properties2.parameters) == null ? void 0 : _d.estimated_hail_size]) != null ? _e : "--"})`;
+  const properties = event == null ? void 0 : event.properties;
+  const vtec = (_b = (_a = event == null ? void 0 : event.properties) == null ? void 0 : _a.metadata) == null ? void 0 : _b.vtec;
+  const status = EnumCorrelations.find((c) => c.type === (properties == null ? void 0 : properties.status));
+  const csig = EnumCancellation.find((sig) => properties.description.toLowerCase().includes(sig.toLowerCase()));
+  properties.status_metadata = __spreadProps(__spreadValues({}, properties.status_metadata), { is_issued: true, is_test: false });
+  if ((_c = properties == null ? void 0 : properties.parameters) == null ? void 0 : _c.estimated_hail_size) {
+    properties.parameters.estimated_hail_size += ` (${(_e = EnumHail[(_d = properties == null ? void 0 : properties.parameters) == null ? void 0 : _d.estimated_hail_size]) != null ? _e : "--"})`;
   }
   if (status) {
-    properties2.status = (_f = status.name) != null ? _f : properties2.status;
-    properties2.status_metadata = __spreadProps(__spreadValues({}, properties2.status_metadata), { is_updated: !!status.isUpdate, is_issued: !!status.isIssued, is_expired: !!status.isCancel, is_statement: !!status.isStatement });
+    properties.status = (_f = status.name) != null ? _f : properties.status;
+    properties.status_metadata = __spreadProps(__spreadValues({}, properties.status_metadata), { is_updated: !!status.isUpdate, is_issued: !!status.isIssued, is_expired: !!status.isCancel, is_statement: !!status.isStatement });
   }
   if (csig) {
-    properties2.status_metadata = __spreadProps(__spreadValues({}, properties2.status_metadata), { is_expired: true });
+    properties.status_metadata = __spreadProps(__spreadValues({}, properties.status_metadata), { is_expired: true });
   }
-  const getProduct = (_h = (_g = vtec2 == null ? void 0 : vtec2.vtec) == null ? void 0 : _g.split(`.`)[0]) == null ? void 0 : _h.replace(`/`, ``);
-  const isTestProduct = dict_products[getProduct] == `Test Product`;
-  if (isTestProduct || dict_testing.some((sig) => {
+  const getProduct = (_h = (_g = vtec == null ? void 0 : vtec.vtec) == null ? void 0 : _g.split(`.`)[0]) == null ? void 0 : _h.replace(`/`, ``);
+  const isTestProduct = EnumProducts[getProduct] == `Test Product`;
+  if (isTestProduct || EnumTesting.some((sig) => {
     var _a2, _b2, _c2, _d2;
-    return (_d2 = (_a2 = properties2.description) == null ? void 0 : _a2.toLowerCase().includes(sig.toLowerCase())) != null ? _d2 : (_c2 = (_b2 = properties2 == null ? void 0 : properties2.parameters) == null ? void 0 : _b2.instructions) == null ? void 0 : _c2.toLowerCase().includes(sig.toLowerCase());
+    return (_d2 = (_a2 = properties.description) == null ? void 0 : _a2.toLowerCase().includes(sig.toLowerCase())) != null ? _d2 : (_c2 = (_b2 = properties == null ? void 0 : properties.parameters) == null ? void 0 : _b2.instructions) == null ? void 0 : _c2.toLowerCase().includes(sig.toLowerCase());
   })) {
-    properties2.status_metadata = __spreadProps(__spreadValues({}, properties2.status_metadata), { is_test: true });
+    properties.status_metadata = __spreadProps(__spreadValues({}, properties.status_metadata), { is_test: true });
   }
-  if (new Date(properties2.expires).getTime() < Date.now()) {
-    properties2.status_metadata = __spreadProps(__spreadValues({}, properties2.status_metadata), { is_expired: true });
+  if (new Date(properties.expires).getTime() < Date.now()) {
+    properties.status_metadata = __spreadProps(__spreadValues({}, properties.status_metadata), { is_expired: true });
   }
-  properties2.status_metadata = __spreadValues({}, properties2.status_metadata);
+  properties.status_metadata = __spreadValues({}, properties.status_metadata);
   return event;
 };
 
-// src/@dictionaries/dictionaries.global.ts
-var dict_global = [
-  "spc day 1 outlook",
-  "spc day 2 outlook",
-  "spc day 3 outlook"
+// src/@enums/GlobalFilter.ts
+var EnumGlobalFilter = [
+  "storm prediction center day 1 outlook",
+  "storm prediction center day 2 outlook",
+  "storm prediction center day 3 outlook"
 ];
 
-// src/@manager/manager.setHash.ts
-var setHash = (event, entry) => {
-  if (entry) {
-    entry.hashes.push(event.properties.metadata.hash);
-    entry.expires = event.properties.expires;
-  } else {
+// src/@manager/SetHash.ts
+var SetHash = (event, entry) => {
+  if (!entry) {
     bootstrap.cache.hashes.push({
       tracking: event.properties.metadata.tracking,
       hashes: [event.properties.metadata.hash],
       expires: event.properties.expires
     });
+    return;
   }
+  entry.hashes.push(event.properties.metadata.hash);
+  entry.expires = event.properties.expires;
 };
 
-// src/@modules/@eas/eas.getWavPCM16.ts
-var getWavPCM16 = (buffer) => {
+// src/@modules/@eas/GetWavPCM16.ts
+var GetWavPCM16 = (buffer) => {
   if (buffer.toString("ascii", 0, 4) !== "RIFF" || buffer.toString("ascii", 8, 12) !== "WAVE") {
     return null;
   }
@@ -5995,8 +6085,8 @@ var getWavPCM16 = (buffer) => {
   return { samples: new Int16Array(samples), sampleRate, channels, bitsPerSample };
 };
 
-// src/@modules/@eas/eas.getSampledPCM16.ts
-var getSampledPCM16 = (int16, originalRate, targetRate) => {
+// src/@modules/@eas/GetSampledPCM16.ts
+var GetSampledPCM16 = (int16, originalRate, targetRate) => {
   if (originalRate === targetRate) return int16;
   const ratio = targetRate / originalRate;
   const outLen = Math.max(1, Math.round(int16.length * ratio));
@@ -6012,15 +6102,15 @@ var getSampledPCM16 = (int16, originalRate, targetRate) => {
   return out;
 };
 
-// src/@modules/@eas/eas.getPCMToFloat.ts
-var getPCMToFloat = (int16) => {
+// src/@modules/@eas/GetPCMToFloat.ts
+var GetPCMToFloat = (int16) => {
   const out = new Float32Array(int16.length);
   for (let i = 0; i < int16.length; i++) out[i] = int16[i] / 32768;
   return out;
 };
 
-// src/@modules/@eas/eas.getFloatPCM16.ts
-var getFloatPCM16 = (float32) => {
+// src/@modules/@eas/GetFloatPCM16.ts
+var GetFloatPCM16 = (float32) => {
   const out = new Int16Array(float32.length);
   for (let i = 0; i < float32.length; i++) {
     let v = Math.max(-1, Math.min(1, float32[i]));
@@ -6029,11 +6119,11 @@ var getFloatPCM16 = (float32) => {
   return out;
 };
 
-// src/@modules/@eas/eas.setRadioEffect.ts
-var setRadioEffect = (int16, sampleRate) => {
+// src/@modules/@eas/SetRadioEffect.ts
+var SetRadioEffect = (int16, sampleRate) => {
   const hpCut = 3555;
   const lpCut = 1600;
-  const x = getPCMToFloat(int16);
+  const x = GetPCMToFloat(int16);
   const dt = 1 / sampleRate;
   const rcHP = 1 / (2 * Math.PI * hpCut);
   const aHP = rcHP / (rcHP + dt);
@@ -6054,11 +6144,11 @@ var setRadioEffect = (int16, sampleRate) => {
   const compGain = 2;
   const norm = Math.tanh(compGain);
   for (let i = 0; i < x.length; i++) x[i] = Math.tanh(x[i] * compGain) / norm;
-  return getFloatPCM16(x);
+  return GetFloatPCM16(x);
 };
 
-// src/@modules/@eas/eas.setAFSK.ts
-var setAFSK = (bits, sampleRate) => {
+// src/@modules/@eas/SetAFSK.ts
+var SetAFSK = (bits, sampleRate) => {
   const baud = 520.83;
   const markFreq = 2083.3;
   const spaceFreq = 1562.5;
@@ -6089,8 +6179,8 @@ var setAFSK = (bits, sampleRate) => {
   return Int16Array.from(result);
 };
 
-// src/@modules/@eas/eas.setAsciiToBits.ts
-var setAsciiToBits = (str) => {
+// src/@modules/@eas/SetAsciiToBits.ts
+var SetAsciiToBits = (str) => {
   const bits = [];
   for (let i = 0; i < str.length; i++) {
     const c = str.charCodeAt(i) & 255;
@@ -6101,8 +6191,8 @@ var setAsciiToBits = (str) => {
   return bits;
 };
 
-// src/@modules/@eas/eas.getMergedPCM16.ts
-var getMergedPCM16 = (arrays) => {
+// src/@modules/@eas/GetMergedPCM16.ts
+var GetMergedPCM16 = (arrays) => {
   let total = 0;
   for (const a of arrays) total += a.length;
   const out = new Int16Array(total);
@@ -6114,16 +6204,16 @@ var getMergedPCM16 = (arrays) => {
   return out;
 };
 
-// src/@modules/@eas/eas.setSameHeader.ts
-var setSameHeader = (vtec2, repeats, sampleRate = 8e3, options = {}) => {
+// src/@modules/@eas/SetSameHeader.ts
+var SetSameHeader = (vtec, repeats, sampleRate = 8e3, options = {}) => {
   var _a, _b;
   const preMarkSec = (_a = options.preMarkSec) != null ? _a : 0.3;
   const gapSec = (_b = options.gapSec) != null ? _b : 0.1;
   const bursts = [];
   const gap = new Int16Array(Math.floor(gapSec * sampleRate));
   for (let i = 0; i < repeats; i++) {
-    const bodyBits = setAsciiToBits(vtec2);
-    const body = setAFSK(bodyBits, sampleRate);
+    const bodyBits = SetAsciiToBits(vtec);
+    const body = SetAFSK(bodyBits, sampleRate);
     const extendedBodyDuration = Math.round(preMarkSec * sampleRate);
     const extendedBody = new Int16Array(extendedBodyDuration + gap.length);
     for (let j2 = 0; j2 < extendedBodyDuration; j2++) {
@@ -6133,11 +6223,11 @@ var setSameHeader = (vtec2, repeats, sampleRate = 8e3, options = {}) => {
     bursts.push(extendedBody);
     if (i !== repeats - 1) bursts.push(gap);
   }
-  return getMergedPCM16(bursts);
+  return GetMergedPCM16(bursts);
 };
 
-// src/@modules/@eas/eas.setAttentionTone.ts
-var setAttentionTone = (ms, sampleRate) => {
+// src/@modules/@eas/SetAttentionTone.ts
+var SetAttentionTone = (ms, sampleRate) => {
   const len = Math.floor(ms * sampleRate);
   const out = new Int16Array(len);
   const f1 = 853;
@@ -6157,18 +6247,18 @@ var setAttentionTone = (ms, sampleRate) => {
   return out;
 };
 
-// src/@modules/@eas/eas.setNoise.ts
-var setNoise = (int16, noiseLevel = 0.02) => {
-  const x = getPCMToFloat(int16);
+// src/@modules/@eas/SetNoise.ts
+var SetNoise = (int16, noiseLevel = 0.02) => {
+  const x = GetPCMToFloat(int16);
   for (let i = 0; i < x.length; i++) x[i] += (Math.random() * 2 - 1) * noiseLevel;
   let peak = 0;
   for (let i = 0; i < x.length; i++) peak = Math.max(peak, Math.abs(x[i]));
   if (peak > 1) for (let i = 0; i < x.length; i++) x[i] *= 0.98 / peak;
-  return getFloatPCM16(x);
+  return GetFloatPCM16(x);
 };
 
-// src/@modules/@eas/eas.getPCM16.ts
-var getPCM16 = (samples, sampleRate) => {
+// src/@modules/@eas/GetPCM16.ts
+var GetPCM16 = (samples, sampleRate) => {
   let o = 0;
   const bytesPerSample = 2;
   const blockAlign = 1 * bytesPerSample;
@@ -6208,17 +6298,17 @@ var getPCM16 = (samples, sampleRate) => {
   return buffer;
 };
 
-// src/@modules/@eas/eas.getTTS.ts
+// src/@modules/@eas/GetTTS.ts
 var import_os = require("os");
 var import_fs = require("fs");
 var import_child_process = require("child_process");
-var getTTS = (text2, outputPath) => __async(null, null, function* () {
+var GetTTS = (text, outputPath) => __async(null, null, function* () {
   const vPlatform = (0, import_os.platform)();
   switch (vPlatform) {
     case "win32": {
       try {
         const txtPath = outputPath + ".txt";
-        (0, import_fs.writeFileSync)(txtPath, text2, "utf8");
+        (0, import_fs.writeFileSync)(txtPath, text, "utf8");
         const command = [
           "Add-Type -AssemblyName System.Speech;",
           `$speak = New-Object System.Speech.Synthesis.SpeechSynthesizer;`,
@@ -6235,7 +6325,7 @@ var getTTS = (text2, outputPath) => __async(null, null, function* () {
     }
     case "linux":
       try {
-        (0, import_child_process.execSync)(`espeak -w "${outputPath}" "${text2.replace(/"/g, '\\"')}"`);
+        (0, import_child_process.execSync)(`espeak -w "${outputPath}" "${text.replace(/"/g, '\\"')}"`);
       } catch (e) {
       }
       break;
@@ -6244,8 +6334,8 @@ var getTTS = (text2, outputPath) => __async(null, null, function* () {
   }
 });
 
-// src/@modules/@eas/eas.getCleanDescription.ts
-var getCleanDescription = (message) => {
+// src/@modules/@eas/GetCleanDescription.ts
+var GetCleanDescription = (message) => {
   const patches = [
     { regex: /\.{3,}/g, replacement: ". " },
     { regex: /\bUTC\b/g, replacement: "Coordinated Universal Time" },
@@ -6316,12 +6406,12 @@ var getCleanDescription = (message) => {
   return message.replace(/'/g, "''").replace(/\b(\d{1,2}):(\d{2})\s*(AM|PM)\b/gi, (_, h, m, ap) => fmt(+h, +m, ap.toUpperCase())).replace(/\b(\d{1,2})\s+(\d{2})\s+(AM|PM)\b/gi, (_, h, m, ap) => fmt(+h, +m, ap.toUpperCase())).replace(/\b(\d{2})(\d{2})\s+(AM|PM)\b/gi, (_, hh, mm, ap) => fmt(+hh, +mm, ap.toUpperCase())).replace(/\b(\d{1,2})\s+(AM|PM)\b/gi, (_, h, ap) => fmt(+h, 0, ap.toUpperCase())).replace(/\*+/g, " ").replace(/-/g, " ").replace(/\n/g, " ").trim();
 };
 
-// src/@modules/@eas/eas.setEasTone.ts
+// src/@modules/@eas/GenerateEASMessage.ts
 var import_path2 = require("path");
 var import_fs2 = require("fs");
 var import_child_process2 = require("child_process");
 var import_os2 = require("os");
-var setEasTone = (options) => __async(null, null, function* () {
+var GenerateEASMessage = (options) => __async(null, null, function* () {
   var _a;
   const tick = performance.now();
   const settings = bootstrap.settings;
@@ -6331,7 +6421,7 @@ var setEasTone = (options) => __async(null, null, function* () {
   let header = options.header;
   let title = ((_a = options.title) != null ? _a : `${Math.random().toString(36).substring(2, 15)}-${header.replace(/[^a-zA-Z0-9]/g, "")}`).replace(/[\\:*?"<>|]/g, "_").replace(/\s+/g, " ").trim();
   if (!message || !header) {
-    setWarning({
+    SetWarning({
       title: `EAS`,
       message: `Message and header are required to generate an EAS tone.`
     });
@@ -6343,25 +6433,19 @@ var setEasTone = (options) => __async(null, null, function* () {
   if (!(0, import_fs2.existsSync)(directory)) {
     (0, import_fs2.mkdirSync)(directory, { recursive: true });
   }
-  if (!(0, import_fs2.existsSync)((0, import_path2.join)(directory, `/tts`))) {
-    (0, import_fs2.mkdirSync)((0, import_path2.join)(directory, `/tts`), { recursive: true });
-  }
-  if (!(0, import_fs2.existsSync)((0, import_path2.join)(directory, `/encoded`))) {
-    (0, import_fs2.mkdirSync)((0, import_path2.join)(directory, `/encoded`), { recursive: true });
-  }
-  const tmpTTS = (0, import_path2.join)(directory, `/tts/${title}.wav`);
-  const outTTS = (0, import_path2.join)(directory, `/encoded/${title}.wav`);
+  const tmpTTS = (0, import_path2.join)(directory, `/${title}-tts.wav`);
+  const outTTS = (0, import_path2.join)(directory, `/${title}.wav`);
   const vPlatform = (0, import_os2.platform)();
   if (vPlatform === "darwin") {
-    setWarning({
+    SetWarning({
       title: `EAS`,
       message: `EAS tone generation is not supported on macOS.`
     });
     return null;
   }
   yield new Promise((resolve6, reject) => {
-    const tMsg = getCleanDescription(message);
-    getTTS(tMsg, tmpTTS).then(() => {
+    const tMsg = GetCleanDescription(message);
+    GetTTS(tMsg, tmpTTS).then(() => {
       resolve6();
     });
   });
@@ -6369,19 +6453,19 @@ var setEasTone = (options) => __async(null, null, function* () {
     return null;
   }
   buffTTS = (0, import_fs2.readFileSync)(tmpTTS);
-  const vWav = getWavPCM16(buffTTS);
-  const vSamples = getSampledPCM16(vWav.samples, vWav.sampleRate, 8e3);
-  const vRadio = setRadioEffect(vSamples, 8e3);
+  const vWav = GetWavPCM16(buffTTS);
+  const vSamples = GetSampledPCM16(vWav.samples, vWav.sampleRate, 8e3);
+  const vRadio = SetRadioEffect(vSamples, 8e3);
   if ((0, import_fs2.existsSync)(prefix)) {
     let tBuffer = (0, import_fs2.readFileSync)(prefix);
-    let tWav = getWavPCM16(tBuffer);
+    let tWav = GetWavPCM16(tBuffer);
     if (tWav == null) {
       try {
-        const converted = (0, import_path2.join)(directory, `/tts/${title}.converted.wav`);
+        const converted = (0, import_path2.join)(directory, `/${title}-tts-fixed.wav`);
         (0, import_child_process2.execSync)(`ffmpeg -y -i "${prefix}" -ar 8000 -ac 1 -sample_fmt s16 "${converted}"`, { stdio: "ignore" });
         if ((0, import_fs2.existsSync)(converted)) {
           tBuffer = (0, import_fs2.readFileSync)(converted);
-          tWav = getWavPCM16(tBuffer);
+          tWav = GetWavPCM16(tBuffer);
           try {
             (0, import_fs2.unlinkSync)(converted);
           } catch (e) {
@@ -6391,41 +6475,41 @@ var setEasTone = (options) => __async(null, null, function* () {
       }
     }
     if (tWav == null) {
-      setWarning({ title: `EAS`, message: `Intro tone isn't a valid .WAV file or isn't in PCM 16-bit format. Converted attempt failed; please convert it then try again.` });
+      SetWarning({ title: `EAS`, message: `Intro tone isn't a valid .WAV file or isn't in PCM 16-bit format. Converted attempt failed; please convert it then try again.` });
       return null;
     }
-    const tSamples = tWav.sampleRate != 8e3 ? getSampledPCM16(tWav.samples, tWav.sampleRate, 8e3) : tWav.samples;
-    buffRadio = setRadioEffect(tSamples, 8e3);
+    const tSamples = tWav.sampleRate != 8e3 ? GetSampledPCM16(tWav.samples, tWav.sampleRate, 8e3) : tWav.samples;
+    buffRadio = SetRadioEffect(tSamples, 8e3);
   }
   buffFull = buffRadio != null ? [buffRadio, new Int16Array(Math.floor(0.5 * 8e3))] : [];
   buffFull.push(
-    setSameHeader(header, 3, 8e3, {
+    SetSameHeader(header, 3, 8e3, {
       preMarkSec: 1.1,
       gapSec: 0.5
     }),
     new Int16Array(Math.floor(0.5 * 8e3)),
-    setAttentionTone(8, 8e3),
+    SetAttentionTone(8, 8e3),
     new Int16Array(Math.floor(0.5 * 8e3)),
     vRadio
   );
   for (let i = 0; i < 3; i++) {
-    buffFull.push(setSameHeader(header, 1, 8e3, { preMarkSec: 0.5, gapSec: 0.1 }));
+    buffFull.push(SetSameHeader(header, 1, 8e3, { preMarkSec: 0.5, gapSec: 0.1 }));
     buffFull.push(new Int16Array(Math.floor(0.5 * 8e3)));
   }
-  const aSamples = getMergedPCM16(buffFull);
-  const aFinal = setNoise(aSamples, 2e-3);
-  const aBuffer = getPCM16(Array.from(aFinal).map((v) => ({ value: v })), 8e3);
+  const aSamples = GetMergedPCM16(buffFull);
+  const aFinal = SetNoise(aSamples, 2e-3);
+  const aBuffer = GetPCM16(Array.from(aFinal).map((v) => ({ value: v })), 8e3);
   (0, import_fs2.writeFileSync)(outTTS, aBuffer);
   try {
     (0, import_fs2.unlinkSync)(tmpTTS);
   } catch (e) {
   }
-  setDebug({ title: `@eas.setEasTone`, message: `EAS tone generation took ${performance.now() - tick} ms` });
+  SetDebug({ title: `GenerateEASMessage`, message: `${Math.round(performance.now() - tick)}ms` });
   return outTTS;
 });
 
-// src/@parsers/@text/text.getEmbedText.ts
-var getEmebedText = (event) => {
+// src/@parsers/@text/GetEmbededText.ts
+var GetEmebedText = (event) => {
   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, _ja, _ka, _la, _ma, _na, _oa, _pa, _qa, _ra, _sa, _ta, _ua, _va, _wa, _xa, _ya, _za, _Aa, _Ba, _Ca, _Da, _Ea, _Fa, _Ga, _Ha, _Ia, _Ja, _Ka, _La, _Ma, _Na;
   const line = (label, value, condition = true) => condition && value ? `${label} ${value}` : null;
   const isStatement = event.properties.status_metadata.is_statement;
@@ -6462,44 +6546,46 @@ var getEmebedText = (event) => {
   ].filter(Boolean).join("\n");
 };
 
-// src/@parsers/@text/text.getStringText.ts
-var getStringText = (event) => {
-  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, _ja, _ka, _la, _ma, _na, _oa, _pa, _qa, _ra, _sa, _ta, _ua, _va, _wa, _xa, _ya, _za, _Aa, _Ba, _Ca, _Da;
+// src/@parsers/@text/GetStringText.ts
+var GetStringText = (event) => {
+  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, _ja, _ka, _la, _ma, _na, _oa, _pa, _qa, _ra, _sa, _ta, _ua, _va, _wa, _xa, _ya, _za, _Aa, _Ba, _Ca, _Da, _Ea;
+  const settings = bootstrap.settings;
+  const timezone = (_a = settings.NotifyServer.Timezone) != null ? _a : `UTC`;
   const line = (label, value, condition = true) => condition && value ? `${label} ${value}` : null;
   const isStatement = event.properties.status_metadata.is_statement;
   const isExpired = event.properties.status_metadata.is_expired;
   return [
-    line(`Locations:`, (_b = (_a = event == null ? void 0 : event.properties) == null ? void 0 : _a.locations) == null ? void 0 : _b.slice(0, 100)),
-    line(`Issued:`, new Date(event.properties.issued).toUTCString(), !isExpired),
-    line(`Expires:`, new Date(event.properties.expires).toUTCString(), !isStatement),
-    line(`Damage Threat:`, (_d = (_c = event == null ? void 0 : event.properties) == null ? void 0 : _c.parameters) == null ? void 0 : _d.damage_threat, !isExpired),
-    line(`Flood Threat:`, (_f = (_e = event == null ? void 0 : event.properties) == null ? void 0 : _e.parameters) == null ? void 0 : _f.flood_threat, !isExpired),
-    line(`Tornado Threat:`, (_h = (_g = event == null ? void 0 : event.properties) == null ? void 0 : _g.parameters) == null ? void 0 : _h.tornado_threat, !isExpired),
-    line(`Estimated Wind Gusts:`, `${(_j = (_i = event == null ? void 0 : event.properties) == null ? void 0 : _i.parameters) == null ? void 0 : _j.estimated_wind_gusts} ${((_l = (_k = event == null ? void 0 : event.properties) == null ? void 0 : _k.parameters) == null ? void 0 : _l.wind_threat) ? ` (${(_n = (_m = event == null ? void 0 : event.properties) == null ? void 0 : _m.parameters) == null ? void 0 : _n.wind_threat})` : ""}`, !isExpired && ((_p = (_o = event == null ? void 0 : event.properties) == null ? void 0 : _o.parameters) == null ? void 0 : _p.estimated_wind_gusts) != null),
-    line(`Estimated Hail Size:`, `${(_r = (_q = event == null ? void 0 : event.properties) == null ? void 0 : _q.parameters) == null ? void 0 : _r.estimated_hail_size} ${((_t = (_s = event == null ? void 0 : event.properties) == null ? void 0 : _s.parameters) == null ? void 0 : _t.hail_threat) ? ` (${(_v = (_u = event == null ? void 0 : event.properties) == null ? void 0 : _u.parameters) == null ? void 0 : _v.hail_threat})` : ""}`, !isExpired && ((_x = (_w = event == null ? void 0 : event.properties) == null ? void 0 : _w.parameters) == null ? void 0 : _x.estimated_hail_size) != null),
-    line(`Discussion:`, (_z = (_y = event == null ? void 0 : event.properties) == null ? void 0 : _y.discussion_parameters) == null ? void 0 : _z.discussion_number, !isExpired),
-    line(`Concern:`, (_B = (_A = event == null ? void 0 : event.properties) == null ? void 0 : _A.discussion_parameters) == null ? void 0 : _B.discussion_concerning, !isExpired),
-    line(`SPC Max Tornado Threat:`, (_D = (_C = event == null ? void 0 : event.properties) == null ? void 0 : _C.discussion_parameters) == null ? void 0 : _D.discussion_max_tornado, !isExpired),
-    line(`SPC Max Hail Threat:`, (_F = (_E = event == null ? void 0 : event.properties) == null ? void 0 : _E.discussion_parameters) == null ? void 0 : _F.discussion_max_hail, !isExpired),
-    line(`SPC Max Wind Threat:`, (_H = (_G = event == null ? void 0 : event.properties) == null ? void 0 : _G.discussion_parameters) == null ? void 0 : _H.discussion_max_wind, !isExpired),
-    line(`SPC Watch Issuance Probability:`, ((_J = (_I = event == null ? void 0 : event.properties) == null ? void 0 : _I.discussion_parameters) == null ? void 0 : _J.discussion_watch_issuance) ? `${(_L = (_K = event == null ? void 0 : event.properties) == null ? void 0 : _K.discussion_parameters) == null ? void 0 : _L.discussion_watch_issuance}%` : null, !isExpired),
-    line(`Watch Number:`, (_N = (_M = event == null ? void 0 : event.properties) == null ? void 0 : _M.watch_parameters) == null ? void 0 : _N.watch_number, !isExpired),
-    line(`Strong Tornadoes Probability:`, ((_P = (_O = event == null ? void 0 : event.properties) == null ? void 0 : _O.watch_parameters) == null ? void 0 : _P.strong_tornadoes_probability) ? `${(_R = (_Q = event == null ? void 0 : event.properties) == null ? void 0 : _Q.watch_parameters) == null ? void 0 : _R.strong_tornadoes_probability}%` : null, !isExpired),
-    line(`Additional Tornadoes Probability:`, ((_T = (_S = event == null ? void 0 : event.properties) == null ? void 0 : _S.watch_parameters) == null ? void 0 : _T.additional_tornadoes_probability) ? `${(_V = (_U = event == null ? void 0 : event.properties) == null ? void 0 : _U.watch_parameters) == null ? void 0 : _V.additional_tornadoes_probability}%` : null, !isExpired),
-    line(`Combined Hail/Wind Probability:`, ((_X = (_W = event == null ? void 0 : event.properties) == null ? void 0 : _W.watch_parameters) == null ? void 0 : _X.combined_hail_wind_probability) ? `${(_Z = (_Y = event == null ? void 0 : event.properties) == null ? void 0 : _Y.watch_parameters) == null ? void 0 : _Z.combined_hail_wind_probability}%` : null, !isExpired),
-    line(`Severe Hail Probability:`, ((_$ = (__ = event == null ? void 0 : event.properties) == null ? void 0 : __.watch_parameters) == null ? void 0 : _$.severe_hail_probability) ? `${(_ba = (_aa = event == null ? void 0 : event.properties) == null ? void 0 : _aa.watch_parameters) == null ? void 0 : _ba.severe_hail_probability}%` : null, !isExpired),
-    line(`Hail >2in Probability:`, ((_da = (_ca = event == null ? void 0 : event.properties) == null ? void 0 : _ca.watch_parameters) == null ? void 0 : _da.hail_2in_probability) ? `${(_fa = (_ea = event == null ? void 0 : event.properties) == null ? void 0 : _ea.watch_parameters) == null ? void 0 : _fa.hail_2in_probability}%` : null, !isExpired),
-    line(`Max Hail Inches:`, (_ha = (_ga = event == null ? void 0 : event.properties) == null ? void 0 : _ga.watch_parameters) == null ? void 0 : _ha.max_hail_in, !isExpired),
-    line(`Severe Wind Probability:`, ((_ja = (_ia = event == null ? void 0 : event.properties) == null ? void 0 : _ia.watch_parameters) == null ? void 0 : _ja.severe_wind_probability) ? `${(_la = (_ka = event == null ? void 0 : event.properties) == null ? void 0 : _ka.watch_parameters) == null ? void 0 : _la.severe_wind_probability}%` : null, !isExpired),
-    line(`Max Surface Wind:`, (_na = (_ma = event == null ? void 0 : event.properties) == null ? void 0 : _ma.watch_parameters) == null ? void 0 : _na.max_wind_surface, !isExpired),
-    line(`Max Tops (x100 feet):`, (_pa = (_oa = event == null ? void 0 : event.properties) == null ? void 0 : _oa.watch_parameters) == null ? void 0 : _pa.max_tops_x100feet, !isExpired),
-    line(`Sender:`, ((_sa = (_ra = (_qa = event == null ? void 0 : event.properties) == null ? void 0 : _qa.geocode) == null ? void 0 : _ra.office) == null ? void 0 : _sa.name) ? `${(_va = (_ua = (_ta = event == null ? void 0 : event.properties) == null ? void 0 : _ta.geocode) == null ? void 0 : _ua.office) == null ? void 0 : _va.name} (${(_ya = (_xa = (_wa = event == null ? void 0 : event.properties) == null ? void 0 : _wa.geocode) == null ? void 0 : _xa.office) == null ? void 0 : _ya.office})` : (_Ba = (_Aa = (_za = event == null ? void 0 : event.properties) == null ? void 0 : _za.geocode) == null ? void 0 : _Aa.office) == null ? void 0 : _Ba.office),
-    line(`Tracking:`, (_Da = (_Ca = event == null ? void 0 : event.properties) == null ? void 0 : _Ca.metadata) == null ? void 0 : _Da.tracking)
+    line(`Locations:`, (_c = (_b = event == null ? void 0 : event.properties) == null ? void 0 : _b.locations) == null ? void 0 : _c.slice(0, 100)),
+    line(`Issued:`, `${new Date(event.properties.issued).toLocaleString([], { timeZone: timezone })} (${timezone.replace(`America/`, ``)})`, !isExpired),
+    line(`Expires:`, `${new Date(event.properties.expires).toLocaleString([], { timeZone: timezone })} (${timezone.replace(`America/`, ``)})`, !isStatement),
+    line(`Damage Threat:`, (_e = (_d = event == null ? void 0 : event.properties) == null ? void 0 : _d.parameters) == null ? void 0 : _e.damage_threat, !isExpired),
+    line(`Flood Threat:`, (_g = (_f = event == null ? void 0 : event.properties) == null ? void 0 : _f.parameters) == null ? void 0 : _g.flood_threat, !isExpired),
+    line(`Tornado Threat:`, (_i = (_h = event == null ? void 0 : event.properties) == null ? void 0 : _h.parameters) == null ? void 0 : _i.tornado_threat, !isExpired),
+    line(`Estimated Wind Gusts:`, `${(_k = (_j = event == null ? void 0 : event.properties) == null ? void 0 : _j.parameters) == null ? void 0 : _k.estimated_wind_gusts} ${((_m = (_l = event == null ? void 0 : event.properties) == null ? void 0 : _l.parameters) == null ? void 0 : _m.wind_threat) ? ` (${(_o = (_n = event == null ? void 0 : event.properties) == null ? void 0 : _n.parameters) == null ? void 0 : _o.wind_threat})` : ""}`, !isExpired && ((_q = (_p = event == null ? void 0 : event.properties) == null ? void 0 : _p.parameters) == null ? void 0 : _q.estimated_wind_gusts) != null),
+    line(`Estimated Hail Size:`, `${(_s = (_r = event == null ? void 0 : event.properties) == null ? void 0 : _r.parameters) == null ? void 0 : _s.estimated_hail_size} ${((_u = (_t = event == null ? void 0 : event.properties) == null ? void 0 : _t.parameters) == null ? void 0 : _u.hail_threat) ? ` (${(_w = (_v = event == null ? void 0 : event.properties) == null ? void 0 : _v.parameters) == null ? void 0 : _w.hail_threat})` : ""}`, !isExpired && ((_y = (_x = event == null ? void 0 : event.properties) == null ? void 0 : _x.parameters) == null ? void 0 : _y.estimated_hail_size) != null),
+    line(`Discussion:`, (_A = (_z = event == null ? void 0 : event.properties) == null ? void 0 : _z.discussion_parameters) == null ? void 0 : _A.discussion_number, !isExpired),
+    line(`Concern:`, (_C = (_B = event == null ? void 0 : event.properties) == null ? void 0 : _B.discussion_parameters) == null ? void 0 : _C.discussion_concerning, !isExpired),
+    line(`SPC Max Tornado Threat:`, (_E = (_D = event == null ? void 0 : event.properties) == null ? void 0 : _D.discussion_parameters) == null ? void 0 : _E.discussion_max_tornado, !isExpired),
+    line(`SPC Max Hail Threat:`, (_G = (_F = event == null ? void 0 : event.properties) == null ? void 0 : _F.discussion_parameters) == null ? void 0 : _G.discussion_max_hail, !isExpired),
+    line(`SPC Max Wind Threat:`, (_I = (_H = event == null ? void 0 : event.properties) == null ? void 0 : _H.discussion_parameters) == null ? void 0 : _I.discussion_max_wind, !isExpired),
+    line(`SPC Watch Issuance Probability:`, ((_K = (_J = event == null ? void 0 : event.properties) == null ? void 0 : _J.discussion_parameters) == null ? void 0 : _K.discussion_watch_issuance) ? `${(_M = (_L = event == null ? void 0 : event.properties) == null ? void 0 : _L.discussion_parameters) == null ? void 0 : _M.discussion_watch_issuance}%` : null, !isExpired),
+    line(`Watch Number:`, (_O = (_N = event == null ? void 0 : event.properties) == null ? void 0 : _N.watch_parameters) == null ? void 0 : _O.watch_number, !isExpired),
+    line(`Strong Tornadoes Probability:`, ((_Q = (_P = event == null ? void 0 : event.properties) == null ? void 0 : _P.watch_parameters) == null ? void 0 : _Q.strong_tornadoes_probability) ? `${(_S = (_R = event == null ? void 0 : event.properties) == null ? void 0 : _R.watch_parameters) == null ? void 0 : _S.strong_tornadoes_probability}%` : null, !isExpired),
+    line(`Additional Tornadoes Probability:`, ((_U = (_T = event == null ? void 0 : event.properties) == null ? void 0 : _T.watch_parameters) == null ? void 0 : _U.additional_tornadoes_probability) ? `${(_W = (_V = event == null ? void 0 : event.properties) == null ? void 0 : _V.watch_parameters) == null ? void 0 : _W.additional_tornadoes_probability}%` : null, !isExpired),
+    line(`Combined Hail/Wind Probability:`, ((_Y = (_X = event == null ? void 0 : event.properties) == null ? void 0 : _X.watch_parameters) == null ? void 0 : _Y.combined_hail_wind_probability) ? `${(__ = (_Z = event == null ? void 0 : event.properties) == null ? void 0 : _Z.watch_parameters) == null ? void 0 : __.combined_hail_wind_probability}%` : null, !isExpired),
+    line(`Severe Hail Probability:`, ((_aa = (_$ = event == null ? void 0 : event.properties) == null ? void 0 : _$.watch_parameters) == null ? void 0 : _aa.severe_hail_probability) ? `${(_ca = (_ba = event == null ? void 0 : event.properties) == null ? void 0 : _ba.watch_parameters) == null ? void 0 : _ca.severe_hail_probability}%` : null, !isExpired),
+    line(`Hail >2in Probability:`, ((_ea = (_da = event == null ? void 0 : event.properties) == null ? void 0 : _da.watch_parameters) == null ? void 0 : _ea.hail_2in_probability) ? `${(_ga = (_fa = event == null ? void 0 : event.properties) == null ? void 0 : _fa.watch_parameters) == null ? void 0 : _ga.hail_2in_probability}%` : null, !isExpired),
+    line(`Max Hail Inches:`, (_ia = (_ha = event == null ? void 0 : event.properties) == null ? void 0 : _ha.watch_parameters) == null ? void 0 : _ia.max_hail_in, !isExpired),
+    line(`Severe Wind Probability:`, ((_ka = (_ja = event == null ? void 0 : event.properties) == null ? void 0 : _ja.watch_parameters) == null ? void 0 : _ka.severe_wind_probability) ? `${(_ma = (_la = event == null ? void 0 : event.properties) == null ? void 0 : _la.watch_parameters) == null ? void 0 : _ma.severe_wind_probability}%` : null, !isExpired),
+    line(`Max Surface Wind:`, (_oa = (_na = event == null ? void 0 : event.properties) == null ? void 0 : _na.watch_parameters) == null ? void 0 : _oa.max_wind_surface, !isExpired),
+    line(`Max Tops (x100 feet):`, (_qa = (_pa = event == null ? void 0 : event.properties) == null ? void 0 : _pa.watch_parameters) == null ? void 0 : _qa.max_tops_x100feet, !isExpired),
+    line(`Sender:`, ((_ta = (_sa = (_ra = event == null ? void 0 : event.properties) == null ? void 0 : _ra.geocode) == null ? void 0 : _sa.office) == null ? void 0 : _ta.name) ? `${(_wa = (_va = (_ua = event == null ? void 0 : event.properties) == null ? void 0 : _ua.geocode) == null ? void 0 : _va.office) == null ? void 0 : _wa.name} (${(_za = (_ya = (_xa = event == null ? void 0 : event.properties) == null ? void 0 : _xa.geocode) == null ? void 0 : _ya.office) == null ? void 0 : _za.office})` : (_Ca = (_Ba = (_Aa = event == null ? void 0 : event.properties) == null ? void 0 : _Aa.geocode) == null ? void 0 : _Ba.office) == null ? void 0 : _Ca.office),
+    line(`Tracking:`, (_Ea = (_Da = event == null ? void 0 : event.properties) == null ? void 0 : _Da.metadata) == null ? void 0 : _Ea.tracking)
   ].filter(Boolean).join("\n");
 };
 
-// src/@modules/@utilities/utilities.createHttp.ts
-var createHttp = (options) => __async(null, null, function* () {
+// src/@modules/@utilities/CreateHttp.ts
+var CreateHttp = (options) => __async(null, null, function* () {
   var _a, _b, _c, _d;
   const requestOptions = {
     method: (_a = options.method) != null ? _a : "GET",
@@ -6541,8 +6627,8 @@ var createHttp = (options) => __async(null, null, function* () {
   }
 });
 
-// src/@modules/@utilities/utilities.getMatched.ts
-var getMatched = (strings, string) => {
+// src/@modules/@utilities/GetMatched.ts
+var GetMatched = (strings, string) => {
   const isMatched = strings.some((pattern) => {
     if (!pattern) return false;
     const lowerP = pattern.toLowerCase();
@@ -6557,146 +6643,204 @@ var getMatched = (strings, string) => {
   return isMatched;
 };
 
-// src/@manager/manager.updateListener.ts
-var import_fs3 = require("fs");
-var updateListener = (event) => __async(null, null, function* () {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p;
+// src/@manager/Tasks.ts
+var import_promises = require("fs/promises");
+var Tasks = (events) => __async(null, null, function* () {
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t;
   const tick = performance.now();
   const settings = bootstrap.settings;
-  const listeners2 = settings.ListenerSettings;
-  const properties2 = event.properties;
-  const metadata = {
-    file: null,
-    eas: null,
-    json: null,
-    name: properties2.event,
-    status: properties2.status,
-    description: properties2.description,
-    tracking: properties2.metadata.tracking,
-    header: properties2.metadata.header,
-    raw: properties2.metadata.raw,
-    expired: properties2.status_metadata.is_expired,
-    attachments: properties2.metadata.attachments
-  };
-  for (const listener2 of listeners2) {
-    const events = listener2 == null ? void 0 : listener2.Events;
-    const webhook = listener2 == null ? void 0 : listener2.Webhook;
-    const notify = listener2 == null ? void 0 : listener2.NotificationServer;
-    const uploads = listener2 == null ? void 0 : listener2.Uploads;
-    const isMatched = getMatched(events != null ? events : [], metadata.name);
-    if ((events == null ? void 0 : events.length) == 0 || isMatched) {
-      if (uploads == null ? void 0 : uploads.EAS) {
-        metadata.eas = yield setEasTone({
-          title: `${metadata.name}_${metadata.status}_${metadata.tracking}`,
-          message: metadata.description,
-          header: metadata.header
-        });
-      }
-      if (uploads == null ? void 0 : uploads.File) {
-        const fDestination = settings.GlobalSettings.ArchiveSettings.TextDirectory;
-        if (fDestination) {
-          const file = `${fDestination}/${metadata.name}_${metadata.status}_${metadata.tracking}.txt`.replace(/[\\:*?"<>|]/g, "_").replace(/\s+/g, " ").trim();
-          if (!(0, import_fs3.existsSync)(fDestination)) {
-            (0, import_fs3.mkdirSync)(fDestination, { recursive: true });
-          }
-          if ((0, import_fs3.existsSync)(file)) {
-            (0, import_fs3.appendFileSync)(file, metadata.raw);
-          } else {
-            (0, import_fs3.writeFileSync)(file, metadata.raw);
-          }
+  const notifyServer = settings.NotifyServer;
+  const actions = settings.ActionSettings;
+  for (const event of events) {
+    const properties = event.properties;
+    const hasActions = Array.isArray(actions) && actions.length > 0;
+    if (!hasActions) {
+      SetDebug({ title: `Tasks`, message: `${Math.round(performance.now() - tick)}ms` });
+      return;
+    }
+    const metadata = {
+      text: null,
+      eas: null,
+      json: null,
+      name: properties.event,
+      status: properties.status,
+      description: properties.description,
+      tracking: properties.metadata.tracking,
+      header: properties.metadata.header,
+      raw: properties.metadata.raw,
+      expired: properties.status_metadata.is_expired,
+      attachments: properties.metadata.attachments
+    };
+    const archiveSettings = (_a = settings.GlobalSettings) == null ? void 0 : _a.ArchiveSettings;
+    const textArchiveDir = archiveSettings == null ? void 0 : archiveSettings.TextDirectory;
+    const jsonArchiveDir = archiveSettings == null ? void 0 : archiveSettings.JSONDirectory;
+    const eventBaseName = `${metadata.name}_${metadata.tracking}`;
+    const easTitle = `${metadata.name}_${metadata.status}_${metadata.tracking}`;
+    const cleanedEventText = JSON.stringify(GetCleanedEvent(event), null, 2);
+    const stringText = GetStringText(event);
+    const embedText = GetEmebedText(event);
+    for (const action of actions) {
+      const events2 = action == null ? void 0 : action.Events;
+      const webhook = action == null ? void 0 : action.Webhook;
+      const notify = action == null ? void 0 : action.NotificationServer;
+      const uploads = action == null ? void 0 : action.Uploads;
+      const isMatched = GetMatched(events2 != null ? events2 : [], metadata.name);
+      if ((events2 == null ? void 0 : events2.length) == 0 || isMatched) {
+        const t = performance.now();
+        if ((uploads == null ? void 0 : uploads.EAS) && !metadata.eas) {
+          metadata.eas = yield GenerateEASMessage({
+            title: easTitle,
+            message: metadata.description,
+            header: metadata.header
+          });
+          SetDebug({
+            title: "Tasks/EAS",
+            message: `${Math.round(performance.now() - t)}ms`
+          });
         }
-        metadata.file = metadata.raw;
-      }
-      if (uploads == null ? void 0 : uploads.JSON) {
-        const eDestination = settings.GlobalSettings.ArchiveSettings.EventDirectory;
-        if (eDestination) {
-          const file = `${eDestination}/${metadata.name}_${metadata.status}_${metadata.tracking}.json`.replace(/[\\:*?"<>|]/g, "_").replace(/\s+/g, " ").trim();
-          if (!(0, import_fs3.existsSync)(eDestination)) {
-            (0, import_fs3.mkdirSync)(eDestination, { recursive: true });
+        if ((uploads == null ? void 0 : uploads.TEXT) && metadata.text === null) {
+          const t2 = performance.now();
+          if (textArchiveDir) {
+            const file = `${textArchiveDir}/${eventBaseName}.txt`.replace(/[\\:*?"<>|]/g, "_").replace(/\s+/g, " ").trim();
+            yield (0, import_promises.mkdir)(textArchiveDir, { recursive: true });
+            yield (0, import_promises.appendFile)(file, `${"\n".repeat(7)}${metadata.raw}`);
+            SetDebug({
+              title: "Tasks/TEXT",
+              message: `${Math.round(performance.now() - t2)}ms`
+            });
           }
-          (0, import_fs3.writeFileSync)(file, JSON.stringify(getCleanedEvent(event), null, 2));
-        }
-        metadata.json = JSON.stringify(getCleanedEvent(event), null, 2);
-      }
-      if (((_a = settings == null ? void 0 : settings.NotifyServer) == null ? void 0 : _a.Enabled) && (notify == null ? void 0 : notify.Enabled) && (notify == null ? void 0 : notify.Topic)) {
-        const server = settings == null ? void 0 : settings.NotifyServer;
-        const auth = ((_b = server == null ? void 0 : server.Credentials) == null ? void 0 : _b.Username) && ((_c = server == null ? void 0 : server.Credentials) == null ? void 0 : _c.Password) ? { username: (_e = (_d = settings == null ? void 0 : settings.NotifyServer) == null ? void 0 : _d.Credentials) == null ? void 0 : _e.Username, password: (_f = server == null ? void 0 : server.Credentials) == null ? void 0 : _f.Password } : void 0;
-        const attachment = metadata.eas && (server == null ? void 0 : server.Attachments) ? `${server == null ? void 0 : server.Attachments}/${metadata.name}_${metadata.status}_${metadata.tracking}.wav` : void 0;
-        yield createHttp(__spreadProps(__spreadValues({
-          url: `${(_g = server == null ? void 0 : server.Server) == null ? void 0 : _g.replace(/\/$/, "")}/${(_h = listener2 == null ? void 0 : listener2.NotificationServer) == null ? void 0 : _h.Topic}`,
-          timeout: 15e3,
-          method: "POST"
-        }, auth && { auth }), {
-          headers: __spreadValues({
-            "Title": `${metadata.name} (${metadata.status})`,
-            "Tags": (_j = (_i = properties2.parameters.tags) == null ? void 0 : _i.join(",")) != null ? _j : "N/A",
-            "Expires": new Date(properties2.expires).getTime(),
-            "Priority": (notify == null ? void 0 : notify.Priority) ? notify.Priority.toString() : "5"
-          }, attachment && { "Attach": attachment }),
-          body: getStringText(event)
-        }));
-      }
-      if ((webhook == null ? void 0 : webhook.Enabled) && (webhook == null ? void 0 : webhook.Destination)) {
-        const isRatelimited = setTimeoutAction({ identifier: webhook.Destination, interval: ((_k = webhook.Ratelimit) != null ? _k : 2) * 2, max: (_l = webhook.Ratelimit) != null ? _l : 2, addTime: true });
-        const form = new FormData();
-        const embed = {
-          title: `${metadata.name} (${metadata.status})`,
-          description: getEmebedText(event),
-          fields: [],
-          color: 16711680,
-          timestamp: (/* @__PURE__ */ new Date()).toISOString(),
-          footer: { text: (_m = webhook.Title) != null ? _m : `AtmosphericX` }
-        };
-        if (isRatelimited.limited) {
-          return;
+          metadata.text = metadata.raw;
         }
-        if (metadata.description && !metadata.expired) {
-          if (metadata.description.length > 900) {
-            metadata.description = metadata.description.substring(0, 900) + "\n\n[Message truncated due to length]";
+        if ((uploads == null ? void 0 : uploads.JSON) && metadata.json === null) {
+          const t2 = performance.now();
+          if (jsonArchiveDir) {
+            const file = `${jsonArchiveDir}/${eventBaseName}.json`.replace(/[\\:*?"<>|]/g, "_").replace(/\s+/g, " ").trim();
+            yield (0, import_promises.mkdir)(jsonArchiveDir, { recursive: true });
+            yield (0, import_promises.writeFile)(file, cleanedEventText);
+            SetDebug({
+              title: "Tasks/JSON",
+              message: `${Math.round(performance.now() - t2)}ms`
+            });
           }
-          embed.fields.push({
-            name: "Description",
-            value: metadata.description ? "```\n" + metadata.description.split("\n").map((l) => l.trim()).filter(Boolean).join("\n") + "\n```" : ""
-          });
+          metadata.json = cleanedEventText;
         }
-        if (((_n = metadata.attachments) == null ? void 0 : _n.length) > 0) {
-          metadata.attachments = metadata.attachments.slice(0, 5);
-          embed.fields.push({
-            name: "Attachments",
-            value: metadata.attachments.map((attachment) => `- [${attachment.name.length > 45 ? attachment.name.substring(0, 45) + "..." : attachment.name}](${attachment.link})`).join("\n")
+        if ((notifyServer == null ? void 0 : notifyServer.Enabled) && (notify == null ? void 0 : notify.Enabled) && (notify == null ? void 0 : notify.Topic)) {
+          let buttons = [];
+          const t2 = performance.now();
+          const auth = ((_b = notifyServer == null ? void 0 : notifyServer.Credentials) == null ? void 0 : _b.Username) && ((_c = notifyServer == null ? void 0 : notifyServer.Credentials) == null ? void 0 : _c.Password) ? { username: (_d = notifyServer == null ? void 0 : notifyServer.Credentials) == null ? void 0 : _d.Username, password: (_e = notifyServer == null ? void 0 : notifyServer.Credentials) == null ? void 0 : _e.Password } : void 0;
+          const image = (_f = metadata.attachments) == null ? void 0 : _f.find((a) => a.name === "Image: Graphic");
+          if ((_g = notifyServer == null ? void 0 : notifyServer.MediaStorage) == null ? void 0 : _g.EAS) {
+            if (metadata.eas) {
+              buttons.push({
+                "action": "view",
+                "label": "Listen",
+                "url": `${(_h = notifyServer == null ? void 0 : notifyServer.MediaStorage) == null ? void 0 : _h.EAS}/${metadata.name}_${metadata.status}_${metadata.tracking}.wav`
+              });
+            }
+          }
+          if (metadata.json) {
+            buttons.push({
+              "action": "view",
+              "label": "View JSON",
+              "url": `${(_i = notifyServer == null ? void 0 : notifyServer.MediaStorage) == null ? void 0 : _i.JSON}/${metadata.name}_${metadata.tracking}.json`
+            });
+          }
+          if (metadata.text) {
+            buttons.push({
+              "action": "view",
+              "label": "View Text",
+              "url": `${(_j = notifyServer == null ? void 0 : notifyServer.MediaStorage) == null ? void 0 : _j.TEXT}/${metadata.name}_${metadata.tracking}.txt`
+            });
+          }
+          if (image) {
+            buttons.push({
+              "action": "view",
+              "label": "View Image",
+              "url": image.link
+            });
+          }
+          yield CreateHttp(__spreadProps(__spreadValues({
+            url: `${(_k = notifyServer == null ? void 0 : notifyServer.Server) == null ? void 0 : _k.replace(/\/$/, "")}/${notify.Topic}`,
+            timeout: 15e3,
+            method: "PUT"
+          }, auth && { auth }), {
+            headers: __spreadValues({
+              "Title": `${metadata.name} (${metadata.status})`,
+              "Tags": (_m = (_l = properties.parameters.tags) == null ? void 0 : _l.join(",")) != null ? _m : "N/A",
+              "Priority": (_n = notify == null ? void 0 : notify.Priority) != null ? _n : "5"
+            }, buttons.length > 0 && { "Actions": JSON.stringify(buttons) }),
+            body: stringText
+          }));
+          SetDebug({
+            title: "Tasks/NTFY",
+            message: `${Math.round(performance.now() - t2)}ms`
           });
         }
-        if (uploads == null ? void 0 : uploads.File) {
-          form.append("fUpload", new Blob([Buffer.from(metadata.file)], { type: "application/text" }), `${properties2.event}_${properties2.status}_${properties2.metadata.tracking}.txt`);
-        }
-        if (uploads == null ? void 0 : uploads.JSON) {
-          form.append("fUpload2", new Blob([Buffer.from(metadata.json)], { type: "application/json" }), `${properties2.event}_${properties2.status}_${properties2.metadata.tracking}.json`);
-        }
-        if (uploads == null ? void 0 : uploads.EAS) {
-          if (metadata.eas) {
-            const file = (0, import_fs3.readFileSync)(metadata.eas);
-            form.append("fEas", new Blob([Buffer.from(file)], { type: "audio/mpeg" }), `${properties2.event}_${properties2.status}_${properties2.metadata.tracking}_eas.mp3`);
+        if ((webhook == null ? void 0 : webhook.Enabled) && (webhook == null ? void 0 : webhook.Destination)) {
+          const t2 = performance.now();
+          const isRatelimited = SetTimeoutAction({ identifier: webhook.Destination, interval: ((_o = webhook.Ratelimit) != null ? _o : 2) * 2, max: (_p = webhook.Ratelimit) != null ? _p : 2, addTime: true });
+          const form = new FormData();
+          const embed = {
+            title: `${metadata.name} (${metadata.status})`,
+            description: embedText,
+            fields: [],
+            color: 16711680,
+            timestamp: (/* @__PURE__ */ new Date()).toISOString(),
+            footer: { text: (_q = webhook.Title) != null ? _q : `AtmosphericX` }
+          };
+          if (isRatelimited.limited) {
+            return;
           }
+          if (metadata.description && !metadata.expired) {
+            const description = metadata.description.length > 900 ? metadata.description.substring(0, 900) + "\n\n[Message truncated due to length]" : metadata.description;
+            embed.fields.push({
+              name: "Description",
+              value: description ? "```\n" + description.split("\n").map((l) => l.trim()).filter(Boolean).join("\n") + "\n```" : ""
+            });
+          }
+          if (((_r = metadata.attachments) == null ? void 0 : _r.length) > 0) {
+            const attachments = metadata.attachments.slice(0, 5);
+            embed.fields.push({
+              name: "Attachments",
+              value: attachments.map((attachment) => `- [${attachment.name.length > 45 ? attachment.name.substring(0, 45) + "..." : attachment.name}](${attachment.link})`).join("\n")
+            });
+          }
+          if (uploads == null ? void 0 : uploads.TEXT) {
+            form.append("fUpload", new Blob([Buffer.from(metadata.text)], { type: "application/text" }), `${properties.event}_${properties.status}_${properties.metadata.tracking}.txt`);
+          }
+          if (uploads == null ? void 0 : uploads.JSON) {
+            form.append("fUpload2", new Blob([Buffer.from(metadata.json)], { type: "application/json" }), `${properties.event}_${properties.status}_${properties.metadata.tracking}.json`);
+          }
+          if (uploads == null ? void 0 : uploads.EAS) {
+            if (metadata.eas) {
+              const file = yield (0, import_promises.readFile)(metadata.eas);
+              form.append("fEas", new Blob([Buffer.from(file)], { type: "audio/mpeg" }), `${properties.event}_${properties.status}_${properties.metadata.tracking}_eas.mp3`);
+            }
+          }
+          form.append("payload_json", JSON.stringify({
+            username: (_s = webhook.Title) != null ? _s : "AtmosphericX",
+            content: (_t = webhook.Message) != null ? _t : "",
+            embeds: [embed]
+          }));
+          yield CreateHttp({
+            url: webhook.Destination,
+            timeout: 15e3,
+            method: `POST`,
+            body: form
+          });
+          SetDebug({
+            title: "Tasks/Webhook",
+            message: `${Math.round(performance.now() - t2)}ms`
+          });
         }
-        form.append("payload_json", JSON.stringify({
-          username: (_o = webhook.Title) != null ? _o : "AtmosphericX",
-          content: (_p = webhook.Message) != null ? _p : "",
-          embeds: [embed]
-        }));
-        yield createHttp({
-          url: webhook.Destination,
-          timeout: 15e3,
-          method: `POST`,
-          body: form
-        });
       }
     }
   }
-  setDebug({ title: `@manager.updateListener`, message: `Listener took ${performance.now() - tick} ms` });
+  SetDebug({ title: `Tasks`, message: `${Math.round(performance.now() - tick)}ms` });
 });
 
-// src/@modules/@utilities/utilities.getShapeNearestPoint.ts
-var getShapeNearestPoint = (coordinates, point) => {
+// src/@modules/@utilities/GetShapeNearestPoint.ts
+var GetShapeNearestPoint = (coordinates, point) => {
   if (!coordinates || !point) {
     return { proximity: false, point: [0, 0], distance: null };
   }
@@ -6786,18 +6930,21 @@ var getShapeNearestPoint = (coordinates, point) => {
   return { proximity: distanceMiles === 0, point: closestPoint, distance: distanceMiles, distanceKm, distanceMeters };
 };
 
-// src/@building/building.polygon.ts
-var getEventNodes = (event) => __async(null, null, function* () {
+// src/@building/GetEventNodes.ts
+var GetEventNodes = (event) => __async(null, null, function* () {
   var _a, _b;
+  const nodes = bootstrap.cache.nodes.features;
+  if (!nodes || nodes.length === 0) {
+    return { nodes: [], filtered: true, updated: Date.now() };
+  }
   const metadata = { nodes: [], proximity: false, filtered: false };
-  const geometry = yield getEventGeometry(event);
+  const geometry = yield GetEventGeometry(event);
   if (!geometry || !geometry.coordinates) {
     return { nodes: [], filtered: false, updated: Date.now() };
   }
-  const nodes = bootstrap.cache.nodes.features;
   for (const node of nodes) {
     const [longitude, latitude] = node.geometry.coordinates;
-    const getPoint = getShapeNearestPoint(geometry.coordinates, [longitude, latitude]);
+    const getPoint = GetShapeNearestPoint(geometry.coordinates, [longitude, latitude]);
     const miles = (_a = getPoint.distance) != null ? _a : null;
     const kilometers = Number((miles * 1.609344).toFixed(3));
     const info = {
@@ -6806,10 +6953,10 @@ var getEventNodes = (event) => __async(null, null, function* () {
       nearest: getPoint.point,
       miles,
       kilometers,
-      proximity: getPoint.proximity
+      proximity: false
     };
     metadata.nodes.push(info);
-    if (bootstrap.settings.GlobalSettings.EventFiltering.NodeLocationFiltering && miles < bootstrap.settings.GlobalSettings.NodeMinDistance) {
+    if (miles != null && bootstrap.settings.GlobalSettings.EventFiltering.NodeLocationFiltering && miles < bootstrap.settings.GlobalSettings.NodeMaxDistance) {
       metadata.proximity = true;
       info.proximity = true;
     }
@@ -6821,19 +6968,20 @@ var getEventNodes = (event) => __async(null, null, function* () {
   };
 });
 
-// src/@manager/manager.updateNodes.ts
-var updateNode = (selectedEvent) => __async(null, null, function* () {
+// src/@manager/UpdateNode.ts
+var UpdateNode = (selectedEvent) => __async(null, null, function* () {
   const events = bootstrap.cache.events.features;
   const ttl = bootstrap.settings.GlobalSettings.NodeTTL * 1e3;
   let total = 0;
+  const TTLEvents = selectedEvent ? [selectedEvent] : events.filter((evt) => {
+    var _a, _b, _c;
+    const lastUpdate = (_c = (_b = (_a = evt == null ? void 0 : evt.properties) == null ? void 0 : _a.metadata) == null ? void 0 : _b.updated) != null ? _c : null;
+    return lastUpdate == null || Date.now() - lastUpdate >= ttl;
+  });
+  if (TTLEvents.length === 0) return;
   function update(evt) {
     return __async(this, null, function* () {
-      var _a, _b, _c;
-      const lastUpdate = (_c = (_b = (_a = evt == null ? void 0 : evt.properties) == null ? void 0 : _a.metadata) == null ? void 0 : _b.updated) != null ? _c : null;
-      if (lastUpdate != null && Date.now() - lastUpdate < ttl) {
-        return evt;
-      }
-      const node = yield getEventNodes(evt);
+      const node = yield GetEventNodes(evt);
       if (node.nodes.length > 0) {
         total++;
       }
@@ -6842,16 +6990,13 @@ var updateNode = (selectedEvent) => __async(null, null, function* () {
       evt.properties.metadata.updated = node.updated;
     });
   }
-  if (!selectedEvent) {
-    yield Promise.all(events.map((evt) => __async(null, null, function* () {
-      yield update(evt);
-    })));
-  }
-  if (selectedEvent) {
-    yield update(selectedEvent);
+  const concurrency = 4;
+  for (let index = 0; index < TTLEvents.length; index += concurrency) {
+    const batch = TTLEvents.slice(index, index + concurrency);
+    yield Promise.all(batch.map((evt) => update(evt)));
   }
   if (total > 0) {
-    setEventEmit({
+    SetEventEmit({
       event: `onNodeUpdate`,
       metadata: {
         type: `global-update`,
@@ -6861,103 +7006,121 @@ var updateNode = (selectedEvent) => __async(null, null, function* () {
   }
 });
 
-// src/@manager/manager.mkEvent.ts
-var mkEvent = (event) => __async(null, null, function* () {
+// src/@manager/MakeEvents.ts
+var MakeEvents = (events) => __async(null, 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;
+  let tasked = [];
   const settings = bootstrap.settings;
-  const features = bootstrap.cache.events.features;
-  const getHash = event.properties.metadata.hash;
-  const getTracking = event.properties.metadata.tracking;
-  const isEntry = (_a = bootstrap.cache.hashes) == null ? void 0 : _a.find((hash) => hash.tracking === getTracking);
-  const isHashed = (_c = (_b = isEntry == null ? void 0 : isEntry.hashes) == null ? void 0 : _b.includes(getHash)) != null ? _c : false;
-  const getFeature = features.find((feature) => feature.properties.metadata.tracking === getTracking);
-  if (isHashed || event.properties.status_metadata.is_expired) return;
-  setHash(event, isEntry);
-  const isFilteredLocation = yield updateNode(event).then(() => event.properties.metadata.filtered_proximity);
-  if (!isFilteredLocation && !dict_global.includes(event.properties.event.toLowerCase()) && settings.GlobalSettings.EventFiltering.NodeLocationFiltering) {
-    return;
-  }
-  const isRatelimited = setTimeoutAction({ identifier: getTracking, interval: 1, max: 1, addTime: true });
-  if (!isRatelimited.limited) {
-    setEventEmit({
-      event: `onEventStatus`,
-      metadata: {
-        type: getFeature ? `Updated` : `New`,
-        event
-      },
-      message: `[${getFeature ? "Updated" : "New"}] ${event.properties.event} (${event.properties.status}) (${event.properties.metadata.tracking})`
-    });
-  }
-  if (settings.GlobalSettings.EventManagement) {
-    if (event.properties.status_metadata.is_issued || event.properties.status_metadata.is_updated) {
-      if (getFeature) {
-        const getIndex = features.indexOf(getFeature);
-        const cHistory = (_f = (_e = (_d = getFeature == null ? void 0 : getFeature.properties) == null ? void 0 : _d.metadata) == null ? void 0 : _e.history) != null ? _f : [];
-        const cLocations = (_i = (_h = (_g = getFeature == null ? void 0 : getFeature.properties) == null ? void 0 : _g.locations) == null ? void 0 : _h.split(";").map((l) => l.trim())) != null ? _i : [];
-        const cUgc = (_l = (_k = (_j = getFeature == null ? void 0 : getFeature.properties) == null ? void 0 : _j.geocode) == null ? void 0 : _k.ugc) != null ? _l : [];
-        const iHistory = (_o = (_n = (_m = event.properties) == null ? void 0 : _m.metadata) == null ? void 0 : _n.history) != null ? _o : [];
-        const iLocations = (_r = (_q = (_p = event.properties) == null ? void 0 : _p.locations) == null ? void 0 : _q.split(";").map((l) => l.trim())) != null ? _r : [];
-        const iUgc = (_u = (_t = (_s = event.properties) == null ? void 0 : _s.geocode) == null ? void 0 : _t.ugc) != null ? _u : [];
-        const mHistory = [...cHistory, ...iHistory].filter((v, i, a) => a.indexOf(v) === i).filter((v, i, a) => a.findIndex((h) => h.description === v.description && h.issued === v.issued) === i);
-        const mLocations = [...cLocations, ...iLocations].filter((v, i, a) => a.indexOf(v) === i).join("; ");
-        const mUgc = [...cUgc, ...iUgc].filter((v, i, a) => a.indexOf(v) === i);
-        bootstrap.cache.events.features[getIndex] = __spreadProps(__spreadValues({}, event), {
-          properties: __spreadProps(__spreadValues({}, event.properties), {
-            metadata: __spreadProps(__spreadValues({}, (_v = event == null ? void 0 : event.properties) == null ? void 0 : _v.metadata), {
-              history: mHistory
-            }),
-            locations: mLocations,
-            geocode: __spreadProps(__spreadValues({}, (_w = event == null ? void 0 : event.properties) == null ? void 0 : _w.geocode), {
-              ugc: mUgc
+  if (events.length === 0) return;
+  for (const event of events) {
+    const features = bootstrap.cache.events.features;
+    const getHash = event.properties.metadata.hash;
+    const getTracking = event.properties.metadata.tracking;
+    const isEntry = (_a = bootstrap.cache.hashes) == null ? void 0 : _a.find((hash) => hash.tracking === getTracking);
+    const isHashed = (_c = (_b = isEntry == null ? void 0 : isEntry.hashes) == null ? void 0 : _b.includes(getHash)) != null ? _c : false;
+    const isNodeFiltering = settings.GlobalSettings.EventFiltering.NodeLocationFiltering;
+    const getFeature = features.find((feature) => feature.properties.metadata.tracking === getTracking);
+    if (isHashed || event.properties.status_metadata.is_expired) return;
+    SetHash(event, isEntry);
+    if (isNodeFiltering) {
+      yield UpdateNode(event);
+      if (!event.properties.metadata.filtered_proximity && !EnumGlobalFilter.includes(event.properties.event.toLowerCase())) {
+        return;
+      }
+    }
+    const isRatelimited = SetTimeoutAction({ identifier: getTracking, interval: 1, max: 1, addTime: true });
+    if (!isRatelimited.limited) {
+      SetEventEmit({
+        event: `onEventStatus`,
+        metadata: {
+          type: getFeature ? `Updated` : `New`,
+          event
+        },
+        message: `[${getFeature ? "Updated" : "New"}] ${event.properties.event} (${event.properties.status}) (${event.properties.metadata.tracking})`
+      });
+    }
+    if (settings.GlobalSettings.EventManagement) {
+      if (event.properties.status_metadata.is_issued || event.properties.status_metadata.is_updated) {
+        if (getFeature) {
+          const getIndex = features.indexOf(getFeature);
+          const cHistory = (_f = (_e = (_d = getFeature == null ? void 0 : getFeature.properties) == null ? void 0 : _d.metadata) == null ? void 0 : _e.history) != null ? _f : [];
+          const cLocations = (_i = (_h = (_g = getFeature == null ? void 0 : getFeature.properties) == null ? void 0 : _g.locations) == null ? void 0 : _h.split(";").map((l) => l.trim())) != null ? _i : [];
+          const cUgc = (_l = (_k = (_j = getFeature == null ? void 0 : getFeature.properties) == null ? void 0 : _j.geocode) == null ? void 0 : _k.ugc) != null ? _l : [];
+          const iHistory = (_o = (_n = (_m = event.properties) == null ? void 0 : _m.metadata) == null ? void 0 : _n.history) != null ? _o : [];
+          const iLocations = (_r = (_q = (_p = event.properties) == null ? void 0 : _p.locations) == null ? void 0 : _q.split(";").map((l) => l.trim())) != null ? _r : [];
+          const iUgc = (_u = (_t = (_s = event.properties) == null ? void 0 : _s.geocode) == null ? void 0 : _t.ugc) != null ? _u : [];
+          const mHistory = [...cHistory, ...iHistory].filter((v, i, a) => a.indexOf(v) === i).filter((v, i, a) => a.findIndex((h) => h.description === v.description && h.issued === v.issued) === i);
+          const mLocations = [...cLocations, ...iLocations].filter((v, i, a) => a.indexOf(v) === i).join("; ");
+          const mUgc = [...cUgc, ...iUgc].filter((v, i, a) => a.indexOf(v) === i);
+          bootstrap.cache.events.features[getIndex] = __spreadProps(__spreadValues({}, event), {
+            properties: __spreadProps(__spreadValues({}, event.properties), {
+              metadata: __spreadProps(__spreadValues({}, (_v = event == null ? void 0 : event.properties) == null ? void 0 : _v.metadata), {
+                history: mHistory
+              }),
+              locations: mLocations,
+              geocode: __spreadProps(__spreadValues({}, (_w = event == null ? void 0 : event.properties) == null ? void 0 : _w.geocode), {
+                ugc: mUgc
+              })
             })
-          })
-        });
-        yield updateListener(bootstrap.cache.events.features[getIndex]);
-      } else {
-        features.push(event);
-        yield updateListener(event);
+          });
+          tasked.push(bootstrap.cache.events.features[getIndex]);
+        } else {
+          features.push(event);
+          tasked.push(event);
+        }
       }
     }
   }
+  yield Tasks(tasked);
+  SetEventEmit({ event: `onEventCache`, metadata: bootstrap.cache.events, limited: true });
 });
 
-// src/@manager/manager.rmEvent.ts
-var rmEvent = (event) => __async(null, null, function* () {
-  const gSelect = event;
-  const gEvent = bootstrap.cache.events.features.find((f) => {
-    var _a, _b, _c, _d;
-    return ((_b = (_a = f == null ? void 0 : f.properties) == null ? void 0 : _a.metadata) == null ? void 0 : _b.tracking) === ((_d = (_c = event == null ? void 0 : event.properties) == null ? void 0 : _c.metadata) == null ? void 0 : _d.tracking);
+// src/@enums/Strings.ts
+var EnumStrings = {
+  cancellation: `{EVENT} has been allowed to expire. This event is no longer in effect.`
+};
+
+// src/@manager/RemoveEvent.ts
+var RemoveEvent = (event, isTimeBasedExpiration) => __async(null, null, function* () {
+  const gTracking = event.properties.metadata.tracking;
+  const isTrackingEventLogged = bootstrap.cache.events.features.find((f) => {
+    var _a, _b;
+    return ((_b = (_a = f == null ? void 0 : f.properties) == null ? void 0 : _a.metadata) == null ? void 0 : _b.tracking) === gTracking;
   });
-  const gStatement = event.properties.status_metadata.is_statement;
-  gSelect.properties.expires = (/* @__PURE__ */ new Date()).toISOString();
-  gSelect.properties.status = `Expired`;
-  gSelect.properties.status_metadata.is_expired = true;
-  if (gEvent) {
-    if (!gStatement) {
-      setEventEmit({
+  const isStatement = event.properties.status_metadata.is_statement;
+  if (isTrackingEventLogged) {
+    event.properties.expires = (/* @__PURE__ */ new Date()).toISOString();
+    event.properties.status = `Expired`;
+    event.properties.status_metadata.is_expired = true;
+    const description = isTimeBasedExpiration ? EnumStrings.cancellation.replace(`{SENDER}`, event.properties.geocode.office.name).replace(`{EVENT}`, event.properties.event) : event.properties.description;
+    event.properties.description = description;
+    event.properties.metadata.raw = isTimeBasedExpiration ? description : event.properties.metadata.raw;
+    event.properties.metadata.history.push({
+      description: isTimeBasedExpiration ? description : event.properties.description,
+      issued: event.properties.expires,
+      status: event.properties.status
+    });
+    bootstrap.cache.events.features.splice(bootstrap.cache.events.features.indexOf(isTrackingEventLogged), 1);
+    bootstrap.cache.hashes = bootstrap.cache.hashes.filter((hash) => hash.tracking !== gTracking);
+    if (!isStatement) {
+      SetEventEmit({
         event: `onEventStatus`,
-        metadata: {
-          type: `Removed`,
-          event
-        },
-        message: `[Removed] ${event.properties.event} (${event.properties.status}) (${event.properties.metadata.tracking})`
+        metadata: { type: `Removed`, event },
+        message: `[Removed] ${event.properties.event} (${event.properties.status}) (${gTracking})`
       });
-      setEventEmit({ event: `onExpiredProduct`, metadata: event });
+      yield Tasks([event]);
     }
-    bootstrap.cache.events.features.splice(bootstrap.cache.events.features.indexOf(gEvent), 1);
-    bootstrap.cache.hashes = bootstrap.cache.hashes.filter((hash) => hash.tracking !== event.properties.metadata.tracking);
-    setTimeoutAction({ identifier: event.properties.metadata.tracking, expire: true });
-    if (!gStatement) yield updateListener(gSelect);
+    SetTimeoutAction({ identifier: gTracking, expire: true });
   }
-  setEventEmit({
+  SetEventEmit({
     event: `onEventCache`,
     metadata: bootstrap.cache.events,
     limited: true
   });
 });
 
-// src/@dictionaries/dictionaries.states.ts
-var dict_states = {
+// src/@enums/States.ts
+var EnumStates = {
   "AL": "Alabama",
   "AK": "Alaska",
   "AZ": "Arizona",
@@ -7011,8 +7174,8 @@ var dict_states = {
   "DC": "District of Columbia"
 };
 
-// src/@modules/@utilities/utilities.getLatestIssuance.ts
-var getLatestIssuance = () => {
+// src/@modules/@utilities/GetLatestIssuance.ts
+var GetLatestIssuance = () => {
   const now = /* @__PURE__ */ new Date();
   const current = now.getUTCHours() * 100 + now.getUTCMinutes();
   const issuances = [100, 600, 1300, 1630, 2e3];
@@ -7025,11 +7188,12 @@ var getLatestIssuance = () => {
   return latest.toString().padStart(4, "0");
 };
 
-// src/@building/building.attachments.ts
-var getEventAttachments = (event) => {
+// src/@building/GetEventAttachments.ts
+var GetEventAttachments = (event) => {
   var _a, _b, _c, _d, _e, _f, _g;
   let attachments = [];
-  const issuanceTime = getLatestIssuance();
+  const settings = bootstrap.settings;
+  const issuanceTime = GetLatestIssuance();
   const spcNumber = (_b = (_a = event == null ? void 0 : event.properties) == null ? void 0 : _a.discussion_parameters) == null ? void 0 : _b.discussion_number;
   const watchNumber = (_d = (_c = event == null ? void 0 : event.properties) == null ? void 0 : _c.watch_parameters) == null ? void 0 : _d.watch_number;
   const locations = (_e = event == null ? void 0 : event.properties) == null ? void 0 : _e.locations_array;
@@ -7046,34 +7210,36 @@ var getEventAttachments = (event) => {
   if (events.find((e) => e.target === event.properties.event)) {
     attachments.push({ name: `Image: Graphic`, link: events.find((e) => e.target.toLowerCase() === event.properties.event.toLowerCase()).attachment });
   }
-  for (const location of locations) {
-    if (dict_expressions.location.test(location)) {
-      const lines = [`Northern`, `Southern`, `Eastern`, `Western`, `Inland`, `Costal`, `County`];
-      const county = (_f = location == null ? void 0 : location.split(",")[0]) == null ? void 0 : _f.trim().replace(new RegExp(`^(${lines.join("|")}) `), "");
-      const state = dict_states[(_g = location == null ? void 0 : location.split(",")[1]) == null ? void 0 : _g.trim()];
-      const feeds = bootstrap.database.prepare(`SELECT * FROM broadcastify WHERE state = ? AND county = ?`).all(state, county).sort((a, b) => {
-        const typeOrder = ["Other", "Public Safety"];
-        const indexA = typeOrder.indexOf(a.type);
-        const indexB = typeOrder.indexOf(b.type);
-        return indexA - indexB;
-      });
-      const tags = bootstrap.settings.BroadcastifySettings.BroadcastifyTags;
-      const filtered = feeds.filter((feed) => tags.includes(feed.type));
-      if (filtered.length > 0) {
-        filtered.map((filtered2) => {
-          if (!attachments.some((a) => a.link === filtered2.link)) {
-            attachments.push({ name: `${filtered2.type}: ${filtered2.feed}`, link: filtered2.link });
-          }
+  if (settings.BroadcastifySettings.BroadcastifyAttachments) {
+    for (const location of locations) {
+      if (EnumExpressions.location.test(location)) {
+        const lines = [`Northern`, `Southern`, `Eastern`, `Western`, `Inland`, `Costal`, `County`];
+        const county = (_f = location == null ? void 0 : location.split(",")[0]) == null ? void 0 : _f.trim().replace(new RegExp(`^(${lines.join("|")}) `), "");
+        const state = EnumStates[(_g = location == null ? void 0 : location.split(",")[1]) == null ? void 0 : _g.trim()];
+        const feeds = bootstrap.database.prepare(`SELECT * FROM broadcastify WHERE state = ? AND county = ?`).all(state, county).sort((a, b) => {
+          const typeOrder = ["Other", "Public Safety"];
+          const indexA = typeOrder.indexOf(a.type);
+          const indexB = typeOrder.indexOf(b.type);
+          return indexA - indexB;
         });
+        const tags = bootstrap.settings.BroadcastifySettings.BroadcastifyTags;
+        const filtered = feeds.filter((feed) => tags.includes(feed.type));
+        if (filtered.length > 0) {
+          filtered.map((filtered2) => {
+            if (!attachments.some((a) => a.link === filtered2.link)) {
+              attachments.push({ name: `${filtered2.type}: ${filtered2.feed}`, link: filtered2.link });
+            }
+          });
+        }
       }
     }
   }
   return attachments;
 };
 
-// src/@building/building.validate.ts
+// src/@manager/ValidateEvents.ts
 var import_crypto = require("crypto");
-var validateEvents = (events) => __async(null, null, function* () {
+var ValidateEvents = (events) => __async(null, null, function* () {
   const tick = performance.now();
   if (events.length === 0) return;
   const configurations = bootstrap.settings;
@@ -7091,21 +7257,21 @@ var validateEvents = (events) => __async(null, null, function* () {
   }
   const isFiltered = (define2) => {
     var _a, _b, _c, _d;
-    const properties2 = define2.properties;
-    const zones = properties2.geocode.ugc;
-    const icao = properties2.geocode.office.office;
-    if (properties2.status_metadata.is_test) {
-      setEventEmit({ event: `onTestProduct`, metadata: define2 });
+    const properties = define2.properties;
+    const zones = properties.geocode.ugc;
+    const icao = properties.geocode.office.office;
+    if (properties.status_metadata.is_test) {
+      SetEventEmit({ event: `onTestProduct`, metadata: define2 });
       if (bools == null ? void 0 : bools.IgnoreTestProducts) return true;
     }
-    if (properties2.status_metadata.is_expired) {
-      setEventEmit({ event: `onExpiredProduct`, metadata: define2 });
-      rmEvent(define2);
+    if (properties.status_metadata.is_expired) {
+      SetEventEmit({ event: `onExpiredProduct`, metadata: define2 });
+      RemoveEvent(define2, false);
       return true;
     }
-    if (((_b = (_a = properties2.metadata) == null ? void 0 : _a.vtec) == null ? void 0 : _b.is_watch) && properties2.metadata.source != `events.api`) {
-      const isSPC = (_d = (_c = properties2.metadata) == null ? void 0 : _c.vtec) == null ? void 0 : _d.prediction_center;
-      setEventEmit({ event: isSPC ? `onStormPredictionWatch` : `onNonStormPredictionWatch`, metadata: define2 });
+    if (((_b = (_a = properties.metadata) == null ? void 0 : _a.vtec) == null ? void 0 : _b.is_watch) && properties.metadata.source != `events.api`) {
+      const isSPC = (_d = (_c = properties.metadata) == null ? void 0 : _c.vtec) == null ? void 0 : _d.prediction_center;
+      SetEventEmit({ event: isSPC ? `onStormPredictionWatch` : `onNonStormPredictionWatch`, metadata: define2 });
       if ((bools == null ? void 0 : bools.SPCWatchesOnly) && !isSPC) {
         return true;
       }
@@ -7116,43 +7282,43 @@ var validateEvents = (events) => __async(null, null, function* () {
     for (const key in sets) {
       const setting = sets[key];
       const values = [...setting];
-      if (key === "ListeningEvents" && setting.size > 0 && !getMatched(values, define2.properties.event)) {
-        setEventEmit({
+      if (key === "ListeningEvents" && setting.size > 0 && !GetMatched(values, define2.properties.event)) {
+        SetEventEmit({
           event: `onFilteredEvent`,
           metadata: define2
         });
         return true;
       }
-      if (key === "IgnoredEvents" && setting.size > 0 && getMatched(values, define2.properties.event)) {
-        setEventEmit({
+      if (key === "IgnoredEvents" && setting.size > 0 && GetMatched(values, define2.properties.event)) {
+        SetEventEmit({
           event: `onIgnoredEvent`,
           metadata: define2
         });
         return true;
       }
       if (key === "ListeningICAO" && setting.size > 0 && icao != null && !setting.has(icao.toLowerCase())) {
-        setEventEmit({
+        SetEventEmit({
           event: `onFilteredICAO`,
           metadata: define2
         });
         return true;
       }
       if (key === "IgnoredICAO" && setting.size > 0 && icao != null && setting.has(icao.toLowerCase())) {
-        setEventEmit({
+        SetEventEmit({
           event: `onIgnoredICAO`,
           metadata: define2
         });
         return true;
       }
-      if (key === "ListeningUGC" && setting.size > 0 && zones.length > 0 && !zones.some((ugc2) => setting.has(ugc2.toLowerCase()))) {
-        setEventEmit({
+      if (key === "ListeningUGC" && setting.size > 0 && zones.length > 0 && !zones.some((ugc) => setting.has(ugc.toLowerCase()))) {
+        SetEventEmit({
           event: `onFilteredUGC`,
           metadata: define2
         });
         return true;
       }
-      if (key === "ListeningStates" && setting.size > 0 && zones.length > 0 && !zones.some((ugc2) => setting.has(ugc2.substring(0, 2).toLowerCase()))) {
-        setEventEmit({
+      if (key === "ListeningStates" && setting.size > 0 && zones.length > 0 && !zones.some((ugc) => setting.has(ugc.substring(0, 2).toLowerCase()))) {
+        SetEventEmit({
           event: `onFilteredState`,
           metadata: define2
         });
@@ -7162,37 +7328,29 @@ var validateEvents = (events) => __async(null, null, function* () {
     return false;
   };
   const filtering = events.filter((event) => {
-    var _a;
     bootstrap.cache.processed = bootstrap.cache.processed.filter((e) => e !== event);
-    const define2 = getEventSignature(event);
-    const properties2 = define2.properties;
-    (_a = properties2 == null ? void 0 : properties2.metadata) == null ? true : delete _a.ms;
-    const enhanced = properties2.event = getEventEnhancedName(event);
+    const define2 = GetEventSignature(event);
+    const pre = __spreadProps(__spreadValues({}, define2), { properties: __spreadProps(__spreadValues({}, define2.properties), { metadata: __spreadValues({}, define2.properties.metadata) }) });
+    const properties = define2.properties;
+    delete pre.properties.metadata.ms;
+    delete pre.properties.metadata.header;
+    const enhanced = properties.event = GetEventEnhancedName(event);
     const filtered = isFiltered(define2);
     if (!filtered) {
-      event.geometry = !(bools == null ? void 0 : bools.DisableGeometryParsing) ? getEventGeometry(event) : null;
-      properties2.metadata.attachments = getEventAttachments(event);
+      event.geometry = !(bools == null ? void 0 : bools.DisableGeometryParsing) ? GetEventGeometry(event) : null;
+      properties.metadata.attachments = GetEventAttachments(event);
     }
-    properties2.metadata.hash = (0, import_crypto.createHash)("sha256").update(JSON.stringify(properties2)).digest("hex");
-    setEventEmit({ event: `onProductType${enhanced.replace(/\s+/g, "")}`, metadata: define2 });
+    properties.metadata.hash = (0, import_crypto.createHash)("sha256").update(JSON.stringify(pre)).digest("hex");
+    SetEventEmit({ event: `onProductType${enhanced.replace(/\s+/g, "")}`, metadata: define2 });
     return !filtered;
   });
-  if (filtering.length > 0) {
-    for (const event of filtering) {
-      yield mkEvent(event);
-    }
-  }
-  yield updateNode();
-  setEventEmit({
-    event: `onEventCache`,
-    metadata: bootstrap.cache.events,
-    limited: true
-  });
-  setDebug({ title: `@building.validate`, message: `Filtered ${filtering.length} events which took ${performance.now() - tick} ms` });
+  SetDebug({ title: `ValidateEvents (PRE) (${filtering.length}/${events.length})`, message: `${Math.round(performance.now() - tick)}ms` });
+  yield MakeEvents(filtering);
+  SetDebug({ title: `MakeEvents (${filtering.length}/${events.length})`, message: `${Math.round(performance.now() - tick)}ms` });
 });
 
-// src/@building/building.create.ts
-var createEvent = (stanza, ignorePushing) => __async(null, null, function* () {
+// src/@building/CreateEvent.ts
+var CreateEvent = (stanza, ignorePushing) => __async(null, null, function* () {
   const settings = bootstrap.settings;
   const StanzaSettings = settings.NOAAWeatherWireServiceSettings.StanzaSettings;
   const isVtecEvent = stanza.isVTEC && stanza.isUGC;
@@ -7201,26 +7359,26 @@ var createEvent = (stanza, ignorePushing) => __async(null, null, function* () {
   const isNWWS = stanza.isNWWS;
   switch (true) {
     case !isNWWS:
-      yield api(stanza);
+      yield ParseAPI(stanza);
       break;
     case (isNWWS && !StanzaSettings.DisableVTEC && isVtecEvent):
-      yield vtec(stanza);
+      yield ParseVTEC(stanza);
       break;
     case (isNWWS && !StanzaSettings.DisableUGC && isUgcEvent):
-      yield ugc(stanza);
+      yield ParseUGC(stanza);
       break;
     case (isNWWS && !StanzaSettings.DisableText && isTextEvent):
-      yield text(stanza);
+      yield ParseText(stanza);
       break;
   }
   if (!ignorePushing) {
-    validateEvents(bootstrap.cache.processed);
+    yield ValidateEvents(bootstrap.cache.processed);
   }
   return "nothing picked";
 });
 
-// src/@modules/@database/database.stanza.ts
-var importStanza = (stanza) => __async(null, null, function* () {
+// src/@modules/@database/ImportStanza.ts
+var ImportStanza = (stanza) => __async(null, null, function* () {
   const settings = bootstrap.settings;
   try {
     if (!settings.NOAAWeatherWireServiceSettings.CacheSettings.Enabled) {
@@ -7236,17 +7394,17 @@ var importStanza = (stanza) => __async(null, null, function* () {
       }
     }
   } catch (error) {
-    setWarning({ message: `An error occurred while importing stanza: ${error.message}` });
+    SetWarning({ message: `An error occurred while importing stanza: ${error.message}` });
   }
 });
 
-// src/@modules/@xmpp/xmpp.xStanza.ts
-var xStanza = () => {
+// src/@modules/@xmpp/StanzaXMPP.ts
+var StanzaXMPP = () => {
   bootstrap.session_xmpp.on(`stanza`, (stanza) => __async(null, null, function* () {
     var _a, _b, _c, _d;
     const msgFrom = (_b = (_a = stanza == null ? void 0 : stanza.attrs) == null ? void 0 : _a.from) != null ? _b : ``;
     const msgType = (_d = (_c = stanza == null ? void 0 : stanza.attrs) == null ? void 0 : _c.type) != null ? _d : ``;
-    setEventEmit({
+    SetEventEmit({
       event: `onServiceStatus`,
       metadata: {
         message: stanza,
@@ -7256,18 +7414,18 @@ var xStanza = () => {
     });
     bootstrap.cache.lastStanza = Date.now();
     if (stanza.is(`message`)) {
-      const result = validate({ stanza });
+      const result = ValidateStanza({ stanza });
       const isSkippable = result.isIgnored || result.isCapEvent || result.isCapEvent && !result.isCapAreaDescription;
       if (isSkippable) {
         return;
       }
-      yield createEvent(result);
-      yield importStanza(result);
+      yield CreateEvent(result);
+      yield ImportStanza(result);
     }
     if (stanza.is(`presence`) && msgFrom.startsWith("nwws@conference.nwws-oi.weather.gov/")) {
       const getOccupant = msgFrom.split(`/`).slice(1).join(`/`);
       const getAvailability = msgType === `unavailable`;
-      setEventEmit({
+      SetEventEmit({
         event: `onServiceStatus`,
         metadata: {
           message: `Occupant ${getOccupant} has ${getAvailability ? `left` : `joined`} the room`,
@@ -7280,8 +7438,8 @@ var xStanza = () => {
   }));
 };
 
-// src/@modules/@xmpp/xmpp.xDeploy.ts
-var xDeploy = () => __async(null, null, function* () {
+// src/@modules/@xmpp/DeployXMPP.ts
+var DeployXMPP = () => __async(null, null, function* () {
   var _a, _b;
   let session;
   const settings = bootstrap.settings;
@@ -7293,13 +7451,13 @@ var xDeploy = () => __async(null, null, function* () {
     password: settings.NOAAWeatherWireServiceSettings.CredentialSettings.Password
   });
   try {
-    yield xOffline();
-    yield xError();
-    yield xStanza();
-    yield xOnline();
+    yield OfflineXMPP();
+    yield ErrorXMPP();
+    yield StanzaXMPP();
+    yield OnlineXMPP();
     yield session.start();
   } catch (error) {
-    setEventEmit({
+    SetEventEmit({
       event: `onServiceStatus`,
       metadata: {
         message: `Error occured while starting XMPP Session: ${error}`,
@@ -7311,8 +7469,8 @@ var xDeploy = () => __async(null, null, function* () {
   }
 });
 
-// src/@dictionaries/dictionaries.shapefiles.ts
-var dict_shapefiles = [
+// src/@enums/Shapefiles.ts
+var EnumShapefiles = [
   { name: "us_counties", id: "C", link: "https://www.weather.gov/source/gis/Shapefiles/County/c_16ap26.zip" },
   { name: "us_states_territories", id: "Z", link: "https://www.weather.gov/source/gis/Shapefiles/County/s_16ap26.zip" },
   { name: "fire_weather_zones", id: "Z", link: "https://www.weather.gov/source/gis/Shapefiles/WSOM/fz16ap26.zip" },
@@ -7324,8 +7482,8 @@ var dict_shapefiles = [
   { name: "high_seas_marine_zones", id: "Z", link: "https://www.weather.gov/source/gis/Shapefiles/WSOM/hz17fe26.zip" }
 ];
 
-// src/@modules/@utilities/utilities.setSleep.ts
-var setSleep = (options) => __async(null, null, function* () {
+// src/@modules/@utilities/SetSleep.ts
+var SetSleep = (options) => __async(null, null, function* () {
   return new Promise((resolve6) => {
     setTimeout(() => {
       resolve6();
@@ -7333,31 +7491,31 @@ var setSleep = (options) => __async(null, null, function* () {
   });
 });
 
-// src/@modules/@database/database.shapefiles.ts
-var import_fs4 = require("fs");
+// src/@modules/@database/ImportShapefiles.ts
+var import_fs3 = require("fs");
 var import_path3 = require("path");
 var import_jszip = require("jszip");
 var import_shapefile = require("shapefile");
-var importShapefiles = () => __async(null, null, function* () {
+var ImportShapefiles = () => __async(null, null, function* () {
   var _a, _b;
   const settings = bootstrap.settings;
   try {
     const tShapefiles = bootstrap.database.prepare(`SELECT COUNT(*) AS count FROM shapefiles`).get().count;
     if (tShapefiles === 0) {
-      yield setSleep({ timeout: 1e3 });
-      for (const shapefile of dict_shapefiles) {
+      yield SetSleep({ timeout: 1e3 });
+      for (const shapefile of EnumShapefiles) {
         const response2 = yield fetch(shapefile.link);
         const arrayBuff = yield response2.arrayBuffer();
         const content = yield (0, import_jszip.loadAsync)(arrayBuff);
         const directory = (0, import_path3.resolve)(__dirname, `../../shapefiles`);
-        if (!(0, import_fs4.existsSync)(directory)) {
-          (0, import_fs4.mkdirSync)(directory, { recursive: true });
+        if (!(0, import_fs3.existsSync)(directory)) {
+          (0, import_fs3.mkdirSync)(directory, { recursive: true });
         }
         for (const file of Object.keys(content.files)) {
           if (file.endsWith(".shp") || file.endsWith(".dbf")) {
             const data = yield content.files[file].async(`nodebuffer`);
             const output = (0, import_path3.resolve)(directory, `${(_a = shapefile == null ? void 0 : shapefile.name) != null ? _a : ``}_${(_b = shapefile == null ? void 0 : shapefile.id) != null ? _b : ``}${(0, import_path3.extname)(file)}`);
-            (0, import_fs4.writeFileSync)(output, data);
+            (0, import_fs3.writeFileSync)(output, data);
           }
         }
         const filepath = (0, import_path3.resolve)(__dirname, "../../shapefiles", shapefile.name + "_" + shapefile.id);
@@ -7365,43 +7523,43 @@ var importShapefiles = () => __async(null, null, function* () {
           filepath,
           filepath
         );
-        setWarning({ message: `Importing ${features.length} features from ${shapefile.name}_${shapefile.id} for Shapefiles` });
+        SetWarning({ message: `Importing ${features.length} features from ${shapefile.name}_${shapefile.id} for Shapefiles` });
         const insert = bootstrap.database.prepare(`INSERT OR REPLACE INTO shapefiles (id, location, geometry) VALUES (?, ?, ?)`);
         const transaction = bootstrap.database.transaction((entries) => {
           var _a2, _b2, _c;
           for (const entry of entries) {
-            const { properties: properties2, geometry } = entry;
+            const { properties, geometry } = entry;
             let final2, location;
-            if (properties2.FIPS) {
-              final2 = `${properties2.STATE}${shapefile.id}${properties2.FIPS.substring(2)}`;
-              location = `${properties2.COUNTYNAME}, ${properties2.STATE}`;
-            } else if (properties2.FULLSTAID) {
-              final2 = `${properties2.ST}${shapefile.id}${properties2.WFO}`;
-              location = `${properties2.CITY}, ${properties2.STATE}`;
-            } else if (properties2.STATE) {
-              final2 = `${properties2.STATE}${shapefile.id}${(_a2 = properties2.ZONE) != null ? _a2 : properties2.SITE_ID}`;
-              location = `${(_b2 = properties2.NAME) != null ? _b2 : `${properties2.RFC_NAME} ${properties2.RFC_CITY}`}, ${properties2.STATE}`;
+            if (properties.FIPS) {
+              final2 = `${properties.STATE}${shapefile.id}${properties.FIPS.substring(2)}`;
+              location = `${properties.COUNTYNAME}, ${properties.STATE}`;
+            } else if (properties.FULLSTAID) {
+              final2 = `${properties.ST}${shapefile.id}${properties.WFO}`;
+              location = `${properties.CITY}, ${properties.STATE}`;
+            } else if (properties.STATE) {
+              final2 = `${properties.STATE}${shapefile.id}${(_a2 = properties.ZONE) != null ? _a2 : properties.SITE_ID}`;
+              location = `${(_b2 = properties.NAME) != null ? _b2 : `${properties.RFC_NAME} ${properties.RFC_CITY}`}, ${properties.STATE}`;
             } else {
-              final2 = (_c = properties2.ID) != null ? _c : properties2.WFO;
-              location = properties2.NAME;
+              final2 = (_c = properties.ID) != null ? _c : properties.WFO;
+              location = properties.NAME;
             }
             insert.run(final2, location, JSON.stringify(geometry));
           }
         });
-        (0, import_fs4.unlinkSync)(`${filepath}.shp`);
-        (0, import_fs4.unlinkSync)(`${filepath}.dbf`);
+        (0, import_fs3.unlinkSync)(`${filepath}.shp`);
+        (0, import_fs3.unlinkSync)(`${filepath}.dbf`);
         transaction(features);
       }
-      (0, import_fs4.rm)((0, import_path3.resolve)(__dirname, "../../shapefiles"), { recursive: true, force: true }, () => {
+      (0, import_fs3.rm)((0, import_path3.resolve)(__dirname, "../../shapefiles"), { recursive: true, force: true }, () => {
       });
     }
   } catch (error) {
-    setWarning({ message: `An error occurred while compiling shapefiles: ${error.message}` });
+    SetWarning({ message: `An error occurred while compiling shapefiles: ${error.message}` });
   }
 });
 
-// src/@modules/@database/database.broadcastify.ts
-var importBroadcastify = () => __async(null, null, function* () {
+// src/@modules/@database/ImportBroadcastify.ts
+var ImportBroadcastify = () => __async(null, null, function* () {
   const settings = bootstrap.settings;
   const isBroadcastifyImported = bootstrap.database.prepare(`SELECT name FROM sqlite_master WHERE type='table' AND name='broadcastify';`).get();
   if (!settings.BroadcastifySettings.BroadcastifyAttachments) {
@@ -7410,7 +7568,7 @@ var importBroadcastify = () => __async(null, null, function* () {
   if (isBroadcastifyImported) {
     return;
   }
-  const broadcastify = yield createHttp({
+  const broadcastify = yield CreateHttp({
     url: settings.BroadcastifySettings.BroadcastifyDatabase,
     timeout: 5e3
   });
@@ -7425,7 +7583,7 @@ var importBroadcastify = () => __async(null, null, function* () {
     });
     const batch = [];
     for (const state of states) {
-      setWarning({ message: `Importing ${state.counties.length} counties from ${state.state} for Broadcastify` });
+      SetWarning({ message: `Importing ${state.counties.length} counties from ${state.state} for Broadcastify` });
       for (const county of state.counties) {
         const countyName = county.county;
         for (const feed of county.feeds) {
@@ -7441,17 +7599,20 @@ var importBroadcastify = () => __async(null, null, function* () {
     }
     transaction(batch);
   }
+  if (broadcastify.error) {
+    SetWarning({ message: `Error importing Broadcastify data: ${broadcastify.message}` });
+  }
 });
 
-// src/@modules/@database/database.init.ts
-var import_fs5 = require("fs");
+// src/@modules/@database/InitializeDatabase.ts
+var import_fs4 = require("fs");
 var import_better_sqlite3 = __toESM(require("better-sqlite3"));
-var initializeDatabase = () => __async(null, null, function* () {
+var InitializeDatabase = () => __async(null, null, function* () {
   const settings = bootstrap.settings;
   try {
-    if (!(0, import_fs5.existsSync)(settings.Database)) {
-      (0, import_fs5.writeFileSync)(settings.Database, "");
-      setWarning({ message: `Creating new database at ${settings.Database}` });
+    if (!(0, import_fs4.existsSync)(settings.Database)) {
+      (0, import_fs4.writeFileSync)(settings.Database, "");
+      SetWarning({ message: `Creating new database at ${settings.Database}` });
     }
     bootstrap.database = new import_better_sqlite3.default(settings.Database);
     bootstrap.database.prepare(`CREATE TABLE IF NOT EXISTS stanzas ( id INTEGER PRIMARY KEY AUTOINCREMENT, type TEXT, issued TEXT, stanza TEXT )`).run();
@@ -7459,18 +7620,18 @@ var initializeDatabase = () => __async(null, null, function* () {
     const isNeedingShapefiles = bootstrap.database.prepare(`SELECT name FROM sqlite_master WHERE type='table' AND name='shapefiles';`).get();
     const isNeedingBroadcastify = bootstrap.database.prepare(`SELECT name FROM sqlite_master WHERE type='table' AND name='broadcastify';`).get();
     if (!isNeedingShapefiles || !isNeedingBroadcastify) {
-      setWarning({ message: `Required database tables are currently building, please ${bootstrap.ansi_colors.RED}DO NOT${bootstrap.ansi_colors.RESET} close your terminal. The building will not finish and will remain incomplete. If you do mess up, you will need to delete ${settings.Database} and restart the application.` });
-      yield importBroadcastify();
-      yield importShapefiles();
-      setWarning({ message: `Building has completed, you can now continue or close the terminal` });
+      SetWarning({ message: `Required database tables are currently building, please ${bootstrap.ansi_colors.RED}DO NOT${bootstrap.ansi_colors.RESET} close your terminal. The building will not finish and will remain incomplete. If you do mess up, you will need to delete ${settings.Database} and restart the application.` });
+      yield ImportBroadcastify();
+      yield ImportShapefiles();
+      SetWarning({ message: `Building has completed, you can now continue or close the terminal` });
     }
   } catch (error) {
-    setWarning({ message: `An error occurred while initializing the database: ${error.message}` });
+    SetWarning({ message: `An error occurred while initializing the database: ${error.message}` });
   }
 });
 
-// src/@modules/@database/database.cache.ts
-var getCachedEvents = () => __async(null, null, function* () {
+// src/@modules/@database/GetCachedEvents.ts
+var GetCachedEvents = () => __async(null, null, function* () {
   var _a;
   try {
     const settings = bootstrap.settings;
@@ -7478,7 +7639,7 @@ var getCachedEvents = () => __async(null, null, function* () {
     if (settings.NOAAWeatherWireServiceSettings.CacheSettings.Enabled) {
       const max = (_a = settings.NOAAWeatherWireServiceSettings.CacheSettings.MaxRetentionHistory) != null ? _a : 500;
       const get = yield bootstrap.database.prepare(`SELECT * FROM stanzas ORDER BY rowid DESC LIMIT ?`).all(max);
-      setWarning({ message: `Fetched ${get.length} cached stanzas from the database in ${Math.floor(performance.now() - tick)} ms` });
+      SetWarning({ message: `Fetched ${get.length} cached stanzas from the database in ${Math.floor(performance.now() - tick)} ms` });
       let events = get.map((row) => JSON.parse(row.stanza)).filter((stanza) => {
         if (!stanza) {
           return;
@@ -7487,21 +7648,21 @@ var getCachedEvents = () => __async(null, null, function* () {
         return !isSkippable;
       });
       events = events.sort((a, b) => b.issued - a.issued);
-      yield Promise.all(events.map((event) => createEvent(event, true)));
-      setWarning({ message: `Processed ${events.length} cached stanzas in ${Math.floor(performance.now() - tick)} ms` });
-      validateEvents(bootstrap.cache.processed);
+      yield Promise.all(events.map((event) => CreateEvent(event, true)));
+      SetWarning({ message: `Processed ${events.length} cached stanzas in ${Math.floor(performance.now() - tick)} ms` });
+      yield ValidateEvents(bootstrap.cache.processed);
     }
   } catch (error) {
-    setWarning({ message: `An error occurred while fetching cached stanzas: ${error.message} -> ${error.stack}` });
+    SetWarning({ message: `An error occurred while fetching cached stanzas: ${error.message} -> ${error.stack}` });
   }
 });
 
-// src/@modules/@xmpp/xmpp.xReconnect.ts
-var xReconnect = (interval) => __async(null, null, function* () {
+// src/@modules/@xmpp/ReconnectXMPP.ts
+var ReconnectXMPP = (interval) => __async(null, null, function* () {
   const settings = bootstrap.settings;
   const lastStanza = Date.now() - bootstrap.cache.lastStanza;
   if (interval < 15) {
-    setWarning({ message: `Reconnection interval of ${interval} seconds is too low, setting to 15 seconds` });
+    SetWarning({ message: `Reconnection interval of ${interval} seconds is too low, setting to 15 seconds` });
     interval = 15;
     bootstrap.settings.NOAAWeatherWireServiceSettings.ReconnectionSettings.ReconnectionInterval = 15;
   }
@@ -7515,7 +7676,7 @@ var xReconnect = (interval) => __async(null, null, function* () {
       bootstrap.cache.isConnected = false;
       bootstrap.cache.tReconnects += 1;
       try {
-        setEventEmit({
+        SetEventEmit({
           event: `onServiceStatus`,
           metadata: {
             message: `Attempting to reconnect to XMPP Service (Reconnect Attempt ${bootstrap.cache.tReconnects})`,
@@ -7533,7 +7694,7 @@ var xReconnect = (interval) => __async(null, null, function* () {
         yield bootstrap.session_xmpp.start().catch(() => {
         });
       } catch (error) {
-        setWarning({ message: `XMPP Reconnect Failed - ${error.message}` });
+        SetWarning({ message: `XMPP Reconnect Failed - ${error.message}` });
       } finally {
         bootstrap.cache.isReconnecting = false;
       }
@@ -7541,26 +7702,26 @@ var xReconnect = (interval) => __async(null, null, function* () {
   }
 });
 
-// src/@modules/@utilities/utilities.setCronSchedule.ts
-var import_fs6 = require("fs");
+// src/@modules/@utilities/SetCronSchedule.ts
+var import_fs5 = require("fs");
 var import_path4 = require("path");
-var setCronSchedule = () => __async(null, null, function* () {
+var SetCronSchedule = () => __async(null, null, function* () {
   const settings = bootstrap.settings;
   const TTL = settings.GlobalSettings.ArchiveSettings.TTL;
   const TTLCUT = Date.now() - TTL * 1e3;
   const walk = (dir) => {
-    if ((0, import_fs6.existsSync)(dir)) {
-      const entries = (0, import_fs6.readdirSync)(dir, { withFileTypes: true });
+    if ((0, import_fs5.existsSync)(dir)) {
+      const entries = (0, import_fs5.readdirSync)(dir, { withFileTypes: true });
       for (const entry of entries) {
         const fullPath = (0, import_path4.join)(dir, entry.name);
         if (entry.isDirectory()) {
           walk(fullPath);
           continue;
         }
-        const stats = (0, import_fs6.statSync)(fullPath);
+        const stats = (0, import_fs5.statSync)(fullPath);
         if (stats.mtime.getTime() < TTLCUT) {
           try {
-            (0, import_fs6.unlinkSync)(fullPath);
+            (0, import_fs5.unlinkSync)(fullPath);
           } catch (err) {
             console.error(`Failed to delete ${fullPath}:`, err);
           }
@@ -7570,20 +7731,20 @@ var setCronSchedule = () => __async(null, null, function* () {
   };
   walk(settings.GlobalSettings.ArchiveSettings.TextDirectory);
   walk(settings.GlobalSettings.ArchiveSettings.EasDirectory);
-  walk(settings.GlobalSettings.ArchiveSettings.EventDirectory);
+  walk(settings.GlobalSettings.ArchiveSettings.JSONDirectory);
   if (settings.EnableWireService) {
     if (settings.NOAAWeatherWireServiceSettings.ReconnectionSettings.Enabled) {
-      void xReconnect(settings.NOAAWeatherWireServiceSettings.ReconnectionSettings.ReconnectionInterval);
+      void ReconnectXMPP(settings.NOAAWeatherWireServiceSettings.ReconnectionSettings.ReconnectionInterval);
     }
   } else {
-    const response2 = yield createHttp({
+    const response2 = yield CreateHttp({
       url: settings.NationalWeatherServiceSettings.EventsEndpoint,
       headers: {
         "User-Agent": "@atmosx/event-product-parser"
       }
     });
     if (response2.error) {
-      return setEventEmit({
+      return SetEventEmit({
         event: `onServiceStatus`,
         metadata: {
           type: "fetch-api",
@@ -7593,7 +7754,7 @@ var setCronSchedule = () => __async(null, null, function* () {
         }
       });
     }
-    setEventEmit({
+    SetEventEmit({
       event: `onServiceStatus`,
       metadata: {
         message: `Fetched latest events from National Weather Service API`,
@@ -7602,23 +7763,24 @@ var setCronSchedule = () => __async(null, null, function* () {
         error: false
       }
     });
-    createEvent({ message: response2.message, isNWWS: false });
+    yield CreateEvent({ message: response2.message, isNWWS: false });
   }
 });
 
-// src/@manager/manager.updateEvents.ts
-var updateEvents = (selectedEvent) => __async(null, null, function* () {
+// src/@manager/UpdateEvents.ts
+var UpdateEvents = (selectedEvent) => __async(null, null, function* () {
   const events = bootstrap.cache.events.features;
-  function update(evt) {
+  function update(event) {
     return __async(this, null, function* () {
-      if (new Date(evt.properties.expires) < /* @__PURE__ */ new Date()) {
-        yield rmEvent(evt);
+      if (new Date(event.properties.expires) < /* @__PURE__ */ new Date()) {
+        SetEventEmit({ event: `onExpiredProduct`, metadata: event });
+        yield RemoveEvent(event, true);
       }
     });
   }
   if (!selectedEvent) {
-    yield Promise.all(events.map((evt) => __async(null, null, function* () {
-      yield update(evt);
+    yield Promise.all(events.map((event) => __async(null, null, function* () {
+      yield update(event);
     })));
   }
   if (selectedEvent) {
@@ -7626,41 +7788,41 @@ var updateEvents = (selectedEvent) => __async(null, null, function* () {
   }
 });
 
-// src/@core/core.start.ts
+// src/@core/StartService.ts
 var import_croner = require("croner");
-var startService = (configurations) => __async(null, null, function* () {
+var StartService = (configurations) => __async(null, null, function* () {
   if (!bootstrap.isReady) {
-    return setWarning({
+    return SetWarning({
       message: `You can not create another instance without shutting down the current one first, please make sure to call the stop() method first!`
     });
   }
-  const settings = setSettings(configurations);
+  const settings = SetSettings(configurations);
   bootstrap.isReady = true;
-  yield initializeDatabase();
+  yield InitializeDatabase();
   if (settings.EnableWireService) {
     (() => __async(null, null, function* () {
-      yield getCachedEvents();
-      yield xDeploy();
+      yield GetCachedEvents();
+      yield DeployXMPP();
     }))();
   }
-  yield setCronSchedule();
+  yield SetCronSchedule();
   let scheduleInterval = !settings.EnableWireService ? settings.NationalWeatherServiceSettings.CallbackInterval : 1;
   if (!settings.EnableWireService && scheduleInterval < 15) {
-    setWarning({ message: `Schedule interval of ${scheduleInterval} seconds is too low, setting to 15 seconds` });
+    SetWarning({ message: `Schedule interval of ${scheduleInterval} seconds is too low, setting to 15 seconds` });
     bootstrap.settings.NationalWeatherServiceSettings.CallbackInterval = 15;
     scheduleInterval = 15;
   }
   bootstrap.cron = new import_croner.Cron(`*/${scheduleInterval} * * * * *`, () => __async(null, null, function* () {
-    yield setCronSchedule();
+    yield SetCronSchedule();
   }));
   bootstrap.cron = new import_croner.Cron(`* * * * * *`, () => __async(null, null, function* () {
-    yield updateNode();
-    yield updateEvents();
+    yield UpdateNode();
+    yield UpdateEvents();
   }));
 });
 
-// src/@core/core.stop.ts
-var stopService = () => __async(null, null, function* () {
+// src/@core/StopService.ts
+var StopService = () => __async(null, null, function* () {
   if (bootstrap.isReady) {
     bootstrap.isReady = false;
     if (bootstrap.session_xmpp) {
@@ -7675,15 +7837,15 @@ var stopService = () => __async(null, null, function* () {
   }
 });
 
-// src/@core/core.setNode.ts
-var setNode = (options) => {
+// src/@core/SetNode.ts
+var SetNode = (options) => {
   const nodes = bootstrap.cache.nodes.features;
   const exists = nodes.find((node) => node.properties.identifier === options.identifier);
   if (options.delete) {
     if (exists) {
       const index = nodes.indexOf(exists);
       nodes.splice(index, 1);
-      return setEventEmit({
+      return SetEventEmit({
         event: `onNodeDelete`,
         metadata: {
           type: `node-delete`,
@@ -7691,7 +7853,7 @@ var setNode = (options) => {
         }
       });
     }
-    return setWarning({ message: `Node with identifier '${options.identifier}' not found.` });
+    return SetWarning({ message: `Node with identifier '${options.identifier}' not found.` });
   }
   if (exists) {
     const index = nodes.indexOf(exists);
@@ -7701,7 +7863,7 @@ var setNode = (options) => {
         coordinates: [options.coordinates.longitude, options.coordinates.latitude]
       }
     });
-    return setEventEmit({
+    return SetEventEmit({
       event: `onNodeUpdate`,
       metadata: {
         type: `node-update`,
@@ -7719,7 +7881,7 @@ var setNode = (options) => {
       identifier: options.identifier
     }
   });
-  return setEventEmit({
+  return SetEventEmit({
     event: `onNodeAdd`,
     metadata: {
       type: `node-add`,
@@ -7728,34 +7890,53 @@ var setNode = (options) => {
   });
 };
 
-// src/@core/core.getEvents.ts
-var getEvents = () => {
+// src/@core/GetEvents.ts
+var GetEvents = () => {
   return bootstrap.cache.events;
 };
 
-// src/@core/core.getNodes.ts
-var getNodes = () => {
+// src/@core/GetNodes.ts
+var GetNodes = () => {
   return bootstrap.cache.nodes;
 };
 
-// src/@core/core.manualEvent.ts
-var manualEvent = (options) => __async(null, null, function* () {
+// src/@core/ManualEvent.ts
+var ManualEvent = (options) => __async(null, null, function* () {
+  var _a;
   const isCapEvent = options.message.includes(`<?xml`);
   const isCapAreaDescription = options.message.includes(`<areaDesc>`);
-  const isVTEC = options.message.match(dict_expressions.pvtec) != null;
-  const isUGC = options.message.match(dict_expressions.ugc1) != null;
-  const getType = getAwipsType({ attributes: options.attributes });
-  const result = { message: options.message, attributes: options.attributes, isCapEvent, isVTEC, isUGC, isCapAreaDescription, isIgnored: false, isNWWS: true, getType };
-  yield createEvent(result);
+  const isVTEC = options.message.match(EnumExpressions.pvtec) != null;
+  const isUGC = options.message.match(EnumExpressions.ugc1) != null;
+  const attributes = {
+    "xmlns": "@atmosx/event-product-parser",
+    "id": "manual_processor.0000",
+    "issue": (/* @__PURE__ */ new Date()).toISOString(),
+    "ttaaii": "XXXXX",
+    "cccc": "XXX",
+    "awipsid": (_a = options.awipsid) != null ? _a : "XXXXXX"
+  };
+  const getType = GetAwipsType({ attributes });
+  const result = {
+    message: options.message,
+    attributes,
+    isCapEvent,
+    isVTEC,
+    isUGC,
+    isCapAreaDescription,
+    isIgnored: false,
+    isNWWS: true,
+    getType
+  };
+  yield CreateEvent(result);
 });
 
-// src/@core/core.getRandomEvent.ts
-var getRandomEvent = () => {
+// src/@core/GetRandomEvent.ts
+var GetRandomEvent = () => {
   return bootstrap.cache.events.features[Math.floor(Math.random() * bootstrap.cache.events.features.length)];
 };
 
-// src/@core/core.query.ts
-var query = (options) => __async(null, null, function* () {
+// src/@core/QueryStanza.ts
+var QueryStanza = (options) => __async(null, null, function* () {
   var _a;
   const get = yield bootstrap.database.prepare(
     `SELECT * FROM stanzas WHERE stanza LIKE ? LIMIT ?`
@@ -7764,11 +7945,11 @@ var query = (options) => __async(null, null, function* () {
   return events;
 });
 
-// src/@core/core.clearEvents.ts
-var clearEvents = () => {
+// src/@core/ClearEvents.ts
+var ClearEvents = () => {
   bootstrap.cache.events.features = [];
   bootstrap.cache.hashes = [];
-  setEventEmit({
+  SetEventEmit({
     event: `onEventCache`,
     metadata: bootstrap.cache.events,
     message: `Manually cleared event cache.`
@@ -7779,17 +7960,17 @@ var clearEvents = () => {
 var Manager = class {
   constructor(settings) {
     this.trycatch();
-    startService(settings);
+    StartService(settings);
   }
   on(event, callback) {
-    createListener(event, callback);
+    CreateListener(event, callback);
   }
   trycatch() {
     process.on("uncaughtException", (err) => {
       var _a, _b;
       const ignored = ["ETIMEDOUT", "ECONNRESET", "EHOSTUNREACH", "ENOTFOUND", "ECONNREFUSED", "EPIPE", "EADDRINUSE", "EALREADY", "EACCES", "EAGAIN", "EHOSTDOWN", "STARTTLS_FAILURE"];
       if (ignored.includes(err == null ? void 0 : err.code)) {
-        setEventEmit({
+        SetEventEmit({
           event: `onServiceStatus`,
           metadata: {
             message: `Ignored Critical Error: ${(_a = err == null ? void 0 : err.code) != null ? _a : "Unknown error code"}. This may indicate a connection issue. Attempting to continue...`,
@@ -7800,25 +7981,25 @@ var Manager = class {
         });
         return;
       }
-      setWarning({ message: `Uncaught Exception: ${err instanceof Error ? (_b = err.stack) != null ? _b : err.message : String(err)}` });
+      SetWarning({ message: `Uncaught Exception: ${err instanceof Error ? (_b = err.stack) != null ? _b : err.message : String(err)}` });
     });
   }
 };
 var index_default = Manager;
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  ClearEvents,
+  GenerateEASMessage,
+  GetCleanedEvent,
+  GetEventGeometry,
+  GetEvents,
+  GetNodes,
+  GetRandomEvent,
   Manager,
-  clearEvents,
-  getCleanedEvent,
-  getEventGeometry,
-  getEvents,
-  getNodes,
-  getRandomEvent,
-  manualEvent,
-  query,
-  setEasTone,
-  setNode,
-  setSettings,
-  startService,
-  stopService
+  ManualEvent,
+  QueryStanza,
+  SetNode,
+  SetSettings,
+  StartService,
+  StopService
 });