@atmosx/event-product-parser 3.0.47 → 3.0.48

package/package.json

@@ -1,13 +1,13 @@
 {
 	"name": "@atmosx/event-product-parser",
-	"version": "3.0.47",
+	"version": "3.0.48",
 	"description": "NOAA Weather Wire & NWS API Parser - Built for standalone and Project AtmosphericX Integration.",
 	"main": "dist/cjs/index.cjs",
 	"module": "dist/esm/index.mjs",
 	"repository": {
 		"type": "git",
 		"url": "git+https://github.com/AtmosphericX/event-product-parser",
-		"branch": "beta"
+		"branch": "v3-beta-branch"
 	},
 	"scripts": {
 		"start": "cd ./test && node ./index.js",
@@ -33,14 +33,13 @@
 	},
 	"homepage": "https://github.com/AtmosphericX/event-product-parser#readme",
 	"dependencies": {
-	    "express-ws": "5.0.2",
-		"express": "5.2.1",
 		"@xmpp/client": "0.14.0",
 		"better-sqlite3": "12.9.0",
 		"croner": "10.0.1",
+		"express": "5.2.1",
+		"express-ws": "5.0.2",
 		"jszip": "3.10.1",
 		"polygon-clipping": "0.15.7",
-		"request": "2.88.2",
 		"say": "0.16.0",
 		"shapefile": "0.6.6",
 		"typescript": "5.9.3",

package/src/@building/building.attachments.ts

@@ -38,12 +38,12 @@ type BroadcastifyResponse = {
 
 export const getEventAttachments = (event: TypeEvent): GetEventAttachmentsResponse[] | null => {
     let attachments = [];
-    const latestTime = getLatestIssuance();
+    const issuanceTime = getLatestIssuance();
     const spcNumber = event?.properties?.discussion_parameters?.discussion_number;
     const watchNumber = event?.properties?.watch_parameters?.watch_number;
     const locations = event?.properties?.locations_array;
     const events = [
-        { target: "Day 1", attachment: `https://www.spc.noaa.gov/products/outlook/day1otlk_${latestTime}.png` },
+        { target: "Day 1", attachment: `https://www.spc.noaa.gov/products/outlook/day1otlk_${issuanceTime}.png` },
         { target: "Day 2", attachment: `https://www.spc.noaa.gov/products/outlook/day2otlk.png` },
         { target: "Day 3", attachment: `https://www.spc.noaa.gov/products/outlook/day3otlk.png` },
         { target: "Mesoscale Discussion", attachment: `https://www.spc.noaa.gov/products/md/mcd${spcNumber}.png` },

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

@@ -27,7 +27,8 @@ import { getEmebed } from "../@parsers/@text/text.getEmbed";
 import { getCleanedEvent } from "../@building/building.clean"
 import { createHttp } from "../@modules/@utilities/utilities.createHttp";
 import { existsSync, mkdirSync, writeFileSync, readFileSync, appendFileSync } from "fs";
-import FormData from "form-data";
+import { setWarning } from "../@modules/@utilities/utilities.setWarning";
+
 
 
 
@@ -94,7 +95,7 @@ export const updateListener = async (event: TypeEvent): Promise<void> => {
             }
 
             if (webhook.enabled && webhook.destination) {
-                const ratelimit = setTimeoutAction({ identifier: webhook.destination, interval: webhook.ratelimit, max: webhook.ratelimit, addTime: true })
+                const ratelimit = setTimeoutAction({ identifier: webhook.destination, interval: webhook.ratelimit * 2, max: webhook.ratelimit, addTime: true })
                 const form = new FormData();
                 const embed = {
                     title: `${metadata.name} (${metadata.status})`,
@@ -128,19 +129,13 @@ export const updateListener = async (event: TypeEvent): Promise<void> => {
                 }
 
                 if (uploads?.file) { 
-                    form.append("fUpload", Buffer.from(metadata.file), { 
-                        filename: `${properties.event}_${properties.status}_${properties.metadata.tracking}.txt`, 
-                        contentType: "application/text" 
-                    });
+                    form.append("fUpload", new Blob([Buffer.from(metadata.file)], {type: "application/text"}), `${properties.event}_${properties.status}_${properties.metadata.tracking}.txt`)
                 }
 
                 if (uploads?.eas) { 
                     if (metadata.eas) {
                         const file = readFileSync(metadata.eas)
-                        form.append("fEas", Buffer.from(file), { 
-                            filename: `${properties.event}_${properties.status}_${properties.metadata.tracking}_eas.mp3`, 
-                            contentType: "audio/mpeg" 
-                        });
+                        form.append("fEas", new Blob([Buffer.from(file)], { type: "audio/mpeg" }), `${properties.event}_${properties.status}_${properties.metadata.tracking}_eas.mp3`)
                     }
                 }
 
@@ -150,13 +145,15 @@ export const updateListener = async (event: TypeEvent): Promise<void> => {
                     embeds: [embed]
                 }));
 
-                await createHttp({
+                const a = await createHttp({
                     url: webhook.destination,
                     timeout: 5000,
                     method: `POST`,
-                    headers: form.getHeaders(),
                     body: form
                 })
+                if (a.error) { 
+                    setWarning({ message: `Failed to send webhook: ${a.error.message}` })
+                }
             }
         }
     }

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,65 +27,44 @@ interface CreateHttpOptions {
 }
 
 export const createHttp = async (options: CreateHttpOptions): Promise<any> => {
-    return new Promise((resolve, reject) => {
-        try {
-            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
-                })  
-            })
-        } catch (error) {
-            return resolve({
-                error: true,
-                options: {},
-                status: -1,
-                message: error.message ?? `Unknown Error`
-            })
-        }
-    })
+	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

@@ -68,7 +68,7 @@ export const setCronSchedule = async (): Promise<void> => {
             }
         })
         if (response.error) {
-            return  setEventEmit({
+            return setEventEmit({
                 event: `onServiceStatus`,
                 metadata: {
                     type: "fetch-api",

package/src/bootstrap.ts

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