cuki-bailx 1.1.2 → 1.2.2

package/lib/Socket/chats.js

@@ -5,7 +5,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeChatsSocket = void 0;
 const boom_1 = require("@hapi/boom");
-const node_cache_1 = __importDefault(require("@cacheable/node-cache"));
 const WAProto_1 = require("../../WAProto");
 const Defaults_1 = require("../Defaults");
 const Types_1 = require("../Types");
@@ -13,6 +12,7 @@ const Utils_1 = require("../Utils");
 const make_mutex_1 = require("../Utils/make-mutex");
 const process_message_1 = __importDefault(require("../Utils/process-message"));
 const WABinary_1 = require("../WABinary");
+const socket_1 = require("./socket");
 const WAUSync_1 = require("../WAUSync");
 const usync_1 = require("./usync");
 const MAX_SYNC_ATTEMPTS = 2;
@@ -25,13 +25,6 @@ const makeChatsSocket = (config) => {
     let pendingAppStateSync = false;
     /** this mutex ensures that the notifications (receipts, messages etc.) are processed in order */
     const processingMutex = (0, make_mutex_1.makeMutex)();
-    const placeholderResendCache = config.placeholderResendCache || new node_cache_1.default({
-        stdTTL: Defaults_1.DEFAULT_CACHE_TTLS.MSG_RETRY, // 1 hour
-        useClones: false
-    });
-    if (!config.placeholderResendCache) {
-        config.placeholderResendCache = placeholderResendCache;
-    }
     /** helper function to fetch the given app state sync key */
     const getAppStateSyncKey = async (keyId) => {
         const { [keyId]: key } = await authState.keys.get('app-state-sync-key', [keyId]);
@@ -75,12 +68,6 @@ const makeChatsSocket = (config) => {
                 }]
         });
     };
-    const updateMessagesPrivacy = async (value) => {
-        await privacyQuery('messages', value);
-    };
-    const updateCallPrivacy = async (value) => {
-        await privacyQuery('calladd', value);
-    };
     const updateLastSeenPrivacy = async (value) => {
         await privacyQuery('last', value);
     };
@@ -115,34 +102,44 @@ const makeChatsSocket = (config) => {
                 }]
         });
     };
-    const getBotListV2 = async () => {
-        const resp = await query({
+    /** helper function to run a generic IQ query */
+    const interactiveQuery = async (userNodes, queryNode) => {
+        const result = await query({
             tag: 'iq',
             attrs: {
-                xmlns: 'bot',
                 to: WABinary_1.S_WHATSAPP_NET,
-                type: 'get'
+                type: 'get',
+                xmlns: 'usync',
             },
-            content: [{
-                    tag: 'bot',
+            content: [
+                {
+                    tag: 'usync',
                     attrs: {
-                        v: '2'
-                    }
-                }]
-        });
-        const botNode = (0, WABinary_1.getBinaryNodeChild)(resp, 'bot');
-        const botList = [];
-        for (const section of (0, WABinary_1.getBinaryNodeChildren)(botNode, 'section')) {
-            if (section.attrs.type === 'all') {
-                for (const bot of (0, WABinary_1.getBinaryNodeChildren)(section, 'bot')) {
-                    botList.push({
-                        jid: bot.attrs.jid,
-                        personaId: bot.attrs['persona_id']
-                    });
+                        sid: generateMessageTag(),
+                        mode: 'query',
+                        last: 'true',
+                        index: '0',
+                        context: 'interactive',
+                    },
+                    content: [
+                        {
+                            tag: 'query',
+                            attrs: {},
+                            content: [queryNode]
+                        },
+                        {
+                            tag: 'list',
+                            attrs: {},
+                            content: userNodes
+                        }
+                    ]
                 }
-            }
-        }
-        return botList;
+            ],
+        });
+        const usyncNode = (0, WABinary_1.getBinaryNodeChild)(result, 'usync');
+        const listNode = (0, WABinary_1.getBinaryNodeChild)(usyncNode, 'list');
+        const users = (0, WABinary_1.getBinaryNodeChildren)(listNode, 'user');
+        return users;
     };
     const onWhatsApp = async (...jids) => {
         const usyncQuery = new WAUSync_1.USyncQuery()
@@ -157,26 +154,14 @@ const makeChatsSocket = (config) => {
             return results.list.filter((a) => !!a.contact).map(({ contact, id, lid }) => ({ jid: id, exists: contact, lid }));
         }
     };
-    const fetchStatus = async (...jids) => {
-        const usyncQuery = new WAUSync_1.USyncQuery()
-            .withStatusProtocol();
-        for (const jid of jids) {
-            usyncQuery.withUser(new WAUSync_1.USyncUser().withId(jid));
-        }
-        const result = await sock.executeUSyncQuery(usyncQuery);
-        if (result) {
-            return result.list;
-        }
-    };
-    const fetchDisappearingDuration = async (...jids) => {
-        const usyncQuery = new WAUSync_1.USyncQuery()
-            .withDisappearingModeProtocol();
-        for (const jid of jids) {
-            usyncQuery.withUser(new WAUSync_1.USyncUser().withId(jid));
-        }
-        const result = await sock.executeUSyncQuery(usyncQuery);
+    const fetchStatus = async (jid) => {
+        const [result] = await interactiveQuery([{ tag: 'user', attrs: { jid } }], { tag: 'status', attrs: {} });
         if (result) {
-            return result.list;
+            const status = (0, WABinary_1.getBinaryNodeChild)(result, 'status');
+            return {
+                status: status === null || status === void 0 ? void 0 : status.content.toString(),
+                setAt: new Date(+((status === null || status === void 0 ? void 0 : status.attrs.t) || 0) * 1000)
+            };
         }
     };
     /** update the profile picture for yourself or a group */
@@ -305,9 +290,9 @@ const makeChatsSocket = (config) => {
             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 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,
@@ -416,12 +401,16 @@ const makeChatsSocket = (config) => {
                             states[name] = newState;
                             Object.assign(globalMutationMap, mutationMap);
                             logger.info(`restored state of ${name} from snapshot to v${newState.version} with mutations`);
-                            await authState.keys.set({ 'app-state-sync-version': { [name]: newState } });
+                            await authState.keys.set({ 'app-state-sync-version': {
+                                    [name]: newState
+                                } });
                         }
                         // only process if there are syncd patches
                         if (patches.length) {
                             const { state: newState, mutationMap } = await (0, Utils_1.decodePatches)(name, patches, states[name], getAppStateSyncKey, config.options, initialVersionMap[name], logger, appStateMacVerification.patch);
-                            await authState.keys.set({ 'app-state-sync-version': { [name]: newState } });
+                            await authState.keys.set({ 'app-state-sync-version': {
+                                    [name]: newState
+                                } });
                             logger.info(`synced ${name} to v${newState.version}`);
                             initialVersionMap[name] = newState.version;
                             Object.assign(globalMutationMap, mutationMap);
@@ -436,11 +425,13 @@ const makeChatsSocket = (config) => {
                     catch (error) {
                         // if retry attempts overshoot
                         // or key not found
-                        const isIrrecoverableError = attemptsMap[name] >= MAX_SYNC_ATTEMPTS
-                            || ((_a = error.output) === null || _a === void 0 ? void 0 : _a.statusCode) === 404
-                            || error.name === 'TypeError';
+                        const isIrrecoverableError = attemptsMap[name] >= MAX_SYNC_ATTEMPTS ||
+                            ((_a = error.output) === null || _a === void 0 ? void 0 : _a.statusCode) === 404 ||
+                            error.name === 'TypeError';
                         logger.info({ name, error: error.stack }, `failed to sync state from version${isIrrecoverableError ? '' : ', removing and trying from scratch'}`);
-                        await authState.keys.set({ 'app-state-sync-version': { [name]: null } });
+                        await authState.keys.set({ 'app-state-sync-version': {
+                                [name]: null
+                            } });
                         // increment number of retries
                         attemptsMap[name] = (attemptsMap[name] || 0) + 1;
                         if (isIrrecoverableError) {
@@ -490,7 +481,7 @@ const makeChatsSocket = (config) => {
             await sendNode({
                 tag: 'presence',
                 attrs: {
-                    name: me.name.replace(/@/g, ''),
+                    name: me.name,
                     type
                 }
             });
@@ -524,22 +515,22 @@ const makeChatsSocket = (config) => {
             id: generateMessageTag(),
             type: 'subscribe'
         },
-        content: tcToken
-            ? [
+        content: tcToken ?
+            [
                 {
                     tag: 'tctoken',
                     attrs: {},
                     content: tcToken
                 }
-            ]
-            : undefined
+            ] :
+            undefined
     }));
     const handlePresenceUpdate = ({ tag, attrs, content }) => {
         var _a;
         let presence;
         const jid = attrs.from;
         const participant = attrs.participant || attrs.from;
-        if (shouldIgnoreJid(jid) && jid != '@s.whatsapp.net') {
+        if (shouldIgnoreJid(jid) && jid !== '@s.whatsapp.net') {
             return;
         }
         if (tag === 'presence') {
@@ -563,7 +554,9 @@ const makeChatsSocket = (config) => {
             logger.error({ tag, attrs, content }, 'recv invalid presence node');
         }
         if (presence) {
-            ev.emit('presence.update', { id: jid, presences: { [participant]: presence } });
+            ev.emit('presence.update', { id: jid, presences: {
+                    [participant]: presence
+                } });
         }
     };
     const appPatch = async (patchCreate) => {
@@ -614,7 +607,9 @@ const makeChatsSocket = (config) => {
                     ]
                 };
                 await query(node);
-                await authState.keys.set({ 'app-state-sync-version': { [name]: state } });
+                await authState.keys.set({ 'app-state-sync-version': {
+                        [name]: state
+                    } });
             });
         });
         if (config.emitOwnEvents) {
@@ -627,7 +622,7 @@ const makeChatsSocket = (config) => {
     };
     /** sending non-abt props may fix QR scan fail if server expects */
     const fetchProps = async () => {
-        var _a, _b, _c;
+        var _a, _b;
         const resultNode = await query({
             tag: 'iq',
             attrs: {
@@ -636,19 +631,20 @@ const makeChatsSocket = (config) => {
                 type: 'get',
             },
             content: [
-                { tag: 'props', attrs: {
+                {
+                    tag: 'props',
+                    attrs: {
                         protocol: '2',
                         hash: ((_a = authState === null || authState === void 0 ? void 0 : authState.creds) === null || _a === void 0 ? void 0 : _a.lastPropHash) || ''
-                    } }
+                    }
+                }
             ]
         });
         const propsNode = (0, WABinary_1.getBinaryNodeChild)(resultNode, 'props');
         let props = {};
         if (propsNode) {
-            if ((_b = propsNode.attrs) === null || _b === void 0 ? void 0 : _b.hash) { // on some clients, the hash is returning as undefined
-                authState.creds.lastPropHash = (_c = propsNode === null || propsNode === void 0 ? void 0 : propsNode.attrs) === null || _c === void 0 ? void 0 : _c.hash;
-                ev.emit('creds.update', authState.creds);
-            }
+            authState.creds.lastPropHash = (_b = propsNode === null || propsNode === void 0 ? void 0 : propsNode.attrs) === null || _b === void 0 ? void 0 : _b.hash;
+            ev.emit('creds.update', authState.creds);
             props = (0, WABinary_1.reduceBinaryNodeToDictionary)(propsNode, 'prop');
         }
         logger.debug('fetched props');
@@ -658,7 +654,7 @@ const makeChatsSocket = (config) => {
      * modify a chat -- mark unread, read etc.
      * lastMessages must be sorted in reverse chronologically
      * requires the last messages till the last message received; required for archive & unread
-    */
+     */
     const chatModify = (mod, jid) => {
         const patch = (0, Utils_1.chatModificationToAppPatch)(mod, jid);
         return appPatch(patch);
@@ -742,25 +738,24 @@ const makeChatsSocket = (config) => {
             }
         }
         const historyMsg = (0, Utils_1.getHistoryMsg)(msg.message);
-        const shouldProcessHistoryMsg = historyMsg
-            ? (shouldSyncHistoryMessage(historyMsg)
-                && Defaults_1.PROCESSABLE_HISTORY_TYPES.includes(historyMsg.syncType))
-            : false;
+        const shouldProcessHistoryMsg = historyMsg ?
+            (shouldSyncHistoryMessage(historyMsg) &&
+                Defaults_1.PROCESSABLE_HISTORY_TYPES.includes(historyMsg.syncType)) :
+            false;
         if (historyMsg && !authState.creds.myAppStateKeyId) {
             logger.warn('skipping app state sync, as myAppStateKeyId is not set');
             pendingAppStateSync = true;
         }
         await Promise.all([
             (async () => {
-                if (historyMsg
-                    && authState.creds.myAppStateKeyId) {
+                if (historyMsg &&
+                    authState.creds.myAppStateKeyId) {
                     pendingAppStateSync = false;
                     await doAppStateSync();
                 }
             })(),
             (0, process_message_1.default)(msg, {
                 shouldProcessHistoryMsg,
-                placeholderResendCache,
                 ev,
                 creds: authState.creds,
                 keyStore: authState.keys,
@@ -769,8 +764,8 @@ const makeChatsSocket = (config) => {
                 getMessage: config.getMessage,
             })
         ]);
-        if (((_c = (_b = msg.message) === null || _b === void 0 ? void 0 : _b.protocolMessage) === null || _c === void 0 ? void 0 : _c.appStateSyncKeyShare)
-            && pendingAppStateSync) {
+        if (((_c = (_b = msg.message) === null || _b === void 0 ? void 0 : _b.protocolMessage) === null || _c === void 0 ? void 0 : _c.appStateSyncKeyShare) &&
+            pendingAppStateSync) {
             await doAppStateSync();
             pendingAppStateSync = false;
         }
@@ -821,17 +816,18 @@ const makeChatsSocket = (config) => {
             sendPresenceUpdate(markOnlineOnConnect ? 'available' : 'unavailable')
                 .catch(error => onUnexpectedError(error, 'presence update requests'));
         }
-        if (receivedPendingNotifications && // if we don't have the app state key
+        if (receivedPendingNotifications) {
+            // if we don't have the app state key
             // we keep buffering events until we finally have
             // the key and can sync the messages
-            !((_a = authState.creds) === null || _a === void 0 ? void 0 : _a.myAppStateKeyId)) {
-            ev.buffer();
-            needToFlushWithAppStateSync = true;
+            if (!((_a = authState.creds) === null || _a === void 0 ? void 0 : _a.myAppStateKeyId) && !config.mobile) {
+                ev.buffer();
+                needToFlushWithAppStateSync = true;
+            }
         }
     });
     return {
         ...sock,
-        getBotListV2,
         processingMutex,
         fetchPrivacySettings,
         upsertMessage,
@@ -841,15 +837,12 @@ const makeChatsSocket = (config) => {
         profilePictureUrl,
         onWhatsApp,
         fetchBlocklist,
-        fetchDisappearingDuration,
         fetchStatus,
         updateProfilePicture,
         removeProfilePicture,
         updateProfileStatus,
         updateProfileName,
         updateBlockStatus,
-        updateCallPrivacy,
-        updateMessagesPrivacy,
         updateLastSeenPrivacy,
         updateOnlinePrivacy,
         updateProfilePicturePrivacy,

package/lib/Socket/dugong.d.ts

@@ -0,0 +1,219 @@
+// dugong.d.ts
+import { proto } from '../../WAProto';
+
+declare namespace kikyy {
+    interface MediaUploadOptions {
+        fileEncSha256?: Buffer;
+        mediaType?: string;
+        newsletter?: boolean;
+    }
+
+    type WAMediaUploadFunction = (
+        stream: Buffer | NodeJS.ReadableStream, 
+        options?: MediaUploadOptions
+    ) => Promise<{ url: string; directPath: string }>;
+
+    interface WAMessageContentGenerationOptions {
+        upload?: WAMediaUploadFunction;
+        mediaCache?: any;
+        options?: any;
+        logger?: any;
+    }
+
+    interface StickerMessage {
+        url: string;
+        fileSha256: Buffer | string;
+        fileEncSha256: Buffer | string;
+        mediaKey: Buffer | string;
+        mimetype: string;
+        directPath: string;
+        fileLength: number | string;
+        mediaKeyTimestamp: number | string;
+        isAnimated?: boolean;
+        stickerSentTs?: number | string;
+        isAvatar?: boolean;
+        isAiSticker?: boolean;
+        isLottie?: boolean;
+    }
+
+    interface PaymentMessage {
+        amount: number;
+        currency?: string;
+        from?: string;
+        expiry?: number;
+        sticker?: { stickerMessage: StickerMessage };
+        note?: string;
+        background?: {
+            id?: string;
+            fileLength?: string;
+            width?: number;
+            height?: number;
+            mimetype?: string;
+            placeholderArgb?: number;
+            textArgb?: number;
+            subtextArgb?: number;
+        };
+    }
+
+    interface ProductMessage {
+        title: string;
+        description: string;
+        thumbnail: Buffer | { url: string };
+        productId: string;
+        retailerId: string;
+        url: string;
+        body?: string;
+        footer?: string;
+        buttons?: proto.Message.InteractiveMessage.INativeFlowButton[];
+        priceAmount1000?: number | null;
+        currencyCode?: string;
+    }
+
+    interface InteractiveMessage {
+        title: string;
+        footer?: string;
+        thumbnail?: string;
+        image?: string | Buffer | { url: string };
+        video?: string | Buffer | { url: string };
+        document?: Buffer;
+        mimetype?: string;
+        fileName?: string;
+        jpegThumbnail?: Buffer; // Hanya Buffer saja
+        contextInfo?: {
+            mentionedJid?: string[];
+            forwardingScore?: number;
+            isForwarded?: boolean;
+            externalAdReply?: {
+                title?: string;
+                body?: string;
+                mediaType?: number;
+                thumbnailUrl?: string;
+                mediaUrl?: string;
+                sourceUrl?: string;
+                showAdAttribution?: boolean;
+                renderLargerThumbnail?: boolean;
+                [key: string]: any;
+            };
+            [key: string]: any;
+        };
+        externalAdReply?: {
+            title?: string;
+            body?: string;
+            mediaType?: number;
+            thumbnailUrl?: string;
+            mediaUrl?: string;
+            sourceUrl?: string;
+            showAdAttribution?: boolean;
+            renderLargerThumbnail?: boolean;
+            [key: string]: any;
+        };
+        buttons?: proto.Message.InteractiveMessage.INativeFlowButton[];
+        nativeFlowMessage?: {
+            messageParamsJson?: string;
+            buttons?: proto.Message.InteractiveMessage.INativeFlowButton[];
+            [key: string]: any;
+        };
+    }
+
+    interface AlbumItem {
+        image?: { url: string; caption?: string };
+        video?: { url: string; caption?: string };
+    }
+
+    interface EventMessageLocation {
+        degreesLatitude: number;
+        degreesLongitude: number;
+        name: string;
+    }
+
+    interface EventMessage {
+        isCanceled?: boolean;
+        name: string;
+        description: string;
+        location?: EventMessageLocation;
+        joinLink?: string;
+        startTime?: string | number;
+        endTime?: string | number;
+        extraGuestsAllowed?: boolean;
+    }
+    
+    interface PollVote {
+        optionName: string;
+        optionVoteCount: string | number;
+    }
+    
+    interface PollResultMessage {
+        name: string;
+        pollVotes: PollVote[];
+    }
+ 
+    interface MessageContent {
+        requestPaymentMessage?: PaymentMessage;
+        productMessage?: ProductMessage;
+        interactiveMessage?: InteractiveMessage;
+        albumMessage?: AlbumItem[];
+        eventMessage?: EventMessage;
+        pollResultMessage?: PollResultMessage;
+        sender?: string;
+    }
+
+    interface MessageOptions {
+        quoted?: proto.IWebMessageInfo;
+        filter?: boolean;
+    }
+
+    interface Utils {
+        prepareWAMessageMedia: (media: any, options: WAMessageContentGenerationOptions) => Promise<any>;
+        generateWAMessageContent: (content: any, options: WAMessageContentGenerationOptions) => Promise<any>;
+        generateWAMessageFromContent: (jid: string, content: any, options?: any) => Promise<any>;
+        generateWAMessage: (jid: string, content: any, options?: any) => Promise<any>;
+        generateMessageID: () => string;
+    }
+}
+
+declare class kikyy {
+    constructor(
+        utils: kikyy.Utils,
+        waUploadToServer: kikyy.WAMediaUploadFunction,
+        relayMessageFn?: (jid: string, content: any, options?: any) => Promise<any>
+    );
+    
+    detectType(content: kikyy.MessageContent): 'PAYMENT' | 'PRODUCT' | 'INTERACTIVE' | 'ALBUM' | 'EVENT' | 'POLL_RESULT' | null;
+
+    handlePayment(
+        content: { requestPaymentMessage: kikyy.PaymentMessage },
+        quoted?: proto.IWebMessageInfo
+    ): Promise<{ requestPaymentMessage: proto.Message.RequestPaymentMessage }>;
+
+    handleProduct(
+        content: { productMessage: kikyy.ProductMessage },
+        jid: string,
+        quoted?: proto.IWebMessageInfo
+    ): Promise<{ viewOnceMessage: proto.Message.ViewOnceMessage }>;
+
+    handleInteractive(
+        content: { interactiveMessage: kikyy.InteractiveMessage },
+        jid: string,
+        quoted?: proto.IWebMessageInfo
+    ): Promise<{ interactiveMessage: proto.Message.InteractiveMessage }>;
+
+    handleAlbum(
+        content: { albumMessage: kikyy.AlbumItem[] },
+        jid: string,
+        quoted?: proto.IWebMessageInfo
+    ): Promise<any>;
+
+    handleEvent(
+        content: { eventMessage: kikyy.EventMessage },
+        jid: string,
+        quoted?: proto.IWebMessageInfo
+    ): Promise<any>;
+    
+    handlePollResult(
+        content: { pollResultMessage: kikyy.PollResultMessage },
+        jid: string,
+        quoted?: proto.IWebMessageInfo
+    ): Promise<any>;
+}
+
+export = kikyy;