@pontasockets/baileys 0.3.1 → 0.3.3

package/lib/Utils/messages.js

@@ -1,17 +1,10 @@
 "use strict"
 
-var __importDefault = (this && this.__importDefault) || function(mod) {
-    return (mod && mod.__esModule) ? mod : {
-        "default": mod
-    }
-}
-
 Object.defineProperty(exports, "__esModule", {
     value: true
 })
 
 const boom_1 = require("@hapi/boom")
-const axios_1 = __importDefault(require("axios"))
 const crypto_1 = require("crypto")
 const fs_1 = require("fs")
 const WAProto_1 = require("../../WAProto")
@@ -27,7 +20,7 @@ const MIMETYPE_MAP = {
     image: 'image/jpeg',
     video: 'video/mp4',
     document: 'application/pdf',
-    audio: 'audio/ogg codecs=opus',
+    audio: 'audio/ogg; codecs=opus',
     sticker: 'image/webp',
     'product-catalog-image': 'image/jpeg'
 }
@@ -168,7 +161,7 @@ const prepareWAMessageMedia = async (message, options) => {
 
     const requiresDurationComputation = mediaType === 'audio' && typeof uploadData.seconds === 'undefined'
     const requiresThumbnailComputation = (mediaType === 'image' || mediaType === 'video') && typeof uploadData['jpegThumbnail'] === 'undefined'
-    const requiresWaveformProcessing = mediaType === 'audio' && uploadData.ptt === true
+    const requiresWaveformProcessing = mediaType === 'audio' && uploadData.ptt === true && typeof uploadData.waveform === 'undefined'
     const requiresAudioBackground = options.backgroundColor && mediaType === 'audio' && uploadData.ptt === true
     const requiresOriginalForSomeProcessing = requiresDurationComputation || requiresThumbnailComputation
 
@@ -321,7 +314,7 @@ const prepareAlbumMessageContent = async (jid, albums, options) => {
                 },
                 ...options
             })
-        } else if ('video' in message) {
+        } else if ('video' in media) {
             mediaMsg = await generateWAMessage(jid, {
                 video: media.video,
                 ...media,
@@ -383,9 +376,9 @@ const generateForwardMessageContent = (message, forceForward) => {
     content = WAProto_1.proto.Message.decode(WAProto_1.proto.Message.encode(content).finish())
 
     let key = Object.keys(content)[0]
-    let score = content[key].contextInfo?.forwardingScore || 0
+    let score = content?.[key]?.contextInfo?.forwardingScore || 0
 
-    if (forceForward) score += forceForward ? forceForward : 1
+    score += message.key.fromMe && !forceForward ? 0 : 1
 
     if (key === 'conversation') {
         content.extendedTextMessage = {
@@ -905,7 +898,7 @@ const generateWAMessageContent = async (message, options) => {
             directPath: stickerPackUploadResult.directPath,
             fileLength: stickerPackUpload.fileLength,
             mediaKeyTimestamp: generics_1.unixTimestampSeconds(),
-            trayIconFileName: `${stickerPackId}.png`,
+            trayIconFileName: `${stickerPackId}.webp`,
             imageDataHash,
             thumbnailDirectPath: coverImage.directPath,
             thumbnailFileSha256: coverImage.fileSha256,
@@ -1189,7 +1182,7 @@ const generateWAMessageContent = async (message, options) => {
             }
         }
 
-        if ('footer' in message && !message.footer) {
+        if ('footer' in message && !!message.footer) {
             interactiveMessage.footer = {
                 text: message.footer
             }
@@ -1398,9 +1391,12 @@ const generateWAMessageFromContent = (jid, message, options) => {
             messageSecret: crypto_1.randomBytes(32),
             ...message.messageContextInfo
         }
+    }
+
+    if (!!options?.ephemeralExpiration && key !== 'protocolMessage' && key !== 'ephemeralMessage' && !WABinary_1.isJidNewsletter(jid)) {
         innerMessage[key].contextInfo = {
             ...(innerMessage[key].contextInfo || {}),
-            expiration: options.ephemeralExpiration ? options.ephemeralExpiration : 0
+            expiration: options.ephemeralExpiration
         }
     }
 
@@ -1427,6 +1423,10 @@ const generateWAMessage = async (jid, content, options) => {
         msgId: options.messageId
     })
 
+    if (jid) {
+        options.jid = jid
+    }
+
     return generateWAMessageFromContent(jid, await generateWAMessageContent(content, {
         newsletter: WABinary_1.isJidNewsletter(jid),
         ...options
@@ -1436,7 +1436,7 @@ const generateWAMessage = async (jid, content, options) => {
 const getContentType = (content) => {
     if (content) {
         const keys = Object.keys(content)
-        const key = keys.find(k => (k === 'conversation' || k.endsWith('Message') || k.endsWith('V2') || k.endsWith('V3') || k.endsWith('V4') || k.endsWith('V5')) && k !== 'senderKeyDistributionMessage' && k !== 'messageContextInfo')
+        const key = keys.find(k => (k === 'conversation' || k.includes('Message')) && k !== 'senderKeyDistributionMessage' && k !== 'messageContextInfo')
 
         return key
     }
@@ -1459,7 +1459,7 @@ const normalizeMessageContent = (content) => {
     return content
 
     function getFutureProofMessage(message) {
-        return ((message === null || message === void 0 ? void 0 : message.editedMessage) || (message === null || message === void 0 ? void 0 : message.statusAddYours) || (message === null || message === void 0 ? void 0 : message.botTaskMessage) || (message === null || message === void 0 ? void 0 : message.eventCoverImage) || (message === null || message === void 0 ? void 0 : message.questionMessage) || (message === null || message === void 0 ? void 0 : message.viewOnceMessage) || (message === null || message === void 0 ? void 0 : message.botInvokeMessage) || (message === null || message === void 0 ? void 0 : message.ephemeralMessage) || (message === null || message === void 0 ? void 0 : message.lottieStickerMessage) || (message === null || message === void 0 ? void 0 : message.groupStatusMessage) || (message === null || message === void 0 ? void 0 : message.limitSharingMessage) || (message === null || message === void 0 ? void 0 : message.viewOnceMessageV2) || (message === null || message === void 0 ? void 0 : message.botForwardedMessage) || (message === null || message === void 0 ? void 0 : message.statusMentionMessage) || (message === null || message === void 0 ? void 0 : message.groupStatusMessageV2) || (message === null || message === void 0 ? void 0 : message.pollCreationMessageV4) || (message === null || message === void 0 ? void 0 : message.pollCreationMessageV5) || (message === null || message === void 0 ? void 0 : message.associatedChildMessage) || (message === null || message === void 0 ? void 0 : message.groupMentionedMessage) || (message === null || message === void 0 ? void 0 : message.groupStatusMentionMessage) || (message === null || message === void 0 ? void 0 : message.viewOnceMessageV2Extension) || (message === null || message === void 0 ? void 0 : message.documentWithCaptionMessage) || (message === null || message === void 0 ? void 0 : message.pollCreationOptionImageMessage))
+        return ((message === null || message === void 0 ? void 0 : message.editedMessage) || (message === null || message === void 0 ? void 0 : message.statusAddYours) || (message === null || message === void 0 ? void 0 : message.botTaskMessage) || (message === null || message === void 0 ? void 0 : message.eventCoverImage) || (message === null || message === void 0 ? void 0 : message.questionMessage) || (message === null || message === void 0 ? void 0 : message.questionReplyMessage) || (message === null || message === void 0 ? void 0 : message.viewOnceMessage) || (message === null || message === void 0 ? void 0 : message.botInvokeMessage) || (message === null || message === void 0 ? void 0 : message.ephemeralMessage) || (message === null || message === void 0 ? void 0 : message.lottieStickerMessage) || (message === null || message === void 0 ? void 0 : message.groupStatusMessage) || (message === null || message === void 0 ? void 0 : message.limitSharingMessage) || (message === null || message === void 0 ? void 0 : message.viewOnceMessageV2) || (message === null || message === void 0 ? void 0 : message.botForwardedMessage) || (message === null || message === void 0 ? void 0 : message.statusMentionMessage) || (message === null || message === void 0 ? void 0 : message.groupStatusMessageV2) || (message === null || message === void 0 ? void 0 : message.pollCreationMessageV4) || (message === null || message === void 0 ? void 0 : message.pollCreationMessageV5) || (message === null || message === void 0 ? void 0 : message.associatedChildMessage) || (message === null || message === void 0 ? void 0 : message.groupMentionedMessage) || (message === null || message === void 0 ? void 0 : message.groupStatusMentionMessage) || (message === null || message === void 0 ? void 0 : message.viewOnceMessageV2Extension) || (message === null || message === void 0 ? void 0 : message.documentWithCaptionMessage) || (message === null || message === void 0 ? void 0 : message.pollCreationOptionImageMessage) || (message === null || message === void 0 ? void 0 : message.spoilerMessage) || (message === null || message === void 0 ? void 0 : message.newsletterAdminProfileMessage) || (message === null || message === void 0 ? void 0 : message.newsletterAdminProfileMessageV2) || (message === null || message === void 0 ? void 0 : message.newsletterAdminProfileStatusMessage))
     }
 }
 
@@ -1617,7 +1617,7 @@ const REUPLOAD_REQUIRED_STATUS = [410, 404]
 
 const downloadMediaMessage = async (message, type, options, ctx) => {
     const result = await downloadMsg().catch(async (error) => {
-        if (ctx && axios_1.default.isAxiosError(error) && REUPLOAD_REQUIRED_STATUS.includes(error.response?.status)) {
+        if (ctx && typeof error?.status === 'number' && REUPLOAD_REQUIRED_STATUS.includes(error.status)) {
             ctx.logger.info({
                 key: message.key
             }, 'sending reupload media request...')

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pontasockets/baileys",
-  "version": "0.3.1",
+  "version": "0.3.3",
   "description": "Baileys is a lightweight JavaScript library for interacting with the WhatsApp Web API using WebSocket.",
   "keywords": [
     "facebook",
@@ -31,7 +31,7 @@
     "@adiwajshing/keyed-db": "^0.2.4",
     "@cacheable/node-cache": "1.5.3",
     "@pontasockets/eslint-config": "^1.0.0",
-    "@pontasockets/libsignal-node": "^1.0.0",
+    "@pontasockets/libsignal-node": "^1.1.0",
     "@hapi/boom": "^9.1.3",
     "async-mutex": "^0.5.0",
     "axios": "^1.12.1",