@atmosx/event-product-parser 3.0.61 → 3.0.63

package/package.json

@@ -1,47 +1,49 @@
-{
-	"name": "@atmosx/event-product-parser",
-	"version": "3.0.61",
-	"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": "v3-beta-branch"
-	},
-	"scripts": {
-		"start": "cd ./test && node ./index.js",
-		"build": "tsup && cd ./test && node ./index.js",
-		"publish": "tsup && npm publish --access public",
-		"publish-beta-branch": "tsup && npm publish --tag v3-beta-branch --access public"
-	},
-	"keywords": [
-		"NWWS",
-		"NOAA Weather Wire Service",
-		"TypeScript",
-		"XMPP",
-		"Parser",
-		"JavaScript",
-		"CommonJS",
-		"ESM"
-	],
-	"author": "k3yomi, StarflightWx",
-	"license": "MIT",
-	"bugs": {
-		"url": "https://github.com/AtmosphericX/event-product-parser/issues"
-	},
-	"homepage": "https://github.com/AtmosphericX/event-product-parser#readme",
-	"dependencies": {
-		"@xmpp/client": "0.14.0",
-		"better-sqlite3": "12.9.0",
-		"croner": "10.0.1",
-		"jszip": "3.10.1",
-		"polygon-clipping": "0.15.7",
-		"shapefile": "0.6.6",
-		"typescript": "5.9.3"
-	},
-	"devDependencies": {
-		"@types/node": "25.2.0",
-		"tsup": "8.5.1"
-	}
-}
+{
+	"name": "@atmosx/event-product-parser",
+	"version": "3.0.63",
+	"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": "v3-beta-branch"
+	},
+	"scripts": {
+		"start": "cd ./test && node ./index.js",
+		"build": "node ./tools/build.js && cd ./test && node index.js",
+		"watch": "node ./tools/build.js --watch",
+		"publish": "node ./tools/build.js && npm publish --access public",
+		"publish-beta-branch": "node ./tools/build.js && npm publish --tag v3-beta-branch --access public"
+	},
+	"keywords": [
+		"NWWS",
+		"NOAA Weather Wire Service",
+		"TypeScript",
+		"XMPP",
+		"Parser",
+		"JavaScript",
+		"CommonJS",
+		"ESM"
+	],
+	"author": "k3yomi, StarflightWx",
+	"license": "MIT",
+	"bugs": {
+		"url": "https://github.com/AtmosphericX/event-product-parser/issues"
+	},
+	"homepage": "https://github.com/AtmosphericX/event-product-parser#readme",
+	"dependencies": {
+		"@xmpp/client": "0.14.0",
+		"better-sqlite3": "12.9.0",
+		"croner": "10.0.1",
+		"esbuild": "^0.28.1",
+		"fast-glob": "^3.3.3",
+		"jszip": "3.10.1",
+		"polygon-clipping": "0.15.7",
+		"shapefile": "0.6.6",
+		"typescript": "5.9.3"
+	},
+	"devDependencies": {
+		"@types/node": "25.2.0"
+	}
+}

package/pnpm-workspace.yaml

@@ -0,0 +1,4 @@
+allowBuilds:
+  better-sqlite3: true
+  esbuild: true
+minimumReleaseAge: 43830

package/src/@building/CreateEvent.ts

@@ -17,40 +17,38 @@
 
 */
 
-import { TypeStanzaCompiled } from "../@types/StanzaCompiled"
-import { TypeSettings } from "../@types/Settings"
-import { bootstrap } from "../bootstrap"
-import { ParseText } from "../@events/ParseText"
-import { ParseUGC } from "../@events/ParseUGC"
-import { ParseVTEC } from "../@events/ParseVTEC"
-import { ParseAPI } from "../@events/ParseAPI"
-import { ValidateEvents } from "../@manager/ValidateEvents"
+import { TypeStanzaCompiled } from "types/StanzaCompiled"
+import { TypeSettings } from "types/Settings"
+import { Bootstrap } from "@bootstrap"
+import { ParseText } from "@events/ParseText"
+import { ParseUGC } from "@events/ParseUGC"
+import { ParseVTEC } from "@events/ParseVTEC"
+import { ParseAPI } from "@events/ParseAPI"
+import { ValidateEvents } from "@manager/ValidateEvents"
 
-export const CreateEvent = async (stanza: TypeStanzaCompiled, ignorePushing?: boolean): Promise<void | string> => {
-    const settings = bootstrap.settings as TypeSettings
+export const CreateEvent = async (Stanza: TypeStanzaCompiled): Promise<void | string> => {
+    const settings = Bootstrap.Settings as TypeSettings
     const StanzaSettings = settings.NOAAWeatherWireServiceSettings.StanzaSettings;
 
-    const isVtecEvent = (stanza.isVTEC && stanza.isUGC)
-    const isUgcEvent = (!stanza.isVTEC && stanza.isUGC)
-    const isTextEvent = (!stanza.isVTEC && !stanza.isUGC)
-    const isNWWS = (stanza.isNWWS)
-
+    const isVtecEvent = (Stanza.VTEC && Stanza.UGC)
+    const isUgcEvent = (!Stanza.VTEC && Stanza.UGC)
+    const isTextEvent = (!Stanza.VTEC && !Stanza.UGC)
+    
+    const isNWWS = (Stanza.NWWS)
     switch (true) {
         case (!isNWWS):
-            await ParseAPI(stanza)
+            await ParseAPI(Stanza)
             break;
         case (isNWWS && !StanzaSettings.DisableVTEC && isVtecEvent):
-            await ParseVTEC(stanza)
+            await ParseVTEC(Stanza)
             break;
         case (isNWWS && !StanzaSettings.DisableUGC && isUgcEvent):
-            await ParseUGC(stanza)
+            await ParseUGC(Stanza)
             break;
         case (isNWWS && !StanzaSettings.DisableText && isTextEvent):
-            await ParseText(stanza)
+            await ParseText(Stanza)
             break;
     }
-    if (!ignorePushing) {
-        await ValidateEvents(bootstrap.cache.processed)
-    }
+    await ValidateEvents(Bootstrap.Cache.Parsed)
     return 'nothing picked';
 }

package/src/@building/GetEventAttachments.ts

@@ -17,11 +17,11 @@
 
 */
 
-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";
+import { TypeEvent } from "types-lower/Event"
+import { Bootstrap } from "@bootstrap"
+import { EnumStates } from "@enums/States"
+import { EnumExpressions } from "@enums/Expressions"
+import { GetLatestIssuance } from "@utilities/GetLatestIssuance"
 
 interface GetEventAttachmentsResponse { 
     name: string
@@ -38,7 +38,7 @@ type BroadcastifyResponse = {
 
 export const GetEventAttachments = (event: TypeEvent): GetEventAttachmentsResponse[] | null => {
     let attachments = [];
-    const settings = bootstrap.settings;
+    const settings = Bootstrap.Settings;
     const issuanceTime = GetLatestIssuance();
     const spcNumber = event?.properties?.discussion_parameters?.discussion_number;
     const watchNumber = event?.properties?.watch_parameters?.watch_number;
@@ -64,13 +64,13 @@ export const GetEventAttachments = (event: TypeEvent): GetEventAttachmentsRespon
                 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 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 tags = Bootstrap.Settings.BroadcastifySettings.BroadcastifyTags;
                 const filtered = feeds.filter((feed: BroadcastifyResponse) => tags.includes(feed.type));
                 if (filtered.length > 0) {
                     filtered.map((filtered: BroadcastifyResponse) => {

package/src/@building/GetEventEnhancedName.ts

@@ -17,10 +17,8 @@
 
 */
 
-import { TypeEvent } from "../@types/Event";
-import { TypeSettings } from "../@types/Settings";
-import { EnumEnhanced } from "../@enums/Enhanced"
-import { bootstrap } from "../bootstrap"
+import { TypeEvent } from "types-lower/Event"
+import { EnumEnhanced } from "@enums/Enhanced"
 
 export const GetEventEnhancedName = (event: TypeEvent): string => {
     let name = event?.properties?.event;

package/src/@building/GetEventGeometry.ts

@@ -17,10 +17,10 @@
 
 */
 
-import { TypeSettings } from "../@types/Settings"
-import { TypeEvent } from "../@types/Event"
-import { GetSettings } from "../@modules/@utilities/GetSettings";
-import { getZonePolygon } from "../@parsers/@ugc/GetZonePolygon";
+import { TypeSettings } from "types/Settings"
+import { TypeEvent } from "types-lower/Event"
+import { GetSettings } from "@utilities/GetSettings"
+import { getZonePolygon } from "@parsers/ugc/GetZonePolygon"
 
 interface GetGeometryResponse { 
     type: `Polygon` | `MultiPolygon`
@@ -36,7 +36,7 @@ export const GetEventGeometry = (event: TypeEvent): GetGeometryResponse  => {
         coordinates: generated != null ? JSON.parse(Buffer.from(generated, 'base64').toString('utf-8')) : null
     }
     if (settings.GlobalSettings.UseShapefileCoordinates && generated == null && ugc != null) { 
-        geo = getZonePolygon({zones: ugc, isUnion: false})
+        geo = getZonePolygon({Zones: ugc, Union: false})
         if (geo == null) {
             geo = {
                 type: `Polygon`,

package/src/@building/GetEventHeader.ts

@@ -17,21 +17,21 @@
 
 */
 
-import { TypePVTEC } from "../@types/VTEC";
-import { TypeEventProperties } from "../@types/Properties";
+import { TypeVTEC } from "types/VTEC"
+import { TypeEventProperties } from "types-lower/Properties"
 
 interface GetHeaderOptions {
-    properties: TypeEventProperties
-    vtec?: TypePVTEC
-    getType: {
-        type: string
-        prefix: string
+    Properties: TypeEventProperties
+    VTEC?: TypeVTEC
+    Type: {
+        Type: string
+        Prefix: string
     }
 }
 
-export const GetEventHeader = (options: GetHeaderOptions): string => {
-    const properties = options.properties
-    const vtec = options.vtec ?? null
+export const GetEventHeader = ({ Properties, VTEC, Type }: GetHeaderOptions): string => {
+    const properties = Properties
+    const vtec = VTEC ?? null
     const ugc = properties.geocode.ugc != null ? properties.geocode.ugc.join(`-`) : `0`;
-    return `ZCZC-ATMOSX-${options.getType.prefix}-${ugc}-${vtec?.status ?? `Issued`}-${new Date().toISOString().replace(/[-:]/g, '').split('.')[0]}-${properties.geocode.office.office ?? `KWNS`}`
+    return `ZCZC-ATMOSX-${Type?.Prefix}-${ugc}-${vtec?.Status ?? `Issued`}-${new Date().toISOString().replace(/[-:]/g, '').split('.')[0]}-${properties.geocode.office.office ?? `KWNS`}`
 }

package/src/@building/GetEventNodes.ts

@@ -17,10 +17,10 @@
 
 */
 
-import { TypeEvent } from "../@types/Event"
-import { bootstrap } from "../bootstrap"
-import { GetEventGeometry } from "./GetEventGeometry"
-import { GetShapeNearestPoint } from "../@modules/@utilities/GetShapeNearestPoint"
+import { TypeEvent } from "types-lower/Event"
+import { Bootstrap } from "@bootstrap"
+import { GetEventGeometry } from "@building/GetEventGeometry"
+import { GetShapeNearestPoint } from "@utilities/GetShapeNearestPoint"
 
 interface GetEventNodesResponse { 
     nodes: {
@@ -36,9 +36,9 @@ interface GetEventNodesResponse {
 }
 
 export const GetEventNodes = async (event: TypeEvent): Promise<GetEventNodesResponse> => {
-    const nodes = bootstrap.cache.nodes.features;
+    const nodes = Bootstrap.Cache.Nodes.features;
     if (!nodes || nodes.length === 0) {
-        return { nodes: [], filtered: true, updated: Date.now() };
+        return { nodes: [], filtered: false, updated: Date.now() };
     }
     const metadata = { nodes: [], proximity: false, filtered: false };
     const geometry = await GetEventGeometry(event);
@@ -47,23 +47,23 @@ export const GetEventNodes = async (event: TypeEvent): Promise<GetEventNodesResp
     }
     for (const node of nodes) {
         const [longitude, latitude] = node.geometry.coordinates;
-        const getPoint = GetShapeNearestPoint(geometry.coordinates, [longitude, latitude])
-        const miles = getPoint.distance ?? null;
+        const getPoint = GetShapeNearestPoint({ Coordinates: geometry.coordinates, Point: [longitude, latitude] });
+        const miles = getPoint.Distance ?? null;
         const kilometers = Number((miles * 1.609344).toFixed(3));
 
         const info = {
             id: node.properties?.identifier,
             coordinates: [longitude, latitude],
-            nearest: getPoint.point,
+            nearest: getPoint.Point,
             miles,
             kilometers,
             proximity: false
         }
-        metadata.nodes.push(info)
-        if (miles != null && (bootstrap.settings.GlobalSettings.EventFiltering.NodeLocationFiltering) && (miles < bootstrap.settings.GlobalSettings.NodeMaxDistance)) {
-            metadata.proximity = true;
+        if (miles != null && (miles < Bootstrap.Settings.GlobalSettings.NodeMaxDistance)) {
             info.proximity = true;
+            metadata.proximity = true;
         }
+        metadata.nodes.push(info)
     }
     return {
         nodes: metadata.nodes,

package/src/@building/GetEventOffice.ts

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

package/src/@building/GetEventProperties.ts

@@ -17,76 +17,81 @@
 
 */
 
-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";
+import { TypeEventProperties } from "types-lower/Properties"
+import { TypeAttributes } from "types-lower/Attributes"
+import { TypeUGC } from "types/UGC"
+import { TypeVTEC } 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 "@building/GetEventOffice"
+import { GetEventTags } from "@building/GetEventTags"
 
 interface GetEventPropertiesOptions { 
-    message: string
-    attributes: TypeAttributes
-    ugc?: TypeUGC
-    pVtec?: TypePVTEC
-    hVtec?: TypeHVTEC
+    Message: string
+    Attributes: TypeAttributes
+    UGC?: TypeUGC
+    VTEC?: TypeVTEC
 }
 
-export const GetEventProperties = (options: GetEventPropertiesOptions): TypeEventProperties => {
-    const organization = options.message.match(EnumExpressions.wmo)?.[0] ?? null
-    const polygons = getPolygonFromProduct(options.message)
+
+export const GetEventProperties = ({ Message, Attributes, UGC, VTEC }: GetEventPropertiesOptions): TypeEventProperties => {
+    const organization = Message.match(EnumExpressions.wmo)?.[0] ?? null
+    const polygons = getPolygonFromProduct(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,
+        locations: UGC?.Locations?.join(`; `) ?? null,
+        locations_array: UGC?.Locations ?? [],
+        location_states: [...new Set(
+            UGC?.Locations
+            ?.map((location: string) => location.match(/,\s*([A-Z]{2})\b/)?.[1])
+            .filter(Boolean) ?? []
+        )],
+        description: GetDescriptionFromProduct({ Message: Message, Handle: VTEC?.Raw ?? null }),
+        attributes: Attributes,
         geocode: {
-            office: GetEventOffice({ attributes: options.attributes, organization: organization, pVtec: options.pVtec }),
+            office: GetEventOffice({ Attributes: Attributes, Organization: organization, VTEC: VTEC }),
             organization: organization,
-            ugc: options?.ugc?.zones ?? [],
+            ugc: 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,
+            tags: GetEventTags(Message),
+            instructions: GetTextFromProduct({ Message: Message, Find: [`For your protection`, `do not`, `use extreme caution`], Append: `...`, Removal: [`.`]})  ?? null,
+            source: GetTextFromProduct({ Message: Message, Find: [`SOURCE...`], Removal: [`.`]}) ?? null,
+            hazards: GetTextFromProduct({ Message: Message, Find: [`HAZARD...`], Removal: [`.`]}) ?? null,
+            impacts: GetTextFromProduct({ Message: Message, Find: [`IMPACT...`], Removal: [`.`]}) ?? null,
+            estimated_hail_size: GetTextFromProduct({ Message: Message, Find: [`MAX HAIL SIZE...`, `HAIL...`], Removal: ['in']}) ?? null,
+            estimated_wind_gusts: GetTextFromProduct({ Message: Message, Find: [`MAX WIND GUST...`, `WIND...`]}) ?? null,
+            damage_threat: GetTextFromProduct({ Message: Message, Find: [`DAMAGE THREAT...`], Removal: []}) ?? null,
+            tornado_threat: GetTextFromProduct({ Message: Message, Find: [`TORNADO...`, `WATERSPOUT...`] }) ?? null,
+            flood_threat: GetTextFromProduct({ Message: Message, Find: [`FLASH FLOOD...`]}) ?? null,
+            wind_threat: GetTextFromProduct({ Message: Message, Find: [`WIND THREAT...`]}) ?? null,
+            hail_threat: GetTextFromProduct({ Message: 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,
+            discussion_number: GetTextFromProduct({ Message: Message, Find: [`Mesoscale Discussion `], Removal: [`Mesoscale Discussion`, `Number`, `...`] })?.toString()?.padStart(4, "0") ?? null,
+            discussion_concerning: GetTextFromProduct({ Message: Message, Find: [`Concerning...`] }) ?? null,
+            discussion_max_tornado: GetTextFromProduct({ Message: Message, Find: [`MOST PROBABLE PEAK TORNADO INTENSITY...`] }) ?? null,
+            discussion_max_hail: GetTextFromProduct({ Message: Message, Find: [`MOST PROBABLE PEAK HAIL SIZE...`] }) ?? null,
+            discussion_max_wind: GetTextFromProduct({ Message: Message, Find: [`MOST PROBABLE PEAK WIND GUST...`] }) ?? null,
+            discussion_watch_issuance: GetTextFromProduct({ Message: 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) : 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)
+            watch_number: VTEC?.Watch ? ( GetTextFromProduct({ Message: Message, Find: [`ITIES FOR`, `UPDATE FOR`, `Watch Number `], Removal: [`%`, `<`, `:`] })?.replace(/(WT|WS|)/g, '')?.trim()?.toString()?.padStart(4, "0") ?? VTEC?.Tracking?.slice(-4)?.toString()?.padStart(4, "0") ?? null) : null,
+            watch_type: Message.includes(`TORNADO WATCH`) ? `Tornado` : Message.includes(`SEVERE`) ? `Severe` : null,
+            additional_tornadoes_probability: GetTextFromProduct({ Message: Message, Find: [`PROB OF 2 OR MORE TORNADOES`], Removal: [`%`, `<`, `:`] }) ?? null,
+            strong_tornadoes_probability: GetTextFromProduct({ Message: Message, Find: [`PROB OF 1 OR MORE STRONG /EF2-EF5/ TORNADOES`], Removal: [`%`, `<`, `:`] }) ?? null,
+            severe_wind_probability: GetTextFromProduct({ Message: Message, Find: [`PROB OF 10 OR MORE SEVERE WIND EVENTS`], Removal: [`%`, `<`, `:`] }) ?? null,
+            severe_hail_probability: GetTextFromProduct({ Message: Message, Find: [`PROB OF 10 OR MORE SEVERE HAIL EVENTS`], Removal: [`%`, `<`, `:`] }) ?? null,
+            hail_2in_probability: GetTextFromProduct({ Message: Message, Find: [`PROB OF 1 OR MORE HAIL EVENTS >= 2 INCHES`], Removal: [`%`, `<`, `:`] }) ?? null,
+            combined_hail_wind_probability: GetTextFromProduct({ Message: Message, Find: [`PROB OF 6 OR MORE COMBINED SEVERE HAIL/WIND EVENTS`], Removal: [`%`, `<`, `:`] }) ?? null,
+            max_hail_in: GetTextFromProduct({ Message: Message, Find: [`MAX HAIL /INCHES/`], Removal: [`%`, `<`, `:`] }) ?? null,
+            max_wind_surface:  GetTextFromProduct({ Message: Message, Find: [`MAX WIND GUSTS SURFACE /KNOTS/`], Removal: [`%`, `<`, `:`] }) ?? null,
+            max_tops_x100feet:  GetTextFromProduct({ Message: Message, Find: [`MAX TOPS /X 100 FEET/`], Removal: [`%`, `<`, `:`] }) ?? null,
+            pds_watch: (GetTextFromProduct({ Message: Message, Find: [`PARTICULARLY DANGEROUS SITUATION`], Removal: [`%`, `<`, `:`] }) === `YES` ? true : null)
         }
     }
     if (isNaN(Number(properties.watch_parameters.watch_number))) {

package/src/@building/GetEventSignature.ts

@@ -17,12 +17,12 @@
 
 */
 
-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"
+import { TypeEvent } from "types-lower/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;
@@ -44,7 +44,7 @@ export const GetEventSignature = (event: TypeEvent): TypeEvent => {
         properties.status_metadata = { ...properties.status_metadata, is_expired: true };
     }
     
-    const getProduct = vtec?.vtec?.split(`.`)[0]?.replace(`/`, ``)
+    const getProduct = vtec?.Raw?.split(`.`)[0]?.replace(`/`, ``)
     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/GetEventTags.ts

@@ -17,7 +17,7 @@
 
 */
 
-import { EnumTags } from "../@enums/Tags";
+import { EnumTags } from "@enums/Tags"
 
 export const GetEventTags = (message: string): string[] => {
     if (!message) return [];