@atmosx/event-product-parser 3.0.53 → 3.0.55

package/src/@manager/manager.updateListener.ts

@@ -22,8 +22,8 @@ import { TypeListener } from "../@types/type.listener";
 import { bootstrap } from "../bootstrap"
 import { setEasTone } from "../@modules/@eas/eas.setEasTone"
 import { setTimeoutAction } from "../@modules/@utilities/utilities.setTimeoutAction";
-import { getEmebed } from "../@parsers/@text/text.getEmbed";
-import { getRaw } from "../@parsers/@text/text.getRaw";
+import { getEmebedText } from "../@parsers/@text/text.getEmbedText";
+import { getStringText } from "../@parsers/@text/text.getStringText";
 import { getCleanedEvent } from "../@building/building.clean"
 import { createHttp } from "../@modules/@utilities/utilities.createHttp";
 import { setDebug } from "../@modules/@utilities/utilities.setDebug";
@@ -50,13 +50,14 @@ export const updateListener = async (event: TypeEvent): Promise<void> => {
     }
 
     for (const listener of listeners) {
-        const events = listener?.events;
-        const webhook = listener?.webhook;
-        const uploads = listener?.uploads
+        const events = listener?.Events;
+        const webhook = listener?.Webhook;
+        const notify = listener?.NotificationServer;
+        const uploads = listener?.Uploads
         const isMatched = getMatched(events ?? [], metadata.name)
 
         if (events?.length == 0 || isMatched) {
-            if (uploads?.eas) { 
+            if (uploads?.EAS) { 
                 metadata.eas = await setEasTone({
                     title: `${metadata.name}_${metadata.status}_${metadata.tracking}`,
                     message: metadata.description,
@@ -64,13 +65,13 @@ export const updateListener = async (event: TypeEvent): Promise<void> => {
                 });
             }
 
-            if (uploads?.file) {
+            if (uploads?.File) {
                 const fDestination = settings.GlobalSettings.ArchiveSettings.TextDirectory;
                 if (fDestination) {
-                    const file = (`${fDestination}/${metadata.name}_${metadata.status}_${metadata.tracking}.txt`).replace(/[\\:*?"<>|]/g, "_").replace(/\s+/g, " ").trim();
+                    const file = (`${fDestination}/${metadata.name}_${metadata.tracking}.txt`).replace(/[\\:*?"<>|]/g, "_").replace(/\s+/g, " ").trim();
                     if (!existsSync(fDestination)) { mkdirSync(fDestination, { recursive: true }); }
                     if (existsSync(file)) {
-                        appendFileSync(file, metadata.raw);
+                        appendFileSync(file, `${(`\n`).repeat(10)}${metadata.raw}`);
                     } else {
                         writeFileSync(file, metadata.raw);
                     }
@@ -78,50 +79,49 @@ export const updateListener = async (event: TypeEvent): Promise<void> => {
                 metadata.file = metadata.raw;
             }
 
-            if (uploads?.event) {
+            if (uploads?.JSON) {
                 const eDestination = settings.GlobalSettings.ArchiveSettings.EventDirectory;
                 if (eDestination) {
-                    const file = (`${eDestination}/${metadata.name}_${metadata.status}_${metadata.tracking}.json`).replace(/[\\:*?"<>|]/g, "_").replace(/\s+/g, " ").trim();
+                    const file = (`${eDestination}/${metadata.name}_${metadata.tracking}.json`).replace(/[\\:*?"<>|]/g, "_").replace(/\s+/g, " ").trim();
                     if (!existsSync(eDestination)) { mkdirSync(eDestination, { recursive: true }); }
                     writeFileSync(file, JSON.stringify(getCleanedEvent(event), null, 2));
                 }
                 metadata.json = JSON.stringify(getCleanedEvent(event), null, 2);
             }
 
-            if (settings.NotifyServer.Enabled && listener?.notify?.enabled && listener?.notify?.topic) {
-                const auth = settings.NotifyServer.Credentials?.Username && settings.NotifyServer.Credentials?.Password
-                    ? {
-                        username: settings.NotifyServer.Credentials.Username,
-                        password: settings.NotifyServer.Credentials.Password
-                    }
-                    : undefined;
-                const attachment = metadata.eas && settings.NotifyServer.Attachments ? `${settings.NotifyServer.Attachments}/${metadata.name}_${metadata.status}_${metadata.tracking}.wav` : null;
-                await createHttp({
-                    url: `${settings.NotifyServer.Server.replace(/\/$/, "")}/${listener?.notify?.topic}`,
-                    timeout: 15_000,
-                    method: "POST",
-                    ...(auth && { auth }),
-                    headers: {
-                        "Title": `${metadata.name} (${metadata.status})`,
-                        "Tags":  properties.parameters.tags?.join(",") ?? "N/A",
-                        ... (attachment && { "Attach": attachment }),
-                        "Priority": "max",
-                        "Sound": "siren",
-                    },
-                    body: getRaw(event)
-                })
+            if (settings?.NotifyServer?.Enabled && notify?.Enabled && notify?.Topic) {
+                const server = settings?.NotifyServer;
+                const auth = server?.Credentials?.Username && server?.Credentials?.Password ? { username: settings?.NotifyServer?.Credentials?.Username, password: server?.Credentials?.Password } : undefined;
+                const attachment = metadata.eas && server?.Attachments ? `${server?.Attachments}/${metadata.name}_${metadata.status}_${metadata.tracking}.wav` : undefined;
+                const isRatelimited = setTimeoutAction({ identifier: metadata.tracking + `notify.server`, interval: 1, max: 1, addTime: true })
+                if (!isRatelimited.limited) { 
+                    await createHttp({
+                        url: `${server?.Server?.replace(/\/$/, "")}/${listener?.NotificationServer?.Topic}`,
+                        timeout: 15_000,
+                        method: "POST",
+                        ...(auth && { auth }),
+                        headers: {
+                            "Title": `${metadata.name} (${metadata.status})`,
+                            "Tags":  properties.parameters.tags?.join(",") ?? "N/A",
+                            "Expires": new Date(properties.expires).getTime(),
+                            "Priority": notify?.Priority ? notify.Priority.toString() : "5",
+                            ... (attachment && { "Attach": attachment }),
+                        },
+                        body: getStringText(event)
+                    })
+                }
             }
 
-            if (webhook?.enabled && webhook?.destination) {
-                const isRatelimited = setTimeoutAction({ identifier: webhook.destination, interval: (webhook.ratelimit ?? 2) * 2, max: (webhook.ratelimit ?? 2), addTime: true })
+            if (webhook?.Enabled && webhook?.Destination) {
+                const isRatelimited = setTimeoutAction({ identifier: webhook.Destination, interval: (webhook.Ratelimit ?? 2) * 2, max: (webhook.Ratelimit ?? 2), addTime: true })
                 const form = new FormData();
                 const embed = {
                     title: `${metadata.name} (${metadata.status})`,
-                    description: getEmebed(event),
+                    description: getEmebedText(event),
                     fields: [],
                     color: 16711680,
                     timestamp: new Date().toISOString(),
-                    footer: { text: webhook.title ?? `AtmosphericX` }
+                    footer: { text: webhook.Title ?? `AtmosphericX` }
                 };
 
                 if (isRatelimited.limited) { return } 
@@ -146,15 +146,15 @@ export const updateListener = async (event: TypeEvent): Promise<void> => {
                     });
                 }
 
-                if (uploads?.file) { 
+                if (uploads?.File) { 
                     form.append("fUpload", new Blob([Buffer.from(metadata.file)], {type: "application/text"}), `${properties.event}_${properties.status}_${properties.metadata.tracking}.txt`)
                 }
 
-                if (uploads?.event) { 
+                if (uploads?.JSON) { 
                     form.append("fUpload2", new Blob([Buffer.from(metadata.json)], {type: "application/json"}), `${properties.event}_${properties.status}_${properties.metadata.tracking}.json`)
                 }
 
-                if (uploads?.eas) { 
+                if (uploads?.EAS) { 
                     if (metadata.eas) {
                         const file = readFileSync(metadata.eas)
                         form.append("fEas", new Blob([Buffer.from(file)], { type: "audio/mpeg" }), `${properties.event}_${properties.status}_${properties.metadata.tracking}_eas.mp3`)
@@ -162,13 +162,13 @@ export const updateListener = async (event: TypeEvent): Promise<void> => {
                 }
 
                 form.append("payload_json", JSON.stringify({
-                    username: webhook.title ?? "AtmosphericX",
-                    content: webhook.message ?? "",
+                    username: webhook.Title ?? "AtmosphericX",
+                    content: webhook.Message ?? "",
                     embeds: [embed]
                 }));
 
                 await createHttp({
-                    url: webhook.destination,
+                    url: webhook.Destination,
                     timeout: 15e3,
                     method: `POST`,
                     body: form

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

@@ -41,6 +41,7 @@ export const setTimeoutAction = (options: SetTimeoutActionOptions): SetTimeoutAc
     }
     if (options?.expire) {
         delete bootstrap.ratelimits[options?.identifier];
+        return { limited: false };
     }
     if (target?.length > 0) {
        bootstrap.ratelimits[options?.identifier] = target.filter((ts: number) => Date.now() - ts < options?.interval * 1000);

package/src/@parsers/@text/{text.getEmbed.ts → text.getEmbedText.ts}

@@ -19,7 +19,7 @@
 
 import { TypeEvent } from "../../@types/type.event"
 
-export const getEmebed = (event: TypeEvent): string => {
+export const getEmebedText = (event: TypeEvent): string => {
     const line = (label: string, value: unknown, condition = true) => condition && value ? `${label} ${value}` : null;
     const isStatement = event.properties.status_metadata.is_statement;
     const isExpired = event.properties.status_metadata.is_expired;

package/src/@parsers/@text/{text.getRaw.ts → text.getStringText.ts}

@@ -19,7 +19,7 @@
 
 import { TypeEvent } from "../../@types/type.event"
 
-export const getRaw = (event: TypeEvent): string => {
+export const getStringText = (event: TypeEvent): string => {
     const line = (label: string, value: unknown, condition = true) => condition && value ? `${label} ${value}` : null;
     const isStatement = event.properties.status_metadata.is_statement;
     const isExpired = event.properties.status_metadata.is_expired;

package/src/@types/type.listener.ts

@@ -18,20 +18,21 @@
 */
 
 export type TypeListener = { 
-    events: string[]
-    webhook?: {
-        enabled: boolean
-        destination: string
-        ratelimit: number
-        title: string
-        message: string
+    Events: string[]
+    Webhook?: {
+        Enabled: boolean
+        Destination: string
+        Ratelimit: number
+        Title: string
+        Message: string
     }
-    notify?: {
-        enabled: boolean
-        topic: string
+    NotificationServer?: {
+        Enabled: boolean
+        Topic: string
+        Priority?: 1 | 2 | 3 | 4 | 5 | void
     }
-    uploads?: {
-        file?: boolean, eas?: boolean, event?: boolean
+    Uploads?: {
+        File?: boolean, EAS?: boolean, JSON?: boolean
     }
 
 }

package/src/bootstrap.ts

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

package/testing/init.js

@@ -1,7 +1,7 @@
 const { Manager } = require(`../dist/cjs/index.cjs`)
 
 const Client = new Manager({
-    Database: `shapefiles.db`,
+    Database: `event-product-parser.db`,
     EnableWireService: false,
     EnableJournal: true,
     EnableDebugging: false,
@@ -17,8 +17,8 @@ const Client = new Manager({
         },   
         CacheSettings: {
             Enabled: true,
-            MaxDatabaseHistory: 5000,
-            MaxRetentionHistory: 555,
+            MaxDatabaseHistory: 50000,
+            MaxRetentionHistory: 1500,
         },
         StanzaSettings: {
             DisableUGC: false,
@@ -32,12 +32,13 @@ const Client = new Manager({
     },
     BroadcastifySettings: {
         BroadcastifyAttachments: true,
+        BroadcastifyDatabase: `https://scriptkitty.cafe/ftp/@atmosphericx/assets/broadcastify.json`,
         BroadcastifyTags: [`Public Safety`, `Amateur Radio`, `Other`, `Rail`, `Aviation`, `Marine`, `Disaster Event`, `Special Event`]
     },
     NotifyServer: {
         Enabled: false,
-        Server: "https://ntfy.domainname.com",
-        Attachments: "https://domainname.com/Storage/EasScenarios",
+        Server: "https://ntfy.scriptkitty.cafe",
+        Attachments: "https://scriptkitty.cafe/ftp/@bucket/EAS/encoded",
         Credentials: {
             Username: "username",
             Password: "password"
@@ -45,22 +46,16 @@ const Client = new Manager({
     },
     ListenerSettings: [
         {
-            events: [`*Thunderstorm Warning*`, `* Watch`],
-            webhook: {
-                enabled: true,
-                destination: "https://discord.com/api/XXXXXXXXXX/XXXXXXXXXXX",
-                title: "AtmosphericX - (Thunderstorm Warnings and Watches)",
-                message: "<@&XXXXXXXXXXXXXXXXXXXXX>",
-                ratelimit: 1
+            Events: ["*Extreme Heat Warning*"],
+            NotificationServer: {
+                Enabled: false,
+                Topic: "heat-warnings",
+                Priority: 5
             },
-            notify: {
-                enabled: false,
-                topic: "thunderstorm_events",
-            },
-            uploads: {
-                eas: true,
-                file: true,
-                event: true
+            Uploads: {
+                EAS: true,
+                File: true,
+                JSON: true
             }
         }
     ],
@@ -72,35 +67,25 @@ const Client = new Manager({
         SPCWatchesOnly: true,
         ShapefileSkipPoints: 0,
         NodeTTL: 60,
-        NodeMinDistance: 120,
+        NodeMinDistance: 125,
         EventFiltering: {
             ListeningEvents: [
-                "*Severe Thunderstorm Warning*",
-                "*Blizzard*", "*Ice Storm*", "*Winter Storm*", "*Snow Squall*",
-                "Tornado Emergency", "*Tornado Warning*",
-                "Special Weather Statement", "Marine Weather Statement",
-                "*Tsunami*", "*Hurricane*", "*Tropical Storm*", "*Special Marine*",
-                "*Flash Flood Warning*", "*Flash Flood Watch*", "*Flash Flood Advisory*",
-                "Mesoscale Discussion",
-                "*Storm Prediction Center*",
-                "PDS Tornado Watch", "Tornado Watch", "Severe Thunderstorm Watch", "Flash Flood Watch", "PDS Severe Thunderstorm Watch",
-                "*Administrative*", "National Weather Service Policy",
-                "Fire Weather Warning", "Fire Weather Watch", "Fire Weather Advisory",
+               "*Warning*"
             ],
-            ListeningICAO: [`KLOT`],
+            ListeningICAO: [],
+            ListeningUGC: [],
+            ListeningStates: [],
             IgnoredICAO: [],
             IgnoredEvents: [],
-            ListeningUGC: [`WIC001`],
-            ListeningStates: [`MO`, `IA`],
             NodeLocationFiltering: false,
             IgnoreTestProducts: true,
         },
         ArchiveSettings: {
-            TTL: 600,
-            EventDirectory: `Storage/EventProducts`,
-            TextDirectory: `Storage/TextProducts`,
-            EasDirectory: `Storage/EasScenarios`,
-            EasToneout: `tone.wav`,
+            TTL: 30,
+            EventDirectory: `@bucket/ParsedProducts`,
+            TextDirectory: `@bucket/RawTextProducts`,
+            EasDirectory: `@bucket/EAS`,
+            EasToneout: `eas-toneout.wav`,
         }
     }
-})
+})