@atmosx/event-product-parser 3.0.61 → 3.0.63

package/src/@building/GetEventTracking.ts

@@ -17,49 +17,45 @@
 
 */
 
-import { TypeAttributes } from "../@types/Attributes";
-import { TypeEventProperties } from "../@types/Properties";
-import { TypeStanzaCompiled } from "../@types/StanzaCompiled";
-import { TypePVTEC } from "../@types/VTEC";
+import { TypeAttributes } from "types-lower/Attributes"
+import { TypeEventProperties } from "types-lower/Properties"
+import { TypeStanzaCompiled } from "types/StanzaCompiled"
+import { TypeVTEC } from "types/VTEC"
 
 interface GetTrackingOptions { 
-    type: `RAW` | `VTEC` | `API`
-    stanza?: TypeStanzaCompiled
-    attributes?: TypeAttributes
-    properties?: TypeEventProperties
-    organization?: {
-        wmoidentifier: string
-        featureId: string
+    Type: `RAW` | `VTEC` | `API`
+    Stanza?: TypeStanzaCompiled
+    Attributes?: TypeAttributes
+    Properties?: TypeEventProperties
+    WMO?: {
+        Identifier: string
+        ID: string
     }
-    vtec?: TypePVTEC
+    VTEC?: TypeVTEC
 }
 
-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 = properties.watch_parameters.watch_number ?? null
+export const GetEventTracking = ({ Type, Stanza, Attributes, Properties, WMO, VTEC }: GetTrackingOptions): string => {
+    if (Type === `RAW`) { 
+        const getWatchNumber = Properties?.watch_parameters?.watch_number ?? null
         if (getWatchNumber) {
-            return `${properties.geocode.office.office}.${stanza.getType.prefix}.A.${getWatchNumber}`
+            return `${Properties.geocode.office.office}.${Stanza.Type.Prefix}.A.${getWatchNumber}`
         }
-        return `${properties.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;
+    if (Type === `VTEC`) {
+        return VTEC?.Tracking;
     }
-    if (options.type === `API`) {
-        if (options.vtec) { 
-            const vtecValue = Array.isArray(options.vtec) 
-                ? options.vtec[0].vtec : options.vtec?.vtec;
-            const splitPVTEC = vtecValue.split('.');
-            return `${splitPVTEC[2]}.${splitPVTEC[3]}.${splitPVTEC[4]}.${splitPVTEC[5]}`;
+    if (Type === `API`) {
+        if (VTEC) { 
+            const vtecValue = Array.isArray(VTEC) 
+                ? VTEC[0].vtec : VTEC?.Raw;
+            const splitVTEC = vtecValue.split('.');
+            return `${splitVTEC[2]}.${splitVTEC[3]}.${splitVTEC[4]}.${splitVTEC[5]}`;
         }
-        const wmoMatch = options.organization?.wmoidentifier?.match(/([A-Z]{4}\d{2})\s+([A-Z]{4})/);
+        const wmoMatch = WMO?.Identifier?.match(/([A-Z]{4}\d{2})\s+([A-Z]{4})/);
         const station = wmoMatch?.[2] ?? '---';
-        if (options.organization.featureId) {
-            const idMatch = options.organization.featureId.match(/([a-f0-9]+)\.(\d+)\.(\d+)$/);
+        if (WMO?.ID) {
+            const idMatch = WMO?.ID.match(/([a-f0-9]+)\.(\d+)\.(\d+)$/);
             return `${station}.${idMatch?.[0]?.replace(/\./g, '') ?? '---'}`;
         }
         const id = wmoMatch?.[1] ?? '---';

package/src/@core/ClearEvents.ts

@@ -17,15 +17,15 @@
 
 */
 
-import { bootstrap } from "../bootstrap";
-import { SetEventEmit } from "../@modules/@utilities/SetEventEmit";
+import { Bootstrap } from "@bootstrap"
+import { SetEventEmit } from "@utilities/SetEventEmit"
 
 export const ClearEvents = (): void => {
-    bootstrap.cache.events.features = [];
-    bootstrap.cache.hashes = [];
+    Bootstrap.Cache.Events.features = [];
+    Bootstrap.Cache.Hashes = [];
     SetEventEmit({
-        event: `onEventCache`,
-        metadata: bootstrap.cache.events,
-        message: `Manually cleared event cache.`
+        Event: `onEventCache`,
+        Metadata: Bootstrap.Cache.Events,
+        Message: `Manually cleared event cache.`
     })
 }

package/src/@core/CreateListener.ts

@@ -17,8 +17,8 @@
 
 */
 
-import { SetListener } from "../@modules/@utilities/SetListener";
+import { SetListener } from "@utilities/SetListener"
 
 export const CreateListener = (event: string, callback: () => void) => {
-    SetListener({event, callback})
+    SetListener({Event: event, Callback: callback})
 }

package/src/@core/GetEvents.ts

@@ -17,8 +17,8 @@
 
 */
 
-import { bootstrap } from "../bootstrap";
+import { Bootstrap } from "@bootstrap"
 
 export const GetEvents = (): any => {
-    return bootstrap.cache.events
+    return Bootstrap.Cache.Events
 }

package/src/@core/GetNodes.ts

@@ -17,8 +17,8 @@
 
 */
 
-import { bootstrap } from "../bootstrap";
+import { Bootstrap } from "@bootstrap"
 
 export const GetNodes = (): any => {
-    return bootstrap.cache.nodes
+    return Bootstrap.Cache.Nodes
 }

package/src/@core/GetRandomEvent.ts

@@ -17,8 +17,8 @@
 
 */
 
-import { bootstrap } from "../bootstrap";
+import { Bootstrap } from "@bootstrap"
 
 export const GetRandomEvent = (): any => {
-    return bootstrap.cache.events.features[Math.floor(Math.random() * bootstrap.cache.events.features.length)]
+    return Bootstrap.Cache.Events.features[Math.floor(Math.random() * Bootstrap.Cache.Events.features.length)]
 }

package/src/@core/GetVersion.ts

@@ -17,8 +17,8 @@
 
 */
 
-import { bootstrap } from "../bootstrap";
+import { Bootstrap } from "@bootstrap"
 
 export const GetVersion = (): any => {
-    return bootstrap.version
+    return Bootstrap.Version
 }

package/src/@core/ManualEvent.ts

@@ -17,39 +17,38 @@
 
 */
 
-import { TypeAttributes } from "../@types/Attributes";
-import { EnumExpressions } from "../@enums/Expressions"
-import { GetAwipsType } from "../@modules/@stanza/GetAwipsType";
-import { CreateEvent } from "../@building/CreateEvent";
+import { EnumExpressions } from "@enums/Expressions"
+import { GetAwipsType } from "@stanza/GetAwipsType"
+import { CreateEvent } from "@building/CreateEvent"
 
 interface CreateEventOptions {
-    message: string
-    awipsid?: string
+    Message: string
+    Awipsid?: string
 }
 
-export const ManualEvent = async (options: CreateEventOptions): Promise<void> => {
-    const isCapEvent = options.message.includes(`<?xml`);
-    const isCapAreaDescription = options.message.includes(`<areaDesc>`)
-    const isVTEC = options.message.match(EnumExpressions.pvtec) != null;
-    const isUGC = options.message.match(EnumExpressions.ugc1) != null;
+export const ManualEvent = async ({ Message, Awipsid }: CreateEventOptions): Promise<void> => {
+    const isCapEvent = Message.includes(`<?xml`);
+    const isCapAreaDescription = Message.includes(`<areaDesc>`)
+    const isVTEC = Message.match(EnumExpressions.vtec) != null;
+    const isUGC = Message.match(EnumExpressions.ugc1) != null;
     const attributes = {
         "xmlns": "@atmosx/event-product-parser",
         "id": "manual_processor.0000",
         "issue": new Date().toISOString(),
         "ttaaii": "XXXXX",
         "cccc": "XXX",
-        "awipsid": options.awipsid ?? "XXXXXX",
+        "awipsid": Awipsid ?? "XXXXXX",
     }
-    const getType = GetAwipsType({ attributes })
+    const getType = GetAwipsType({ Attributes: attributes})
     const result = { 
-        message: options.message, 
-        attributes,
-        isCapEvent, 
-        isVTEC, 
-        isUGC, 
-        isCapAreaDescription, 
-        isIgnored: false, 
-        isNWWS: true, 
+        Message: Message, 
+        Attributes: attributes,
+        CapEvent: isCapEvent, 
+        VTEC: isVTEC, 
+        UGC: isUGC, 
+        CapAreaDescription: isCapAreaDescription, 
+        Ignored: false, 
+        NWWS: true, 
         getType 
     }
     await CreateEvent(result);

package/src/@core/QueryStanza.ts

@@ -17,12 +17,12 @@
 
 */
 
-import { TypeStanza } from "../@types/Stanza";
-import { bootstrap } from "../bootstrap";
+import { TypeStanza } from "types-lower/Stanza"
+import { Bootstrap } from "@bootstrap"
 
 interface QueryStanzaOptions {
-    search: string
-    max?: number
+    Search: string
+    Max?: number
 }
 
 type QueryStanza = {
@@ -30,10 +30,10 @@ type QueryStanza = {
     stanza: string
 }
 
-export const QueryStanza = async (options: QueryStanzaOptions): Promise<TypeStanza[]> => {
-    const get = await bootstrap.database.prepare(
+export const QueryStanza = async ({ Search, Max }: QueryStanzaOptions): Promise<TypeStanza[]> => {
+    const get = await Bootstrap.Database.prepare(
         `SELECT * FROM stanzas WHERE stanza LIKE ? LIMIT ?`)
-    .all(`%${options.search}%`, options.max ?? 100) as QueryStanza[];
+    .all(`%${Search}%`, Max ?? 100) as QueryStanza[];
     const events = get.map((row) => JSON.parse(row.stanza));
     return events as TypeStanza[];
 }

package/src/@core/SetNode.ts

@@ -17,47 +17,52 @@
 
 */
 
-import { bootstrap } from "../bootstrap";
-import { SetWarning } from "../@modules/@utilities/SetWarning"
-import { SetEventEmit } from "../@modules/@utilities/SetEventEmit";
+import { Bootstrap } from "@bootstrap"
+import { SetWarning } from "@utilities/SetWarning"
+import { SetEventEmit } from "@utilities/SetEventEmit"
 
 interface GetNodeOptions {
-    identifier: string
-    delete?: boolean
-    coordinates: { longitude: number; latitude: number }
+    Identifier: string
+    Delete?: boolean
+    Coordinates: { Longitude: number; Latitude: number }
 }
 
-export const SetNode = (options: GetNodeOptions) => {
-    const nodes = bootstrap.cache.nodes.features;
-    const exists = nodes.find((node) => node.properties.identifier === options.identifier);
-    if (options.delete) {
+export const SetNode = ({ Identifier, Delete, Coordinates }: GetNodeOptions) => {
+    const nodes = Bootstrap.Cache.Nodes.features;
+    const exists = nodes.find((node) => node.properties.identifier === Identifier);
+    if (Delete) {
         if (exists) {
             const index = nodes.indexOf(exists);
             nodes.splice(index, 1);
+            SetWarning({ Message: `Node with identifier '${Identifier}' deleted.` })
             return SetEventEmit({
-                event: `onNodeDelete`,
-                metadata: {
-                    type: `node-delete`,
-                    node: exists
+                Event: `onNodeDelete`,
+                Metadata: {
+                    Type: `node-delete`,
+                    Node: exists
                 }
             })
         }
-        return SetWarning({ message: `Node with identifier '${options.identifier}' not found.` })
+        return SetWarning({ Message: `Node with identifier '${Identifier}' not found.` })
     }
     if (exists) {
         const index = nodes.indexOf(exists);
+        if (exists.geometry.coordinates[0] === Coordinates.Longitude && exists.geometry.coordinates[1] === Coordinates.Latitude) {
+            return;
+        }
         nodes[index] = {
             ...exists,
             geometry: {
                 type: "Point",
-                coordinates: [options.coordinates.longitude, options.coordinates.latitude]
+                coordinates: [Coordinates.Longitude, Coordinates.Latitude]
             }
         };
+        SetWarning({ Message: `Node with identifier '${Identifier}' updated.` })
         return SetEventEmit({
-            event: `onNodeUpdate`,
-            metadata: {
-                type: `node-update`,
-                node: nodes[index]
+            Event: `onNodeUpdate`,
+            Metadata: {
+                Type: `node-update`,
+                Node: nodes[index]
             }
         })
     }
@@ -65,17 +70,18 @@ export const SetNode = (options: GetNodeOptions) => {
         type: "Feature",
         geometry: {
             type: "Point",
-            coordinates: [options.coordinates.longitude, options.coordinates.latitude]
+            coordinates: [Coordinates.Longitude, Coordinates.Latitude]
         },
         properties: {
-            identifier: options.identifier
+            identifier: Identifier
         }
     });
+    SetWarning({ Message: `Node with identifier '${Identifier}' added.` })
     return SetEventEmit({
-        event: `onNodeAdd`,
-        metadata: {
-            type: `node-add`,
-            node: nodes[nodes.length - 1]
+        Event: `onNodeAdd`,
+        Metadata: {
+            Type: `node-add`,
+            Node: nodes[nodes.length - 1]
         }
     })
 }

package/src/@core/StartService.ts

@@ -17,26 +17,26 @@
 
 */
 
-import { TypeSettings } from "../@types/Settings";
-import { bootstrap } from "../bootstrap";
-import { SetWarning } from "../@modules/@utilities/SetWarning"
-import { SetSettings } from "../@modules/@utilities/SetSettings"
-import { DeployXMPP } from "../@modules/@xmpp/DeployXMPP"
-import { InitializeDatabase } from "../@modules/@database/InitializeDatabase";
-import { GetCachedEvents } from "../@modules/@database/GetCachedEvents";
-import { SetCronSchedule } from "../@modules/@utilities/SetCronSchedule";
-import { UpdateNode } from "../@manager/UpdateNode";
-import { UpdateEvents } from "../@manager/UpdateEvents";
-import { Cron } from "croner";
+import { TypeSettings } from "types/Settings"
+import { Bootstrap } from "@bootstrap"
+import { SetWarning } from "@utilities/SetWarning"
+import { SetSettings } from "@utilities/SetSettings"
+import { SetCronSchedule } from "@utilities/SetCronSchedule"
+import { DeployXMPP } from "@xmpp/DeployXMPP"
+import { InitializeDatabase } from "@database/InitializeDatabase"
+import { GetCachedEvents } from "@database/GetCachedEvents"
+import { UpdateNode } from "@manager/UpdateNode"
+import { UpdateEvents } from "@manager/UpdateEvents"
+import { Cron } from "croner"
 
 export const StartService = async (configurations: TypeSettings): Promise<void> => {
-    if (!bootstrap.isReady) { 
+    if (!Bootstrap.Ready) { 
         return SetWarning({ 
-            message: `You can not create another instance without shutting down the current one first, please make sure to call the stop() method first!` 
+            Message: `You can not create another instance without shutting down the current one first, please make sure to call the stop() method first!` 
         })
     }
     const settings = SetSettings(configurations);
-    bootstrap.isReady = true;
+    Bootstrap.Ready = true;
     await InitializeDatabase();
     if (settings.EnableWireService) {
         (async () => {
@@ -47,14 +47,14 @@ export const StartService = async (configurations: TypeSettings): Promise<void>
     await SetCronSchedule()
     let scheduleInterval = !settings.EnableWireService ? settings.NationalWeatherServiceSettings.CallbackInterval : 1;
     if (!settings.EnableWireService && scheduleInterval < 15) {
-        SetWarning({ message: `Schedule interval of ${scheduleInterval} seconds is too low, setting to 15 seconds` })
-        bootstrap.settings.NationalWeatherServiceSettings.CallbackInterval = 15;
+        SetWarning({ Message: `Schedule interval of ${scheduleInterval} seconds is too low, setting to 15 seconds` })
+        Bootstrap.Settings.NationalWeatherServiceSettings.CallbackInterval = 15;
         scheduleInterval = 15;
     }
-    bootstrap.cron = new Cron(`*/${scheduleInterval} * * * * *`, async () => {
+    Bootstrap.Job = new Cron(`*/${scheduleInterval} * * * * *`, async () => {
         await SetCronSchedule();
     })
-    bootstrap.cron = new Cron(`* * * * * *`, async () => { 
+    Bootstrap.Job = new Cron(`* * * * * *`, async () => { 
         await UpdateNode();
         await UpdateEvents();
     })

package/src/@core/StopService.ts

@@ -17,16 +17,16 @@
 
 */
 
-import { bootstrap } from "../bootstrap";
+import { Bootstrap } from "@bootstrap"
 
 export const StopService = async (): Promise<void> => {
-    if (bootstrap.isReady) {
-        bootstrap.isReady = false;
-        if (bootstrap.session_xmpp) {
-            try { await bootstrap.session_xmpp.stop(); } catch {}
-            bootstrap.cache.isConnected = false;
-            bootstrap.cache.sigHault = true;
-            bootstrap.session_xmpp = null;
+    if (Bootstrap.Ready) {
+        Bootstrap.Ready = false;
+        if (Bootstrap.Session) {
+            try { await Bootstrap.Session.stop(); } catch {}
+            Bootstrap.Cache.Connected = false;
+            Bootstrap.Cache.Hault = true;
+            Bootstrap.Session = null;
         }
     }
 }

package/src/@enums/Expressions.ts

@@ -19,7 +19,7 @@
 
 export const EnumExpressions: { [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"),
+    vtec: 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"),
     ugc1: new RegExp(`(\\w{2}[CZ](\\d{3}((-|>)\\s?(\\n\\n)?))+)`, "imu"),

package/src/@enums/Tags.ts

@@ -148,7 +148,7 @@ export const EnumTags = {
         { match: /Source\.\.\.Doppler Radar/i, tag: "Confirmed By Radar" },
         { match: /Source\.\.\.Automated Gauges/i, tag: "Confirmed By Automated Gauges" },
         { match: /Source\.\.\.Radar Confirmed/i, tag: "Confirmed By Radar" },
-        { match: /Source\.\.\.Radar Indicated/i, tag: "Indicated By Radar" },
+        { match: /Source\.\.\.Radar Indicated/i, tag: "Radar Indicated" },
         { match: /Source\.\.\.Public/i, tag: "Confirmed By Public" },
         { match: /Source\.\.\.Amateur Radio/i, tag: "Confirmed By Amateur Radio" },
         { match: /Source\.\.\.Emergency Management/i, tag: "Confirmed By Emergency Management" },

package/src/@events/ParseAPI.ts

@@ -17,22 +17,22 @@
 
 */
 
-import { TypeStanzaCompiled } from "../@types/StanzaCompiled"
-import { TypePVTEC } from "../@types/VTEC";
-import { EnumICAO } from "../@enums/ICAO";
-import { bootstrap } from "../bootstrap";
-import { GetEventTracking } from "../@building/GetEventTracking";
-import { VTECExtract } from "../@parsers/@pvtec/VTECExtract"
-import { GetEventTags } from "../@building/GetEventTags";
-import { GetTextFromProduct } from "../@parsers/@text/GetTextFromProduct";
-import { SetDebug } from "../@modules/@utilities/SetDebug";
+import { TypeStanzaCompiled } from "types/StanzaCompiled"
+import { TypeVTEC } from "types/VTEC"
+import { EnumICAO } from "@enums/ICAO"
+import { Bootstrap } from "@bootstrap"
+import { GetEventTracking } from "@building/GetEventTracking"
+import { VTECExtract } from "@parsers/vtec/VTECExtract"
+import { GetEventTags } from "@building/GetEventTags"
+import { GetTextFromProduct } from "@parsers/text/GetTextFromProduct"
+import { SetDebug } from "@utilities/SetDebug"
 
-export const ParseAPI = async (stanza: TypeStanzaCompiled): Promise<void> => {
-    const messages = Object.values(JSON.parse(stanza.message).features) as any;
+export const ParseAPI = async (Stanza: TypeStanzaCompiled): Promise<void> => {
+    const messages = Object.values(JSON.parse(Stanza.Message).features) as any;
     for (const feature of messages) {
         const tick = performance.now();
-        const pVtec = VTECExtract(feature?.properties?.parameters?.VTEC?.[0]) ?? null as TypePVTEC[]
-        bootstrap.cache.processed.push({
+        const VTEC = VTECExtract(feature?.properties?.parameters?.VTEC?.[0]) ?? null as TypeVTEC[]
+        Bootstrap.Cache.Parsed.push({
             type: `Feature`,
             geometry: {
                 type: `Point`,
@@ -45,13 +45,18 @@ export const ParseAPI = 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(';') : [],
+                locations_array: feature?.properties?.areaDesc ? feature?.properties?.areaDesc.split('; ') : [],
+                location_states: [...new Set(
+                    feature?.properties?.areaDesc?.split(';')
+                    ?.map((location: string) => location.match(/,\s*([A-Z]{2})\b/)?.[1])
+                    .filter(Boolean) ?? []
+                )],
                 description: feature?.properties?.description ?? null,
                 attributes: feature?.properties?.attributes ?? {},
                 geocode: {
                     office: {
-                        office: pVtec ? pVtec?.[0]?.tracking.split(`.`)[0] : null,
-                        name: EnumICAO[pVtec ? pVtec?.[0]?.tracking.split(`.`)[0] : null] ?? null,
+                        office: VTEC ? VTEC?.[0]?.Tracking.split(`.`)[0] : null,
+                        name: EnumICAO[VTEC ? VTEC?.[0]?.Tracking.split(`.`)[0] : null] ?? null,
                     },
                     organization:  feature?.properties?.parameters?.WMOidentifier?.[0],
                     ugc: feature?.properties?.geocode?.UGC ?? [], 
@@ -61,9 +66,9 @@ export const ParseAPI = async (stanza: TypeStanzaCompiled): Promise<void> => {
                 parameters: {
                     tags: GetEventTags(feature?.properties?.description),
                     instructions: feature?.properties?.instruction ?? null,
-                    source: GetTextFromProduct({ message: feature?.properties?.description, find: [`SOURCE...`], removal: [`.`]}) ?? null,
-                    hazards: GetTextFromProduct({ message: feature?.properties?.description, find: [`HAZARD...`], removal: [`.`]}) ?? null,
-                    impacts: GetTextFromProduct({ message: feature?.properties?.description, find: [`IMPACT...`], removal: [`.`]}) ?? null,
+                    source: GetTextFromProduct({ Message: feature?.properties?.description, Find: [`SOURCE...`], Removal: [`.`]}) ?? null,
+                    hazards: GetTextFromProduct({ Message: feature?.properties?.description, Find: [`HAZARD...`], Removal: [`.`]}) ?? null,
+                    impacts: GetTextFromProduct({ Message: feature?.properties?.description, Find: [`IMPACT...`], Removal: [`.`]}) ?? null,
                     estimated_hail_size: feature?.properties?.parameters?.maxHailSize?.[0] ?? null,
                     estimated_wind_gusts: feature?.properties?.parameters?.maxWindGust?.[0] ?? null,
                     damage_threat: feature?.properties?.parameters?.thunderstormDamageThreat?.[0] ?? null,
@@ -73,33 +78,33 @@ export const ParseAPI = async (stanza: TypeStanzaCompiled): Promise<void> => {
                     hail_threat: feature?.properties?.parameters?.hailThreat?.[0] ?? 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,
+                    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: (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_number: (VTEC?.[0]?.Watch) && (GetTextFromProduct({ Message: feature?.properties?.description, Find: [`ITIES FOR`, `UPDATE FOR`, `Watch Number `], Removal: [`%`, `<`, `:`] })?.replace(/(WT|WS|)/g, '')?.trim()?.toString()?.padStart(4, "0") ?? VTEC?.[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,
-                    severe_wind_probability: GetTextFromProduct({ message: feature?.properties?.description, find: [`PROB OF 10 OR MORE SEVERE WIND EVENTS`], removal: [`%`, `<`, `:`] }) ?? null,
-                    severe_hail_probability: GetTextFromProduct({ message: feature?.properties?.description, find: [`PROB OF 10 OR MORE SEVERE HAIL EVENTS`], removal: [`%`, `<`, `:`] }) ?? null,
-                    hail_2in_probability: GetTextFromProduct({ message: feature?.properties?.description, find: [`PROB OF 1 OR MORE HAIL EVENTS >= 2 INCHES`], removal: [`%`, `<`, `:`] }) ?? null,
-                    combined_hail_wind_probability: GetTextFromProduct({ message: feature?.properties?.description, find: [`PROB OF 6 OR MORE COMBINED SEVERE HAIL/WIND EVENTS`], removal: [`%`, `<`, `:`] }) ?? null,
-                    max_hail_in: GetTextFromProduct({ message: feature?.properties?.description, find: [`MAX HAIL /INCHES/`], removal: [`%`, `<`, `:`] }) ?? null,
-                    max_wind_surface:  GetTextFromProduct({ message: feature?.properties?.description, find: [`MAX WIND GUSTS SURFACE /KNOTS/`], removal: [`%`, `<`, `:`] }) ?? null,
-                    max_tops_x100feet:  GetTextFromProduct({ message: feature?.properties?.description, find: [`MAX TOPS /X 100 FEET/`], removal: [`%`, `<`, `:`] }) ?? null,
-                    pds_watch: (GetTextFromProduct({ message: feature?.properties?.description, find: [`PARTICULARLY DANGEROUS SITUATION`], removal: [`%`, `<`, `:`] }) === `YES`)
+                    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,
+                    severe_wind_probability: GetTextFromProduct({ Message: feature?.properties?.description, Find: [`PROB OF 10 OR MORE SEVERE WIND EVENTS`], Removal: [`%`, `<`, `:`] }) ?? null,
+                    severe_hail_probability: GetTextFromProduct({ Message: feature?.properties?.description, Find: [`PROB OF 10 OR MORE SEVERE HAIL EVENTS`], Removal: [`%`, `<`, `:`] }) ?? null,
+                    hail_2in_probability: GetTextFromProduct({ Message: feature?.properties?.description, Find: [`PROB OF 1 OR MORE HAIL EVENTS >= 2 INCHES`], Removal: [`%`, `<`, `:`] }) ?? null,
+                    combined_hail_wind_probability: GetTextFromProduct({ Message: feature?.properties?.description, Find: [`PROB OF 6 OR MORE COMBINED SEVERE HAIL/WIND EVENTS`], Removal: [`%`, `<`, `:`] }) ?? null,
+                    max_hail_in: GetTextFromProduct({ Message: feature?.properties?.description, Find: [`MAX HAIL /INCHES/`], Removal: [`%`, `<`, `:`] }) ?? null,
+                    max_wind_surface:  GetTextFromProduct({ Message: feature?.properties?.description, Find: [`MAX WIND GUSTS SURFACE /KNOTS/`], Removal: [`%`, `<`, `:`] }) ?? null,
+                    max_tops_x100feet:  GetTextFromProduct({ Message: feature?.properties?.description, Find: [`MAX TOPS /X 100 FEET/`], Removal: [`%`, `<`, `:`] }) ?? null,
+                    pds_watch: (GetTextFromProduct({ Message: feature?.properties?.description, Find: [`PARTICULARLY DANGEROUS SITUATION`], Removal: [`%`, `<`, `:`] }) === `YES`)
                 },
                 metadata: {
                     ms: performance.now() - tick,
                     source: `events.api`,
-                    tracking: GetEventTracking({ type: `API`, organization: { wmoidentifier: feature?.properties?.parameters?.WMOidentifier?.[0], featureId: feature?.id}, vtec: pVtec?.[0]}),
+                    tracking: GetEventTracking({ Type: `API`, WMO: { Identifier: feature?.properties?.parameters?.WMOidentifier?.[0], ID: feature?.id}, VTEC: VTEC?.[0]}),
                     header: `ZCZC-ATMOSX-${feature?.properties?.parameters?.WMOidentifier}`,
-                    vtec: pVtec?.[0],
+                    vtec: VTEC?.[0],
                     hvtec: null,
                     raw: feature?.properties?.description,
                     history: [
@@ -112,6 +117,6 @@ export const ParseAPI = async (stanza: TypeStanzaCompiled): Promise<void> => {
                 }
             }
         })
-        SetDebug({ title: `ParseAPI`, message: `${Math.round(performance.now() - tick)}ms` })
+        SetDebug({ Title: `ParseAPI`, Message: `${Math.round(performance.now() - tick)}ms` })
     }
 }