Migrate to baileys

.eslintrc.json

@@ -3,6 +3,12 @@
     "rules": {
         "no-useless-escape": [
             "off"
+        ],
+        "no-unmodified-loop-condition": [
+            "off"
+        ],
+        "no-irregular-whitespace": [
+            "off"
         ]
     }
 }

.gitignore

@@ -1,11 +1,10 @@
 node_modules
 
-.wwebjs_auth
-.wwebjs_cache
+auth_info_baileys
 
 .env
 package-lock.json
 errors.log
 
-temp/*
-!temp/.gitkeep
+src/temp/*
+!src/temp/.gitkeep

.vscode/settings.json

@@ -1,22 +1,2 @@
 {
-    "workbench.colorCustomizations": {
-        "activityBar.activeBackground": "#14e8a2",
-        "activityBar.background": "#14e8a2",
-        "activityBar.foreground": "#15202b",
-        "activityBar.inactiveForeground": "#15202b99",
-        "activityBarBadge.background": "#bb4ff0",
-        "activityBarBadge.foreground": "#15202b",
-        "commandCenter.border": "#15202b99",
-        "sash.hoverBorder": "#14e8a2",
-        "statusBar.background": "#10b981",
-        "statusBar.foreground": "#15202b",
-        "statusBarItem.hoverBackground": "#0c8a60",
-        "statusBarItem.remoteBackground": "#10b981",
-        "statusBarItem.remoteForeground": "#15202b",
-        "titleBar.activeBackground": "#10b981",
-        "titleBar.activeForeground": "#15202b",
-        "titleBar.inactiveBackground": "#10b98199",
-        "titleBar.inactiveForeground": "#15202b99"
-    },
-    "peacock.color": "#10b981"
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "deadbyte-v3",
-  "version": "3.0.0",
+  "version": "3.5.0",
   "description": "deadbyte 3rd generation",
   "author": "sergiooak",
   "main": "src/index.js",
@@ -15,21 +15,28 @@
   },
   "license": "unlicense",
   "dependencies": {
-    "change-case": "^5.3.0",
+    "@whiskeysockets/baileys": "^6.6.0",
+    "change-case": "^5.4.2",
+    "cheerio": "^1.0.0-rc.12",
     "citty": "^0.1.5",
     "dayjs": "^1.11.10",
-    "dotenv": "^16.3.1",
+    "dotenv": "^16.4.1",
+    "file-type": "^19.0.0",
     "filenamify": "^6.0.0",
+    "fluent-ffmpeg": "^2.1.2",
     "form-data": "^4.0.0",
+    "link-preview-js": "^3.0.5",
     "mime-types": "^2.1.35",
+    "node-cache": "^5.1.2",
     "node-cron": "^3.0.3",
-    "openai": "^4.24.1",
+    "node-webpmux": "^3.2.0",
+    "openai": "^4.25.0",
     "pino": "^8.17.2",
     "pino-pretty": "^10.3.1",
     "qrcode-terminal": "^0.12.0",
     "qs": "^6.11.2",
+    "read-chunk": "^4.0.3",
     "sharp": "^0.32.6",
-    "whatsapp-web.js": "^1.23.0",
     "yargs": "^17.7.2"
   },
   "devDependencies": {

src/db.js

@@ -1,6 +1,6 @@
-import fetch from 'node-fetch'
-import logger from './logger.js'
 import { kebabCase } from 'change-case'
+import logger from './logger.js'
+import fetch from 'node-fetch'
 import qs from 'qs'
 //
 // ===================================== Variables ======================================
@@ -48,7 +48,6 @@ doLogin()
 //
 /**
  * Check if the API is online
- *
  * @returns {boolean} true if the API is online
  */
 export function isOnline () {
@@ -57,7 +56,6 @@ export function isOnline () {
 
 /**
  * Get the token
- *
  * @returns {string} token
  */
 export function getToken () {
@@ -66,7 +64,6 @@ export function getToken () {
 
 /**
  * Load the commands from the database
- *
  * @returns {object} commands
  */
 export async function loadCommands () {
@@ -98,7 +95,6 @@ export async function loadCommands () {
 
 /**
  * Get the commands
- *
  * @returns {object} commands
  */
 export function getCommands () {
@@ -129,35 +125,35 @@ export function getBot () {
  * @param {import('whatsapp-web.js').Contact} contact
  */
 export async function findOrCreateContact (contact) {
-  // 1 - Check if contact.id._serialized is on the cache
-  if (contactsCache[contact.id._serialized]) {
-    contactsCache[contact.id._serialized].lastSeen = new Date()
-    return contactsCache[contact.id._serialized]
+  const id = contact.id.replace('@s.whatsapp.net', '@c.us')
+
+  // 1 - Check if contact is on the cache
+  if (contactsCache[id]) {
+    contactsCache[id].lastSeen = new Date()
+    return contactsCache[id]
   }
 
   // 2 - If not, fetch from the database
-  const response = await fetch(`${dbUrl}/contacts/${contact.id._serialized}`, {
+  const response = await fetch(`${dbUrl}/contacts/${id}`, {
     method: 'POST',
     headers: {
       'Content-Type': 'application/json',
       Authorization: `Bearer ${token}`
     },
     body: JSON.stringify({
       data: {
-        name: contact.name,
-        number: contact.id.user,
+        number: id.split('@')[0],
         pushname: contact.pushname,
-        isMyContact: contact.isMyContact,
-        wid: contact.id._serialized
+        wid: id
       }
     })
   })
   const data = await response.json()
 
   // 3 - Save on the cache
-  contactsCache[contact.id._serialized] = data
-  contactsCache[contact.id._serialized].lastSeen = new Date()
-  return contactsCache[contact.id._serialized]
+  contactsCache[id] = data
+  contactsCache[id].lastSeen = new Date()
+  return contactsCache[id]
 }
 
 // mini cache system for contacts, every minute filter out the contacts that haven't been seen in the last 5 minutes
@@ -171,38 +167,51 @@ setInterval(() => {
   })
 }, 60_000)
 
+/**
+ * Force a contact update on the database
+ * @param {import('whatsapp-web.js').Contact} contact
+ * @returns {Promise<object>} - The updated contact
+ */
+export async function forceContactUpdate (contact) {
+  const id = contact.id.replace('@s.whatsapp.net', '@c.us')
+  delete contactsCache[id]
+  return await findOrCreateContact(contact)
+}
+
 /**
  * Find or create a chat on the database
- *
- * @param {import('whatsapp-web.js').Chat} chat
  */
-export async function findOrCreateChat (chat) {
+export async function findOrCreateChat (msg) {
   // 1 - Check if chat.id._serialized is on the cache
-  if (chatsCache[chat.id._serialized]) {
-    chatsCache[chat.id._serialized].lastSeen = new Date()
-    return chatsCache[chat.id._serialized]
+  const id = msg.isGroup
+    ? msg.aux.group.id
+    : msg.contact.id.replace('@s.whatsapp.net', '@c.us')
+
+  if (chatsCache[id]) {
+    chatsCache[id].lastSeen = new Date()
+    return chatsCache[id]
   }
 
   // 2 - If not, fetch from the database
-  const response = await fetch(`${dbUrl}/chats/${chat.id._serialized}`, {
+  const response = await fetch(`${dbUrl}/chats/${id}`, {
     method: 'POST',
     headers: {
       'Content-Type': 'application/json',
       Authorization: `Bearer ${token}`
     },
     body: JSON.stringify({
       data: {
-        name: chat.name,
-        isGroup: chat.isGroup,
-        wid: chat.id._serialized
+        name: msg.isGroup ? msg.aux.group.subject : msg.pushname,
+        isGroup: msg.isGroup,
+        wid: id
       }
     })
   })
   const data = await response.json()
 
   // 3 - Save on the cache
-  chatsCache[chat.id._serialized] = data
-  chatsCache[chat.id._serialized].lastSeen = new Date()
+  chatsCache[id] = data
+  chatsCache[id].lastSeen = new Date()
 
   return data
 }
@@ -274,45 +283,49 @@ export async function saveActionToDB (moduleName, functionName, msg) {
   const commandGroupID = commandGroup?.id
   const command = commandGroup.commands.find((command) => command.slug === kebabCase(functionName))
   const commandID = command?.id
-  const contact = await findOrCreateContact(msg.aux.sender)
+  const contact = await findOrCreateContact(msg.contact)
   const contactID = contact.id
-  const chat = await findOrCreateChat(msg.aux.chat)
+  const chat = await findOrCreateChat(msg)
   const chatID = chat.id
-
-  const action = await createAction(commandGroupID, commandID, chatID, contactID)
-
+  const action = createAction(commandGroupID, commandID, chatID, contactID)
   try {
-    const actionID = action.id
-    return { action, actionID, commandGroup, commandGroupID, command, commandID, contact, contactID, chat, chatID }
+    return { action, commandGroup, commandGroupID, command, commandID, contact, contactID, chat, chatID }
   } catch (error) {
     logger.error('Error saving action to database', error)
     logger.error('Action:', action)
   }
 }
 
-export async function findCurrentBot (client) {
+export async function findCurrentBot (socket) {
+  if (!socket.user) { // TODO: auto-restart
+    logger.warn('Bot never connected before')
+    logger.warn('Remember to restart after reading the QR code')
+    return
+  }
+  const id = socket.user.id.split(':')[0] + '@c.us'
   // 1 - Check if bot already exists on db
-
   const findQuery = qs.stringify(
     {
       filters: {
         wid: {
-          $eq: client.info.wid._serialized
+          $eq: id
         }
       }
     },
     {
       encodeValuesOnly: true // prettify URL
     }
   )
+  while (!token) { // wait token to be populated
+    await new Promise(resolve => setTimeout(resolve, 100))
+  }
   const find = await fetch(`${dbUrl}/bots?${findQuery}`, {
     method: 'GET',
     headers: {
       'Content-Type': 'application/json',
       Authorization: `Bearer ${token}`
     }
   })
-
   const { data: findData } = await find.json()
 
   if (findData.length) {
@@ -321,7 +334,6 @@ export async function findCurrentBot (client) {
   }
 
   // 2 - If not, create it
-
   const create = await fetch(`${dbUrl}/bots`, {
     method: 'POST',
     headers: {
@@ -330,12 +342,12 @@ export async function findCurrentBot (client) {
     },
     body: JSON.stringify({
       data: {
-        wid: client.info.wid._serialized,
-        pushname: client.info.pushname,
-        platform: client.info.platform
+        wid: id,
+        pushname: socket.user.name
       }
     })
   })
+
   const { data: createData } = await create.json()
   bot = createData.id
 }