Free, Open Source, Self-Hosted WhatsApp API Gateway
TypeScript apibotgatewayself-hostedwhatsappwhatsapp-apiwhatsapp-automationwhatsapp-botwhatsapp-gatewaywhatsapp-gateway-apiwhatsapp-webwhatsapp-web-api
fix(media): fall back to the url when base64 holds no bytes
Yudhi Armyndharisc5c9c8ccb8b1
diff --git a/src/modules/media/media-conversion.service.spec.ts b/src/modules/media/media-conversion.service.spec.tsindex c2233cd08..b7be676ce 100644--- a/src/modules/media/media-conversion.service.spec.ts+++ b/src/modules/media/media-conversion.service.spec.ts@@ -270,6 +270,36 @@ describe('MediaConversionService', () => {expect((runFfmpeg.mock.calls[0] as [Buffer])[0]).toEqual(Buffer.from('inline'));});+ it.each(['convertToVoice', 'convertToVideo'] as const)(+ '%s uses the URL when a data URI carries no base64 bytes',+ async method => {+ const load = jest+ .spyOn(loadRemoteMedia, 'loadRemoteMediaBuffer')+ .mockResolvedValue({ data: Buffer.from('remote-media'), mimetype: 'audio/mpeg' });+ const service = makeService(config(), { registry: registryWith('socks5://live.invalid:1080') });++ await service[method](SESSION, {+ base64: 'data:audio/mpeg;base64,',+ url: 'https://example.com/media',+ });++ expect((runFfmpeg.mock.calls[0] as [Buffer])[0]).toEqual(Buffer.from('remote-media'));+ expect(load).toHaveBeenCalledWith('https://example.com/media', 'socks5://live.invalid:1080');+ },+ );++ it('keeps nonempty base64 ahead of a stale URL', async () => {+ const load = jest.spyOn(loadRemoteMedia, 'loadRemoteMediaBuffer');++ await makeService().convertToVoice(SESSION, {+ base64: 'data:audio/mpeg;base64,aW5saW5l',+ url: 'https://example.com/ignored',+ });++ expect((runFfmpeg.mock.calls[0] as [Buffer])[0]).toEqual(Buffer.from('inline'));+ expect(load).not.toHaveBeenCalled();+ });+it('rejects base64 above the media cap with 413, before any conversion', async () => {const service = makeService(config());const oversized = Buffer.alloc(51 * 1024 * 1024).toString('base64');diff --git a/src/modules/media/media-conversion.service.ts b/src/modules/media/media-conversion.service.tsindex 66aa6f923..2c7912e87 100644--- a/src/modules/media/media-conversion.service.ts+++ b/src/modules/media/media-conversion.service.ts@@ -170,10 +170,12 @@ export class MediaConversionService implements OnApplicationShutdown {/** Read the caller's media into memory, honouring the same caps and SSRF guard as a send. */private async resolveInput(sessionId: string, dto: ConvertMediaDto): Promise<Buffer> {- if (dto.base64) {+ // Stripped first: a bare `data:...;base64,` prefix holds no bytes, so a url beside it is used.+ const base64 = stripBase64DataUri(dto.base64);+ if (base64) {// Checked before decoding, so an oversized payload is refused without allocating it.- assertBase64WithinMediaCap(dto.base64);- const data = Buffer.from(stripBase64DataUri(dto.base64) ?? '', 'base64');+ assertBase64WithinMediaCap(base64);+ const data = Buffer.from(base64, 'base64');if (data.length === 0) throw new BadRequestException('base64 did not decode to any bytes');return data;}