@lordmega/baileys 0.3.23 → 0.3.25

package/lib/Utils/messages-media.js

@@ -11,7 +11,7 @@ import { proto } from '../../WAProto/index.js';
 import { DEFAULT_ORIGIN, MEDIA_HKDF_KEY_MAPPING, MEDIA_PATH_MAP, NEWSLETTER_MEDIA_PATH_MAP } from '../Defaults/index.js';
 import { getBinaryNodeChild, getBinaryNodeChildBuffer, jidNormalizedUser } from '../WABinary/index.js';
 import { aesDecryptGCM, aesEncryptGCM, hkdf } from './crypto.js';
-import { generateMessageIDV2 } from './generics.js';
+import { delay, generateMessageIDV2 } from './generics.js';
 const getTmpFilesDirectory = () => tmpdir();
 let imageProcessingLibrary;
 export const getImageProcessingLibrary = async () => {
@@ -621,10 +621,14 @@ export const uploadWithNodeHttp = async ({ url, filePath, headers, timeoutMs, ag
             res.on('data', chunk => (body += chunk));
             res.on('end', () => {
                 try {
-                    resolve(JSON.parse(body));
+                    const parsed = JSON.parse(body);
+                    // attach status so caller can log/branch on it
+                    parsed._status = res.statusCode;
+                    resolve(parsed);
                 }
                 catch {
-                    resolve(undefined);
+                    // non-JSON body — resolve with status-only object
+                    resolve({ _status: res.statusCode, _body: body.substring(0, 200) });
                 }
             });
         });
@@ -656,10 +660,12 @@ const uploadWithFetch = async ({ url, filePath, headers, timeoutMs, agent }) =>
         signal: timeoutMs ? AbortSignal.timeout(timeoutMs) : undefined
     });
     try {
-        return (await response.json());
+        const parsed = await response.json();
+        parsed._status = response.status;
+        return parsed;
     }
     catch {
-        return undefined;
+        return { _status: response.status };
     }
 };
 /**
@@ -692,7 +698,13 @@ const uploadMedia = async (params, logger) => {
 export const getWAUploadToServer = ({ customUploadHosts, fetchAgent, logger, options }, refreshMediaConn) => {
     return async (filePath, { mediaType, fileEncSha256B64, timeoutMs, newsletter }) => {
         // send a query JSON to obtain the url & auth token to upload our media
-        let uploadInfo = await refreshMediaConn(false);
+        let uploadInfo;
+        try {
+            uploadInfo = await refreshMediaConn(false);
+        }
+        catch (err) {
+            throw new Boom(`Media upload failed: cannot fetch media connection (${err?.message})`, { statusCode: 503, data: err });
+        }
         let urls;
         const hosts = [...customUploadHosts, ...uploadInfo.hosts];
         fileEncSha256B64 = encodeBase64EncodedStringForUpload(fileEncSha256B64);
@@ -708,47 +720,102 @@ export const getWAUploadToServer = ({ customUploadHosts, fetchAgent, logger, opt
             'Content-Type': 'application/octet-stream',
             Origin: DEFAULT_ORIGIN
         };
-        for (const { hostname } of hosts) {
-            logger.debug(`uploading to "${hostname}"`);
-            const auth = encodeURIComponent(uploadInfo.auth);
-            // Lia@Changes 06-02-26 --- Switch media path map for newsletter uploads
-            const mediaPathMap = newsletter ? NEWSLETTER_MEDIA_PATH_MAP : MEDIA_PATH_MAP;
-            // Lia@Changes 20-03-26 --- Add server thumb for newsletter media
-            const serverThumb = newsletter ? '&server_thumb_gen=1' : '';
-            const url = `https://${hostname}${mediaPathMap[mediaType]}/${fileEncSha256B64}?auth=${auth}&token=${fileEncSha256B64}${serverThumb}`;
-            let result;
-            try {
-                result = await uploadMedia({
-                    url,
-                    filePath,
-                    headers,
-                    timeoutMs,
-                    agent: fetchAgent
-                }, logger);
-                if (result?.url || result?.direct_path) {
-                    urls = {
-                        mediaUrl: result.url,
-                        directPath: result.direct_path,
-                        meta_hmac: result.meta_hmac,
-                        fbid: result.fbid,
-                        ts: result.ts,
-                        thumbnailDirectPath: result.thumbnail_info?.thumbnail_direct_path,
-                        thumbnailSha256: result.thumbnail_info?.thumbnail_sha256
-                    };
-                    break;
-                }
-                else {
+        // deduplicate hosts — WA server sometimes returns same host multiple times
+        const seenHosts = new Set();
+        const uniqueHosts = hosts.filter(h => {
+            if (seenHosts.has(h.hostname)) return false;
+            seenHosts.add(h.hostname);
+            return true;
+        });
+        // Lia@Changes 12-06-26 --- mediaConn auth can go stale on long-lived sessions; WA then
+        // rejects EVERY host with HTTP 500 (not 401), so plain host-rotation never recovers.
+        // Force-refresh once on the first auth-suspect failure and retry the SAME host with fresh auth.
+        const AUTH_SUSPECT_STATUS = new Set([401, 403, 408, 500, 502, 503]);
+        let refreshedOnce = false;
+        // Lia@Changes 06-02-26 --- Switch media path map for newsletter uploads
+        const mediaPathMap = newsletter ? NEWSLETTER_MEDIA_PATH_MAP : MEDIA_PATH_MAP;
+        const mediaPath = mediaPathMap[mediaType];
+        if (!mediaPath && mediaPath !== '') {
+            throw new Boom(`Unknown mediaType "${mediaType}" — no upload path defined`, { statusCode: 400 });
+        }
+        // Lia@Changes 20-03-26 --- Add server thumb for newsletter media.
+        // Lia@Changes 12-06-26 --- Gated behind options.newsletterServerThumbGen (default on) so
+        // it can be A/B disabled — a non-standard query param is a suspect when newsletter uploads 500.
+        const useServerThumb = newsletter && (options?.newsletterServerThumbGen ?? true);
+        const serverThumb = useServerThumb ? '&server_thumb_gen=1' : '';
+        // Lia@Changes 12-06-26 --- Datacenter/VPS IPs get throttled by the WA media CDN, which
+        // surfaces as ALL hosts failing in one pass. Wrap the host sweep in bounded retry ROUNDS
+        // with exponential backoff (modeled on whatsmeow's download retry path) so a transient
+        // CDN/IP throttle recovers instead of bubbling up a hard "failed on all hosts".
+        const maxRounds = Math.max(1, options?.mediaUploadMaxRetries ?? 3);
+        for (let round = 0; round < maxRounds && !urls; round++) {
+            if (round > 0) {
+                // exponential backoff: 1s, 2s, 4s ... capped at 15s
+                const backoffMs = Math.min(1000 * Math.pow(2, round - 1), 15000);
+                logger.warn({ round, backoffMs }, `all hosts failed, retrying upload round (${round + 1}/${maxRounds}) after backoff`);
+                await delay(backoffMs);
+                // fresh mediaConn between rounds — auth/host list may have rotated server-side
+                try {
                     uploadInfo = await refreshMediaConn(true);
-                    throw new Error(`upload failed, reason: ${JSON.stringify(result)}`);
+                }
+                catch (refreshErr) {
+                    logger.warn({ trace: refreshErr?.stack }, 'mediaConn refresh between rounds failed');
                 }
             }
-            catch (error) {
-                const isLast = hostname === hosts[uploadInfo.hosts.length - 1]?.hostname;
-                logger.warn({ trace: error?.stack, uploadResult: result }, `Error in uploading to ${hostname} ${isLast ? '' : ', retrying...'}`);
+            for (let i = 0; i < uniqueHosts.length && !urls; i++) {
+                const { hostname } = uniqueHosts[i];
+                const isLast = i === uniqueHosts.length - 1;
+                // attempt 0 = first try; attempt 1 = retry same host after a forced mediaConn refresh
+                for (let attempt = 0; attempt < 2; attempt++) {
+                    const auth = encodeURIComponent(uploadInfo.auth);
+                    const url = `https://${hostname}${mediaPath}/${fileEncSha256B64}?auth=${auth}&token=${fileEncSha256B64}${serverThumb}`;
+                    logger.debug({ hostname, mediaType, round, attempt, url: url.split('?')[0] }, `uploading to host (${i + 1}/${uniqueHosts.length})`);
+                    let result;
+                    try {
+                        result = await uploadMedia({
+                            url,
+                            filePath,
+                            headers,
+                            timeoutMs,
+                            agent: fetchAgent
+                        }, logger);
+                        if (result?.url || result?.direct_path) {
+                            urls = {
+                                mediaUrl: result.url,
+                                directPath: result.direct_path,
+                                meta_hmac: result.meta_hmac,
+                                fbid: result.fbid,
+                                ts: result.ts,
+                                thumbnailDirectPath: result.thumbnail_info?.thumbnail_direct_path,
+                                thumbnailSha256: result.thumbnail_info?.thumbnail_sha256
+                            };
+                            break;
+                        }
+                        throw new Error(`upload failed, status=${result?._status ?? 'unknown'}, reason: ${JSON.stringify(result)}`);
+                    }
+                    catch (error) {
+                        const status = result?._status;
+                        // Stale auth often surfaces as a 5xx/408, not just 401/403. Refresh once globally,
+                        // then immediately retry THIS host with the new token before giving up on it.
+                        if (!refreshedOnce && AUTH_SUSPECT_STATUS.has(status) && attempt === 0) {
+                            refreshedOnce = true;
+                            try {
+                                uploadInfo = await refreshMediaConn(true);
+                                logger.warn({ hostname, status }, 'mediaConn refreshed after auth-suspect failure, retrying same host');
+                                continue; // retry same host, attempt 1
+                            }
+                            catch (refreshErr) {
+                                logger.warn({ trace: refreshErr?.stack }, 'mediaConn refresh failed');
+                            }
+                        }
+                        logger.warn({ trace: error?.stack, uploadResult: result, status }, `Error uploading to ${hostname}${isLast ? ' (last host this round)' : ', retrying next host...'}`);
+                        break; // move to next host
+                    }
+                }
             }
         }
         if (!urls) {
-            throw new Boom('Media upload failed on all hosts', { statusCode: 500 });
+            throw new Boom(`Media upload failed on all hosts after ${maxRounds} round(s) (${uniqueHosts.map(h => h.hostname).join(', ')})`, { statusCode: 500 });
         }
         return urls;
     };

package/lib/Utils/messages.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"messages.d.ts","sourceRoot":"","sources":["../../src/Utils/messages.js"],"names":[],"mappings":"AA6mDA;;;;;GAKG;AACH;;;qBAgCC;AACD;;;;;GAKG;AACH;;qBAgBC;AAnnDM,mDAA+D;AAC/D,qGAYN;AAeM,0FAmKN;AAmTM,kGAaN;AAMM,oFAwBN;AACM,uEAKN;AACM,iEAKN;AAEM,0DAGN;AACM,iEAMN;AAEM,8DAIN;AACM,mFAmxBN;AACM,yGA4EN;AACM,uGAQN;AAEM,iEAMN;AAOM,2DA2CN;AAKM,yDAkCN;AAIM,sFAQoB;AAEpB,uEASN;AAEM,yEAMN;AAEM,yEAON;AAEM,4EAKN;AAgEM,gEAgBN;AAKM,oGA8CN;AAEM,sDAWN;AAkEM,kEAOF;sBAh0DiB,wBAAwB"}
+{"version":3,"file":"messages.d.ts","sourceRoot":"","sources":["../../src/Utils/messages.js"],"names":[],"mappings":"AAgnDA;;;;;GAKG;AACH;;;qBAgCC;AACD;;;;;GAKG;AACH;;qBAgBC;AApnDM,mDAA+D;AAC/D,qGAYN;AAeM,0FAmKN;AAuTM,kGAaN;AAMM,oFAwBN;AACM,uEAKN;AACM,iEAKN;AAEM,sDAGN;AACM,6DAMN;AAEM,0DAIN;AACM,mFAixBN;AACM,yGA4EN;AACM,uGAQN;AAEM,iEAMN;AAOM,2DA0CN;AAKM,yDAkCN;AAIM,sFAQoB;AAEpB,uEASN;AAEM,yEAMN;AAEM,yEAON;AAEM,4EAKN;AAgEM,gEAgBN;AAKM,oGA8CN;AAEM,sDAWN;AAkEM,8DAUN;sBAt0DqB,wBAAwB"}