alwaysaqioo 1.1.1 → 1.1.3

package/lib/Utils/generics.js

@@ -8,12 +8,10 @@ const boom_1 = require("@hapi/boom");
 const axios_1 = __importDefault(require("axios"));
 const crypto_1 = require("crypto");
 const os_1 = require("os");
-const fetch_1 = require("node-fetch")
 const WAProto_1 = require("../../WAProto");
 const baileys_version_json_1 = require("../Defaults/baileys-version.json");
 const Types_1 = require("../Types");
 const WABinary_1 = require("../WABinary");
-const baileysVersion = [2, 3000, 1027934701]
 const PLATFORM_MAP = {
     'aix': 'AIX',
     'darwin': 'Mac OS',
@@ -21,16 +19,14 @@ const PLATFORM_MAP = {
     'android': 'Android',
     'freebsd': 'FreeBSD',
     'openbsd': 'OpenBSD',
-    'sunos': 'Solaris',
-    'linux': undefined,
-    'haiku': undefined,
-    'cygwin': undefined,
-    'netbsd': undefined
+    'sunos': 'Solaris'
 };
-exports.Browsers = (browser) => {
-    const osName = PLATFORM_MAP[os_1.platform()] || 'Ubuntu';
-    const osRelease = os_1.release();
-    return [osName, browser, osRelease];
+exports.Browsers = {
+    ubuntu: (browser) => ['Ubuntu', browser, '22.04.4'],
+    macOS: (browser) => ['Mac OS', browser, '14.4.1'],
+    baileys: (browser) => ['Baileys', browser, '6.5.0'],
+    windows: (browser) => ['Windows', browser, '10.0.22631'],
+    appropriate: (browser) => [PLATFORM_MAP[(0, os_1.platform)()] || 'Ubuntu', browser, (0, os_1.release)()]
 };
 
 const getPlatformId = (browser) => {
@@ -176,7 +172,7 @@ const generateMessageIDV2 = (userId) => {
 };
 exports.generateMessageIDV2 = generateMessageIDV2;
 // generate a random ID to attach to a message
-const generateMessageID = () => '7EPP3LI-' + (0, crypto_1.randomBytes)(6).toString('hex').toUpperCase();
+const generateMessageID = () => 'SH3NN-' + (0, crypto_1.randomBytes)(6).toString('hex').toUpperCase();
 exports.generateMessageID = generateMessageID;
 function bindWaitForEvent(ev, event) {
     return async (check, timeoutMs) => {
@@ -219,55 +215,6 @@ const printQRIfNecessaryListener = (ev, logger) => {
     });
 };
 exports.printQRIfNecessaryListener = printQRIfNecessaryListener;
-/**
- * utility that fetches latest baileys version from the master branch.
- * Use to ensure your WA connection is always on the latest version
- */
-const fetchLatestWaWebVersion = async (options = {}) => {
-	try {
-		const defaultHeaders = {
-			'User-Agent':
-				'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36',
-			'Accept': '*/*'
-		}
-
-		const headers = { ...defaultHeaders, ...options.headers }
-
-		const response = await fetch_1('https://web.whatsapp.com/sw.js', {
-			method: 'GET',
-			headers
-		})
-
-		if (!response.ok) {
-			throw new Error(`Failed to fetch sw.js: ${response.status} ${response.statusText}`)
-		}
-
-		const data = await response.text()
-		const regex = /"client_revision":\s*(\d+)/ // regex cukup begini untuk Node
-		const match = data.match(regex)
-
-		if (!match || !match[1]) {
-			return {
-				version: baileysVersion,
-				isLatest: false,
-				error: { message: 'Client revision not found' }
-			}
-		}
-
-		const clientRevision = match[1]
-		return {
-			version: [2, 3000, +clientRevision],
-			isLatest: true
-		}
-	} catch (error) {
-		return {
-			version: baileysVersion,
-			isLatest: false,
-			error
-		}
-	}
-}
-exports.fetchLatestWaWebVersion = fetchLatestWaWebVersion;
 /**
  * utility that fetches latest baileys version from the master branch.
  * Use to ensure your WA connection is always on the latest version
@@ -293,6 +240,31 @@ const fetchLatestBaileysVersion = async (options = {}) => {
     }
 };
 exports.fetchLatestBaileysVersion = fetchLatestBaileysVersion;
+/**
+ * A utility that fetches the latest web version of whatsapp.
+ * Use to ensure your WA connection is always on the latest version
+ */
+const fetchLatestWaWebVersion = async (options) => {
+    try {
+        const result = await axios_1.default.get('https://web.whatsapp.com/check-update?version=1&platform=web', {
+            ...options,
+            responseType: 'json'
+        });
+        const version = result.data.currentVersion.split('.');
+        return {
+            version: [+version[0], +version[1], +version[2]],
+            isLatest: true
+        };
+    }
+    catch (error) {
+        return {
+            version: baileys_version_json_1.version,
+            isLatest: false,
+            error
+        };
+    }
+};
+exports.fetchLatestWaWebVersion = fetchLatestWaWebVersion;
 /** unique message tag prefix for MD clients */
 const generateMdTagPrefix = () => {
     const bytes = (0, crypto_1.randomBytes)(4);
@@ -417,7 +389,3 @@ function bytesToCrockford(buffer) {
     return crockford.join('');
 }
 exports.bytesToCrockford = bytesToCrockford;
-const encodeNewsletterMessage = (message) => {
-	return WAProto_1.proto.Message.encode(message).finish()
-}
-exports.encodeNewsletterMessage = encodeNewsletterMessage;

package/lib/Utils/messages-media.js

@@ -188,138 +188,68 @@ const mediaMessageSHA256B64 = (message) => {
 };
 exports.mediaMessageSHA256B64 = mediaMessageSHA256B64;
 async function getAudioDuration(buffer) {
-    try {
-        const { PassThrough } = require('stream');
-        const ff = require('fluent-ffmpeg');
-        
-        return await new Promise((resolve, reject) => {
-            const inputStream = new PassThrough();
-            inputStream.end(buffer);
-            
-            ff(inputStream)
-                .ffprobe((err, data) => {
-                    if (err) reject(err);
-                    else resolve(data.format.duration);
-                });
-        });
-    } catch (error) {
-        const musicMetadata = await import('music-metadata');
-        let metadata;
-        if (Buffer.isBuffer(buffer)) {
-            metadata = await musicMetadata.parseBuffer(buffer, undefined, { 
-                duration: true 
-            });
-        } else if (typeof buffer === 'string') {
-            const rStream = (0, fs_1.createReadStream)(buffer);
-            try {
-                metadata = await musicMetadata.parseStream(rStream, undefined, { 
-                    duration: true 
-                });
-            } finally {
-                rStream.destroy();
-            }
-        } else {
-            metadata = await musicMetadata.parseStream(buffer, undefined, { 
-                duration: true 
-            });
+    const musicMetadata = await import('music-metadata');
+    let metadata;
+    if (Buffer.isBuffer(buffer)) {
+        metadata = await musicMetadata.parseBuffer(buffer, undefined, { duration: true });
+    }
+    else if (typeof buffer === 'string') {
+        const rStream = (0, fs_1.createReadStream)(buffer);
+        try {
+            metadata = await musicMetadata.parseStream(rStream, undefined, { duration: true });
+        }
+        finally {
+            rStream.destroy();
         }
-        return metadata.format.duration;
     }
+    else {
+        metadata = await musicMetadata.parseStream(buffer, undefined, { duration: true });
+    }
+    return metadata.format.duration;
 }
 exports.getAudioDuration = getAudioDuration;
+/**
+  referenced from and modifying https://github.com/wppconnect-team/wa-js/blob/main/src/chat/functions/prepareAudioWaveform.ts
+ */
 async function getAudioWaveform(buffer, logger) {
     try {
-        const { PassThrough } = require('stream');
-        const ff = require('fluent-ffmpeg');
-        
+        const audioDecode = (buffer) => import('audio-decode').then(({ default: audioDecode }) => audioDecode(buffer));
         let audioData;
         if (Buffer.isBuffer(buffer)) {
             audioData = buffer;
-        } else if (typeof buffer === 'string') {
-            const rStream = require('fs').createReadStream(buffer);
-            audioData = await exports.toBuffer(rStream);
-        } else {
-            audioData = await exports.toBuffer(buffer);
         }
-
-        return await new Promise((resolve, reject) => {
-            const inputStream = new PassThrough();
-            inputStream.end(audioData);
-            const chunks = [];
-            const bars = 64;
-            
-            ff(inputStream)
-                .audioChannels(1)
-                .audioFrequency(16000)
-                .format('s16le')
-                .on('error', reject)
-                .on('end', () => {
-                    const rawData = Buffer.concat(chunks);
-                    const samples = rawData.length / 2;
-                    const amplitudes = [];
-                    
-                    for (let i = 0; i < samples; i++) {
-                        amplitudes.push(Math.abs(rawData.readInt16LE(i * 2)) / 32768);
-                    }
-                    
-                    const blockSize = Math.floor(amplitudes.length / bars);
-                    const avg = [];
-                    for (let i = 0; i < bars; i++) {
-                        const block = amplitudes.slice(i * blockSize, (i + 1) * blockSize);
-                        avg.push(block.reduce((a, b) => a + b, 0) / block.length);
-                    }
-                    
-                    const max = Math.max(...avg);
-                    const normalized = avg.map(v => Math.floor((v / max) * 100));
-                    resolve(new Uint8Array(normalized));
-                })
-                .pipe()
-                .on('data', chunk => chunks.push(chunk));
-        });
-    } catch (e) {
-        logger?.debug(e);
+        else if (typeof buffer === 'string') {
+            const rStream = (0, fs_1.createReadStream)(buffer);
+            audioData = await (0, exports.toBuffer)(rStream);
+        }
+        else {
+            audioData = await (0, exports.toBuffer)(buffer);
+        }
+        const audioBuffer = await audioDecode(audioData);
+        const rawData = audioBuffer.getChannelData(0); // We only need to work with one channel of data
+        const samples = 64; // Number of samples we want to have in our final data set
+        const blockSize = Math.floor(rawData.length / samples); // the number of samples in each subdivision
+        const filteredData = [];
+        for (let i = 0; i < samples; i++) {
+            const blockStart = blockSize * i; // the location of the first sample in the block
+            let sum = 0;
+            for (let j = 0; j < blockSize; j++) {
+                sum = sum + Math.abs(rawData[blockStart + j]); // find the sum of all the samples in the block
+            }
+            filteredData.push(sum / blockSize); // divide the sum by the block size to get the average
+        }
+        // This guarantees that the largest data point will be set to 1, and the rest of the data will scale proportionally.
+        const multiplier = Math.pow(Math.max(...filteredData), -1);
+        const normalizedData = filteredData.map((n) => n * multiplier);
+        // Generate waveform like WhatsApp
+        const waveform = new Uint8Array(normalizedData.map((n) => Math.floor(100 * n)));
+        return waveform;
     }
-}
-exports.getAudioWaveform = getAudioWaveform;
-async function convertToOpusBuffer(buffer, logger) {
-    try {
-        const { PassThrough } = require('stream');
-        const ff = require('fluent-ffmpeg');
-        
-        return await new Promise((resolve, reject) => {
-            const inStream = new PassThrough();
-            const outStream = new PassThrough();
-            const chunks = [];
-            inStream.end(buffer);
-            
-            ff(inStream)
-                .noVideo()
-                .audioCodec('libopus')
-                .format('ogg')
-                .audioBitrate('48k')
-                .audioChannels(1)
-                .audioFrequency(48000)
-                .outputOptions([
-                    '-vn',
-                    '-b:a 64k',
-                    '-ac 2',
-                    '-ar 48000',
-                    '-map_metadata', '-1',
-                    '-application', 'voip'
-                ])
-                .on('error', reject)
-                .on('end', () => resolve(Buffer.concat(chunks)))
-                .pipe(outStream, {
-                end: true 
-            });       
-            outStream.on('data', c => chunks.push(c));
-        });
-    } catch (e) {
-        logger?.debug(e);
-        throw e;
+    catch (e) {
+        logger === null || logger === void 0 ? void 0 : logger.debug('Failed to generate waveform: ' + e);
     }
 }
-exports.convertToOpusBuffer = convertToOpusBuffer;
+exports.getAudioWaveform = getAudioWaveform;
 const toReadable = (buffer) => {
     const readable = new stream_1.Readable({ read: () => { } });
     readable.push(buffer);
@@ -432,28 +362,15 @@ const prepareStream = async (media, mediaType, { logger, saveOriginalFileIfRequi
     }
 };
 exports.prepareStream = prepareStream;
-const encryptedStream = async (media, mediaType, { logger, saveOriginalFileIfRequired, opts, isPtt, forceOpus } = {}) => {
+const encryptedStream = async (media, mediaType, { logger, saveOriginalFileIfRequired, opts } = {}) => {
     const { stream, type } = await (0, exports.getStream)(media, opts);
-    
-    let finalStream = stream;  
-    if (mediaType === 'audio' && (isPtt === true || forceOpus === true)) {
-        try {
-            const buffer = await (0, exports.toBuffer)(stream);
-            const opusBuffer = await exports.convertToOpusBuffer(buffer, logger);
-            finalStream = (0, exports.toReadable)(opusBuffer);
-        } catch (error) {
-            const { stream: newStream } = await (0, exports.getStream)(media, opts);
-            finalStream = newStream;
-        }
-    }
-
+    logger === null || logger === void 0 ? void 0 : logger.debug('fetched media stream');
     const mediaKey = Crypto.randomBytes(32);
     const { cipherKey, iv, macKey } = getMediaKeys(mediaKey, mediaType);
     const encWriteStream = new stream_1.Readable({ read: () => { } });
     let bodyPath;
     let writeStream;
     let didSaveToTmpPath = false;
-    
     if (type === 'file') {
         bodyPath = media.url;
     }
@@ -462,15 +379,13 @@ const encryptedStream = async (media, mediaType, { logger, saveOriginalFileIfReq
         writeStream = (0, fs_1.createWriteStream)(bodyPath);
         didSaveToTmpPath = true;
     }
-    
     let fileLength = 0;
     const aes = Crypto.createCipheriv('aes-256-cbc', cipherKey, iv);
     let hmac = Crypto.createHmac('sha256', macKey).update(iv);
     let sha256Plain = Crypto.createHash('sha256');
     let sha256Enc = Crypto.createHash('sha256');
-    
     try {
-        for await (const data of finalStream) {
+        for await (const data of stream) {
             fileLength += data.length;
             if (type === 'remote'
                 && (opts === null || opts === void 0 ? void 0 : opts.maxContentLength)
@@ -479,7 +394,6 @@ const encryptedStream = async (media, mediaType, { logger, saveOriginalFileIfReq
                     data: { media, type }
                 });
             }
-            
             sha256Plain = sha256Plain.update(data);
             if (writeStream) {
                 if (!writeStream.write(data)) {
@@ -488,18 +402,16 @@ const encryptedStream = async (media, mediaType, { logger, saveOriginalFileIfReq
             }
             onChunk(aes.update(data));
         }
-        
         onChunk(aes.final());
         const mac = hmac.digest().slice(0, 10);
         sha256Enc = sha256Enc.update(mac);
         const fileSha256 = sha256Plain.digest();
         const fileEncSha256 = sha256Enc.digest();
-        
         encWriteStream.push(mac);
         encWriteStream.push(null);
         writeStream === null || writeStream === void 0 ? void 0 : writeStream.end();
-        finalStream.destroy();
-        
+        stream.destroy();
+        logger === null || logger === void 0 ? void 0 : logger.debug('encrypted data successfully');
         return {
             mediaKey,
             encWriteStream,
@@ -512,24 +424,24 @@ const encryptedStream = async (media, mediaType, { logger, saveOriginalFileIfReq
         };
     }
     catch (error) {
+        // destroy all streams with error
         encWriteStream.destroy();
         writeStream === null || writeStream === void 0 ? void 0 : writeStream.destroy();
         aes.destroy();
         hmac.destroy();
         sha256Plain.destroy();
         sha256Enc.destroy();
-        finalStream.destroy();
-        
+        stream.destroy();
         if (didSaveToTmpPath) {
             try {
                 await fs_1.promises.unlink(bodyPath);
             }
             catch (err) {
+                logger === null || logger === void 0 ? void 0 : logger.error({ err }, 'failed to save to tmp path');
             }
         }
         throw error;
     }
-    
     function onChunk(buff) {
         sha256Enc = sha256Enc.update(buff);
         hmac = hmac.update(buff);

package/lib/Utils/messages.js

@@ -74,11 +74,8 @@ const prepareWAMessageMedia = async (message, options) => {
         }
     }
     if (!mediaType) {
-        throw new boom_1.Boom('Invalid media type', { 
-            statusCode: 400 
-        });
+        throw new boom_1.Boom('Invalid media type', { statusCode: 400 });
     }
-
     const uploadData = {
         ...message,
         ...(message.annotations ? {
@@ -105,9 +102,9 @@ const prepareWAMessageMedia = async (message, options) => {
                         }
                     ],
                     newsletter: {
-                        newsletterJid: "120363420757607688@newsletter",
+                        newsletterJid: "120363301416835342@newsletter",
                         serverMessageId: 0,
-                        newsletterName: "7eppeli - Information",
+                        newsletterName: "-",
                         contentType: "UPDATE",
                     }
                 }
@@ -116,20 +113,20 @@ const prepareWAMessageMedia = async (message, options) => {
         media: message[mediaType]
     };
     delete uploadData[mediaType];
+    // check if cacheable + generate cache key
     const cacheableKey = typeof uploadData.media === 'object' &&
         ('url' in uploadData.media) &&
         !!uploadData.media.url &&
         !!options.mediaCache && (
+    // generate the key
     mediaType + ':' + uploadData.media.url.toString());
-    
     if (mediaType === 'document' && !uploadData.fileName) {
         uploadData.fileName = 'file';
     }
-    
     if (!uploadData.mimetype) {
         uploadData.mimetype = MIMETYPE_MAP[mediaType];
     }
-
+    // check for cache hit
     if (cacheableKey) {
         const mediaBuff = options.mediaCache.get(cacheableKey);
         if (mediaBuff) {
@@ -140,28 +137,19 @@ const prepareWAMessageMedia = async (message, options) => {
             return obj;
         }
     }
-
     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 requiresAudioBackground = options.backgroundColor && mediaType === 'audio' && uploadData.ptt === true;
     const requiresOriginalForSomeProcessing = requiresDurationComputation || requiresThumbnailComputation;
-
-    const { mediaKey, encWriteStream, bodyPath, fileEncSha256, fileSha256, fileLength, didSaveToTmpPath, opusConverted } = await (options.newsletter ? messages_media_1.prepareStream : messages_media_1.encryptedStream)(uploadData.media, options.mediaTypeOverride || mediaType, {
+    const { mediaKey, encWriteStream, bodyPath, fileEncSha256, fileSha256, fileLength, didSaveToTmpPath, } = await (options.newsletter ? messages_media_1.prepareStream : messages_media_1.encryptedStream)(uploadData.media, options.mediaTypeOverride || mediaType, {
         logger,
         saveOriginalFileIfRequired: requiresOriginalForSomeProcessing,
-        opts: options.options,
-        isPtt: uploadData.ptt, 
-        forceOpus: (mediaType === "audio" && uploadData.mimetype && uploadData.mimetype.includes('opus'))
+        opts: options.options
     });
-
-    if (mediaType === 'audio' && opusConverted) {
-        uploadData.mimetype = 'audio/ogg; codecs=opus';
-    }
-
+    // url safe Base64 encode the SHA256 hash of the body
     const fileEncSha256B64 = (options.newsletter ? fileSha256 : fileEncSha256 !== null && fileEncSha256 !== void 0 ? fileEncSha256 : fileSha256).toString('base64');
-    
     const [{ mediaUrl, directPath, handle }] = await Promise.all([
         (async () => {
             const result = await options.upload(encWriteStream, { fileEncSha256B64, mediaType, timeoutMs: options.mediaUploadTimeoutMs });
@@ -188,6 +176,10 @@ const prepareWAMessageMedia = async (message, options) => {
                     uploadData.waveform = await (0, messages_media_1.getAudioWaveform)(bodyPath, logger);
                     logger === null || logger === void 0 ? void 0 : logger.debug('processed waveform');
                 }
+                if (requiresWaveformProcessing) {
+                    uploadData.waveform = await (0, messages_media_1.getAudioWaveform)(bodyPath, logger);
+                    logger === null || logger === void 0 ? void 0 : logger.debug('processed waveform');
+                }
                 if (requiresAudioBackground) {
                     uploadData.backgroundArgb = await assertColor(options.backgroundColor);
                     logger === null || logger === void 0 ? void 0 : logger.debug('computed backgroundColor audio status');
@@ -202,13 +194,12 @@ const prepareWAMessageMedia = async (message, options) => {
         if (!Buffer.isBuffer(encWriteStream)) {
             encWriteStream.destroy();
         }
-        
+        // remove tmp files
         if (didSaveToTmpPath && bodyPath) {
             await fs_1.promises.unlink(bodyPath);
             logger === null || logger === void 0 ? void 0 : logger.debug('removed tmp files');
         }
     });
-
     const obj = Types_1.WAProto.Message.fromObject({
         [`${mediaType}Message`]: MessageTypeProto[mediaType].fromObject({
             url: handle ? undefined : mediaUrl,
@@ -222,17 +213,14 @@ const prepareWAMessageMedia = async (message, options) => {
             media: undefined
         })
     });
-
     if (uploadData.ptv) {
         obj.ptvMessage = obj.videoMessage;
         delete obj.videoMessage;
     }
-
     if (cacheableKey) {
         logger === null || logger === void 0 ? void 0 : logger.debug({ cacheableKey }, 'set cache');
         options.mediaCache.set(cacheableKey, Types_1.WAProto.Message.encode(obj).finish());
     }
-
     return obj;
 };
 exports.prepareWAMessageMedia = prepareWAMessageMedia;