@atmosx/event-product-parser 3.0.44 → 3.0.47

package/src/@core/core.createEvent.ts

@@ -0,0 +1,83 @@
+/*
+              _                             _               _     __   __
+         /\  | |                           | |             (_)    \ \ / /
+        /  \ | |_ _ __ ___   ___  ___ _ __ | |__   ___ _ __ _  ___ \ 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
+
+*/
+
+import { validateEvents } from "../@building/building.validate";
+import { dict_correlations } from "../@dictionaries/dictionaries.correlations";
+
+interface CreateEventOptions { 
+    event: string
+    status: string
+    issued: Date
+    expires: Date
+    locations: string
+    description: string
+    coordinates: number[][]
+}
+
+export const createEvent = (options: CreateEventOptions): void => {
+    const tick = performance.now()
+    validateEvents([{
+        type: `Feature`,
+        geometry: {
+            type: `Point`,
+            coordinates: options.coordinates
+        },
+        properties: { 
+            event: options.event,
+            parent: options.event,
+            status: options.status,
+            issued: options.issued.toISOString(),
+            expires: options.expires.toISOString(),
+            locations: options.locations,
+            locations_array: options.locations ? options.locations.split(';') : [],
+            description: options.description,
+            geocode: {
+                office: {
+                    office: `ATMX`,
+                    name: `AtmosphericX Manual Event`,
+                },
+                organization: `AtmosphericX`,
+                ugc: [],
+                polygon: options.coordinates.length > 0 ? Buffer.from(JSON.stringify([options.coordinates[0]])).toString('base64') : null,
+                polygon_generated: options.coordinates.length > 0 ? true : false,
+            },
+            status_metadata: {
+                is_issued: options.status == `Issued`,
+                is_updated: options.status == `Updated`,
+                is_expired: options.status == `Expired`,
+                is_test: options.status == `Test`,
+                is_statement: options.status == `Statement`
+            },
+            metadata: {
+                ms: performance.now() - tick,
+                source: `events.manual`,
+                tracking: `ATMX-M-W-01`,
+                header: `ZCZC-ATMOSX-ATMX-M-W-01`,
+                raw: options.description,
+                history: [
+                    {
+                        description: options.description,
+                        issued: options.issued.toISOString(),
+                        status: options.status ?? null,
+                    }
+                ]
+            }
+        }
+    }]) 
+}

package/src/@dictionaries/{dictionaries.eventActions.ts → dictionaries.actions.ts}

@@ -17,7 +17,7 @@
 
 */
 
-export const eventActions: Record<string, string> = {
+export const dict_actions: Record<string, string> = {
     "W": "Warning", 
     "F": "Forecast", 
     "A": "Watch", 

package/src/@dictionaries/{dictionaries.eventAwipAbreviations.ts → dictionaries.awips.ts}

@@ -17,7 +17,7 @@
 
 */
 
-export const eventAwipAbreviations: Record<string, string> = {
+export const dict_awips: Record<string, string> = {
     ABV: `rawinsonde-data-above-100-millibars`,
     ADA: `alarm-alert-administrative-message`,
     ADM: `alert-administrative-message`,

package/src/@dictionaries/{dictionaries.eventCancelMessages.ts → dictionaries.cancellation.ts}

@@ -17,10 +17,11 @@
 
 */
 
-export const eventCancelMessages: string[] = [
+export const dict_cancellation: string[] = [
     "has been cancelled",
     "subsided sufficiently for the advisory to be cancelled", 
     "has been cancelled", 
+    "no tsunami threat from a nearby earthquake",
     "will be allowed to expire", 
     "has diminished", 
     "and no longer", 

package/src/@dictionaries/{dictionaries.eventCauses.ts → dictionaries.causes.ts}

@@ -17,7 +17,7 @@
 
 */
 
-export const eventCauses : Record<string, string> = {
+export const dict_causes: Record<string, string> = {
     "SM": "Snow Melt",
     "RS": "Rain/Snow Melt",
     "ER": "Excessive Rain",

package/src/@dictionaries/{dictionaries.statusCorrelationText.ts → dictionaries.correlations.ts}

@@ -26,7 +26,7 @@ type TypeCorrelations = {
     isStatement: boolean
 }
 
-export const statusCorrelationText: TypeCorrelations[] = [
+export const dict_correlations: TypeCorrelations[] = [
     {type: "Statement", name: "Statement", isCancel: false, isUpdate: false, isIssued: true, isStatement: true},
     {type: "Update", name: "Updated", isCancel: false, isUpdate: true, isIssued: false, isStatement: false},
     {type: "Cancel", name: "Cancelled", isCancel: true, isUpdate: false, isIssued: false, isStatement: false},

package/src/@dictionaries/{dictionaries.betterEventNames.ts → dictionaries.enhanced.ts}

@@ -22,9 +22,10 @@ type EnhancedEventType = {
     append?: boolean
     tornado?: string
     damage?: string
+    pdswatch?: boolean
 }
 
-export const betterEventNames: Record<string, Record<string, EnhancedEventType>> = {
+export const dict_enhanced: Record<string, Record<string, EnhancedEventType>> = {
     "Tornado Warning": {
         "Tornado Emergency": { 
             description: "tornado emergency"
@@ -42,6 +43,11 @@ export const betterEventNames: Record<string, Record<string, EnhancedEventType>>
         },
         "Radar Indicated Tornado Warning": { },
     },
+    "Fire Weather Warning": {
+        "PDS Fire Weather Warning": {
+            description: "particularly dangerous situation", 
+        },
+    },
     "Blizzard Warning": {
         "PDS Blizzard Warning": {
             description: "particularly dangerous situation", 
@@ -59,7 +65,12 @@ export const betterEventNames: Record<string, Record<string, EnhancedEventType>>
     },
     "Tornado Watch": {
         "PDS Tornado Watch": { 
-            description: "particularly dangerous situation"
+            pdswatch: true,
+        }
+    },
+    "Severe Thunderstorm Watch": {
+        "PDS Severe Thunderstorm Watch": { 
+            pdswatch: true
         }
     },
     "Flash Flood Warning": {

package/src/@dictionaries/{dictionaries.eventTypes.ts → dictionaries.events.ts}

@@ -17,7 +17,7 @@
 
 */
 
-export const eventTypes: Record<string, string> = {
+export const dict_events: Record<string, string> = {
     "AF": "Ashfall",
     "AS": "Air Stagnation",
     "BH": "Beach Hazard",

package/src/@dictionaries/{dictionaries.regExp.ts → dictionaries.expressions.ts}

@@ -17,7 +17,8 @@
 
 */
 
-export const regExp: { [key: string]: RegExp } = { 
+export const dict_expressions: { [key: string]: RegExp } = { 
+    location: new RegExp(/^([A-Za-z.\-' ]+),\s*([A-Z]{2})$/),
     pvtec: new RegExp(`[OTEX].(NEW|CON|EXT|EXA|EXB|UPG|CAN|EXP|COR|ROU).[A-Z]{4}.[A-Z]{2}.[WAYSFON].[0-9]{4}.[0-9]{6}T[0-9]{4}Z-[0-9]{6}T[0-9]{4}Z`, "g"),
     hvtec: new RegExp(`[a-zA-Z0-9]{4}.[A-Z0-9].[A-Z]{2}.[0-9]{6}T[0-9]{4}Z.[0-9]{6}T[0-9]{4}Z.[0-9]{6}T[0-9]{4}Z.[A-Z]{2}`, "imu"),
     wmo: new RegExp(`[A-Z0-9]{6}\\s[A-Z]{4}\\s\\d{6}`, "imu"),

package/src/@dictionaries/{dictionaries.hailStrings.ts → dictionaries.hail.ts}

@@ -17,8 +17,11 @@
 
 */
 
-export const hailStrings: Record<string, string> = {
+export const dict_hail: Record<string, string> = {
+    ".25": "Pea",
+    ".50": "Penny",
     ".75": "Penny",
+    "Up to .75": "Penny",
     ".88": "Nickel",
     "0.75": "Penny",
     "0.88": "Nickel",

package/src/@dictionaries/{dictionaries.officeICAOs.ts → dictionaries.icao.ts}

@@ -17,7 +17,7 @@
 
 */
 
-export const officeICAOs: Record<string, string> = {
+export const dict_icao: Record<string, string> = {
     "KLUB": "Lubbock, TX",
     "KLCH": "Lake Charles, LA",
     "TSTL": "St. Louis, MO", 

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

@@ -17,7 +17,7 @@
 
 */
 
-export const eventsMatchText: Record<string, string> = {
+export const dict_matches: Record<string, string> = {
     "Special Weather Statement": "Special Weather Statement",
     "Hurricane Warning": "Hurricane Warning",
     "Hurricane Force Wind Warning": "Hurricane Force Wind Warning",

package/src/@dictionaries/{dictionaries.eventProducts.ts → dictionaries.products.ts}

@@ -17,7 +17,7 @@
 
 */
 
-export const eventProducts: Record<string, string> = {
+export const dict_products: Record<string, string> = {
     "O": "Operational Product",
     "T": "Test Product",
     "E": "Experimental Product",

package/src/@dictionaries/{dictionaries.eventRecords.ts → dictionaries.records.ts}

@@ -17,7 +17,7 @@
 
 */
 
-export const eventRecords: Record<string, string> = {
+export const dict_records: Record<string, string> = {
     "NO": "No Record Expected",
     "NR": "Near Record or possible record",
     "UU": "Unknown history of records",

package/src/@dictionaries/{dictionaries.eventSeverity.ts → dictionaries.severity.ts}

@@ -17,7 +17,7 @@
 
 */
 
-export const eventSeverity: Record<string, string> = {
+export const dict_severity: Record<string, string> = {
     N: "Not Expected",
     0: "Areal Flood or FF Product",
     1: "Minor",

package/src/@dictionaries/{dictionaries.shapefileLinks.ts → dictionaries.shapefiles.ts}

@@ -23,7 +23,7 @@ interface ShapefilesResponse {
     link: string
 }
 
-export const shapefileLinks: ShapefilesResponse[] = [
+export const dict_shapefiles: ShapefilesResponse[] = [
     {name: "us_counties", id: "C", link: "https://www.weather.gov/source/gis/Shapefiles/County/c_16ap26.zip"},
     {name: "us_states_territories", id: "Z", link: "https://www.weather.gov/source/gis/Shapefiles/County/s_16ap26.zip"},
     {name: "fire_weather_zones", id: "Z", link: "https://www.weather.gov/source/gis/Shapefiles/WSOM/fz16ap26.zip"},

package/src/@dictionaries/dictionaries.states.ts

@@ -0,0 +1,72 @@
+/*
+              _                             _               _     __   __
+         /\  | |                           | |             (_)    \ \ / /
+        /  \ | |_ _ __ ___   ___  ___ _ __ | |__   ___ _ __ _  ___ \ 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_states: Record<string, string> = {
+    "AL": "Alabama",
+    "AK": "Alaska",
+    "AZ": "Arizona",
+    "AR": "Arkansas",
+    "CA": "California",
+    "CO": "Colorado",
+    "CT": "Connecticut",
+    "DE": "Delaware",
+    "FL": "Florida",
+    "GA": "Georgia",
+    "HI": "Hawaii",
+    "ID": "Idaho",
+    "IL": "Illinois",
+    "IN": "Indiana",
+    "IA": "Iowa",
+    "KS": "Kansas",
+    "KY": "Kentucky",
+    "LA": "Louisiana",
+    "ME": "Maine",
+    "MD": "Maryland",
+    "MA": "Massachusetts",
+    "MI": "Michigan",
+    "MN": "Minnesota",
+    "MS": "Mississippi",
+    "MO": "Missouri",
+    "MT": "Montana",
+    "NE": "Nebraska",
+    "NV": "Nevada",
+    "NH": "New Hampshire",
+    "NJ": "New Jersey",
+    "NM": "New Mexico",
+    "NY": "New York",
+    "NC": "North Carolina",
+    "ND": "North Dakota",
+    "OH": "Ohio",
+    "OK": "Oklahoma",
+    "OR": "Oregon",
+    "PA": "Pennsylvania",
+    "RI": "Rhode Island",
+    "SC": "South Carolina",
+    "SD": "South Dakota",
+    "TN": "Tennessee",
+    "TX": "Texas",
+    "UT": "Utah",
+    "VT": "Vermont",
+    "VA": "Virginia",
+    "WA": "Washington",
+    "WV": "West Virginia",
+    "WI": "Wisconsin",
+    "WY": "Wyoming",
+    "DC": "District of Columbia"
+  };

package/src/@dictionaries/{dictionaries.eventStatus.ts → dictionaries.status.ts}

@@ -17,7 +17,7 @@
 
 */
 
-export const eventStatus: Record<string, string> = {
+export const dict_status: Record<string, string> = {
     "NEW": "Issued", 
     "CON": "Updated", 
     "EXT": "Extended", 

package/src/@dictionaries/{dictionaries.eventTags.ts → dictionaries.tags.ts}

@@ -17,7 +17,7 @@
 
 */
 
-export const eventTags: Record<string, string> = {
+export const dict_tags: Record<string, string> = {
     "FROSTBITE AND HYPOTHERMIA ARE LIKELY": "Frostbite and Hypothermia Likely",
     "LICKELY BECOME SLICK AND HAZARDOUS": "Slick and Hazardous Roads",
     "SLIPPERY ROAD CONDITIONS": "Slippery Roads",

package/src/@dictionaries/{dictionaries.testSignatures.ts → dictionaries.testing.ts}

@@ -17,8 +17,9 @@
 
 */
 
-export const testSignatures: string[] = [
+export const dict_testing: string[] = [
     `This is a test message`, 
     `Monitoring message only.`,
-    `THIS_MESSAGE_IS_FOR_TEST_PURPOSES_ONLY`
+    `THIS_MESSAGE_IS_FOR_TEST_PURPOSES_ONLY`,
+    "TEST MESSAGE"
 ]

package/src/@events/events.api.ts

@@ -21,17 +21,19 @@ import { TypeStanzaCompiled } from "../@types/type.compiled"
 import { TypeEvent } from "../@types/type.event";
 import { getEventTracking } from "../@building/building.tracking";
 import { validateEvents } from "../@building/building.validate";
-import { getEventOffice } from "../@building/building.office";
+import { pvExtract } from "../@parsers/@pvtec/pvtec.extract"
 import { getEventTags } from "../@building/building.tags";
 import { getTextFromProduct } from "../@parsers/@text/text.getTextFromProduct";
-import { officeICAOs } from "../@dictionaries/dictionaries.officeICAOs";
+import { dict_icao } from "../@dictionaries/dictionaries.icao";
+import { TypePVTEC } from "../@types/type.pvtec";
+
 
 export const api = async (stanza: TypeStanzaCompiled): Promise<void> => {
     let processed: TypeEvent[] = [];
     const messages =  Object.values(JSON.parse(stanza.message).features) as any;
     for (const feature of messages) {
         const tick = performance.now();
-        const pVtec = feature?.properties?.parameters?.VTEC?.[0] ?? null
+        const pVtec = pvExtract(feature?.properties?.parameters?.VTEC?.[0]) ?? null as TypePVTEC[]
         processed.push({
             type: `Feature`,
             geometry: {
@@ -45,12 +47,13 @@ export const api = async (stanza: TypeStanzaCompiled): Promise<void> => {
                 issued: feature?.properties?.sent ? new Date(feature?.properties?.sent).toISOString() : null,
                 expires: feature?.properties?.expires ? new Date(feature?.properties?.expires).toISOString() : null,
                 locations: feature?.properties?.areaDesc ?? null,
+                locations_array: feature?.properties?.areaDesc ? feature?.properties?.areaDesc.split(';') : [],
                 description: feature?.properties?.description ?? null,
                 attributes: feature?.properties?.attributes ?? {},
                 geocode: {
                     office: {
-                        office: pVtec ? pVtec.split(`.`)[2] : null,
-                        name: officeICAOs[pVtec ? pVtec.split(`.`)[2] : null] ?? null,
+                        office: pVtec ? pVtec?.[0]?.tracking.split(`.`)[0] : null,
+                        name: dict_icao[pVtec ? pVtec?.[0]?.tracking.split(`.`)[0] : null] ?? null,
                     },
                     organization:  feature?.properties?.parameters?.WMOidentifier?.[0],
                     ugc: feature?.properties?.geocode?.UGC ?? [], 
@@ -71,16 +74,16 @@ export const api = async (stanza: TypeStanzaCompiled): Promise<void> => {
                     wind_threat: feature?.properties?.parameters?.windThreat?.[0] ?? null,
                     hail_threat: feature?.properties?.parameters?.hailThreat?.[0] ?? null,
                 },
-                spc_parameters: {
-                    spc_number: getTextFromProduct({ message: feature?.properties?.description, find: [`Mesoscale Discussion `], removal: [`Mesoscale Discussion`, `Number`, `...`] }) ?? null,
-                    spc_concerning: getTextFromProduct({ message: feature?.properties?.description, find: [`Concerning...`] }) ?? null,
-                    spc_max_tornado: getTextFromProduct({ message: feature?.properties?.description, find: [`MOST PROBABLE PEAK TORNADO INTENSITY...`] }) ?? null,
-                    spc_max_hail: getTextFromProduct({ message: feature?.properties?.description, find: [`MOST PROBABLE PEAK HAIL SIZE...`] }) ?? null,
-                    spc_max_wind: getTextFromProduct({ message: feature?.properties?.description, find: [`MOST PROBABLE PEAK WIND GUST...`] }) ?? null,
-                    spc_watch_issuance: getTextFromProduct({ message: feature?.properties?.description, find: [`Probability of Watch Issuance...`], removal: [`percent`]}) ?? null,
+                discussion_parameters: {
+                    discussion_number: getTextFromProduct({ message: feature?.properties?.description, find: [`Mesoscale Discussion `], removal: [`Mesoscale Discussion`, `Number`, `...`] })?.toString()?.padStart(4, "0") ?? null,
+                    discussion_concerning: getTextFromProduct({ message: feature?.properties?.description, find: [`Concerning...`] }) ?? null,
+                    discussion_max_tornado: getTextFromProduct({ message: feature?.properties?.description, find: [`MOST PROBABLE PEAK TORNADO INTENSITY...`] }) ?? null,
+                    discussion_max_hail: getTextFromProduct({ message: feature?.properties?.description, find: [`MOST PROBABLE PEAK HAIL SIZE...`] }) ?? null,
+                    discussion_max_wind: getTextFromProduct({ message: feature?.properties?.description, find: [`MOST PROBABLE PEAK WIND GUST...`] }) ?? null,
+                    discussion_watch_issuance: getTextFromProduct({ message: feature?.properties?.description, find: [`Probability of Watch Issuance...`], removal: [`percent`]}) ?? null,
                 },
                 watch_parameters: {
-                    watch_number: getTextFromProduct({ message: feature?.properties?.description, find: [`ITIES FOR`, `UPDATE FOR`, `Watch Number `], removal: [`%`, `<`, `:`] })?.replace(/(WT|WS|)/g, '')?.trim() ?? null,
+                    watch_number: (pVtec?.[0]?.is_watch) && (getTextFromProduct({ message: feature?.properties?.description, find: [`ITIES FOR`, `UPDATE FOR`, `Watch Number `], removal: [`%`, `<`, `:`] })?.replace(/(WT|WS|)/g, '')?.trim()?.toString()?.padStart(4, "0") ?? pVtec?.[0]?.tracking?.slice(-4)?.toString()?.padStart(4, "0") ?? null),
                     watch_type: feature?.properties?.description.includes(`TORNADO WATCH`) ? `Tornado` : feature?.properties?.description.includes(`SEVERE`) ? `Severe` : null,
                     additional_tornadoes_probability: getTextFromProduct({ message: feature?.properties?.description, find: [`PROB OF 2 OR MORE TORNADOES`], removal: [`%`, `<`, `:`] }) ?? null,
                     strong_tornadoes_probability: getTextFromProduct({ message: feature?.properties?.description, find: [`PROB OF 1 OR MORE STRONG /EF2-EF5/ TORNADOES`], removal: [`%`, `<`, `:`] }) ?? null,
@@ -96,9 +99,9 @@ export const api = async (stanza: TypeStanzaCompiled): Promise<void> => {
                 metadata: {
                     ms: performance.now() - tick,
                     source: `events.api`,
-                    tracking: getEventTracking({ type: `API`, organization: { wmoidentifier: feature?.properties?.parameters?.WMOidentifier?.[0], featureId: feature?.id}, vtec: pVtec}),
+                    tracking: getEventTracking({ type: `API`, organization: { wmoidentifier: feature?.properties?.parameters?.WMOidentifier?.[0], featureId: feature?.id}, vtec: pVtec?.[0]}),
                     header: `ZCZC-ATMOSX-${feature?.properties?.parameters?.WMOidentifier}`,
-                    vtec: pVtec,
+                    vtec: pVtec?.[0],
                     hvtec: null,
                     raw: feature?.properties?.description,
                     history: [

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

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

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

@@ -20,7 +20,7 @@
 import { TypeAttributes } from "../@types/type.attributes";
 import { TypeStanzaCompiled } from "../@types/type.compiled"
 import { TypeEvent } from "../@types/type.event";
-import { eventsMatchText } from "../@dictionaries/dictionaries.eventsMatchText";
+import { dict_matches } from "../@dictionaries/dictionaries.matches";
 import { ugcExtract } from "../@parsers/@ugc/ugc.extract";
 import { properties } from "../@building/building.properties";
 import { getEventHeader } from "../@building/building.headers";
@@ -43,7 +43,7 @@ export const ugc = async (stanza: TypeStanzaCompiled): Promise<void> => {
             const issued = new Date(attributes.issue)
             const expires = new Date(ugc.expires)
             const header = getEventHeader({properties: props, getType: stanza.getType })
-            let event = Object.keys(eventsMatchText).find(event => message.toLowerCase().includes(event.toLowerCase()));
+            let event = Object.keys(dict_matches).find(event => message.toLowerCase().includes(event.toLowerCase()));
             let isStatement = false;
             if (!event) { 
                 event = stanza.getType.type.split(`-`).map(word => word.charAt(0).toUpperCase() + word.slice(1).toLowerCase()).join(` `)

package/src/@manager/manager.mkEvent.ts

@@ -21,7 +21,7 @@ import { setEventEmit } from "../@modules/@utilities/utilities.setEventEmit";
 import { TypeEvent } from "../@types/type.event";
 import { bootstrap } from "../bootstrap"
 import { setHash } from "./manager.setHash";
-import { updateWebhooks } from "./manager.updateWebhooks";
+import { updateListener } from "./manager.updateListener";
 import { updateNode } from "./manager.updateNodes";
 import { TypeSettings } from "../@types/type.settings";
 
@@ -79,10 +79,10 @@ export const mkEvent = async (event: TypeEvent): Promise<void> => {
                         },
                     }
                 };
-                updateWebhooks(bootstrap.cache.events.features[getIndex])
+                updateListener(bootstrap.cache.events.features[getIndex])
             } else { 
                 features.push(event)
-                updateWebhooks(event)
+                updateListener(event)
             }
         }
     }

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

@@ -20,13 +20,14 @@
 import { setEventEmit } from "../@modules/@utilities/utilities.setEventEmit";
 import { TypeEvent } from "../@types/type.event";
 import { bootstrap } from "../bootstrap"
-import { updateWebhooks } from "./manager.updateWebhooks";
+import { updateListener } from "./manager.updateListener";
 
 export const rmEvent = (event: TypeEvent): 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;
     if (getEvent) {
         setEventEmit({
             event: `onEventStatus`,
@@ -37,7 +38,7 @@ export const rmEvent = (event: TypeEvent): void => {
             message: `[Removed] ${event.properties.event} (${event.properties.status}) (${event.properties.metadata.tracking})`
         })
         setEventEmit({ event: `onExpiredProduct`, metadata: event })
-        if (cachedStatus != `Statement`) updateWebhooks(event)
+        if (cachedStatus != `Statement`) 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);
     }