@atmosx/event-product-parser 3.0.2 → 3.0.3

package/README.md

@@ -56,6 +56,7 @@ const Client = new Manager({
             webhook: "https://discord.com/api/webhooks/XXXXXXXXXXXXXX/XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX", 
             title: "AtmosphericX - (@atmosx/event-product-parser)", 
             message: ``, 
+            upload: true,
             events: [`Severe Thunderstorm Warning`, `Radar Indicated Tornado Warning`, `*Warning`, `*Thunderstorm*`],
             rate: 5,
         }
@@ -124,6 +125,7 @@ const Client = new Manager({
 - **webhook**: The URL of the webhook you want to send messages to.
 - **title**: The title of the message you want to send.
 - **message**: The message content you want to send. You can use placeholders like `<@&role_id>` to mention roles in Discord.
+- **upload**: Whether to upload a JSON file as well with the message containing the event data.
 - **events**: An array of event types that will trigger the webhook when they are received by the parser. If this array is empty, the webhook will be triggered for all events.
 - **rate**: The rate limit in seconds for how often the webhook can be triggered. This is to prevent spamming the webhook with too many messages in a short period of time.
 

package/dist/cjs/index.cjs

@@ -10509,7 +10509,7 @@ module.exports = __toCommonJS(index_exports);
 var import_path = __toESM(require("path"));
 var import_node_events = require("events");
 var bootstrap = {
-  version: `3.0.2`,
+  version: `3.0.3`,
   isReady: true,
   ratelimits: {},
   session_xmpp: null,
@@ -14388,7 +14388,16 @@ var eventTags = {
   "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"
+  "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/@building/building.tags.ts
@@ -14458,8 +14467,8 @@ var getEventHeader = (options) => {
   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`}`;
 };
 
-// src/@dictionaries/dictionaries.eventsOffshore.ts
-var eventsOffshore = {
+// src/@dictionaries/dictionaries.eventsMatchText.ts
+var eventsMatchText = {
   "Special Weather Statement": "Special Weather Statement",
   "Hurricane Warning": "Hurricane Warning",
   "Hurricane Force Wind Warning": "Hurricane Force Wind Warning",
@@ -14469,7 +14478,12 @@ var eventsOffshore = {
   "High Wind Warning": "High Wind Warning",
   "Gale Warning": "Gale Warning",
   "Small Craft Advisory": "Small Craft Advisory",
-  "Small Craft Warning": "Small Craft Warning"
+  "Small Craft Warning": "Small Craft Warning",
+  "Tsunami Warning": "Tsunami Warning",
+  "Tsunami Watch": "Tsunami Watch",
+  "Tsunami Advisory": "Tsunami Advisory",
+  "Tsunami Information Statement": "Tsunami Information Statement",
+  "Subscribers:": "National Weather Service Policy"
 };
 
 // src/@building/building.tracking.ts
@@ -14528,6 +14542,16 @@ var betterEventNames = {
     },
     "Radar Indicated Tornado Warning": {}
   },
+  "Blizzard Warning": {
+    "PDS Blizzard Warning": {
+      description: "particularly dangerous situation"
+    }
+  },
+  "Ice Storm Warning": {
+    "PDS Ice Storm Warning": {
+      description: "particularly dangerous situation"
+    }
+  },
   "Special Marine Warning": {
     "Special Marine Warning (TPROB)": {
       tornado: `POSSIBLE`
@@ -14775,13 +14799,13 @@ var createHttp = (options) => __async(null, null, function* () {
 // src/@modules/@utilities/utilities.createWebhook.ts
 var import_form_data = __toESM(require_form_data());
 var createWebhook = (options) => __async(null, null, function* () {
-  var _a, _b, _c, _d, _e, _f, _g, _h;
+  var _a, _b, _c, _d;
   const event = options.event.properties;
   const settings = options.webhook;
   let body = [
     event.locations ? `**Locations**: ${event.locations.slice(0, 100)}` : null,
     event.issued ? `**Issued**: <t:${Math.floor(new Date(event.issued).getTime() / 1e3)}:R>` : null,
-    event.expires ? `**Expires**: <t:${Math.floor(new Date(event.expires).getTime() / 1e3)}:R>` : null,
+    event.expires && event.status != `Statement` ? `**Expires**: <t:${Math.floor(new Date(event.expires).getTime() / 1e3)}:R>` : null,
     (() => {
       var _a2, _b2;
       const val = (_a2 = event.parameters.estimated_wind_gusts) != null ? _a2 : null;
@@ -14798,16 +14822,28 @@ var createWebhook = (options) => __async(null, null, function* () {
     event.parameters.damage_threat ? `**Damage Threat**: ${event.parameters.damage_threat}` : null,
     event.parameters.flood_threat ? `**Flood Threat**: ${event.parameters.flood_threat}` : null,
     event.parameters.tornado_threat ? `**Tornado Threat**: ${event.parameters.tornado_threat}` : null,
+    event.spc_parameters.spc_max_tornado ? `**Max Tornado Threat**: ${event.spc_parameters.spc_max_tornado}` : null,
+    event.spc_parameters.spc_max_hail ? `**Max Hail Threat**: ${event.spc_parameters.spc_max_hail}` : null,
+    event.spc_parameters.spc_max_wind ? `**Max Wind Threat**: ${event.spc_parameters.spc_max_wind}` : null,
+    event.spc_parameters.spc_watch_issuance ? `**Watch Issuance**: ${event.spc_parameters.spc_watch_issuance}%` : null,
+    event.watch_parameters.watch_number ? `**Watch Number**: ${event.watch_parameters.watch_number}` : null,
+    event.watch_parameters.strong_tornadoes_probability ? `**Strong Tornadoes Probability**: ${event.watch_parameters.strong_tornadoes_probability}%` : null,
+    event.watch_parameters.additional_tornadoes_probability ? `**Additional Tornadoes Probability**: ${event.watch_parameters.additional_tornadoes_probability}%` : null,
+    event.watch_parameters.combined_hail_wind_probability ? `**Combined Hail/Wind Probability**: ${event.watch_parameters.combined_hail_wind_probability}%` : null,
+    event.watch_parameters.severe_hail_probability ? `**Severe Hail Probability**: ${event.watch_parameters.severe_hail_probability}%` : null,
+    event.watch_parameters.hail_2in_probability ? `**Hail \u22652in Probability**: ${event.watch_parameters.hail_2in_probability}%` : null,
+    event.watch_parameters.max_hail_in ? `**Max Hail Inches**: ${event.watch_parameters.max_hail_in}` : null,
+    event.watch_parameters.severe_wind_probability ? `**Severe Wind Probability**: ${event.watch_parameters.severe_wind_probability}%` : null,
+    event.watch_parameters.max_wind_surface ? `**Max Surface Wind**: ${event.watch_parameters.max_wind_surface}` : null,
+    event.watch_parameters.max_tops_x100feet ? `**Max Tops (x100 feet)**: ${event.watch_parameters.max_tops_x100feet}` : null,
     ((_a = event.parameters.tags) == null ? void 0 : _a.length) > 0 ? `**Tags**: ${event.parameters.tags.join(", ")}` : null,
     (() => {
-      var _a2, _b2, _c2, _d2, _e2, _f2;
+      var _a2, _b2, _c2, _d2, _e, _f;
       const val = (_c2 = (_b2 = (_a2 = event.geocode) == null ? void 0 : _a2.office) == null ? void 0 : _b2.name) != null ? _c2 : `N/A`;
-      const th = (_f2 = (_e2 = (_d2 = event.geocode) == null ? void 0 : _d2.office) == null ? void 0 : _e2.office) != null ? _f2 : null;
+      const th = (_f = (_e = (_d2 = event.geocode) == null ? void 0 : _d2.office) == null ? void 0 : _e.office) != null ? _f : null;
       return val || th ? `**Sender**: ${val} ${th ? `(${th})` : ""}` : null;
     })(),
     ((_b = event.metadata) == null ? void 0 : _b.tracking) ? `**Tracking**: ${event.metadata.tracking}` : null,
-    ((_d = (_c = event.metadata) == null ? void 0 : _c.vtec) == null ? void 0 : _d.vtec) ? `**VTEC**: ${(_e = event.metadata.vtec) == null ? void 0 : _e.vtec}` : null,
-    ((_f = event.metadata) == null ? void 0 : _f.filtered_proximity) != null ? `**Currently in polygon (Node)**: ${event.metadata.filtered_proximity ? "Yes" : "No"}` : null,
     (() => {
       const desc = (event.description || "").split("\n").map((l) => l.trim()).filter(Boolean).join("\n");
       return desc ? "```\n" + desc + "\n```" : null;
@@ -14831,14 +14867,16 @@ var createWebhook = (options) => __async(null, null, function* () {
     footer: { text: settings.title }
   };
   form.append("payload_json", JSON.stringify({
-    username: (_g = settings.title) != null ? _g : "AtmosphericX",
-    content: (_h = settings.message) != null ? _h : "",
+    username: (_c = settings.title) != null ? _c : "AtmosphericX",
+    content: (_d = settings.message) != null ? _d : "",
     embeds: [embed]
   }));
-  form.append("file", Buffer.from(JSON.stringify({ type: "FeatureCollection", features: [getCleanedEvent(options.event)] }, null, 2)), {
-    filename: `${event.event}_${event.status}_${event.metadata.tracking}.json`,
-    contentType: "application/json"
-  });
+  if (settings.upload) {
+    form.append("file", Buffer.from(JSON.stringify(getCleanedEvent(event), null, 2)), {
+      filename: `${event.event}_${event.status}_${event.metadata.tracking}.json`,
+      contentType: "application/json"
+    });
+  }
   yield createHttp({
     url: settings.webhook,
     timeout: 2e3,
@@ -15260,7 +15298,7 @@ var text = (stanza) => __async(null, null, function* () {
     const header = getEventHeader({ properties: props, getType: stanza.getType });
     const issued = new Date(attributes.issue);
     const expires = new Date(issued.getTime() + 12 * 60 * 60 * 1e3);
-    let event = Object.keys(eventsOffshore).find((event2) => message.toLowerCase().includes(event2.toLowerCase()));
+    let event = Object.keys(eventsMatchText).find((event2) => message.toLowerCase().includes(event2.toLowerCase()));
     let isStatement = false;
     if (!event) {
       event = stanza.getType.type.split(`-`).map((word) => word.charAt(0).toUpperCase() + word.slice(1).toLowerCase()).join(` `);
@@ -15277,7 +15315,7 @@ var text = (stanza) => __async(null, null, function* () {
         parent: event,
         status: isStatement ? `Statement` : `Issued`,
         issued: !isNaN(issued.getTime()) ? issued.toISOString() : (/* @__PURE__ */ new Date()).toISOString(),
-        expires: isStatement ? new Date(issued.getTime() + 5 * 1e3).toISOString() : !isNaN(expires.getTime()) ? expires.toISOString() : new Date(Date.now() + 60 * 60 * 1e3).toISOString()
+        expires: isStatement ? new Date(issued.getTime() + 120 * 1e3).toISOString() : !isNaN(expires.getTime()) ? expires.toISOString() : new Date(Date.now() + 60 * 60 * 1e3).toISOString()
       }, props), {
         metadata: {
           ms: performance.now() - tick,
@@ -15394,11 +15432,13 @@ var ugc = (stanza) => __async(null, null, function* () {
     if (ugc2 != null) {
       const props = properties({ message, attributes, ugc: ugc2 });
       const issued = new Date(attributes.issue);
-      const expires = new Date(ugc2.expires).toISOString();
+      const expires = new Date(ugc2.expires);
       const header = getEventHeader({ properties: props, getType: stanza.getType });
-      let event = Object.keys(eventsOffshore).find((event2) => message.toLowerCase().includes(event2.toLowerCase()));
+      let event = Object.keys(eventsMatchText).find((event2) => message.toLowerCase().includes(event2.toLowerCase()));
+      let isStatement = false;
       if (!event) {
         event = stanza.getType.type.split(`-`).map((word) => word.charAt(0).toUpperCase() + word.slice(1).toLowerCase()).join(` `);
+        isStatement = true;
       }
       processed.push({
         type: `Feature`,
@@ -15409,9 +15449,9 @@ var ugc = (stanza) => __async(null, null, function* () {
         properties: __spreadProps(__spreadValues({
           event,
           parent: event,
-          status: `Issued`,
+          status: isStatement ? `Statement` : `Issued`,
           issued: !isNaN(issued.getTime()) ? issued.toISOString() : (/* @__PURE__ */ new Date()).toISOString(),
-          expires: !isNaN(new Date(ugc2.expires).getTime()) ? expires : new Date(Date.now() + 60 * 60 * 1e3).toISOString()
+          expires: isStatement ? new Date(issued.getTime() + 120 * 1e3).toISOString() : !isNaN(expires.getTime()) ? expires.toISOString() : new Date(Date.now() + 60 * 60 * 1e3).toISOString()
         }, props), {
           metadata: {
             ms: performance.now() - tick,

package/dist/esm/index.mjs

@@ -10491,7 +10491,7 @@ var require_form_data = __commonJS({
 import path from "path";
 import { EventEmitter } from "events";
 var bootstrap = {
-  version: `3.0.2`,
+  version: `3.0.3`,
   isReady: true,
   ratelimits: {},
   session_xmpp: null,
@@ -14370,7 +14370,16 @@ var eventTags = {
   "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"
+  "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/@building/building.tags.ts
@@ -14440,8 +14449,8 @@ var getEventHeader = (options) => {
   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`}`;
 };
 
-// src/@dictionaries/dictionaries.eventsOffshore.ts
-var eventsOffshore = {
+// src/@dictionaries/dictionaries.eventsMatchText.ts
+var eventsMatchText = {
   "Special Weather Statement": "Special Weather Statement",
   "Hurricane Warning": "Hurricane Warning",
   "Hurricane Force Wind Warning": "Hurricane Force Wind Warning",
@@ -14451,7 +14460,12 @@ var eventsOffshore = {
   "High Wind Warning": "High Wind Warning",
   "Gale Warning": "Gale Warning",
   "Small Craft Advisory": "Small Craft Advisory",
-  "Small Craft Warning": "Small Craft Warning"
+  "Small Craft Warning": "Small Craft Warning",
+  "Tsunami Warning": "Tsunami Warning",
+  "Tsunami Watch": "Tsunami Watch",
+  "Tsunami Advisory": "Tsunami Advisory",
+  "Tsunami Information Statement": "Tsunami Information Statement",
+  "Subscribers:": "National Weather Service Policy"
 };
 
 // src/@building/building.tracking.ts
@@ -14510,6 +14524,16 @@ var betterEventNames = {
     },
     "Radar Indicated Tornado Warning": {}
   },
+  "Blizzard Warning": {
+    "PDS Blizzard Warning": {
+      description: "particularly dangerous situation"
+    }
+  },
+  "Ice Storm Warning": {
+    "PDS Ice Storm Warning": {
+      description: "particularly dangerous situation"
+    }
+  },
   "Special Marine Warning": {
     "Special Marine Warning (TPROB)": {
       tornado: `POSSIBLE`
@@ -14757,13 +14781,13 @@ var createHttp = (options) => __async(null, null, function* () {
 // src/@modules/@utilities/utilities.createWebhook.ts
 var import_form_data = __toESM(require_form_data());
 var createWebhook = (options) => __async(null, null, function* () {
-  var _a, _b, _c, _d, _e, _f, _g, _h;
+  var _a, _b, _c, _d;
   const event = options.event.properties;
   const settings = options.webhook;
   let body = [
     event.locations ? `**Locations**: ${event.locations.slice(0, 100)}` : null,
     event.issued ? `**Issued**: <t:${Math.floor(new Date(event.issued).getTime() / 1e3)}:R>` : null,
-    event.expires ? `**Expires**: <t:${Math.floor(new Date(event.expires).getTime() / 1e3)}:R>` : null,
+    event.expires && event.status != `Statement` ? `**Expires**: <t:${Math.floor(new Date(event.expires).getTime() / 1e3)}:R>` : null,
     (() => {
       var _a2, _b2;
       const val = (_a2 = event.parameters.estimated_wind_gusts) != null ? _a2 : null;
@@ -14780,16 +14804,28 @@ var createWebhook = (options) => __async(null, null, function* () {
     event.parameters.damage_threat ? `**Damage Threat**: ${event.parameters.damage_threat}` : null,
     event.parameters.flood_threat ? `**Flood Threat**: ${event.parameters.flood_threat}` : null,
     event.parameters.tornado_threat ? `**Tornado Threat**: ${event.parameters.tornado_threat}` : null,
+    event.spc_parameters.spc_max_tornado ? `**Max Tornado Threat**: ${event.spc_parameters.spc_max_tornado}` : null,
+    event.spc_parameters.spc_max_hail ? `**Max Hail Threat**: ${event.spc_parameters.spc_max_hail}` : null,
+    event.spc_parameters.spc_max_wind ? `**Max Wind Threat**: ${event.spc_parameters.spc_max_wind}` : null,
+    event.spc_parameters.spc_watch_issuance ? `**Watch Issuance**: ${event.spc_parameters.spc_watch_issuance}%` : null,
+    event.watch_parameters.watch_number ? `**Watch Number**: ${event.watch_parameters.watch_number}` : null,
+    event.watch_parameters.strong_tornadoes_probability ? `**Strong Tornadoes Probability**: ${event.watch_parameters.strong_tornadoes_probability}%` : null,
+    event.watch_parameters.additional_tornadoes_probability ? `**Additional Tornadoes Probability**: ${event.watch_parameters.additional_tornadoes_probability}%` : null,
+    event.watch_parameters.combined_hail_wind_probability ? `**Combined Hail/Wind Probability**: ${event.watch_parameters.combined_hail_wind_probability}%` : null,
+    event.watch_parameters.severe_hail_probability ? `**Severe Hail Probability**: ${event.watch_parameters.severe_hail_probability}%` : null,
+    event.watch_parameters.hail_2in_probability ? `**Hail \u22652in Probability**: ${event.watch_parameters.hail_2in_probability}%` : null,
+    event.watch_parameters.max_hail_in ? `**Max Hail Inches**: ${event.watch_parameters.max_hail_in}` : null,
+    event.watch_parameters.severe_wind_probability ? `**Severe Wind Probability**: ${event.watch_parameters.severe_wind_probability}%` : null,
+    event.watch_parameters.max_wind_surface ? `**Max Surface Wind**: ${event.watch_parameters.max_wind_surface}` : null,
+    event.watch_parameters.max_tops_x100feet ? `**Max Tops (x100 feet)**: ${event.watch_parameters.max_tops_x100feet}` : null,
     ((_a = event.parameters.tags) == null ? void 0 : _a.length) > 0 ? `**Tags**: ${event.parameters.tags.join(", ")}` : null,
     (() => {
-      var _a2, _b2, _c2, _d2, _e2, _f2;
+      var _a2, _b2, _c2, _d2, _e, _f;
       const val = (_c2 = (_b2 = (_a2 = event.geocode) == null ? void 0 : _a2.office) == null ? void 0 : _b2.name) != null ? _c2 : `N/A`;
-      const th = (_f2 = (_e2 = (_d2 = event.geocode) == null ? void 0 : _d2.office) == null ? void 0 : _e2.office) != null ? _f2 : null;
+      const th = (_f = (_e = (_d2 = event.geocode) == null ? void 0 : _d2.office) == null ? void 0 : _e.office) != null ? _f : null;
       return val || th ? `**Sender**: ${val} ${th ? `(${th})` : ""}` : null;
     })(),
     ((_b = event.metadata) == null ? void 0 : _b.tracking) ? `**Tracking**: ${event.metadata.tracking}` : null,
-    ((_d = (_c = event.metadata) == null ? void 0 : _c.vtec) == null ? void 0 : _d.vtec) ? `**VTEC**: ${(_e = event.metadata.vtec) == null ? void 0 : _e.vtec}` : null,
-    ((_f = event.metadata) == null ? void 0 : _f.filtered_proximity) != null ? `**Currently in polygon (Node)**: ${event.metadata.filtered_proximity ? "Yes" : "No"}` : null,
     (() => {
       const desc = (event.description || "").split("\n").map((l) => l.trim()).filter(Boolean).join("\n");
       return desc ? "```\n" + desc + "\n```" : null;
@@ -14813,14 +14849,16 @@ var createWebhook = (options) => __async(null, null, function* () {
     footer: { text: settings.title }
   };
   form.append("payload_json", JSON.stringify({
-    username: (_g = settings.title) != null ? _g : "AtmosphericX",
-    content: (_h = settings.message) != null ? _h : "",
+    username: (_c = settings.title) != null ? _c : "AtmosphericX",
+    content: (_d = settings.message) != null ? _d : "",
     embeds: [embed]
   }));
-  form.append("file", Buffer.from(JSON.stringify({ type: "FeatureCollection", features: [getCleanedEvent(options.event)] }, null, 2)), {
-    filename: `${event.event}_${event.status}_${event.metadata.tracking}.json`,
-    contentType: "application/json"
-  });
+  if (settings.upload) {
+    form.append("file", Buffer.from(JSON.stringify(getCleanedEvent(event), null, 2)), {
+      filename: `${event.event}_${event.status}_${event.metadata.tracking}.json`,
+      contentType: "application/json"
+    });
+  }
   yield createHttp({
     url: settings.webhook,
     timeout: 2e3,
@@ -15242,7 +15280,7 @@ var text = (stanza) => __async(null, null, function* () {
     const header = getEventHeader({ properties: props, getType: stanza.getType });
     const issued = new Date(attributes.issue);
     const expires = new Date(issued.getTime() + 12 * 60 * 60 * 1e3);
-    let event = Object.keys(eventsOffshore).find((event2) => message.toLowerCase().includes(event2.toLowerCase()));
+    let event = Object.keys(eventsMatchText).find((event2) => message.toLowerCase().includes(event2.toLowerCase()));
     let isStatement = false;
     if (!event) {
       event = stanza.getType.type.split(`-`).map((word) => word.charAt(0).toUpperCase() + word.slice(1).toLowerCase()).join(` `);
@@ -15259,7 +15297,7 @@ var text = (stanza) => __async(null, null, function* () {
         parent: event,
         status: isStatement ? `Statement` : `Issued`,
         issued: !isNaN(issued.getTime()) ? issued.toISOString() : (/* @__PURE__ */ new Date()).toISOString(),
-        expires: isStatement ? new Date(issued.getTime() + 5 * 1e3).toISOString() : !isNaN(expires.getTime()) ? expires.toISOString() : new Date(Date.now() + 60 * 60 * 1e3).toISOString()
+        expires: isStatement ? new Date(issued.getTime() + 120 * 1e3).toISOString() : !isNaN(expires.getTime()) ? expires.toISOString() : new Date(Date.now() + 60 * 60 * 1e3).toISOString()
       }, props), {
         metadata: {
           ms: performance.now() - tick,
@@ -15376,11 +15414,13 @@ var ugc = (stanza) => __async(null, null, function* () {
     if (ugc2 != null) {
       const props = properties({ message, attributes, ugc: ugc2 });
       const issued = new Date(attributes.issue);
-      const expires = new Date(ugc2.expires).toISOString();
+      const expires = new Date(ugc2.expires);
       const header = getEventHeader({ properties: props, getType: stanza.getType });
-      let event = Object.keys(eventsOffshore).find((event2) => message.toLowerCase().includes(event2.toLowerCase()));
+      let event = Object.keys(eventsMatchText).find((event2) => message.toLowerCase().includes(event2.toLowerCase()));
+      let isStatement = false;
       if (!event) {
         event = stanza.getType.type.split(`-`).map((word) => word.charAt(0).toUpperCase() + word.slice(1).toLowerCase()).join(` `);
+        isStatement = true;
       }
       processed.push({
         type: `Feature`,
@@ -15391,9 +15431,9 @@ var ugc = (stanza) => __async(null, null, function* () {
         properties: __spreadProps(__spreadValues({
           event,
           parent: event,
-          status: `Issued`,
+          status: isStatement ? `Statement` : `Issued`,
           issued: !isNaN(issued.getTime()) ? issued.toISOString() : (/* @__PURE__ */ new Date()).toISOString(),
-          expires: !isNaN(new Date(ugc2.expires).getTime()) ? expires : new Date(Date.now() + 60 * 60 * 1e3).toISOString()
+          expires: isStatement ? new Date(issued.getTime() + 120 * 1e3).toISOString() : !isNaN(expires.getTime()) ? expires.toISOString() : new Date(Date.now() + 60 * 60 * 1e3).toISOString()
         }, props), {
           metadata: {
             ms: performance.now() - tick,

package/dist/index.d.mts

@@ -2,6 +2,7 @@ type TypeWebhook = {
     webhook: string;
     title: string;
     message: string;
+    upload: boolean;
     rate: number;
     events: string[];
 };

package/dist/index.d.ts

@@ -2,6 +2,7 @@ type TypeWebhook = {
     webhook: string;
     title: string;
     message: string;
+    upload: boolean;
     rate: number;
     events: string[];
 };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atmosx/event-product-parser",
-	"version": "3.0.2",
+	"version": "3.0.3",
 	"description": "NOAA Weather Wire & NWS API Parser - Built for standalone and Project AtmosphericX Integration.",
 	"main": "dist/cjs/index.cjs",
 	"module": "dist/esm/index.mjs",

package/src/@dictionaries/dictionaries.betterEventNames.ts

@@ -42,6 +42,16 @@ export const betterEventNames: Record<string, Record<string, EnhancedEventType>>
         },
         "Radar Indicated Tornado Warning": { },
     },
+    "Blizzard Warning": {
+        "PDS Blizzard Warning": {
+            description: "particularly dangerous situation", 
+        },
+    },
+    "Ice Storm Warning": {
+        "PDS Ice Storm Warning": {
+            description: "particularly dangerous situation", 
+        },
+    },
     "Special Marine Warning": {
         "Special Marine Warning (TPROB)": { 
             tornado: `POSSIBLE`

package/src/@dictionaries/dictionaries.eventTags.ts

@@ -81,4 +81,13 @@ export const eventTags: Record<string, string> = {
     "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",
 }

package/src/@dictionaries/{dictionaries.eventsOffshore.ts → dictionaries.eventsMatchText.ts}

@@ -17,7 +17,7 @@
 
 */
 
-export const eventsOffshore: Record<string, string> = {
+export const eventsMatchText: Record<string, string> = {
     "Special Weather Statement": "Special Weather Statement",
     "Hurricane Warning": "Hurricane Warning",
     "Hurricane Force Wind Warning": "Hurricane Force Wind Warning",
@@ -28,4 +28,9 @@ export const eventsOffshore: Record<string, string> = {
     "Gale Warning": "Gale Warning",
     "Small Craft Advisory": "Small Craft Advisory",
     "Small Craft Warning": "Small Craft Warning",
+    "Tsunami Warning": "Tsunami Warning",
+    "Tsunami Watch": "Tsunami Watch",
+    "Tsunami Advisory": "Tsunami Advisory",
+    "Tsunami Information Statement": "Tsunami Information Statement",
+    "Subscribers:": "National Weather Service Policy",
 };

package/src/@events/events.text.ts

@@ -22,7 +22,7 @@ import { TypeStanzaCompiled } from "../@types/types.compiled"
 import { TypeEvent } from "../@types/type.event";
 import { properties } from "../@building/building.properties";
 import { getEventHeader } from "../@building/building.headers";
-import { eventsOffshore } from "../@dictionaries/dictionaries.eventsOffshore";
+import { eventsMatchText } from "../@dictionaries/dictionaries.eventsMatchText";
 import { getEventTracking } from "../@building/building.tracking";
 import { validateEvents } from "../@building/building.validate";
 
@@ -40,7 +40,7 @@ export const text = async (stanza: TypeStanzaCompiled): Promise<void> => {
         const header = getEventHeader({properties: props, getType: stanza.getType})   
         const issued = new Date(attributes.issue)
         const expires = new Date(issued.getTime() + 12 * 60 * 60 * 1000)
-        let event = Object.keys(eventsOffshore).find(event => message.toLowerCase().includes(event.toLowerCase()));
+        let event = Object.keys(eventsMatchText).find(event => message.toLowerCase().includes(event.toLowerCase()));
         let isStatement = false;
         if (!event) { 
             event = stanza.getType.type.split(`-`).map(word => word.charAt(0).toUpperCase() + word.slice(1).toLowerCase()).join(` `)
@@ -57,7 +57,7 @@ export const text = async (stanza: TypeStanzaCompiled): Promise<void> => {
                 parent: event,
                 status: isStatement ? `Statement` : `Issued`,
                 issued: (!isNaN(issued.getTime())) ? issued.toISOString() : new Date().toISOString(),
-                expires: isStatement ? new Date(issued.getTime() + 5 * 1000).toISOString() : (!isNaN(expires.getTime())) ? expires.toISOString() : new Date(Date.now() + 60 * 60 * 1000).toISOString(),
+                expires: isStatement ? new Date(issued.getTime() + 120 * 1000).toISOString() : (!isNaN(expires.getTime())) ? expires.toISOString() : new Date(Date.now() + 60 * 60 * 1000).toISOString(),
                 ...props,
                 metadata: {
                     ms: performance.now() - tick,

package/src/@events/events.ugc.ts

@@ -20,7 +20,7 @@
 import { TypeAttributes } from "../@types/types.attributes";
 import { TypeStanzaCompiled } from "../@types/types.compiled"
 import { TypeEvent } from "../@types/type.event";
-import { eventsOffshore } from "../@dictionaries/dictionaries.eventsOffshore";
+import { eventsMatchText } from "../@dictionaries/dictionaries.eventsMatchText";
 import { ugcExtract } from "../@parsers/@ugc/ugc.extract";
 import { properties } from "../@building/building.properties";
 import { getEventHeader } from "../@building/building.headers";
@@ -41,11 +41,13 @@ export const ugc = async (stanza: TypeStanzaCompiled): Promise<void> => {
         if (ugc != null ) {
             const props = properties({ message, attributes, ugc: ugc })
             const issued = new Date(attributes.issue)
-            const expires = new Date(ugc.expires).toISOString()
+            const expires = new Date(ugc.expires)
             const header = getEventHeader({properties: props, getType: stanza.getType })
-            let event = Object.keys(eventsOffshore).find(event => message.toLowerCase().includes(event.toLowerCase()));
+            let event = Object.keys(eventsMatchText).find(event => message.toLowerCase().includes(event.toLowerCase()));
+            let isStatement = false;
             if (!event) { 
                 event = stanza.getType.type.split(`-`).map(word => word.charAt(0).toUpperCase() + word.slice(1).toLowerCase()).join(` `)
+                isStatement = true;
             }
             processed.push({
                 type: `Feature`,
@@ -56,9 +58,9 @@ export const ugc = async (stanza: TypeStanzaCompiled): Promise<void> => {
                 properties: { 
                     event: event,
                     parent: event,
-                    status: `Issued`,
+                    status: isStatement ? `Statement` : `Issued`,
                     issued: (!isNaN(issued.getTime())) ? issued.toISOString() : new Date().toISOString(),
-                    expires: (!isNaN(new Date(ugc.expires).getTime())) ? expires : new Date(Date.now() + 60 * 60 * 1000).toISOString(),
+                    expires: isStatement ? new Date(issued.getTime() + 120 * 1000).toISOString() : (!isNaN(expires.getTime())) ? expires.toISOString() : new Date(Date.now() + 60 * 60 * 1000).toISOString(),
                     ...props,
                     metadata: {
                         ms: performance.now() - tick,

package/src/@modules/@utilities/utilities.createWebhook.ts

@@ -32,10 +32,11 @@ interface CreateWebhookOptions {
 export const createWebhook = async (options: CreateWebhookOptions): Promise<void> => {
     const event = options.event.properties;
     const settings = options.webhook;
+    
     let body = [
         event.locations ? `**Locations**: ${event.locations.slice(0,100)}` : null,
         event.issued ? `**Issued**: <t:${Math.floor(new Date(event.issued).getTime()/1000)}:R>` : null,
-        event.expires ? `**Expires**: <t:${Math.floor(new Date(event.expires).getTime()/1000)}:R>` : null,
+        event.expires && event.status != `Statement` ? `**Expires**: <t:${Math.floor(new Date(event.expires).getTime()/1000)}:R>` : null,
         (() => {
             const val = event.parameters.estimated_wind_gusts ?? null
             const th = event.parameters.wind_threat ?? null
@@ -50,6 +51,20 @@ export const createWebhook = async (options: CreateWebhookOptions): Promise<void
         event.parameters.damage_threat ? `**Damage Threat**: ${event.parameters.damage_threat}` : null,
         event.parameters.flood_threat ? `**Flood Threat**: ${event.parameters.flood_threat}` : null,
         event.parameters.tornado_threat ? `**Tornado Threat**: ${event.parameters.tornado_threat}` : null,
+        event.spc_parameters.spc_max_tornado ? `**Max Tornado Threat**: ${event.spc_parameters.spc_max_tornado}` : null,
+        event.spc_parameters.spc_max_hail ? `**Max Hail Threat**: ${event.spc_parameters.spc_max_hail}` : null,
+        event.spc_parameters.spc_max_wind ? `**Max Wind Threat**: ${event.spc_parameters.spc_max_wind}` : null,
+        event.spc_parameters.spc_watch_issuance ? `**Watch Issuance**: ${event.spc_parameters.spc_watch_issuance}%` : null,
+        event.watch_parameters.watch_number ? `**Watch Number**: ${event.watch_parameters.watch_number}` : null,
+        event.watch_parameters.strong_tornadoes_probability ? `**Strong Tornadoes Probability**: ${event.watch_parameters.strong_tornadoes_probability}%` : null,
+        event.watch_parameters.additional_tornadoes_probability ? `**Additional Tornadoes Probability**: ${event.watch_parameters.additional_tornadoes_probability}%` : null,
+        event.watch_parameters.combined_hail_wind_probability ? `**Combined Hail/Wind Probability**: ${event.watch_parameters.combined_hail_wind_probability}%` : null,        
+        event.watch_parameters.severe_hail_probability ? `**Severe Hail Probability**: ${event.watch_parameters.severe_hail_probability}%` : null,
+        event.watch_parameters.hail_2in_probability ? `**Hail ≥2in Probability**: ${event.watch_parameters.hail_2in_probability}%` : null,
+        event.watch_parameters.max_hail_in ? `**Max Hail Inches**: ${event.watch_parameters.max_hail_in}` : null,
+        event.watch_parameters.severe_wind_probability ? `**Severe Wind Probability**: ${event.watch_parameters.severe_wind_probability}%` : null,
+        event.watch_parameters.max_wind_surface ? `**Max Surface Wind**: ${event.watch_parameters.max_wind_surface}` : null,
+        event.watch_parameters.max_tops_x100feet ? `**Max Tops (x100 feet)**: ${event.watch_parameters.max_tops_x100feet}` : null,
         (event.parameters.tags?.length > 0) ? `**Tags**: ${event.parameters.tags.join(', ')}` : null,
         (() => {
             const val = event.geocode?.office?.name ?? `N/A`
@@ -57,8 +72,6 @@ export const createWebhook = async (options: CreateWebhookOptions): Promise<void
             return (val || th) ? `**Sender**: ${val} ${th ? `(${th})` : ''}` : null;
         })(),
         event.metadata?.tracking ? `**Tracking**: ${event.metadata.tracking}` : null,
-        event.metadata?.vtec?.vtec ? `**VTEC**: ${event.metadata.vtec?.vtec}` : null,
-        event.metadata?.filtered_proximity != null ? `**Currently in polygon (Node)**: ${event.metadata.filtered_proximity ? 'Yes' : 'No'}` : null,
         (() => {
             const desc = (event.description || '').split('\n').map(l => l.trim()).filter(Boolean).join('\n');
             return desc ? '```' + '\n' + desc + '\n' + '```' : null;
@@ -86,10 +99,12 @@ export const createWebhook = async (options: CreateWebhookOptions): Promise<void
         content: settings.message ?? "",
         embeds: [embed]
     }));
-    form.append("file", Buffer.from(JSON.stringify({ type: "FeatureCollection", features: [(getCleanedEvent(options.event))] }, null, 2)), {
-        filename: `${event.event}_${event.status}_${event.metadata.tracking}.json`,
-        contentType: "application/json"
-    });
+    if (settings.upload) {
+        form.append("file", Buffer.from(JSON.stringify((getCleanedEvent(event)), null, 2)), {
+            filename: `${event.event}_${event.status}_${event.metadata.tracking}.json`,
+            contentType: "application/json"
+        });
+    }
     await createHttp({
         url: settings.webhook,
         timeout: 2000,

package/src/@types/types.webhook.ts

@@ -21,6 +21,7 @@ export type TypeWebhook = {
     webhook: string
     title: string
     message: string
+    upload: boolean
     rate: number
     events: string[]
 }

package/src/bootstrap.ts

@@ -21,7 +21,7 @@ import path from 'path'
 import { EventEmitter } from 'node:events';
 
 export const bootstrap = {
-    version: `3.0.2`,
+    version: `3.0.3`,
     isReady: true,
     ratelimits: {},
     session_xmpp: null,

package/test.js

@@ -34,6 +34,7 @@ const NOAAWeatherWireService = new Manager({
             webhook: "https://discord.com/api/webhooks/XXXXXXXXXXXXXX/XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX", 
             title: "AtmosphericX - (Severe Weather Events)", 
             message: `<@user_id>`, 
+            upload: true,
             events: [`Severe Thunderstorm Warning`, `Radar Indicated Tornado Warning`],
             rate: 1,
         },
@@ -41,6 +42,7 @@ const NOAAWeatherWireService = new Manager({
             webhook: "https://discord.com/api/webhooks/XXXXXXXXXXXXXX/XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX", 
             title: "AtmosphericX - (All Events)", 
             message: `<@user_id>`, 
+            upload: false,
             events: [],
             rate: 5,
         }