Correção do restore

backend/.wwebjs_auth/sessions/1657314170.txt

@@ -0,0 +1 @@
+Whatsapp id: 33 | Fri Jul 08 2022 15:02:50 GMT-0300 (Brasilia Standard Time)

backend/src/controllers/WhatsAppSessionController.ts

@@ -44,7 +44,7 @@ const restart = async (req: Request, res: Response): Promise<Response> => {
 
   const whatsapp = await ShowWhatsAppService(whatsappId);
 
-  await restartWhatsSession(whatsapp)
+  restartWhatsSession(whatsapp, true)
 
   return res.status(200).json({ message: "Starting session." });
 };

backend/src/helpers/RestartWhatsSession.ts

@@ -10,7 +10,7 @@ const fsPromises = require("fs/promises");
 const fs = require('fs')
 
 // Restart session
-export const restartWhatsSession = async (whatsapp: Whatsapp) => {
+export const restartWhatsSession = async (whatsapp: Whatsapp, backupSession: boolean = false) => {
 
     console.log('RESTARTING THE whatsapp.id: ', whatsapp.id)
 
@@ -34,6 +34,6 @@ export const restartWhatsSession = async (whatsapp: Whatsapp) => {
  
     console.log('RESTARTING SESSION...')
 
-    await StartWhatsAppSession(whatsapp);
+    await StartWhatsAppSession(whatsapp, backupSession);
 
 }

backend/src/helpers/SetTicketMessagesAsRead.ts

@@ -19,9 +19,9 @@ const SetTicketMessagesAsRead = async (ticket: Ticket): Promise<void> => {
 
   try {
     const wbot = await GetTicketWbot(ticket);
-    await wbot.sendSeen(
+    
-      `${ticket.contact.number}@${ticket.isGroup ? "g" : "c"}.us`
+    await wbot.sendSeen(`${ticket.contact.number}@${ticket.isGroup ? "g" : "c"}.us`);
-    );
+
   } catch (err) {
     logger.warn(
       `Could not mark messages as read. Maybe whatsapp session disconnected? Err: ${err}`

backend/src/libs/wbot.ts

@@ -10,6 +10,7 @@ const fs = require('fs')
 import { copyFolder } from "../helpers/CopyFolder";
 import path from "path";
 import { number } from "yup";
+import { removeDir } from "../helpers/DeleteDirectory";
 
 interface Session extends Client {
   id?: number;
@@ -43,7 +44,7 @@ const syncUnreadMessages = async (wbot: Session) => {
   }
 };
 
-export const initWbot = async (whatsapp: Whatsapp): Promise<Session> => {
+export const initWbot = async (whatsapp: Whatsapp, backupSessionRestore: boolean = false): Promise<Session> => {
   return new Promise((resolve, reject) => {
     try {
 
@@ -63,29 +64,12 @@ export const initWbot = async (whatsapp: Whatsapp): Promise<Session> => {
         puppeteer: { args: ['--no-sandbox', '--disable-setuid-sandbox'], executablePath: process.env.CHROME_BIN || undefined },
       });
 
-      //OPÇÃO DEFAULT NAO MD
-      // const wbot: Session = new Client({session: sessionCfg, 
-      //   puppeteer: {executablePath: process.env.CHROME_BIN || undefined
-      //   }
-      // }); 
-
-      //OPÇÃO MD ANTIGO COM ERRO
-      // const io = getIO();
-      // const sessionName = whatsapp.name;
-      // const SESSION_FILE_PATH = './session.json'
-      // let sessionCfg
-      // if(fs.existsSync(SESSION_FILE_PATH)){
-      //   sessionCfg = require(SESSION_FILE_PATH)
-      // }  
-      // const wbot: Session = new Client({ puppeteer: { headless: true },  clientId: 'bd_'+whatsapp.id}) 
-
-
 
       wbot.initialize();
 
       wbot.on("qr", async qr => {
 
-         
+
         if (!backupSession.includes(whatsapp.id)) {
           backupSession.push(whatsapp.id)
         }
@@ -163,19 +147,22 @@ export const initWbot = async (whatsapp: Whatsapp): Promise<Session> => {
         await syncUnreadMessages(wbot);
 
         resolve(wbot);
- 
+
 
 
 
         console.log(`>>>>>>>>>>>>>>>>>>>>>>>>>.. BACKUP SESSION whatsapp.id ${whatsapp.id} | backupSession: ${backupSession}`)
 
-        const whatsIndex = backupSession.findIndex((id:number) => id === +whatsapp.id);
+        const whatsIndex = backupSession.findIndex((id: number) => id === +whatsapp.id);
 
         console.log('               whatsIndex: ', whatsIndex)
-       
-        if (whatsIndex !== -1) {
 
-          backupSession.splice(whatsIndex, 1);
+        if (whatsIndex !== -1 || backupSessionRestore) {
+
+          if (whatsIndex !== -1) {
+            backupSession.splice(whatsIndex, 1);
+          }
+
 
           setTimeout(async () => {
 
@@ -183,6 +170,9 @@ export const initWbot = async (whatsapp: Whatsapp): Promise<Session> => {
             const destPath = path.join(__dirname, `../../.wwebjs_auth/sessions`, `session-bd_${whatsapp.id}`)
 
             if (fs.existsSync(path.join(__dirname, `../../.wwebjs_auth/sessions`))) {
+
+              await removeDir(destPath)
+
               // copy the good session for backup dir
               copyFolder(sourcePath, destPath)
             }
@@ -193,9 +183,9 @@ export const initWbot = async (whatsapp: Whatsapp): Promise<Session> => {
             console.log(` COPIOU backup whatsapp.id ---------------------------------->${whatsapp.id}`)
 
 
-          }, 30000);
+          }, 55000);
 
-          console.log('                                PASSOU NO TIMEOUT!')
+          console.log('                                PASSOU NO TIMEOUT whatsapp.id: ',whatsapp.id)
 
 
         }

backend/src/services/WbotServices/StartWhatsAppSession.ts

@@ -5,7 +5,7 @@ import { getIO } from "../../libs/socket";
 import wbotMonitor from "./wbotMonitor";
 import { logger } from "../../utils/logger";
 
-export const StartWhatsAppSession = async (whatsapp: Whatsapp): Promise<void> => {
+export const StartWhatsAppSession = async (whatsapp: Whatsapp, backupSession: boolean = false): Promise<void> => {
   await whatsapp.update({ status: "OPENING" });
 
   const io = getIO();
@@ -15,7 +15,7 @@ export const StartWhatsAppSession = async (whatsapp: Whatsapp): Promise<void> =>
   });
 
   try {
-    const wbot = await initWbot(whatsapp);
+    const wbot = await initWbot(whatsapp, backupSession);
     wbotMessageListener(wbot);
     wbotMonitor(wbot, whatsapp);
   } catch (err) {