@atmosx/event-product-parser 3.0.54 → 3.0.55

package/dist/cjs/index.cjs

@@ -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.55`,
   isReady: true,
   ratelimits: {},
   session_xmpp: null,
@@ -1378,6 +1378,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);
@@ -5815,6 +5816,9 @@ 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" }
   }
 };
 
@@ -6595,12 +6599,13 @@ var updateListener = (event) => __async(null, null, function* () {
       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();
+          const file = `${fDestination}/${metadata.name}_${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);
+            (0, import_fs3.appendFileSync)(file, `${`
+`.repeat(10)}${metadata.raw}`);
           } else {
             (0, import_fs3.writeFileSync)(file, metadata.raw);
           }
@@ -6610,7 +6615,7 @@ var updateListener = (event) => __async(null, null, function* () {
       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();
+          const file = `${eDestination}/${metadata.name}_${metadata.tracking}.json`.replace(/[\\:*?"<>|]/g, "_").replace(/\s+/g, " ").trim();
           if (!(0, import_fs3.existsSync)(eDestination)) {
             (0, import_fs3.mkdirSync)(eDestination, { recursive: true });
           }
@@ -6622,19 +6627,22 @@ var updateListener = (event) => __async(null, null, function* () {
         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)
-        }));
+        const isRatelimited = setTimeoutAction({ identifier: metadata.tracking + `notify.server`, interval: 1, max: 1, addTime: true });
+        if (!isRatelimited.limited) {
+          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 });
@@ -6921,33 +6929,42 @@ var mkEvent = (event) => __async(null, null, function* () {
   }
 });
 
+// src/@dictionaries/dictionaries.strings.ts
+var dict_strings = {
+  cancellation: `{EVENT} has been allowed to expire. This product is no longer in effect.`
+};
+
 // 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);
+var rmEvent = (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) {
+  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 ? dict_strings.cancellation.replace(`{SENDER}`, event.properties.geocode.office.name).replace(`{EVENT}`, event.properties.event) : event.properties.metadata.raw;
+    event.properties.description = event.properties.metadata.raw = description;
+    event.properties.metadata.history.push({
+      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 updateListener(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 });
+    setTimeoutAction({ identifier: gTracking + `notify.server`, expire: true });
   }
   setEventEmit({
     event: `onEventCache`,
@@ -7100,7 +7117,7 @@ var validateEvents = (events) => __async(null, null, function* () {
     }
     if (properties2.status_metadata.is_expired) {
       setEventEmit({ event: `onExpiredProduct`, metadata: define2 });
-      rmEvent(define2);
+      rmEvent(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`) {
@@ -7162,18 +7179,19 @@ 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 pre = __spreadProps(__spreadValues({}, define2), { properties: __spreadProps(__spreadValues({}, define2.properties), { metadata: __spreadValues({}, define2.properties.metadata) }) });
     const properties2 = define2.properties;
-    (_a = properties2 == null ? void 0 : properties2.metadata) == null ? true : delete _a.ms;
+    delete pre.properties.metadata.ms;
+    delete pre.properties.metadata.header;
     const enhanced = properties2.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);
     }
-    properties2.metadata.hash = (0, import_crypto.createHash)("sha256").update(JSON.stringify(properties2)).digest("hex");
+    properties2.metadata.hash = (0, import_crypto.createHash)("sha256").update(JSON.stringify(pre)).digest("hex");
     setEventEmit({ event: `onProductType${enhanced.replace(/\s+/g, "")}`, metadata: define2 });
     return !filtered;
   });
@@ -7609,16 +7627,17 @@ var setCronSchedule = () => __async(null, null, function* () {
 // src/@manager/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 rmEvent(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) {

package/dist/esm/index.mjs

@@ -1104,7 +1104,7 @@ var require_main3 = __commonJS({
 import path from "path";
 import { EventEmitter } from "events";
 var bootstrap = {
-  version: `3.0.54`,
+  version: `3.0.55`,
   isReady: true,
   ratelimits: {},
   session_xmpp: null,
@@ -1358,6 +1358,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);
@@ -5795,6 +5796,9 @@ 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" }
   }
 };
 
@@ -6575,12 +6579,13 @@ var updateListener = (event) => __async(null, null, function* () {
       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();
+          const file = `${fDestination}/${metadata.name}_${metadata.tracking}.txt`.replace(/[\\:*?"<>|]/g, "_").replace(/\s+/g, " ").trim();
           if (!existsSync2(fDestination)) {
             mkdirSync2(fDestination, { recursive: true });
           }
           if (existsSync2(file)) {
-            appendFileSync(file, metadata.raw);
+            appendFileSync(file, `${`
+`.repeat(10)}${metadata.raw}`);
           } else {
             writeFileSync3(file, metadata.raw);
           }
@@ -6590,7 +6595,7 @@ var updateListener = (event) => __async(null, null, function* () {
       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();
+          const file = `${eDestination}/${metadata.name}_${metadata.tracking}.json`.replace(/[\\:*?"<>|]/g, "_").replace(/\s+/g, " ").trim();
           if (!existsSync2(eDestination)) {
             mkdirSync2(eDestination, { recursive: true });
           }
@@ -6602,19 +6607,22 @@ var updateListener = (event) => __async(null, null, function* () {
         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)
-        }));
+        const isRatelimited = setTimeoutAction({ identifier: metadata.tracking + `notify.server`, interval: 1, max: 1, addTime: true });
+        if (!isRatelimited.limited) {
+          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 });
@@ -6901,33 +6909,42 @@ var mkEvent = (event) => __async(null, null, function* () {
   }
 });
 
+// src/@dictionaries/dictionaries.strings.ts
+var dict_strings = {
+  cancellation: `{EVENT} has been allowed to expire. This product is no longer in effect.`
+};
+
 // 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);
+var rmEvent = (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) {
+  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 ? dict_strings.cancellation.replace(`{SENDER}`, event.properties.geocode.office.name).replace(`{EVENT}`, event.properties.event) : event.properties.metadata.raw;
+    event.properties.description = event.properties.metadata.raw = description;
+    event.properties.metadata.history.push({
+      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 updateListener(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 });
+    setTimeoutAction({ identifier: gTracking + `notify.server`, expire: true });
   }
   setEventEmit({
     event: `onEventCache`,
@@ -7080,7 +7097,7 @@ var validateEvents = (events) => __async(null, null, function* () {
     }
     if (properties2.status_metadata.is_expired) {
       setEventEmit({ event: `onExpiredProduct`, metadata: define2 });
-      rmEvent(define2);
+      rmEvent(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`) {
@@ -7142,18 +7159,19 @@ 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 pre = __spreadProps(__spreadValues({}, define2), { properties: __spreadProps(__spreadValues({}, define2.properties), { metadata: __spreadValues({}, define2.properties.metadata) }) });
     const properties2 = define2.properties;
-    (_a = properties2 == null ? void 0 : properties2.metadata) == null ? true : delete _a.ms;
+    delete pre.properties.metadata.ms;
+    delete pre.properties.metadata.header;
     const enhanced = properties2.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);
     }
-    properties2.metadata.hash = createHash("sha256").update(JSON.stringify(properties2)).digest("hex");
+    properties2.metadata.hash = createHash("sha256").update(JSON.stringify(pre)).digest("hex");
     setEventEmit({ event: `onProductType${enhanced.replace(/\s+/g, "")}`, metadata: define2 });
     return !filtered;
   });
@@ -7589,16 +7607,17 @@ var setCronSchedule = () => __async(null, null, function* () {
 // src/@manager/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 rmEvent(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) {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atmosx/event-product-parser",
-	"version": "3.0.54",
+	"version": "3.0.55",
 	"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/@building/building.validate.ts

@@ -57,7 +57,7 @@ export const validateEvents = async (events: TypeEvent[]): Promise<void> => {
         
         if (properties.status_metadata.is_expired) { 
             setEventEmit({ event: `onExpiredProduct`, metadata: define })
-            rmEvent(define)
+            rmEvent(define, false)
             return true; 
         }
         
@@ -124,14 +124,16 @@ export const validateEvents = async (events: TypeEvent[]): Promise<void> => {
     const filtering = events.filter((event: TypeEvent) => {
         bootstrap.cache.processed = bootstrap.cache.processed.filter((e) => e !== event);
         const define = getEventSignature(event) as TypeEvent;
-        const properties = define.properties; delete properties?.metadata?.ms;
+        // make a copy of the define object with properites so we can delete values to make hash
+        const pre = {...define,properties: {...define.properties,  metadata: {...define.properties.metadata }}};
+        const properties = define.properties; delete pre.properties.metadata.ms; delete pre.properties.metadata.header;
         const enhanced = properties.event = getEventEnhancedName(event)
         const filtered = isFiltered(define)
         if (!filtered) {
             event.geometry = !bools?.DisableGeometryParsing ? getEventGeometry(event) : null;
             properties.metadata.attachments = getEventAttachments(event)
         }
-        properties.metadata.hash = createHash("sha256").update(JSON.stringify(properties)).digest("hex")  
+        properties.metadata.hash = createHash("sha256").update(JSON.stringify(pre)).digest("hex")  
         setEventEmit({ event: `onProductType${enhanced.replace(/\s+/g, '')}`, metadata: define });
         return !filtered
     })

package/src/@dictionaries/dictionaries.enhanced.ts

@@ -64,4 +64,7 @@ export const dict_enhanced: Record<string, Record<string, EnhancedEventType>> =
         "Considerable Severe Thunderstorm Warning": { damage: `CONSIDERABLE` },
         "Severe Thunderstorm Warning (TPROB)": { tornado: `POSSIBLE` },
     },
+    "Special Weather Statement": {
+        "Convective Special Weather Statement": { description: "strong thunderstorm" },
+    }
 }

package/src/@dictionaries/dictionaries.strings.ts

@@ -0,0 +1,22 @@
+/*
+              _                             _               _     __   __
+         /\  | |                           | |             (_)    \ \ / /
+        /  \ | |_ _ __ ___   ___  ___ _ __ | |__   ___ _ __ _  ___ \ V / 
+       / /\ \| __| '_ ` _ \ / _ \/ __| '_ \| '_ \ / _ \ '__| |/ __| > <  
+      / ____ \ |_| | | | | | (_) \__ \ |_) | | | |  __/ |  | | (__ / . \ 
+     /_/    \_\__|_| |_| |_|\___/|___/ .__/|_| |_|\___|_|  |_|\___/_/ \_\
+                                     | |                            
+                                     |_|                                                                                                                
+
+    Created with ♥ by the AtmosphericX Team (KiyoWx, StarflightWx, & CJ Ziegler)
+    Discord: https://atmosphericx-discord.scriptkitty.cafe
+    Ko-Fi: https://ko-fi.com/k3yomi
+    Documentation: http://localhost/documentation | https://atmosphericx.scriptkitty.cafe/documentation
+
+    Internal Package: @atmosx/event-product-parser
+
+*/
+
+export const dict_strings: Record<string, string> = {
+    cancellation: `{EVENT} has been allowed to expire. This product is no longer in effect.`,
+}

package/src/@manager/manager.rmEvent.ts

@@ -18,39 +18,52 @@
 */
 
 import { TypeEvent } from "../@types/type.event";
+import { dict_strings } from "../@dictionaries/dictionaries.strings";
 import { bootstrap } from "../bootstrap"
 import { setEventEmit } from "../@modules/@utilities/utilities.setEventEmit";
 import { setTimeoutAction } from "../@modules/@utilities/utilities.setTimeoutAction";
 import { updateListener } from "./manager.updateListener";
 
-export const rmEvent = async (event: TypeEvent): Promise<void> => {
-    const gSelect = event;
-    const gEvent = bootstrap.cache.events.features.find(f => f?.properties?.metadata?.tracking === event?.properties?.metadata?.tracking);
-    const gStatement = event.properties.status_metadata.is_statement
 
-    gSelect.properties.expires = new Date().toISOString();
-    gSelect.properties.status = `Expired`;
-    gSelect.properties.status_metadata.is_expired = true;
+export const rmEvent = async (event: TypeEvent, isTimeBasedExpiration: boolean):Promise<void> => {
+    const gTracking = event.properties.metadata.tracking;
+    const isTrackingEventLogged = bootstrap.cache.events.features
+        .find(f => f?.properties?.metadata?.tracking === gTracking);
+    const isStatement = event.properties.status_metadata.is_statement;
 
-    if (gEvent) {
-        if (!gStatement) {
+    if (isTrackingEventLogged) { 
+        event.properties.expires = new Date().toISOString();
+        event.properties.status = `Expired`;
+        event.properties.status_metadata.is_expired = true;
+
+        
+        const description = isTimeBasedExpiration ? dict_strings.cancellation
+            .replace(`{SENDER}`, event.properties.geocode.office.name)
+            .replace(`{EVENT}`, event.properties.event) : event.properties.metadata.raw;
+        event.properties.description = event.properties.metadata.raw = description;
+        event.properties.metadata.history.push({
+            description: 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: event
-                },
-                message: `[Removed] ${event.properties.event} (${event.properties.status}) (${event.properties.metadata.tracking})`
+                metadata: { type: `Removed`, event: event },
+                message: `[Removed] ${event.properties.event} (${event.properties.status}) (${gTracking})`
             })
-            setEventEmit({ event: `onExpiredProduct`, metadata: event })
+            await updateListener(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) await updateListener(gSelect)
+        setTimeoutAction({ identifier: gTracking, expire: true })
+        setTimeoutAction({ identifier: gTracking + `notify.server`, expire: true })
     }
-    
     setEventEmit({
         event: `onEventCache`,
         metadata: bootstrap.cache.events,

package/src/@manager/manager.updateEvents.ts

@@ -19,15 +19,17 @@
 
 import { TypeEvent } from "../@types/type.event";
 import { bootstrap } from "../bootstrap"
+import { setEventEmit } from "../@modules/@utilities/utilities.setEventEmit";
 import { rmEvent } from "./manager.rmEvent";
 
 export const updateEvents = async (selectedEvent?: TypeEvent): Promise<void> => {
     const events = bootstrap.cache.events.features;
-    async function update(evt: TypeEvent) {
-        if (new Date(evt.properties.expires) < new Date()) {
-            await rmEvent(evt);
+    async function update(event: TypeEvent) {
+        if (new Date(event.properties.expires) < new Date()) {
+            setEventEmit({ event: `onExpiredProduct`, metadata: event })
+            await rmEvent(event, true)
         }
     }
-    if (!selectedEvent) { await Promise.all(events.map(async (evt) => { await update(evt) })) } 
+    if (!selectedEvent) { await Promise.all(events.map(async (event) => { await update(event) })) } 
     if (selectedEvent) { await update(selectedEvent) }
 }

package/src/@manager/manager.updateListener.ts

@@ -68,10 +68,10 @@ export const updateListener = async (event: TypeEvent): Promise<void> => {
             if (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();
+                    const file = (`${fDestination}/${metadata.name}_${metadata.tracking}.txt`).replace(/[\\:*?"<>|]/g, "_").replace(/\s+/g, " ").trim();
                     if (!existsSync(fDestination)) { mkdirSync(fDestination, { recursive: true }); }
                     if (existsSync(file)) {
-                        appendFileSync(file, metadata.raw);
+                        appendFileSync(file, `${(`\n`).repeat(10)}${metadata.raw}`);
                     } else {
                         writeFileSync(file, metadata.raw);
                     }
@@ -82,7 +82,7 @@ export const updateListener = async (event: TypeEvent): Promise<void> => {
             if (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();
+                    const file = (`${eDestination}/${metadata.name}_${metadata.tracking}.json`).replace(/[\\:*?"<>|]/g, "_").replace(/\s+/g, " ").trim();
                     if (!existsSync(eDestination)) { mkdirSync(eDestination, { recursive: true }); }
                     writeFileSync(file, JSON.stringify(getCleanedEvent(event), null, 2));
                 }
@@ -93,20 +93,23 @@ export const updateListener = async (event: TypeEvent): Promise<void> => {
                 const server = settings?.NotifyServer;
                 const auth = server?.Credentials?.Username && server?.Credentials?.Password ? { username: settings?.NotifyServer?.Credentials?.Username, password: server?.Credentials?.Password } : undefined;
                 const attachment = metadata.eas && server?.Attachments ? `${server?.Attachments}/${metadata.name}_${metadata.status}_${metadata.tracking}.wav` : undefined;
-                await createHttp({
-                    url: `${server?.Server?.replace(/\/$/, "")}/${listener?.NotificationServer?.Topic}`,
-                    timeout: 15_000,
-                    method: "POST",
-                    ...(auth && { auth }),
-                    headers: {
-                        "Title": `${metadata.name} (${metadata.status})`,
-                        "Tags":  properties.parameters.tags?.join(",") ?? "N/A",
-                        "Expires": new Date(properties.expires).getTime(),
-                        "Priority": notify?.Priority ? notify.Priority.toString() : "5",
-                        ... (attachment && { "Attach": attachment }),
-                    },
-                    body: getStringText(event)
-                })
+                const isRatelimited = setTimeoutAction({ identifier: metadata.tracking + `notify.server`, interval: 1, max: 1, addTime: true })
+                if (!isRatelimited.limited) { 
+                    await createHttp({
+                        url: `${server?.Server?.replace(/\/$/, "")}/${listener?.NotificationServer?.Topic}`,
+                        timeout: 15_000,
+                        method: "POST",
+                        ...(auth && { auth }),
+                        headers: {
+                            "Title": `${metadata.name} (${metadata.status})`,
+                            "Tags":  properties.parameters.tags?.join(",") ?? "N/A",
+                            "Expires": new Date(properties.expires).getTime(),
+                            "Priority": notify?.Priority ? notify.Priority.toString() : "5",
+                            ... (attachment && { "Attach": attachment }),
+                        },
+                        body: getStringText(event)
+                    })
+                }
             }
 
             if (webhook?.Enabled && webhook?.Destination) {

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

@@ -41,6 +41,7 @@ export const setTimeoutAction = (options: SetTimeoutActionOptions): SetTimeoutAc
     }
     if (options?.expire) {
         delete bootstrap.ratelimits[options?.identifier];
+        return { limited: false };
     }
     if (target?.length > 0) {
        bootstrap.ratelimits[options?.identifier] = target.filter((ts: number) => Date.now() - ts < options?.interval * 1000);

package/src/bootstrap.ts

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