@atmosx/event-product-parser 3.0.4 → 3.0.6

package/package.json

@@ -1,18 +1,17 @@
 {
 	"name": "@atmosx/event-product-parser",
-	"version": "3.0.4",
+	"version": "3.0.6",
 	"description": "NOAA Weather Wire & NWS API Parser - Built for standalone and Project AtmosphericX Integration.",
 	"main": "dist/cjs/index.cjs",
 	"module": "dist/esm/index.mjs",
 	"repository": {
 		"type": "git",
 		"url": "git+https://github.com/AtmosphericX/event-product-parser",
-		"branch": "beta"
+		"branch": "v3-beta-branch"
 	},
 	"scripts": {
 		"start": "cd ./test && node ./index.js",
 		"build": "tsup && cd ./test && node ./index.js",
-		"heap-memory-errors": "node --heap-prof --heap-prof-name=heap-profile-%p.heapsnapshot ./test/index.js",
 		"publish": "tsup && npm publish --access public",
 		"publish-beta-branch": "tsup && npm publish --tag v3-beta-branch --access public"
 	},
@@ -33,18 +32,13 @@
 	},
 	"homepage": "https://github.com/AtmosphericX/event-product-parser#readme",
 	"dependencies": {
-	    "express-ws": "5.0.2",
-		"express": "5.2.1",
 		"@xmpp/client": "0.14.0",
 		"better-sqlite3": "12.9.0",
 		"croner": "10.0.1",
 		"jszip": "3.10.1",
 		"polygon-clipping": "0.15.7",
-		"request": "2.88.2",
-		"say": "0.16.0",
 		"shapefile": "0.6.6",
-		"typescript": "5.9.3",
-		"xml2js": "0.6.2"
+		"typescript": "5.9.3"
 	},
 	"devDependencies": {
 		"@types/node": "25.2.0",

package/src/@building/{building.create.ts → CreateEvent.ts}

@@ -17,15 +17,16 @@
 
 */
 
-import { TypeStanzaCompiled } from "../@types/types.compiled"
-import { TypeSettings } from "../@types/types.settings"
+import { TypeStanzaCompiled } from "../@types/StanzaCompiled"
+import { TypeSettings } from "../@types/Settings"
 import { bootstrap } from "../bootstrap"
-import { text } from "../@events/events.text"
-import { ugc } from "../@events/events.ugc"
-import { vtec } from "../@events/events.vtec"
-import { api } from "../@events/events.api"
+import { ParseText } from "../@events/ParseText"
+import { ParseUGC } from "../@events/ParseUGC"
+import { ParseVTEC } from "../@events/ParseVTEC"
+import { ParseAPI } from "../@events/ParseAPI"
+import { ValidateEvents } from "./ValidateEvents"
 
-export const createEvent = async (stanza: TypeStanzaCompiled): Promise<void | string> => {
+export const CreateEvent = async (stanza: TypeStanzaCompiled, ignorePushing?: boolean): Promise<void | string> => {
     const settings = bootstrap.settings as TypeSettings
     const StanzaSettings = settings.NOAAWeatherWireServiceSettings.StanzaSettings;
 
@@ -34,9 +35,22 @@ export const createEvent = async (stanza: TypeStanzaCompiled): Promise<void | st
     const isTextEvent = (!stanza.isVTEC && !stanza.isUGC)
     const isNWWS = (stanza.isNWWS)
 
-    if (!isNWWS) return await api(stanza)
-    if (!StanzaSettings.DisableVTEC && isVtecEvent) return await vtec(stanza)
-    if (!StanzaSettings.DisableUGC && isUgcEvent) return await ugc(stanza);
-    if (!StanzaSettings.DisableText && isTextEvent) return await text(stanza);
+    switch (true) {
+        case (!isNWWS):
+            await ParseAPI(stanza)
+            break;
+        case (isNWWS && !StanzaSettings.DisableVTEC && isVtecEvent):
+            await ParseVTEC(stanza)
+            break;
+        case (isNWWS && !StanzaSettings.DisableUGC && isUgcEvent):
+            await ParseUGC(stanza)
+            break;
+        case (isNWWS && !StanzaSettings.DisableText && isTextEvent):
+            await ParseText(stanza)
+            break;
+    }
+    if (!ignorePushing) {
+        await ValidateEvents(bootstrap.cache.processed)
+    }
     return 'nothing picked';
 }

package/src/@building/{building.clean.ts → GetCleanedEvent.ts}

@@ -17,13 +17,13 @@
 
 */
 
-export const getCleanedEvent = <T extends Record<string, any>>(event: T): T => {
+export const GetCleanedEvent = <T extends Record<string, any>>(event: T): T => {
     for (const key of Object.keys(event)) {
         const value = event[key];
         if (value === null || value === undefined) {
             delete event[key];
         } else if (typeof value === "object" && value !== null && !Array.isArray(value)) {
-            (event as Record<string, any>)[key] = getCleanedEvent(value as Record<string, any>) as any;
+            (event as Record<string, any>)[key] = GetCleanedEvent(value as Record<string, any>) as any;
         }
     }
     return event;

package/src/@building/GetEventAttachments.ts

@@ -0,0 +1,86 @@
+/*
+              _                             _               _     __   __
+         /\  | |                           | |             (_)    \ \ / /
+        /  \ | |_ _ __ ___   ___  ___ _ __ | |__   ___ _ __ _  ___ \ 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 { TypeEvent } from "../@types/Event"
+import { bootstrap } from "../bootstrap"
+import { EnumStates } from "../@enums/States"
+import { EnumExpressions } from "../@enums/Expressions"
+import { GetLatestIssuance } from "../@modules/@utilities/GetLatestIssuance";
+
+interface GetEventAttachmentsResponse { 
+    name: string
+    link: string
+}
+
+type BroadcastifyResponse = { 
+    state: string
+    county: string
+    feed: string
+    type: string
+    link: string
+}
+
+export const GetEventAttachments = (event: TypeEvent): GetEventAttachmentsResponse[] | null => {
+    let attachments = [];
+    const settings = bootstrap.settings;
+    const issuanceTime = GetLatestIssuance();
+    const spcNumber = event?.properties?.discussion_parameters?.discussion_number;
+    const watchNumber = event?.properties?.watch_parameters?.watch_number;
+    const locations = event?.properties?.locations_array;
+    const events = [
+        { target: "Storm Prediction Center Day 1 Outlook", attachment: `https://www.spc.noaa.gov/products/outlook/day1otlk_${issuanceTime}.png` },
+        { target: "Storm Prediction Center Day 2 Outlook", attachment: `https://www.spc.noaa.gov/products/outlook/day2otlk.png` },
+        { target: "Storm Prediction Center Day 3 Outlook", attachment: `https://www.spc.noaa.gov/products/outlook/day3otlk.png` },
+        { target: "Mesoscale Discussion", attachment: `https://www.spc.noaa.gov/products/md/mcd${spcNumber}.png` },
+        { target: "Tornado Watch", attachment: `https://www.spc.noaa.gov/products/watch/ww${watchNumber}_radar_big.gif` },
+        { target: "PDS Tornado Watch", attachment: `https://www.spc.noaa.gov/products/watch/ww${watchNumber}_radar_big.gif` },
+        { target: "Severe Thunderstorm Watch", attachment: `https://www.spc.noaa.gov/products/watch/ww${watchNumber}_radar_big.gif` },
+        { target: "PDS Severe Thunderstorm Watch", attachment: `https://www.spc.noaa.gov/products/watch/ww${watchNumber}_radar_big.gif` }
+    ]
+
+    if (events.find((e) => e.target === event.properties.event)) {
+        attachments.push({ name: `Image: Graphic`, link: events.find((e) => e.target.toLowerCase() === event.properties.event.toLowerCase()).attachment });
+    }
+
+    if (settings.BroadcastifySettings.BroadcastifyAttachments) {
+        for (const location of locations) {
+            if (EnumExpressions.location.test(location)) {
+                const lines = [`Northern`, `Southern`, `Eastern`, `Western`, `Inland`, `Costal`, `County`]
+                const county = location?.split(',')[0]?.trim().replace(new RegExp(`^(${lines.join('|')}) `), '')
+                const state = EnumStates[location?.split(',')[1]?.trim()]
+                const feeds = bootstrap.database.prepare(`SELECT * FROM broadcastify WHERE state = ? AND county = ?`).all(state, county).sort((a, b) => {
+                    const typeOrder = ['Other', 'Public Safety'];
+                    const indexA = typeOrder.indexOf(a.type);
+                    const indexB = typeOrder.indexOf(b.type);
+                    return indexA - indexB;
+                })
+                const tags = bootstrap.settings.BroadcastifySettings.BroadcastifyTags;
+                const filtered = feeds.filter((feed: BroadcastifyResponse) => tags.includes(feed.type));
+                if (filtered.length > 0) {
+                    filtered.map((filtered: BroadcastifyResponse) => {
+                        if (!attachments.some((a) => a.link === filtered.link)) {
+                            attachments.push({ name: `${filtered.type}: ${filtered.feed}`, link: filtered.link });
+                        }
+                    });
+                }
+            }
+        }
+    }
+    return attachments;
+}

package/src/@building/{building.enhance.ts → GetEventEnhancedName.ts}

@@ -17,23 +17,19 @@
 
 */
 
-import { TypeEvent } from "../@types/type.event";
-import { TypeSettings } from "../@types/types.settings";
+import { TypeEvent } from "../@types/Event";
+import { TypeSettings } from "../@types/Settings";
+import { EnumEnhanced } from "../@enums/Enhanced"
 import { bootstrap } from "../bootstrap"
-import { betterEventNames } from "../@dictionaries/dictionaries.betterEventNames"
 
-export const getEventEnhancedName = (event: TypeEvent): string => {
-    const configurations = bootstrap.settings as TypeSettings
-    let name = event?.properties?.event
-
-    if (!configurations?.GlobalSettings?.BetterEventNames) {
-        return name 
-    }
+export const GetEventEnhancedName = (event: TypeEvent): string => {
+    let name = event?.properties?.event;
 
     const damage = event?.properties?.parameters?.damage_threat
-    const tornado = event?.properties?.parameters.tornado_threat;
+    const tornado = event?.properties?.parameters?.tornado_threat;
+    const pdswatch = event?.properties?.watch_parameters?.pds_watch;
     const description = event?.properties?.description?.toLowerCase()
-    for (const [eventKey, eventConfig] of Object.entries(betterEventNames)) {
+    for (const [eventKey, eventConfig] of Object.entries(EnumEnhanced)) {
         if (eventKey !== name) continue;
         for (const [paramKey, paramValue] of Object.entries(eventConfig)) {
             let matches = true;
@@ -46,6 +42,9 @@ export const getEventEnhancedName = (event: TypeEvent): string => {
             if (paramValue?.tornado) {
                 if (paramValue.tornado !== tornado) matches = false;
             }
+            if (paramValue?.pdswatch) {
+                if (paramValue.pdswatch !== pdswatch) matches = false;
+            }
             if (matches) {
                 name = paramKey;
                 break;

package/src/@building/{building.geometry.ts → GetEventGeometry.ts}

@@ -17,18 +17,18 @@
 
 */
 
-import { getSettings } from "../@modules/@utilities/utilities.getSettings";
-import { TypeSettings } from "../@types/types.settings"
-import { TypeEvent } from "../@types/type.event"
-import { getZonePolygon } from "../@parsers/@ugc/ugc.coordinates";
+import { TypeSettings } from "../@types/Settings"
+import { TypeEvent } from "../@types/Event"
+import { GetSettings } from "../@modules/@utilities/GetSettings";
+import { getZonePolygon } from "../@parsers/@ugc/GetZonePolygon";
 
 interface GetGeometryResponse { 
     type: `Polygon` | `MultiPolygon`
     coordinates: any[]
 }
 
-export const getEventGeometry = async (event: TypeEvent): Promise<GetGeometryResponse> => {
-    const settings = getSettings() as TypeSettings
+export const GetEventGeometry = (event: TypeEvent): GetGeometryResponse  => {
+    const settings = GetSettings() as TypeSettings
     const generated = event?.properties?.geocode?.polygon ?? null;
     const ugc = event?.properties?.geocode?.ugc ?? null;
     let geo: GetGeometryResponse = {
@@ -36,7 +36,7 @@ export const getEventGeometry = async (event: TypeEvent): Promise<GetGeometryRes
         coordinates: generated != null ? JSON.parse(Buffer.from(generated, 'base64').toString('utf-8')) : null
     }
     if (settings.GlobalSettings.UseShapefileCoordinates && generated == null && ugc != null) { 
-        geo = await getZonePolygon({zones: ugc, isUnion: false})
+        geo = getZonePolygon({zones: ugc, isUnion: false})
         if (geo == null) {
             geo = {
                 type: `Polygon`,

package/src/@building/{building.headers.ts → GetEventHeader.ts}

@@ -17,8 +17,8 @@
 
 */
 
-import { TypePVTEC } from "../@types/types.pvtec";
-import { TypeEventProperties } from "../@types/type.properties";
+import { TypePVTEC } from "../@types/VTEC";
+import { TypeEventProperties } from "../@types/Properties";
 
 interface GetHeaderOptions {
     properties: TypeEventProperties
@@ -29,7 +29,7 @@ interface GetHeaderOptions {
     }
 }
 
-export const getEventHeader = (options: GetHeaderOptions): string => {
+export const GetEventHeader = (options: GetHeaderOptions): string => {
     const properties = options.properties
     const vtec = options.vtec ?? null
     const ugc = properties.geocode.ugc != null ? properties.geocode.ugc.join(`-`) : `0`;

package/src/@building/{building.polygon.ts → GetEventNodes.ts}

@@ -17,11 +17,10 @@
 
 */
 
-
-import { TypeEvent } from "../@types/type.event"
-import { getEventGeometry } from "./building.geometry"
+import { TypeEvent } from "../@types/Event"
 import { bootstrap } from "../bootstrap"
-import { getShapeNearestPoint } from "../@modules/@utilities/utilities.getShapeNearestPoint"
+import { GetEventGeometry } from "./GetEventGeometry"
+import { GetShapeNearestPoint } from "../@modules/@utilities/GetShapeNearestPoint"
 
 interface GetEventNodesResponse { 
     nodes: {
@@ -36,16 +35,19 @@ interface GetEventNodesResponse {
     updated: number
 }
 
-export const getEventNodes = async (event: TypeEvent): Promise<GetEventNodesResponse> => {
-    const metadata = { nodes: [], proximity: false, filtered: false }
-    const geometry = await getEventGeometry(event);
+export const GetEventNodes = async (event: TypeEvent): Promise<GetEventNodesResponse> => {
+    const nodes = bootstrap.cache.nodes.features;
+    if (!nodes || nodes.length === 0) {
+        return { nodes: [], filtered: false, updated: Date.now() };
+    }
+    const metadata = { nodes: [], proximity: false, filtered: false };
+    const geometry = await GetEventGeometry(event);
     if (!geometry || !geometry.coordinates) {
         return { nodes: [], filtered: false, updated: Date.now() }
     }
-    const nodes = bootstrap.cache.nodes.features;
     for (const node of nodes) {
         const [longitude, latitude] = node.geometry.coordinates;
-        const getPoint = getShapeNearestPoint(geometry.coordinates, [longitude, latitude])
+        const getPoint = GetShapeNearestPoint(geometry.coordinates, [longitude, latitude])
         const miles = getPoint.distance ?? null;
         const kilometers = Number((miles * 1.609344).toFixed(3));
 
@@ -55,10 +57,10 @@ export const getEventNodes = async (event: TypeEvent): Promise<GetEventNodesResp
             nearest: getPoint.point,
             miles,
             kilometers,
-            proximity: getPoint.proximity
+            proximity: false
         }
         metadata.nodes.push(info)
-        if (bootstrap.settings.GlobalSettings.EventFiltering.NodeLocationFiltering && miles < bootstrap.settings.GlobalSettings.NodeMinDistance) {
+        if (miles != null && (bootstrap.settings.GlobalSettings.EventFiltering.NodeLocationFiltering) && (miles < bootstrap.settings.GlobalSettings.NodeMaxDistance)) {
             metadata.proximity = true;
             info.proximity = true;
         }

package/src/@building/{building.office.ts → GetEventOffice.ts}

@@ -17,9 +17,9 @@
 
 */
 
-import { TypeAttributes } from "../@types/types.attributes";
-import { TypePVTEC } from "../@types/types.pvtec";
-import { officeICAOs } from "../@dictionaries/dictionaries.officeICAOs";
+import { TypeAttributes } from "../@types/Attributes";
+import { TypePVTEC } from "../@types/VTEC";
+import { EnumICAO } from "../@enums/ICAO";
 
 interface GetOfficeOptions { 
     attributes: TypeAttributes
@@ -32,12 +32,12 @@ interface GetOfficeResponse {
     name: string | null
 }
 
-export const getEventOffice = (options: GetOfficeOptions): GetOfficeResponse => {
+export const GetEventOffice = (options: GetOfficeOptions): GetOfficeResponse => {
     const office = options.pVtec != null 
-        ? options.pVtec?.tracking?.split(`-`)[0] : (options.attributes?.cccc || 
+        ? options.pVtec?.tracking?.split(`.`)[0] : (options.attributes?.cccc ??
             (options.organization != null ? 
                 (Array.isArray(options.organization) ? options.organization?.[0] : options.organization) 
         : null));
-    const name = officeICAOs?.[office] ?? null;
+    const name = EnumICAO?.[office] ?? null;
     return { office, name };
 }

package/src/@building/GetEventProperties.ts

@@ -0,0 +1,96 @@
+/*
+              _                             _               _     __   __
+         /\  | |                           | |             (_)    \ \ / /
+        /  \ | |_ _ __ ___   ___  ___ _ __ | |__   ___ _ __ _  ___ \ 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 { TypeEventProperties } from "../@types/Properties";
+import { TypeAttributes } from "../@types/Attributes";
+import { TypeUGC } from "../@types/UGC";
+import { TypePVTEC } from "../@types/VTEC";
+import { TypeHVTEC } from "../@types/HVTEC";
+import { EnumExpressions } from "../@enums/Expressions";
+import { GetDescriptionFromProduct } from "../@parsers/@text/GetDescriptionFromProduct";
+import { getPolygonFromProduct } from "../@parsers/@text/GetPolygonFromProduct";
+import { GetTextFromProduct } from "../@parsers/@text/GetTextFromProduct";
+import { GetEventOffice } from "./GetEventOffice";
+import { GetEventTags } from "./GetEventTags";
+
+interface GetEventPropertiesOptions { 
+    message: string
+    attributes: TypeAttributes
+    ugc?: TypeUGC
+    pVtec?: TypePVTEC
+    hVtec?: TypeHVTEC
+}
+
+export const GetEventProperties = (options: GetEventPropertiesOptions): TypeEventProperties => {
+    const organization = options.message.match(EnumExpressions.wmo)?.[0] ?? null
+    const polygons = getPolygonFromProduct(options.message)
+    const properties = {
+        locations: options?.ugc?.locations?.join(`; `) ?? null,
+        locations_array: options?.ugc?.locations ?? [],
+        description: GetDescriptionFromProduct({ message: options.message, handle: options?.pVtec?.vtec ?? null }),
+        attributes: options.attributes,
+        geocode: {
+            office: GetEventOffice({ attributes: options.attributes, organization: organization, pVtec: options.pVtec }),
+            organization: organization,
+            ugc: options?.ugc?.zones ?? [],
+            polygon: polygons.length > 0 ? Buffer.from(JSON.stringify([polygons])).toString('base64') : null,
+            polygon_generated: polygons.length > 0 ? true : false
+        },
+        parameters: {
+            tags: GetEventTags(options.message),
+            instructions: GetTextFromProduct({ message: options.message, find: [`For your protection`, `do not`, `use extreme caution`], append: `...`, removal: [`.`]})  ?? null,
+            source: GetTextFromProduct({ message: options.message, find: [`SOURCE...`], removal: [`.`]}) ?? null,
+            hazards: GetTextFromProduct({ message: options.message, find: [`HAZARD...`], removal: [`.`]}) ?? null,
+            impacts: GetTextFromProduct({ message: options.message, find: [`IMPACT...`], removal: [`.`]}) ?? null,
+            estimated_hail_size: GetTextFromProduct({ message: options.message, find: [`MAX HAIL SIZE...`, `HAIL...`], removal: ['in']}) ?? null,
+            estimated_wind_gusts: GetTextFromProduct({ message: options.message, find: [`MAX WIND GUST...`, `WIND...`]}) ?? null,
+            damage_threat: GetTextFromProduct({ message: options.message, find: [`DAMAGE THREAT...`], removal: []}) ?? null,
+            tornado_threat: GetTextFromProduct({ message: options.message, find: [`TORNADO...`, `WATERSPOUT...`] }) ?? null,
+            flood_threat: GetTextFromProduct({ message: options.message, find: [`FLASH FLOOD...`]}) ?? null,
+            wind_threat: GetTextFromProduct({ message: options.message, find: [`WIND THREAT...`]}) ?? null,
+            hail_threat: GetTextFromProduct({ message: options.message, find: [`HAIL THREAT...`], removal: []}) ?? null,
+        },
+        discussion_parameters: {
+            discussion_number: GetTextFromProduct({ message: options.message, find: [`Mesoscale Discussion `], removal: [`Mesoscale Discussion`, `Number`, `...`] })?.toString()?.padStart(4, "0") ?? null,
+            discussion_concerning: GetTextFromProduct({ message: options.message, find: [`Concerning...`] }) ?? null,
+            discussion_max_tornado: GetTextFromProduct({ message: options.message, find: [`MOST PROBABLE PEAK TORNADO INTENSITY...`] }) ?? null,
+            discussion_max_hail: GetTextFromProduct({ message: options.message, find: [`MOST PROBABLE PEAK HAIL SIZE...`] }) ?? null,
+            discussion_max_wind: GetTextFromProduct({ message: options.message, find: [`MOST PROBABLE PEAK WIND GUST...`] }) ?? null,
+            discussion_watch_issuance: GetTextFromProduct({ message: options.message, find: [`Probability of Watch Issuance...`], removal: [`percent`]}) ?? null,
+        },
+        watch_parameters: {
+            watch_number: (options?.pVtec?.is_watch) && (GetTextFromProduct({ message: options.message, find: [`ITIES FOR`, `UPDATE FOR`, `Watch Number `], removal: [`%`, `<`, `:`] })?.replace(/(WT|WS|)/g, '')?.trim()?.toString()?.padStart(4, "0") ?? options?.pVtec?.tracking?.slice(-4)?.toString()?.padStart(4, "0") ?? null),
+            watch_type: options.message.includes(`TORNADO WATCH`) ? `Tornado` : options?.message.includes(`SEVERE`) ? `Severe` : null,
+            additional_tornadoes_probability: GetTextFromProduct({ message: options.message, find: [`PROB OF 2 OR MORE TORNADOES`], removal: [`%`, `<`, `:`] }) ?? null,
+            strong_tornadoes_probability: GetTextFromProduct({ message: options.message, find: [`PROB OF 1 OR MORE STRONG /EF2-EF5/ TORNADOES`], removal: [`%`, `<`, `:`] }) ?? null,
+            severe_wind_probability: GetTextFromProduct({ message: options.message, find: [`PROB OF 10 OR MORE SEVERE WIND EVENTS`], removal: [`%`, `<`, `:`] }) ?? null,
+            severe_hail_probability: GetTextFromProduct({ message: options.message, find: [`PROB OF 10 OR MORE SEVERE HAIL EVENTS`], removal: [`%`, `<`, `:`] }) ?? null,
+            hail_2in_probability: GetTextFromProduct({ message: options.message, find: [`PROB OF 1 OR MORE HAIL EVENTS >= 2 INCHES`], removal: [`%`, `<`, `:`] }) ?? null,
+            combined_hail_wind_probability: GetTextFromProduct({ message: options.message, find: [`PROB OF 6 OR MORE COMBINED SEVERE HAIL/WIND EVENTS`], removal: [`%`, `<`, `:`] }) ?? null,
+            max_hail_in: GetTextFromProduct({ message: options.message, find: [`MAX HAIL /INCHES/`], removal: [`%`, `<`, `:`] }) ?? null,
+            max_wind_surface:  GetTextFromProduct({ message: options.message, find: [`MAX WIND GUSTS SURFACE /KNOTS/`], removal: [`%`, `<`, `:`] }) ?? null,
+            max_tops_x100feet:  GetTextFromProduct({ message: options.message, find: [`MAX TOPS /X 100 FEET/`], removal: [`%`, `<`, `:`] }) ?? null,
+            pds_watch: (GetTextFromProduct({ message: options.message, find: [`PARTICULARLY DANGEROUS SITUATION`], removal: [`%`, `<`, `:`] }) === `YES` ? true : null)
+        }
+    }
+    if (isNaN(Number(properties.watch_parameters.watch_number))) {
+        properties.watch_parameters.watch_number = null
+    }
+    return properties;
+}

package/src/@building/{building.signature.ts → GetEventSignature.ts}

@@ -17,24 +17,23 @@
 
 */
 
-import { TypeEvent } from "../@types/type.event";
-import { statusCorrelationText } from "../@dictionaries/dictionaries.statusCorrelationText";
-import { eventCancelMessages } from "../@dictionaries/dictionaries.eventCancelMessages";
-import { testSignatures} from "../@dictionaries/dictionaries.testSignatures"
-import { eventProducts } from "../@dictionaries/dictionaries.eventProducts";
-import { hailStrings } from "../@dictionaries/dictionaries.hailStrings"
-
-
-export const getEventSignature = (event: TypeEvent): TypeEvent => {
+import { TypeEvent } from "../@types/Event";
+import { EnumCorrelations } from "../@enums/Correlations";
+import { EnumCancellation } from "../@enums/Cancellation";
+import { EnumTesting} from "../@enums/Testing"
+import { EnumProducts } from "../@enums/Products";
+import { EnumHail } from "../@enums/Hail"
+
+export const GetEventSignature = (event: TypeEvent): TypeEvent => {
     const properties = event?.properties;
     const vtec = event?.properties?.metadata?.vtec
-    const status = statusCorrelationText
+    const status = EnumCorrelations
         .find((c: { type: string }) => c.type === properties?.status);
-    const csig = eventCancelMessages.find(sig => properties.description.toLowerCase().includes(sig.toLowerCase()));
+    const csig = EnumCancellation.find(sig => properties.description.toLowerCase().includes(sig.toLowerCase()));
     properties.status_metadata = { ...properties.status_metadata, is_issued: true, is_test: false};
 
-    if (properties.parameters.estimated_hail_size) { 
-        properties.parameters.estimated_hail_size += ` (${hailStrings[properties.parameters.estimated_hail_size] ?? '--'})`
+    if (properties?.parameters?.estimated_hail_size) { 
+        properties.parameters.estimated_hail_size += ` (${EnumHail[properties?.parameters?.estimated_hail_size] ?? '--'})`
     }
 
     if (status) { 
@@ -46,8 +45,8 @@ export const getEventSignature = (event: TypeEvent): TypeEvent => {
     }
     
     const getProduct = vtec?.vtec?.split(`.`)[0]?.replace(`/`, ``)
-    const isTestProduct = eventProducts[getProduct] == `Test Product`
-    if (isTestProduct || testSignatures.some(sig => properties.description?.toLowerCase().includes(sig.toLowerCase()) || properties?.parameters?.instructions?.toLowerCase().includes(sig.toLowerCase()))) {
+    const isTestProduct = EnumProducts[getProduct] == `Test Product`
+    if (isTestProduct || EnumTesting.some(sig => properties.description?.toLowerCase().includes(sig.toLowerCase()) ?? properties?.parameters?.instructions?.toLowerCase().includes(sig.toLowerCase()))) {
         properties.status_metadata = { ...properties.status_metadata, is_test: true }
     }    
     

package/src/@building/{building.tags.ts → GetEventTags.ts}

@@ -17,8 +17,13 @@
 
 */
 
-import { eventTags } from "../@dictionaries/dictionaries.eventTags";
+import { EnumTags } from "../@enums/Tags";
 
-export const getEventTags = (message: string): string[] => {
-    return Object.entries(eventTags).filter(([key]) => message?.toLowerCase().includes(key.toLowerCase())).map(([, value]) => value)
-}
+export const GetEventTags = (message: string): string[] => {
+    if (!message) return [];
+    return [...new Set(Object.values(EnumTags)
+        .flat()
+        .filter(({ match }) => match.test(message))
+        .map(({ tag }) => tag)
+    )];
+};

package/src/@building/{building.tracking.ts → GetEventTracking.ts}

@@ -17,10 +17,10 @@
 
 */
 
-import { TypeAttributes } from "../@types/types.attributes";
-import { TypeEventProperties } from "../@types/type.properties";
-import { TypeStanzaCompiled } from "../@types/types.compiled";
-import { TypePVTEC } from "../@types/types.pvtec";
+import { TypeAttributes } from "../@types/Attributes";
+import { TypeEventProperties } from "../@types/Properties";
+import { TypeStanzaCompiled } from "../@types/StanzaCompiled";
+import { TypePVTEC } from "../@types/VTEC";
 
 interface GetTrackingOptions { 
     type: `RAW` | `VTEC` | `API`
@@ -34,17 +34,17 @@ interface GetTrackingOptions {
     vtec?: TypePVTEC
 }
 
-export const getEventTracking = (options: GetTrackingOptions): string => {
-    const proprties = options.properties
+export const GetEventTracking = (options: GetTrackingOptions): string => {
+    const properties = options.properties
     const attributes = options.attributes
     const stanza = options.stanza
     const vtec = options.vtec
     if (options.type === `RAW`) { 
-        const getWatchNumber = proprties.watch_parameters.watch_number ?? null
+        const getWatchNumber = properties.watch_parameters.watch_number ?? null
         if (getWatchNumber) {
-            return `${proprties.geocode.office.office}-${stanza.getType.prefix}-A-${getWatchNumber}`
+            return `${properties.geocode.office.office}.${stanza.getType.prefix}.A.${getWatchNumber}`
         }
-        return `${proprties.geocode.office.office}-${attributes.ttaaii}-${attributes.id.slice(-4).replace(`.`, ``) ?? '0'}`
+        return `${properties.geocode.office.office}.${attributes.ttaaii}.${attributes.id.slice(-4).replace(`.`, ``) ?? '0'}`
     }
     if (options.type === `VTEC`) {
         return vtec.tracking;
@@ -52,17 +52,17 @@ export const getEventTracking = (options: GetTrackingOptions): string => {
     if (options.type === `API`) {
         if (options.vtec) { 
             const vtecValue = Array.isArray(options.vtec) 
-                ? options.vtec[0] : options.vtec;
+                ? options.vtec[0].vtec : options.vtec?.vtec;
             const splitPVTEC = vtecValue.split('.');
-            return `${splitPVTEC[2]}-${splitPVTEC[3]}-${splitPVTEC[4]}-${splitPVTEC[5]}`;
+            return `${splitPVTEC[2]}.${splitPVTEC[3]}.${splitPVTEC[4]}.${splitPVTEC[5]}`;
         }
         const wmoMatch = options.organization?.wmoidentifier?.match(/([A-Z]{4}\d{2})\s+([A-Z]{4})/);
-        const station = wmoMatch?.[2] ?? 'N/A';
+        const station = wmoMatch?.[2] ?? '---';
         if (options.organization.featureId) {
             const idMatch = options.organization.featureId.match(/([a-f0-9]+)\.(\d+)\.(\d+)$/);
-            return `${station}-${idMatch?.[1] ?? 'N/A'}`;
+            return `${station}.${idMatch?.[0]?.replace(/\./g, '') ?? '---'}`;
         }
-        const id = wmoMatch?.[1] ?? 'N/A';
-        return `${station}-${id}`;
+        const id = wmoMatch?.[1] ?? '---';
+        return `${station}.${id?.replace(/\./g, '') ?? '---'}`;
     }
 }