Merge pull request 'wisdom' (#44) from wisdom into main

Reviewed-on: #44

.gitignore

@@ -3,4 +3,5 @@ node_modules
 .vscode
 request.http
 *.rest
-package-lock.json
+package-lock.json
+*.log

ecosystem.config.js

@@ -1,7 +1,7 @@
 module.exports = {
   apps: [
     {
-      name: "bengkel-api",
+      name: "cod-api",
       script: "./index.js", // Path to your entry file
       env: {
         NODE_ENV: "development",
@@ -9,6 +9,14 @@ module.exports = {
       env_production: {
         NODE_ENV: "production",
       },
+      // Logging configuration
+      // error_file: "C:\IDETAMA\pm2-log\cod-api\cod-api-error.log",
+      // out_file: "C:\IDETAMA\pm2-log\cod-api\cod-api-out.log",
+      // log_file: "C:\IDETAMA\pm2-log\cod-api\cod-api-combined.log", // optional combined file
+      error_file: "cod-api-error.log",
+      out_file: "cod-api-out.log",
+      log_file: "cod-api-combined.log", // optional combined file
+      time: true, // adds timestamps to logs
     },
   ],
 };

services/notification_error.service.js

@@ -173,7 +173,8 @@ class NotificationService {
 
   static async resendNotification(id) {
     const deviceNotification = await getNotificationByIdDb(id);
-    if (!deviceNotification) throw new ErrorHandler(404, "Data not found");
+    if (!deviceNotification)
+      throw new ErrorHandler(404, "Notification Data not found");
 
     const errorCode = await getErrorCodeByBrandAndCodeDb(deviceNotification?.brand_id ?? 0,
       deviceNotification.error_code_id

services/notifikasi-wa.service.js

@@ -14,7 +14,10 @@ const {
 } = require("../db/notification_wa.db");
 const { getErrorCodeByBrandAndCodeDb } = require("../db/brand_code.db");
 const { getDeviceNotificationByIdDb } = require("../db/notification_error.db");
+
 const { exec } = require("child_process");
+const util = require("util");
+const execPromise = util.promisify(exec);
 const fs = require("fs");
 const path = require("path");
 
@@ -107,6 +110,7 @@ class NotifikasiWaService {
               const resultNotificationErrorUser =
                 await createNotificationErrorUserDb({
                   notification_error_id: param.idData,
+
                   contact_phone: param.userPhone,
                   contact_name: param.userName,
                   message_error_issue: param.bodyMessage,
@@ -146,42 +150,49 @@ class NotifikasiWaService {
   }
 
   async restartWhatsapp() {
-    return new Promise((resolve, reject) => {
-      exec('pm2 jlist', (err, stdout) => {
-        if (err) return reject({ success: false, message: "Error list PM2" });
+    try {
+      const processName = "Whatsapp-API-notification" && "cod-whatsapp-notif";
+      const { stdout } = await execPromise("pm2 jlist");
+      const processes = JSON.parse(stdout);
+      const waProcess = processes.find((p) => p.name === processName);
 
-        try {
-          const processes = JSON.parse(stdout);
-          const waProcess = processes.find(p => 
-            p.name.toLowerCase().includes('whatsapp') || 
-            p.name.toLowerCase().includes('wa-api')
-          );
+      if (!waProcess) throw new Error(`PM2 ${processName} not found`);
 
-          if (!waProcess) return reject({ success: false, message: "PM2 List PM2 Not Found" });
+      const waProcessId = waProcess.pm_id;
+      const pathDelete = waProcess.pm2_env.pm_cwd;
 
-          const processId = waProcess.pm_id;
+      // const execLogs = (cmd) => {
+      //   const p = exec(cmd);
+      //   p.stdout.pipe(process.stdout);
+      //   p.stderr.pipe(process.stderr);
+      //   return new Promise((res) => p.on("exit", res));
+      // };
 
-          exec(`pm2 stop ${processId}`, () => {
-            const paths = [
-              path.join(__dirname, "../../.wwebjs_auth"),
-              path.join(__dirname, "../../.wwebjs_cache")
-            ];
+      // console.log(`stop proses id: ${waProcessId}`)
+      await execPromise(`start powershell -Command "pm2 stop ${waProcessId}"`);
 
-            paths.forEach(dir => {
-              if (fs.existsSync(dir)) fs.rmSync(dir, { recursive: true, force: true });
-            });
+      const pathFolderDelete = [
+        path.join(pathDelete, ".wwebjs_auth"),
+        path.join(pathDelete, ".wwebjs_cache"),
+      ];
 
-            exec(`pm2 restart ${processId}`, (reErr) => {
-              if (reErr) return reject({ success: false, message: "Gagal restart" });
-              resolve({ success: true, message: `WA has been restart.` });
-            });
-          });
-        } catch (e) {
-          reject({ success: false, message: "JSON Parse Error: " + e.message });
+      // console.log(`path: ${pathDelete}`);
+
+      pathFolderDelete.forEach((dir) => {
+        if (fs.existsSync(dir)) {
+          // console.log(`path folder: ${dir}`);
+          fs.rmSync(dir, { recursive: true, force: true });
         }
       });
-    });
+
+      // console.log(`start proses id: ${waProcessId}`);
+      await execPromise(`start powershell -Command "pm2 start ${waProcessId}"`);
+
+      return { success: true, message: "WhatsApp has been restarted." };
+    } catch (err) {
+      return err;
+    }
   }
 }
 
-module.exports = new NotifikasiWaService();
+module.exports = new NotifikasiWaService();