@arghajit/playwright-pulse-report 0.2.10 → 0.3.1

package/scripts/generate-trend.mjs

@@ -1,6 +1,7 @@
 #!/usr/bin/env node
 import * as fs from "fs/promises";
 import path from "path";
+import { getOutputDir } from "./config-reader.mjs";
 
 // Use dynamic import for chalk as it's ESM only for prettier console logs
 let chalk;
@@ -22,8 +23,17 @@ const HISTORY_SUBDIR = "history"; // Subdirectory for historical JSON files
 const HISTORY_FILE_PREFIX = "trend-";
 const MAX_HISTORY_FILES = 15; // Store last 15 runs
 
+const args = process.argv.slice(2);
+let customOutputDir = null;
+for (let i = 0; i < args.length; i++) {
+  if (args[i] === "--outputDir" || args[i] === "-o") {
+    customOutputDir = args[i + 1];
+    break;
+  }
+}
+
 async function archiveCurrentRunData() {
-  const outputDir = path.resolve(process.cwd(), DEFAULT_OUTPUT_DIR);
+  const outputDir = await getOutputDir(customOutputDir);
   const currentRunJsonPath = path.join(outputDir, CURRENT_RUN_JSON_FILE);
   const historyDir = path.join(outputDir, HISTORY_SUBDIR);
 

package/scripts/merge-pulse-report.js

@@ -3,9 +3,30 @@
 const fs = require("fs");
 const path = require("path");
 
-const REPORT_DIR = "./pulse-report"; // Or change this to your reports directory
+const args = process.argv.slice(2);
+let customOutputDir = null;
+for (let i = 0; i < args.length; i++) {
+  if (args[i] === '--outputDir' || args[i] === '-o') {
+    customOutputDir = args[i + 1];
+    break;
+  }
+}
+
 const OUTPUT_FILE = "playwright-pulse-report.json";
 
+async function getReportDir() {
+  if (customOutputDir) {
+    return path.resolve(process.cwd(), customOutputDir);
+  }
+
+  try {
+    const { getOutputDir } = await import("./config-reader.mjs");
+    return await getOutputDir();
+  } catch (error) {
+    return path.resolve(process.cwd(), "pulse-report");
+  }
+}
+
 function getReportFiles(dir) {
   return fs
     .readdirSync(dir)
@@ -15,7 +36,7 @@ function getReportFiles(dir) {
     );
 }
 
-function mergeReports(files) {
+function mergeReports(files, reportDir) {
   let combinedRun = {
     totalTests: 0,
     passed: 0,
@@ -30,7 +51,7 @@ function mergeReports(files) {
   let latestGeneratedAt = "";
 
   for (const file of files) {
-    const filePath = path.join(REPORT_DIR, file);
+    const filePath = path.join(reportDir, file);
     const json = JSON.parse(fs.readFileSync(filePath, "utf-8"));
 
     const run = json.run || {};
@@ -66,17 +87,28 @@ function mergeReports(files) {
 }
 
 // Main execution
-const reportFiles = getReportFiles(REPORT_DIR);
+(async () => {
+  const REPORT_DIR = await getReportDir();
+
+  console.log(`Report directory set to: ${REPORT_DIR}`);
+  if (customOutputDir) {
+    console.log(`  (from CLI argument)`);
+  } else {
+    console.log(`  (auto-detected from playwright.config or using default)`);
+  }
 
-if (reportFiles.length === 0) {
-  console.log("No matching JSON report files found.");
-  process.exit(1);
-}
+  const reportFiles = getReportFiles(REPORT_DIR);
+
+  if (reportFiles.length === 0) {
+    console.log("No matching JSON report files found.");
+    process.exit(1);
+  }
 
-const merged = mergeReports(reportFiles);
+  const merged = mergeReports(reportFiles, REPORT_DIR);
 
-fs.writeFileSync(
-  path.join(REPORT_DIR, OUTPUT_FILE),
-  JSON.stringify(merged, null, 2)
-);
-console.log(`✅ Merged report saved as ${OUTPUT_FILE}`);
+  fs.writeFileSync(
+    path.join(REPORT_DIR, OUTPUT_FILE),
+    JSON.stringify(merged, null, 2)
+  );
+  console.log(`✅ Merged report saved as ${OUTPUT_FILE}`);
+})();

package/scripts/sendReport.mjs

@@ -10,6 +10,7 @@ import {
 import { fileURLToPath } from "url";
 import { fork } from "child_process"; // This was missing in your sendReport.js but present in generate-email-report.js and needed for runScript
 import "dotenv/config"; // CHANGED for dotenv
+import { getOutputDir } from "./config-reader.mjs";
 
 // Import chalk using top-level await if your Node version supports it (14.8+)
 // or keep the dynamic import if preferred, but ensure chalk is resolved before use.
@@ -28,7 +29,14 @@ try {
   };
 }
 
-const reportDir = "./pulse-report";
+const args = process.argv.slice(2);
+let customOutputDir = null;
+for (let i = 0; i < args.length; i++) {
+  if (args[i] === "--outputDir" || args[i] === "-o") {
+    customOutputDir = args[i + 1];
+    break;
+  }
+}
 
 let fetch;
 // Ensure fetch is imported and available before it's used in fetchCredentials
@@ -40,11 +48,8 @@ let fetch;
 
 let projectName;
 
-function getUUID() {
-  const reportPath = path.join(
-    process.cwd(),
-    `${reportDir}/playwright-pulse-report.json`
-  );
+function getUUID(reportDir) {
+  const reportPath = path.join(reportDir, "playwright-pulse-report.json");
   console.log("Report path:", reportPath);
 
   if (!fsExistsSync(reportPath)) {
@@ -71,18 +76,15 @@ const formatStartTime = (isoString) => {
   return date.toLocaleString(); // Default locale
 };
 
-const getPulseReportSummary = () => {
-  const reportPath = path.join(
-    process.cwd(),
-    `${reportDir}/playwright-pulse-report.json`
-  );
+const getPulseReportSummary = (reportDir) => {
+  const reportPath = path.join(reportDir, "playwright-pulse-report.json");
 
   if (!fsExistsSync(reportPath)) {
     // CHANGED
     throw new Error("Pulse report file not found.");
   }
 
-  const content = JSON.parse(fsReadFileSync(reportPath, "utf-8")); // CHANGED
+  const content = JSON.parse(fsReadFileSync(reportPath, "utf-8")); // D
   const run = content.run;
 
   const total = run.totalTests || 0;
@@ -220,9 +222,9 @@ const archiveRunScriptPath = path.resolve(
   "generate-email-report.mjs" // Or input_file_0.mjs if you rename it, or input_file_0.js if you configure package.json
 );
 
-async function runScript(scriptPath) {
+async function runScript(scriptPath, args = []) {
   return new Promise((resolve, reject) => {
-    const childProcess = fork(scriptPath, [], {
+    const childProcess = fork(scriptPath, args, {
       // Renamed variable
       stdio: "inherit",
     });
@@ -244,22 +246,46 @@ async function runScript(scriptPath) {
   });
 }
 
-const sendEmail = async (credentials) => {
-  await runScript(archiveRunScriptPath);
+const sendEmail = async (credentials, reportDir) => {
+  const archiveArgs = customOutputDir ? ["--outputDir", customOutputDir] : [];
+  await runScript(archiveRunScriptPath, archiveArgs);
   try {
     console.log("Starting the sendEmail function...");
 
-    const secureTransporter = nodemailer.createTransport({
-      host: "smtp.gmail.com",
-      port: 465,
-      secure: true,
-      auth: {
-        user: credentials.username,
-        pass: credentials.password,
-      },
-    });
+    let secureTransporter;
+    const mailHost = credentials.host
+      ? credentials.host.toLowerCase()
+      : "gmail";
+
+    if (mailHost === "gmail") {
+      secureTransporter = nodemailer.createTransport({
+        service: "gmail",
+        auth: {
+          user: credentials.username,
+          pass: credentials.password,
+        },
+      });
+    } else if (mailHost === "outlook") {
+      secureTransporter = nodemailer.createTransport({
+        host: "smtp.outlook.com",
+        port: 587,
+        secure: false,
+        auth: {
+          user: credentials.username,
+          pass: credentials.password,
+        },
+      });
+    } else {
+      // Should be caught in main, but safety check here
+      console.log(
+        chalk.red(
+          "Pulse report currently do not support provided mail host, kindly use either outlook mail or, gmail"
+        )
+      );
+      process.exit(1);
+    }
 
-    const reportData = getPulseReportSummary();
+    const reportData = getPulseReportSummary(reportDir);
     const htmlContent = generateHtmlTable(reportData);
 
     const mailOptions = {
@@ -289,7 +315,7 @@ const sendEmail = async (credentials) => {
   }
 };
 
-async function fetchCredentials(retries = 10) {
+async function fetchCredentials(reportDir, retries = 10) {
   // Ensure fetch is initialized from the dynamic import before calling this
   if (!fetch) {
     try {
@@ -304,7 +330,7 @@ async function fetchCredentials(retries = 10) {
   }
 
   const timeout = 10000;
-  const key = getUUID();
+  const key = getUUID(reportDir);
 
   if (!key) {
     console.error(
@@ -384,16 +410,65 @@ const main = async () => {
     }
   }
 
-  const credentials = await fetchCredentials();
-  if (!credentials) {
-    console.warn(
-      "Skipping email sending due to missing or failed credential fetch"
+  const reportDir = await getOutputDir(customOutputDir);
+
+  console.log(chalk.blue(`Preparing to send email report...`));
+  console.log(chalk.blue(`Report directory set to: ${reportDir}`));
+  if (customOutputDir) {
+    console.log(chalk.gray(`  (from CLI argument)`));
+  } else {
+    console.log(
+      chalk.gray(`  (auto-detected from playwright.config or using default)`)
+    );
+  }
+
+  // --- MODIFIED: Credentials Selection Logic ---
+  let credentials;
+
+  // Check if custom environment variables are provided
+  if (
+    process.env.PULSE_MAIL_HOST &&
+    process.env.PULSE_MAIL_USERNAME &&
+    process.env.PULSE_MAIL_PASSWORD
+  ) {
+    const host = process.env.PULSE_MAIL_HOST.toLowerCase();
+
+    // Validate host immediately
+    if (host !== "gmail" && host !== "outlook") {
+      console.log(
+        chalk.red(
+          "Pulse report currently do not support provided mail host, kindly use either outlook mail or, gmail."
+        )
+      );
+      process.exit(1);
+    }
+
+    console.log(
+      chalk.blue(
+        `Using custom credentials from environment variables for ${host}.`
+      )
     );
-    return;
+    credentials = {
+      username: process.env.PULSE_MAIL_USERNAME,
+      password: process.env.PULSE_MAIL_PASSWORD,
+      host: host,
+    };
+  } else {
+    // Fallback to existing fetch mechanism
+    credentials = await fetchCredentials(reportDir);
+    if (!credentials) {
+      console.warn(
+        "Skipping email sending due to missing or failed credential fetch"
+      );
+      return;
+    }
+    // Mark fetched credentials as gmail by default for compatibility
+    credentials.host = "gmail";
   }
+  // --- END MODIFICATION ---
   // Removed await delay(10000); // If not strictly needed, remove it.
   try {
-    await sendEmail(credentials);
+    await sendEmail(credentials, reportDir);
   } catch (error) {
     console.error("Error in main function: ", error);
   }