@atmosx/event-product-parser 3.0.622 → 3.1.0

package/src/{@core → exports}/GetRandomEvent.ts

@@ -11,14 +11,14 @@
     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 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 → exports}/GetVersion.ts

@@ -11,14 +11,14 @@
     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 GetVersion = (): any => {
-    return bootstrap.version
+    return Bootstrap.Version
 }

package/src/{@core → exports}/ManualEvent.ts

@@ -11,45 +11,45 @@
     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 { GetAwipsType } from "@stanza/GetAwipsType"
-import { CreateEvent } from "@building/CreateEvent"
+import { EnumExpressions } from "@Enums/Expressions"
+import { GetAwipsType } from "@Stanza/GetAwipsType"
+import { ProcessStanza } from "@Builder/ProcessStanza"
 
 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, 
-        getType 
+        Message: Message, 
+        Attributes: attributes,
+        CapEvent: isCapEvent, 
+        VTEC: isVTEC, 
+        UGC: isUGC, 
+        CapAreaDescription: isCapAreaDescription, 
+        Ignored: false, 
+        NWWS: true, 
+        Type: getType, 
     }
-    await CreateEvent(result);
+    await ProcessStanza(result);
 }

package/src/{@core → exports}/QueryStanza.ts

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

package/src/exports/SetNode.ts

@@ -0,0 +1,100 @@
+/*
+              _                             _               _     __   __
+         /\  | |                           | |             (_)    \ \ / /
+        /  \ | |_ _ __ ___   ___  ___ _ __ | |__   ___ _ __ _  ___ \ 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"
+import { SetWarning } from "@Utilities/SetWarning"
+import { SetEventEmit } from "@Utilities/SetEventEmit"
+import { GetNearestCity } from "@Exports/GetNearestCity"
+
+interface GetNodeOptions {
+    Identifier: string
+    Delete?: boolean
+    Coordinates: { Longitude: number; Latitude: number }
+}
+
+export const SetNode = ({ Identifier, Delete, Coordinates }: GetNodeOptions) => {
+    const nodes = Bootstrap.Cache.Nodes.features;
+    const exists = nodes.find((node) => node.properties.identifier === Identifier);
+    const nearest = GetNearestCity({ Coordinates, Radius: 25 });
+    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
+                }
+            })
+        }
+        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: [Coordinates.Longitude, Coordinates.Latitude]
+            },
+            properties: {
+                ...exists.properties,
+                city: nearest?.name ?? null,
+                county: nearest?.county ?? null,
+                state: nearest?.state ?? null,
+                population: nearest?.population ?? null
+            }
+        };
+        SetWarning({ Message: `Node with identifier '${Identifier}' updated. (${nearest?.name ?? "---"}, ${nearest?.county ?? "---"}, ${nearest?.state ?? "---"})` })
+        return SetEventEmit({
+            Event: `onNodeUpdate`,
+            Metadata: {
+                Type: `node-update`,
+                Node: nodes[index]
+            }
+        })
+    }
+    nodes.push({
+        type: "Feature",
+        geometry: {
+            type: "Point",
+            coordinates: [Coordinates.Longitude, Coordinates.Latitude]
+        },
+        properties: {
+            identifier: Identifier,
+            city: nearest?.name ?? null,
+            county: nearest?.county ?? null,
+            state: nearest?.state ?? null,
+            population: nearest?.population ?? null
+        }
+    });
+    SetWarning({ Message: `Node with identifier '${Identifier}' added. (${nearest?.name ?? "---"}, ${nearest?.county ?? "---"}, ${nearest?.state ?? "---"})` })
+    return SetEventEmit({
+        Event: `onNodeAdd`,
+        Metadata: {
+            Type: `node-add`,
+            Node: nodes[nodes.length - 1]
+        }
+    })
+}

package/src/{@core → exports}/StartService.ts

@@ -11,50 +11,51 @@
     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 { 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 { TypeSettings } from "TypesStandard/Settings"
+import { Bootstrap } from "@Bootstrap"
+import { SetWarning } from "@Utilities/SetWarning"
+import { SetSettings } from "@Utilities/SetSettings"
+import { EmitThread } from "@Utilities/EmitThread"
+import { DeployXMPP } from "@XMPP/DeployXMPP"
+import { InitializeDatabase } from "@Database/InitializeDatabase"
+import { GetCachedEvents } from "@BuilderUtilities/GetCachedEvents"
+import { UpdateNode } from "@BuilderUtilities/UpdateNode"
+import { UpdateEvents } from "@BuilderUtilities/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.DeveloperDisableEvents) { return SetWarning({ Message: `DeveloperDisableEvents is enabled, no events will be processed!` }) }
     if (settings.EnableWireService) {
         (async () => {
             await GetCachedEvents();
             await DeployXMPP()
         })();
     }
-    await SetCronSchedule()
+    await EmitThread()
     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 () => {
-        await SetCronSchedule();
+    Bootstrap.Job = new Cron(`*/${scheduleInterval} * * * * *`, async () => {
+        await EmitThread();
     })
-    bootstrap.cron = new Cron(`* * * * * *`, async () => { 
+    Bootstrap.Job = new Cron(`* * * * * *`, async () => { 
         await UpdateNode();
         await UpdateEvents();
     })

package/src/{@core → exports}/StopService.ts

@@ -11,22 +11,22 @@
     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 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/index.ts

@@ -11,66 +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 { GetEventGeometry } from "@building/GetEventGeometry"
-import { GetCleanedEvent } from "@building/GetCleanedEvent"
-import { SetSettings } from "@utilities/SetSettings"
-import { SetEventEmit } from "@utilities/SetEventEmit"
-import { SetWarning } from "@utilities/SetWarning"
-import { GenerateEASMessage } from "@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 { CreateListener } from "@core/CreateListener"
-import { StartService } from "@core/StartService"
-import { StopService } from "@core/StopService"
+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 { 
     public constructor(settings: TypeSettings) { 
-        this.trycatch(); StartService(settings) 
+        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();
 }