migrate metar cmd to zod

src/commands/utils/metar.ts

@@ -1,6 +1,8 @@
 import { ApplicationCommandOptionType, ApplicationCommandType, Colors } from 'discord.js';
-import fetch from 'node-fetch';
-import { constantsConfig, slashCommand, slashCommandStructure, makeEmbed, makeLines, Logger } from '../../lib';
+import { Request } from 'node-fetch';
+import { ZodError } from 'zod';
+import { constantsConfig, fetchData, makeEmbed, makeLines, slashCommand, slashCommandStructure } from '../../lib';
+import { Metar, MetarSchema } from '../../lib/apis/zodSchemas/metarSchemas';
 
 const data = slashCommandStructure({
     name: 'metar',
@@ -16,6 +18,12 @@ const data = slashCommandStructure({
     }],
 });
 
+const errorEmbed = (error: string) => makeEmbed({
+    title: 'METAR Error',
+    description: error,
+    color: Colors.Red,
+});
+
 export default slashCommand(data, async ({ interaction }) => {
     await interaction.deferReply();
 
@@ -32,55 +40,44 @@ export default slashCommand(data, async ({ interaction }) => {
         return interaction.editReply({ embeds: [noTokenEmbed] });
     }
 
+    let metar: Metar;
     try {
-        const metarReport: any = await fetch(`https://avwx.rest/api/metar/${icao}`, {
+        metar = await fetchData<Metar>(new Request(`https://avwx.rest/api/metar/${icao}`, {
             method: 'GET',
             headers: { Authorization: metarToken },
-        })
-            .then((res) => res.json());
-
-        if (metarReport.error) {
-            const invalidEmbed = makeEmbed({
-                title: `Metar Error | ${icao.toUpperCase()}`,
-                description: metarReport.error,
-                color: Colors.Red,
-            });
-            return interaction.editReply({ embeds: [invalidEmbed] });
-        }
-        const metarEmbed = makeEmbed({
-            title: `METAR Report | ${metarReport.station}`,
-            description: makeLines([
-                '**Raw Report**',
-                metarReport.raw,
-                '',
-                '**Basic Report:**',
-                `**Time Observed:** ${metarReport.time.dt}`,
-                `**Station:** ${metarReport.station}`,
-                `**Wind:** ${metarReport.wind_direction.repr}${metarReport.wind_direction.repr === 'VRB' ? '' : constantsConfig.units.DEGREES} at ${metarReport.wind_speed.repr} ${metarReport.units.wind_speed}`,
-                `**Visibility:** ${metarReport.visibility.repr} ${Number.isNaN(+metarReport.visibility.repr) ? '' : metarReport.units.visibility}`,
-                `**Temperature:** ${metarReport.temperature.repr} ${constantsConfig.units.CELSIUS}`,
-                `**Dew Point:** ${metarReport.dewpoint.repr} ${constantsConfig.units.CELSIUS}`,
-                `**Altimeter:** ${metarReport.altimeter.value.toString()} ${metarReport.units.altimeter}`,
-                `**Flight Rules:** ${metarReport.flight_rules}`,
-            ]),
-            fields: [
-                {
-                    name: 'Unsure of how to read the raw report?',
-                    value: 'Please refer to our guide [here.](https://docs.flybywiresim.com/pilots-corner/airliner-flying-guide/weather/)',
-                    inline: false,
-                },
-            ],
-            footer: { text: 'This METAR report may not accurately reflect the weather in the simulator. However, it will always be similar to the current conditions present in the sim.' },
-        });
-
-        return interaction.editReply({ embeds: [metarEmbed] });
+        }), MetarSchema);
     } catch (e) {
-        Logger.error('metar:', e);
-        const fetchErrorEmbed = makeEmbed({
-            title: 'Metar Error | Fetch Error',
-            description: 'There was an error fetching the METAR report. Please try again later.',
-            color: Colors.Red,
-        });
-        return interaction.editReply({ embeds: [fetchErrorEmbed] });
+        if (e instanceof ZodError) {
+            return interaction.editReply({ embeds: [errorEmbed('The API returned unknown data.')] });
+        }
+        return interaction.editReply({ embeds: [errorEmbed(`An error occurred while fetching the latest METAR for ${icao.toUpperCase()}.`)] });
     }
+
+    const metarEmbed = makeEmbed({
+        title: `METAR Report | ${metar.station}`,
+        description: makeLines([
+            '**Raw Report**',
+            metar.raw,
+            '',
+            '**Basic Report:**',
+            `**Time Observed:** ${metar.time.dt}`,
+            `**Station:** ${metar.station}`,
+            `**Wind:** ${metar.wind_direction.repr}${metar.wind_direction.repr === 'VRB' ? '' : constantsConfig.units.DEGREES} at ${metar.wind_speed.repr} ${metar.units.wind_speed}`,
+            `**Visibility:** ${metar.visibility.repr} ${Number.isNaN(+metar.visibility.repr) ? '' : metar.units.visibility}`,
+            `**Temperature:** ${metar.temperature.repr} ${constantsConfig.units.CELSIUS}`,
+            `**Dew Point:** ${metar.dewpoint.repr} ${constantsConfig.units.CELSIUS}`,
+            `**Altimeter:** ${metar.altimeter.value.toString()} ${metar.units.altimeter}`,
+            `**Flight Rules:** ${metar.flight_rules}`,
+        ]),
+        fields: [
+            {
+                name: 'Unsure of how to read the raw report?',
+                value: 'Please refer to our guide [here](https://docs.flybywiresim.com/pilots-corner/airliner-flying-guide/weather/).',
+                inline: false,
+            },
+        ],
+        footer: { text: 'This METAR report may not accurately reflect the weather in the simulator. However, it will always be similar to the current conditions present in the sim.' },
+    });
+
+    return interaction.editReply({ embeds: [metarEmbed] });
 });

src/commands/utils/taf.ts

@@ -1,7 +1,7 @@
 import { ApplicationCommandOptionType, ApplicationCommandType, Colors } from 'discord.js';
 import { Request } from 'node-fetch';
 import { ZodError } from 'zod';
-import { Logger, TAF, TafSchema, fetchData, makeEmbed, makeLines, slashCommand, slashCommandStructure } from '../../lib';
+import { TAF, TafSchema, fetchData, makeEmbed, makeLines, slashCommand, slashCommandStructure } from '../../lib';
 
 const data = slashCommandStructure({
     name: 'taf',
@@ -62,33 +62,23 @@ export default slashCommand(data, async ({ interaction }) => {
         return interaction.editReply({ embeds: [errorEmbed(`An error occurred while fetching the latest TAF for ${icao.toUpperCase()}.`)] });
     }
 
-    try {
-        const tafEmbed = makeEmbed({
-            title: `TAF Report | ${taf.station}`,
-            description: makeLines(['**Raw Report**', ...taf.forecast.map((forecast, i) => {
-                if (i === 0) {
-                    return `${taf.station} ${forecast.raw}`;
-                }
-                return forecast.raw;
-            })]),
-            fields: [
-                {
-                    name: 'Unsure of how to read the report?',
-                    value: `Please refer to our guide [here](https://docs.flybywiresim.com/pilots-corner/airliner-flying-guide/weather/#taf-example-decoded) or see above report decoded [here](https://e6bx.com/weather/${taf.station}/?showDecoded=1&focuspoint=tafdecoder).`,
-                    inline: false,
-                },
-            ],
-            footer: { text: 'This TAF report is only a forecast, and may not accurately reflect weather in the simulator.' },
-        });
+    const tafEmbed = makeEmbed({
+        title: `TAF Report | ${taf.station}`,
+        description: makeLines(['**Raw Report**', ...taf.forecast.map((forecast, i) => {
+            if (i === 0) {
+                return `${taf.station} ${forecast.raw}`;
+            }
+            return forecast.raw;
+        })]),
+        fields: [
+            {
+                name: 'Unsure of how to read the report?',
+                value: `Please refer to our guide [here](https://docs.flybywiresim.com/pilots-corner/airliner-flying-guide/weather/#taf-example-decoded) or see above report decoded [here](https://e6bx.com/weather/${taf.station}/?showDecoded=1&focuspoint=tafdecoder).`,
+                inline: false,
+            },
+        ],
+        footer: { text: 'This TAF report is only a forecast, and may not accurately reflect weather in the simulator.' },
+    });
 
-        return interaction.editReply({ embeds: [tafEmbed] });
-    } catch (error) {
-        Logger.error('taf:', error);
-        const fetchErrorEmbed = makeEmbed({
-            title: 'TAF Error | Fetch Error',
-            description: 'There was an error fetching the TAF report. Please try again later.',
-            color: Colors.Red,
-        });
-        return interaction.editReply({ embeds: [fetchErrorEmbed] });
-    }
+    return interaction.editReply({ embeds: [tafEmbed] });
 });

src/lib/apis/zodSchemas/metarSchemas.ts

@@ -0,0 +1,46 @@
+import { z } from 'zod';
+
+export const TimeSchema = z.object({ dt: z.string().datetime() });
+
+export const WindDirectionSchema = z.object({ repr: z.string() });
+
+export const WindSpeedSchema = z.object({ repr: z.string() });
+
+export const VisibilitySchema = z.object({ repr: z.string() });
+
+export const TemperatureSchema = z.object({ repr: z.string() });
+
+export const DewpointSchema = z.object({ repr: z.string() });
+
+export const AltimeterSchema = z.object({ value: z.number() });
+
+export const UnitsSchema = z.object({
+    accumulation: z.string(),
+    altimeter: z.string(),
+    altitude: z.string(),
+    temperature: z.string(),
+    visibility: z.string(),
+    wind_speed: z.string(),
+});
+
+/**
+ * This schema only contains currently used fields. If you wish to use other fields returned by the API add them below.
+ */
+export const MetarSchema = z.object({
+    station: z.string(),
+    raw: z.string(),
+    time: TimeSchema,
+    wind_direction: WindDirectionSchema,
+    wind_speed: WindSpeedSchema,
+    visibility: VisibilitySchema,
+    temperature: TemperatureSchema,
+    dewpoint: DewpointSchema,
+    altimeter: AltimeterSchema,
+    flight_rules: z.string(),
+    units: UnitsSchema,
+});
+
+/**
+ * This type only contains currently used fields. If you wish to use other fields returned by the API add them below.
+ */
+export type Metar = z.infer<typeof MetarSchema>;

src/lib/apis/zodSchemas/tafSchemas.ts

@@ -8,5 +8,4 @@ export const TafSchema = z.object({
     forecast: z.array(ForecastSchema),
 });
 
-export type Forecast = z.infer<typeof ForecastSchema>;
 export type TAF = z.infer<typeof TafSchema>;