@atmosx/event-product-parser 3.0.44 → 3.0.47

package/dist/index.d.mts

@@ -1,11 +1,17 @@
-type TypeWebhook = {
-    webhook: string;
-    title: string;
-    message: string;
-    upload: boolean;
-    eas: boolean;
-    rate: number;
+type TypeListener = {
     events: string[];
+    webhook?: {
+        enabled: boolean;
+        destination: string;
+        ratelimit: number;
+        title: string;
+        message: string;
+    };
+    uploads?: {
+        file?: boolean;
+        eas?: boolean;
+        event?: boolean;
+    };
 };
 
 type TypeSettings = {
@@ -37,6 +43,11 @@ type TypeSettings = {
         CallbackInterval: number;
         EventsEndpoint: string;
     };
+    BroadcastifySettings: {
+        BroadcastifyAttachments: boolean;
+        BroadcastifyDatabase: string;
+        BroadcastifyTags: string[];
+    };
     GlobalSettings: {
         EventManagement: boolean;
         BetterEventNames: boolean;
@@ -46,7 +57,7 @@ type TypeSettings = {
         ShapefileSkipPoints: number;
         NodeTTL: number;
         NodeMinDistance: number;
-        WebhookSettings?: TypeWebhook;
+        ListenerSettings?: TypeListener[];
         EventFiltering: {
             ListeningEvents: string[];
             ListeningICAO: string[];
@@ -57,10 +68,12 @@ type TypeSettings = {
             NodeLocationFiltering: boolean;
             IgnoreTestProducts: boolean;
         };
-        EASSettings: {
-            ArchiveTTL: number;
-            ArchiveDirectory: string;
-            IntroWavFile: string;
+        ArchiveSettings: {
+            TTL: number;
+            EventDirectory: string;
+            TextDirectory: string;
+            EasDirectory: string;
+            EasToneout: string;
         };
     };
 };
@@ -78,8 +91,9 @@ type TypeAttributes = {
 
 type TypeEventProperties = {
     locations: string;
+    locations_array: string[];
     description: string;
-    attributes: TypeAttributes;
+    attributes?: TypeAttributes;
     geocode: {
         office: {
             name: string;
@@ -90,7 +104,7 @@ type TypeEventProperties = {
         polygon: string;
         polygon_generated: boolean;
     };
-    parameters: {
+    parameters?: {
         tags: string[];
         instructions: string;
         source: string;
@@ -123,13 +137,13 @@ type TypeEventProperties = {
         max_tops_x100feet: string;
         pds_watch: boolean;
     };
-    spc_parameters: {
-        spc_number: string;
-        spc_concerning: string;
-        spc_max_tornado: string;
-        spc_max_hail: string;
-        spc_max_wind: string;
-        spc_watch_issuance: string;
+    discussion_parameters?: {
+        discussion_number: string;
+        discussion_concerning: string;
+        discussion_max_tornado: string;
+        discussion_max_hail: string;
+        discussion_max_wind: string;
+        discussion_watch_issuance: string;
     };
 };
 
@@ -177,8 +191,8 @@ type TypeEvent = {
             tracking: string;
             hash?: string;
             header: string;
-            vtec: TypePVTEC | null;
-            hvtec: TypeHVTEC[];
+            vtec?: TypePVTEC | null;
+            hvtec?: TypeHVTEC[] | null;
             nodes?: {
                 id?: string | number;
                 coordinates: [number, number];
@@ -194,7 +208,10 @@ type TypeEvent = {
                 issued: string;
                 status: string;
             }[];
-            attachments?: string[];
+            attachments?: {
+                name: string;
+                link: string;
+            }[];
             raw: string;
         };
     } & TypeEventProperties;
@@ -215,6 +232,7 @@ declare const stopService: () => Promise<void>;
 interface GenerateEASOptions {
     message: string;
     header: string;
+    title: string;
 }
 declare const setEasTone: (options: GenerateEASOptions) => Promise<string>;
 
@@ -232,6 +250,17 @@ declare const getEvents: () => any;
 
 declare const getNodes: () => any;
 
+interface CreateEventOptions {
+    event: string;
+    status: string;
+    issued: Date;
+    expires: Date;
+    locations: string;
+    description: string;
+    coordinates: number[][];
+}
+declare const createEvent: (options: CreateEventOptions) => void;
+
 declare const getRandomEvent: () => any;
 
 type TypeStanza = {
@@ -267,4 +296,4 @@ declare class Manager {
     trycatch(): void;
 }
 
-export { Manager, type TypeEvent, clearEvents, Manager as default, getCleanedEvent, getEventGeometry, getEvents, getNodes, getRandomEvent, query, setEasTone, setNode, setSettings, startService, stopService };
+export { Manager, type TypeEvent, clearEvents, createEvent, Manager as default, getCleanedEvent, getEventGeometry, getEvents, getNodes, getRandomEvent, query, setEasTone, setNode, setSettings, startService, stopService };

package/dist/index.d.ts

@@ -1,11 +1,17 @@
-type TypeWebhook = {
-    webhook: string;
-    title: string;
-    message: string;
-    upload: boolean;
-    eas: boolean;
-    rate: number;
+type TypeListener = {
     events: string[];
+    webhook?: {
+        enabled: boolean;
+        destination: string;
+        ratelimit: number;
+        title: string;
+        message: string;
+    };
+    uploads?: {
+        file?: boolean;
+        eas?: boolean;
+        event?: boolean;
+    };
 };
 
 type TypeSettings = {
@@ -37,6 +43,11 @@ type TypeSettings = {
         CallbackInterval: number;
         EventsEndpoint: string;
     };
+    BroadcastifySettings: {
+        BroadcastifyAttachments: boolean;
+        BroadcastifyDatabase: string;
+        BroadcastifyTags: string[];
+    };
     GlobalSettings: {
         EventManagement: boolean;
         BetterEventNames: boolean;
@@ -46,7 +57,7 @@ type TypeSettings = {
         ShapefileSkipPoints: number;
         NodeTTL: number;
         NodeMinDistance: number;
-        WebhookSettings?: TypeWebhook;
+        ListenerSettings?: TypeListener[];
         EventFiltering: {
             ListeningEvents: string[];
             ListeningICAO: string[];
@@ -57,10 +68,12 @@ type TypeSettings = {
             NodeLocationFiltering: boolean;
             IgnoreTestProducts: boolean;
         };
-        EASSettings: {
-            ArchiveTTL: number;
-            ArchiveDirectory: string;
-            IntroWavFile: string;
+        ArchiveSettings: {
+            TTL: number;
+            EventDirectory: string;
+            TextDirectory: string;
+            EasDirectory: string;
+            EasToneout: string;
         };
     };
 };
@@ -78,8 +91,9 @@ type TypeAttributes = {
 
 type TypeEventProperties = {
     locations: string;
+    locations_array: string[];
     description: string;
-    attributes: TypeAttributes;
+    attributes?: TypeAttributes;
     geocode: {
         office: {
             name: string;
@@ -90,7 +104,7 @@ type TypeEventProperties = {
         polygon: string;
         polygon_generated: boolean;
     };
-    parameters: {
+    parameters?: {
         tags: string[];
         instructions: string;
         source: string;
@@ -123,13 +137,13 @@ type TypeEventProperties = {
         max_tops_x100feet: string;
         pds_watch: boolean;
     };
-    spc_parameters: {
-        spc_number: string;
-        spc_concerning: string;
-        spc_max_tornado: string;
-        spc_max_hail: string;
-        spc_max_wind: string;
-        spc_watch_issuance: string;
+    discussion_parameters?: {
+        discussion_number: string;
+        discussion_concerning: string;
+        discussion_max_tornado: string;
+        discussion_max_hail: string;
+        discussion_max_wind: string;
+        discussion_watch_issuance: string;
     };
 };
 
@@ -177,8 +191,8 @@ type TypeEvent = {
             tracking: string;
             hash?: string;
             header: string;
-            vtec: TypePVTEC | null;
-            hvtec: TypeHVTEC[];
+            vtec?: TypePVTEC | null;
+            hvtec?: TypeHVTEC[] | null;
             nodes?: {
                 id?: string | number;
                 coordinates: [number, number];
@@ -194,7 +208,10 @@ type TypeEvent = {
                 issued: string;
                 status: string;
             }[];
-            attachments?: string[];
+            attachments?: {
+                name: string;
+                link: string;
+            }[];
             raw: string;
         };
     } & TypeEventProperties;
@@ -215,6 +232,7 @@ declare const stopService: () => Promise<void>;
 interface GenerateEASOptions {
     message: string;
     header: string;
+    title: string;
 }
 declare const setEasTone: (options: GenerateEASOptions) => Promise<string>;
 
@@ -232,6 +250,17 @@ declare const getEvents: () => any;
 
 declare const getNodes: () => any;
 
+interface CreateEventOptions {
+    event: string;
+    status: string;
+    issued: Date;
+    expires: Date;
+    locations: string;
+    description: string;
+    coordinates: number[][];
+}
+declare const createEvent: (options: CreateEventOptions) => void;
+
 declare const getRandomEvent: () => any;
 
 type TypeStanza = {
@@ -267,4 +296,4 @@ declare class Manager {
     trycatch(): void;
 }
 
-export { Manager, type TypeEvent, clearEvents, Manager as default, getCleanedEvent, getEventGeometry, getEvents, getNodes, getRandomEvent, query, setEasTone, setNode, setSettings, startService, stopService };
+export { Manager, type TypeEvent, clearEvents, createEvent, Manager as default, getCleanedEvent, getEventGeometry, getEvents, getNodes, getRandomEvent, query, setEasTone, setNode, setSettings, startService, stopService };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atmosx/event-product-parser",
-	"version": "3.0.44",
+	"version": "3.0.47",
 	"description": "NOAA Weather Wire & NWS API Parser - Built for standalone and Project AtmosphericX Integration.",
 	"main": "dist/cjs/index.cjs",
 	"module": "dist/esm/index.mjs",

package/src/@building/building.attachments.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 { bootstrap } from "../bootstrap"
+import { TypeEvent } from "../@types/type.event"
+import { getLatestIssuance } from "../@modules/@utilities/utilities.getLatestIssuance";
+import { dict_states } from "../@dictionaries/dictionaries.states"
+import { dict_expressions } from "../@dictionaries/dictionaries.expressions"
+
+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 latestTime = 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: "Day 1", attachment: `https://www.spc.noaa.gov/products/outlook/day1otlk_${latestTime}.png` },
+        { target: "Day 2", attachment: `https://www.spc.noaa.gov/products/outlook/day2otlk.png` },
+        { target: "Day 3", 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 === event.properties.event).attachment });
+    }
+
+    for (const location of locations) {
+        if (dict_expressions.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 = dict_states[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

@@ -20,7 +20,7 @@
 import { TypeEvent } from "../@types/type.event";
 import { TypeSettings } from "../@types/type.settings";
 import { bootstrap } from "../bootstrap"
-import { betterEventNames } from "../@dictionaries/dictionaries.betterEventNames"
+import { dict_enhanced } from "../@dictionaries/dictionaries.enhanced"
 
 export const getEventEnhancedName = (event: TypeEvent): string => {
     const configurations = bootstrap.settings as TypeSettings
@@ -31,9 +31,10 @@ export const getEventEnhancedName = (event: TypeEvent): string => {
     }
 
     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(dict_enhanced)) {
         if (eventKey !== name) continue;
         for (const [paramKey, paramValue] of Object.entries(eventConfig)) {
             let matches = true;
@@ -46,6 +47,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.office.ts

@@ -19,7 +19,7 @@
 
 import { TypeAttributes } from "../@types/type.attributes";
 import { TypePVTEC } from "../@types/type.pvtec";
-import { officeICAOs } from "../@dictionaries/dictionaries.officeICAOs";
+import { dict_icao } from "../@dictionaries/dictionaries.icao";
 
 interface GetOfficeOptions { 
     attributes: TypeAttributes
@@ -38,6 +38,6 @@ export const getEventOffice = (options: GetOfficeOptions): GetOfficeResponse =>
             (options.organization != null ? 
                 (Array.isArray(options.organization) ? options.organization?.[0] : options.organization) 
         : null));
-    const name = officeICAOs?.[office] ?? null;
+    const name = dict_icao?.[office] ?? null;
     return { office, name };
 }

package/src/@building/building.properties.ts

@@ -22,7 +22,7 @@ import { TypeAttributes } from "../@types/type.attributes";
 import { TypeUGC } from "../@types/type.ugc";
 import { TypePVTEC } from "../@types/type.pvtec";
 import { TypeHVTEC } from "../@types/type.hvtec";
-import { regExp } from "../@dictionaries/dictionaries.regExp";
+import { dict_expressions } from "../@dictionaries/dictionaries.expressions";
 import { getDescriptionFromProduct } from "../@parsers/@text/text.getDescriptionFromProduct";
 import { getPolygonFromProduct } from "../@parsers/@text/text.getPolygonFromProduct";
 import { getTextFromProduct } from "../@parsers/@text/text.getTextFromProduct";
@@ -38,10 +38,11 @@ interface GetPropertiesOptions {
 }
 
 export const properties = (options: GetPropertiesOptions): TypeEventProperties => {
-    const organization = options.message.match(regExp.wmo)?.[0] ?? null
+    const organization = options.message.match(dict_expressions.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: {
@@ -65,16 +66,16 @@ export const properties = (options: GetPropertiesOptions): TypeEventProperties =
             wind_threat: getTextFromProduct({ message: options.message, find: [`WIND THREAT...`]}) ?? null,
             hail_threat: getTextFromProduct({ message: options.message, find: [`HAIL THREAT...`], removal: []}) ?? null,
         },
-        spc_parameters: {
-            spc_number: getTextFromProduct({ message: options.message, find: [`Mesoscale Discussion `], removal: [`Mesoscale Discussion`, `Number`, `...`] }) ?? null,
-            spc_concerning: getTextFromProduct({ message: options.message, find: [`Concerning...`] }) ?? null,
-            spc_max_tornado: getTextFromProduct({ message: options.message, find: [`MOST PROBABLE PEAK TORNADO INTENSITY...`] }) ?? null,
-            spc_max_hail: getTextFromProduct({ message: options.message, find: [`MOST PROBABLE PEAK HAIL SIZE...`] }) ?? null,
-            spc_max_wind: getTextFromProduct({ message: options.message, find: [`MOST PROBABLE PEAK WIND GUST...`] }) ?? null,
-            spc_watch_issuance: getTextFromProduct({ message: options.message, find: [`Probability of Watch Issuance...`], removal: [`percent`]}) ?? 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: getTextFromProduct({ message: options.message, find: [`ITIES FOR`, `UPDATE FOR`, `Watch Number `], removal: [`%`, `<`, `:`] })?.replace(/(WT|WS|)/g, '')?.trim() ?? null,
+            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,
@@ -85,7 +86,7 @@ export const properties = (options: GetPropertiesOptions): TypeEventProperties =
             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`)
+            pds_watch: (getTextFromProduct({ message: options.message, find: [`PARTICULARLY DANGEROUS SITUATION`], removal: [`%`, `<`, `:`] }) === `YES` ? true : null)
         }
     }
     if (isNaN(Number(properties.watch_parameters.watch_number))) {

package/src/@building/building.signature.ts

@@ -18,23 +18,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"
+import { dict_correlations } from "../@dictionaries/dictionaries.correlations";
+import { dict_cancellation } from "../@dictionaries/dictionaries.cancellation";
+import { dict_testing} from "../@dictionaries/dictionaries.testing"
+import { dict_products } from "../@dictionaries/dictionaries.products";
+import { dict_hail } from "../@dictionaries/dictionaries.hail"
 
 
 export const getEventSignature = (event: TypeEvent): TypeEvent => {
     const properties = event?.properties;
     const vtec = event?.properties?.metadata?.vtec
-    const status = statusCorrelationText
+    const status = dict_correlations
         .find((c: { type: string }) => c.type === properties?.status);
-    const csig = eventCancelMessages.find(sig => properties.description.toLowerCase().includes(sig.toLowerCase()));
+    const csig = dict_cancellation.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 += ` (${dict_hail[properties?.parameters?.estimated_hail_size] ?? '--'})`
     }
 
     if (status) { 
@@ -46,8 +46,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 = dict_products[getProduct] == `Test Product`
+    if (isTestProduct || dict_testing.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

@@ -17,8 +17,8 @@
 
 */
 
-import { eventTags } from "../@dictionaries/dictionaries.eventTags";
+import { dict_tags } from "../@dictionaries/dictionaries.tags";
 
 export const getEventTags = (message: string): string[] => {
-    return Object.entries(eventTags).filter(([key]) => message?.toLowerCase().includes(key.toLowerCase())).map(([, value]) => value)
+    return Object.entries(dict_tags).filter(([key]) => message?.toLowerCase().includes(key.toLowerCase())).map(([, value]) => value)
 }

package/src/@building/building.tracking.ts

@@ -52,7 +52,7 @@ 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]}`;
         }
@@ -60,9 +60,9 @@ export const getEventTracking = (options: GetTrackingOptions): string => {
         const station = wmoMatch?.[2] ?? 'N/A';
         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, '') ?? 'N/A'}`;
         }
         const id = wmoMatch?.[1] ?? 'N/A';
-        return `${station}.${id}`;
+        return `${station}.${id?.replace(/\./g, '') ?? 'N/A'}`;
     }
 }

package/src/@building/building.validate.ts

@@ -26,7 +26,7 @@ import { getEventSignature } from "./building.signature"
 import { mkEvent } from "../@manager/manager.mkEvent";
 import { rmEvent } from "../@manager/manager.rmEvent";
 import { getEventGeometry } from "./building.geometry";
-import { getEventAttachments } from "./building.outlooks";
+import { getEventAttachments } from "./building.attachments";
 import { updateNode } from "../@manager/manager.updateNodes";
 import { setEventEmit } from "../@modules/@utilities/utilities.setEventEmit";
 
@@ -67,7 +67,7 @@ export const validateEvents = async (events: TypeEvent[]): Promise<void> => {
             return false; 
         }
         
-        if (properties.metadata?.vtec?.is_watch) {
+        if (properties.metadata?.vtec?.is_watch && properties.metadata.source != `events.api`) {
             const isSPC = properties.metadata?.vtec?.prediction_center;
             setEventEmit({ event: isSPC ? `onStormPredictionWatch` : `onNonStormPredictionWatch`, metadata: define })
             if (bools?.SPCWatchesOnly && !isSPC) {