@atmosx/event-product-parser 3.0.46 → 3.0.48

package/src/@modules/@database/database.shapefiles.ts

@@ -35,7 +35,6 @@ export const importShapefiles = async (): Promise<void> => {
             .get().count;
         if (tShapefiles === 0) {
             await setSleep({timeout: 1e3});
-            setWarning({ message: `Shapefiles are currently building, please DO NOT close your terminal. The shapefiles will not finish and will remain incomplete. If you do mess up, you will need to delete ${settings.Database} and restart the application.` })
             for (const shapefile of dict_shapefiles) {
                 const response = await fetch(shapefile.link);
                 const arrayBuff = await response.arrayBuffer();
@@ -56,7 +55,7 @@ export const importShapefiles = async (): Promise<void> => {
                     filepath,
                     filepath,
                 );
-                setWarning({ message: `Importing ${features.length} features from ${shapefile.name}_${shapefile.id}` })
+                setWarning({ message: `Importing ${features.length} features from ${shapefile.name}_${shapefile.id} for Shapefiles` })
                 const insert = bootstrap.database
                     .prepare(`INSERT OR REPLACE INTO shapefiles (id, location, geometry) VALUES (?, ?, ?)`)
                 const transaction = bootstrap.database.transaction((entries: any[]) => {
@@ -84,10 +83,8 @@ export const importShapefiles = async (): Promise<void> => {
                 })
                 fs.unlinkSync(`${filepath}.shp`)
                 fs.unlinkSync(`${filepath}.dbf`)
-                setWarning({ message: `Cleaned up temporary files for ${shapefile.name}_${shapefile.id}` })
                 transaction(features)
             }
-            setWarning({ message: `Shapefiles have finished compiling, you can now continue and close this terminal` })
             fs.rm(resolve(__dirname, '../../shapefiles'), { recursive: true, force: true }, () => {});
         }
     } catch (error) {

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

@@ -17,10 +17,7 @@
 
 */
 
-import request from 'request'
-
 interface CreateHttpOptions { 
-    proxy?: string
     url: string
     headers?: any
     timeout?: number
@@ -30,56 +27,44 @@ interface CreateHttpOptions {
 }
 
 export const createHttp = async (options: CreateHttpOptions): Promise<any> => {
-    return new Promise((resolve, reject) => {
-        const requestOptions = { 
-            url: options.url ?? `https://api.weather.gov/alerts/active`,
-            headers: options.headers ?? {
-                "User-Agent": "AtmosphericX",
-                "Accept": "application/geo+json, text/plain, */*; q=0.9",
-                "Accept-Language": "en-US,en;q=0.9"
-            }, 
-            method: options.method ?? `GET`,
-            timeout: options.timeout ?? 10e3,
-            proxy: options.proxy ?? null,
-            maxRedirects: 1, 
-        };
-        if (options.formData) {
-            requestOptions['formData'] = options.formData;
-        } else if (options.body) {
-            requestOptions['body'] = options.body;
-        }
-        
-        request(requestOptions, (error, response, body) => {
-            if (error) { 
-                return resolve({
-                    error: true,
-                    options: requestOptions,
-                    status: -1,
-                    message: error.message ?? `Unknown Error`
-                })
-            }
-            if (response.statusCode < 200 || response.statusCode >= 300) {
-                return resolve({
-                    error: true,
-                    options: requestOptions,
-                    status: response.statusCode ?? -1,
-                    message: `HTTP Status Code ${response.statusCode ?? `Unknown Status Code`} (${body})`
-                })
-            }
-            if (body == undefined || body == null) { 
-                return resolve({
-                    error: true,
-                    options: requestOptions,
-                    status: response.statusCode ?? -1,
-                    message: `Empty Response Body`
-                })
-            }
-            resolve({
-                error: false,
-                options: requestOptions,
-                status: response.statusCode ?? -1,
-                message: body
-            })  
-        })
-    })
+	const requestOptions: RequestInit = {
+        method: options.method ?? "GET",
+        headers: options.headers ?? {
+            "User-Agent": "AtmosphericX",
+            "Accept": "application/geo+json, text/plain, */*; q=0.9",
+            "Accept-Language": "en-US,en;q=0.9",
+        },
+        signal: AbortSignal.timeout(options.timeout ?? 10_000),
+        redirect: "follow"
+    };
+
+
+	const returnHttp = function(error: boolean,status: number, message: string) {
+		return { error: error, options: requestOptions, status, message };
+	}
+
+	if (options?.formData) { 
+		requestOptions.body = options.formData;
+	} else if (options?.body != undefined) {
+        requestOptions.body =
+        options.body instanceof FormData
+            ? options.body
+            : typeof options.body === "string"
+                ? options.body
+                : JSON.stringify(options.body);
+	}
+
+	try { 
+		const response = await fetch(
+			options?.url ?? `https://api.weather.gov/alerts/active`,
+			requestOptions
+		)
+		const body = await response.text();
+		if (!response.ok) { 
+			return returnHttp(true, response.status, `HTTP Status Code ${response.status} (${response.statusText})`)
+		}
+		return returnHttp(false, response.status, body)
+	} catch (error) {
+		return returnHttp(true, 500, `Internal Server Error: ${error}`)
+	}
 }

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

@@ -52,6 +52,7 @@ export const setCronSchedule = async (): Promise<void> => {
     };
     walk(settings.GlobalSettings.ArchiveSettings.TextDirectory)
     walk(settings.GlobalSettings.ArchiveSettings.EasDirectory)
+    walk(settings.GlobalSettings.ArchiveSettings.EventDirectory)
 
 
 
@@ -67,7 +68,7 @@ export const setCronSchedule = async (): Promise<void> => {
             }
         })
         if (response.error) {
-            return  setEventEmit({
+            return setEventEmit({
                 event: `onServiceStatus`,
                 metadata: {
                     type: "fetch-api",

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

@@ -50,7 +50,7 @@ export const xReconnect = async (interval: number): Promise<void> => {
                         },
                         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(() => {});

package/src/@parsers/@text/text.getEmbed.ts

@@ -54,7 +54,5 @@ export const getEmebed = (event: TypeEvent): string => {
         line(`**Sender:**`, event?.properties?.geocode?.office?.name ? `${event?.properties?.geocode?.office?.name} (${event?.properties?.geocode?.office?.office})` : event?.properties?.geocode?.office?.office),
         line(`**Tracking:**`, event?.properties?.metadata?.tracking),
         line(`**Logs:**`, event?.properties?.metadata?.history?.length > 0 ? event?.properties?.metadata?.history.length : null),
-        line(``, event?.properties?.metadata?.attachments?.length > 0 ? `**Attachments:** ${event?.properties?.metadata?.attachments.map(attachment => `[Attachment #${event?.properties?.metadata?.attachments.indexOf(attachment) + 1}](${attachment})`).join(' | ')}` : null),
-        line(``, event?.properties?.description ? '```' + '\n' + event?.properties?.description.split('\n').map(l => l.trim()).filter(Boolean).join('\n') + '\n' + '```' : null, !isExpired),
     ].filter(Boolean).join('\n');
 }

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

@@ -63,7 +63,7 @@ export type TypeEvent = {
                 issued: string
                 status: string
             }[]
-            attachments?: string[]
+            attachments?: { name: string; link: string }[]
             raw: string
         }
     } & BaseTypeEventProperties

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

@@ -27,6 +27,6 @@ export type TypeListener = {
         message: string
     }
     uploads?: {
-        file?: boolean, eas?: boolean
+        file?: boolean, eas?: boolean, event?: boolean
     }
 }

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

@@ -21,6 +21,7 @@ import { TypeAttributes } from "./type.attributes";
     
 export type TypeEventProperties = {
     locations: string
+    locations_array: string[]
     description: string
     attributes?: TypeAttributes
     geocode: {

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

@@ -48,6 +48,11 @@ export type TypeSettings = {
         CallbackInterval: number
         EventsEndpoint: string
     }
+    BroadcastifySettings: {
+        BroadcastifyAttachments: boolean
+        BroadcastifyDatabase: string
+        BroadcastifyTags: string[]
+    },
     GlobalSettings: {
         EventManagement: boolean
         BetterEventNames: boolean
@@ -69,7 +74,8 @@ export type TypeSettings = {
             IgnoreTestProducts: boolean
         },
         ArchiveSettings: {
-            TTL: number,
+            TTL: number
+            EventDirectory: string
             TextDirectory: string
             EasDirectory: string
             EasToneout: string

package/src/bootstrap.ts

@@ -21,7 +21,7 @@ import path from 'path'
 import { EventEmitter } from 'node:events';
 
 export const bootstrap = {
-    version: `3.0.46`,
+    version: `3.0.48`,
     isReady: true,
     ratelimits: {},
     session_xmpp: null,
@@ -72,6 +72,11 @@ export const bootstrap = {
             CallbackInterval: 15,
             EventsEndpoint: `https://api.weather.gov/alerts/active`,
         },
+        BroadcastifySettings: {
+            BroadcastifyAttachments: true,
+            BroadcastifyDatabase: `https://scriptkitty.cafe/ftp/@atmosphericx/assets/broadcastify.json`,
+            BroadcastifyTags: [`Ham`, `Air`, `Fire`, `Public Safety`, `Weather`, `EMS`, `Police`, `Rail`]
+        },
         ListenerSettings: [],
         GlobalSettings: {
             EventManagement: true,
@@ -94,6 +99,7 @@ export const bootstrap = {
             },
             ArchiveSettings: {
                 TTL: 60,
+                EventDirectory: null,
                 TextDirectory: null,
                 EasDirectory: null,
                 EasToneout: null

package/test.js

@@ -1,6 +1,6 @@
-const { Manager, setSettings, getSettings, getListener } = require(`../dist/cjs/index.cjs`)
+const { Manager } = require(`../dist/cjs/index.cjs`)
 
-const NOAAWeatherWireService = new Manager({
+const Client = new Manager({
     Database: `shapefiles.db`,
     EnableWireService: false,
     EnableJournal: true,
@@ -29,6 +29,10 @@ const NOAAWeatherWireService = new Manager({
         CallbackInterval: 30,
         EventsEndpoint: `https://api.weather.gov/alerts/active`,
     },
+    BroadcastifySettings: {
+        BroadcastifyAttachments: true,
+        BroadcastifyTags: [`Public Safety`, `Amateur Radio`, `Other`, `Rail`, `Aviation`, `Marine`, `Disaster Event`, `Special Event`]
+    },
     ListenerSettings: [
         {
             events: [`*Thunderstorm Warning*`, `* Watch`],
@@ -41,15 +45,18 @@ const NOAAWeatherWireService = new Manager({
             },
             uploads: {
                 eas: true,
-                file: true
+                file: true,
+                event: true
             }
         }
     ],
     GlobalSettings: {
+        EventManagement: true,
         BetterEventNames: true,
         DisableGeometryParsing: false,
         UseShapefileCoordinates: true,
         SPCWatchesOnly: true,
+        ShapefileSkipPoints: 0,
         NodeTTL: 60,
         NodeMinDistance: 120,
         EventFiltering: {
@@ -83,9 +90,10 @@ const NOAAWeatherWireService = new Manager({
         },
         ArchiveSettings: {
             TTL: 600,
+            EventDirectory: `Storage/EventProducts`,
             TextDirectory: `Storage/TextProducts`,
             EasDirectory: `Storage/EasScenarios`,
             EasToneout: `tone.wav`,
         }
     }
-})
+})