@atmosx/event-product-parser 3.0.53 → 3.0.55

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.53`,
+  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" }
   }
 };
 
@@ -6404,8 +6408,8 @@ var setEasTone = (options) => __async(null, null, function* () {
   return outTTS;
 });
 
-// src/@parsers/@text/text.getEmbed.ts
-var getEmebed = (event) => {
+// src/@parsers/@text/text.getEmbedText.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;
@@ -6442,8 +6446,8 @@ var getEmebed = (event) => {
   ].filter(Boolean).join("\n");
 };
 
-// src/@parsers/@text/text.getRaw.ts
-var getRaw = (event) => {
+// 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;
   const line = (label, value, condition = true) => condition && value ? `${label} ${value}` : null;
   const isStatement = event.properties.status_metadata.is_statement;
@@ -6540,7 +6544,7 @@ var getMatched = (strings, string) => {
 // src/@manager/manager.updateListener.ts
 import { existsSync as existsSync2, mkdirSync as mkdirSync2, writeFileSync as writeFileSync3, readFileSync as readFileSync2, appendFileSync } from "fs";
 var updateListener = (event) => __async(null, null, function* () {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p;
   const tick = performance.now();
   const settings = bootstrap.settings;
   const listeners2 = settings.ListenerSettings;
@@ -6559,37 +6563,39 @@ var updateListener = (event) => __async(null, null, function* () {
     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 uploads = listener2 == null ? void 0 : listener2.uploads;
+    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) {
+      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) {
+      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);
           }
         }
         metadata.file = metadata.raw;
       }
-      if (uploads == null ? void 0 : uploads.event) {
+      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 });
           }
@@ -6597,37 +6603,37 @@ var updateListener = (event) => __async(null, null, function* () {
         }
         metadata.json = JSON.stringify(getCleanedEvent(event), null, 2);
       }
-      if (settings.NotifyServer.Enabled && ((_a = listener2 == null ? void 0 : listener2.notify) == null ? void 0 : _a.enabled) && ((_b = listener2 == null ? void 0 : listener2.notify) == null ? void 0 : _b.topic)) {
-        const auth = ((_c = settings.NotifyServer.Credentials) == null ? void 0 : _c.Username) && ((_d = settings.NotifyServer.Credentials) == null ? void 0 : _d.Password) ? {
-          username: settings.NotifyServer.Credentials.Username,
-          password: settings.NotifyServer.Credentials.Password
-        } : void 0;
-        const attachment = metadata.eas && settings.NotifyServer.Attachments ? `${settings.NotifyServer.Attachments}/${metadata.name}_${metadata.status}_${metadata.tracking}.wav` : null;
-        yield createHttp(__spreadProps(__spreadValues({
-          url: `${settings.NotifyServer.Server.replace(/\/$/, "")}/${(_e = listener2 == null ? void 0 : listener2.notify) == null ? void 0 : _e.topic}`,
-          timeout: 15e3,
-          method: "POST"
-        }, auth && { auth }), {
-          headers: __spreadProps(__spreadValues({
-            "Title": `${metadata.name} (${metadata.status})`,
-            "Tags": (_g = (_f = properties2.parameters.tags) == null ? void 0 : _f.join(",")) != null ? _g : "N/A"
-          }, attachment && { "Attach": attachment }), {
-            "Priority": "max",
-            "Sound": "siren"
-          }),
-          body: getRaw(event)
-        }));
+      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;
+        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: ((_h = webhook.ratelimit) != null ? _h : 2) * 2, max: (_i = webhook.ratelimit) != null ? _i : 2, addTime: true });
+      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: getEmebed(event),
+          description: getEmebedText(event),
           fields: [],
           color: 16711680,
           timestamp: (/* @__PURE__ */ new Date()).toISOString(),
-          footer: { text: (_j = webhook.title) != null ? _j : `AtmosphericX` }
+          footer: { text: (_m = webhook.Title) != null ? _m : `AtmosphericX` }
         };
         if (isRatelimited.limited) {
           return;
@@ -6641,32 +6647,32 @@ var updateListener = (event) => __async(null, null, function* () {
             value: metadata.description ? "```\n" + metadata.description.split("\n").map((l) => l.trim()).filter(Boolean).join("\n") + "\n```" : ""
           });
         }
-        if (((_k = metadata.attachments) == null ? void 0 : _k.length) > 0) {
+        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 (uploads == null ? void 0 : uploads.file) {
+        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.event) {
+        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 (uploads == null ? void 0 : uploads.EAS) {
           if (metadata.eas) {
             const file = readFileSync2(metadata.eas);
             form.append("fEas", new Blob([Buffer.from(file)], { type: "audio/mpeg" }), `${properties2.event}_${properties2.status}_${properties2.metadata.tracking}_eas.mp3`);
           }
         }
         form.append("payload_json", JSON.stringify({
-          username: (_l = webhook.title) != null ? _l : "AtmosphericX",
-          content: (_m = webhook.message) != null ? _m : "",
+          username: (_o = webhook.Title) != null ? _o : "AtmosphericX",
+          content: (_p = webhook.Message) != null ? _p : "",
           embeds: [embed]
         }));
         yield createHttp({
-          url: webhook.destination,
+          url: webhook.Destination,
           timeout: 15e3,
           method: `POST`,
           body: form
@@ -6903,32 +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 getEvent = 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 cachedStatus = event.properties.status;
-  event.properties.expires = (/* @__PURE__ */ new Date()).toISOString();
-  event.properties.status = `Expired`;
-  event.properties.status_metadata.is_expired = true;
-  if (getEvent) {
-    if (!event.properties.status_metadata.is_statement) {
+  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);
     }
-    if (cachedStatus != `Statement`) yield updateListener(event);
-    bootstrap.cache.events.features.splice(bootstrap.cache.events.features.indexOf(getEvent), 1);
-    bootstrap.cache.hashes = bootstrap.cache.hashes.filter((hash) => hash.tracking !== event.properties.metadata.tracking);
-    setTimeoutAction({ identifier: event.properties.metadata.tracking, expire: true });
+    setTimeoutAction({ identifier: gTracking, expire: true });
+    setTimeoutAction({ identifier: gTracking + `notify.server`, expire: true });
   }
   setEventEmit({
     event: `onEventCache`,
@@ -7081,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`) {
@@ -7143,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;
   });
@@ -7590,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.53",
+	"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,37 +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 getEvent = bootstrap.cache.events.features.find(f => f?.properties?.metadata?.tracking === event?.properties?.metadata?.tracking);
-    const cachedStatus = event.properties.status;
 
-    event.properties.expires = new Date().toISOString();
-    event.properties.status = `Expired`;
-    event.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 (getEvent) {
-        if (!event.properties.status_metadata.is_statement) {
+    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)
         }
-        if (cachedStatus != `Statement`) await updateListener(event)
-        bootstrap.cache.events.features.splice(bootstrap.cache.events.features.indexOf(getEvent), 1);
-        bootstrap.cache.hashes = bootstrap.cache.hashes.filter(hash => hash.tracking !== event.properties.metadata.tracking);
-        setTimeoutAction({ identifier: event.properties.metadata.tracking, expire: true })
+        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) }
 }