First github Commit

This commit is contained in:
canove
2020-06-18 17:25:43 -03:00
parent 48ee6385d3
commit 8a6324a98b
19 changed files with 391 additions and 210 deletions

View File

@@ -3,12 +3,23 @@ const Message = require("../models/Message");
const Sequelize = require("sequelize");
exports.getContacts = async (req, res) => {
const { searchParam } = req.query;
const lowerSerachParam = searchParam.toLowerCase();
const whereCondition = {
name: Sequelize.where(
Sequelize.fn("LOWER", Sequelize.col("name")),
"LIKE",
"%" + lowerSerachParam + "%"
),
};
//todo >> add contact number to search where condition
try {
const contacts = await Contact.findAll({
include: {
model: Message,
attributes: [],
},
where: whereCondition,
attributes: {
include: [
[
@@ -25,7 +36,7 @@ exports.getContacts = async (req, res) => {
],
],
},
order: [[Message, "createdAt", "DESC"]],
order: [["updatedAt", "DESC"]],
});
return res.json(contacts);

View File

@@ -3,7 +3,7 @@ const Message = require("../models/Message");
const Contact = require("../models/Contact");
const { getIO } = require("../socket");
const { getWbot } = require("./wbot");
const sequelize = require("sequelize");
const Sequelize = require("sequelize");
const { MessageMedia } = require("whatsapp-web.js");
@@ -44,13 +44,11 @@ exports.getContactMessages = async (req, res, next) => {
const { contactId } = req.params;
const { searchParam, pageNumber = 1 } = req.query;
console.log(req.body, req.query);
const lowerSerachParam = searchParam.toLowerCase();
const whereCondition = {
messageBody: sequelize.where(
sequelize.fn("LOWER", sequelize.col("messageBody")),
messageBody: Sequelize.where(
Sequelize.fn("LOWER", Sequelize.col("messageBody")),
"LIKE",
"%" + lowerSerachParam + "%"
),
@@ -90,7 +88,11 @@ exports.getContactMessages = async (req, res, next) => {
};
});
return res.json({ messages: serializedMessages.reverse(), messagesFound });
return res.json({
messages: serializedMessages.reverse(),
contact: contact,
messagesFound,
});
} catch (err) {
next(err);
}

View File

@@ -1,57 +1,72 @@
const qrCode = require("qrcode-terminal");
const { Client } = require("whatsapp-web.js");
const Whatsapp = require("../models/Whatsapp");
const { getIO } = require("../socket");
let wbot;
module.exports = {
init: async () => {
let sessionCfg;
try {
let sessionCfg;
const dbSession = await Whatsapp.findOne({ where: { id: 1 } });
if (dbSession && dbSession.session) {
sessionCfg = JSON.parse(dbSession.session);
}
const dbSession = await Whatsapp.findOne({ where: { id: 1 } });
if (dbSession && dbSession.session) {
sessionCfg = JSON.parse(dbSession.session);
}
wbot = new Client({
session: sessionCfg,
restartOnAuthFail: true,
});
wbot.initialize();
wbot.on("qr", async qr => {
qrCode.generate(qr, { small: true });
await Whatsapp.upsert({ id: 1, qrcode: qr, status: "pending" });
});
wbot.on("authenticated", async session => {
console.log("AUTHENTICATED");
await Whatsapp.upsert({
id: 1,
session: JSON.stringify(session),
status: "authenticated",
wbot = new Client({
session: sessionCfg,
restartOnAuthFail: true,
});
});
wbot.on("auth_failure", async msg => {
console.error("AUTHENTICATION FAILURE", msg);
await Whatsapp.destroy({ where: { id: 1 } });
});
wbot.on("ready", async () => {
console.log("READY");
await Whatsapp.update({ status: "online" }, { where: { id: 1 } });
// const chats = await wbot.getChats(); // pega as mensagens nao lidas (recebidas quando o bot estava offline)
// let unreadMessages; // todo > salvar isso no DB pra mostrar no frontend
// for (let chat of chats) {
// if (chat.unreadCount > 0) {
// unreadMessages = await chat.fetchMessages({
// limit: chat.unreadCount,
// });
// }
// }
wbot.initialize();
wbot.on("qr", async qr => {
qrCode.generate(qr, { small: true });
await Whatsapp.upsert({ id: 1, qrcode: qr, status: "pending" });
getIO().emit("qrcode", {
action: "update",
qr: qr,
});
});
wbot.on("authenticated", async session => {
console.log("AUTHENTICATED");
await Whatsapp.upsert({
id: 1,
session: JSON.stringify(session),
status: "authenticated",
});
getIO().emit("whats_auth", {
action: "authentication",
session: dbSession,
});
});
wbot.on("auth_failure", async msg => {
console.error("AUTHENTICATION FAILURE", msg);
await Whatsapp.update({ session: "" }, { where: { id: 1 } });
});
wbot.on("ready", async () => {
console.log("READY");
await Whatsapp.update(
{ status: "online", qrcode: "" },
{ where: { id: 1 } }
);
// const chats = await wbot.getChats(); // pega as mensagens nao lidas (recebidas quando o bot estava offline)
// let unreadMessages; // todo > salvar isso no DB pra mostrar no frontend
// for (let chat of chats) {
// if (chat.unreadCount > 0) {
// unreadMessages = await chat.fetchMessages({
// limit: chat.unreadCount,
// });
// }
// }
// console.log(unreadMessages);
wbot.sendPresenceAvailable();
});
return wbot;
// console.log(unreadMessages);
wbot.sendPresenceAvailable();
});
return wbot;
} catch (err) {
console.log(err);
}
},
getWbot: () => {

View File

@@ -1,10 +1,6 @@
const Contact = require("../models/Contact");
const Message = require("../models/Message");
const Whatsapp = require("../models/Whatsapp");
const wbotMessageListener = require("./wbotMessageListener");
const path = require("path");
const fs = require("fs");
const { getIO } = require("../socket");
const { getWbot, init } = require("./wbot");
@@ -12,32 +8,43 @@ const wbotMonitor = () => {
const io = getIO();
const wbot = getWbot();
wbot.on("change_state", newState => {
console.log("monitor", newState);
});
try {
wbot.on("change_state", newState => {
console.log("monitor", newState);
});
wbot.on("change_battery", batteryInfo => {
// Battery percentage for attached device has changed
const { battery, plugged } = batteryInfo;
console.log(`Battery: ${battery}% - Charging? ${plugged}`);
});
wbot.on("change_battery", async batteryInfo => {
// Battery percentage for attached device has changed
const { battery, plugged } = batteryInfo;
try {
await Whatsapp.update({ battery, plugged }, { where: { id: 1 } });
} catch (err) {
console.log(err);
}
wbot.on("disconnected", reason => {
console.log("disconnected", reason);
wbot.destroy();
setTimeout(() =>
init()
.then(res => {
wbotMessageListener();
wbotMonitor();
})
.catch(err => console.log(err))
);
});
console.log(`Battery: ${battery}% - Charging? ${plugged}`); //todo> save batery state to db
});
// setInterval(() => {
// wbot.resetState();
// }, 20000);
wbot.on("disconnected", reason => {
console.log("disconnected", reason); //todo> save connection status to DB
setTimeout(
() =>
init()
.then(res => {
wbotMessageListener();
wbotMonitor();
})
.catch(err => console.log(err)),
2000
);
});
// setInterval(() => {
// wbot.resetState();
// }, 20000);
} catch (err) {
console.log(err);
}
};
module.exports = wbotMonitor;

View File

@@ -5,7 +5,9 @@ const sequelize = require("../util/database");
const Whatsapp = sequelize.define("whatsapp", {
session: { type: Sequelize.TEXT() },
qrcode: { type: Sequelize.TEXT() },
status: { type: Sequelize.STRING(20) },
status: { type: Sequelize.STRING(60) },
battery: { type: Sequelize.STRING(20) },
plugged: { type: Sequelize.BOOLEAN() },
});
module.exports = Whatsapp;

View File

@@ -31,9 +31,9 @@
"dev": true
},
"@types/node": {
"version": "14.0.11",
"resolved": "https://registry.npmjs.org/@types/node/-/node-14.0.11.tgz",
"integrity": "sha512-lCvvI24L21ZVeIiyIUHZ5Oflv1hhHQ5E1S25IRlKIXaRkVgmXpJMI3wUJkmym2bTbCe+WoIibQnMVAU3FguaOg=="
"version": "14.0.13",
"resolved": "https://registry.npmjs.org/@types/node/-/node-14.0.13.tgz",
"integrity": "sha512-rouEWBImiRaSJsVA+ITTFM6ZxibuAlTuNOCyxVbwreu6k6+ujs7DfnU9o+PShFhET78pMBl3eH+AGSI5eOTkPA=="
},
"@types/yauzl": {
"version": "2.9.1",
@@ -1046,9 +1046,9 @@
}
},
"extract-zip": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-2.0.0.tgz",
"integrity": "sha512-i42GQ498yibjdvIhivUsRslx608whtGoFIhF26Z7O4MYncBxp8CwalOs1lnHy21A9sIohWO2+uiE4SRtC9JXDg==",
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-2.0.1.tgz",
"integrity": "sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==",
"requires": {
"@types/yauzl": "^2.9.1",
"debug": "^4.1.1",
@@ -2342,9 +2342,9 @@
"integrity": "sha1-1WgS4cAXpuTnw+Ojeh2m143TyT4="
},
"sequelize": {
"version": "5.21.12",
"resolved": "https://registry.npmjs.org/sequelize/-/sequelize-5.21.12.tgz",
"integrity": "sha512-WRTXLoH72HQnlEUbKI1Iev2yS1/epg72Chz0fHqk0MLn4Wj2pH/TS01lpMDGQqxZPXCxRGrwk1YxwUw2C0yI9A==",
"version": "5.21.13",
"resolved": "https://registry.npmjs.org/sequelize/-/sequelize-5.21.13.tgz",
"integrity": "sha512-wpwSpxzvADmgPkcOGeer5yFdAVsYeA7NLEw4evSXw03OlGL41J4S8hVz2/nilSWlJSwumlDGC9QbdwAmkWGqJg==",
"requires": {
"bluebird": "^3.5.0",
"cls-bluebird": "^2.1.0",
@@ -2867,9 +2867,9 @@
"integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw="
},
"whatsapp-web.js": {
"version": "1.6.1",
"resolved": "https://registry.npmjs.org/whatsapp-web.js/-/whatsapp-web.js-1.6.1.tgz",
"integrity": "sha512-pj0JEIuMsWTlqlNr7vRST9XrS+lj/E4i9B7c00FCzUGu6pbPr+95QrYYY56tH5bpCtpsl2NbIB3fbYe3RlxdkA==",
"version": "1.7.0",
"resolved": "https://registry.npmjs.org/whatsapp-web.js/-/whatsapp-web.js-1.7.0.tgz",
"integrity": "sha512-cha7byb+/xWZCB60JW/bSTGaiPgWlA4m37vXjGRkUvMT30/JZyVjQ9W2hazS4dBOtnx3/8DKSnn2AQEEb6Hi5w==",
"requires": {
"@pedroslopez/moduleraid": "^4.1.0",
"jsqr": "^1.3.1",

View File

@@ -23,10 +23,10 @@
"multer": "^1.4.2",
"mysql2": "^2.1.0",
"qrcode-terminal": "^0.12.0",
"sequelize": "^5.21.12",
"sequelize": "^5.21.13",
"sequelize-cli": "^5.5.1",
"socket.io": "^2.3.0",
"whatsapp-web.js": "^1.6.1"
"whatsapp-web.js": "^1.7.0"
},
"devDependencies": {
"nodemon": "^2.0.4"