@atmosx/event-product-parser 3.0.42 → 3.0.44

package/dist/index.d.mts

@@ -3,6 +3,7 @@ type TypeWebhook = {
     title: string;
     message: string;
     upload: boolean;
+    eas: boolean;
     rate: number;
     events: string[];
 };
@@ -57,6 +58,7 @@ type TypeSettings = {
             IgnoreTestProducts: boolean;
         };
         EASSettings: {
+            ArchiveTTL: number;
             ArchiveDirectory: string;
             IntroWavFile: string;
         };
@@ -122,6 +124,8 @@ type TypeEventProperties = {
         pds_watch: boolean;
     };
     spc_parameters: {
+        spc_number: string;
+        spc_concerning: string;
         spc_max_tornado: string;
         spc_max_hail: string;
         spc_max_wind: string;
@@ -190,6 +194,8 @@ type TypeEvent = {
                 issued: string;
                 status: string;
             }[];
+            attachments?: string[];
+            raw: string;
         };
     } & TypeEventProperties;
 };

package/dist/index.d.ts

@@ -3,6 +3,7 @@ type TypeWebhook = {
     title: string;
     message: string;
     upload: boolean;
+    eas: boolean;
     rate: number;
     events: string[];
 };
@@ -57,6 +58,7 @@ type TypeSettings = {
             IgnoreTestProducts: boolean;
         };
         EASSettings: {
+            ArchiveTTL: number;
             ArchiveDirectory: string;
             IntroWavFile: string;
         };
@@ -122,6 +124,8 @@ type TypeEventProperties = {
         pds_watch: boolean;
     };
     spc_parameters: {
+        spc_number: string;
+        spc_concerning: string;
         spc_max_tornado: string;
         spc_max_hail: string;
         spc_max_wind: string;
@@ -190,6 +194,8 @@ type TypeEvent = {
                 issued: string;
                 status: string;
             }[];
+            attachments?: string[];
+            raw: string;
         };
     } & TypeEventProperties;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atmosx/event-product-parser",
-	"version": "3.0.42",
+	"version": "3.0.44",
 	"description": "NOAA Weather Wire & NWS API Parser - Built for standalone and Project AtmosphericX Integration.",
 	"main": "dist/cjs/index.cjs",
 	"module": "dist/esm/index.mjs",

package/src/@building/building.create.ts

@@ -17,8 +17,8 @@
 
 */
 
-import { TypeStanzaCompiled } from "../@types/types.compiled"
-import { TypeSettings } from "../@types/types.settings"
+import { TypeStanzaCompiled } from "../@types/type.compiled"
+import { TypeSettings } from "../@types/type.settings"
 import { bootstrap } from "../bootstrap"
 import { text } from "../@events/events.text"
 import { ugc } from "../@events/events.ugc"

package/src/@building/building.enhance.ts

@@ -18,7 +18,7 @@
 */
 
 import { TypeEvent } from "../@types/type.event";
-import { TypeSettings } from "../@types/types.settings";
+import { TypeSettings } from "../@types/type.settings";
 import { bootstrap } from "../bootstrap"
 import { betterEventNames } from "../@dictionaries/dictionaries.betterEventNames"
 

package/src/@building/building.geometry.ts

@@ -18,7 +18,7 @@
 */
 
 import { getSettings } from "../@modules/@utilities/utilities.getSettings";
-import { TypeSettings } from "../@types/types.settings"
+import { TypeSettings } from "../@types/type.settings"
 import { TypeEvent } from "../@types/type.event"
 import { getZonePolygon } from "../@parsers/@ugc/ugc.coordinates";
 

package/src/@building/building.headers.ts

@@ -17,7 +17,7 @@
 
 */
 
-import { TypePVTEC } from "../@types/types.pvtec";
+import { TypePVTEC } from "../@types/type.pvtec";
 import { TypeEventProperties } from "../@types/type.properties";
 
 interface GetHeaderOptions {

package/src/@building/building.office.ts

@@ -17,8 +17,8 @@
 
 */
 
-import { TypeAttributes } from "../@types/types.attributes";
-import { TypePVTEC } from "../@types/types.pvtec";
+import { TypeAttributes } from "../@types/type.attributes";
+import { TypePVTEC } from "../@types/type.pvtec";
 import { officeICAOs } from "../@dictionaries/dictionaries.officeICAOs";
 
 interface GetOfficeOptions { 

package/src/@building/building.outlooks.ts

@@ -0,0 +1,36 @@
+/*
+              _                             _               _     __   __
+         /\  | |                           | |             (_)    \ \ / /
+        /  \ | |_ _ __ ___   ___  ___ _ __ | |__   ___ _ __ _  ___ \ 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: http://localhost/documentation | https://atmosphericx.scriptkitty.cafe/documentation
+
+    Internal Package: @atmosx/event-product-parser
+
+*/
+
+import { TypeEvent } from "../@types/type.event"
+import { getLatestIssuance } from "../@modules/@utilities/utilities.getLatestIssuance";
+
+export const getEventAttachments = (event: TypeEvent): string[] | null => {
+    const latestTime = getLatestIssuance();
+    const validEvents = [
+        { target: "Day 1", attachment: `https://www.spc.noaa.gov/products/outlook/day1otlk_${latestTime}.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${event?.properties?.spc_parameters?.spc_number}.png` },
+    ]
+    const isValid = validEvents.find(outlook => outlook.target == event.properties.event);
+    if (isValid) {
+        return isValid?.attachment ? [isValid.attachment] : [];
+    }
+    return null;
+}

package/src/@building/building.properties.ts

@@ -18,10 +18,10 @@
 */
 
 import { TypeEventProperties } from "../@types/type.properties";
-import { TypeAttributes } from "../@types/types.attributes";
-import { TypeUGC } from "../@types/types.ugc";
-import { TypePVTEC } from "../@types/types.pvtec";
-import { TypeHVTEC } from "../@types/types.hvtec";
+import { TypeAttributes } from "../@types/type.attributes";
+import { TypeUGC } from "../@types/type.ugc";
+import { TypePVTEC } from "../@types/type.pvtec";
+import { TypeHVTEC } from "../@types/type.hvtec";
 import { regExp } from "../@dictionaries/dictionaries.regExp";
 import { getDescriptionFromProduct } from "../@parsers/@text/text.getDescriptionFromProduct";
 import { getPolygonFromProduct } from "../@parsers/@text/text.getPolygonFromProduct";
@@ -66,6 +66,8 @@ export const properties = (options: GetPropertiesOptions): TypeEventProperties =
             hail_threat: getTextFromProduct({ message: options.message, find: [`HAIL THREAT...`], removal: []}) ?? null,
         },
         spc_parameters: {
+            spc_number: getTextFromProduct({ message: options.message, find: [`Mesoscale Discussion `], removal: [`Mesoscale Discussion`, `Number`, `...`] }) ?? null,
+            spc_concerning: getTextFromProduct({ message: options.message, find: [`Concerning...`] }) ?? null,
             spc_max_tornado: getTextFromProduct({ message: options.message, find: [`MOST PROBABLE PEAK TORNADO INTENSITY...`] }) ?? null,
             spc_max_hail: getTextFromProduct({ message: options.message, find: [`MOST PROBABLE PEAK HAIL SIZE...`] }) ?? null,
             spc_max_wind: getTextFromProduct({ message: options.message, find: [`MOST PROBABLE PEAK WIND GUST...`] }) ?? null,

package/src/@building/building.tracking.ts

@@ -17,10 +17,10 @@
 
 */
 
-import { TypeAttributes } from "../@types/types.attributes";
+import { TypeAttributes } from "../@types/type.attributes";
 import { TypeEventProperties } from "../@types/type.properties";
-import { TypeStanzaCompiled } from "../@types/types.compiled";
-import { TypePVTEC } from "../@types/types.pvtec";
+import { TypeStanzaCompiled } from "../@types/type.compiled";
+import { TypePVTEC } from "../@types/type.pvtec";
 
 interface GetTrackingOptions { 
     type: `RAW` | `VTEC` | `API`

package/src/@building/building.validate.ts

@@ -19,13 +19,14 @@
 
 import { createHash } from "crypto"
 import { TypeEvent } from "../@types/type.event";
-import { TypeSettings } from "../@types/types.settings";
+import { TypeSettings } from "../@types/type.settings";
 import { bootstrap } from "../bootstrap"
 import { getEventEnhancedName } from "./building.enhance";
 import { getEventSignature } from "./building.signature"
 import { mkEvent } from "../@manager/manager.mkEvent";
 import { rmEvent } from "../@manager/manager.rmEvent";
 import { getEventGeometry } from "./building.geometry";
+import { getEventAttachments } from "./building.outlooks";
 import { updateNode } from "../@manager/manager.updateNodes";
 import { setEventEmit } from "../@modules/@utilities/utilities.setEventEmit";
 
@@ -51,7 +52,8 @@ export const validateEvents = async (events: TypeEvent[]): Promise<void> => {
             delete filteredProperties.metadata.ms;
         }
         filteredProperties.metadata = filteredProperties.metadata ?? {} as any;
-        properties.metadata.hash = createHash("sha256").update(JSON.stringify(filteredProperties)).digest("hex")        
+        properties.metadata.hash = createHash("sha256").update(JSON.stringify(filteredProperties)).digest("hex")  
+        properties.metadata.attachments = getEventAttachments(event)
         setEventEmit({ event: `onProductType${enhancedEventName.replace(/\s+/g, '')}`, metadata: define });
         
         if (properties.status_metadata.is_test) { 

package/src/@core/core.query.ts

@@ -17,7 +17,7 @@
 
 */
 
-import { TypeStanza } from "../@types/types.stanza";
+import { TypeStanza } from "../@types/type.stanza";
 import { bootstrap } from "../bootstrap";
 
 interface QueryOptions {

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

@@ -17,7 +17,7 @@
 
 */
 
-import { TypeSettings } from "../@types/types.settings";
+import { TypeSettings } from "../@types/type.settings";
 import { bootstrap } from "../bootstrap";
 import { setWarning } from "../@modules/@utilities/utilities.setWarning"
 import { setSettings } from "../@modules/@utilities/utilities.setSettings"

package/src/@events/events.api.ts

@@ -17,7 +17,7 @@
 
 */
 
-import { TypeStanzaCompiled } from "../@types/types.compiled"
+import { TypeStanzaCompiled } from "../@types/type.compiled"
 import { TypeEvent } from "../@types/type.event";
 import { getEventTracking } from "../@building/building.tracking";
 import { validateEvents } from "../@building/building.validate";
@@ -72,6 +72,8 @@ export const api = async (stanza: TypeStanzaCompiled): Promise<void> => {
                     hail_threat: feature?.properties?.parameters?.hailThreat?.[0] ?? null,
                 },
                 spc_parameters: {
+                    spc_number: getTextFromProduct({ message: feature?.properties?.description, find: [`Mesoscale Discussion `], removal: [`Mesoscale Discussion`, `Number`, `...`] }) ?? null,
+                    spc_concerning: getTextFromProduct({ message: feature?.properties?.description, find: [`Concerning...`] }) ?? null,
                     spc_max_tornado: getTextFromProduct({ message: feature?.properties?.description, find: [`MOST PROBABLE PEAK TORNADO INTENSITY...`] }) ?? null,
                     spc_max_hail: getTextFromProduct({ message: feature?.properties?.description, find: [`MOST PROBABLE PEAK HAIL SIZE...`] }) ?? null,
                     spc_max_wind: getTextFromProduct({ message: feature?.properties?.description, find: [`MOST PROBABLE PEAK WIND GUST...`] }) ?? null,
@@ -98,6 +100,7 @@ export const api = async (stanza: TypeStanzaCompiled): Promise<void> => {
                     header: `ZCZC-ATMOSX-${feature?.properties?.parameters?.WMOidentifier}`,
                     vtec: pVtec,
                     hvtec: null,
+                    raw: feature?.properties?.description,
                     history: [
                         {
                             description: feature?.properties?.description,

package/src/@events/events.text.ts

@@ -17,8 +17,8 @@
 
 */
 
-import { TypeAttributes } from "../@types/types.attributes";
-import { TypeStanzaCompiled } from "../@types/types.compiled"
+import { TypeAttributes } from "../@types/type.attributes";
+import { TypeStanzaCompiled } from "../@types/type.compiled"
 import { TypeEvent } from "../@types/type.event";
 import { properties } from "../@building/building.properties";
 import { getEventHeader } from "../@building/building.headers";
@@ -66,6 +66,7 @@ export const text = async (stanza: TypeStanzaCompiled): Promise<void> => {
                     header: header,
                     vtec: null,
                     hvtec: null,
+                    raw: message,
                     history: [
                         {
                             description: props.description,

package/src/@events/events.ugc.ts

@@ -17,8 +17,8 @@
 
 */
 
-import { TypeAttributes } from "../@types/types.attributes";
-import { TypeStanzaCompiled } from "../@types/types.compiled"
+import { TypeAttributes } from "../@types/type.attributes";
+import { TypeStanzaCompiled } from "../@types/type.compiled"
 import { TypeEvent } from "../@types/type.event";
 import { eventsMatchText } from "../@dictionaries/dictionaries.eventsMatchText";
 import { ugcExtract } from "../@parsers/@ugc/ugc.extract";
@@ -69,6 +69,7 @@ export const ugc = async (stanza: TypeStanzaCompiled): Promise<void> => {
                         header: header,
                         vtec: null,
                         hvtec: null,
+                        raw: message,
                         history: [
                             {
                                 description: props.description,

package/src/@events/events.vtec.ts

@@ -17,11 +17,11 @@
 
 */
 
-import { TypeAttributes } from "../@types/types.attributes";
-import { TypeStanzaCompiled } from "../@types/types.compiled"
+import { TypeAttributes } from "../@types/type.attributes";
+import { TypeStanzaCompiled } from "../@types/type.compiled"
 import { TypeEvent } from "../@types/type.event";
-import { TypePVTEC } from "../@types/types.pvtec";
-import { TypeHVTEC } from "../@types/types.hvtec";
+import { TypePVTEC } from "../@types/type.pvtec";
+import { TypeHVTEC } from "../@types/type.hvtec";
 import { pvExtract } from "../@parsers/@pvtec/pvtec.extract";
 import { hvExtract } from "../@parsers/@hvtec/hvtec.extract";
 import { ugcExtract } from "../@parsers/@ugc/ugc.extract";
@@ -70,6 +70,7 @@ export const vtec = async (stanza: TypeStanzaCompiled): Promise<void> => {
                             header: header,
                             vtec: pv,
                             hvtec: hVtec,
+                            raw: message,
                             history: [
                                 {
                                     description: props.description,

package/src/@manager/manager.createWebhook.ts

@@ -20,8 +20,11 @@
 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 { isImageReady } from "../@modules/@utilities/utilities.isImageReady"
+import { TypeWebhook } from "../@types/type.webhook";
 import { getCleanedEvent } from "../@building/building.clean";
+import { setEasTone } from "../@modules/@eas/eas.setEasTone";
+import { readFileSync } from "fs";
 import FormData from "form-data";
 
 interface CreateWebhookOptions { 
@@ -32,86 +35,95 @@ interface CreateWebhookOptions {
 export const createWebhook = async (options: CreateWebhookOptions): Promise<void> => {
     const event = options.event.properties;
     const settings = options.webhook;
-    
-    let body = [
-        event.locations ? `**Locations**: ${event.locations.slice(0,100)}` : 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
-            const th = event.parameters.wind_threat ?? null
-            const combined = [val, th].filter(Boolean).join(' ');
-            return combined ? `**Wind Gusts**: ${val} ${th ? `(${th})` : ''}` : null;
-        })(),
-        (() => {
-            const val = event.parameters.estimated_hail_size ?? null
-            const th = event.parameters.hail_threat ?? 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,
-        event.parameters.tornado_threat ? `**Tornado Threat**: ${event.parameters.tornado_threat}` : null,
-        event.spc_parameters.spc_max_tornado ? `**Max Tornado Threat**: ${event.spc_parameters.spc_max_tornado}` : null,
-        event.spc_parameters.spc_max_hail ? `**Max Hail Threat**: ${event.spc_parameters.spc_max_hail}` : null,
-        event.spc_parameters.spc_max_wind ? `**Max Wind Threat**: ${event.spc_parameters.spc_max_wind}` : null,
-        event.spc_parameters.spc_watch_issuance ? `**Watch Issuance**: ${event.spc_parameters.spc_watch_issuance}%` : null,
-        event.watch_parameters.watch_number ? `**Watch Number**: ${event.watch_parameters.watch_number}` : null,
-        event.watch_parameters.strong_tornadoes_probability ? `**Strong Tornadoes Probability**: ${event.watch_parameters.strong_tornadoes_probability}%` : null,
-        event.watch_parameters.additional_tornadoes_probability ? `**Additional Tornadoes Probability**: ${event.watch_parameters.additional_tornadoes_probability}%` : null,
-        event.watch_parameters.combined_hail_wind_probability ? `**Combined Hail/Wind Probability**: ${event.watch_parameters.combined_hail_wind_probability}%` : null,        
-        event.watch_parameters.severe_hail_probability ? `**Severe Hail Probability**: ${event.watch_parameters.severe_hail_probability}%` : null,
-        event.watch_parameters.hail_2in_probability ? `**Hail ≥2in Probability**: ${event.watch_parameters.hail_2in_probability}%` : null,
-        event.watch_parameters.max_hail_in ? `**Max Hail Inches**: ${event.watch_parameters.max_hail_in}` : null,
-        event.watch_parameters.severe_wind_probability ? `**Severe Wind Probability**: ${event.watch_parameters.severe_wind_probability}%` : null,
-        event.watch_parameters.max_wind_surface ? `**Max Surface Wind**: ${event.watch_parameters.max_wind_surface}` : null,
-        event.watch_parameters.max_tops_x100feet ? `**Max Tops (x100 feet)**: ${event.watch_parameters.max_tops_x100feet}` : null,
-        (event.parameters.tags?.length > 0) ? `**Tags**: ${event.parameters.tags.join(', ')}` : null,
-        (() => {
-            const val = event.geocode?.office?.name ?? `N/A`
-            const th = event.geocode?.office?.office ?? 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,
-        (() => {
-            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');
-
+    const line = (label: string, value: unknown, condition = true) => condition && value ? `${label} ${value}` : null;
     const isLimited = setTimeoutAction({ identifier: options.webhook.webhook, interval: options.webhook.rate, max: options.webhook.rate, addTime: true })
-    if (isLimited.limited) { return }
-
-    if (body.length > 1900) {   
-        body = body.substring(0, 1900) + "\n\n[Message truncated due to length]";
-        const blocks = (body.match(/```/g) ?? []).length;
-        if (blocks % 2 !== 0) body += "```";
-    }
-    const form = new FormData();
-    const embed = {
-        title: `${event.event} (${event.status})`,
-        description: body,
-        color: 16711680,
-        timestamp: new Date().toISOString(),
-        footer: { text: settings.title }
-    };
-    form.append("payload_json", JSON.stringify({
-        username: settings.title ?? "AtmosphericX",
-        content: settings.message ?? "",
-        embeds: [embed]
-    }));
-    if (settings.upload) {
-        form.append("file", Buffer.from(JSON.stringify((getCleanedEvent(event)), null, 2)), {
-            filename: `${event.event}_${event.status}_${event.metadata.tracking}.json`,
-            contentType: "application/json"
-        });
+    if (!isLimited.limited) {
+        const isStatement = event.status_metadata.is_statement;
+        const isExpired = event.status_metadata.is_expired;
+        let body = [
+            line(`**Locations:**`, event?.locations?.slice(0, 100)),
+            line(`**Issued:**`, `<t:${Math.floor(new Date(event.issued).getTime() / 1000)}:R>`),
+            line(`**Expires:**`, `<t:${Math.floor(new Date(event.expires).getTime() / 1000)}:R>`, !isExpired && !isStatement),
+            line(`**Damage Threat:**`, event.parameters.damage_threat, !isExpired),
+            line(`**Flood Threat:**`, event.parameters.flood_threat, !isExpired),
+            line(`**Tornado Threat:**`, event.parameters.tornado_threat, !isExpired),
+            line(`**Estimated Wind Gusts:**`, `${event.parameters.estimated_wind_gusts} ${event.parameters.wind_threat ? ` (${event.parameters.wind_threat})` : ''}`, !isExpired && event.parameters.estimated_wind_gusts != null),
+            line(`**Estimated Hail Size:**`, `${event.parameters.estimated_hail_size} ${event.parameters.hail_threat ? ` (${event.parameters.hail_threat})` : ''}`, !isExpired && event.parameters.estimated_hail_size != null),
+            line(`**Discussion:**`, event.spc_parameters.spc_number, !isExpired),
+            line(`**Concern:**`, event.spc_parameters.spc_concerning, !isExpired),
+            line(`**SPC Max Tornado Threat:**`, event.spc_parameters.spc_max_tornado, !isExpired),
+            line(`**SPC Max Hail Threat:**`, event.spc_parameters.spc_max_hail, !isExpired),
+            line(`**SPC Max Wind Threat:**`, event.spc_parameters.spc_max_wind, !isExpired),
+            line(`**SPC Watch Issuance Probability:**`, event.spc_parameters.spc_watch_issuance ? `${event.spc_parameters.spc_watch_issuance}%` : null, !isExpired),
+            line(`**Watch Number:**`, event.watch_parameters.watch_number, !isExpired),
+            line(`**Strong Tornadoes Probability:**`, event.watch_parameters.strong_tornadoes_probability ? `${event.watch_parameters.strong_tornadoes_probability}%` : null, !isExpired),
+            line(`**Additional Tornadoes Probability:**`, event.watch_parameters.additional_tornadoes_probability ? `${event.watch_parameters.additional_tornadoes_probability}%` : null, !isExpired),
+            line(`**Combined Hail/Wind Probability:**`, event.watch_parameters.combined_hail_wind_probability ? `${event.watch_parameters.combined_hail_wind_probability}%` : null, !isExpired),
+            line(`**Severe Hail Probability:**`, event.watch_parameters.severe_hail_probability ? `${event.watch_parameters.severe_hail_probability}%` : null, !isExpired),
+            line(`**Hail >2in Probability:**`, event.watch_parameters.hail_2in_probability ? `${event.watch_parameters.hail_2in_probability}%` : null, !isExpired),
+            line(`**Max Hail Inches:**`, event.watch_parameters.max_hail_in, !isExpired),
+            line(`**Severe Wind Probability:**`, event.watch_parameters.severe_wind_probability ? `${event.watch_parameters.severe_wind_probability}%` : null, !isExpired),
+            line(`**Max Surface Wind:**`, event.watch_parameters.max_wind_surface, !isExpired),
+            line(`**Max Tops (x100 feet):**`, event.watch_parameters.max_tops_x100feet, !isExpired), 
+            line(`**Tags:**`, event.parameters.tags?.length > 0 ? event.parameters.tags.join(', ') : null, !isExpired),
+            line(`**Sender:**`, event.geocode?.office?.name ? `${event.geocode.office.name} (${event.geocode.office.office})` : event.geocode?.office?.office),
+            line(`**Tracking:**`, event.metadata?.tracking),
+            line(`**Logs:**`, event.metadata.history?.length > 0 ? event.metadata.history.length : null),
+            line(``, event.description ? '```' + '\n' + event.description.split('\n').map(l => l.trim()).filter(Boolean).join('\n') + '\n' + '```' : null, !isExpired)
+        ].filter(Boolean).join('\n');
+    
+        if (body.length > 1900) {   
+            body = body.substring(0, 1900) + "\n\n[Message truncated due to length]";
+            const blocks = (body.match(/```/g) ?? []).length;
+            if (blocks % 2 !== 0) body += "```";
+        }
+        if (event.description.length < 25) { return }
+            
+        const form = new FormData();
+        const img = event.metadata.attachments?.[0]
+        const embed = {
+            title: `${event.event} (${event.status})`,
+            description: body,
+            color: 16711680,
+            timestamp: new Date().toISOString(),
+            image: {},
+            footer: { text: settings.title }
+        };
+        if (img) {
+            for (let i = 0; i < 5; i++) {
+                const ok = await isImageReady(img)
+                if (ok) break
+                await new Promise(r => setTimeout(r, 5000))
+            }
+            const finalCheck = await isImageReady(img)
+            if (finalCheck) {
+                embed.image = { url: img }
+            }
+        }
+        form.append("payload_json", JSON.stringify({
+            username: settings.title ?? "AtmosphericX",
+            content: settings.message ?? "",
+            embeds: [embed]
+        }));
+        if (settings.upload) {
+            form.append("fUpload", Buffer.from(`${event.metadata.raw}\n\n${JSON.stringify((getCleanedEvent(event)), null, 2)}`), { filename: `${event.event}_${event.status}_${event.metadata.tracking}.txt`, contentType: "application/text" });
+        }
+        if (settings.eas) { 
+            const audio = await setEasTone({
+                message: event.description,
+                header: event.metadata.header
+            });
+            const file = readFileSync(audio)
+            if (audio) {
+                form.append("fEas", Buffer.from(file), { filename: `${event.event}_${event.status}_${event.metadata.tracking}_eas.mp3`, contentType: "audio/mpeg" });
+            }
+        }
+        await createHttp({
+            url: settings.webhook,
+            timeout: 2000,
+            method: `POST`,
+            headers: form.getHeaders(),
+            body: form
+        })
     }
-    await createHttp({
-        url: settings.webhook,
-        timeout: 2000,
-        method: `POST`,
-        headers: form.getHeaders(),
-        body: form
-    })
 }

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

@@ -23,7 +23,7 @@ import { bootstrap } from "../bootstrap"
 import { setHash } from "./manager.setHash";
 import { updateWebhooks } from "./manager.updateWebhooks";
 import { updateNode } from "./manager.updateNodes";
-import { TypeSettings } from "../@types/types.settings";
+import { TypeSettings } from "../@types/type.settings";
 
 export const mkEvent = async (event: TypeEvent): Promise<void> => {
     const settings = bootstrap.settings as TypeSettings;

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

@@ -18,7 +18,7 @@
 */
 
 import { TypeEvent } from "../@types/type.event";
-import { TypeHash } from "../@types/types.hash"
+import { TypeHash } from "../@types/type.hash"
 import { bootstrap } from "../bootstrap"
 
 

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

@@ -19,7 +19,7 @@
 
 import { createWebhook } from "./manager.createWebhook";
 import { TypeEvent } from "../@types/type.event";
-import { TypeWebhook } from "../@types/types.webhook";
+import { TypeWebhook } from "../@types/type.webhook";
 import { bootstrap } from "../bootstrap"
 
 export const updateWebhooks = async (event: TypeEvent): Promise<void> => {

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

@@ -17,7 +17,7 @@
 
 */
 
-import { TypeSettings } from "../../@types/types.settings"
+import { TypeSettings } from "../../@types/type.settings"
 import { bootstrap } from '../../bootstrap'
 import { setWarning } from '../@utilities/utilities.setWarning';
 import { createEvent } from '../../@building/building.create';

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

@@ -19,7 +19,7 @@
 
 import fs from 'fs'
 import sqlite3 from 'better-sqlite3'
-import { TypeSettings } from "../../@types/types.settings"
+import { TypeSettings } from "../../@types/type.settings"
 import { bootstrap } from "../../bootstrap"
 import { setWarning } from '../@utilities/utilities.setWarning'
 import { importShapefiles } from './database.shapefiles'

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

@@ -21,7 +21,7 @@ import fs from 'fs'
 import { resolve, extname} from 'path'
 import { loadAsync } from 'jszip'
 import { read } from 'shapefile'
-import { TypeSettings } from "../../@types/types.settings"
+import { TypeSettings } from "../../@types/type.settings"
 import { bootstrap } from "../../bootstrap"
 import { setSleep } from '../@utilities/utilities.setSleep'
 import { setWarning } from '../@utilities/utilities.setWarning'

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

@@ -20,8 +20,8 @@
 
 import { bootstrap } from '../../bootstrap'
 import { setWarning } from '../@utilities/utilities.setWarning';
-import { TypeSettings } from "../../@types/types.settings"
-import { TypeStanzaCompiled } from '../../@types/types.compiled';
+import { TypeSettings } from "../../@types/type.settings"
+import { TypeStanzaCompiled } from '../../@types/type.compiled';
 
 export const importStanza = async (stanza: TypeStanzaCompiled): Promise<void> => {
     const settings = bootstrap.settings as TypeSettings;