Added state monitor to wwebjs

backend/app.js

@@ -7,6 +7,7 @@ const multer = require("multer");
 const wBot = require("./controllers/wbot");
 const Contact = require("./models/Contact");
 const wbotMessageListener = require("./controllers/wbotMessageListener");
+const wbotMonitor = require("./controllers/wbotMonitor");
 
 const messageRoutes = require("./routes/message");
 const ContactRoutes = require("./routes/contacts");
@@ -61,9 +62,10 @@ sequelize
 			});
 		});
 
-		wBot.init();
+		wBot.init().then(res => {
-		wbotMessageListener();
+			wbotMessageListener();
-
+			wbotMonitor();
+		});
 		console.log("Server started");
 	})
 	.catch(err => {

backend/controllers/session.json

@@ -1 +0,0 @@
-{"WABrowserId":"\"E9dnt9Mm/JiFDCMJQHkXBw==\"","WASecretBundle":"{\"key\":\"fHTKtoDcxidboASIs5WV5JKyRrF+SfMktqHXmq/KBJU=\",\"encKey\":\"FrM3OnnEbuEr1JrtKypw5CPSc6rSD5bjbOGstv8ijk4=\",\"macKey\":\"fHTKtoDcxidboASIs5WV5JKyRrF+SfMktqHXmq/KBJU=\"}","WAToken1":"\"tjwS2T/ux5P+nyxYcBEj+gRIUS/XqREEEPqap787yzg=\"","WAToken2":"\"1@781NE8OipW/PigfWCI6tiz8fEpUOVVhyNEePCZMuEyC7aXG0cy1I75liSVz8z6DxVjXiw4iGI7c4Hg==\""}

backend/controllers/wbot.js

@@ -1,39 +1,42 @@
-const path = require("path");
 const qrCode = require("qrcode-terminal");
-const fs = require("fs");
 const { Client } = require("whatsapp-web.js");
+const Whatsapp = require("../models/Whatsapp");
+
 let wbot;
 
 module.exports = {
-	init: () => {
+	init: async () => {
-		const SESSION_FILE_PATH = path.join(__dirname, "/session.json");
 		let sessionCfg;
-		if (fs.existsSync(SESSION_FILE_PATH)) {
+
-			sessionCfg = require(SESSION_FILE_PATH);
+		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", qr => {
+		wbot.on("qr", async qr => {
 			qrCode.generate(qr, { small: true });
+			await Whatsapp.upsert({ id: 1, qrcode: qr, status: "pending" });
 		});
-		wbot.on("authenticated", session => {
+		wbot.on("authenticated", async session => {
 			console.log("AUTHENTICATED");
-			sessionCfg = session;
+			await Whatsapp.upsert({
-			fs.writeFile(SESSION_FILE_PATH, JSON.stringify(sessionCfg), function (
+				id: 1,
-				err
+				session: JSON.stringify(session),
-			) {
+				status: "authenticated",
-				if (err) {
-					console.error(err);
-				}
 			});
 		});
-		wbot.on("auth_failure", msg => {
+		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) {
@@ -45,6 +48,7 @@ module.exports = {
 			// }
 
 			// console.log(unreadMessages);
+			wbot.sendPresenceAvailable();
 		});
 
 		return wbot;

backend/controllers/wbotMessageListener.js

@@ -5,7 +5,7 @@ const path = require("path");
 const fs = require("fs");
 
 const { getIO } = require("../socket");
-const { getWbot } = require("./wbot");
+const { getWbot, init } = require("./wbot");
 
 const wbotMessageListener = () => {
 	const io = getIO();
@@ -14,6 +14,9 @@ const wbotMessageListener = () => {
 	wbot.on("message", async msg => {
 		let newMessage;
 		console.log(msg);
+		if (msg.from === "status@broadcast") {
+			return;
+		}
 		const msgContact = await msg.getContact();
 		const imageUrl = await msgContact.getProfilePicUrl();
 		try {
@@ -21,6 +24,10 @@ const wbotMessageListener = () => {
 				where: { number: msgContact.number },
 			});
 
+			if (contact) {
+				await contact.update({ imageURL: imageUrl });
+			}
+
 			if (!contact) {
 				try {
 					contact = await Contact.create({
@@ -28,13 +35,6 @@ const wbotMessageListener = () => {
 						number: msgContact.number,
 						imageURL: imageUrl,
 					});
-
-					// contact.dataValues.unreadMessages = 1;
-
-					io.to("notification").emit("contact", {
-						action: "create",
-						contact: contact,
-					});
 				} catch (err) {
 					console.log(err);
 				}
@@ -45,8 +45,7 @@ const wbotMessageListener = () => {
 				if (media) {
 					if (!media.filename) {
 						let ext = media.mimetype.split("/")[1].split(";")[0];
-						let aux = Math.random(5).toString();
+						media.filename = `${new Date().getTime()}.${ext}`;
-						media.filename = aux.split(".")[1] + "." + ext;
 					}
 
 					fs.writeFile(
@@ -72,10 +71,19 @@ const wbotMessageListener = () => {
 				});
 			}
 
-			io.to(contact.id).to("notification").emit("appMessage", {
+			io.to(contact.id)
-				action: "create",
+				.to("notification")
-				message: newMessage,
+				.emit("appMessage", {
-			});
+					action: "create",
+					message: {
+						...newMessage.dataValues,
+						mediaUrl: `${
+							newMessage.mediaUrl
+								? `http://localhost:8080/public/${newMessage.mediaUrl}`
+								: ""
+						}`,
+					},
+				});
 
 			let chat = await msg.getChat();
 			chat.sendSeen();
@@ -90,6 +98,7 @@ const wbotMessageListener = () => {
 				where: { id: msg.id.id },
 			});
 			if (!messageToUpdate) {
+				// will throw an error is msg wasn't sent from app
 				const error = new Error(
 					"Erro ao alterar o ack da mensagem no banco de dados"
 				);

backend/controllers/wbotMonitor.js

@@ -0,0 +1,40 @@
+const Contact = require("../models/Contact");
+const Message = require("../models/Message");
+const wbotMessageListener = require("./wbotMessageListener");
+
+const path = require("path");
+const fs = require("fs");
+
+const { getIO } = require("../socket");
+const { getWbot, init } = require("./wbot");
+
+const wbotMonitor = () => {
+	const io = getIO();
+	const wbot = getWbot();
+
+	wbot.on("change_state", newState => {
+		console.log(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("disconnected", reason => {
+		console.log("disconnected", reason);
+		wbot.destroy();
+		setTimeout(() =>
+			init()
+				.then(res => wbotMessageListener(), 2000)
+				.catch(err => console.log(err))
+		);
+	});
+
+	// setInterval(() => {
+	// 	wbot.resetState();
+	// }, 20000);
+};
+
+module.exports = wbotMonitor;

backend/models/Whatsapp.js

@@ -0,0 +1,11 @@
+const Sequelize = require("sequelize");
+
+const sequelize = require("../util/database");
+
+const Whatsapp = sequelize.define("whatsapp", {
+	session: { type: Sequelize.TEXT() },
+	qrcode: { type: Sequelize.TEXT() },
+	status: { type: Sequelize.STRING(20) },
+});
+
+module.exports = Whatsapp;

frontend/package-lock.json

@@ -11319,6 +11319,14 @@
         "prop-types": "^15.6.2"
       }
     },
+    "react-web-notification": {
+      "version": "0.8.0",
+      "resolved": "https://registry.npmjs.org/react-web-notification/-/react-web-notification-0.8.0.tgz",
+      "integrity": "sha512-c9oJEBHyI8P6ymA6lOdUKeOiLH3XkcsvV3nNfMK0D0aXh47sTxoGZLQnw/qO32bm5CmS7k66FSwvQXnTaBoJ3g==",
+      "requires": {
+        "core-js": "3"
+      }
+    },
     "read-pkg": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz",

frontend/package.json

@@ -27,6 +27,7 @@
     "react-scripts": "3.4.1",
     "react-scroll-to-bottom": "^2.0.0",
     "react-toastify": "^6.0.4",
+    "react-web-notification": "^0.8.0",
     "socket.io-client": "^2.3.0"
   },
   "scripts": {

frontend/src/pages/Chat/components/ContactsList/ContactsList.js

@@ -13,7 +13,6 @@ import List from "@material-ui/core/List";
 import ListItem from "@material-ui/core/ListItem";
 import ListItemText from "@material-ui/core/ListItemText";
 import ListItemAvatar from "@material-ui/core/ListItemAvatar";
-import ListItemSecondaryAction from "@material-ui/core/ListItemSecondaryAction";
 import Typography from "@material-ui/core/Typography";
 import Avatar from "@material-ui/core/Avatar";
 import Divider from "@material-ui/core/Divider";
@@ -24,11 +23,6 @@ import InputBase from "@material-ui/core/InputBase";
 import ContactsHeader from "../ContactsHeader/ContactsHeader";
 
 const useStyles = makeStyles(theme => ({
-	badgeStyle: {
-		color: "white",
-		backgroundColor: green[500],
-	},
-
 	contactsWrapper: {
 		display: "flex",
 		height: "100%",
@@ -94,13 +88,24 @@ const useStyles = makeStyles(theme => ({
 		// display: "inline",
 	},
 
-	contactName: {
-		// flex: 1,
-	},
-
 	lastMessageTime: {
 		marginLeft: "auto",
 	},
+
+	contactLastMessage: {
+		paddingRight: 20,
+	},
+
+	newMessagesCount: {
+		alignSelf: "center",
+		marginRight: 8,
+		marginLeft: "auto",
+	},
+
+	badgeStyle: {
+		color: "white",
+		backgroundColor: green[500],
+	},
 }));
 
 const ContactsList = ({ selectedContact, setSelectedContact }) => {
@@ -113,6 +118,14 @@ const ContactsList = ({ selectedContact, setSelectedContact }) => {
 
 	const history = useHistory();
 
+	useEffect(() => {
+		if (!("Notification" in window)) {
+			console.log("Esse navegador não suporte notificações");
+		} else {
+			Notification.requestPermission();
+		}
+	}, []);
+
 	useEffect(() => {
 		const fetchContacts = async () => {
 			try {
@@ -139,9 +152,6 @@ const ContactsList = ({ selectedContact, setSelectedContact }) => {
 		socket.emit("joinNotification");
 
 		socket.on("contact", data => {
-			if (data.action === "create") {
-				addContact(data.contact);
-			}
 			if (data.action === "updateUnread") {
 				resetUnreadMessages(data.contactId);
 			}
@@ -149,13 +159,40 @@ const ContactsList = ({ selectedContact, setSelectedContact }) => {
 
 		socket.on("appMessage", data => {
 			setNotification(prevState => !prevState);
-			// handleUnreadMessages(data.message.contactId);
+			if (
+				selectedContact &&
+				data.message.contactId === selectedContact.id &&
+				document.visibilityState === "visible"
+			) {
+				return;
+			}
+
+			let contactImageUrl = profileDefaultPic;
+			let contactName = "Novo Contato";
+
+			const contactIndex = contacts.findIndex(
+				contact => contact.id === data.message.contactId
+			);
+
+			if (contactIndex !== -1) {
+				contactImageUrl = contacts[contactIndex].imageURL;
+				contactName = contacts[contactIndex].name;
+			}
+
+			const options = {
+				body: `${data.message.messageBody} - ${moment(new Date())
+					.tz("America/Sao_Paulo")
+					.format("DD/MM/YY - HH:mm")}`,
+				icon: contactImageUrl,
+			};
+			new Notification(`Mensagem de ${contactName}`, options);
+			document.getElementById("sound").play();
 		});
 
 		return () => {
 			socket.disconnect();
 		};
-	}, []);
+	}, [selectedContact, contacts]);
 
 	const resetUnreadMessages = contactId => {
 		setDisplayedContacts(prevState => {
@@ -167,14 +204,8 @@ const ContactsList = ({ selectedContact, setSelectedContact }) => {
 		});
 	};
 
-	const addContact = contact => {
-		setContacts(prevState => [contact, ...prevState]);
-		setDisplayedContacts(prevState => [contact, ...prevState]);
-	};
-
 	const handleSelectContact = (e, contact) => {
 		setSelectedContact(contact);
-		// setNotification(prevState => !prevState);
 	};
 
 	const handleSearchContact = e => {
@@ -218,13 +249,9 @@ const ContactsList = ({ selectedContact, setSelectedContact }) => {
 									></Avatar>
 								</ListItemAvatar>
 								<ListItemText
-									// primaryTypographyProps={{ noWrap: true }}
-									// secondaryTypographyProps={{ noWrap: true }}
-
 									primary={
-										<div className={classes.contactNameWrapper}>
+										<span className={classes.contactNameWrapper}>
 											<Typography
-												className={classes.contactName}
 												noWrap
 												component="span"
 												variant="body2"
@@ -235,7 +262,7 @@ const ContactsList = ({ selectedContact, setSelectedContact }) => {
 											{contact.messages && contact.messages[0] && (
 												<Typography
 													className={classes.lastMessageTime}
-													oWrap
+													noWrap
 													component="span"
 													variant="body2"
 													color="textSecondary"
@@ -245,31 +272,44 @@ const ContactsList = ({ selectedContact, setSelectedContact }) => {
 														.format("HH:mm")}
 												</Typography>
 											)}
-										</div>
+										</span>
 									}
 									secondary={
-										(contact.messages &&
+										<span className={classes.contactNameWrapper}>
-											contact.messages[0] &&
+											<Typography
-											contact.messages[0].messageBody) ||
+												className={classes.contactLastMessage}
-										"-"
+												noWrap
+												component="span"
+												variant="body2"
+												color="textSecondary"
+											>
+												{(contact.messages &&
+													contact.messages[0] &&
+													contact.messages[0].messageBody) || <br />}
+											</Typography>
+											{contact.unreadMessages > 0 && (
+												<Badge
+													className={classes.newMessagesCount}
+													badgeContent={contact.unreadMessages}
+													classes={{
+														badge: classes.badgeStyle,
+													}}
+												/>
+											)}
+										</span>
 									}
 								/>
-								<ListItemSecondaryAction>
-									{contact.unreadMessages > 0 && (
-										<Badge
-											badgeContent={contact.unreadMessages}
-											classes={{
-												badge: classes.badgeStyle,
-											}}
-										/>
-									)}
-								</ListItemSecondaryAction>
 							</ListItem>
 							<Divider variant="inset" component="li" />
 						</React.Fragment>
 					))}
 				</List>
 			</Paper>
+			<audio id="sound" preload="auto">
+				<source src={require("../../../../util/sound.mp3")} type="audio/mpeg" />
+				<source src={require("../../../../util/sound.ogg")} type="audio/ogg" />
+				<embed hidden={true} autostart="false" loop={false} src="./sound.mp3" />
+			</audio>
 		</div>
 	);
 };

frontend/src/pages/Chat/components/MessagesList/MessagesList.js

@@ -20,7 +20,6 @@ import openSocket from "socket.io-client";
 import moment from "moment-timezone";
 import InfiniteScrollReverse from "react-infinite-scroll-reverse";
 import ModalImage from "react-modal-image";
-import ReactAudioPlayer from "react-audio-player";
 import MessagesInput from "../MessagesInput/MessagesInput";
 
 const useStyles = makeStyles(theme => ({
@@ -313,7 +312,11 @@ const MessagesList = ({ selectedContact }) => {
 			);
 		}
 		if (message.mediaType === "audio") {
-			return <ReactAudioPlayer src={message.mediaUrl} controls />;
+			return (
+				<audio controls>
+					<source src={message.mediaUrl} type="audio/ogg"></source>
+				</audio>
+			);
 		}
 
 		if (message.mediaType === "video") {

frontend/src/pages/Home/Dashboard.js

@@ -4,7 +4,9 @@ import MainDrawer from "../../components/Layout/MainDrawer";
 const Dashboard = () => {
 	return (
 		<div>
-			<MainDrawer appTitle="Dashboard"></MainDrawer>
+			<MainDrawer appTitle="Dashboard">
+				<h1>Todo Dashboard</h1>
+			</MainDrawer>
 		</div>
 	);
 };