From 15ba4b66fba97bfc62ff12d40eba8a176d3b533d Mon Sep 17 00:00:00 2001 From: Adhiraj Date: Tue, 6 Oct 2020 12:55:38 +0530 Subject: [PATCH] Added fetch agent --- src/Tests/Tests.Messages.ts | 10 ++++++++-- src/WAConnection/0.Base.ts | 2 +- src/WAConnection/Constants.ts | 4 +++- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/Tests/Tests.Messages.ts b/src/Tests/Tests.Messages.ts index 439492f..bdde6ce 100644 --- a/src/Tests/Tests.Messages.ts +++ b/src/Tests/Tests.Messages.ts @@ -202,9 +202,15 @@ WAConnectionTest('Messages', conn => { for (let i = 0; i < messages.length;i++) { assert.deepEqual (messages[i].key, msgs[i].key, `failed equal at ${i}`) } - } - + cursor = msgs[0].key + + msgs = await conn.fetchMessagesFromWA (testJid, 20, cursor) + messages = (await conn.loadMessages (testJid, 20, cursor)).messages + for (let i = 0; i < messages.length;i++) { + assert.deepEqual (messages[i].key, msgs[i].key, `failed equal at ${i}`) + } + } }) it('should deliver a message', async () => { const waitForUpdate = diff --git a/src/WAConnection/0.Base.ts b/src/WAConnection/0.Base.ts index ccd4e1c..9d327aa 100644 --- a/src/WAConnection/0.Base.ts +++ b/src/WAConnection/0.Base.ts @@ -377,7 +377,7 @@ export class WAConnection extends EventEmitter { method, body, headers: { Origin: DEFAULT_ORIGIN, ...(headers || {}) }, - agent: agent || this.connectOptions.agent + agent: agent || this.connectOptions.fetchAgent }) ) generateMessageTag (longTag: boolean = false) { diff --git a/src/WAConnection/Constants.ts b/src/WAConnection/Constants.ts index 6937620..0bf9600 100644 --- a/src/WAConnection/Constants.ts +++ b/src/WAConnection/Constants.ts @@ -84,8 +84,10 @@ export type WAConnectOptions = { /** max time for the phone to respond to a connectivity test */ phoneResponseTime?: number connectCooldownMs?: number - /** agent which can be used for proxying connections */ + /** agent used for WS connections */ agent?: Agent + /** agent used for fetch requests -- uploading/downloading media */ + fetchAgent?: Agent } /** from: https://stackoverflow.com/questions/3809401/what-is-a-good-regular-expression-to-match-a-url */ export const URL_REGEX = /[-a-zA-Z0-9@:%._+~#=]{1,256}\.[a-zA-Z0-9()]{1,6}\b([-a-zA-Z0-9()@:%_+.~#?&//=]*)?/gi