Merge pull request 'connect mqtt ws colo' (#38) from wisdom into main

Reviewed-on: #38

.env.example

@@ -45,18 +45,4 @@ IMAGEKIT_PRIVATE_KEY=private_vhO/jXHnEoaVYptOHIuZDPMbxIA=
 # CLIENT_SECRET=xxxxxxxxxxxxxxxxxxxxxxxx
 # REFRESH_TOKEN=1//XXXXXXXX
 
-ENDPOINT_WHATSAPP=https://117.102.231.130:9531/send
-# ENDPOINT_WHATSAPP=http://localhost:9529/send
-
-# ENDPOINT_FE=http://localhost:8592
-# ENDPOINT_FE=http://203.153.114.226:8466
-ENDPOINT_FE=https://117.102.231.130:9529
-
-
-# MQTT Connection
-MQTT_HOST=ws://117.102.231.130:7001
-MQTT_USERNAME=morekmorekmorek
-MQTT_PASSWORD=morek888
-TOPIC_COD=PIU_COD/ERROR_CODE
-
 VITE_KEY_SESSION=PetekRombonganPetekMorekMorakMarek

.gitignore

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

config/index.js

@@ -292,11 +292,11 @@ const mqttOptions = {
   clientId: 'express_mqtt_client_' + Math.random().toString(16).substr(2, 8),
   clean: true,
   connectTimeout: 4000,
-  username: process.env.MQTT_USERNAME ?? 'morekmorekmorek', // jika ada
-  password: process.env.MQTT_PASSWORD ?? 'morek888', // jika ada
+  username: 'morekmorekmorek', // jika ada
+  password: 'morek888', // jika ada
 };
 
-const mqttUrl = process.env.MQTT_HOST; // Ganti dengan broker kamu
+const mqttUrl = 'ws://117.102.231.130:7001'; // Ganti dengan broker kamu
 const topic = process.env.TOPIC_COD ?? 'morek';
 
 const mqttClient = mqtt.connect(mqttUrl, mqttOptions);

controllers/auth.controller.js

@@ -104,8 +104,6 @@ class AuthController {
     const bytes = CryptoJS.AES.decrypt(tokenRedirect, process.env.VITE_KEY_SESSION);
     const decrypted = JSON.parse(bytes.toString(CryptoJS.enc.Utf8));
 
-    console.log("decrypted: ", decrypted);
-
     const userPhone = decrypted?.user_phone
     const userName = decrypted?.user_name
     const idData = decrypted?.id

db/notification_error.db.js

@@ -21,8 +21,7 @@ const getNotificationByIdDb = async (id) => {
       d.device_name,
       d.device_location,
       d.listen_channel,
-      e.brand_name,
-      e.brand_id
+      e.brand_name
 
     FROM notification_error a
 
@@ -47,7 +46,6 @@ const getNotificationByIdDb = async (id) => {
 const getDeviceNotificationByIdDb = async (chanel_id) => {
   const queryText = `
     SELECT 
-      brand_id,
       device_code, 
       device_name, 
       device_location, 
@@ -97,8 +95,7 @@ const getAllNotificationDb = async (searchParams = {}) => {
     ],
     queryParams
   );
-
-  queryParams = whereParamAnd ? whereParamAnd : queryParams;
+  if (whereParamAnd) queryParams = whereParamAnd;
 
   const queryText = `
     SELECT
@@ -111,12 +108,12 @@ const getAllNotificationDb = async (searchParams = {}) => {
       a.is_delivered,
       a.is_read,
       a.is_active,
-      a.created_at,
 
       b.error_code,
       b.error_code_name,
       b.error_code_color,
       b.path_icon,
+      b.created_at,
 
       c.solution_name,
       c.type_solution,
@@ -132,17 +129,17 @@ const getAllNotificationDb = async (searchParams = {}) => {
 
       FROM notification_error a
 
-      LEFT JOIN m_device d
-        ON a.error_chanel = d.listen_channel AND d.deleted_at IS NULL
-
       LEFT JOIN brand_code b
-        ON a.error_code_id = b.error_code AND b.deleted_at IS NULL AND d.brand_id = b.brand_id
+        ON a.error_code_id = b.error_code_id AND b.deleted_at IS NULL
 
       LEFT JOIN brand_code_solution c
         ON b.error_code_id = c.error_code_id AND c.deleted_at IS NULL
         
+      LEFT JOIN m_device d
+        ON a.error_chanel = d.listen_channel AND d.deleted_at IS NULL
+
       LEFT JOIN m_brands e
-        ON d.brand_id = e.brand_id AND e.deleted_at IS NULL
+        ON d.brand_id = e.brand_id AND d.deleted_at IS NULL
 
     WHERE a.deleted_at IS NULL
       ${whereConditions.length > 0 ? ` AND ${whereConditions.join(" AND ")}` : ""}

db/notification_error_user.db.js

@@ -67,9 +67,7 @@ const getNotificationErrorUserByIdDb = async (id) => {
       d.error_code,
       d.error_code_name,
 
-      e.device_name,
-
-      c.error_chanel as chanel_id
+      e.device_name
       
     FROM notification_error_user a
     

db/notification_wa.db.js

@@ -46,22 +46,13 @@ const sendNotifikasi = async (phone, message) => {
 
   try {
     const response = await axios.post(endPointWhatsapp, payload,{httpsAgent} );
-
-    return {
-      success: true,
-      statusCode: response.status,   // 200, 201, dll
-      data: response.data
-    };
+    // console.log(response.data);
+    return response?.data
   } catch (error) {
-    return {
-      success: false,
-      statusCode: error.response?.status || null,
-      errorCode: error.code || null,  // ECONNABORTED, dll
-      message: error.response?.data || error.message
-    };
+    // console.error(error.response?.data || error.message);
+    return error.response?.data || error.message
   }
 
-
 };
 
 module.exports = {

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
     },
   ],
 };

package.json

@@ -47,7 +47,6 @@
     "nodemailer": "^6.8.0",
     "pg": "^8.8.0",
     "pino": "^6.11.3",
-    "pm2": "^6.0.14",
     "stripe": "^8.138.0",
     "svg-captcha": "^1.4.0",
     "swagger-ui-express": "^4.6.0",

routes/index.js

@@ -19,8 +19,7 @@ const notificationErrorSparepart = require("./notification_error_sparepart.route
 const sparepart = require("./sparepart.route")
 const notificationErrorLog = require("./notification_error_log.route")
 const notificationErrorUser = require("./notification_error_user.route")
-const errorCode = require("./error_code.route");
-const notifikasiWA = require("./notifikasi-wa.route");
+const errorCode = require("./error_code.route")
 
 router.use("/auth", auth);
 router.use("/user", users);
@@ -43,6 +42,5 @@ router.use("/sparepart", sparepart)
 router.use("/notification-log", notificationErrorLog)
 router.use("/notification-user", notificationErrorUser)
 router.use("/error-code", errorCode)
-router.use("/notifikasi-wa", notifikasiWA)
 
 module.exports = router;

routes/notifikasi-wa.route.js

@@ -1,14 +0,0 @@
-const express = require('express');
-const router = express.Router();
-const NotifikasiWaService = require('../services/notifikasi-wa.service');
-
-router.post('/restart-wa', async (req, res) => {
-  try {
-    const result = await NotifikasiWaService.restartWhatsapp();
-    return res.status(200).json(result);
-  } catch (error) {
-    return res.status(500).json(error);
-  }
-});
-
-module.exports = router;

services/notification_error.service.js

@@ -7,7 +7,7 @@ const {
   updateNotificationErrorDb,
 } = require("../db/notification_error.db");
 
-const { getErrorCodeByIdDb, getErrorCodeByBrandAndCodeDb } = require("../db/brand_code.db");
+const { getErrorCodeByIdDb } = require("../db/brand_code.db");
 
 const { getSolutionsByErrorCodeIdDb } = require("../db/brand_code_solution.db");
 
@@ -173,9 +173,10 @@ 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,
+    const errorCode = await getErrorCodeByIdDb(
       deviceNotification.error_code_id
     );
     const dataExist = await getUsersNotificationErrorDb(id);
@@ -221,11 +222,11 @@ class NotificationService {
         console.log("URL:", shortUrl);
 
         const bodyWithUrl =
-          `Hai ${user.contact_name || "-"},\n` +
-          `Terjadi peringatan dengan kode ${errorCode?.error_code ?? "-"} "${errorCode?.error_code_name}", Chanel ${deviceNotification?.error_chanel ?? "-"} ` +
-          `pada device ${deviceNotification.device_name ?? "berikut"}` +
-          `\nSilahkan cek detail pada link :` +
-          `${shortUrl}`;
+          `Hai ${user.contact_name || "-"}\n` +
+          `Terjadi peringatan dengan kode ${errorCode?.error_code || "-"} - ${
+            errorCode?.error_code_name
+          } pada device ${deviceNotification.device_name || "-"}.\n` +
+          `Silahkan cek detail pada link berikut:\n ${shortUrl}`;
 
         const resultSend = await sendNotifikasi(
           user.contact_phone,
@@ -234,7 +235,7 @@ class NotificationService {
         
         console.log("notifikasi wa:", resultSend)
 
-        const isSuccess = resultSend.success;
+        const isSuccess = resultSend?.error ? false : true;
 
         await updateNotificationErrorDb(user.notification_error_id, {
           is_send: isSuccess,
@@ -256,7 +257,8 @@ class NotificationService {
     console.log("result akhir: ", results)
 
     console.log(
-      `Resend chat: ${results.filter((r) => r.status === "success").length
+      `Resend chat: ${
+        results.filter((r) => r.status === "success").length
       }, Gagal: ${results.filter((r) => r.status === "failed").length}`
     );
   }

services/notification_error_user.service.js

@@ -139,17 +139,20 @@ class NotificationErrorUserService {
         const shortUrl = await shortUrltiny(encodedToken);
 
         const bodyWithUrl =
-          `Hai ${data.contact_name || "-"},\n` +
-          `Terjadi peringatan dengan kode ${data?.error_code ?? "-"} "${data?.error_code_name ?? ""}", Chanel ${data?.chanel_id ?? "-"} ` +
-          `pada device ${data?.device_name ?? "berikut"},` +
-          `\nSilahkan cek detail pada link :` +
+          `Hai ${data.contact_name || "-"}\n` +
+          `Terjadi peringatan dengan kode error ${data.error_code || "-"} - ${
+            data.error_code_name || "-"
+          } ` +
+          `pada device ${
+            data.device_name || "-"
+          }, silahkan cek detail pada link berikut:\n` +
           `${shortUrl}`;
 
         const resultSend = await sendNotifikasi(
           data.contact_phone,
           bodyWithUrl
         );
-        const isSuccess = resultSend.success;
+        const isSuccess = resultSend?.error ? false : true;
 
         const updateData = {
           is_send: isSuccess,
@@ -162,7 +165,8 @@ class NotificationErrorUserService {
           results.push({
             id,
             status: "failed",
-            message: `WhatsApp API Gagal: ${resultSend?.message || "Unknown Error"
+            message: `WhatsApp API Gagal: ${
+              resultSend?.message || "Unknown Error"
             }`,
           });
         } else {

services/notifikasi-wa.service.js

@@ -1,8 +1,5 @@
 const { getAllContactDb } = require("../db/contact.db");
-const {
-  InsertNotificationErrorDb,
-  updateNotificationErrorDb,
-} = require("../db/notification_error.db");
+const { InsertNotificationErrorDb } = require("../db/notification_error.db");
 const {
   createNotificationErrorUserDb,
   updateNotificationErrorUserDb,
@@ -12,15 +9,9 @@ const {
   shortUrltiny,
   sendNotifikasi,
 } = require("../db/notification_wa.db");
-const { getErrorCodeByBrandAndCodeDb } = require("../db/brand_code.db");
+const { getErrorCodeByIdDb } = 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");
-
 class NotifikasiWaService {
   async onNotification(topic, message) {
     try {
@@ -57,13 +48,9 @@ class NotifikasiWaService {
         const dataUsers = results.data;
 
         for (const chanel of resultChanel) {
+          const errorCode = await getErrorCodeByIdDb(chanel.value);
           const deviceNotification = await getDeviceNotificationByIdDb(
-            Number(chanel.chanel_id)
-          );
-
-          const errorCode = await getErrorCodeByBrandAndCodeDb(
-            deviceNotification?.brand_id ?? 0,
-            chanel.value
+            chanel.chanel_id
           );
 
           const data = {
@@ -77,13 +64,11 @@ class NotifikasiWaService {
 
           const resultNotificationError = await InsertNotificationErrorDb(data);
 
-          let isSendNotification = false;
-
           for (const dataUser of dataUsers) {
             if (dataUser.is_active) {
               const tokenRedirect = await generateTokenRedirect(
-                dataUser.contact_phone,
-                dataUser.contact_name,
+                dataUser.userPhone,
+                dataUser.userName,
                 resultNotificationError.notification_error_id
               );
 
@@ -92,12 +77,11 @@ class NotifikasiWaService {
               const shortUrl = await shortUrltiny(encodedToken);
 
               const bodyMessage =
-                `Hai ${dataUser.contact_name || "-"},\n` +
-                `Terjadi peringatan dengan kode ${chanel?.value ?? "-"} "${
-                  errorCode?.error_code_name ?? ""
-                }", Chanel ${chanel?.chanel_id ?? "-"} ` +
-                `pada device ${deviceNotification?.device_name ?? "berikut"},` +
-                `\nSilahkan cek detail pada link :` +
+                `Hai ${dataUser.contact_name || "-"}\n` +
+                `Terjadi peringatan dengan kode error ${errorCode?.error_code || "-"
+                } - ${errorCode?.error_code_name || "-"} ` +
+                `pada device ${deviceNotification?.device_name || "-"
+                }, silahkan cek detail pada link berikut:\n` +
                 `${shortUrl}`;
 
               const param = {
@@ -109,11 +93,10 @@ class NotifikasiWaService {
 
               const resultNotificationErrorUser =
                 await createNotificationErrorUserDb({
-                  notification_error_id: param.idData,
-
+                  notification_error_id:
+                    resultNotificationError.notification_error_id,
                   contact_phone: param.userPhone,
                   contact_name: param.userName,
-                  message_error_issue: param.bodyMessage,
                   is_send: false,
                 });
 
@@ -125,72 +108,16 @@ class NotifikasiWaService {
               await updateNotificationErrorUserDb(
                 resultNotificationErrorUser[0].notification_error_user_id,
                 {
-                  is_send: resultSend.success,
-                }
-              );
-
-              if (resultSend.success) {
-                isSendNotification = resultSend.success;
-              }
-            }
-          }
-
-          await updateNotificationErrorDb(
-            resultNotificationError.notification_error_id,
-            {
-              is_send: isSendNotification,
-              is_delivered: isSendNotification,
+                  is_send: resultSend?.error ? false : true,
                 }
               );
             }
           }
-    } catch (err) {
-      return err;
         }
       }
-
-  async restartWhatsapp() {
-    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);
-
-      if (!waProcess) throw new Error(`PM2 ${processName} not found`);
-
-      const waProcessId = waProcess.pm_id;
-      const pathDelete = waProcess.pm2_env.pm_cwd;
-
-      // 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));
-      // };
-
-      // console.log(`stop proses id: ${waProcessId}`)
-      await execPromise(`start powershell -Command "pm2 stop ${waProcessId}"`);
-
-      const pathFolderDelete = [
-        path.join(pathDelete, ".wwebjs_auth"),
-        path.join(pathDelete, ".wwebjs_cache"),
-      ];
-
-      // 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;
+    } catch (error) {
+      // throw new ErrorHandler(error.statusCode, error.message);
+      return error;
     }
   }
 }