Merge pull request #563 from codigoencasa/dev

Dev

package.json

@@ -80,7 +80,9 @@
         "eslint-config-prettier": "^8.5.0",
         "fs-extra": "^11.1.0",
         "git-cz": "^4.9.0",
+        "got": "11.8.3",
         "husky": "^8.0.2",
+        "mime-types": "^2.1.35",
         "only-allow": "^1.1.1",
         "prettier": "^2.8.0",
         "pretty-quick": "^3.1.3",

packages/docs/src/routes/docs/flows/index.mdx

@@ -226,6 +226,7 @@ async (ctx,{flowDynamic, endFlow})=>{
 Argumento para asignar nombre y puerto al BOT
 
 ```js
+const BOTNAME = 'bot';
 QRPortalWeb({name:BOTNAME, port:3005 });
 
 ```

packages/provider/common/download.js

@@ -0,0 +1,65 @@
+const mimeDep = require('mime-types')
+const { tmpdir } = require('os')
+const http = require('http')
+const https = require('https')
+const { rename, createWriteStream } = require('fs')
+
+/**
+ * Extrar el mimetype from buffer
+ * @param {string} response
+ * @returns
+ */
+const fileTypeFromFile = async (response) => {
+    const type = response.headers['content-type'] ?? null
+    const ext = mimeDep.extension(type)
+    return {
+        type,
+        ext,
+    }
+}
+
+/**
+ * Descargar archivo binay en tmp
+ * @param {*} url
+ * @returns
+ */
+const generalDownload = async (url) => {
+    const handleDownload = () => {
+        const checkProtocol = url.includes('https:')
+        const handleHttp = checkProtocol ? https : http
+        const name = `tmp-${Date.now()}-dat`
+        const fullPath = `${tmpdir()}/${name}`
+        const file = createWriteStream(fullPath)
+
+        return new Promise((res, rej) => {
+            handleHttp.get(url, function (response) {
+                response.pipe(file)
+                file.on('finish', async function () {
+                    file.close()
+                    res({ response, fullPath })
+                })
+                file.on('error', function () {
+                    file.close()
+                    rej(null)
+                })
+            })
+        })
+    }
+
+    const handleFile = (pathInput, ext) =>
+        new Promise((resolve, reject) => {
+            const fullPath = `${pathInput}.${ext}`
+            rename(pathInput, fullPath, (err) => {
+                if (err) reject(null)
+                resolve(fullPath)
+            })
+        })
+
+    const httpResponse = await handleDownload()
+    const { ext } = await fileTypeFromFile(httpResponse.response)
+    const getPath = await handleFile(httpResponse.fullPath, ext)
+
+    return getPath
+}
+
+module.exports = { generalDownload }

packages/provider/src/baileys/index.js

@@ -4,7 +4,7 @@ const pino = require('pino')
 const rimraf = require('rimraf')
 const mime = require('mime-types')
 const { join } = require('path')
-const { existsSync, createWriteStream, readFileSync } = require('fs')
+const { createWriteStream, readFileSync } = require('fs')
 const { Console } = require('console')
 
 const {
@@ -13,13 +13,15 @@ const {
     Browsers,
     DisconnectReason,
 } = require('@adiwajshing/baileys')
+
 const {
     baileyGenerateImage,
     baileyCleanNumber,
     baileyIsValidNumber,
-    baileyDownloadMedia,
 } = require('./utils')
 
+const { generalDownload } = require('../../common/download')
+
 const logger = new Console({
     stdout: createWriteStream(`${process.cwd()}/baileys.log`),
 })
@@ -169,14 +171,50 @@ class BaileysProvider extends ProviderClass {
      */
 
     sendMedia = async (number, imageUrl, text) => {
-        const fileDownloaded = await baileyDownloadMedia(imageUrl)
+        const fileDownloaded = await generalDownload(imageUrl)
+        const mimeType = mime.lookup(fileDownloaded)
+
+        if (mimeType.includes('image'))
+            return this.sendImage(number, fileDownloaded, text)
+        if (mimeType.includes('video'))
+            return this.sendVideo(number, fileDownloaded, text)
+        if (mimeType.includes('audio'))
+            return this.sendAudio(number, fileDownloaded, text)
+
+        return this.sendFile(number, fileDownloaded)
+    }
+
+    /**
+     * Enviar imagen
+     * @param {*} number
+     * @param {*} imageUrl
+     * @param {*} text
+     * @returns
+     */
+    sendImage = async (number, filePath, text) => {
         return this.vendor.sendMessage(number, {
-            image: readFileSync(fileDownloaded),
+            image: readFileSync(filePath),
             caption: text,
         })
     }
 
     /**
+     * Enviar video
+     * @param {*} number
+     * @param {*} imageUrl
+     * @param {*} text
+     * @returns
+     */
+    sendVideo = async (number, filePath, text) => {
+        return this.vendor.sendMessage(number, {
+            video: readFileSync(filePath),
+            caption: text,
+            gifPlayback: true,
+        })
+    }
+
+    /**
+     * Enviar audio
      * @alpha
      * @param {string} number
      * @param {string} message
@@ -185,8 +223,7 @@ class BaileysProvider extends ProviderClass {
      */
 
     sendAudio = async (number, audioUrl, voiceNote = false) => {
-        const numberClean = number.replace('+', '')
-        await this.vendor.sendMessage(`${numberClean}@c.us`, {
+        return this.vendor.sendMessage(number, {
             audio: { url: audioUrl },
             ptt: voiceNote,
         })
@@ -210,17 +247,13 @@ class BaileysProvider extends ProviderClass {
      */
 
     sendFile = async (number, filePath) => {
-        if (existsSync(filePath)) {
-            const mimeType = mime.lookup(filePath)
-            const numberClean = number.replace('+', '')
-            const fileName = filePath.split('/').pop()
-
-            await this.vendor.sendMessage(`${numberClean}@c.us`, {
-                document: { url: filePath },
-                mimetype: mimeType,
-                fileName: fileName,
-            })
-        }
+        const mimeType = mime.lookup(filePath)
+        const fileName = filePath.split('/').pop()
+        return this.vendor.sendMessage(number, {
+            document: { url: filePath },
+            mimetype: mimeType,
+            fileName: fileName,
+        })
     }
 
     /**

packages/provider/src/baileys/package.json

@@ -1,7 +1,6 @@
 {
     "dependencies": {
         "@adiwajshing/baileys": "4.4.0",
-        "mime-types": "2.1.35",
         "wa-sticker-formatter": "4.3.2"
     }
 }

packages/provider/src/baileys/utils.js

@@ -1,9 +1,6 @@
 const { createWriteStream } = require('fs')
 const combineImage = require('combine-image')
 const qr = require('qr-image')
-const { tmpdir } = require('os')
-const http = require('http')
-const https = require('https')
 
 const baileyCleanNumber = (number, full = false) => {
     number = number.replace('@s.whatsapp.net', '')
@@ -41,38 +38,8 @@ const baileyIsValidNumber = (rawNumber) => {
     return !exist
 }
 
-/**
- * Incompleta
- * Descargar archivo multimedia para enviar
- * @param {*} url
- * @returns
- */
-const baileyDownloadMedia = (url) => {
-    return new Promise((resolve, reject) => {
-        const ext = url.split('.').pop()
-        const checkProtocol = url.includes('https:')
-        const handleHttp = checkProtocol ? https : http
-        const name = `tmp-${Date.now()}.${ext}`
-        const fullPath = `${tmpdir()}/${name}`
-        const file = createWriteStream(fullPath)
-        handleHttp.get(url, function (response) {
-            response.pipe(file)
-            file.on('finish', function () {
-                file.close()
-                resolve(fullPath)
-            })
-            file.on('error', function () {
-                console.log('errro')
-                file.close()
-                reject(null)
-            })
-        })
-    })
-}
-
 module.exports = {
     baileyCleanNumber,
     baileyGenerateImage,
     baileyIsValidNumber,
-    baileyDownloadMedia,
 }

packages/provider/src/venom/index.js

@@ -2,18 +2,20 @@ const { ProviderClass } = require('@bot-whatsapp/bot')
 const venom = require('venom-bot')
 const { createWriteStream } = require('fs')
 const { Console } = require('console')
+const mime = require('mime-types')
 
 const {
     venomCleanNumber,
     venomGenerateImage,
     venomisValidNumber,
-    venomDownloadMedia,
 } = require('./utils')
 
 const logger = new Console({
     stdout: createWriteStream(`${process.cwd()}/venom.log`),
 })
 
+const { generalDownload } = require('../../common/download')
+
 /**
  * ⚙️ VenomProvider: Es una clase tipo adaptor
  * que extiende clases de ProviderClass (la cual es como interfaz para sber que funciones rqueridas)
@@ -134,6 +136,53 @@ class VenomProvider extends ProviderClass {
         // return this.vendor.sendButtons(number, "Title", buttons1, "Description");
     }
 
+    /**
+     * Enviar audio
+     * @alpha
+     * @param {string} number
+     * @param {string} message
+     * @param {boolean} voiceNote optional
+     * @example await sendMessage('+XXXXXXXXXXX', 'audio.mp3')
+     */
+
+    sendAudio = async (number, audioPath, voiceNote = false) => {
+        return this.vendor.sendVoice(number, audioPath)
+    }
+
+    /**
+     * Enviar imagen
+     * @param {*} number
+     * @param {*} imageUrl
+     * @param {*} text
+     * @returns
+     */
+    sendImage = async (number, filePath, text) => {
+        return this.vendor.sendImage(number, filePath, 'image-name', text)
+    }
+
+    /**
+     *
+     * @param {string} number
+     * @param {string} filePath
+     * @example await sendMessage('+XXXXXXXXXXX', './document/file.pdf')
+     */
+
+    sendFile = async (number, filePath, text) => {
+        const fileName = filePath.split('/').pop()
+        return this.vendor.sendFile(number, filePath, fileName, text)
+    }
+
+    /**
+     * Enviar video
+     * @param {*} number
+     * @param {*} imageUrl
+     * @param {*} text
+     * @returns
+     */
+    sendVideo = async (number, filePath, text) => {
+        return this.vendor.sendVideoAsGif(number, filePath, 'video.gif', text)
+    }
+
     /**
      * Enviar imagen o multimedia
      * @param {*} number
@@ -141,10 +190,18 @@ class VenomProvider extends ProviderClass {
      * @param {*} message
      * @returns
      */
-    sendMedia = async (number, mediaInput, message) => {
-        if (!mediaInput) throw new Error(`NO_SE_ENCONTRO: ${mediaInput}`)
-        const fileDownloaded = await venomDownloadMedia(mediaInput)
-        return this.vendor.sendImage(number, fileDownloaded, '.', message)
+    sendMedia = async (number, mediaUrl, text) => {
+        const fileDownloaded = await generalDownload(mediaUrl)
+        const mimeType = mime.lookup(fileDownloaded)
+
+        if (mimeType.includes('image'))
+            return this.sendImage(number, fileDownloaded, text)
+        if (mimeType.includes('video'))
+            return this.sendVideo(number, fileDownloaded, text)
+        if (mimeType.includes('audio'))
+            return this.sendAudio(number, fileDownloaded)
+
+        return this.sendFile(number, fileDownloaded, text)
     }
 
     /**

yarn.lock

@@ -1112,7 +1112,9 @@ __metadata:
     eslint-config-prettier: ^8.5.0
     fs-extra: ^11.1.0
     git-cz: ^4.9.0
+    got: 11.8.3
     husky: ^8.0.2
+    mime-types: ^2.1.35
     only-allow: ^1.1.1
     prettier: ^2.8.0
     pretty-quick: ^3.1.3
@@ -2933,6 +2935,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@sindresorhus/is@npm:^4.0.0":
+  version: 4.6.0
+  resolution: "@sindresorhus/is@npm:4.6.0"
+  checksum: 83839f13da2c29d55c97abc3bc2c55b250d33a0447554997a85c539e058e57b8da092da396e252b11ec24a0279a0bed1f537fa26302209327060643e327f81d2
+  languageName: node
+  linkType: hard
+
 "@sindresorhus/is@npm:^5.2.0":
   version: 5.3.0
   resolution: "@sindresorhus/is@npm:5.3.0"
@@ -2977,7 +2986,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@szmarczak/http-timer@npm:^4.0.0":
+"@szmarczak/http-timer@npm:^4.0.0, @szmarczak/http-timer@npm:^4.0.5":
   version: 4.0.6
   resolution: "@szmarczak/http-timer@npm:4.0.6"
   dependencies:
@@ -5073,6 +5082,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"cacheable-lookup@npm:^5.0.3":
+  version: 5.0.4
+  resolution: "cacheable-lookup@npm:5.0.4"
+  checksum: 763e02cf9196bc9afccacd8c418d942fc2677f22261969a4c2c2e760fa44a2351a81557bd908291c3921fe9beb10b976ba8fa50c5ca837c5a0dd945f16468f2d
+  languageName: node
+  linkType: hard
+
 "cacheable-lookup@npm:^7.0.0":
   version: 7.0.0
   resolution: "cacheable-lookup@npm:7.0.0"
@@ -5125,7 +5141,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"cacheable-request@npm:^7.0.1":
+"cacheable-request@npm:^7.0.1, cacheable-request@npm:^7.0.2":
   version: 7.0.2
   resolution: "cacheable-request@npm:7.0.2"
   dependencies:
@@ -9899,6 +9915,25 @@ __metadata:
   languageName: node
   linkType: hard
 
+"got@npm:11.8.3":
+  version: 11.8.3
+  resolution: "got@npm:11.8.3"
+  dependencies:
+    "@sindresorhus/is": ^4.0.0
+    "@szmarczak/http-timer": ^4.0.5
+    "@types/cacheable-request": ^6.0.1
+    "@types/responselike": ^1.0.0
+    cacheable-lookup: ^5.0.3
+    cacheable-request: ^7.0.2
+    decompress-response: ^6.0.0
+    http2-wrapper: ^1.0.0-beta.5.2
+    lowercase-keys: ^2.0.0
+    p-cancelable: ^2.0.0
+    responselike: ^2.0.0
+  checksum: 3b6db107d9765470b18e4cb22f7c7400381be7425b9be5823f0168d6c21b5d6b28b023c0b3ee208f73f6638c3ce251948ca9b54a1e8f936d3691139ac202d01b
+  languageName: node
+  linkType: hard
+
 "got@npm:^10.0.0, got@npm:^10.7.0":
   version: 10.7.0
   resolution: "got@npm:10.7.0"
@@ -10446,6 +10481,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"http2-wrapper@npm:^1.0.0-beta.5.2":
+  version: 1.0.3
+  resolution: "http2-wrapper@npm:1.0.3"
+  dependencies:
+    quick-lru: ^5.1.1
+    resolve-alpn: ^1.0.0
+  checksum: 74160b862ec699e3f859739101ff592d52ce1cb207b7950295bf7962e4aa1597ef709b4292c673bece9c9b300efad0559fc86c71b1409c7a1e02b7229456003e
+  languageName: node
+  linkType: hard
+
 "http2-wrapper@npm:^2.1.10":
   version: 2.2.0
   resolution: "http2-wrapper@npm:2.2.0"
@@ -13443,7 +13488,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"mime-types@npm:^2.1.12, mime-types@npm:~2.1.19, mime-types@npm:~2.1.24, mime-types@npm:~2.1.34":
+"mime-types@npm:^2.1.12, mime-types@npm:^2.1.35, mime-types@npm:~2.1.19, mime-types@npm:~2.1.24, mime-types@npm:~2.1.34":
   version: 2.1.35
   resolution: "mime-types@npm:2.1.35"
   dependencies:
@@ -16820,7 +16865,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"resolve-alpn@npm:^1.2.0":
+"resolve-alpn@npm:^1.0.0, resolve-alpn@npm:^1.2.0":
   version: 1.2.1
   resolution: "resolve-alpn@npm:1.2.1"
   checksum: f558071fcb2c60b04054c99aebd572a2af97ef64128d59bef7ab73bd50d896a222a056de40ffc545b633d99b304c259ea9d0c06830d5c867c34f0bfa60b8eae0