@rexxhayanasi/elaina-baileys 1.1.7 → 1.1.9

package/lib/Signal/Group/keyhelper.js

@@ -1,20 +1,22 @@
 "use strict";
+/**
+ * Signal Group Key Helper
+ * Helper functions to generate sender keys and signing keys safely.
+ */
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
 }));
+
 var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
     Object.defineProperty(o, "default", { enumerable: true, value: v });
 }) : function(o, v) {
     o["default"] = v;
 });
+
 var __importStar = (this && this.__importStar) || (function () {
     var ownKeys = function(o) {
         ownKeys = Object.getOwnPropertyNames || function (o) {
@@ -32,45 +34,55 @@ var __importStar = (this && this.__importStar) || (function () {
         return result;
     };
 })();
+
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateSenderKey = generateSenderKey;
 exports.generateSenderKeyId = generateSenderKeyId;
 exports.generateSenderSigningKey = generateSenderSigningKey;
+
 const nodeCrypto = __importStar(require("crypto"));
-const curve_1 = require("libsignal/src/curve");
+const curve_1 = require("libsignal/src/curve"); 
 
+/**
+ * Generates a random 32-byte Sender Key.
+ * @returns {Buffer} The generated key.
+ */
 function generateSenderKey() {
     const key = nodeCrypto.randomBytes(32);
-    if (!Buffer.isBuffer(key) || key.length !== 32) {
-        throw new Error("Failed to generate valid sender key");
+    if (key.length !== 32) {
+        throw new Error("Failed to generate a valid 32-byte Sender Key");
     }
     return key;
 }
 
+/**
+ * Generates a random Sender Key ID.
+ * @returns {number} The generated Key ID.
+ */
 function generateSenderKeyId() {
     const id = nodeCrypto.randomInt(2147483647);
-    if (typeof id !== 'number') {
-        throw new Error("Failed to generate sender key ID");
+    if (!id || typeof id !== 'number') {
+        throw new Error("Failed to generate Sender Key ID");
     }
     return id;
 }
 
+/**
+ * Generates a Sender Signing Key Pair.
+ * Uses libsignal's curve implementation.
+ * @param {Object} [key] Optional existing key pair.
+ * @returns {Object} The key pair (public/private).
+ */
 function generateSenderSigningKey(key) {
     if (!key) {
         key = (0, curve_1.generateKeyPair)();
     }
+
     if (!key || !key.pubKey || !key.privKey) {
-        throw new Error("Invalid key pair provided");
+        throw new Error("Invalid KeyPair generated from Curve");
     }
-    const publicBuf = Buffer.from(key.pubKey);
-    const privateBuf = Buffer.from(key.privKey);
-    
-    if (publicBuf.length !== 32 || privateBuf.length !== 32) {
-        throw new Error("Invalid signing key length");
-    }
-
     return {
-        public: publicBuf,
-        private: privateBuf
+        public: key.pubKey, 
+        private: key.privKey
     };
 }

package/lib/Utils/messages-media.js

@@ -83,9 +83,8 @@ const getImageProcessingLibrary = async () => {
     throw new boom_1.Boom('No image processing library available');
 };
 const hkdfInfoKey = (type) => {
-    if (type === 'ptv') return 'WhatsApp Video Keys';
     if (type === 'sticker-pack') return 'WhatsApp Image Keys';
-
+    if (type === 'ptv') return 'WhatsApp Video Keys';
     const hkdfInfo = Defaults_1.MEDIA_HKDF_KEY_MAPPING[type];
     return `WhatsApp ${hkdfInfo} Keys`;
 };
@@ -727,7 +726,7 @@ function extensionForMediaMessage(message) {
     }
     return extension;
 }
-const getWAUploadToServer = ({ customUploadHosts, fetchAgent, logger, options }, refreshMediaConn) => {
+    const getWAUploadToServer = ({ customUploadHosts, fetchAgent, logger, options }, refreshMediaConn) => {
     return async (stream, { mediaType, fileEncSha256B64, newsletter, timeoutMs }) => {
         var _a, _b;
         let uploadInfo = await refreshMediaConn(false);
@@ -741,6 +740,7 @@ const getWAUploadToServer = ({ customUploadHosts, fetchAgent, logger, options },
         }
         const reqBody = Buffer.isBuffer(stream) ? stream : Buffer.concat(chunks);
         fileEncSha256B64 = (0, exports.encodeBase64EncodedStringForUpload)(fileEncSha256B64);
+        
         let media = Defaults_1.MEDIA_PATH_MAP[mediaType];
         if (mediaType === 'sticker-pack') {
             media = '/mms/image';
@@ -748,6 +748,7 @@ const getWAUploadToServer = ({ customUploadHosts, fetchAgent, logger, options },
         if (newsletter) {
             media = media === null || media === void 0 ? void 0 : media.replace('/mms/', '/newsletter/newsletter-');
         }
+
         for (const { hostname, maxContentLengthBytes } of hosts) {
             logger.debug(`uploading to "${hostname}"`);
             const auth = encodeURIComponent(uploadInfo.auth);
@@ -798,7 +799,7 @@ const getWAUploadToServer = ({ customUploadHosts, fetchAgent, logger, options },
         return urls;
     };
 };
-exports.getWAUploadToServer = getWAUploadToServer;
+exports.getWAUploadToServer = getWAUploadToServer;                
 const getMediaRetryKey = (mediaKey) => {
     return (0, crypto_1.hkdf)(mediaKey, 32, { info: 'WhatsApp Media Retry Notification' });
 };

package/lib/Utils/messages.js

@@ -101,20 +101,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());
+            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) {
@@ -125,19 +125,78 @@ const prepareWAMessageMedia = async (message, options) => {
             return obj;
         }
     }
+
+    const isNewsletter = options.newsletter || (options.jid && (0, WABinary_1.isJidNewsletter)(options.jid));
+
+    if (isNewsletter) {
+        logger === null || logger === void 0 ? void 0 : logger.debug({ key: cacheableKey }, 'Preparing raw media for newsletter');
+        
+        const { bodyPath, fileSha256, fileLength, didSaveToTmpPath } = await (0, messages_media_1.prepareStream)(
+            uploadData.media, 
+            options.mediaTypeOverride || mediaType, 
+            { logger, opts: options.options }
+        );
+
+        const fileEncSha256B64 = fileSha256.toString('base64');
+        
+        const { mediaUrl, directPath } = await options.upload(bodyPath, { 
+            fileEncSha256B64, 
+            mediaType, 
+            timeoutMs: options.mediaUploadTimeoutMs,
+            newsletter: true
+        });
+
+        if (didSaveToTmpPath && bodyPath) {
+            try {
+                await fs_1.promises.unlink(bodyPath);
+            } catch (error) {
+                logger === null || logger === void 0 ? void 0 : logger.warn('failed to remove tmp file');
+            }
+        }
+
+        const obj = Types_1.WAProto.Message.fromObject({
+            [`${mediaType}Message`]: MessageTypeProto[mediaType].fromObject({
+                url: mediaUrl,
+                directPath,
+                fileSha256,
+                fileLength,
+                ...uploadData,
+                media: undefined
+            })
+        });
+
+        if (uploadData.ptv) {
+            obj.ptvMessage = obj.videoMessage;
+            delete obj.videoMessage;
+        }
+
+        if (obj.stickerMessage) {
+            obj.stickerMessage.stickerSentTs = Date.now();
+        }
+
+        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;
+    }
+
     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, } = 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 (0, messages_media_1.encryptedStream)(uploadData.media, options.mediaTypeOverride || mediaType, {
         logger,
         saveOriginalFileIfRequired: requiresOriginalForSomeProcessing,
         opts: options.options
     });
-    // 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 fileEncSha256B64 = (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 });
@@ -152,21 +211,16 @@ const prepareWAMessageMedia = async (message, options) => {
                     if (!uploadData.width && originalImageDimensions) {
                         uploadData.width = originalImageDimensions.width;
                         uploadData.height = originalImageDimensions.height;
-                        logger === null || logger === void 0 ? void 0 : logger.debug('set dimensions');
                     }
-                    logger === null || logger === void 0 ? void 0 : logger.debug('generated thumbnail');
                 }
                 if (requiresDurationComputation) {
                     uploadData.seconds = await (0, messages_media_1.getAudioDuration)(bodyPath);
-                    logger === null || logger === void 0 ? void 0 : logger.debug('computed audio duration');
                 }
                 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');
                 }
             }
             catch (error) {
@@ -174,11 +228,10 @@ const prepareWAMessageMedia = async (message, options) => {
             }
         })(),
     ])
-        .finally(async () => {
+    .finally(async () => {
         if (!Buffer.isBuffer(encWriteStream)) {
             encWriteStream.destroy();
         }
-        // remove tmp files
         if (didSaveToTmpPath && bodyPath) {
             try {
                 await fs_1.promises.access(bodyPath);
@@ -190,6 +243,7 @@ const prepareWAMessageMedia = async (message, options) => {
             }
         }
     });
+
     const obj = Types_1.WAProto.Message.fromObject({
         [`${mediaType}Message`]: MessageTypeProto[mediaType].fromObject({
             url: handle ? undefined : mediaUrl,
@@ -203,17 +257,19 @@ 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;
+
 const prepareDisappearingMessageSettingContent = (ephemeralExpiration) => {
     ephemeralExpiration = ephemeralExpiration || 0;
     const content = {
@@ -398,11 +454,11 @@ const generateWAMessageContent = async (message, options) => {
         }
     }
         else if ('ptv' in message && message.ptv) {
-        const { videoMessage } = await (0, exports.prepareWAMessageMedia)({ 
+        const { ptvMessage } = await (0, exports.prepareWAMessageMedia)({ 
             video: message.ptv, 
-            ptv: true           
+            ptv: true 
         }, options);
-        m.ptvMessage = videoMessage;
+        m.ptvMessage = ptvMessage;
     }
     else if ('product' in message) {
         const { imageMessage } = await (0, exports.prepareWAMessageMedia)({ image: message.product.productImage }, options);
@@ -1225,4 +1281,4 @@ const prepareStickerPackMessage = async (stickerPack, options) => {
 
     return { stickerPackMessage };
 };
-exports.prepareStickerPackMessage = prepareStickerPackMessage;
+exports.prepareStickerPackMessage = prepareStickerPackMessage;

package/lib/index.js

@@ -55,6 +55,5 @@ __exportStar(require("./WABinary"), exports);
 __exportStar(require("./WAM"), exports);
 __exportStar(require("./WAUSync"), exports);
 __exportStar(require("./Api"), exports);
-__exportStar(require("./Auth"), exports);
 
 exports.default = Socket_1.default;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rexxhayanasi/elaina-baileys",
-  "version": "1.1.7",
+  "version": "1.1.9",
   "description": "Custom Baileys WhatsApp API",
   "keywords": [
     "baileys", 
@@ -89,8 +89,7 @@
     "jimp": "^0.22.10",
     "link-preview-js": "^3.0.0",
     "qrcode-terminal": "^0.12.0",
-    "sharp": "^0.34.1",
-    "better-sqlite3": "^12.5.0"
+    "sharp": "^0.34.1"
   },
   "peerDependenciesMeta": {    
     "jimp": {

package/lib/Auth/index.js

@@ -1,8 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.useSQLiteAuth = void 0;
-const sqlite_1 = __importDefault(require("./sqlite"));
-exports.useSQLiteAuth = sqlite_1.default;

package/lib/Auth/sqlite.js

@@ -1,57 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.useSQLiteAuth = void 0;
-
-const BetterSqlite = require("better-sqlite3");
-const { BufferJSON } = require("../index");
-const { initAuthCreds } = require("../Utils");
-
-const db = new BetterSqlite("./session.db");
-
-db.exec(`
-  CREATE TABLE IF NOT EXISTS auth (
-    id TEXT PRIMARY KEY,
-    data TEXT
-  )
-`);
-
-const useSQLiteAuth = () => {
-    const readData = (id) => {
-        const row = db.prepare("SELECT data FROM auth WHERE id=?").get(id);
-        return row ? JSON.parse(row.data, BufferJSON.reviver) : null;
-    };
-
-    const writeData = (id, data) => {
-        db.prepare("INSERT OR REPLACE INTO auth VALUES (?, ?)")
-          .run(id, JSON.stringify(data, BufferJSON.replacer));
-    };
-
-    const state = {
-        creds: readData("creds") || initAuthCreds(),
-        keys: {
-            get(type, ids) {
-                const data = {};
-                for (const id of ids) {
-                    const value = readData(`${type}-${id}`);
-                    if (value) data[id] = value;
-                }
-                return data;
-            },
-            set(data) {
-                for (const type in data) {
-                    for (const id in data[type]) {
-                        writeData(`${type}-${id}`, data[type][id]);
-                    }
-                }
-            }
-        }
-    };
-
-    const saveCreds = () => writeData("creds", state.creds);
-
-    return { state, saveCreds };
-};
-
-exports.useSQLiteAuth = useSQLiteAuth;
-exports.default = useSQLiteAuth;