-
Notifications
You must be signed in to change notification settings - Fork 21
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #290 from xmtp/cv/fix-stream-unsubscribe
Fix stream unsubscribe, remove event emitters
- Loading branch information
Showing
5 changed files
with
252 additions
and
7 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,212 @@ | ||
| import { Test, assert, createClients, delayToPropogate } from './test-utils' | ||
|
|
||
| export const restartStreamTests: Test[] = [] | ||
|
|
||
| function test(name: string, perform: () => Promise<boolean>) { | ||
| restartStreamTests.push({ name, run: perform }) | ||
| } | ||
|
|
||
| test('Can cancel a stream and restart', async () => { | ||
| // Create clients | ||
| const [alix, bo, caro, davon] = await createClients(4) | ||
|
|
||
| // Start stream | ||
| let numEvents1 = 0 | ||
| await alix.conversations.stream(async (_) => { | ||
| numEvents1++ | ||
| }) | ||
| await delayToPropogate() | ||
| await alix.conversations.newConversation(bo.address) | ||
| await delayToPropogate() | ||
| assert(numEvents1 === 1, 'expected 1 event, first stream') | ||
|
|
||
| // Cancel stream | ||
| alix.conversations.cancelStream() | ||
| await alix.conversations.newConversation(caro.address) | ||
| await delayToPropogate() | ||
| assert(numEvents1 === 1, 'expected 1 event, first stream after cancel') | ||
|
|
||
| // Start new stream | ||
| let numEvents2 = 0 | ||
| await alix.conversations.stream(async (_) => { | ||
| numEvents2++ | ||
| }) | ||
| await delayToPropogate() | ||
|
|
||
| await alix.conversations.newConversation(davon.address) | ||
| await delayToPropogate() | ||
|
|
||
| // Verify correct number of events from each stream | ||
| assert( | ||
| numEvents1 === 1, | ||
| 'expected 1 event, first stream after cancel, but found ' + numEvents1 | ||
| ) | ||
| assert( | ||
| numEvents2 === 1, | ||
| 'expected 1 event, second stream, but found ' + numEvents2 | ||
| ) | ||
|
|
||
| return true | ||
| }) | ||
|
|
||
| // Existing issue, client who started stream, creating groups will not | ||
| // be streamed | ||
| test('Can cancel a streamGroups and restart', async () => { | ||
| // Create clients | ||
| const [alix, bo, caro, davon] = await createClients(4) | ||
|
|
||
| // Start stream | ||
| let numEvents1 = 0 | ||
| await alix.conversations.streamGroups(async (_) => { | ||
| numEvents1++ | ||
| }) | ||
| await delayToPropogate() | ||
| await bo.conversations.newGroup([alix.address]) | ||
| await delayToPropogate() | ||
| assert(numEvents1 === 1, 'expected 1 event, first stream') | ||
|
|
||
| // Cancel stream | ||
| alix.conversations.cancelStreamGroups() | ||
| await caro.conversations.newGroup([alix.address]) | ||
| await delayToPropogate() | ||
| assert(numEvents1 === 1, 'expected 1 event, first stream after cancel') | ||
|
|
||
| // Start new stream | ||
| let numEvents2 = 0 | ||
| await alix.conversations.streamGroups(async (_) => { | ||
| numEvents2++ | ||
| }) | ||
| await delayToPropogate() | ||
|
|
||
| await davon.conversations.newGroup([alix.address]) | ||
| await delayToPropogate() | ||
|
|
||
| // Verify correct number of events from each stream | ||
| assert( | ||
| numEvents1 === 1, | ||
| 'expected 1 event, first stream after cancel, but found ' + numEvents1 | ||
| ) | ||
| assert( | ||
| numEvents2 === 1, | ||
| 'expected 1 event, second stream, but found ' + numEvents2 | ||
| ) | ||
|
|
||
| return true | ||
| }) | ||
|
|
||
| test('Can cancel a streamAllMessages and restart', async () => { | ||
| // Create clients | ||
| const [alix, bo] = await createClients(2) | ||
|
|
||
| // Create a group | ||
| await delayToPropogate() | ||
| await bo.conversations.newGroup([alix.address]) | ||
| await bo.conversations.newConversation(alix.address) | ||
| await delayToPropogate() | ||
|
|
||
| // Start stream | ||
| let numEvents1 = 0 | ||
| await alix.conversations.streamAllMessages(async (_) => { | ||
| numEvents1++ | ||
| }, true) | ||
| await delayToPropogate() | ||
|
|
||
| // Send one Group message and one Conversation Message | ||
| const boGroup = (await bo.conversations.listGroups())[0] | ||
| const boConversation = (await bo.conversations.list())[0] | ||
|
|
||
| await boGroup.send('test') | ||
| await boConversation.send('test') | ||
| await delayToPropogate() | ||
|
|
||
| assert( | ||
| numEvents1 === 2, | ||
| 'expected 2 events, first stream, but found ' + numEvents1 | ||
| ) | ||
|
|
||
| // Cancel stream | ||
| alix.conversations.cancelStreamAllMessages() | ||
| await boGroup.send('test') | ||
| await boConversation.send('test') | ||
| await delayToPropogate() | ||
| assert(numEvents1 === 2, 'expected 2 events, first stream after cancel') | ||
|
|
||
| // Start new stream | ||
| let numEvents2 = 0 | ||
| await alix.conversations.streamAllMessages(async (_) => { | ||
| numEvents2++ | ||
| }, true) | ||
| await delayToPropogate() | ||
|
|
||
| await boGroup.send('test') | ||
| await boConversation.send('test') | ||
| await delayToPropogate() | ||
|
|
||
| // Verify correct number of events from each stream | ||
| assert( | ||
| numEvents1 === 2, | ||
| 'expected 2 events, first stream after cancel, but found ' + numEvents1 | ||
| ) | ||
| assert( | ||
| numEvents2 === 2, | ||
| 'expected 2 events, second stream, but found ' + numEvents2 | ||
| ) | ||
|
|
||
| return true | ||
| }) | ||
|
|
||
| test('Can cancel a streamAllGroupMessages and restart', async () => { | ||
| // Create clients | ||
| const [alix, bo] = await createClients(2) | ||
|
|
||
| // Create a group | ||
| await delayToPropogate() | ||
| await bo.conversations.newGroup([alix.address]) | ||
| await delayToPropogate() | ||
|
|
||
| // Start stream | ||
| let numEvents1 = 0 | ||
| await alix.conversations.streamAllGroupMessages(async (_) => { | ||
| numEvents1++ | ||
| }) | ||
| await delayToPropogate() | ||
|
|
||
| // Send one Group message and one Conversation Message | ||
| const boGroup = (await bo.conversations.listGroups())[0] | ||
|
|
||
| await boGroup.send('test') | ||
| await delayToPropogate() | ||
|
|
||
| assert( | ||
| numEvents1 === 1, | ||
| 'expected 1 events, first stream, but found ' + numEvents1 | ||
| ) | ||
|
|
||
| // Cancel stream | ||
| alix.conversations.cancelStreamAllGroupMessages() | ||
| await boGroup.send('test') | ||
| await delayToPropogate() | ||
| assert(numEvents1 === 1, 'expected 1 event, first stream after cancel') | ||
|
|
||
| // Start new stream | ||
| let numEvents2 = 0 | ||
| await alix.conversations.streamAllGroupMessages(async (_) => { | ||
| numEvents2++ | ||
| }) | ||
| await delayToPropogate() | ||
|
|
||
| await boGroup.send('test') | ||
| await delayToPropogate() | ||
|
|
||
| // Verify correct number of events from each stream | ||
| assert( | ||
| numEvents1 === 1, | ||
| 'expected 1 event, first stream after cancel, but found ' + numEvents1 | ||
| ) | ||
| assert( | ||
| numEvents2 === 1, | ||
| 'expected 1 event, second stream, but found ' + numEvents2 | ||
| ) | ||
|
|
||
| return true | ||
| }) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters