diff --git a/ts/components/session/SessionRadio.tsx b/ts/components/session/SessionRadio.tsx index 0753833dd..11b40c6bd 100644 --- a/ts/components/session/SessionRadio.tsx +++ b/ts/components/session/SessionRadio.tsx @@ -15,13 +15,9 @@ export const SessionRadio = (props: Props) => { function clickHandler(e: any) { e.stopPropagation(); - console.warn(`SessionRadio clickHandler ${value}`); - onClick(value); } - console.warn(`isactive ${value}: ${active}`); - return ( { const { items, group, initialItem } = props; useEffect(() => { - console.warn('unMNount:', initialItem); setActiveItem(initialItem); }, []); diff --git a/ts/session/group/index.ts b/ts/session/group/index.ts index 47c8e668f..1a969890c 100644 --- a/ts/session/group/index.ts +++ b/ts/session/group/index.ts @@ -466,13 +466,6 @@ async function sendAddedMembers( await ConversationController.getInstance().getOrCreateAndWait(m, 'private'); const memberPubKey = PubKey.cast(m); await getMessageQueue().sendToPubKey(memberPubKey, newClosedGroupUpdate); - - // if (expirationTimerMessage) { - // await getMessageQueue().sendToPubKey( - // memberPubKey, - // expirationTimerMessage - // ); - // } }); await Promise.all(promises); } diff --git a/ts/session/sending/MessageSender.ts b/ts/session/sending/MessageSender.ts index ba2356324..24c380770 100644 --- a/ts/session/sending/MessageSender.ts +++ b/ts/session/sending/MessageSender.ts @@ -26,7 +26,8 @@ export function canSendToSnode(): boolean { */ export async function send( message: RawMessage, - attempts: number = 3 + attempts: number = 3, + retryMinTimeout?: number // in ms ): Promise { if (!canSendToSnode()) { throw new Error('lokiMessageAPI is not initialized.'); @@ -56,6 +57,7 @@ export async function send( { retries: Math.max(attempts - 1, 0), factor: 1, + minTimeout: retryMinTimeout || 1000, } ); } diff --git a/ts/test/session/unit/sending/MessageQueue_test.ts b/ts/test/session/unit/sending/MessageQueue_test.ts index d018490e9..c8c1dac5c 100644 --- a/ts/test/session/unit/sending/MessageQueue_test.ts +++ b/ts/test/session/unit/sending/MessageQueue_test.ts @@ -39,7 +39,7 @@ describe('MessageQueue', () => { let messageQueueStub: MessageQueue; // Message Sender Stubs - let sendStub: sinon.SinonStub<[RawMessage, (number | undefined)?]>; + let sendStub: sinon.SinonStub<[RawMessage, (number | undefined)?, (number | undefined)?]>; beforeEach(() => { // Utils Stubs @@ -113,7 +113,7 @@ describe('MessageQueue', () => { const promise = PromiseUtils.waitUntil(async () => { const messages = await pendingMessageCache.getForDevice(device); return messages.length === 0; - }); + }, 100); return promise.should.be.fulfilled; } }).timeout(15000); @@ -122,45 +122,51 @@ describe('MessageQueue', () => { it('should send a success event if message was sent', done => { const device = TestUtils.generateFakePubKey(); const message = TestUtils.generateChatMessage(); - const waitForMessageSentEvent = new Promise(resolve => { - resolve(true); - done(); - }); + const waitForMessageSentEvent = async () => new Promise(resolve => { + resolve(); + try { - void pendingMessageCache - .add(device, message, waitForMessageSentEvent as any) - .then(() => messageQueueStub.processPending(device)) - .then(() => { expect(messageSentHandlerSuccessStub.callCount).to.be.equal(1); expect( messageSentHandlerSuccessStub.lastCall.args[0].identifier ).to.be.equal(message.identifier); - }); + done(); + } catch (e) { + done(e); + } + }); + + void pendingMessageCache + .add(device, message, waitForMessageSentEvent) + .then(() => messageQueueStub.processPending(device)); }); - it('should send a fail event if something went wrong while sending', done => { + it('should send a fail event if something went wrong while sending', async () => { sendStub.throws(new Error('failure')); const device = TestUtils.generateFakePubKey(); const message = TestUtils.generateChatMessage(); - const waitForMessageSentEvent = new Promise(resolve => { - resolve(true); - done(); - }); - void pendingMessageCache - .add(device, message, waitForMessageSentEvent as any) - .then(() => messageQueueStub.processPending(device)) - .then(() => { - expect(messageSentHandlerFailedStub.callCount).to.be.equal(1); - expect( - messageSentHandlerFailedStub.lastCall.args[0].identifier - ).to.be.equal(message.identifier); - expect( - messageSentHandlerFailedStub.lastCall.args[1].message - ).to.equal('failure'); - expect(waitForMessageSentEvent).to.be.eventually.fulfilled; - }); + .add(device, message) + .then(() => messageQueueStub.processPending(device)); + // The cb is only invoke is all reties fails. Here we poll until the messageSentHandlerFailed was invoked as this is what we want to do + + return PromiseUtils.poll(done => { + if (messageSentHandlerFailedStub.callCount === 1) { + try { + expect(messageSentHandlerFailedStub.callCount).to.be.equal(1); + expect( + messageSentHandlerFailedStub.lastCall.args[0].identifier + ).to.be.equal(message.identifier); + expect( + messageSentHandlerFailedStub.lastCall.args[1].message + ).to.equal('failure'); + done(); + } catch (e) { + done(e); + } + } + }); }); }); }); @@ -182,7 +188,7 @@ describe('MessageQueue', () => { describe('sendToGroup', () => { it('should throw an error if invalid non-group message was passed', async () => { const chatMessage = TestUtils.generateChatMessage(); - await expect( + return expect( messageQueueStub.sendToGroup(chatMessage as any) ).to.be.rejectedWith('Invalid group message passed in sendToGroup.'); }); diff --git a/ts/test/session/unit/sending/MessageSender_test.ts b/ts/test/session/unit/sending/MessageSender_test.ts index 7d5accef8..90da9290b 100644 --- a/ts/test/session/unit/sending/MessageSender_test.ts +++ b/ts/test/session/unit/sending/MessageSender_test.ts @@ -85,16 +85,19 @@ describe('MessageSender', () => { }); it('should only retry the specified amount of times before throwing', async () => { + // const clock = sinon.useFakeTimers(); + lokiMessageAPISendStub.throws(new Error('API error')); const attempts = 2; - const promise = MessageSender.send(rawMessage, attempts); + const promise = MessageSender.send(rawMessage, attempts, 10); await expect(promise).is.rejectedWith('API error'); + // clock.restore(); expect(lokiMessageAPISendStub.callCount).to.equal(attempts); }); it('should not throw error if successful send occurs within the retry limit', async () => { lokiMessageAPISendStub.onFirstCall().throws(new Error('API error')); - await MessageSender.send(rawMessage, 3); + await MessageSender.send(rawMessage, 3, 10); expect(lokiMessageAPISendStub.callCount).to.equal(2); }); }); diff --git a/ts/test/session/unit/utils/JobQueue_test.ts b/ts/test/session/unit/utils/JobQueue_test.ts index ecdc6e7fe..4f3c29b8e 100644 --- a/ts/test/session/unit/utils/JobQueue_test.ts +++ b/ts/test/session/unit/utils/JobQueue_test.ts @@ -17,7 +17,7 @@ describe('JobQueue', () => { const id = 'jobId'; assert.isFalse(queue.has(id)); - const promise = queue.addWithId(id, async () => TestUtils.timeout(100)); + const promise = queue.addWithId(id, async () => TestUtils.timeout(30)); assert.isTrue(queue.has(id)); await promise; assert.isFalse(queue.has(id)); @@ -27,9 +27,9 @@ describe('JobQueue', () => { describe('addWithId', () => { it('should run the jobs concurrently', async () => { const input = [ - [10, 300], - [20, 200], - [30, 100], + [10, 10], + [20, 8], + [30, 2], ]; const queue = new JobQueue(); const mapper = async ([value, ms]: Array): Promise => @@ -48,20 +48,20 @@ describe('JobQueue', () => { const timeTaken = Date.now() - start; assert.isAtLeast( timeTaken, - 600, - 'Queue should take atleast 600ms to run.' + 20, + 'Queue should take atleast 100ms to run.' ); }); it('should return the result of the job', async () => { const queue = new JobQueue(); const success = queue.addWithId(uuid(), async () => { - await TestUtils.timeout(100); + await TestUtils.timeout(10); return 'success'; }); const failure = queue.addWithId(uuid(), async () => { - await TestUtils.timeout(100); + await TestUtils.timeout(10); throw new Error('failed'); }); @@ -73,7 +73,7 @@ describe('JobQueue', () => { const queue = new JobQueue(); const first = queue.addWithId(uuid(), () => 'first'); const second = queue.addWithId(uuid(), async () => { - await TestUtils.timeout(100); + await TestUtils.timeout(10); return 'second'; }); @@ -90,7 +90,7 @@ describe('JobQueue', () => { const queue = new JobQueue(); const id = uuid(); const job = async () => { - await TestUtils.timeout(100); + await TestUtils.timeout(10); return 'job1'; }; @@ -106,14 +106,14 @@ describe('JobQueue', () => { const id = uuid(); const successfullJob = queue.addWithId(id, async () => - TestUtils.timeout(100) + TestUtils.timeout(10) ); assert.isTrue(queue.has(id)); await successfullJob; assert.isFalse(queue.has(id)); const failJob = queue.addWithId(id, async () => { - await TestUtils.timeout(100); + await TestUtils.timeout(10); throw new Error('failed'); }); assert.isTrue(queue.has(id)); diff --git a/ts/test/session/unit/utils/Promise_test.ts b/ts/test/session/unit/utils/Promise_test.ts index d913538c9..9e54ef6ce 100644 --- a/ts/test/session/unit/utils/Promise_test.ts +++ b/ts/test/session/unit/utils/Promise_test.ts @@ -51,7 +51,7 @@ describe('Promise Utils', () => { done(); }; - const promise = PromiseUtils.poll(task, {}); + const promise = PromiseUtils.poll(task, { interval: 10 }); expect(pollSpy.callCount).to.equal(1); expect(completionSpy.callCount).to.equal(1); @@ -63,7 +63,7 @@ describe('Promise Utils', () => { const completionSpy = sandbox.spy(); const task = (_done: any) => undefined; - const promise = PromiseUtils.poll(task, { timeoutMs: 1 }); + const promise = PromiseUtils.poll(task, { timeoutMs: 1, interval: 10 }); expect(pollSpy.callCount).to.equal(1); expect(completionSpy.callCount).to.equal(0); @@ -75,7 +75,7 @@ describe('Promise Utils', () => { it('will recur according to interval option', async () => { const expectedRecurrences = 4; const timeout = 3000; - const interval = 50; + const interval = 3; const recurrenceSpy = sandbox.spy(); const task = (done: any) => { @@ -129,7 +129,7 @@ describe('Promise Utils', () => { describe('waitUntil', () => { it('can wait for check', async () => { const check = () => true; - const promise = PromiseUtils.waitUntil(check); + const promise = PromiseUtils.waitUntil(check, 5); expect(waitUntilSpy.callCount).to.equal(1); return promise; diff --git a/ts/test/updater/curve_test.ts b/ts/test/updater/curve_test.ts deleted file mode 100644 index 638961ec5..000000000 --- a/ts/test/updater/curve_test.ts +++ /dev/null @@ -1,14 +0,0 @@ -import { assert } from 'chai'; - -import { keyPair, sign, verify } from '../../updater/curve'; - -describe('updater/curve', () => { - it('roundtrips', () => { - const message = Buffer.from('message'); - const { publicKey, privateKey } = keyPair(); - const signature = sign(privateKey, message); - const verified = verify(publicKey, message, signature); - - assert.strictEqual(verified, true); - }); -});