@atmosx/event-product-parser 3.0.53 → 3.0.55

package/.github/README.md

@@ -23,7 +23,7 @@ const { Manager } = require(`@atmosx/event-product-parser`) // CJS Importing
 import { Manager } from '@atmosx/event-product-parser' // EJS Importing
 
 const Client = new Manager({
-    Database: `shapefiles.db`,
+    Database: `event-product-parser.db`,
     EnableWireService: false,
     EnableJournal: true,
     EnableDebugging: false,
@@ -39,8 +39,8 @@ const Client = new Manager({
         },   
         CacheSettings: {
             Enabled: true,
-            MaxDatabaseHistory: 5000,
-            MaxRetentionHistory: 555,
+            MaxDatabaseHistory: 50000,
+            MaxRetentionHistory: 1500,
         },
         StanzaSettings: {
             DisableUGC: false,
@@ -54,12 +54,13 @@ const Client = new Manager({
     },
     BroadcastifySettings: {
         BroadcastifyAttachments: true,
+        BroadcastifyDatabase: `https://scriptkitty.cafe/ftp/@atmosphericx/assets/broadcastify.json`,
         BroadcastifyTags: [`Public Safety`, `Amateur Radio`, `Other`, `Rail`, `Aviation`, `Marine`, `Disaster Event`, `Special Event`]
     },
     NotifyServer: {
         Enabled: false,
-        Server: "https://ntfy.domainname.com",
-        Attachments: "https://domainname.com/Storage/EasScenarios",
+        Server: "https://ntfy.scriptkitty.cafe",
+        Attachments: "https://scriptkitty.cafe/ftp/@bucket/EAS/encoded",
         Credentials: {
             Username: "username",
             Password: "password"
@@ -67,22 +68,16 @@ const Client = new Manager({
     },
     ListenerSettings: [
         {
-            events: [`*Thunderstorm Warning*`, `* Watch`],
-            webhook: {
-                enabled: true,
-                destination: "https://discord.com/api/XXXXXXXXXX/XXXXXXXXXXX",
-                title: "AtmosphericX - (Thunderstorm Warnings and Watches)",
-                message: "<@&XXXXXXXXXXXXXXXXXXXXX>",
-                ratelimit: 1
+            Events: ["*Extreme Heat Warning*"],
+            NotificationServer: {
+                Enabled: false,
+                Topic: "heat-warnings",
+                Priority: 5
             },
-            notify: {
-                enabled: false,
-                topic: "thunderstorm_events",
-            },
-            uploads: {
-                eas: true,
-                file: true,
-                event: true
+            Uploads: {
+                EAS: true,
+                File: true,
+                JSON: true
             }
         }
     ],
@@ -94,106 +89,29 @@ const Client = new Manager({
         SPCWatchesOnly: true,
         ShapefileSkipPoints: 0,
         NodeTTL: 60,
-        NodeMinDistance: 120,
+        NodeMinDistance: 125,
         EventFiltering: {
             ListeningEvents: [
-                "*Severe Thunderstorm Warning*",
-                "*Blizzard*", "*Ice Storm*", "*Winter Storm*", "*Snow Squall*",
-                "Tornado Emergency", "*Tornado Warning*",
-                "Special Weather Statement", "Marine Weather Statement",
-                "*Tsunami*", "*Hurricane*", "*Tropical Storm*", "*Special Marine*",
-                "*Flash Flood Warning*", "*Flash Flood Watch*", "*Flash Flood Advisory*",
-                "Mesoscale Discussion",
-                "*Storm Prediction Center*",
-                "PDS Tornado Watch", "Tornado Watch", "Severe Thunderstorm Watch", "Flash Flood Watch", "PDS Severe Thunderstorm Watch",
-                "*Administrative*", "National Weather Service Policy",
-                "Fire Weather Warning", "Fire Weather Watch", "Fire Weather Advisory",
+               "*Warning*"
             ],
-            ListeningICAO: [`KLOT`],
+            ListeningICAO: [],
+            ListeningUGC: [],
+            ListeningStates: [],
             IgnoredICAO: [],
             IgnoredEvents: [],
-            ListeningUGC: [`WIC001`],
-            ListeningStates: [`MO`, `IA`],
             NodeLocationFiltering: false,
             IgnoreTestProducts: true,
         },
         ArchiveSettings: {
-            TTL: 600,
-            EventDirectory: `Storage/EventProducts`,
-            TextDirectory: `Storage/TextProducts`,
-            EasDirectory: `Storage/EasScenarios`,
-            EasToneout: `tone.wav`,
+            TTL: 30,
+            EventDirectory: `@bucket/ParsedProducts`,
+            TextDirectory: `@bucket/RawTextProducts`,
+            EasDirectory: `@bucket/EAS`,
+            EasToneout: `eas-toneout.wav`,
         }
     }
 })
 ```
-### General Settings
-- **Database**: The database file name and location, please make sure to include the `.db` extension.
-- **EnableWireService**: Whether to enable `NOAA Weather Wire Service` within the parser. This requires credentials from [NOAA Weather Wire Service](https://www.weather.gov/nwws/).
-- **EnableJournal**: Whether to output logs without requiring event `listeners`.
-
-### NOAAWeatherWireServiceSettings
-- **ReconnectionSettings**: When the XMPP client gets disconnected or has an error, choose to reconnect to the service again. This contains a reconnection check interval.
-- **CredentialSettings**: The username (nickname) and password that is required for using `NOAA Weather Wire Service`.
-- **CacheSettings**: The ability to use the cache system so when you relaunch the parser, it will have a event retention history of all the stanzas collected.
-- **StanzaSettings**: Modify what type of products metadata you'd like to receive. (UGC, VTEC, RawText)
-
-### NationalWeatherServiceSettings
-- **CallbackInterval**: The interval at which the parser will check for new alerts from the National Weather Service API.
-- **EventsEndpoint**: The URL that directs to the API.
-
-## BroadcastifySettings
-- **BroadcastifyAttachments**: Whether to enable broadcastify attachments for events.
-- **BroadcastifyDatabase**: The download url to point to for the collection of broadcastify feeds. (Stored locally once downloaded)
-- **BroadcastifyTags**: An array of tags to filter broadcastify feeds. (`Public Safety`, `Amateur Radio`, `Other`, `Rail`, `Aviation`, `Marine`, `Disaster Event`, `Special Event`)
-
-## NotifyServer
-- **Enabled**: Whether to enable the notify server for events. This uses the [ntfy.sh](https://ntfy.sh/) service to send notifications for events. This is optional and can be disabled if not needed.
-- **Server**: The notify server URL (Ex. `https://ntfy.domainname.com`)
-- **Attachments**: The URL to the attachments directory (Ex. `https://domainname.com/Storage/EasScenarios`)
-- **Credentials**: The username and password for the notify server if required. (Optional)
-
-### ListenerSettings
-- **events**: An array of event types that will trigger the listener when they are received by the parser. If this array is empty, the listener will be triggered for all events.
-
-#### Webhook
-- **enabled**: If the webhook is enabled or not
-- **destination**: Webhook URL
-- **title**: The title of the webhook
-- **message**: The message you'd like to use for the webhook
-- **ratelimit**: How many messages can it send before being ratelimited
-
-#### Notify
-- **enabled**: If the notify server is enabled or not
-- **topic**: The topic you'd like to use for the notify server. This is used to send notifications for events. (Ex. `thunderstorm_events`)
-
-#### Uploads
-- **eas**: Whether to enable auto eas generated audio files
-- **file**: Wheather to generate text files
-
-
-### GlobalSettings
-- **EventManagement**: Whether to enable the event management system which includes filtering, tracking nodes, and custom messages.
-- **BetterEventNames**: Changes events to a more specific version depending on parameters, message types, etc. `(Ex. "Tornado Warning" -> "Observed Tornado Warning")`
-- **DisableGeometryParsing**: Disable automatically appending GeoJSON geometry data to the events to save on memory consumption.
-- **UseShapefileCoordinates**: Whether to use the shapefile database to obtain the coordinates for events with specified UGC zones.
-- **SPCWatchesOnly**: Whether to only listen for SPC watches only (TOR/SVR) (If using the API, this is ignored).
-- **ShapefileSkipPoints**: When using the shapefile database to obtain coordinates, you can choose to skip a certain amount of points to reduce the number of coordinates for large events. (Ex. If an event has 1000 coordinates and you set this to `2`, it will only use every other coordinate, therefore using 500 coordinates instead of 1000).
-- **NodeTTL**: How often nodes should be checked per event. (Tracking/Filtering)
-- **NodeMinDistance**: The minimum distance to filter events from the node (Miles)
-- **ListeningEvents**: Events you'd like to listen for. If this array is left empty, it will listen for **ALL** events and products.
-- **ListeningICAO**: ICAO codes for the weather stations you'd like to listen for. Filtering all events that do not contain the codes. `(Ex. ["KLOT", "TORD"])`
-- **IgnoredICAO**: Ignored ICAO codes `(Ex. ["KWNS"])`
-- **IgnoredEvents**: Ignored events / products.
-- **ListeningUGC**: Zones you'd like to listen to `(Ex. ["ILZ001"])`
-- **ListeningStates**: States you'd like to listen to `(Ex. ["IL"])`
-- **NodeLocationFiltering**: If you want tracking nodes to filter out events based on radius. (Miles)\
-- **IgnoreTextProducts**: If you want to ignore test products and events.
-- **TTL**: How long files live for before getting automatically deleted
-- **TextDirectory**: The location to store text products that are generated.
-- **EasDirectory**: The location to store audio eas files that are generated.
-- **EasToneout**: The toneout prefix to use for generated eas messages.
-
 
 ## How do custom listeners work?
 

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.53`,
+  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" }
   }
 };
 
@@ -6424,8 +6428,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;
@@ -6462,8 +6466,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;
@@ -6560,7 +6564,7 @@ var getMatched = (strings, string) => {
 // src/@manager/manager.updateListener.ts
 var import_fs3 = require("fs");
 var updateListener = (event) => __async(null, null, function* () {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m;
+  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;
@@ -6579,37 +6583,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 (!(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);
           }
         }
         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 (!(0, import_fs3.existsSync)(eDestination)) {
             (0, import_fs3.mkdirSync)(eDestination, { recursive: true });
           }
@@ -6617,37 +6623,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;
@@ -6661,32 +6667,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 = (0, import_fs3.readFileSync)(metadata.eas);
             form.append("fEas", new Blob([Buffer.from(file)], { type: "audio/mpeg" }), `${properties2.event}_${properties2.status}_${properties2.metadata.tracking}_eas.mp3`);
           }
         }
         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
@@ -6923,32 +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 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`,
@@ -7101,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`) {
@@ -7163,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;
   });
@@ -7610,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) {