This is a test email from the notifier.
"; + const subject = "Test Teams Notification"; + const body = "This is a test Teams webhook notification from the notifier."; - const APIKEY = process.env.APIKEY; - if (!APIKEY) { - console.warn("APIKEY not set. Skipping email notification."); - return; - } - const sendTo = process.env.SENDTO; - if (!sendTo) { - console.warn("SENDTO not set. Skipping email notification."); + const webhookUrl = process.env.TEAMS_WEBHOOK_URL; + if (!webhookUrl) { + console.warn("TEAMS_WEBHOOK_URL not set. Skipping Teams notification."); return; } - const sendFrom = process.env.SENDFROM; - if (!sendFrom) { - console.warn("SENDFROM not set. Skipping email notification."); - return; - } - - const resend = new Resend(APIKEY); try { - console.log(`Sending email with subject: "${subject}"`); - const { data, error } = await resend.emails.send({ - from: `WebClass Notifier <${sendFrom}>`, - to: sendTo, - subject: subject, - html: body, + console.log(`Sending Teams webhook notification with subject: "${subject}"`); + const response = await fetch(webhookUrl, { + method: "POST", + headers: { "Content-Type": "application/json" }, + body: JSON.stringify({ + text: `**${subject}**\n\n${body}`, + }), }); - if (error) { - console.error("Failed to send email:", { error }); - throw error; + if (!response.ok) { + const responseText = await response.text(); + throw new Error(`Webhook request failed with status ${response.status}: ${responseText}`); } - console.log("Email sent successfully:", { data }); - console.log("Test email sent successfully!"); + console.log("Teams webhook notification sent successfully!"); } catch (error) { - console.error("Failed to send test email:", error); + console.error("Failed to send test Teams notification:", error); } } diff --git a/index.js b/index.js index 8cfc0d8..85982a6 100644 --- a/index.js +++ b/index.js @@ -1,5 +1,5 @@ import { scrapeAssignments } from "./src/scraper.js"; -import { sendNotification } from "./src/sender.js"; +import { sendErrorNotification, sendLoginRequiredNotification, sendNotification } from "./src/sender.js"; import { processNotifications } from "./src/notifier.js"; import fs from "fs/promises"; import path from "path"; @@ -22,7 +22,8 @@ async function run() { const scrapeResult = await scrapeAssignments(); if (scrapeResult?.loginRequired) { - console.log("Scraping failed. Skipping notification."); + console.log("Scraping failed due to authentication/session issue. Sending alert notification."); + await sendLoginRequiredNotification(scrapeResult?.error || ""); return; } @@ -37,6 +38,11 @@ async function run() { } catch (error) { console.error("An error occurred in the main process:", error); + try { + await sendErrorNotification(error); + } catch (notificationError) { + console.error("Failed to send error notifications:", notificationError); + } process.exit(1); } } diff --git a/package-lock.json b/package-lock.json index f9a2266..1a572ad 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4,12 +4,11 @@ "requires": true, "packages": { "": { - "name": "webc-asgmt-notify", "dependencies": { "bottleneck": "^2.19.5", "dotenv": "^17.2.3", "puppeteer": "^24.34.0", - "resend": "^6.7.0" + "resend": "^6.12.4" } }, "node_modules/@babel/code-frame": { @@ -797,6 +796,12 @@ "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==", "license": "ISC" }, + "node_modules/postal-mime": { + "version": "2.7.4", + "resolved": "https://registry.npmjs.org/postal-mime/-/postal-mime-2.7.4.tgz", + "integrity": "sha512-0WdnFQYUrPGGTFu1uOqD2s7omwua8xaeYGdO6rb88oD5yJ/4pPHDA4sdWqfD8wQVfCny563n/HQS7zTFft+f/g==", + "license": "MIT-0" + }, "node_modules/progress": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz", @@ -890,12 +895,13 @@ } }, "node_modules/resend": { - "version": "6.7.0", - "resolved": "https://registry.npmjs.org/resend/-/resend-6.7.0.tgz", - "integrity": "sha512-2ZV0NDZsh4Gh+Nd1hvluZIitmGJ59O4+OxMufymG6Y8uz1Jgt2uS1seSENnkIUlmwg7/dwmfIJC9rAufByz7wA==", + "version": "6.12.4", + "resolved": "https://registry.npmjs.org/resend/-/resend-6.12.4.tgz", + "integrity": "sha512-lRpJ2Hxd+ht+JPDm97juRcUp9HOMuZyxaRFRFmc9Tx8iNWiei94Dx9v6SWufgKk2667C/uCeKKspMotOHSpCSg==", "license": "MIT", "dependencies": { - "svix": "1.84.1" + "postal-mime": "2.7.4", + "standardwebhooks": "1.0.0" }, "engines": { "node": ">=20" @@ -1025,16 +1031,6 @@ "node": ">=8" } }, - "node_modules/svix": { - "version": "1.84.1", - "resolved": "https://registry.npmjs.org/svix/-/svix-1.84.1.tgz", - "integrity": "sha512-K8DPPSZaW/XqXiz1kEyzSHYgmGLnhB43nQCMeKjWGCUpLIpAMMM8kx3rVVOSm6Bo6EHyK1RQLPT4R06skM/MlQ==", - "license": "MIT", - "dependencies": { - "standardwebhooks": "1.0.0", - "uuid": "^10.0.0" - } - }, "node_modules/tar-fs": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-3.1.1.tgz", @@ -1088,19 +1084,6 @@ "license": "MIT", "optional": true }, - "node_modules/uuid": { - "version": "10.0.0", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-10.0.0.tgz", - "integrity": "sha512-8XkAphELsDnEGrDxUOHB3RGvXz6TeuYSGEZBOjtTtPm2lwhGBjLgOzLHB63IUWfBpNucQjND6d3AOudO+H3RWQ==", - "funding": [ - "https://github.com/sponsors/broofa", - "https://github.com/sponsors/ctavan" - ], - "license": "MIT", - "bin": { - "uuid": "dist/bin/uuid" - } - }, "node_modules/webdriver-bidi-protocol": { "version": "0.3.10", "resolved": "https://registry.npmjs.org/webdriver-bidi-protocol/-/webdriver-bidi-protocol-0.3.10.tgz", diff --git a/package.json b/package.json index cee4ede..7dd34b6 100644 --- a/package.json +++ b/package.json @@ -4,6 +4,6 @@ "bottleneck": "^2.19.5", "dotenv": "^17.2.3", "puppeteer": "^24.34.0", - "resend": "^6.7.0" + "resend": "^6.12.4" } } diff --git a/src/config.js b/src/config.js index 1b9b522..3de1542 100644 --- a/src/config.js +++ b/src/config.js @@ -28,6 +28,7 @@ export default { apikey: process.env.APIKEY, sendfrom: process.env.SENDFROM, sendto: process.env.SENDTO, + teamsWebhookUrl: process.env.TEAMS_WEBHOOK_URL, baseUrl: 'https://webclass.kosen-k.go.jp/webclass/', entryUrl: 'https://webclass.kosen-k.go.jp/webclass/index.php', }; diff --git a/src/sender.js b/src/sender.js index 536b070..92ac810 100644 --- a/src/sender.js +++ b/src/sender.js @@ -1,46 +1,63 @@ import { Resend } from "resend"; import config from "./config.js"; -export async function sendNotification(subject, body) { - const { apikey, sendto, sendfrom } = config; - if (!apikey) { - console.warn("APIKEY not set. Skipping email notification."); - return; +async function sendTeamsWebhook(subject, body) { + const { teamsWebhookUrl } = config; + if (!teamsWebhookUrl) { + throw new Error("TEAMS_WEBHOOK_URL not set."); } - if (!sendto) { - console.warn("SENDTO not set. Skipping email notification."); - return; + + console.log(`Sending Teams webhook notification with subject: "${subject}"`); + const response = await fetch(teamsWebhookUrl, { + method: "POST", + headers: { "Content-Type": "application/json" }, + body: JSON.stringify({ + text: `**${subject}**\n\n${body}`, + }), + }); + + if (!response.ok) { + const responseText = await response.text(); + throw new Error(`Webhook request failed with status ${response.status}: ${responseText}`); } - const resend = new Resend(apikey); + console.log("Teams webhook notification sent successfully."); +} + +async function sendAdminEmail(subject, body) { + const { apikey, sendto, sendfrom } = config; + if (!apikey || !sendto || !sendfrom) { + throw new Error("APIKEY/SENDFROM/SENDTO not set."); + } - console.log(`Sending email with subject: "${subject}"`); + const resend = new Resend(apikey); + console.log(`Sending admin email notification with subject: "${subject}"`); const { data, error } = await resend.emails.send({ from: `WebClass Notifier <${sendfrom}>`, to: sendto, - subject: subject, + subject, html: body, }); if (error) { - console.error("Failed to send email:", { error }); - throw error; // Re-throw the error to be caught by the caller + throw error; } - console.log("Email sent successfully:", { data }); + console.log("Admin email notification sent successfully:", { data }); } -export async function sendLoginRequiredNotification() { - const { apikey, username } = config; - - if (!apikey || !username) { - console.warn( - "APIKEY or USER_ID not set. Skipping login required notification." - ); - return; +export async function sendNotification(subject, body) { + try { + await sendTeamsWebhook(subject, body); + } catch (error) { + console.error("Failed to send Teams webhook notification:", error.message); + throw error; } +} + +export async function sendLoginRequiredNotification(errorMessage = "") { + const { username } = config; - const resend = new Resend(apikey); const subject = "WebClass Scraper: Authentication Required"; const body = `Please run the script manually in your terminal to enter the MFA code:
node --env-file=.env src/scraper.js
This is a notification for the user: ${username}
+ ${errorMessage ? `Error detail: ${errorMessage}
` : ""} `; - console.log(`Sending authentication required email to ${username}...`); - const { data, error } = await resend.emails.send({ - from: "Scraper AlertAn error occurred in the main process.
+${errorText}
+ `;
+
+ try {
+ await sendAdminEmail(subject, body);
+ } catch (sendError) {
+ console.error("Failed to send runtime error admin email notification:", sendError.message);
+ throw sendError;
+ }
+}