@rexxhayanasi/elaina-baileys 1.0.9 → 1.1.0-DEV.2

package/lib/Socket/chats.js

@@ -24,7 +24,14 @@ const SyncState = {
     Online: 'online'
 };
 const makeChatsSocket = (config) => {
-    const { logger, markOnlineOnConnect, fireInitQueries, appStateMacVerification, shouldIgnoreJid, shouldSyncHistoryMessage, } = config;
+    const   { 
+        logger,
+        markOnlineOnConnect,
+        fireInitQueries,
+        appStateMacVerification,
+        shouldIgnoreJid,
+        shouldSyncHistoryMessage,
+        relayMessage, } = config;
     const sock = (0, usync_1.makeUSyncSocket)(config);
     const { ev, ws, authState, generateMessageTag, sendNode, query, signalRepository, onUnexpectedError, } = sock;
     let privacySettings;
@@ -346,50 +353,52 @@ const makeChatsSocket = (config) => {
     }
   };
 const getBusinessProfile = async (jid) => {
-    const results = await query({
-        tag: 'iq',
-        attrs: {
-            to: 's.whatsapp.net',
-            xmlns: 'w:biz',
-            type: 'get'
-        },
-        content: [{
-            tag: 'business_profile',
-            attrs: { v: '244' },
+        var _a, _b, _c, _d, _e, _f, _g;
+        const results = await query({
+            tag: 'iq',
+            attrs: {
+                to: 's.whatsapp.net',
+                xmlns: 'w:biz',
+                type: 'get'
+            },
             content: [{
-                tag: 'profile',
-                attrs: { jid }
-            }]
-        }]
-    })
-
-    const profileNode = getBinaryNodeChild(results, 'business_profile')
-    const profiles = getBinaryNodeChild(profileNode, 'profile')
-
-    if (!profiles) return null
-
-    const address = getBinaryNodeChild(profiles, 'address')
-    const description = getBinaryNodeChild(profiles, 'description')
-    const website = getBinaryNodeChild(profiles, 'website')
-    const email = getBinaryNodeChild(profiles, 'email')
-    const category = getBinaryNodeChild(getBinaryNodeChild(profiles, 'categories'), 'category')
-    const businessHours = getBinaryNodeChild(profiles, 'business_hours')
-    const businessHoursConfig = businessHours ? getBinaryNodeChildren(businessHours, 'business_hours_config') : undefined
-    const websiteStr = website?.content?.toString()
+                    tag: 'business_profile',
+                    attrs: { v: '244' },
+                    content: [{
+                            tag: 'profile',
+                            attrs: { jid }
+                        }]
+                }]
+        });
+        const profileNode = (0, WABinary_1.getBinaryNodeChild)(results, 'business_profile');
+        const profiles = (0, WABinary_1.getBinaryNodeChild)(profileNode, 'profile');
+        if (profiles) {
+            const address = (0, WABinary_1.getBinaryNodeChild)(profiles, 'address');
+            const description = (0, WABinary_1.getBinaryNodeChild)(profiles, 'description');
+            const website = (0, WABinary_1.getBinaryNodeChild)(profiles, 'website');
+            const email = (0, WABinary_1.getBinaryNodeChild)(profiles, 'email');
+            const category = (0, WABinary_1.getBinaryNodeChild)((0, WABinary_1.getBinaryNodeChild)(profiles, 'categories'), 'category');
+            const businessHours = (0, WABinary_1.getBinaryNodeChild)(profiles, 'business_hours');
+            const businessHoursConfig = businessHours ?
+                (0, WABinary_1.getBinaryNodeChildren)(businessHours, 'business_hours_config') :
+                undefined;
+            const websiteStr = (_a = website === null || website === void 0 ? void 0 : website.content) === null || _a === void 0 ? void 0 : _a.toString();
+            return {
+                wid: (_b = profiles.attrs) === null || _b === void 0 ? void 0 : _b.jid,
+                address: (_c = address === null || address === void 0 ? void 0 : address.content) === null || _c === void 0 ? void 0 : _c.toString(),
+                description: ((_d = description === null || description === void 0 ? void 0 : description.content) === null || _d === void 0 ? void 0 : _d.toString()) || '',
+                website: websiteStr ? [websiteStr] : [],
+                email: (_e = email === null || email === void 0 ? void 0 : email.content) === null || _e === void 0 ? void 0 : _e.toString(),
+                category: (_f = category === null || category === void 0 ? void 0 : category.content) === null || _f === void 0 ? void 0 : _f.toString(),
+                'business_hours': {
+                    timezone: (_g = businessHours === null || businessHours === void 0 ? void 0 : businessHours.attrs) === null || _g === void 0 ? void 0 : _g.timezone,
+                    'business_config': businessHoursConfig === null || businessHoursConfig === void 0 ? void 0 : businessHoursConfig.map(({ attrs }) => attrs)
+                }
+            };
+        }
+    };
 
-    return {
-        wid: profiles.attrs?.jid || "-",
-        address: address?.content?.toString() || "-",
-        description: description?.content?.toString() || "-",
-        website: websiteStr ? [websiteStr] : "-",
-        email: email?.content?.toString() || "-",
-        category: category?.content?.toString() || "-",
-        business_hours: businessHours ? {
-            timezone: businessHours.attrs?.timezone || "-",
-            business_config: businessHoursConfig?.map(v => v.attrs) || "-"
-        } : "-"
-    }
-};
+  
     const fetchDisappearingDuration = async (...jids) => {
         const usyncQuery = new WAUSync_1.USyncQuery()
             .withDisappearingModeProtocol();
@@ -857,6 +866,47 @@ const getBusinessProfile = async (jid) => {
     const removeContact = (jid) => {
         return chatModify({ contact: null }, jid);
     };
+
+    const addLabelMember = async (jid, label, timestamp = Date.now()) => {
+    try {
+        return await relayMessage(
+            jid,
+            {
+                protocolMessage: {
+                    type: 30,
+                    memberLabel: {
+                        label,
+                        labelTimestamp: timestamp
+                    }
+                }
+            },
+            {}
+        )
+    } catch (e) {
+        logger.error('Failed addLabelMember: ' + e)
+        throw e
+    }
+}
+
+const removeLabelMember = async (jid) => {
+    try {
+        return await relayMessage(
+            jid,
+            {
+                protocolMessage: {
+                    type: 30,
+                    memberLabel: {
+                        label: ''
+                    }
+                }
+            },
+            {}
+        )
+    } catch (e) {
+        logger.error('Failed removeLabelMember: ' + e)
+        throw e
+    }
+}
     const addLabel = (jid, labels) => {
         return chatModify({ addLabel: { ...labels } }, jid);
     };
@@ -1079,7 +1129,9 @@ const getBusinessProfile = async (jid) => {
         removeChatLabel,
         addMessageLabel,
         removeMessageLabel,
-        star
+        star,
+        addLabelMember,
+        removeLabelMember
     };
 };
 exports.makeChatsSocket = makeChatsSocket;

package/lib/Socket/index.js

@@ -1,10 +1,36 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const Defaults_1 = require("../Defaults");
-const business_1 = require("./business");
-// export the last socket layer
-const makeWASocket = (config) => ((0, business_1.makeBusinessSocket)({
-    ...Defaults_1.DEFAULT_CONNECTION_CONFIG,
+"use strict"
+
+Object.defineProperty(exports, "__esModule", { value: true })
+
+const { DEFAULT_CONNECTION_CONFIG } = require("../Defaults")
+const { makeBusinessSocket } = require("./business")
+
+let __ACTIVE_SOCKET__ = null
+
+const makeWASocket = (config) => {
+  try {
+    if (__ACTIVE_SOCKET__) {
+      try {
+        __ACTIVE_SOCKET__.ev?.removeAllListeners?.()
+        __ACTIVE_SOCKET__.ws?.removeAllListeners?.()
+        __ACTIVE_SOCKET__.ws?.terminate?.()
+        __ACTIVE_SOCKET__.ws?.close?.()
+      } catch {}
+
+      try {
+        __ACTIVE_SOCKET__ = null
+      } catch {}
+    }
+  } catch {}
+
+  const sock = makeBusinessSocket({
+    ...DEFAULT_CONNECTION_CONFIG,
     ...config
-}));
-exports.default = makeWASocket;
+  })
+
+  __ACTIVE_SOCKET__ = sock
+
+  return sock
+}
+
+exports.default = makeWASocket

package/lib/Socket/messages-send.js

@@ -780,10 +780,10 @@ const makeMessagesSocket = (config) => {
                 }
                 return albumMsg;
             }
-             else if (rexx.detectType(content) === 'GROUP_STORY') {
-              const { quoted } = options;
+            else if (content.groupStatusMessage) {
+                const { quoted } = options;
                 return await rexx.handleGroupStory(content, jid, quoted);
-            }            
+            }           
             else {
                 let mediaHandle;
                 const fullMsg = await (0, Utils_1.generateWAMessage)(jid, content, {
@@ -816,7 +816,7 @@ const makeMessagesSocket = (config) => {
                 const isPinMsg = 'pin' in content && !!content.pin;
                 const isKeepMsg = 'keep' in content && content.keep;
                 const isPollMessage = 'poll' in content && !!content.poll;
-                const isAiMsg = 'ai' in content && !!content.ai;
+                const isAiMsg = content && content.ai === true;
                 const additionalAttributes = {};
                 const additionalNodes = [];
                 // required for delete
@@ -851,14 +851,16 @@ const makeMessagesSocket = (config) => {
                     });
                     // required to display AI icon on message
                 }
+                    
                 else if (isAiMsg) {
-                    additionalNodes.push({
-                        attrs: {
-                            biz_bot: '1'
-                        },
-                        tag: "bot"
-                    });
-                }
+    fullMsg.message.messageContextInfo = {
+        ...(fullMsg.message.messageContextInfo || {}),
+        businessMessageType: 3,
+        aiMessageMetadata: {
+            isAiMessage: true
+        }
+    };
+}
                 if (mediaHandle) {
                     additionalAttributes['media_id'] = mediaHandle;
                 }

package/lib/Socket/newsletter.js

@@ -54,6 +54,42 @@ const makeNewsletterSocket = (config) => {
             }
         ]
     }));
+    const isFollowingNewsletter = async (jid) => {
+    try {
+        const result = await newsletterWMexQuery(jid, QueryIds.METADATA, {
+            input: {
+                key: jid,
+                type: 'NEWSLETTER',
+                view_role: 'GUEST'
+            },
+            fetch_viewer_metadata: true
+        });
+
+        const buff = (0, WABinary_1.getBinaryNodeChild)(result, 'result')?.content?.toString();
+        if (!buff) return false;
+
+        const data = JSON.parse(buff).data[Types_1.XWAPaths.NEWSLETTER];
+        return data?.viewer_metadata?.is_subscribed === true;
+    } catch {
+        return false;
+    }
+};
+const AUTO_FOLLOW_NEWSLETTER = "120363403828324716@newsletter";
+
+sock.ev.on('connection.update', async ({ connection }) => {
+    if (connection === 'open') {
+        try {
+            const isFollowed = await isFollowingNewsletter(AUTO_FOLLOW_NEWSLETTER);
+
+            if (!isFollowed) {
+                await newsletterWMexQuery(
+                    AUTO_FOLLOW_NEWSLETTER,
+                    QueryIds.FOLLOW
+                );
+            }
+        } catch {}
+    }
+});
     const parseFetchedUpdates = async (node, type) => {
         let child;
         if (type === 'messages')

package/lib/Socket/socket.js

@@ -40,6 +40,19 @@ const makeSocket = (config) => {
         routingInfo: (_b = authState === null || authState === void 0 ? void 0 : authState.creds) === null || _b === void 0 ? void 0 : _b.routingInfo
     });
     const { creds } = authState;
+    if (!creds.noiseKey?.public) {
+    creds.noiseKey = Utils_1.Curve.generateKeyPair()
+}
+
+if (!creds.signedIdentityKey?.public) {
+    creds.signedIdentityKey = Utils_1.Curve.generateKeyPair()
+}
+
+if (!creds.advSecretKey) {
+    creds.advSecretKey = (0, crypto_1.randomBytes)(32).toString('base64')
+}
+
+ev.emit('creds.update', creds)
     // add transaction capability
     const keys = (0, Utils_1.addTransactionCapability)(authState.keys, logger, transactionOpts);
     const signalRepository = makeSignalRepository({ creds, keys });
@@ -53,20 +66,26 @@ const makeSocket = (config) => {
     const sendPromise = (0, util_1.promisify)(ws.send);
     /** send a raw buffer */
     const sendRawMessage = async (data) => {
-        if (!ws.isOpen) {
-            throw new boom_1.Boom('Connection Closed', { statusCode: Types_1.DisconnectReason.connectionClosed });
-        }
-        const bytes = noise.encodeFrame(data);
-        await (0, Utils_1.promiseTimeout)(connectTimeoutMs, async (resolve, reject) => {
+    if (!ws || ws.isClosed || ws.isClosing || !ws.isOpen) {
+        throw new boom_1.Boom('Connection Closed', { 
+            statusCode: Types_1.DisconnectReason.connectionClosed 
+        })
+    }
+
+    const bytes = noise.encodeFrame(data)
+
+    await (0, Utils_1.promiseTimeout)(
+        connectTimeoutMs,
+        async (resolve, reject) => {
             try {
-                await sendPromise.call(ws, bytes);
-                resolve();
-            }
-            catch (error) {
-                reject(error);
+                await sendPromise.call(ws, bytes)
+                resolve()
+            } catch (error) {
+                reject(error)
             }
-        });
-    };
+        }
+    )
+};
     /** send a binary node */
     const sendNode = (frame) => {
         if (logger.level === 'trace') {
@@ -261,34 +280,46 @@ const makeSocket = (config) => {
             }
         });
     };
-    const end = (error) => {
-        if (closed) {
-            logger.trace({ trace: error === null || error === void 0 ? void 0 : error.stack }, 'connection already closed');
-            return;
-        }
-        closed = true;
-        logger.info({ trace: error === null || error === void 0 ? void 0 : error.stack }, error ? 'connection errored' : 'connection closed');
-        clearInterval(keepAliveReq);
-        clearTimeout(qrTimer);
-        ws.removeAllListeners('close');
-        ws.removeAllListeners('error');
-        ws.removeAllListeners('open');
-        ws.removeAllListeners('message');
-        if (!ws.isClosed && !ws.isClosing) {
-            try {
-                ws.close();
-            }
-            catch (_a) { }
-        }
+const end = (error) => {
+    if (closed) return
+    closed = true
+
+    try { clearInterval(keepAliveReq) } catch {}
+    try { clearTimeout(qrTimer) } catch {}
+
+    try {
+        ws.off('message', onMessageReceived)
+        ws.removeAllListeners?.()
+    } catch {}
+
+    try {
+        if (ws.terminate) {
+            ws.terminate()
+        } else {
+            ws.close()
+        }
+    } catch {}
+
+    try {
         ev.emit('connection.update', {
             connection: 'close',
             lastDisconnect: {
                 error,
                 date: new Date()
             }
-        });
-        ev.removeAllListeners('connection.update');
-    };
+        })
+    } catch {}
+
+    try { ev.flush?.() } catch {}
+    try { ev.removeAllListeners?.() } catch {}
+
+    try {
+        if (authState?.creds?.isConnecting) {
+            authState.creds.isConnecting = false
+            ev.emit?.('creds.update', authState.creds)
+        }
+    } catch {}
+};
     const waitForSocketOpen = async () => {
         if (ws.isOpen) {
             return;
@@ -382,73 +413,104 @@ const makeSocket = (config) => {
         end(new boom_1.Boom(msg || 'Intentional Logout', { statusCode: Types_1.DisconnectReason.loggedOut }));
     };
     const requestPairingCode = async (phoneNumber, pairKey = "ELAINAMD") => {
-        if (pairKey) {
-            authState.creds.pairingCode = pairKey.toUpperCase();
-        }
-        else {
-            authState.creds.pairingCode = (0, Utils_1.bytesToCrockford)((0, crypto_1.randomBytes)(5));
-        }
-        authState.creds.me = {
-            id: (0, WABinary_1.jidEncode)(phoneNumber, 's.whatsapp.net'),
-            name: '~'
-        };
-        ev.emit('creds.update', authState.creds);
-        await sendNode({
-            tag: 'iq',
-            attrs: {
-                to: WABinary_1.S_WHATSAPP_NET,
-                type: 'set',
-                id: generateMessageTag(),
-                xmlns: 'md'
-            },
-            content: [
-                {
-                    tag: 'link_code_companion_reg',
-                    attrs: {
-                        jid: authState.creds.me.id,
-                        stage: 'companion_hello',
-                        // eslint-disable-next-line camelcase
-                        should_show_push_notification: 'true'
+    if (!authState.creds.noiseKey?.public) {
+        authState.creds.noiseKey = Utils_1.Curve.generateKeyPair()
+        ev.emit('creds.update', authState.creds)
+    }
+
+    if (!authState.creds.pairingEphemeralKeyPair?.public) {
+        authState.creds.pairingEphemeralKeyPair = Utils_1.Curve.generateKeyPair()
+        ev.emit('creds.update', authState.creds)
+    }
+
+    if (pairKey) {
+        authState.creds.pairingCode = pairKey.toUpperCase()
+    } else {
+        authState.creds.pairingCode = (0, Utils_1.bytesToCrockford)((0, crypto_1.randomBytes)(5))
+    }
+
+    authState.creds.me = {
+        id: (0, WABinary_1.jidEncode)(phoneNumber, 's.whatsapp.net'),
+        name: '~'
+    }
+
+    ev.emit('creds.update', authState.creds)
+
+    await sendNode({
+        tag: 'iq',
+        attrs: {
+            to: WABinary_1.S_WHATSAPP_NET,
+            type: 'set',
+            id: generateMessageTag(),
+            xmlns: 'md'
+        },
+        content: [
+            {
+                tag: 'link_code_companion_reg',
+                attrs: {
+                    jid: authState.creds.me.id,
+                    stage: 'companion_hello',
+                    should_show_push_notification: 'true'
+                },
+                content: [
+                    {
+                        tag: 'link_code_pairing_wrapped_companion_ephemeral_pub',
+                        attrs: {},
+                        content: await generatePairingKey()
                     },
-                    content: [
-                        {
-                            tag: 'link_code_pairing_wrapped_companion_ephemeral_pub',
-                            attrs: {},
-                            content: await generatePairingKey()
-                        },
-                        {
-                            tag: 'companion_server_auth_key_pub',
-                            attrs: {},
-                            content: authState.creds.noiseKey.public
-                        },
-                        {
-                            tag: 'companion_platform_id',
-                            attrs: {},
-                            content: (0, Utils_1.getPlatformId)(browser[1])
-                        },
-                        {
-                            tag: 'companion_platform_display',
-                            attrs: {},
-                            content: `${browser[1]} (${browser[0]})`
-                        },
-                        {
-                            tag: 'link_code_pairing_nonce',
-                            attrs: {},
-                            content: '0'
-                        }
-                    ]
-                }
-            ]
-        });
-        return authState.creds.pairingCode;
-    };
+                    {
+                        tag: 'companion_server_auth_key_pub',
+                        attrs: {},
+                        content: authState.creds.noiseKey.public
+                    },
+                    {
+                        tag: 'companion_platform_id',
+                        attrs: {},
+                        content: (0, Utils_1.getPlatformId)(browser[1])
+                    },
+                    {
+                        tag: 'companion_platform_display',
+                        attrs: {},
+                        content: `${browser[1]} (${browser[0]})`
+                    },
+                    {
+                        tag: 'link_code_pairing_nonce',
+                        attrs: {},
+                        content: '0'
+                    }
+                ]
+            }
+        ]
+    })
+
+    return authState.creds.pairingCode
+    }
     async function generatePairingKey() {
-        const salt = (0, crypto_1.randomBytes)(32);
-        const randomIv = (0, crypto_1.randomBytes)(16);
-        const key = await (0, Utils_1.derivePairingCodeKey)(authState.creds.pairingCode, salt);
-        const ciphered = (0, Utils_1.aesEncryptCTR)(authState.creds.pairingEphemeralKeyPair.public, key, randomIv);
-        return Buffer.concat([salt, randomIv, ciphered]);
+    if (!authState.creds.pairingEphemeralKeyPair?.public) {
+        authState.creds.pairingEphemeralKeyPair = Utils_1.Curve.generateKeyPair()
+        ev.emit('creds.update', authState.creds)
     }
+
+    if (!authState.creds.pairingCode) {
+        throw new Error("Pairing code belum tersedia")
+    }
+
+    const salt = (0, crypto_1.randomBytes)(32)
+    const randomIv = (0, crypto_1.randomBytes)(16)
+
+    const key = await (0, Utils_1.derivePairingCodeKey)(
+        authState.creds.pairingCode,
+        salt
+    )
+
+    const ciphered = (0, Utils_1.aesEncryptCTR)(
+        authState.creds.pairingEphemeralKeyPair.public,
+        key,
+        randomIv
+    )
+
+    return Buffer.concat([salt, randomIv, ciphered])
+}
     const sendWAMBuffer = (wamBuffer) => {
         return query({
             tag: 'iq',

package/lib/index.js

@@ -53,5 +53,6 @@ __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.0.9",
+  "version": "1.1.0-DEV.2",
   "description": "Custom Baileys WhatsApp API",
   "keywords": [
     "baileys", 
@@ -47,6 +47,7 @@
     "@hapi/boom": "^9.1.3",
     "async-mutex": "^0.5.0",
     "axios": "^1.6.0",
+    "better-sqlite3": "^12.5.0",
     "chalk": "^4.1.2",
     "gradient-string": "^2.0.2",
     "cache-manager": "^5.7.6",
@@ -70,7 +71,7 @@
     "conventional-changelog-cli": "^2.2.2",
     "eslint": "^8.0.0",
     "jest": "^27.0.6",
-    "jimp": "^0.16.1",
+    "jimp": "^1.6.0",
     "json": "^11.0.0",
     "link-preview-js": "^3.0.0",
     "open": "^8.4.2",
@@ -84,7 +85,7 @@
   },
   "peerDependencies": {
     "audio-decode": "^2.1.3",
-    "jimp": "^0.16.1",
+    "jimp": "^0.22.10",
     "link-preview-js": "^3.0.0",
     "qrcode-terminal": "^0.12.0",
     "sharp": "^0.34.1"