@atmosx/event-product-parser 3.0.4 → 3.0.42

package/src/@core/core.start.ts

@@ -47,7 +47,7 @@ export const startService = async (configurations: TypeSettings): Promise<void>
     await setCronSchedule()
     let scheduleInterval = !settings.EnableWireService ? settings.NationalWeatherServiceSettings.CallbackInterval : 1;
     if (!settings.EnableWireService && scheduleInterval < 15) {
-        setWarning({ message: `Schedule Interval of ${scheduleInterval} seconds is too low, setting to 15 seconds` })
+        setWarning({ message: `Schedule interval of ${scheduleInterval} seconds is too low, setting to 15 seconds` })
         bootstrap.settings.NationalWeatherServiceSettings.CallbackInterval = 15;
         scheduleInterval = 15;
     }

package/src/@dictionaries/dictionaries.officeICAOs.ts

@@ -18,6 +18,7 @@
 */
 
 export const officeICAOs: Record<string, string> = {
+    "KLUB": "Lubbock, TX",
     "KLCH": "Lake Charles, LA",
     "TSTL": "St. Louis, MO", 
     "PABC": "Bethel, AK", 
@@ -253,5 +254,6 @@ export const officeICAOs: Record<string, string> = {
     "KCAR": "Caribou, ME",
     "KMFR": "Medford, OR",
     "PGUM": "Guam, GU",
+    "PACR": "Cordova, AK",
     "PAJK": "Juneau, AK"
 };

package/src/{@modules/@utilities/utilities.createWebhook.ts → @manager/manager.createWebhook.ts}

@@ -17,11 +17,11 @@
 
 */
 
-import { TypeEvent } from "../../@types/type.event";
-import { setTimeoutAction } from "./utilities.setTimeoutAction"
-import { createHttp } from "./utilities.createHttp"
-import { TypeWebhook } from "../../@types/types.webhook";
-import { getCleanedEvent } from "../../@building/building.clean";
+import { TypeEvent } from "../@types/type.event";
+import { setTimeoutAction } from "../@modules/@utilities/utilities.setTimeoutAction"
+import { createHttp } from "../@modules/@utilities/utilities.createHttp"
+import { TypeWebhook } from "../@types/types.webhook";
+import { getCleanedEvent } from "../@building/building.clean";
 import FormData from "form-data";
 
 interface CreateWebhookOptions { 
@@ -35,7 +35,7 @@ export const createWebhook = async (options: CreateWebhookOptions): Promise<void
     
     let body = [
         event.locations ? `**Locations**: ${event.locations.slice(0,100)}` : null,
-        event.issued ? `**Issued**: <t:${Math.floor(new Date(event.issued).getTime()/1000)}:R>` : null,
+        event.issued && event.status != `Expired` ? `**Issued**: <t:${Math.floor(new Date(event.issued).getTime()/1000)}:R>` : null,
         event.expires && event.status != `Statement` ? `**Expires**: <t:${Math.floor(new Date(event.expires).getTime()/1000)}:R>` : null,
         (() => {
             const val = event.parameters.estimated_wind_gusts ?? null
@@ -46,7 +46,7 @@ export const createWebhook = async (options: CreateWebhookOptions): Promise<void
         (() => {
             const val = event.parameters.estimated_hail_size ?? null
             const th = event.parameters.hail_threat ?? null
-            return (val || th) ? `**Hail Threat**: ${val} ${th ? `(${th})` : ''}` : null;
+            return (val ?? th) ? `**Hail Threat**: ${val} ${th ? `(${th})` : ''}` : null;
         })(),
         event.parameters.damage_threat ? `**Damage Threat**: ${event.parameters.damage_threat}` : null,
         event.parameters.flood_threat ? `**Flood Threat**: ${event.parameters.flood_threat}` : null,
@@ -69,11 +69,13 @@ export const createWebhook = async (options: CreateWebhookOptions): Promise<void
         (() => {
             const val = event.geocode?.office?.name ?? `N/A`
             const th = event.geocode?.office?.office ?? null
-            return (val || th) ? `**Sender**: ${val} ${th ? `(${th})` : ''}` : null;
+            return (val ?? th) ? `**Sender**: ${val} ${th ? `(${th})` : ''}` : null;
         })(),
         event.metadata?.tracking ? `**Tracking**: ${event.metadata.tracking}` : null,
+        event.metadata.history?.length > 0 ? `**Logs**: ${event.metadata.history.length}` : null,
         (() => {
-            const desc = (event.description || '').split('\n').map(l => l.trim()).filter(Boolean).join('\n');
+            if (event.status == `Expired`) { return null }
+            const desc = (event.description ?? '').split('\n').map(l => l.trim()).filter(Boolean).join('\n');
             return desc ? '```' + '\n' + desc + '\n' + '```' : null;
         })(),
     ].filter(Boolean).join('\n');
@@ -83,7 +85,7 @@ export const createWebhook = async (options: CreateWebhookOptions): Promise<void
 
     if (body.length > 1900) {   
         body = body.substring(0, 1900) + "\n\n[Message truncated due to length]";
-        const blocks = (body.match(/```/g) || []).length;
+        const blocks = (body.match(/```/g) ?? []).length;
         if (blocks % 2 !== 0) body += "```";
     }
     const form = new FormData();

package/src/@manager/manager.mkEvent.ts

@@ -28,22 +28,15 @@ import { TypeSettings } from "../@types/types.settings";
 export const mkEvent = async (event: TypeEvent): Promise<void> => {
     const settings = bootstrap.settings as TypeSettings;
     const features = bootstrap.cache.events.features;
-    const map = new Map<string, typeof features[0]>();
-    
-    for (const f of features) {
-        const key = f?.properties?.metadata?.tracking;
-        if (!key) continue;
-        map.set(key, f);
-    }
-    
+ 
     const getHash = event.properties.metadata.hash;
     const getTracking = event.properties.metadata.tracking;
     const isEntry = bootstrap.cache.hashes?.find(hash => hash.tracking === getTracking)
     const isHashed = isEntry?.hashes?.includes(getHash) ?? false;
-    const getFeature = map.get(getTracking);
-    
+    const getFeature = features.find(feature => feature.properties.metadata.tracking === getTracking);    
     if (isHashed || event.properties.status_metadata.is_expired) return
-    await setHash(event, isEntry)
+    setHash(event, isEntry)
+    
     const isFilteredLocation = await updateNode(event).then(() => event.properties.metadata.filtered_proximity);
     if (!isFilteredLocation && settings.GlobalSettings.EventFiltering.NodeLocationFiltering) { return }
 
@@ -67,7 +60,7 @@ export const mkEvent = async (event: TypeEvent): Promise<void> => {
                 const iLocations = event.properties?.locations?.split(";").map((l: string) => l.trim()) ?? [];
                 const iUgc = event.properties?.geocode?.ugc ?? [];
     
-                const mHistory = [...cHistory, ...iHistory].filter((v, i, a) => a.indexOf(v) === i);
+                const mHistory = [...cHistory, ...iHistory].filter((v, i, a) => a.indexOf(v) === i).filter((v, i, a) => a.findIndex(h => h.description === v.description && h.issued === v.issued) === i);
                 const mLocations = [...cLocations, ...iLocations].filter((v, i, a) => a.indexOf(v) === i).join('; ');
                 const mUgc = [...cUgc, ...iUgc].filter((v, i, a) => a.indexOf(v) === i);
     

package/src/@manager/manager.setHash.ts

@@ -22,7 +22,7 @@ import { TypeHash } from "../@types/types.hash"
 import { bootstrap } from "../bootstrap"
 
 
-export const setHash = async (event: TypeEvent, entry: TypeHash): Promise<void> => {
+export const setHash = (event: TypeEvent, entry: TypeHash): void => {
     if (entry) {
         entry.hashes.push(event.properties.metadata.hash);
         entry.expires = event.properties.expires;

package/src/@manager/manager.updateWebhooks.ts

@@ -17,12 +17,11 @@
 
 */
 
-import { createWebhook } from "../@modules/@utilities/utilities.createWebhook";
+import { createWebhook } from "./manager.createWebhook";
 import { TypeEvent } from "../@types/type.event";
 import { TypeWebhook } from "../@types/types.webhook";
 import { bootstrap } from "../bootstrap"
 
-
 export const updateWebhooks = async (event: TypeEvent): Promise<void> => {
     const settings = bootstrap.settings;
     const webhooks = settings.WebhookSettings as TypeWebhook[];

package/src/@modules/@utilities/utilities.setTimeoutAction.ts

@@ -45,7 +45,7 @@ export const setTimeoutAction = (options: SetTimeoutActionOptions): SetTimeoutAc
 
     const oldestTimestamp = target?.[0];
     const getWait = oldestTimestamp ? Math.ceil((options?.interval * 1000) - (Date.now() - oldestTimestamp)) : 0;
-    const max = options?.max || 1;
+    const max = options?.max ?? 1;
     
     if (target?.length >= max && getWait > 0) {
         return {

package/src/@modules/@xmpp/xmpp.xReconnect.ts

@@ -26,7 +26,7 @@ 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` })
+        setWarning({ message: `Reconnection interval of ${interval} seconds is too low, setting to 15 seconds` })
         interval = 15;
         bootstrap.settings.NOAAWeatherWireServiceSettings.ReconnectionSettings.ReconnectionInterval = 15;
     }

package/src/@parsers/@pvtec/pvtec.extract.ts

@@ -35,7 +35,7 @@ export const pvExtract = (message: string): TypePVTEC[] | null => {
         vtecs.push({
             vtec: vtec,
             product: eventProducts[sub[0]],
-            tracking: `${sub[2]}-${sub[3]}-${sub[4]}-${sub[5]}`,
+            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,

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

@@ -70,7 +70,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 +89,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/bootstrap.ts

@@ -21,7 +21,7 @@ import path from 'path'
 import { EventEmitter } from 'node:events';
 
 export const bootstrap = {
-    version: `3.0.3`,
+    version: `3.0.42`,
     isReady: true,
     ratelimits: {},
     session_xmpp: null,

package/src/index.ts

@@ -31,6 +31,7 @@ import { setNode } from "./@core/core.setNode"
 import { getEvents } from "./@core/core.getEvents"
 import { getNodes } from "./@core/core.getNodes"
 import { getRandomEvent } from './@core/core.getRandomEvent';
+import { query } from './@core/core.query';
 import { clearEvents } from './@core/core.clearEvents';
 
 export class Manager { 
@@ -55,7 +56,7 @@ export class Manager {
                 })
                 return; 
             }
-            setWarning({message: `Uncaught Exception: ${err instanceof Error ? err.stack || err.message : String(err)}`})
+            setWarning({message: `Uncaught Exception: ${err instanceof Error ? err.stack ?? err.message : String(err)}`})
         })
     }
 }
@@ -66,7 +67,7 @@ export {
     setSettings, getEventGeometry, 
     getCleanedEvent, stopService, clearEvents,
     startService, setNode, getRandomEvent,
-    getEvents, getNodes, setEasTone
+    getEvents, getNodes, setEasTone, query
 }