@atmosx/event-product-parser 3.0.621 → 3.1.0

package/src/index.ts

@@ -11,64 +11,84 @@
     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
+    Documentation: https://atmosphericx.scriptkitty.cafe/documentation
 
-    Internal Package: @atmosx/event-product-parser
+    Independent Package: @atmosx/event-product-parser
 
 */
 
-import { TypeSettings } from './@types/Settings'
-import { SetSettings } from "./@modules/@utilities/SetSettings"
-import { GetEventGeometry } from "./@building/GetEventGeometry";
-import { GetCleanedEvent } from "./@building/GetCleanedEvent"
-import { SetEventEmit } from './@modules/@utilities/SetEventEmit';
-import { SetWarning } from './@modules/@utilities/SetWarning';
-import { CreateListener } from "./@core/CreateListener"
-import { StartService } from "./@core/StartService"
-import { StopService } from "./@core/StopService"
-import { GenerateEASMessage } from './@modules/@eas/GenerateEASMessage';
-import { SetNode } from "./@core/SetNode"
-import { GetEvents } from "./@core/GetEvents"
-import { GetNodes } from "./@core/GetNodes"
-import { ManualEvent } from "./@core/ManualEvent"
-import { GetRandomEvent } from './@core/GetRandomEvent';
-import { QueryStanza } from './@core/QueryStanza';
-import { ClearEvents } from './@core/ClearEvents';
+import { TypeSettings } from "TypesStandard/Settings"
+import { Bootstrap } from "@Bootstrap"
+import { GetEventGeometry } from "@BuilderComponents/GetEventGeometry"
+import { GetCleanedEvent } from "@BuilderComponents/GetCleanedEvent"
+import { SetSettings } from "@Utilities/SetSettings"
+import { SetEventEmit } from "@Utilities/SetEventEmit"
+import { SetWarning } from "@Utilities/SetWarning"
+import { GenerateAudioMessage } from "@Audio/GenerateAudioMessage"
+import { GenerateGraphic } from "@Image/GenerateGraphic"
+import { SetNode } from "@Exports/SetNode"
+import { GetEvents } from "@Exports/GetEvents"
+import { GetNodes } from "@Exports/GetNodes"
+import { ManualEvent } from "@Exports/ManualEvent"
+import { GetRandomEvent } from "@Exports/GetRandomEvent"
+import { QueryStanza } from "@Exports/QueryStanza"
+import { ClearEvents } from "@Exports/ClearEvents"
+import { StartService } from "@Exports/StartService"
+import { StopService } from "@Exports/StopService"
+import { GetVersion } from "@Exports/GetVersion"
+
 
 export class Manager { 
-    constructor(settings: TypeSettings) { this.trycatch(); StartService(settings) }
+    public constructor(settings: TypeSettings) { 
+        this.ErrorHandler(); StartService(settings) 
+    }
 
-    on(event: string, callback: () => void) {
-        CreateListener(event, callback)
+    public on(event: string, callback: () => void) {
+        Bootstrap.Listener.on(event, callback)
+        return () => { void Bootstrap.Listener.off(event, callback) };
     }
 
-    trycatch() {
-        process.on('uncaughtException', (err: any) => {
-            const ignored = ['ETIMEDOUT', 'ECONNRESET', 'EHOSTUNREACH', 'ENOTFOUND', 'ECONNREFUSED', 'EPIPE', 'EADDRINUSE', 'EALREADY', 'EACCES', 'EAGAIN', 'EHOSTDOWN', 'STARTTLS_FAILURE'];
-            if (ignored.includes(err?.code)) { 
+    private ErrorHandler() {
+        process.on('uncaughtException', (error: any) => {
+            const _IGNORED = [
+                'ETIMEDOUT', 
+                'ECONNRESET', 
+                'EHOSTUNREACH', 
+                'ENOTFOUND', 
+                'ECONNREFUSED', 
+                'EPIPE', 
+                'EADDRINUSE', 
+                'EALREADY', 
+                'EACCES', 
+                'EAGAIN', 
+                'EHOSTDOWN', 
+                'STARTTLS_FAILURE'
+            ];
+            if (_IGNORED.includes(error?.code)) { 
                 SetEventEmit({
-                    event: `onServiceStatus`,
-                    metadata: {
-                        message: `Ignored Critical Error: ${err?.code ?? 'Unknown error code'}. This may indicate a connection issue. Attempting to continue...`,
-                        data: {},
-                        type: `error`,
-                        error: true 
+                    Event: `onServiceStatus`,
+                    Metadata: {
+                        Message: `Ignored Critical Error: ${error?.code ?? 'Unknown error code'}. This may indicate a connection issue. Attempting to continue...`,
+                        Data: {},
+                        Type: `error`,
+                        Error: true 
                     }
                 })
-                return; 
             }
-            SetWarning({message: `Uncaught Exception: ${err instanceof Error ? err.stack ?? err.message : String(err)}`})
+            console.log(`Uncaught Exception: ${error instanceof Error ? error.stack ?? error.message : String(error)}`);
+            SetWarning({Message: `Uncaught Exception: ${error instanceof Error ? error.stack ?? error.message : String(error)}`})
         })
     }
 }
 
 export default Manager;
-export type { TypeEvent } from './@types/Event';
+export type { TypeEvent } from "TypesEvent/Event"
 export { 
     SetSettings, GetEventGeometry, ManualEvent,
     GetCleanedEvent, StopService, ClearEvents,
-    StartService, SetNode, GetRandomEvent,
-    GetEvents, GetNodes, GenerateEASMessage, QueryStanza
+    StartService, SetNode, GetRandomEvent, GetVersion,
+    GetEvents, GetNodes, GenerateAudioMessage, GenerateGraphic,
+    QueryStanza
 }
 
 

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

@@ -11,17 +11,17 @@
     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
+    Documentation: https://atmosphericx.scriptkitty.cafe/documentation
 
-    Internal Package: @atmosx/event-product-parser
+    Independent 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";
+import { TypeHVTEC } from "TypesEvent/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) ?? [];

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

@@ -11,21 +11,20 @@
     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
+    Documentation: https://atmosphericx.scriptkitty.cafe/documentation
 
-    Internal Package: @atmosx/event-product-parser
+    Independent Package: @atmosx/event-product-parser
 
 */
 
-import { EnumExpressions } from "../../@enums/Expressions";
+import { EnumExpressions } from "@Enums/Expressions"
 
 interface GetDescriptionFromProductOptions { 
-    message: string
-    handle?: string
+    Message: string
+    Handle?: string
 }
 
-export const GetDescriptionFromProduct = (options: GetDescriptionFromProductOptions): string => {
-    let message = options.message;
+export const GetDescriptionFromProduct = ({ Message, Handle }: GetDescriptionFromProductOptions): string => {
     const predefinedEndMarkers = ['&&', 'LAT...'];
     const getEndIndex = (text: string, fromIndex = 0): number => {
         const indices = predefinedEndMarkers
@@ -33,28 +32,28 @@ export const GetDescriptionFromProduct = (options: GetDescriptionFromProductOpti
             .filter((idx) => idx !== -1);
         return indices.length ? Math.min(...indices) : -1;
     };
-    const dates = Array.from(message.matchAll(EnumExpressions.dateline));
+    const dates = Array.from(Message.matchAll(EnumExpressions.dateline));
     if (dates.length) {
         const lastMatch = dates[dates.length - 1][0];
-        const sIndx = message.lastIndexOf(lastMatch);
+        const sIndx = Message.lastIndexOf(lastMatch);
         if (sIndx !== -1) {
-            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)) {
-                const handleIdx = message.indexOf(options.handle);
-                message = message.substring(handleIdx + options.handle.length).trimStart();
-                if (message.startsWith('/')) message = message.slice(1).trimStart();
+            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 (Handle && Message.includes(Handle)) {
+                const handleIdx = Message.indexOf(Handle);
+                Message = Message.substring(handleIdx + Handle.length).trimStart();
+                if (Message.startsWith('/')) Message = Message.slice(1).trimStart();
             }
         }
-    } else if (options.handle) {
-        const handleIndx = message.indexOf(options.handle);
+    } else if (Handle) {
+        const handleIndx = Message.indexOf(Handle);
         if (handleIndx !== -1) {
-            let afterHandle = message.substring(handleIndx + options.handle.length).trimStart();
+            let afterHandle = Message.substring(handleIndx + Handle.length).trimStart();
             if (afterHandle.startsWith('/')) afterHandle = afterHandle.slice(1).trimStart();
             const latEnd = getEndIndex(afterHandle);
-            message = latEnd !== -1 ? afterHandle.substring(0, latEnd).trim() : afterHandle.trim();
+            Message = latEnd !== -1 ? afterHandle.substring(0, latEnd).trim() : afterHandle.trim();
         }
     }
-    return message.trim();
+    return Message.trim();
 }

package/src/parsers/text/GetPolygonFromProduct.ts

@@ -0,0 +1,71 @@
+/*
+              _                             _               _     __   __
+         /\  | |                           | |             (_)    \ \ / /
+        /  \ | |_ _ __ ___   ___  ___ _ __ | |__   ___ _ __ _  ___ \ 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: https://atmosphericx.scriptkitty.cafe/documentation
+
+    Independent Package: @atmosx/event-product-parser
+
+*/
+
+export const GetPolygonFromProduct = (message: string): number[][] => {
+    const coordinates: number[][] = [];
+    const match = message.match(
+        /LAT\.\.\.LON\s+([\s\S]*?)(?=\n\s*(?:TIME\.\.\.MOT\.\.\.LOC|\$\$|[A-Za-z]|$))/i
+    );
+    if (!match) return coordinates;
+    const text = match[1]
+        .split(/\r?\n/).map(l => l.trim())
+        .filter(l => l && !/[A-Za-z]/.test(l))
+        .join(' ').trim();
+    if (!text) return coordinates;
+    const values = text.match(/\d{4,8}/g);
+    if (!values || values.length === 0) return coordinates;
+    const points: { lat: number; lon: number }[] = [];
+    if (values.every(v => v.length === 8)) {
+        for (const value of values) {
+            const lat = parseInt(value.slice(0, 4), 10) / 100;
+            let lon = parseInt(value.slice(4, 8), 10) / 100;
+            if (lon < 20) lon += 100;
+            points.push({ lat, lon });
+        }
+    } else if (values.every(v => v.length === 4)) {
+        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;
+            points.push({ lat, lon });
+        }
+    } else {
+        for (let i = 0; i + 1 < values.length; i += 2) {
+            const latStr = values[i];
+            const lonStr = values[i + 1];
+            if (latStr.length !== 4) continue;
+            if (lonStr.length < 4 || lonStr.length > 5) continue;
+            const lat = parseInt(latStr, 10) / 100;
+            let lon = parseInt(lonStr, 10) / 100;
+            points.push({ lat, lon });
+        }
+    }
+    if (points.length === 0) return coordinates;
+    const isEast = points.some(p => p.lon > 130 && p.lon < 180);
+    for (const p of points) {
+        const lon = isEast ? p.lon : -p.lon;
+        if (Number.isFinite(p.lat) && Number.isFinite(lon) && p.lat >= -90 && p.lat <= 90 && lon >= -180 && lon <= 180) {
+            coordinates.push([lon, p.lat]);
+        }
+    }
+    if (coordinates.length > 2 && (coordinates[0][0] !== coordinates[coordinates.length - 1][0] ||  coordinates[0][1] !== coordinates[coordinates.length - 1][1])) {
+        coordinates.push([...coordinates[0]]);
+    }
+    
+    return coordinates;
+};

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

@@ -11,32 +11,32 @@
     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
+    Documentation: https://atmosphericx.scriptkitty.cafe/documentation
 
-    Internal Package: @atmosx/event-product-parser
+    Independent Package: @atmosx/event-product-parser
 
 */
 
 interface GetTextFromProductOptions {
-    message: string
-    find: string[]
-    append?: string
-    removal?: string[]
+    Message: string
+    Find: string[]
+    Append?: string
+    Removal?: string[]
 }
 
-export const GetTextFromProduct = (options: GetTextFromProductOptions): string => {
-    const lines = options.message.split(`\n`);
+export const GetTextFromProduct = ({ Message, Find, Append, Removal }: GetTextFromProductOptions): string => {
+    const lines = Message.split(`\n`);
     for (const line of lines) {
-        const matchedFind = options.find.find((find) => line.includes(find));
+        const matchedFind = Find.find((find) => line.includes(find));
         if (matchedFind) {
             let result = line.slice(line.indexOf(matchedFind) + matchedFind.length).trim();
-            if (options.removal) {
-                for (const str of options.removal) {
+            if (Removal) {
+                for (const str of Removal) {
                     result = result.toLowerCase().split(str.toLowerCase()).join('');
                 }
                 result = result.replace(matchedFind, '').replace('<', '').trim();
             }
-            return result.toUpperCase() + (options?.append ?? ``);
+            return result.toUpperCase() + (Append ?? ``);
         }
     }
     return null;

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: https://atmosphericx.scriptkitty.cafe/documentation
+
+    Independent Package: @atmosx/event-product-parser
+
+*/
+
+import { Bootstrap } from "@Bootstrap"
+
+export const GetCache = (key: string) => {
+    return Bootstrap.Cache.UGC.get(key);
+};

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

@@ -11,9 +11,9 @@
     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
+    Documentation: https://atmosphericx.scriptkitty.cafe/documentation
 
-    Internal Package: @atmosx/event-product-parser
+    Independent Package: @atmosx/event-product-parser
 
 */
 

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

@@ -11,15 +11,15 @@
     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
+    Documentation: https://atmosphericx.scriptkitty.cafe/documentation
 
-    Internal Package: @atmosx/event-product-parser
+    Independent Package: @atmosx/event-product-parser
 
 */
 
-import { EnumExpressions } from "../../@enums/Expressions"
+import { EnumExpressions } from "@Enums/Expressions"
 
-export const getUGCHeader = (message: string): string | null => {
+export const GetHeader = (message: string): string | null => {
     const start = message.search(EnumExpressions.ugc1)
     const sub = message.substring(start)
     const end = sub.search(EnumExpressions.ugc2)

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

@@ -11,17 +11,17 @@
     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
+    Documentation: https://atmosphericx.scriptkitty.cafe/documentation
 
-    Internal Package: @atmosx/event-product-parser
+    Independent Package: @atmosx/event-product-parser
 
 */
 
-import { bootstrap } from "../../bootstrap";
-import { getCache } from "./GetCache";
-import { setCache } from "./SetCache";
+import { Bootstrap } from "@Bootstrap"
+import { GetCache } from "@ParsingUGC/GetCache"
+import { SetCache } from "@ParsingUGC/SetCache"
 
-export const getLocations = async (zones: string[]): Promise<string[]> => {
+export const GetLocations = async (zones: string[]): Promise<string[]> => {
     const uniqueZones = Array.from(new Set(zones));
 
     const results: string[] = [];
@@ -29,7 +29,7 @@ export const getLocations = async (zones: string[]): Promise<string[]> => {
 
     for (let i = 0; i < uniqueZones.length; i++) {
         const zone = uniqueZones[i];
-        const cached = getCache(zone);
+        const cached = GetCache(zone);
 
         if (cached) {
             for (let j = 0; j < cached.length; j++) {
@@ -41,7 +41,7 @@ export const getLocations = async (zones: string[]): Promise<string[]> => {
     }
 
     if (missing.length > 0) {
-        const rows = await bootstrap.database
+        const rows = await Bootstrap.Database
             .prepare(
                 `SELECT id, location FROM shapefiles WHERE id IN (${missing.map(() => '?').join(',')})`
             )
@@ -49,9 +49,9 @@ export const getLocations = async (zones: string[]): Promise<string[]> => {
 
         for (let i = 0; i < rows.length; i++) {
             const r = rows[i] as any;
-            setCache(r.id, [r.location]);
+            SetCache({ Key: r.id, Value: [r.location] });
             results.push(r.location);
         }
     }
-    return results;
+    return Array.from(new Set(results));
 };

package/src/parsers/ugc/GetZonePolygon.ts

@@ -0,0 +1,73 @@
+/*
+              _                             _               _     __   __
+         /\  | |                           | |             (_)    \ \ / /
+        /  \ | |_ _ __ ___   ___  ___ _ __ | |__   ___ _ __ _  ___ \ 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: https://atmosphericx.scriptkitty.cafe/documentation
+
+    Independent Package: @atmosx/event-product-parser
+
+*/
+
+import { CreateQuery } from "@Database/CreateQuery"
+import { GetUnionPolygon } from "@Geometry/GetUnionPolygon"
+import { createHash } from "crypto";
+
+interface CoordinatesOptions {
+    Zones: string[]
+    Union: boolean
+}
+
+interface CoordinatesResponse { 
+    type: `Polygon` | `MultiPolygon`
+    coordinates: any[]
+}
+
+export const GetZonePolygon = ({ Zones, Union }: CoordinatesOptions): CoordinatesResponse | null => {
+    const list = [...new Set(Zones.map(z => z.trim()))].filter(z => z === 'XX000' ? false : true);
+    if (list.length === 0) return null;
+
+    const placeholders = list.map(() => "?").join(",");
+    const rows = CreateQuery({
+        Query: `SELECT geometry FROM shapefiles WHERE id IN (${placeholders})`,
+        Parameters: list
+    });
+    const polygons: any[] = [];
+    const geometryHashes = new Set<string>();
+    for (const row of rows) {
+        if (!row?.geometry) continue;
+        const geometryHash = createHash("sha256").update(row.geometry).digest("hex");
+        if (geometryHashes.has(geometryHash)) continue;
+        geometryHashes.add(geometryHash);
+        const geom = JSON.parse(row.geometry);
+        if (geom?.type === "Polygon") {
+            polygons.push(geom.coordinates);
+        }
+        if (geom?.type === "MultiPolygon") {
+            for (const poly of geom.coordinates) {
+                polygons.push(poly);
+            }
+        }
+    }
+    if (polygons.length === 0) return null;
+    if (Union) {
+        return GetUnionPolygon({ Polygons: polygons });
+    } else {
+        const multi: any[] = [];
+        for (const polyCoords of polygons) {
+            if (Array.isArray(polyCoords) && Array.isArray(polyCoords[0])) {
+                multi.push(polyCoords);
+            }
+        }
+        if (multi.length === 0) return null;
+        return {type: "MultiPolygon", coordinates: multi};
+    }
+}

package/src/{@parsers/@ugc → parsers/ugc}/GetZones.ts

@@ -11,13 +11,13 @@
     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
+    Documentation: https://atmosphericx.scriptkitty.cafe/documentation
 
-    Internal Package: @atmosx/event-product-parser
+    Independent Package: @atmosx/event-product-parser
 
 */
 
-export const getZones = (header: string): string[] => {
+export const GetZones = (header: string): string[] => {
     const splits = header.split('-');
     const zones: string[] = [];
     let state = splits[0].substring(0, 2);

package/src/{@parsers/@ugc → parsers/ugc}/SetCache.ts

@@ -11,18 +11,23 @@
     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
+    Documentation: https://atmosphericx.scriptkitty.cafe/documentation
 
-    Internal Package: @atmosx/event-product-parser
+    Independent Package: @atmosx/event-product-parser
 
 */
 
-import { bootstrap } from "../../bootstrap";
+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);
+interface SetCacheOptions {
+    Key: string
+    Value: string[]
+}
+
+export const SetCache = ({ Key, Value }: SetCacheOptions) => {
+	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);
+    Bootstrap.Cache.UGC.set(Key, Value);
 };

package/src/{@parsers/@ugc → parsers/ugc}/UGCExtract.ts

@@ -11,27 +11,27 @@
     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
+    Documentation: https://atmosphericx.scriptkitty.cafe/documentation
 
-    Internal Package: @atmosx/event-product-parser
+    Independent Package: @atmosx/event-product-parser
 
 */
 
-import { TypeUGC } from "../../@types/UGC";
-import { getUGCHeader } from "./GetUGCHeader"
-import { getZones } from "./GetZones";
-import { GetExpiry } from './GetExpiry';
-import { getLocations } from "./GetLocations";
+import { TypeUGC } from "TypesStandard/UGC"
+import { GetHeader } from "@ParsingUGC/GetHeader"
+import { GetZones } from "@ParsingUGC/GetZones"
+import { GetExpiry } from "@ParsingUGC/GetExpiry"
+import { GetLocations } from "@ParsingUGC/GetLocations"
 
-export const ugcExtract = async (message: string): Promise<TypeUGC> => {
-    const head = getUGCHeader(message);
-    const ugcs = getZones(head)
+export const UGCExtract = async (message: string): Promise<TypeUGC> => {
     const expires = GetExpiry(message)
-    const areas = await getLocations(ugcs)
+    const head = GetHeader(message);
+    const ugcs = GetZones(head);
+    const areas = await GetLocations(ugcs)
     if (!head || ugcs?.length == 0) return;
     return { 
-        zones: ugcs,
-        locations: areas, 
-        expires: expires
+        Zones: ugcs,
+        Locations: areas, 
+        Expires: expires
     }
 }

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

@@ -11,9 +11,9 @@
     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
+    Documentation: https://atmosphericx.scriptkitty.cafe/documentation
 
-    Internal Package: @atmosx/event-product-parser
+    Independent Package: @atmosx/event-product-parser
 
 */