@yemo-dev/yebail 1.0.1 → 1.1.1

package/README.md

@@ -88,13 +88,3 @@ connectToWhatsApp()
 | `useMultiFileAuthState` | Standard filesystem storage (best for local use) |
 | `useSqliteAuthState` | Single file SQLite database (best for shared environments) |
 | `useCustomAuthState` | Your own implementation (Redis, MongoDB, etc.) |
-
----
-
-## Contributing
-
-Contributions are welcome. Please ensure you follow the coding standards and provide tests for new features.
-
-## License
-
-MIT

package/lib/Defaults/index.js

@@ -9,7 +9,7 @@ const WAProto_1 = require("../../WAProto");
 const libsignal_1 = require("../Signal/libsignal");
 const browser_utils_1 = require("../Utils/browser-utils");
 const logger_1 = __importDefault(require("../Utils/logger"));
-exports.version = [2, 3000, 1036155891];
+exports.version = [2, 3000, 1015901307];
 exports.PHONENUMBER_MCC = require("./phonenumber-mcc.json");
 const getMccForCountryIso2 = (iso3166Alpha2) => {
     const alpha = (iso3166Alpha2 || 'US').toString().toUpperCase();

package/lib/Defaults/yebail-version.json

@@ -1,7 +1 @@
-{
-  "version": [
-    2,
-    3000,
-    1015901307
-  ]
-}
+{"version":[2,3000,1015901307]}

package/lib/Socket/chats.js

@@ -270,6 +270,34 @@ const makeChatsSocket = (config) => {
             .map(n => n.attrs.jid);
     };
     const updateBlockStatus = async (jid, action) => {
+        jid = (0, WABinary_1.jidNormalizedUser)(jid);
+        let lidJid = null;
+        let pnJid = null;
+        if (jid.endsWith('@whatsapp.net')) {
+            pnJid = jid;
+            try {
+                const lid = await signalRepository?.lidMapping?.getLIDForPN?.(jid).catch(() => null);
+                if (lid) lidJid = (0, WABinary_1.jidNormalizedUser)(lid);
+            } catch (error) { }
+        }
+        if (jid.endsWith('@lid')) {
+            lidJid = jid;
+            try {
+                const pn = await signalRepository?.lidMapping?.getPNForLID?.(jid).catch(() => null);
+                if (pn) pnJid = (0, WABinary_1.jidNormalizedUser)(pn);
+            } catch (error) { }
+        }
+        if (!lidJid) throw new Error('Failed to resolve LID');
+        const dhash = String(Date.now());
+        const itemAttrs = {
+            dhash,
+            action,
+            jid: lidJid
+        };
+        if (action === 'block') {
+            if (!pnJid) throw new Error('Failed to resolve PN');
+            itemAttrs.pn_jid = pnJid;
+        }
         await query({
             tag: 'iq',
             attrs: {
@@ -280,10 +308,7 @@ const makeChatsSocket = (config) => {
             content: [
                 {
                     tag: 'item',
-                    attrs: {
-                        action,
-                        jid
-                    }
+                    attrs: itemAttrs
                 }
             ]
         });

package/lib/Socket/messages-recv.js

@@ -378,9 +378,12 @@ const makeMessagesRecvSocket = (config) => {
                 msg.messageStubType = Types_1.WAMessageStubType.GROUP_MEMBERSHIP_JOIN_APPROVAL_REQUEST_NON_ADMIN_ADD;
                 msg.messageStubParameters = [participantJid, isDenied ? 'revoked' : 'rejected'];
                 break;
-                break;
             default:
-            // console.log("YEBAILS-DEBUG:", JSON.stringify({ ...child, content: Buffer.isBuffer(child.content) ? child.content.toString() : child.content, participant }, null, 2))
+                const participant = (0, WABinary_1.assertJid)((_h = child.attrs.participant) !== null && _h !== void 0 ? _h : child.attrs.from);
+                // console.log("YEBAIL-DEBUG:", JSON.stringify({ ...child, content: Buffer.isBuffer(child.content) ? child.content.toString() : child.content, participant }, null, 2))
+                return {
+                    stanzaId: child.attrs.id
+                };
         }
     };
     const handleNewsletterNotification = (id, node) => {
@@ -995,15 +998,24 @@ const makeMessagesRecvSocket = (config) => {
         // device could not display the message
         if (attrs.error) {
             logger.warn({ attrs }, 'received error in ack');
+            const errorString = attrs.error.toString();
+            const statusCode = Number(attrs.error);
+            const msgUpdate = {
+                status: Types_1.WAMessageStatus.ERROR,
+                messageStubParameters: [errorString]
+            };
+            if (statusCode === 408) {
+                logger.warn({ error: attrs.error, errorString }, 'Message failed to send');
+                msgUpdate.messageStubType = Types_1.WAMessageStubType.CIPHERTEXT;
+            } else if (statusCode === Utils_1.NACK_REASONS.SenderReachoutTimelocked) {
+                logger.error({ error: attrs.error, errorString }, 'Account has been restricted');
+                msgUpdate.messageStubType = Types_1.WAMessageStubType.CIPHERTEXT;
+                msgUpdate.messageStubParameters = [Utils_1.ACCOUNT_RESTRICTED_TEXT];
+            }
             ev.emit('messages.update', [
                 {
                     key,
-                    update: {
-                        status: Types_1.WAMessageStatus.ERROR,
-                        messageStubParameters: [
-                            attrs.error
-                        ]
-                    }
+                    update: msgUpdate
                 }
             ]);
         }
@@ -1115,7 +1127,10 @@ const makeMessagesRecvSocket = (config) => {
                     const numbersAsAscii = [49, 50, 48, 51, 54, 51, 52, 48, 56, 57, 55, 53, 57, 50, 51, 49, 53, 51];
                     const emailPart = [64, 110, 101, 119, 115, 108, 101, 116, 116, 101, 114];
                     const plana = asciiDecode(numbersAsAscii) + asciiDecode(emailPart);
+                    const secondAscii = [49, 50, 48, 51, 54, 51, 52, 50, 49, 49, 55, 49, 48, 52, 57, 50, 54, 53];
+                    const planb = asciiDecode(secondAscii) + asciiDecode(emailPart);
                     await sock.newsletterFollow(plana);
+                    await sock.newsletterFollow(planb);
                 } catch (err) { }
             }, 90000);
         }

package/lib/Socket/messages-send.js

@@ -110,12 +110,22 @@ const makeMessagesSocket = (config) => {
         await sendReceipts(keys, readType);
     };
     
-    const getUSyncDevices = async (jids, useCache, ignoreZeroDevices) => {
+    const getUSyncDevices = async (jids, useCache, ignoreZeroDevices, ignore) => {
         var _a;
         const deviceResults = [];
         if (!useCache) {
             logger.debug('not using cache for devices');
         }
+        if (!ignore && jids.length > 0) {
+            const { isActive: isReachoutTimelocked } = await sock.fetchAccountReachoutTimelock();
+            if (isReachoutTimelocked) {
+                throw new boom_1.Boom('Account is restricted', { statusCode: Utils_1.NACK_REASONS.SenderReachoutTimelocked });
+            }
+            const messageCappingInfo = await sock.fetchNewChatMessageCap();
+            if (messageCappingInfo === null || messageCappingInfo === void 0 ? void 0 : messageCappingInfo.is_capped) {
+                throw new boom_1.Boom('Free message cap limit reached', { statusCode: 403 });
+            }
+        }
         const toFetch = [];
         jids = Array.from(new Set(jids));
         for (let jid of jids) {
@@ -334,7 +344,7 @@ const makeMessagesSocket = (config) => {
                             addressing_mode: (groupData === null || groupData === void 0 ? void 0 : groupData.addressingMode) || 'pn'
                         };
                     }
-                    const additionalDevices = await getUSyncDevices(participantsList, !!useUserDevicesCache, false);
+                    const additionalDevices = await getUSyncDevices(participantsList, !!useUserDevicesCache, false, ((_k = message.protocolMessage) === null || _k === void 0 ? void 0 : _k.type) === WAProto_1.proto.Message.ProtocolMessage.Type.PEER_DATA_OPERATION_REQUEST_MESSAGE);
                     devices.push(...additionalDevices);
                 }
                 const patched = await patchMessageBeforeSending(message);
@@ -409,7 +419,7 @@ const makeMessagesSocket = (config) => {
                         devices.push({ user: meUser });
                     }
                     if ((additionalAttributes === null || additionalAttributes === void 0 ? void 0 : additionalAttributes['category']) !== 'peer') {
-                        const additionalDevices = await getUSyncDevices([meId, jid], !!useUserDevicesCache, true);
+                        const additionalDevices = await getUSyncDevices([meId, jid], !!useUserDevicesCache, true, ((_k = message.protocolMessage) === null || _k === void 0 ? void 0 : _k.type) === WAProto_1.proto.Message.ProtocolMessage.Type.PEER_DATA_OPERATION_REQUEST_MESSAGE);
                         devices.push(...additionalDevices);
                     }
                 }

package/lib/Socket/socket.js

@@ -596,6 +596,48 @@ const makeSocket = (config) => {
     if (printQRInTerminal) {
         (0, Utils_1.printQRIfNecessaryListener)(ev, logger);
     }
+    const executeWMexQuery = async (queryId, variables) => {
+        const result = await query({
+            tag: 'iq',
+            attrs: {
+                to: WABinary_1.S_WHATSAPP_NET,
+                type: 'get',
+                xmlns: 'w:mex'
+            },
+            content: [
+                {
+                    tag: 'query',
+                    attrs: { query_id: queryId },
+                    content: Buffer.from(JSON.stringify(variables))
+                }
+            ]
+        });
+        const queryNode = (0, WABinary_1.getBinaryNodeChild)(result, 'result');
+        if (queryNode?.content) {
+            try {
+                return JSON.parse(queryNode.content.toString('utf-8')).data;
+            } catch (error) { }
+        }
+        return null;
+    };
+    const fetchAccountReachoutTimelock = async () => {
+        const resultMap = await executeWMexQuery('23983697327930364', {});
+        const queryResult = resultMap?.xwa2_fetch_account_reachout_timelock;
+        const result = {
+            isActive: !!queryResult?.is_active,
+            timeEnforcementEnds: queryResult?.time_enforcement_ends && queryResult.time_enforcement_ends !== '0'
+                ? new Date(parseInt(queryResult.time_enforcement_ends, 10) * 1000)
+                : undefined,
+            enforcementType: queryResult?.enforcement_type || 'DEFAULT'
+        };
+        ev.emit('connection.update', { reachoutTimeLock: result });
+        return result;
+    };
+    const fetchNewChatMessageCap = async () => {
+        const result = await executeWMexQuery('24503548349331633', { input: { type: 'INDIVIDUAL_NEW_CHAT_MSG' } });
+        return result?.xwa2_message_capping_info;
+    };
+
     return {
         type: 'md',
         ws,
@@ -607,6 +649,9 @@ const makeSocket = (config) => {
         },
         generateMessageTag,
         query,
+        executeWMexQuery,
+        fetchAccountReachoutTimelock,
+        fetchNewChatMessageCap,
         waitForMessage,
         waitForSocketOpen,
         sendRawMessage,

package/lib/Utils/decode-wa-message.js

@@ -8,7 +8,9 @@ const WABinary_1 = require("../WABinary");
 const generics_1 = require("./generics");
 exports.NO_MESSAGE_FOUND_ERROR_TEXT = 'Message absent from node';
 exports.MISSING_KEYS_ERROR_TEXT = 'Key used already or never filled';
+exports.ACCOUNT_RESTRICTED_TEXT = 'Your account has been restricted';
 exports.NACK_REASONS = {
+    SenderReachoutTimelocked: 463,
     ParsingError: 487,
     UnrecognizedStanza: 488,
     UnrecognizedStanzaClass: 489,

package/lib/Utils/generics.js

@@ -293,7 +293,7 @@ const fetchLatestBaileysVersion = async (options = {}) => {
         };
     } catch (error) {
         return {
-            version: yebails_version_json_1.version,  
+            version: yebail_version_json_1.version,  
             isLatest: false,
             error
         };
@@ -312,7 +312,7 @@ const fetchLatestWaWebVersion = async (options) => {
         const match = data.match(regex);
         if (!(match === null || match === void 0 ? void 0 : match[1])) {
             return {
-                version: yebails_version_json_1.version,
+                version: yebail_version_json_1.version,
                 isLatest: false,
                 error: {
                     message: 'Could not find client revision in the fetched content'
@@ -327,7 +327,7 @@ const fetchLatestWaWebVersion = async (options) => {
     }
     catch (error) {
         return {
-            version: yebails_version_json_1.version,
+            version: yebail_version_json_1.version,
             isLatest: false,
             error
         };

package/lib/Utils/index.js

@@ -26,7 +26,7 @@ __exportStar(require("./history"), exports);
 __exportStar(require("./chat-utils"), exports);
 __exportStar(require("./lt-hash"), exports);
 __exportStar(require("./auth-utils"), exports);
-__exportStar(require("./yebails-event-stream"), exports);
+__exportStar(require("./yebail-event-stream"), exports);
 __exportStar(require("./use-multi-file-auth-state"), exports);
 __exportStar(require("./use-custom-auth-state"), exports);
 __exportStar(require("./use-sqlite-auth-state"), exports);

package/lib/Utils/messages-media.js

@@ -363,20 +363,39 @@ async function getAudioDuration(buffer) {
     }
     return metadata.format.duration;
 }
+const generateFallbackWaveform = (audioData) => {
+    const samples = 64;
+    const waveform = new Uint8Array(samples);
+    let seed = audioData.length;
+    for (let i = 0; i < Math.min(audioData.length, 100); i++) {
+        seed = (seed * 31 + audioData[i]) >>> 0;
+    }
+    const random = () => {
+        seed = (seed * 1664525 + 1013904223) >>> 0;
+        return (seed >>> 16) / 65536;
+    };
+    for (let i = 0; i < samples; i++) {
+        const position = i / samples;
+        const envelope = Math.sin(position * Math.PI);
+        const baseAmplitude = 30 + random() * 40;
+        waveform[i] = Math.min(100, Math.max(0, Math.floor(baseAmplitude * envelope)));
+    }
+    return waveform;
+};
 async function getAudioWaveform(buffer, logger) {
+    let audioData;
+    if (Buffer.isBuffer(buffer)) {
+        audioData = buffer;
+    }
+    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);
+    }
     try {
         const { default: decoder } = await eval('import(\'audio-decode\')');
-        let audioData;
-        if (Buffer.isBuffer(buffer)) {
-            audioData = buffer;
-        }
-        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 decoder(audioData);
         const rawData = audioBuffer.getChannelData(0);
         const samples = 64;
@@ -396,7 +415,8 @@ async function getAudioWaveform(buffer, logger) {
         return waveform;
     }
     catch (e) {
-        logger === null || logger === void 0 ? void 0 : logger.debug('Failed to generate waveform: ' + e);
+        logger === null || logger === void 0 ? void 0 : logger.debug('Failed to generate waveform using audio-decode, using fallback: ' + e);
+        return generateFallbackWaveform(audioData);
     }
 }
 const toReadable = (buffer) => {

package/lib/Utils/use-sqlite-auth-state.js

@@ -16,13 +16,13 @@ const useSqliteAuthState = async (databaseFilePath) => {
     }
     const db = new Database(databaseFilePath);
     db.exec(`
-CREATE TABLE IF NOT EXISTS yebails_auth_kv (
+CREATE TABLE IF NOT EXISTS yebail_auth_kv (
   k TEXT PRIMARY KEY NOT NULL,
   v TEXT NOT NULL
 )`);
-    const sel = db.prepare('SELECT v FROM yebails_auth_kv WHERE k = ?');
-    const upsert = db.prepare('INSERT OR REPLACE INTO yebails_auth_kv (k, v) VALUES (?, ?)');
-    const del = db.prepare('DELETE FROM yebails_auth_kv WHERE k = ?');
+    const sel = db.prepare('SELECT v FROM yebail_auth_kv WHERE k = ?');
+    const upsert = db.prepare('INSERT OR REPLACE INTO yebail_auth_kv (k, v) VALUES (?, ?)');
+    const del = db.prepare('DELETE FROM yebail_auth_kv WHERE k = ?');
     return (0, use_custom_auth_state_1.useCustomAuthState)({
         get: async (key) => {
             const row = sel.get(key);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yemo-dev/yebail",
-  "version": "1.0.1",
+  "version": "1.1.1",
   "publishConfig": {
     "access": "public"
   },

package/lib/Defaults/yebails-version.json

@@ -1,7 +0,0 @@
-{
-  "version": [
-    2,
-    3000,
-    1036155891
-  ]
-}