@atmosx/event-product-parser 3.0.55 → 3.0.61

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

@@ -1,46 +1,46 @@
-/*
-              _                             _               _     __   __
-         /\  | |                           | |             (_)    \ \ / /
-        /  \ | |_ _ __ ___   ___  ___ _ __ | |__   ___ _ __ _  ___ \ 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 { setEventEmit } from '../@utilities/utilities.setEventEmit';
-import { xml } from '@xmpp/client'
-
-export const xOnline = () => {
-    const settings = bootstrap.settings;
-    bootstrap.session_xmpp.on(`online`, async (address: string) => {
-        bootstrap.cache.sigHault = false;
-        bootstrap.cache.isConnected = true;
-        bootstrap.cache.tReconnects = 0;
-        const nickname = settings.NOAAWeatherWireServiceSettings.CredentialSettings.Nickname;
-        bootstrap.session_xmpp.send(xml('presence', {
-            to: `nwws@conference.nwws-oi.weather.gov/${nickname}`,
-            xmlns: 'http://jabber.org/protocol/muc',
-        }))
-        setEventEmit({
-            event: `onServiceStatus`,
-            metadata: {
-                message: `Succesfully connected to NOAA Weather Wire Service as "${nickname}"`,
-                data: {},
-                type: `online`,
-                error: false
-            },
-            message: `Succesfully connected to NOAA Weather Wire Service as "${nickname}"`,
-        })
-    })
+/*
+              _                             _               _     __   __
+         /\  | |                           | |             (_)    \ \ / /
+        /  \ | |_ _ __ ___   ___  ___ _ __ | |__   ___ _ __ _  ___ \ 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 { SetEventEmit } from '../@utilities/SetEventEmit';
+import { xml } from '@xmpp/client'
+
+export const OnlineXMPP = () => {
+    const settings = bootstrap.settings;
+    bootstrap.session_xmpp.on(`online`, async (address: string) => {
+        bootstrap.cache.sigHault = false;
+        bootstrap.cache.isConnected = true;
+        bootstrap.cache.tReconnects = 0;
+        const nickname = settings.NOAAWeatherWireServiceSettings.CredentialSettings.Nickname;
+        bootstrap.session_xmpp.send(xml('presence', {
+            to: `nwws@conference.nwws-oi.weather.gov/${nickname}`,
+            xmlns: 'http://jabber.org/protocol/muc',
+        }))
+        SetEventEmit({
+            event: `onServiceStatus`,
+            metadata: {
+                message: `Succesfully connected to NOAA Weather Wire Service as "${nickname}"`,
+                data: {},
+                type: `online`,
+                error: false
+            },
+            message: `Succesfully connected to NOAA Weather Wire Service as "${nickname}"`,
+        })
+    })
 }

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

@@ -1,64 +1,64 @@
-/*
-              _                             _               _     __   __
-         /\  | |                           | |             (_)    \ \ / /
-        /  \ | |_ _ __ ___   ___  ___ _ __ | |__   ___ _ __ _  ___ \ 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 { TypeSettings } from "../../@types/type.settings";
-import { bootstrap } from "../../bootstrap"
-import { setEventEmit } from "../@utilities/utilities.setEventEmit";
-import { setWarning } from "../@utilities/utilities.setWarning";
-
-export const xReconnect = 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` })
-        interval = 15;
-        bootstrap.settings.NOAAWeatherWireServiceSettings.ReconnectionSettings.ReconnectionInterval = 15;
-    }
-    const reconnectThreshold = interval * 1e3
-    if ((!bootstrap.cache.isConnected && !bootstrap.cache.sigHault) || !bootstrap.session_xmpp) { 
-        return; 
-    }
-    if (lastStanza > reconnectThreshold) {
-        if (!bootstrap.cache.isReconnecting) {
-            bootstrap.cache.isReconnecting = true;
-            bootstrap.cache.isConnected = false;
-            bootstrap.cache.tReconnects += 1;
-            try { 
-                setEventEmit({
-                    event: `onServiceStatus`,
-                    metadata: {
-                        message: `Attempting to reconnect to XMPP Service (Reconnect Attempt ${bootstrap.cache.tReconnects})`,
-                        data: {
-                            last_stanza: lastStanza,
-                            nickname: settings.NOAAWeatherWireServiceSettings.CredentialSettings.Nickname
-                        },
-                        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}` })
-            } finally { 
-                bootstrap.cache.isReconnecting = false;
-            }
-        }
-    }
-}
+/*
+              _                             _               _     __   __
+         /\  | |                           | |             (_)    \ \ / /
+        /  \ | |_ _ __ ___   ___  ___ _ __ | |__   ___ _ __ _  ___ \ 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 { TypeSettings } from "../../@types/Settings";
+import { bootstrap } from "../../bootstrap"
+import { SetEventEmit } from "../@utilities/SetEventEmit";
+import { SetWarning } from "../@utilities/SetWarning";
+
+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` })
+        interval = 15;
+        bootstrap.settings.NOAAWeatherWireServiceSettings.ReconnectionSettings.ReconnectionInterval = 15;
+    }
+    const reconnectThreshold = interval * 1e3
+    if ((!bootstrap.cache.isConnected && !bootstrap.cache.sigHault) || !bootstrap.session_xmpp) { 
+        return; 
+    }
+    if (lastStanza > reconnectThreshold) {
+        if (!bootstrap.cache.isReconnecting) {
+            bootstrap.cache.isReconnecting = true;
+            bootstrap.cache.isConnected = false;
+            bootstrap.cache.tReconnects += 1;
+            try { 
+                SetEventEmit({
+                    event: `onServiceStatus`,
+                    metadata: {
+                        message: `Attempting to reconnect to XMPP Service (Reconnect Attempt ${bootstrap.cache.tReconnects})`,
+                        data: {
+                            last_stanza: lastStanza,
+                            nickname: settings.NOAAWeatherWireServiceSettings.CredentialSettings.Nickname
+                        },
+                        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}` })
+            } finally { 
+                bootstrap.cache.isReconnecting = false;
+            }
+        }
+    }
+}

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

@@ -1,63 +1,63 @@
-/*
-              _                             _               _     __   __
-         /\  | |                           | |             (_)    \ \ / /
-        /  \ | |_ _ __ ___   ___  ___ _ __ | |__   ___ _ __ _  ___ \ 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 { TypeStanza } from "../../@types/type.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";
-
-export const xStanza = () => {
-    bootstrap.session_xmpp.on(`stanza`, async (stanza: TypeStanza) => {
-        const msgFrom = stanza?.attrs?.from ?? ``
-        const msgType = stanza?.attrs?.type ?? ``
-        setEventEmit({
-            event: `onServiceStatus`,
-            metadata: {
-                message: stanza,
-                from: msgFrom,
-                type: `stanza`
-            },
-        })
-        bootstrap.cache.lastStanza = Date.now();
-        if (stanza.is(`message`)) {
-            const result = validate({ stanza });
-            const isSkippable = result.isIgnored ||
-                (result.isCapEvent) ||
-                (result.isCapEvent && !result.isCapAreaDescription)
-            if (isSkippable) { return; }
-            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({
-                event: `onServiceStatus`,
-                metadata: {
-                    message: `Occupant ${getOccupant} has ${getAvailability ? `left` : `joined`} the room`,
-                    data: {},
-                    type: `occupant`,
-                    error: false 
-                },
-            })
-        }
-    })
+/*
+              _                             _               _     __   __
+         /\  | |                           | |             (_)    \ \ / /
+        /  \ | |_ _ __ ___   ___  ___ _ __ | |__   ___ _ __ _  ___ \ 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 { TypeStanza } from "../../@types/Stanza";
+import { bootstrap } from "../../bootstrap";
+import { ValidateStanza } from "../@stanza/ValidateStanza";
+import { CreateEvent } from "../../@building/CreateEvent";
+import { ImportStanza } from "../@database/ImportStanza";
+import { SetEventEmit } from "../@utilities/SetEventEmit";
+
+export const StanzaXMPP = () => {
+    bootstrap.session_xmpp.on(`stanza`, async (stanza: TypeStanza) => {
+        const msgFrom = stanza?.attrs?.from ?? ``
+        const msgType = stanza?.attrs?.type ?? ``
+        SetEventEmit({
+            event: `onServiceStatus`,
+            metadata: {
+                message: stanza,
+                from: msgFrom,
+                type: `stanza`
+            },
+        })
+        bootstrap.cache.lastStanza = Date.now();
+        if (stanza.is(`message`)) {
+            const result = ValidateStanza({ stanza });
+            const isSkippable = result.isIgnored ||
+                (result.isCapEvent) ||
+                (result.isCapEvent && !result.isCapAreaDescription)
+            if (isSkippable) { return; }
+            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({
+                event: `onServiceStatus`,
+                metadata: {
+                    message: `Occupant ${getOccupant} has ${getAvailability ? `left` : `joined`} the room`,
+                    data: {},
+                    type: `occupant`,
+                    error: false 
+                },
+            })
+        }
+    })
 }

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

@@ -1,40 +1,40 @@
-/*
-              _                             _               _     __   __
-         /\  | |                           | |             (_)    \ \ / /
-        /  \ | |_ _ __ ___   ___  ___ _ __ | |__   ___ _ __ _  ___ \ 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 { TypeHVTEC } from "../../@types/type.hvtec";
-import { dict_causes } from "../../@dictionaries/dictionaries.causes";
-import { dict_records } from "../../@dictionaries/dictionaries.records";
-import { dict_expressions } from "../../@dictionaries/dictionaries.expressions";
-import { dict_severity } from "../../@dictionaries/dictionaries.severity";
-
-export const hvExtract = (message: string): TypeHVTEC[] | null => {
-    const getHVTECs = message.match(dict_expressions.hvtec) ?? [];
-    const vtecs: TypeHVTEC[] = [];
-    for (const vtec of getHVTECs) {
-        const sub = vtec.split(`.`);
-        if (sub.length < 7) continue;
-        vtecs.push({
-            hvtec: vtec,
-            severity: dict_severity[sub[1]],
-            cause: dict_causes[sub[2]],
-            record: dict_records[sub[6]]
-        })
-    }
-    return vtecs.length > 0 ? vtecs : null;
+/*
+              _                             _               _     __   __
+         /\  | |                           | |             (_)    \ \ / /
+        /  \ | |_ _ __ ___   ___  ___ _ __ | |__   ___ _ __ _  ___ \ 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 { 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(EnumExpressions.hvtec) ?? [];
+    const vtecs: TypeHVTEC[] = [];
+    for (const vtec of getHVTECs) {
+        const sub = vtec.split(`.`);
+        if (sub.length < 7) continue;
+        vtecs.push({
+            hvtec: vtec,
+            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}

@@ -1,26 +1,26 @@
-/*
-              _                             _               _     __   __
-         /\  | |                           | |             (_)    \ \ / /
-        /  \ | |_ _ __ ___   ___  ___ _ __ | |__   ___ _ __ _  ___ \ 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
-
-*/
-
-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);
-    const pad = (n: number) => n.toString().padStart(2, '0');
-    return `${local.getFullYear()}-${pad(local.getMonth() + 1)}-${pad(local.getDate())}T${pad(local.getHours())}:${pad(local.getMinutes())}:00.000-04:00`;
+/*
+              _                             _               _     __   __
+         /\  | |                           | |             (_)    \ \ / /
+        /  \ | |_ _ __ ___   ___  ___ _ __ | |__   ___ _ __ _  ___ \ 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
+
+*/
+
+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);
+    const pad = (n: number) => n.toString().padStart(2, '0');
+    return `${local.getFullYear()}-${pad(local.getMonth() + 1)}-${pad(local.getDate())}T${pad(local.getHours())}:${pad(local.getMinutes())}:00.000-04:00`;
 }

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

@@ -1,49 +1,49 @@
-/*
-              _                             _               _     __   __
-         /\  | |                           | |             (_)    \ \ / /
-        /  \ | |_ _ __ ___   ___  ___ _ __ | |__   ___ _ __ _  ___ \ 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 { TypePVTEC } from "../../@types/type.pvtec";
-import { dict_expressions } from "../../@dictionaries/dictionaries.expressions";
-import { dict_products } from "../../@dictionaries/dictionaries.products";
-import { dict_events } from "../../@dictionaries/dictionaries.events";
-import { dict_actions } from "../../@dictionaries/dictionaries.actions";
-import { dict_status } from "../../@dictionaries/dictionaries.status";
-import { getExpiry } from "./pvtec.expires";
-
-export const pvExtract = (message: string): TypePVTEC[] | null => {
-    if (!message) return null;
-    const getVTECs = message.match(dict_expressions.pvtec) ?? [];
-    const vtecs: TypePVTEC[] = [];
-    for (const vtec of getVTECs) {
-        const sub = vtec.split(`.`);
-        if (sub?.length < 7) continue;
-        const dates = sub[6]?.split(`-`);
-        vtecs.push({
-            vtec: vtec,
-            product: dict_products[sub[0]],
-            tracking: `${sub[2]}.${sub[3]}.${sub[4]}.${sub[5]}`,
-            event: `${dict_events[sub[3]]} ${dict_actions[sub[4]]}`,
-            status: dict_status[sub[1]],
-            organization: message.match(dict_expressions.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
-        })
-    }
-    return vtecs.length > 0 ? vtecs : null;
+/*
+              _                             _               _     __   __
+         /\  | |                           | |             (_)    \ \ / /
+        /  \ | |_ _ __ ___   ___  ___ _ __ | |__   ___ _ __ _  ___ \ 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 { 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 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(`.`);
+        if (sub?.length < 7) continue;
+        const dates = sub[6]?.split(`-`);
+        vtecs.push({
+            vtec: vtec,
+            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
+        })
+    }
+    return vtecs.length > 0 ? vtecs : null;
 }