Compare commits

...

50 Commits

Author SHA1 Message Date
c86800add0 Merge pull request 'wisdom' (#44) from wisdom into main
Reviewed-on: #44
2026-04-13 08:30:07 +00:00
0ce6a04f97 repair: add cod-whatsapp-notif in process pm2 2026-04-01 15:09:24 +07:00
76ac604ba8 restart change to start in api restart wa 2026-03-18 18:36:29 +07:00
f4b400fe02 repair: api restart wa 2026-03-18 17:25:40 +07:00
d53f0cba33 repair restart api: replace name in pm2 list 2026-03-16 14:22:19 +07:00
a20d36c012 add: api restart wa 2026-03-16 11:11:29 +07:00
88ce628204 add: api restart wa 2026-03-16 11:09:36 +07:00
d9186b8d3a Merge pull request 'fixing body message notification wa' (#42) from wisdom into main
Reviewed-on: #42
2026-01-20 04:33:05 +00:00
c6e1940604 Merge pull request 'fixing is delivered notification wa' (#41) from wisdom into main
Reviewed-on: #41
2026-01-12 07:37:34 +00:00
63bf57bde3 Merge pull request 'fixing notification wa' (#40) from wisdom into main
Reviewed-on: #40
2026-01-12 06:12:26 +00:00
84836875b9 Merge pull request 'wisdom' (#39) from wisdom into main
Reviewed-on: #39
2026-01-12 04:12:36 +00:00
c09d51591d Merge pull request 'connect mqtt ws colo' (#38) from wisdom into main
Reviewed-on: #38
2026-01-08 08:10:02 +00:00
2a2df58b7d Merge pull request 'wisdom' (#37) from wisdom into main
Reviewed-on: #37
2026-01-08 07:43:58 +00:00
ef491995f9 Merge pull request 'fixing verify access' (#36) from wisdom into main
Reviewed-on: #36
2026-01-08 05:38:22 +00:00
d9975b832b Merge pull request 'add log in resend notif wa' (#35) from wisdom into main
Reviewed-on: #35
2026-01-08 04:51:46 +00:00
205cb9d7cc Merge pull request 'Test push' (#34) from wisdom into main
Reviewed-on: #34
2026-01-08 03:48:11 +00:00
41f5cc9011 Merge branch 'wisdom'
# Conflicts:
#	services/notification_error.service.js
2026-01-08 10:45:02 +07:00
6885443bc2 repair resend notif wa 2026-01-08 09:32:20 +07:00
f5494fb4a1 Merge pull request 'repair: resend wa' (#29) from wisdom into main
Reviewed-on: #29
2026-01-07 05:18:12 +00:00
ed77576958 Merge pull request 'repair: resend notif wa' (#28) from wisdom into main
Reviewed-on: #28
2026-01-07 05:01:44 +00:00
9e862d1a48 Merge pull request 'repair: service & controller notif and notif user' (#27) from wisdom into main
Reviewed-on: #27
2026-01-07 03:10:33 +00:00
9913724d08 Merge pull request 'wisdom' (#26) from wisdom into main
Reviewed-on: #26
2026-01-06 11:41:36 +00:00
63a646fce3 Merge pull request 'add: self-signed certificate' (#25) from wisdom into main
Reviewed-on: #25
2026-01-06 05:38:46 +00:00
8d947a818b Merge pull request 'repair: change message wa notification' (#24) from wisdom into main
Reviewed-on: #24
2026-01-06 03:05:33 +00:00
81e07ed927 Merge pull request 'wisdom' (#23) from wisdom into main
Reviewed-on: #23
2026-01-05 07:06:16 +00:00
019c79d5bc Merge pull request 'wisdom' (#22) from wisdom into main
Reviewed-on: #22
2026-01-05 04:25:09 +00:00
fae6bb7a43 Merge pull request 'repair: notification error log created_by' (#21) from wisdom into main
Reviewed-on: #21
2025-12-31 03:20:14 +00:00
8ecb00a4d3 Merge pull request 'wisdom' (#20) from wisdom into main
Reviewed-on: #20
2025-12-23 05:19:45 +00:00
b62ca35185 Merge pull request 'wisdom' (#19) from wisdom into main
Reviewed-on: #19
2025-12-22 09:18:17 +00:00
5e74122b9e Merge pull request 'wisdom' (#18) from wisdom into main
Reviewed-on: #18
2025-11-28 05:09:58 +00:00
050543dbbf Merge pull request 'wisdom' (#17) from wisdom into main
Reviewed-on: #17
2025-11-25 03:50:08 +00:00
e1b397e1d3 Merge pull request 'add brand id' (#16) from wisdom into main
Reviewed-on: #16
2025-11-20 03:42:49 +00:00
34db6b8d89 Merge pull request 'wisdom' (#15) from wisdom into main
Reviewed-on: #15
2025-11-19 01:04:37 +00:00
5d1b6daef6 Merge pull request 'repair brand device: add brand sparepart in 2 step' (#14) from wisdom into main
Reviewed-on: #14
2025-11-18 00:25:14 +00:00
30431be379 Merge pull request 'wisdom' (#13) from wisdom into main
Reviewed-on: #13
2025-11-17 08:27:07 +00:00
361f750330 Update ecosystem.config.js 2025-11-04 06:14:58 +00:00
31f50d05ab Update .gitignore 2025-11-04 06:12:17 +00:00
961f0d6314 Update ecosystem.config.js 2025-11-04 05:50:27 +00:00
d87fc07a8e Update ecosystem.config.js 2025-11-04 05:46:55 +00:00
95e0c90a16 Merge pull request 'wisdom' (#11) from wisdom into main
Reviewed-on: #11
2025-10-28 09:46:55 +00:00
55e8a6d9ca Merge pull request 'repair: params user_schedule' (#10) from wisdom into main
Reviewed-on: #10
2025-10-28 04:48:25 +00:00
253d83357f Merge pull request 'add: tag_description in tags schema' (#9) from wisdom into main
Reviewed-on: #9
2025-10-27 04:07:05 +00:00
88a0404af0 Merge pull request 'wisdom' (#8) from wisdom into main
Reviewed-on: #8
2025-10-27 03:48:36 +00:00
d11207aedb Merge pull request 'wisdom' (#7) from wisdom into main
Reviewed-on: #7
2025-10-25 09:19:08 +00:00
d7044521bd Merge pull request 'wisdom' (#6) from wisdom into main
Reviewed-on: #6
2025-10-24 05:42:48 +00:00
e2a008c2e1 Merge pull request 'wisdom' (#5) from wisdom into main
Reviewed-on: #5
2025-10-24 03:35:12 +00:00
6d575f649a Merge pull request 'wisdom' (#4) from wisdom into main
Reviewed-on: #4
2025-10-23 04:51:40 +00:00
e8fd307a05 Merge pull request 'wisdom' (#3) from wisdom into main
Reviewed-on: #3
2025-10-22 05:27:56 +00:00
00239db472 Merge pull request 'wisdom' (#2) from wisdom into main
Reviewed-on: #2
2025-10-20 03:26:32 +00:00
251f7148b6 Merge pull request 'wisdom' (#1) from wisdom into main
Reviewed-on: #1
2025-09-17 08:40:15 +00:00
7 changed files with 98 additions and 14 deletions

3
.gitignore vendored
View File

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

View File

@@ -1,7 +1,7 @@
module.exports = { module.exports = {
apps: [ apps: [
{ {
name: "bengkel-api", name: "cod-api",
script: "./index.js", // Path to your entry file script: "./index.js", // Path to your entry file
env: { env: {
NODE_ENV: "development", NODE_ENV: "development",
@@ -9,6 +9,14 @@ module.exports = {
env_production: { env_production: {
NODE_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
}, },
], ],
}; };

View File

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

View File

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

View File

@@ -0,0 +1,14 @@
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;

View File

@@ -173,7 +173,8 @@ class NotificationService {
static async resendNotification(id) { static async resendNotification(id) {
const deviceNotification = await getNotificationByIdDb(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 getErrorCodeByBrandAndCodeDb(deviceNotification?.brand_id ?? 0,
deviceNotification.error_code_id deviceNotification.error_code_id

View File

@@ -1,5 +1,8 @@
const { getAllContactDb } = require("../db/contact.db"); const { getAllContactDb } = require("../db/contact.db");
const { InsertNotificationErrorDb, updateNotificationErrorDb } = require("../db/notification_error.db"); const {
InsertNotificationErrorDb,
updateNotificationErrorDb,
} = require("../db/notification_error.db");
const { const {
createNotificationErrorUserDb, createNotificationErrorUserDb,
updateNotificationErrorUserDb, updateNotificationErrorUserDb,
@@ -12,6 +15,12 @@ const {
const { getErrorCodeByBrandAndCodeDb } = require("../db/brand_code.db"); const { getErrorCodeByBrandAndCodeDb } = require("../db/brand_code.db");
const { getDeviceNotificationByIdDb } = require("../db/notification_error.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 { class NotifikasiWaService {
async onNotification(topic, message) { async onNotification(topic, message) {
try { try {
@@ -52,7 +61,10 @@ class NotifikasiWaService {
Number(chanel.chanel_id) Number(chanel.chanel_id)
); );
const errorCode = await getErrorCodeByBrandAndCodeDb(deviceNotification?.brand_id ?? 0, chanel.value); const errorCode = await getErrorCodeByBrandAndCodeDb(
deviceNotification?.brand_id ?? 0,
chanel.value
);
const data = { const data = {
error_code_id: chanel.value, error_code_id: chanel.value,
@@ -65,7 +77,7 @@ class NotifikasiWaService {
const resultNotificationError = await InsertNotificationErrorDb(data); const resultNotificationError = await InsertNotificationErrorDb(data);
let isSendNotification = false let isSendNotification = false;
for (const dataUser of dataUsers) { for (const dataUser of dataUsers) {
if (dataUser.is_active) { if (dataUser.is_active) {
@@ -81,7 +93,9 @@ class NotifikasiWaService {
const bodyMessage = const bodyMessage =
`Hai ${dataUser.contact_name || "-"},\n` + `Hai ${dataUser.contact_name || "-"},\n` +
`Terjadi peringatan dengan kode ${chanel?.value ?? "-"} "${errorCode?.error_code_name ?? ""}", Chanel ${chanel?.chanel_id ?? "-"} ` + `Terjadi peringatan dengan kode ${chanel?.value ?? "-"} "${
errorCode?.error_code_name ?? ""
}", Chanel ${chanel?.chanel_id ?? "-"} ` +
`pada device ${deviceNotification?.device_name ?? "berikut"},` + `pada device ${deviceNotification?.device_name ?? "berikut"},` +
`\nSilahkan cek detail pada link :` + `\nSilahkan cek detail pada link :` +
`${shortUrl}`; `${shortUrl}`;
@@ -96,6 +110,7 @@ class NotifikasiWaService {
const resultNotificationErrorUser = const resultNotificationErrorUser =
await createNotificationErrorUserDb({ await createNotificationErrorUserDb({
notification_error_id: param.idData, notification_error_id: param.idData,
contact_phone: param.userPhone, contact_phone: param.userPhone,
contact_name: param.userName, contact_name: param.userName,
message_error_issue: param.bodyMessage, message_error_issue: param.bodyMessage,
@@ -107,8 +122,6 @@ class NotifikasiWaService {
param.bodyMessage param.bodyMessage
); );
await updateNotificationErrorUserDb( await updateNotificationErrorUserDb(
resultNotificationErrorUser[0].notification_error_user_id, resultNotificationErrorUser[0].notification_error_user_id,
{ {
@@ -117,7 +130,7 @@ class NotifikasiWaService {
); );
if (resultSend.success) { if (resultSend.success) {
isSendNotification = resultSend.success isSendNotification = resultSend.success;
} }
} }
} }
@@ -131,9 +144,53 @@ class NotifikasiWaService {
); );
} }
} }
} catch (error) { } catch (err) {
// throw new ErrorHandler(error.statusCode, error.message); return err;
return error; }
}
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;
} }
} }
} }