@atmosx/event-product-parser 3.0.4 → 3.0.6

package/src/@modules/@xmpp/{xmpp.xOnline.ts → OnlineXMPP.ts}

@@ -16,12 +16,12 @@
     Internal Package: @atmosx/event-product-parser
 
 */
-import { xml } from '@xmpp/client'
+
 import { bootstrap } from "../../bootstrap";
-import { setSleep } from "../@utilities/utilities.setSleep";
-import { setEventEmit } from '../@utilities/utilities.setEventEmit';
+import { SetEventEmit } from '../@utilities/SetEventEmit';
+import { xml } from '@xmpp/client'
 
-export const xOnline = () => {
+export const OnlineXMPP = () => {
     const settings = bootstrap.settings;
     bootstrap.session_xmpp.on(`online`, async (address: string) => {
         bootstrap.cache.sigHault = false;
@@ -32,7 +32,7 @@ export const xOnline = () => {
             to: `nwws@conference.nwws-oi.weather.gov/${nickname}`,
             xmlns: 'http://jabber.org/protocol/muc',
         }))
-        setEventEmit({
+        SetEventEmit({
             event: `onServiceStatus`,
             metadata: {
                 message: `Succesfully connected to NOAA Weather Wire Service as "${nickname}"`,
@@ -40,6 +40,7 @@ export const xOnline = () => {
                 type: `online`,
                 error: false
             },
+            message: `Succesfully connected to NOAA Weather Wire Service as "${nickname}"`,
         })
     })
 }

package/src/@modules/@xmpp/{xmpp.xReconnect.ts → ReconnectXMPP.ts}

@@ -17,16 +17,16 @@
 
 */
 
-import { TypeSettings } from "../../@types/types.settings";
+import { TypeSettings } from "../../@types/Settings";
 import { bootstrap } from "../../bootstrap"
-import { setEventEmit } from "../@utilities/utilities.setEventEmit";
-import { setWarning } from "../@utilities/utilities.setWarning";
+import { SetEventEmit } from "../@utilities/SetEventEmit";
+import { SetWarning } from "../@utilities/SetWarning";
 
-export const xReconnect = async (interval: number): Promise<void> => {
+export const ReconnectXMPP = async (interval: number): Promise<void> => {
     const settings = bootstrap.settings as TypeSettings;
     const lastStanza = Date.now() - bootstrap.cache.lastStanza
     if (interval < 15) { 
-        setWarning({ message: `Reconnection Interval of ${interval} seconds is too low, setting to 15 seconds` })
+        SetWarning({ message: `Reconnection interval of ${interval} seconds is too low, setting to 15 seconds` })
         interval = 15;
         bootstrap.settings.NOAAWeatherWireServiceSettings.ReconnectionSettings.ReconnectionInterval = 15;
     }
@@ -40,7 +40,7 @@ export const xReconnect = async (interval: number): Promise<void> => {
             bootstrap.cache.isConnected = false;
             bootstrap.cache.tReconnects += 1;
             try { 
-                setEventEmit({
+                SetEventEmit({
                     event: `onServiceStatus`,
                     metadata: {
                         message: `Attempting to reconnect to XMPP Service (Reconnect Attempt ${bootstrap.cache.tReconnects})`,
@@ -50,12 +50,12 @@ export const xReconnect = async (interval: number): Promise<void> => {
                         },
                         type: `reconnect`,
                         error: true
-                    },
+                    }, message: `Attempting to reconnect to XMPP Service (Reconnect Attempt ${bootstrap.cache.tReconnects})`,
                 })
                 await bootstrap.session_xmpp.stop().catch(() => {});
                 await bootstrap.session_xmpp.start().catch(() => {});
             } catch (error) {
-                setWarning({ message: `XMPP Reconnect Failed - ${(error as Error).message}` })
+                SetWarning({ message: `XMPP Reconnect Failed - ${(error as Error).message}` })
             } finally { 
                 bootstrap.cache.isReconnecting = false;
             }

package/src/@modules/@xmpp/{xmpp.xStanza.ts → StanzaXMPP.ts}

@@ -17,18 +17,18 @@
 
 */
 
-import { TypeStanza } from "../../@types/types.stanza";
+import { TypeStanza } from "../../@types/Stanza";
 import { bootstrap } from "../../bootstrap";
-import { validate } from "../@stanza/stanza.validate";
-import { createEvent } from "../../@building/building.create";
-import { importStanza } from "../@database/database.stanza";
-import { setEventEmit } from "../@utilities/utilities.setEventEmit";
+import { ValidateStanza } from "../@stanza/ValidateStanza";
+import { CreateEvent } from "../../@building/CreateEvent";
+import { ImportStanza } from "../@database/ImportStanza";
+import { SetEventEmit } from "../@utilities/SetEventEmit";
 
-export const xStanza = () => {
+export const StanzaXMPP = () => {
     bootstrap.session_xmpp.on(`stanza`, async (stanza: TypeStanza) => {
         const msgFrom = stanza?.attrs?.from ?? ``
         const msgType = stanza?.attrs?.type ?? ``
-        setEventEmit({
+        SetEventEmit({
             event: `onServiceStatus`,
             metadata: {
                 message: stanza,
@@ -38,18 +38,18 @@ export const xStanza = () => {
         })
         bootstrap.cache.lastStanza = Date.now();
         if (stanza.is(`message`)) {
-            const result = validate({ stanza });
+            const result = ValidateStanza({ stanza });
             const isSkippable = result.isIgnored ||
                 (result.isCapEvent) ||
                 (result.isCapEvent && !result.isCapAreaDescription)
             if (isSkippable) { return; }
-            await createEvent(result);
-            await importStanza(result);
+            await CreateEvent(result);
+            await ImportStanza(result);
         }
         if (stanza.is(`presence`) && msgFrom.startsWith('nwws@conference.nwws-oi.weather.gov/')) {
             const getOccupant = msgFrom.split(`/`).slice(1).join(`/`)
             const getAvailability = msgType === `unavailable`
-            setEventEmit({
+            SetEventEmit({
                 event: `onServiceStatus`,
                 metadata: {
                     message: `Occupant ${getOccupant} has ${getAvailability ? `left` : `joined`} the room`,

package/src/@parsers/@hvtec/{hvtec.extract.ts → HVExtract.ts}

@@ -17,23 +17,23 @@
 
 */
 
-import { TypeHVTEC } from "../../@types/types.hvtec";
-import { eventCauses } from "../../@dictionaries/dictionaries.eventCauses";
-import { eventRecords } from "../../@dictionaries/dictionaries.eventRecords";
-import { regExp } from "../../@dictionaries/dictionaries.regExp";
-import { eventSeverity } from "../../@dictionaries/dictionaries.eventSeverity";
+import { TypeHVTEC } from "../../@types/HVTEC";
+import { EnumCauses } from "../../@enums/Causes";
+import { EnumRecords } from "../../@enums/Records";
+import { EnumExpressions } from "../../@enums/Expressions";
+import { EnumSeverity } from "../../@enums/Severity";
 
-export const hvExtract = (message: string): TypeHVTEC[] | null => {
-    const getHVTECs = message.match(regExp.hvtec) ?? [];
+export const HVExtract = (message: string): TypeHVTEC[] | null => {
+    const getHVTECs = message.match(EnumExpressions.hvtec) ?? [];
     const vtecs: TypeHVTEC[] = [];
     for (const vtec of getHVTECs) {
         const sub = vtec.split(`.`);
         if (sub.length < 7) continue;
         vtecs.push({
             hvtec: vtec,
-            severity: eventSeverity[sub[1]],
-            cause: eventCauses[sub[2]],
-            record: eventRecords[sub[6]]
+            severity: EnumSeverity[sub[1]],
+            cause: EnumCauses[sub[2]],
+            record: EnumRecords[sub[6]]
         })
     }
     return vtecs.length > 0 ? vtecs : null;

package/src/@parsers/@pvtec/{pvtec.expires.ts → GetExpiry.ts}

@@ -17,7 +17,7 @@
 
 */
 
-export const getExpiry = (dates: string[]): string => {
+export const GetExpiry = (dates: string[]): string => {
     if (dates?.[1] == `000000T0000Z`) return 'Invalid Date Format'
     const expires = `${new Date().getFullYear().toString().substring(0, 2)}${dates[1].substring(0, 2)}-${dates[1].substring(2, 4)}-${dates[1].substring(4, 6)}T${dates[1].substring(7, 9)}:${dates[1].substring(9, 11)}:00`;
     const local = new Date(new Date(expires).getTime() - 4 * 60 * 60000);

package/src/@parsers/@pvtec/{pvtec.extract.ts → VTECExtract.ts}

@@ -17,16 +17,17 @@
 
 */
 
-import { TypePVTEC } from "../../@types/types.pvtec";
-import { regExp } from "../../@dictionaries/dictionaries.regExp";
-import { eventProducts } from "../../@dictionaries/dictionaries.eventProducts";
-import { eventTypes } from "../../@dictionaries/dictionaries.eventTypes";
-import { eventActions } from "../../@dictionaries/dictionaries.eventActions";
-import { eventStatus } from "../../@dictionaries/dictionaries.eventStatus";
-import { getExpiry } from "./pvtec.expires";
+import { TypePVTEC } from "../../@types/VTEC";
+import { EnumExpressions } from "../../@enums/Expressions";
+import { EnumProducts } from "../../@enums/Products";
+import { EnumEvents } from "../../@enums/Events";
+import { EnumActions } from "../../@enums/Actions";
+import { EnumStatus } from "../../@enums/Status";
+import { GetExpiry } from "./GetExpiry";
 
-export const pvExtract = (message: string): TypePVTEC[] | null => {
-    const getVTECs = message.match(regExp.pvtec) ?? [];
+export const VTECExtract = (message: string): TypePVTEC[] | null => {
+    if (!message) return null;
+    const getVTECs = message.match(EnumExpressions.pvtec) ?? [];
     const vtecs: TypePVTEC[] = [];
     for (const vtec of getVTECs) {
         const sub = vtec.split(`.`);
@@ -34,15 +35,14 @@ export const pvExtract = (message: string): TypePVTEC[] | null => {
         const dates = sub[6]?.split(`-`);
         vtecs.push({
             vtec: vtec,
-            product: eventProducts[sub[0]],
-            tracking: `${sub[2]}-${sub[3]}-${sub[4]}-${sub[5]}`,
-            event: `${eventTypes[sub[3]]} ${eventActions[sub[4]]}`,
-            status: eventStatus[sub[1]],
-            organization: message.match(regExp.wmo)?.[0] ?? null,
-            expires: getExpiry(dates),
+            product: EnumProducts[sub[0]],
+            tracking: `${sub[2]}.${sub[3]}.${sub[4]}.${sub[5]}`,
+            event: `${EnumEvents[sub[3]]} ${EnumActions[sub[4]]}`,
+            status: EnumStatus[sub[1]],
+            organization: message.match(EnumExpressions.wmo)?.[0] ?? null,
+            expires: GetExpiry(dates),
             is_watch: (sub[4] == `A` || sub[4] == `Y`) && (sub[3] == `TO` || sub[3] == `SV`),
-            prediction_center: sub[2] == `KWNS`
-            ? true : false
+            prediction_center: sub[2] == `KWNS` ? true : false
         })
     }
     return vtecs.length > 0 ? vtecs : null;

package/src/@parsers/@text/{text.getDescriptionFromProduct.ts → GetDescriptionFromProduct.ts}

@@ -17,21 +17,28 @@
 
 */
 
-import { regExp } from "../../@dictionaries/dictionaries.regExp";
+import { EnumExpressions } from "../../@enums/Expressions";
 
 interface GetDescriptionFromProductOptions { 
     message: string
     handle?: string
 }
 
-export const getDescriptionFromProduct = (options: GetDescriptionFromProductOptions): string => {
+export const GetDescriptionFromProduct = (options: GetDescriptionFromProductOptions): string => {
     let message = options.message;
-    const dates = Array.from(message.matchAll(regExp.dateline));
+    const predefinedEndMarkers = ['&&', 'LAT...'];
+    const getEndIndex = (text: string, fromIndex = 0): number => {
+        const indices = predefinedEndMarkers
+            .map((marker) => text.indexOf(marker, fromIndex))
+            .filter((idx) => idx !== -1);
+        return indices.length ? Math.min(...indices) : -1;
+    };
+    const dates = Array.from(message.matchAll(EnumExpressions.dateline));
     if (dates.length) {
         const lastMatch = dates[dates.length - 1][0];
         const sIndx = message.lastIndexOf(lastMatch);
         if (sIndx !== -1) {
-            const endIndx = message.indexOf('&&', sIndx);
+            const endIndx = getEndIndex(message, sIndx);
             message = message.substring(sIndx + lastMatch.length, endIndx !== -1 ? endIndx : undefined).trimStart();
             if (message.startsWith('/')) message = message.slice(1).trimStart();
             if (options.handle && message.includes(options.handle)) {
@@ -45,7 +52,7 @@ export const getDescriptionFromProduct = (options: GetDescriptionFromProductOpti
         if (handleIndx !== -1) {
             let afterHandle = message.substring(handleIndx + options.handle.length).trimStart();
             if (afterHandle.startsWith('/')) afterHandle = afterHandle.slice(1).trimStart();
-            const latEnd = afterHandle.indexOf('&&')
+            const latEnd = getEndIndex(afterHandle);
             message = latEnd !== -1 ? afterHandle.substring(0, latEnd).trim() : afterHandle.trim();
         }
     }

package/src/@parsers/@text/GetEmbededText.ts

@@ -0,0 +1,56 @@
+/*
+              _                             _               _     __   __
+         /\  | |                           | |             (_)    \ \ / /
+        /  \ | |_ _ __ ___   ___  ___ _ __ | |__   ___ _ __ _  ___ \ 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"
+
+export const GetEmebedText = (event: TypeEvent): string => {
+    const line = (label: string, value: unknown, condition = true) => condition && value ? `${label} ${value}` : null;
+    const isStatement = event.properties.status_metadata.is_statement;
+    const isExpired = event.properties.status_metadata.is_expired;
+    return [
+        line(`**Locations:**`, event?.properties?.locations?.slice(0, 100)),
+        line(`**Issued:**`, `<t:${Math.floor(new Date(event.properties.issued).getTime() / 1000)}:R>`, !isExpired),
+        line(`**Expires:**`, `<t:${Math.floor(new Date(event.properties.expires).getTime() / 1000)}:R>`, !isStatement),
+        line(`**Damage Threat:**`, event?.properties?.parameters?.damage_threat, !isExpired),
+        line(`**Flood Threat:**`, event?.properties?.parameters?.flood_threat, !isExpired),
+        line(`**Tornado Threat:**`, event?.properties?.parameters?.tornado_threat, !isExpired),
+        line(`**Estimated Wind Gusts:**`, `${event?.properties?.parameters?.estimated_wind_gusts} ${event?.properties?.parameters?.wind_threat ? ` (${event?.properties?.parameters?.wind_threat})` : ''}`, !isExpired && event?.properties?.parameters?.estimated_wind_gusts != null),
+        line(`**Estimated Hail Size:**`, `${event?.properties?.parameters?.estimated_hail_size} ${event?.properties?.parameters?.hail_threat ? ` (${event?.properties?.parameters?.hail_threat})` : ''}`, !isExpired && event?.properties?.parameters?.estimated_hail_size != null),
+        line(`**Discussion:**`, event?.properties?.discussion_parameters?.discussion_number, !isExpired),
+        line(`**Concern:**`, event?.properties?.discussion_parameters?.discussion_concerning, !isExpired),
+        line(`**SPC Max Tornado Threat:**`, event?.properties?.discussion_parameters?.discussion_max_tornado, !isExpired),
+        line(`**SPC Max Hail Threat:**`, event?.properties?.discussion_parameters?.discussion_max_hail, !isExpired),
+        line(`**SPC Max Wind Threat:**`, event?.properties?.discussion_parameters?.discussion_max_wind, !isExpired),
+        line(`**SPC Watch Issuance Probability:**`, event?.properties?.discussion_parameters?.discussion_watch_issuance ? `${event?.properties?.discussion_parameters?.discussion_watch_issuance}%` : null, !isExpired),
+        line(`**Watch Number:**`, event?.properties?.watch_parameters?.watch_number, !isExpired),
+        line(`**Strong Tornadoes Probability:**`, event?.properties?.watch_parameters?.strong_tornadoes_probability ? `${event?.properties?.watch_parameters?.strong_tornadoes_probability}%` : null, !isExpired),
+        line(`**Additional Tornadoes Probability:**`, event?.properties?.watch_parameters?.additional_tornadoes_probability ? `${event?.properties?.watch_parameters?.additional_tornadoes_probability}%` : null, !isExpired),
+        line(`**Combined Hail/Wind Probability:**`, event?.properties?.watch_parameters?.combined_hail_wind_probability ? `${event?.properties?.watch_parameters?.combined_hail_wind_probability}%` : null, !isExpired),
+        line(`**Severe Hail Probability:**`, event?.properties?.watch_parameters?.severe_hail_probability ? `${event?.properties?.watch_parameters?.severe_hail_probability}%` : null, !isExpired),
+        line(`**Hail >2in Probability:**`, event?.properties?.watch_parameters?.hail_2in_probability ? `${event?.properties?.watch_parameters?.hail_2in_probability}%` : null, !isExpired),
+        line(`**Max Hail Inches:**`, event?.properties?.watch_parameters?.max_hail_in, !isExpired),
+        line(`**Severe Wind Probability:**`, event?.properties?.watch_parameters?.severe_wind_probability ? `${event?.properties?.watch_parameters?.severe_wind_probability}%` : null, !isExpired),
+        line(`**Max Surface Wind:**`, event?.properties?.watch_parameters?.max_wind_surface, !isExpired),
+        line(`**Max Tops (x100 feet):**`, event?.properties?.watch_parameters?.max_tops_x100feet, !isExpired), 
+        line(`**Tags:**`, event?.properties?.parameters?.tags?.length > 0 ? event?.properties?.parameters?.tags.join(', ') : null, !isExpired),
+        line(`**Sender:**`, event?.properties?.geocode?.office?.name ? `${event?.properties?.geocode?.office?.name} (${event?.properties?.geocode?.office?.office})` : event?.properties?.geocode?.office?.office),
+        line(`**Tracking:**`, event?.properties?.metadata?.tracking),
+        line(`**Logs:**`, event?.properties?.metadata?.history?.length > 0 ? event?.properties?.metadata?.history.length : null),
+    ].filter(Boolean).join('\n');
+}

package/src/@parsers/@text/{text.getPolygonFromProduct.ts → GetPolygonFromProduct.ts}

@@ -18,15 +18,36 @@
 */
 
 export const getPolygonFromProduct = (message: string): number[][] => {
-    const coordinates: [number, number][] = [];
-    const match = message.match(/LAT\.{3}LON\s+([\d\s]+)/i);
-    if (!match || !match[1]) return coordinates;
-    const coordStrings = match[1].replace(/\n/g, ' ').trim().split(/\s+/);
-    for (let i = 0; i < coordStrings.length - 1; i += 2) {
-        const lat = parseFloat(coordStrings[i]) / 100;
-        const lon = -parseFloat(coordStrings[i + 1]) / 100;
-        if (!isNaN(lat) && !isNaN(lon)) { coordinates.push([lon, lat]); }
+    const coordinates: number[][] = [];
+    const match = message.match(
+        /LAT\.\.\.LON\s+([\s\S]*?)(?=\n[A-Z]{2,}(?:\.\.\.|:)|\$\$|&&|$)/i
+    );
+    if (!match) return coordinates;
+    const text = match[1];
+    const values = text.match(/\d{4,8}/g);
+    if (!values) return coordinates;
+
+    if (values.every(v => v.length === 8)) {
+        for (const value of values) {
+            const lat = parseInt(value.slice(0, 4), 10) / 100;
+            const lon = -parseInt(value.slice(4, 8), 10) / 100;
+            if (Number.isFinite(lat) && Number.isFinite(lon)) {
+                coordinates.push([lon, lat]);
+            }
+        }
+    }
+
+    else {
+        for (let i = 0; i + 1 < values.length; i += 2) {
+            const lat = parseInt(values[i], 10) / 100;
+            const lon = -parseInt(values[i + 1], 10) / 100;
+            if (Number.isFinite(lat) && Number.isFinite(lon)) {
+                coordinates.push([lon, lat]);
+            }
+        }
+    }
+    if (coordinates.length > 2) {
+        coordinates.push([...coordinates[0]]);
     }
-    if (coordinates.length > 2) { coordinates.push(coordinates[0]); }
     return coordinates;
-}
+};

package/src/@parsers/@text/GetStringText.ts

@@ -0,0 +1,58 @@
+/*
+              _                             _               _     __   __
+         /\  | |                           | |             (_)    \ \ / /
+        /  \ | |_ _ __ ___   ___  ___ _ __ | |__   ___ _ __ _  ___ \ 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 { TypeSettings } from "../../@types/Settings";
+import { bootstrap } from "../../bootstrap";
+
+export const GetStringText = (event: TypeEvent): string => {
+    const settings = bootstrap.settings as TypeSettings;
+    const timezone = settings.NotifyServer.Timezone ?? `UTC`;
+    const line = (label: string, value: unknown, condition = true) => condition && value ? `${label} ${value}` : null;
+    const isStatement = event.properties.status_metadata.is_statement;
+    const isExpired = event.properties.status_metadata.is_expired;
+    return [
+        line(`Locations:`, event?.properties?.locations?.slice(0, 100)),
+        line(`Issued:`, `${new Date(event.properties.issued).toLocaleString([], { timeZone: timezone })} (${(timezone.replace(`America/`, ``))})`, !isExpired),
+        line(`Expires:`, `${new Date(event.properties.expires).toLocaleString([], { timeZone: timezone })} (${(timezone.replace(`America/`, ``))})`, !isStatement),
+        line(`Damage Threat:`, event?.properties?.parameters?.damage_threat, !isExpired),
+        line(`Flood Threat:`, event?.properties?.parameters?.flood_threat, !isExpired),
+        line(`Tornado Threat:`, event?.properties?.parameters?.tornado_threat, !isExpired),
+        line(`Estimated Wind Gusts:`, `${event?.properties?.parameters?.estimated_wind_gusts} ${event?.properties?.parameters?.wind_threat ? ` (${event?.properties?.parameters?.wind_threat})` : ''}`, !isExpired && event?.properties?.parameters?.estimated_wind_gusts != null),
+        line(`Estimated Hail Size:`, `${event?.properties?.parameters?.estimated_hail_size} ${event?.properties?.parameters?.hail_threat ? ` (${event?.properties?.parameters?.hail_threat})` : ''}`, !isExpired && event?.properties?.parameters?.estimated_hail_size != null),
+        line(`Discussion:`, event?.properties?.discussion_parameters?.discussion_number, !isExpired),
+        line(`Concern:`, event?.properties?.discussion_parameters?.discussion_concerning, !isExpired),
+        line(`SPC Max Tornado Threat:`, event?.properties?.discussion_parameters?.discussion_max_tornado, !isExpired),
+        line(`SPC Max Hail Threat:`, event?.properties?.discussion_parameters?.discussion_max_hail, !isExpired),
+        line(`SPC Max Wind Threat:`, event?.properties?.discussion_parameters?.discussion_max_wind, !isExpired),
+        line(`SPC Watch Issuance Probability:`, event?.properties?.discussion_parameters?.discussion_watch_issuance ? `${event?.properties?.discussion_parameters?.discussion_watch_issuance}%` : null, !isExpired),
+        line(`Watch Number:`, event?.properties?.watch_parameters?.watch_number, !isExpired),
+        line(`Strong Tornadoes Probability:`, event?.properties?.watch_parameters?.strong_tornadoes_probability ? `${event?.properties?.watch_parameters?.strong_tornadoes_probability}%` : null, !isExpired),
+        line(`Additional Tornadoes Probability:`, event?.properties?.watch_parameters?.additional_tornadoes_probability ? `${event?.properties?.watch_parameters?.additional_tornadoes_probability}%` : null, !isExpired),
+        line(`Combined Hail/Wind Probability:`, event?.properties?.watch_parameters?.combined_hail_wind_probability ? `${event?.properties?.watch_parameters?.combined_hail_wind_probability}%` : null, !isExpired),
+        line(`Severe Hail Probability:`, event?.properties?.watch_parameters?.severe_hail_probability ? `${event?.properties?.watch_parameters?.severe_hail_probability}%` : null, !isExpired),
+        line(`Hail >2in Probability:`, event?.properties?.watch_parameters?.hail_2in_probability ? `${event?.properties?.watch_parameters?.hail_2in_probability}%` : null, !isExpired),
+        line(`Max Hail Inches:`, event?.properties?.watch_parameters?.max_hail_in, !isExpired),
+        line(`Severe Wind Probability:`, event?.properties?.watch_parameters?.severe_wind_probability ? `${event?.properties?.watch_parameters?.severe_wind_probability}%` : null, !isExpired),
+        line(`Max Surface Wind:`, event?.properties?.watch_parameters?.max_wind_surface, !isExpired),
+        line(`Max Tops (x100 feet):`, event?.properties?.watch_parameters?.max_tops_x100feet, !isExpired), 
+        line(`Sender:`, event?.properties?.geocode?.office?.name ? `${event?.properties?.geocode?.office?.name} (${event?.properties?.geocode?.office?.office})` : event?.properties?.geocode?.office?.office),
+        line(`Tracking:`, event?.properties?.metadata?.tracking),
+    ].filter(Boolean).join('\n');
+}

package/src/@parsers/@text/{text.getTextFromProduct.ts → GetTextFromProduct.ts}

@@ -24,7 +24,7 @@ interface GetTextFromProductOptions {
     removal?: string[]
 }
 
-export const getTextFromProduct = (options: GetTextFromProductOptions): string => {
+export const GetTextFromProduct = (options: GetTextFromProductOptions): string => {
     const lines = options.message.split(`\n`);
     for (const line of lines) {
         const matchedFind = options.find.find((find) => line.includes(find));

package/src/@parsers/@text/{text.getXML.ts → GetXML.ts}

@@ -22,7 +22,7 @@ interface GetXMLOptions {
     targets: string[]
 }
 
-export const getXML = (options: GetXMLOptions): Record<string, string> => {
+export const GetXML = (options: GetXMLOptions): Record<string, string> => {
     const extracted: Record<string, any> = {};   
     const findValueByKey = (obj: any, searchKey: string) => {
         const results = [];

package/src/@parsers/@ugc/GetCache.ts

@@ -0,0 +1,24 @@
+/*
+              _                             _               _     __   __
+         /\  | |                           | |             (_)    \ \ / /
+        /  \ | |_ _ __ ___   ___  ___ _ __ | |__   ___ _ __ _  ___ \ 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";
+
+export const getCache = (key: string) => {
+    return bootstrap.cache.ugc.get(key);
+};

package/src/@parsers/@ugc/{ugc.expiry.ts → GetExpiry.ts}

@@ -17,7 +17,7 @@
 
 */
 
-export const getExpiry = (message: string): string | null => {
+export const GetExpiry = (message: string): string | null => {
     const match = message.match(/\b(\d{6})-/);
     if (!match) { 
         return null;

package/src/@parsers/@ugc/{ugc.locations.ts → GetLocations.ts}

@@ -18,12 +18,40 @@
 */
 
 import { bootstrap } from "../../bootstrap";
+import { getCache } from "./GetCache";
+import { setCache } from "./SetCache";
 
 export const getLocations = async (zones: string[]): Promise<string[]> => {
-    const sites = Array.from(new Set(zones));
-    const placeholders = sites.map(() => '?').join(',');
-    const rows = await bootstrap.database
-        .prepare(`SELECT id, location FROM shapefiles WHERE id IN (${placeholders})`)
-        .all(...sites)
-    return rows.map((row: any) => row.location).sort();
-}
+    const uniqueZones = Array.from(new Set(zones));
+
+    const results: string[] = [];
+    const missing: string[] = [];
+
+    for (let i = 0; i < uniqueZones.length; i++) {
+        const zone = uniqueZones[i];
+        const cached = getCache(zone);
+
+        if (cached) {
+            for (let j = 0; j < cached.length; j++) {
+                results.push(cached[j]);
+            }
+        } else {
+            missing.push(zone);
+        }
+    }
+
+    if (missing.length > 0) {
+        const rows = await bootstrap.database
+            .prepare(
+                `SELECT id, location FROM shapefiles WHERE id IN (${missing.map(() => '?').join(',')})`
+            )
+            .all(...missing);
+
+        for (let i = 0; i < rows.length; i++) {
+            const r = rows[i] as any;
+            setCache(r.id, [r.location]);
+            results.push(r.location);
+        }
+    }
+    return results;
+};

package/src/@parsers/@ugc/{ugc.header.ts → GetUGCHeader.ts}

@@ -17,12 +17,12 @@
 
 */
 
-import { regExp } from "../../@dictionaries/dictionaries.regExp"
+import { EnumExpressions } from "../../@enums/Expressions"
 
 export const getUGCHeader = (message: string): string | null => {
-    const start = message.search(regExp.ugc1)
+    const start = message.search(EnumExpressions.ugc1)
     const sub = message.substring(start)
-    const end = sub.search(regExp.ugc2)
+    const end = sub.search(EnumExpressions.ugc2)
     const fin = sub.substring(0, end)
         .replace(/\s+/g, '')
         .slice(0, -1);

package/src/@parsers/@ugc/{ugc.coordinates.ts → GetZonePolygon.ts}

@@ -16,8 +16,9 @@
     Internal Package: @atmosx/event-product-parser
 
 */
+
+import { bootstrap } from "../../bootstrap"
 import { union } from "polygon-clipping";
-import { bootstrap } from "../../bootstrap";
 
 interface CoordinatesOptions {
     zones: string[]
@@ -70,7 +71,7 @@ export const getZonePolygon = (options: CoordinatesOptions): CoordinatesResponse
         }
         if (!bestPoly || bestPoly.length === 0) return null;
         const outerRing = bestPoly[0];
-        const skip = Math.max(1, parseInt(String(bootstrap.settings.GlobalSettings.ShapefileSkipPoints), 10) || 1);
+        const skip = Math.max(1, parseInt(String(bootstrap.settings.GlobalSettings.ShapefileSkipPoints), 10) ?? 1);
         let skipped = outerRing.filter((_: any, idx: number) => idx % skip === 0);
         if (skipped.length < 4) {
             skipped = outerRing.slice();
@@ -89,7 +90,7 @@ export const getZonePolygon = (options: CoordinatesOptions): CoordinatesResponse
             }
         }
         if (multi.length === 0) return null;
-        const skip = Math.max(1, parseInt(String(bootstrap.settings.GlobalSettings.ShapefileSkipPoints), 10) || 1);
+        const skip = Math.max(1, parseInt(String(bootstrap.settings.GlobalSettings.ShapefileSkipPoints), 10) ?? 1);
         if (skip > 1) {
             for (let p = 0; p < multi.length; p++) {
                 for (let r = 0; r < multi[p].length; r++) {

package/src/@parsers/@ugc/SetCache.ts

@@ -0,0 +1,28 @@
+/*
+              _                             _               _     __   __
+         /\  | |                           | |             (_)    \ \ / /
+        /  \ | |_ _ __ ___   ___  ___ _ __ | |__   ___ _ __ _  ___ \ 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";
+
+export const setCache = (key: string, value: string[]) => {
+	if (bootstrap.cache.ugc.size >= 5000) {
+        const firstKey = bootstrap.cache.ugc.keys().next().value;
+        bootstrap.cache.ugc.delete(firstKey);
+    }
+    bootstrap.cache.ugc.set(key, value);
+};