Skip to content

Commit

Permalink
Make conversation listing sync (node + WASM) (#1475)
Browse files Browse the repository at this point in the history
  • Loading branch information
@rygine
rygine authored Jan 6, 2025
1 parent 1dd536d commit 32327da
Show file tree
Hide file tree
Showing 5 changed files with 53 additions and 71 deletions.
1 change: 1 addition & 0 deletions bindings_node/CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
## 0.0.33

- Added installation ID `bytes` to return value of `inboxState`
- Refactored `list`, `listGroups`, and `listDms` to be synchronous

## 0.0.32

Expand Down
32 changes: 11 additions & 21 deletions bindings_node/src/conversations.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,7 @@ impl Conversations {
}

#[napi]
pub async fn list(&self, opts: Option<ListConversationsOptions>) -> Result<Vec<Conversation>> {
pub fn list(&self, opts: Option<ListConversationsOptions>) -> Result<Vec<Conversation>> {
let convo_list: Vec<Conversation> = self
.inner_client
.find_groups(opts.unwrap_or_default().into())
Expand All @@ -316,29 +316,19 @@ impl Conversations {
}

#[napi]
pub async fn list_groups(
&self,
opts: Option<ListConversationsOptions>,
) -> Result<Vec<Conversation>> {
self
.list(Some(ListConversationsOptions {
conversation_type: Some(ConversationType::Group),
..opts.unwrap_or_default()
}))
.await
pub fn list_groups(&self, opts: Option<ListConversationsOptions>) -> Result<Vec<Conversation>> {
self.list(Some(ListConversationsOptions {
conversation_type: Some(ConversationType::Group),
..opts.unwrap_or_default()
}))
}

#[napi]
pub async fn list_dms(
&self,
opts: Option<ListConversationsOptions>,
) -> Result<Vec<Conversation>> {
self
.list(Some(ListConversationsOptions {
conversation_type: Some(ConversationType::Dm),
..opts.unwrap_or_default()
}))
.await
pub fn list_dms(&self, opts: Option<ListConversationsOptions>) -> Result<Vec<Conversation>> {
self.list(Some(ListConversationsOptions {
conversation_type: Some(ConversationType::Dm),
..opts.unwrap_or_default()
}))
}

#[napi]
Expand Down
58 changes: 29 additions & 29 deletions bindings_node/test/Conversations.test.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ describe('Conversations', () => {
const user = createUser()
const client = await createRegisteredClient(user)

expect((await client.conversations().list()).length).toBe(0)
expect((await client.conversations().listDms()).length).toBe(0)
expect((await client.conversations().listGroups()).length).toBe(0)
expect(client.conversations().list().length).toBe(0)
expect(client.conversations().listDms().length).toBe(0)
expect(client.conversations().listGroups().length).toBe(0)
})

it('should create a group chat', async () => {
Expand Down Expand Up @@ -67,22 +67,22 @@ describe('Conversations', () => {

expect(group.consentState()).toBe(ConsentState.Allowed)

const group1 = await client1.conversations().list()
const group1 = client1.conversations().list()
expect(group1.length).toBe(1)
expect(group1[0].id).toBe(group.id)
expect((await client1.conversations().listDms()).length).toBe(0)
expect((await client1.conversations().listGroups()).length).toBe(1)
expect(client1.conversations().listDms().length).toBe(0)
expect(client1.conversations().listGroups().length).toBe(1)

expect((await client2.conversations().list()).length).toBe(0)
expect(client2.conversations().list().length).toBe(0)

await client2.conversations().sync()

const group2 = await client2.conversations().list()
const group2 = client2.conversations().list()
expect(group2.length).toBe(1)
expect(group2[0].id).toBe(group.id)

expect((await client2.conversations().listDms()).length).toBe(0)
expect((await client2.conversations().listGroups()).length).toBe(1)
expect(client2.conversations().listDms().length).toBe(0)
expect(client2.conversations().listGroups().length).toBe(1)
})

it('should create a group with custom permissions', async () => {
Expand Down Expand Up @@ -213,25 +213,25 @@ describe('Conversations', () => {

expect(group.consentState()).toBe(ConsentState.Allowed)

const group1 = await client1.conversations().list()
const group1 = client1.conversations().list()
expect(group1.length).toBe(1)
expect(group1[0].id).toBe(group.id)
expect(group1[0].dmPeerInboxId()).toBe(client2.inboxId())

expect((await client1.conversations().listDms()).length).toBe(1)
expect((await client1.conversations().listGroups()).length).toBe(0)
expect(client1.conversations().listDms().length).toBe(1)
expect(client1.conversations().listGroups().length).toBe(0)

expect((await client2.conversations().list()).length).toBe(0)
expect(client2.conversations().list().length).toBe(0)

await client2.conversations().sync()

const group2 = await client2.conversations().list()
const group2 = client2.conversations().list()
expect(group2.length).toBe(1)
expect(group2[0].id).toBe(group.id)
expect(group2[0].dmPeerInboxId()).toBe(client1.inboxId())

expect((await client2.conversations().listDms()).length).toBe(1)
expect((await client2.conversations().listGroups()).length).toBe(0)
expect(client2.conversations().listDms().length).toBe(1)
expect(client2.conversations().listGroups().length).toBe(0)

const dm1 = client1.conversations().findDmByTargetInboxId(client2.inboxId())
expect(dm1).toBeDefined()
Expand Down Expand Up @@ -487,15 +487,15 @@ describe('Conversations', () => {

const groups2 = client2.conversations()
await groups2.sync()
const groupsList2 = await groups2.list()
const groupsList2 = groups2.list()

const groups3 = client3.conversations()
await groups3.sync()
const groupsList3 = await groups3.list()
const groupsList3 = groups3.list()

const groups4 = await client4.conversations()
const groups4 = client4.conversations()
await groups4.sync()
const groupsList4 = await groups4.list()
const groupsList4 = groups4.list()

const message1 = await groupsList2[0].send(encodeTextMessage('gm!'))
const message2 = await groupsList3[0].send(encodeTextMessage('gm2!'))
Expand Down Expand Up @@ -530,15 +530,15 @@ describe('Conversations', () => {

const groups2 = client2.conversations()
await groups2.sync()
const groupsList2 = await groups2.list()
const groupsList2 = groups2.list()

const groups3 = client3.conversations()
await groups3.sync()
const groupsList3 = await groups3.list()
const groupsList3 = groups3.list()

const groups4 = await client4.conversations()
const groups4 = client4.conversations()
await groups4.sync()
const groupsList4 = await groups4.list()
const groupsList4 = groups4.list()

await groupsList4[0].send(encodeTextMessage('gm3!'))
const message1 = await groupsList2[0].send(encodeTextMessage('gm!'))
Expand Down Expand Up @@ -573,15 +573,15 @@ describe('Conversations', () => {

const groups2 = client2.conversations()
await groups2.sync()
const groupsList2 = await groups2.list()
const groupsList2 = groups2.list()

const groups3 = client3.conversations()
await groups3.sync()
const groupsList3 = await groups3.list()
const groupsList3 = groups3.list()

const groups4 = await client4.conversations()
const groups4 = client4.conversations()
await groups4.sync()
const groupsList4 = await groups4.list()
const groupsList4 = groups4.list()

await groupsList2[0].send(encodeTextMessage('gm!'))
await groupsList3[0].send(encodeTextMessage('gm2!'))
Expand Down
1 change: 1 addition & 0 deletions bindings_wasm/CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
## 0.0.11

- Added installation ID `bytes` to return value of `inboxState`
- Refactored `list`, `listGroups`, and `listDms` to be synchronous

## 0.0.10

Expand Down
32 changes: 11 additions & 21 deletions bindings_wasm/src/conversations.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -323,10 +323,7 @@ impl Conversations {
}

#[wasm_bindgen]
pub async fn list(
&self,
opts: Option<ListConversationsOptions>,
) -> Result<js_sys::Array, JsError> {
pub fn list(&self, opts: Option<ListConversationsOptions>) -> Result<js_sys::Array, JsError> {
let convo_list: js_sys::Array = self
.inner_client
.find_groups(opts.unwrap_or_default().into())
Expand All @@ -345,28 +342,21 @@ impl Conversations {
}

#[wasm_bindgen(js_name = listGroups)]
pub async fn list_groups(
pub fn list_groups(
&self,
opts: Option<ListConversationsOptions>,
) -> Result<js_sys::Array, JsError> {
self
.list(Some(ListConversationsOptions {
conversation_type: Some(ConversationType::Group),
..opts.unwrap_or_default()
}))
.await
self.list(Some(ListConversationsOptions {
conversation_type: Some(ConversationType::Group),
..opts.unwrap_or_default()
}))
}

#[wasm_bindgen(js_name = listDms)]
pub async fn list_dms(
&self,
opts: Option<ListConversationsOptions>,
) -> Result<js_sys::Array, JsError> {
self
.list(Some(ListConversationsOptions {
conversation_type: Some(ConversationType::Dm),
..opts.unwrap_or_default()
}))
.await
pub fn list_dms(&self, opts: Option<ListConversationsOptions>) -> Result<js_sys::Array, JsError> {
self.list(Some(ListConversationsOptions {
conversation_type: Some(ConversationType::Dm),
..opts.unwrap_or_default()
}))
}
}

0 comments on commit 32327da

Please sign in to comment.