diff --git a/backend/src/libs/socket.ts b/backend/src/libs/socket.ts index 7351637..8eb1464 100644 --- a/backend/src/libs/socket.ts +++ b/backend/src/libs/socket.ts @@ -70,8 +70,8 @@ export const initIO = (httpServer: Server): SocketIO => { }); - socket.on("media_uploaded", async (data: any) => { - + socket.on("media_uploaded", async (data: any) => { + handleMessage(data.msg, data); }); diff --git a/backend/src/server.ts b/backend/src/server.ts index 8adcfc6..d7c2d29 100644 --- a/backend/src/server.ts +++ b/backend/src/server.ts @@ -12,7 +12,8 @@ import { loadSchedulesCache } from "./helpers/SchedulingNotifyCache"; import { delRestoreControllFile } from "./helpers/RestoreControll"; import "./helpers/SchedulingNotifySendMessage" - +import axios from "axios"; +import os from 'os'; const server = app.listen(process.env.PORT, () => { logger.info(`Server started on port: ${process.env.PORT}`); @@ -30,9 +31,11 @@ initIO(server); // StartAllWhatsAppsSessions(); gracefulShutdown(server); - + (async () => { + console.log('os.tmpdir(): ', os.tmpdir()) + let whatsapps: any = await Whatsapp.findAll({ attributes: ['id', 'url'] }) // console.log('whatsapps: ', whatsapps) @@ -43,12 +46,20 @@ gracefulShutdown(server); try { - const response = await endPointQuery(`${whatsapps[i].dataValues.url}/api/status`, {}) + console.log(`API URL: ${whatsapps[i].dataValues.url}/api/connection/status`) + + const response = await axios.get(`${whatsapps[i].dataValues.url}/api/connection/status`, {}); + + console.log(`-------> Response: ${response.data.data}`) if (!response) { throw new Error('Response null'); } + if (response.data.data && response.data.data == 'CONNECTED') { + await whatsapps[i].update({ status: 'CONNECTED' }); + } + } catch (error: any) { await whatsapps[i].update({ status: 'OPENING' }); diff --git a/backend/src/services/MessageServices/CreateMessageService.ts b/backend/src/services/MessageServices/CreateMessageService.ts index 853cd07..b0d991b 100644 --- a/backend/src/services/MessageServices/CreateMessageService.ts +++ b/backend/src/services/MessageServices/CreateMessageService.ts @@ -19,7 +19,7 @@ interface Request { const CreateMessageService = async ({ messageData }: Request): Promise => { - // console.log('UPSERT MESSAGE messageData: ', messageData) + console.log('UPSERT MESSAGE messageData: ', messageData) await Message.upsert(messageData); diff --git a/backend/src/services/WbotServices/wbotMessageListener.ts b/backend/src/services/WbotServices/wbotMessageListener.ts index 3be0655..a066020 100644 --- a/backend/src/services/WbotServices/wbotMessageListener.ts +++ b/backend/src/services/WbotServices/wbotMessageListener.ts @@ -167,7 +167,7 @@ const verifyMediaMessage = async ( }; await ticket.update({ lastMessage: msg.body || media.filename }); - const newMessage = await CreateMessageService({ messageData }); + const newMessage = await CreateMessageService({ messageData }); return newMessage; }; @@ -198,7 +198,7 @@ const verifyMessage = async ( }; - await ticket.update({ lastMessage: msg.body }); + await ticket.update({ lastMessage: msg.body }); await CreateMessageService({ messageData }); }; @@ -418,6 +418,8 @@ const handleMessage = async ( msg: any, wbot: any ): Promise => { + + console.log('kkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkk') if (!msg.fromMe) { @@ -557,7 +559,11 @@ const handleMessage = async ( } // - + + if(msg.fromMe){ + console.log('====> msg.fromMe: ',msg.fromMe) + + } if (msg.hasMedia) { await verifyMediaMessage(msg, ticket, contact, wbot.media, wbot.quotedMsg);