Free, Open Source, Self-Hosted WhatsApp API Gateway
TypeScript apibotgatewayself-hostedwhatsappwhatsapp-apiwhatsapp-automationwhatsapp-botwhatsapp-gatewaywhatsapp-gateway-apiwhatsapp-webwhatsapp-web-api
fix(wwebjs): keep the status media cap under MEDIA_DOWNLOAD_MAX_BYTES
Yudhi Armyndharis2c00ee2c1a2c
diff --git a/src/engine/adapters/whatsapp-web-js.adapter.spec.ts b/src/engine/adapters/whatsapp-web-js.adapter.spec.tsindex ba497c798..ff3df84ea 100644--- a/src/engine/adapters/whatsapp-web-js.adapter.spec.ts+++ b/src/engine/adapters/whatsapp-web-js.adapter.spec.ts@@ -5470,6 +5470,47 @@ describe('WhatsAppWebJsAdapter inbound media concurrency (slot held until the reexpect(media.data).toBe(Buffer.from('ok').toString('base64'));expect(calls).toEqual(['bad', 'good']);});++ it('never lets a per-call override raise the cap above MEDIA_DOWNLOAD_MAX_BYTES', async () => {+ process.env.MEDIA_DOWNLOAD_MAX_BYTES = '1000';+ process.env.MEDIA_DOWNLOAD_ENABLED = 'true';++ const adapter = newAdapter();+ const downloadMedia = jest.fn(() => Promise.resolve({ mimetype: 'video/mp4', data: 'x'.repeat(2000) }));+ const msg = { id: { _serialized: 'big' }, _data: { size: 1500, mimetype: 'video/mp4' }, downloadMedia };+ const cap = (m: unknown, override: number): Promise<unknown> =>+ (adapter as unknown as { capInboundMediaFor: (msg: unknown, o: number) => Promise<unknown> }).capInboundMediaFor(+ m,+ override,+ );++ // The declared 1500 bytes is over the global 1000 cap, so the larger override must not admit it.+ await expect(cap(msg, 5000)).resolves.toEqual(+ expect.objectContaining({ mimetype: 'video/mp4', omitted: true, sizeBytes: 1500 }),+ );+ expect(downloadMedia).not.toHaveBeenCalled();+ });++ it('drops a downloaded payload over the per-call override when no size was declared', async () => {+ process.env.MEDIA_DOWNLOAD_MAX_BYTES = '1000';+ process.env.MEDIA_DOWNLOAD_ENABLED = 'true';++ const adapter = newAdapter();+ const data = Buffer.alloc(300).toString('base64');+ const downloadMedia = jest.fn(() => Promise.resolve({ mimetype: 'image/jpeg', data }));+ const msg = { id: { _serialized: 'undeclared' }, _data: {}, downloadMedia };+ const cap = (m: unknown, override: number): Promise<unknown> =>+ (adapter as unknown as { capInboundMediaFor: (msg: unknown, o: number) => Promise<unknown> }).capInboundMediaFor(+ m,+ override,+ );++ // Nothing declared, so the pre-gate admits it; the real 300 bytes is under the global cap but over 100.+ await expect(cap(msg, 100)).resolves.toEqual(+ expect.objectContaining({ mimetype: 'image/jpeg', omitted: true, sizeBytes: 300 }),+ );+ expect(downloadMedia).toHaveBeenCalledTimes(1);+ });});/**diff --git a/src/engine/adapters/whatsapp-web-js.adapter.ts b/src/engine/adapters/whatsapp-web-js.adapter.tsindex de3f03d8d..ae1e54593 100644--- a/src/engine/adapters/whatsapp-web-js.adapter.ts+++ b/src/engine/adapters/whatsapp-web-js.adapter.ts@@ -296,7 +296,9 @@ export class WhatsAppWebJsAdapter extends EventEmitter implements IWhatsAppEngin// that renamed it to `$1` (#747), which is the same build whose page-side rename makes these// downloads fail. The warnings below are the diagnostic for it, so they must carry a real id.const msgId = readWid(msg.id);- const maxBytes = maxBytesOverride ?? inboundMediaMaxBytes();+ // An override (the status seed's STATUS_MEDIA_MAX_BYTES) only tightens the global cap: a larger one+ // would let a download the cap below always drops run anyway, past the memory guard it exists for.+ const maxBytes = Math.min(maxBytesOverride ?? Number.POSITIVE_INFINITY, inboundMediaMaxBytes());const data = (msg as unknown as { _data?: { size?: number; mimetype?: string; filename?: string } })._data;const declared = coerceDeclaredSize(data?.size);if (declared > maxBytes) {@@ -393,6 +395,7 @@ export class WhatsAppWebJsAdapter extends EventEmitter implements IWhatsAppEnginfilename: media.filename || undefined,sizeBytes: Buffer.byteLength(media.data, 'base64'),toBase64: () => media.data,+ maxBytes,});if (capped.omitted) {this.logger.warn('Inbound media exceeds MEDIA_DOWNLOAD_MAX_BYTES; dropped payload, kept envelope', {