@alannxd/baileys 6.0.3 → 6.0.5

package/lib/Utils/business.js

@@ -1,28 +1,26 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.uploadingNecessaryImages = exports.uploadingNecessaryImagesOfProduct = exports.parseProductNode = exports.toProductNode = exports.parseOrderDetailsNode = exports.parseCollectionsNode = exports.parseCatalogNode = void 0;
-const boom_1 = require("@hapi/boom");
-const crypto_1 = require("crypto");
-const WABinary_1 = require("../WABinary");
-const messages_media_1 = require("./messages-media");
-const parseCatalogNode = (node) => {
-    const catalogNode = (0, WABinary_1.getBinaryNodeChild)(node, 'product_catalog');
-    const products = (0, WABinary_1.getBinaryNodeChildren)(catalogNode, 'product').map(exports.parseProductNode);
-    const paging = (0, WABinary_1.getBinaryNodeChild)(catalogNode, 'paging');
+import { Boom } from '@hapi/boom';
+import { createHash } from 'crypto';
+import { createWriteStream, promises as fs } from 'fs';
+import { tmpdir } from 'os';
+import { join } from 'path';
+import { getBinaryNodeChild, getBinaryNodeChildren, getBinaryNodeChildString } from '../WABinary/index.js';
+import { generateMessageIDV2 } from './generics.js';
+import { getStream, getUrlFromDirectPath } from './messages-media.js';
+export const parseCatalogNode = (node) => {
+    const catalogNode = getBinaryNodeChild(node, 'product_catalog');
+    const products = getBinaryNodeChildren(catalogNode, 'product').map(parseProductNode);
+    const paging = getBinaryNodeChild(catalogNode, 'paging');
     return {
         products,
-        nextPageCursor: paging
-            ? (0, WABinary_1.getBinaryNodeChildString)(paging, 'after')
-            : undefined
+        nextPageCursor: paging ? getBinaryNodeChildString(paging, 'after') : undefined
     };
 };
-exports.parseCatalogNode = parseCatalogNode;
-const parseCollectionsNode = (node) => {
-    const collectionsNode = (0, WABinary_1.getBinaryNodeChild)(node, 'collections');
-    const collections = (0, WABinary_1.getBinaryNodeChildren)(collectionsNode, 'collection').map(collectionNode => {
-        const id = (0, WABinary_1.getBinaryNodeChildString)(collectionNode, 'id');
-        const name = (0, WABinary_1.getBinaryNodeChildString)(collectionNode, 'name');
-        const products = (0, WABinary_1.getBinaryNodeChildren)(collectionNode, 'product').map(exports.parseProductNode);
+export const parseCollectionsNode = (node) => {
+    const collectionsNode = getBinaryNodeChild(node, 'collections');
+    const collections = getBinaryNodeChildren(collectionsNode, 'collection').map(collectionNode => {
+        const id = getBinaryNodeChildString(collectionNode, 'id');
+        const name = getBinaryNodeChildString(collectionNode, 'name');
+        const products = getBinaryNodeChildren(collectionNode, 'product').map(parseProductNode);
         return {
             id,
             name,
@@ -34,32 +32,30 @@ const parseCollectionsNode = (node) => {
         collections
     };
 };
-exports.parseCollectionsNode = parseCollectionsNode;
-const parseOrderDetailsNode = (node) => {
-    const orderNode = (0, WABinary_1.getBinaryNodeChild)(node, 'order');
-    const products = (0, WABinary_1.getBinaryNodeChildren)(orderNode, 'product').map(productNode => {
-        const imageNode = (0, WABinary_1.getBinaryNodeChild)(productNode, 'image');
+export const parseOrderDetailsNode = (node) => {
+    const orderNode = getBinaryNodeChild(node, 'order');
+    const products = getBinaryNodeChildren(orderNode, 'product').map(productNode => {
+        const imageNode = getBinaryNodeChild(productNode, 'image');
         return {
-            id: (0, WABinary_1.getBinaryNodeChildString)(productNode, 'id'),
-            name: (0, WABinary_1.getBinaryNodeChildString)(productNode, 'name'),
-            imageUrl: (0, WABinary_1.getBinaryNodeChildString)(imageNode, 'url'),
-            price: +(0, WABinary_1.getBinaryNodeChildString)(productNode, 'price'),
-            currency: (0, WABinary_1.getBinaryNodeChildString)(productNode, 'currency'),
-            quantity: +(0, WABinary_1.getBinaryNodeChildString)(productNode, 'quantity')
+            id: getBinaryNodeChildString(productNode, 'id'),
+            name: getBinaryNodeChildString(productNode, 'name'),
+            imageUrl: getBinaryNodeChildString(imageNode, 'url'),
+            price: +getBinaryNodeChildString(productNode, 'price'),
+            currency: getBinaryNodeChildString(productNode, 'currency'),
+            quantity: +getBinaryNodeChildString(productNode, 'quantity')
         };
     });
-    const priceNode = (0, WABinary_1.getBinaryNodeChild)(orderNode, 'price');
+    const priceNode = getBinaryNodeChild(orderNode, 'price');
     const orderDetails = {
         price: {
-            total: +(0, WABinary_1.getBinaryNodeChildString)(priceNode, 'total'),
-            currency: (0, WABinary_1.getBinaryNodeChildString)(priceNode, 'currency'),
+            total: +getBinaryNodeChildString(priceNode, 'total'),
+            currency: getBinaryNodeChildString(priceNode, 'currency')
         },
         products
     };
     return orderDetails;
 };
-exports.parseOrderDetailsNode = parseOrderDetailsNode;
-const toProductNode = (productId, product) => {
+export const toProductNode = (productId, product) => {
     const attrs = {};
     const content = [];
     if (typeof productId !== 'undefined') {
@@ -96,7 +92,7 @@ const toProductNode = (productId, product) => {
             attrs: {},
             content: product.images.map(img => {
                 if (!('url' in img)) {
-                    throw new boom_1.Boom('Expected img for product to already be uploaded', { statusCode: 400 });
+                    throw new Boom('Expected img for product to already be uploaded', { statusCode: 400 });
                 }
                 return {
                     tag: 'image',
@@ -154,45 +150,44 @@ const toProductNode = (productId, product) => {
     };
     return node;
 };
-exports.toProductNode = toProductNode;
-const parseProductNode = (productNode) => {
+export const parseProductNode = (productNode) => {
     const isHidden = productNode.attrs.is_hidden === 'true';
-    const id = (0, WABinary_1.getBinaryNodeChildString)(productNode, 'id');
-    const mediaNode = (0, WABinary_1.getBinaryNodeChild)(productNode, 'media');
-    const statusInfoNode = (0, WABinary_1.getBinaryNodeChild)(productNode, 'status_info');
+    const id = getBinaryNodeChildString(productNode, 'id');
+    const mediaNode = getBinaryNodeChild(productNode, 'media');
+    const statusInfoNode = getBinaryNodeChild(productNode, 'status_info');
     const product = {
         id,
         imageUrls: parseImageUrls(mediaNode),
         reviewStatus: {
-            whatsapp: (0, WABinary_1.getBinaryNodeChildString)(statusInfoNode, 'status'),
+            whatsapp: getBinaryNodeChildString(statusInfoNode, 'status')
         },
         availability: 'in stock',
-        name: (0, WABinary_1.getBinaryNodeChildString)(productNode, 'name'),
-        retailerId: (0, WABinary_1.getBinaryNodeChildString)(productNode, 'retailer_id'),
-        url: (0, WABinary_1.getBinaryNodeChildString)(productNode, 'url'),
-        description: (0, WABinary_1.getBinaryNodeChildString)(productNode, 'description'),
-        price: +(0, WABinary_1.getBinaryNodeChildString)(productNode, 'price'),
-        currency: (0, WABinary_1.getBinaryNodeChildString)(productNode, 'currency'),
-        isHidden,
+        name: getBinaryNodeChildString(productNode, 'name'),
+        retailerId: getBinaryNodeChildString(productNode, 'retailer_id'),
+        url: getBinaryNodeChildString(productNode, 'url'),
+        description: getBinaryNodeChildString(productNode, 'description'),
+        price: +getBinaryNodeChildString(productNode, 'price'),
+        currency: getBinaryNodeChildString(productNode, 'currency'),
+        isHidden
     };
     return product;
 };
-exports.parseProductNode = parseProductNode;
 /**
  * Uploads images not already uploaded to WA's servers
  */
-async function uploadingNecessaryImagesOfProduct(product, waUploadToServer, timeoutMs = 30000) {
+export async function uploadingNecessaryImagesOfProduct(product, waUploadToServer, timeoutMs = 30000) {
     product = {
         ...product,
-        images: product.images ? await (0, exports.uploadingNecessaryImages)(product.images, waUploadToServer, timeoutMs) : product.images
+        images: product.images
+            ? await uploadingNecessaryImages(product.images, waUploadToServer, timeoutMs)
+            : product.images
     };
     return product;
 }
-exports.uploadingNecessaryImagesOfProduct = uploadingNecessaryImagesOfProduct;
 /**
  * Uploads images not already uploaded to WA's servers
  */
-const uploadingNecessaryImages = async (images, waUploadToServer, timeoutMs = 30000) => {
+export const uploadingNecessaryImages = async (images, waUploadToServer, timeoutMs = 30000) => {
     const results = await Promise.all(images.map(async (img) => {
         if ('url' in img) {
             const url = img.url.toString();
@@ -200,35 +195,37 @@ const uploadingNecessaryImages = async (images, waUploadToServer, timeoutMs = 30
                 return { url };
             }
         }
-        const { stream } = await (0, messages_media_1.getStream)(img);
-        const hasher = (0, crypto_1.createHash)('sha256');
-        const contentBlocks = [];
+        const { stream } = await getStream(img);
+        const hasher = createHash('sha256');
+        const filePath = join(tmpdir(), 'img' + generateMessageIDV2());
+        const encFileWriteStream = createWriteStream(filePath);
         for await (const block of stream) {
             hasher.update(block);
-            contentBlocks.push(block);
+            encFileWriteStream.write(block);
         }
         const sha = hasher.digest('base64');
-        const { directPath } = await waUploadToServer((0, messages_media_1.toReadable)(Buffer.concat(contentBlocks)), {
+        const { directPath } = await waUploadToServer(filePath, {
             mediaType: 'product-catalog-image',
             fileEncSha256B64: sha,
             timeoutMs
         });
-        return { url: (0, messages_media_1.getUrlFromDirectPath)(directPath) };
+        await fs.unlink(filePath).catch(err => console.log('Error deleting temp file ', err));
+        return { url: getUrlFromDirectPath(directPath) };
     }));
     return results;
 };
-exports.uploadingNecessaryImages = uploadingNecessaryImages;
 const parseImageUrls = (mediaNode) => {
-    const imgNode = (0, WABinary_1.getBinaryNodeChild)(mediaNode, 'image');
+    const imgNode = getBinaryNodeChild(mediaNode, 'image');
     return {
-        requested: (0, WABinary_1.getBinaryNodeChildString)(imgNode, 'request_image_url'),
-        original: (0, WABinary_1.getBinaryNodeChildString)(imgNode, 'original_image_url')
+        requested: getBinaryNodeChildString(imgNode, 'request_image_url'),
+        original: getBinaryNodeChildString(imgNode, 'original_image_url')
     };
 };
 const parseStatusInfo = (mediaNode) => {
-    const node = (0, WABinary_1.getBinaryNodeChild)(mediaNode, 'status_info');
+    const node = getBinaryNodeChild(mediaNode, 'status_info');
     return {
-        status: (0, WABinary_1.getBinaryNodeChildString)(node, 'status'),
-        canAppeal: (0, WABinary_1.getBinaryNodeChildString)(node, 'can_appeal') === 'true',
+        status: getBinaryNodeChildString(node, 'status'),
+        canAppeal: getBinaryNodeChildString(node, 'can_appeal') === 'true'
     };
 };
+//# sourceMappingURL=business.js.map

package/lib/Utils/chat-utils.d.ts

@@ -1,20 +1,48 @@
-/// <reference types="node" />
-import { AxiosRequestConfig } from 'axios';
-import type { Logger } from 'pino';
-import { proto } from '../../WAProto';
-import { BaileysEventEmitter, ChatModification, ChatMutation, Contact, InitialAppStateSyncOptions, LTHashState, WAPatchCreate, WAPatchName } from '../Types';
-import { BinaryNode } from '../WABinary';
+import { proto } from '../../WAProto/index.js';
+import type { BaileysEventEmitter, ChatModification, ChatMutation, Contact, InitialAppStateSyncOptions, LTHashState, WAPatchCreate, WAPatchName } from '../Types/index.js';
+import { type BinaryNode } from '../WABinary/index.js';
+import type { ILogger } from './logger.js';
 type FetchAppStateSyncKey = (keyId: string) => Promise<proto.Message.IAppStateSyncKeyData | null | undefined>;
 export type ChatMutationMap = {
     [index: string]: ChatMutation;
 };
+type Mac = {
+    indexMac: Uint8Array;
+    valueMac: Uint8Array;
+    operation: proto.SyncdMutation.SyncdOperation;
+};
+export declare const makeLtHashGenerator: ({ indexValueMap, hash }: Pick<LTHashState, "hash" | "indexValueMap">) => {
+    mix: ({ indexMac, valueMac, operation }: Mac) => void;
+    finish: () => {
+        hash: Buffer<ArrayBuffer>;
+        indexValueMap: {
+            [indexMacBase64: string]: {
+                valueMac: Uint8Array | Buffer;
+            };
+        };
+    };
+};
 export declare const newLTHashState: () => LTHashState;
+export declare const ensureLTHashStateVersion: (state: LTHashState) => LTHashState;
+export declare const MAX_SYNC_ATTEMPTS = 2;
+/**
+ * Check if an error is a missing app state sync key.
+ * WA Web treats these as "Blocked" (waits for key arrival), not fatal.
+ * In Baileys we retry with a snapshot which may use a different key.
+ */
+export declare const isMissingKeyError: (error: any) => boolean;
+/**
+ * Determines if an app state sync error is unrecoverable.
+ * TypeError indicates a WASM crash; otherwise we give up after MAX_SYNC_ATTEMPTS.
+ * Missing keys are NOT checked here — they are handled separately as "Blocked".
+ */
+export declare const isAppStateSyncIrrecoverable: (error: any, attempts: number) => boolean;
 export declare const encodeSyncdPatch: ({ type, index, syncAction, apiVersion, operation }: WAPatchCreate, myAppStateKeyId: string, state: LTHashState, getAppStateSyncKey: FetchAppStateSyncKey) => Promise<{
     patch: proto.ISyncdPatch;
     state: LTHashState;
 }>;
 export declare const decodeSyncdMutations: (msgMutations: (proto.ISyncdMutation | proto.ISyncdRecord)[], initialState: LTHashState, getAppStateSyncKey: FetchAppStateSyncKey, onMutation: (mutation: ChatMutation) => void, validateMacs: boolean) => Promise<{
-    hash: Buffer;
+    hash: Buffer<ArrayBuffer>;
     indexValueMap: {
         [indexMacBase64: string]: {
             valueMac: Uint8Array | Buffer;
@@ -22,50 +50,51 @@ export declare const decodeSyncdMutations: (msgMutations: (proto.ISyncdMutation
     };
 }>;
 export declare const decodeSyncdPatch: (msg: proto.ISyncdPatch, name: WAPatchName, initialState: LTHashState, getAppStateSyncKey: FetchAppStateSyncKey, onMutation: (mutation: ChatMutation) => void, validateMacs: boolean) => Promise<{
-    hash: Buffer;
+    hash: Buffer<ArrayBuffer>;
     indexValueMap: {
         [indexMacBase64: string]: {
             valueMac: Uint8Array | Buffer;
         };
     };
 }>;
-export declare const extractSyncdPatches: (result: BinaryNode, options: AxiosRequestConfig<any>) => Promise<{
-    critical_block: {
-        patches: proto.ISyncdPatch[];
-        hasMorePatches: boolean;
-        snapshot?: proto.ISyncdSnapshot | undefined;
-    };
+export declare const extractSyncdPatches: (result: BinaryNode, options: RequestInit) => Promise<{
     critical_unblock_low: {
         patches: proto.ISyncdPatch[];
         hasMorePatches: boolean;
-        snapshot?: proto.ISyncdSnapshot | undefined;
+        snapshot?: proto.ISyncdSnapshot;
     };
     regular_high: {
         patches: proto.ISyncdPatch[];
         hasMorePatches: boolean;
-        snapshot?: proto.ISyncdSnapshot | undefined;
+        snapshot?: proto.ISyncdSnapshot;
     };
     regular_low: {
         patches: proto.ISyncdPatch[];
         hasMorePatches: boolean;
-        snapshot?: proto.ISyncdSnapshot | undefined;
+        snapshot?: proto.ISyncdSnapshot;
+    };
+    critical_block: {
+        patches: proto.ISyncdPatch[];
+        hasMorePatches: boolean;
+        snapshot?: proto.ISyncdSnapshot;
     };
     regular: {
         patches: proto.ISyncdPatch[];
         hasMorePatches: boolean;
-        snapshot?: proto.ISyncdSnapshot | undefined;
+        snapshot?: proto.ISyncdSnapshot;
     };
 }>;
-export declare const downloadExternalBlob: (blob: proto.IExternalBlobReference, options: AxiosRequestConfig<any>) => Promise<Buffer>;
-export declare const downloadExternalPatch: (blob: proto.IExternalBlobReference, options: AxiosRequestConfig<any>) => Promise<proto.SyncdMutations>;
-export declare const decodeSyncdSnapshot: (name: WAPatchName, snapshot: proto.ISyncdSnapshot, getAppStateSyncKey: FetchAppStateSyncKey, minimumVersionNumber: number | undefined, validateMacs?: boolean) => Promise<{
+export declare const downloadExternalBlob: (blob: proto.IExternalBlobReference, options: RequestInit) => Promise<Buffer<ArrayBuffer>>;
+export declare const downloadExternalPatch: (blob: proto.IExternalBlobReference, options: RequestInit) => Promise<proto.SyncdMutations>;
+export declare const decodeSyncdSnapshot: (name: WAPatchName, snapshot: proto.ISyncdSnapshot, getAppStateSyncKey: FetchAppStateSyncKey, minimumVersionNumber: number | undefined, validateMacs?: boolean, logger?: ILogger) => Promise<{
     state: LTHashState;
     mutationMap: ChatMutationMap;
 }>;
-export declare const decodePatches: (name: WAPatchName, syncds: proto.ISyncdPatch[], initial: LTHashState, getAppStateSyncKey: FetchAppStateSyncKey, options: AxiosRequestConfig<any>, minimumVersionNumber?: number, logger?: Logger, validateMacs?: boolean) => Promise<{
+export declare const decodePatches: (name: WAPatchName, syncds: proto.ISyncdPatch[], initial: LTHashState, getAppStateSyncKey: FetchAppStateSyncKey, options: RequestInit, minimumVersionNumber?: number, logger?: ILogger, validateMacs?: boolean) => Promise<{
     state: LTHashState;
     mutationMap: ChatMutationMap;
 }>;
 export declare const chatModificationToAppPatch: (mod: ChatModification, jid: string) => WAPatchCreate;
-export declare const processSyncAction: (syncAction: ChatMutation, ev: BaileysEventEmitter, me: Contact, initialSyncOpts?: InitialAppStateSyncOptions, logger?: Logger) => void;
+export declare const processSyncAction: (syncAction: ChatMutation, ev: BaileysEventEmitter, me: Contact, initialSyncOpts?: InitialAppStateSyncOptions, logger?: ILogger) => void;
 export {};
+//# sourceMappingURL=chat-utils.d.ts.map