接入群成员与邀请实时同步
This commit is contained in:
1 parent
b2e04e8174
commit
5cae19a256
9 files changed
+175
-38
No files matched your search
+35
-9
@@ -56,7 +56,7 @@ function frame() {
|
||||
return Buffer.concat([Buffer.from([0, 1, 0, 2]), randomBytes(96)]).toString('base64')
|
||||
}
|
||||
|
||||
test('群组邀请、授权、成员移除与版本变更', { timeout: 25_000 }, async () => {
|
||||
test('群组邀请、授权、成员移除、版本变更与实时提示', { timeout: 25_000 }, async (t) => {
|
||||
const owner = await register()
|
||||
const member = await register()
|
||||
const other = await register()
|
||||
@@ -70,32 +70,58 @@ test('群组邀请、授权、成员移除与版本变更', { timeout: 25_000 },
|
||||
await act(owner, 'invite', member.user.id, 409)
|
||||
await contact(owner, member, 'request')
|
||||
await contact(member, owner, 'accept')
|
||||
await act(owner, 'invite', member.user.id)
|
||||
const [ownerSocket, memberSocket, otherSocket] = await Promise.all([owner, member, other].map((actor) => watchRealtime(actor, t)))
|
||||
const unrelated = []
|
||||
otherSocket.on('message', (data) => unrelated.push(JSON.parse(data)))
|
||||
async function expectHint(sockets, action) {
|
||||
const pending = Promise.all(sockets.map((socket) => once(socket, 'message', { signal: AbortSignal.timeout(4000) })))
|
||||
const [events] = await Promise.all([pending, action()])
|
||||
for (const [data] of events) assert.deepEqual(JSON.parse(data), { type: 'group_list_changed' })
|
||||
}
|
||||
await expectHint([ownerSocket, memberSocket], () => act(owner, 'invite', member.user.id))
|
||||
const invitation = await json(path, 'GET', member.token)
|
||||
assert.equal(invitation.state, 'invited')
|
||||
assert.deepEqual(invitation.members, [])
|
||||
assert.equal(invitation.membershipVersion, '1')
|
||||
await act(member, 'decline')
|
||||
await expectHint([ownerSocket, memberSocket], () => act(member, 'decline'))
|
||||
await json(path, 'GET', member.token, undefined, 404)
|
||||
await act(owner, 'invite', member.user.id)
|
||||
await act(member, 'accept')
|
||||
await expectHint([ownerSocket, memberSocket], () => act(owner, 'invite', member.user.id))
|
||||
await expectHint([ownerSocket, memberSocket], () => act(member, 'accept'))
|
||||
const active = await json(path, 'GET', member.token)
|
||||
assert.equal(active.membershipVersion, '2')
|
||||
assert.deepEqual(active.members.map((item) => item.role).sort(), ['member', 'owner'])
|
||||
await act(member, 'remove', owner.user.id, 409)
|
||||
await act(member, 'rename', undefined, 409, '未授权名称')
|
||||
await act(owner, 'promote', member.user.id)
|
||||
await act(member, 'rename', undefined, 204, '管理员改名')
|
||||
const candidate = await register()
|
||||
for (const [actor, target, action] of [[owner, candidate, 'request'], [candidate, owner, 'accept']]) {
|
||||
const pending = once(ownerSocket, 'message', { signal: AbortSignal.timeout(4000) })
|
||||
const [[data]] = await Promise.all([pending, contact(actor, target, action)])
|
||||
assert.deepEqual(JSON.parse(data), { type: 'contacts_changed' })
|
||||
}
|
||||
const candidateSocket = await watchRealtime(candidate, t)
|
||||
const ordinaryMemberEvents = []
|
||||
const recordMemberEvent = (data) => ordinaryMemberEvents.push(JSON.parse(data))
|
||||
memberSocket.on('message', recordMemberEvent)
|
||||
await expectHint([ownerSocket, candidateSocket], () => act(owner, 'invite', candidate.user.id))
|
||||
assert.deepEqual((await json(path, 'GET', member.token)).members.map((entry) => entry.state), ['active', 'active'])
|
||||
await expectHint([ownerSocket, candidateSocket], () => act(candidate, 'decline'))
|
||||
memberSocket.off('message', recordMemberEvent)
|
||||
assert.deepEqual(ordinaryMemberEvents, [])
|
||||
await expectHint([ownerSocket, memberSocket], () => act(owner, 'promote', member.user.id))
|
||||
await expectHint([ownerSocket, memberSocket], () => act(member, 'rename', undefined, 204, '管理员改名'))
|
||||
const renamed = await json(path, 'GET', owner.token)
|
||||
assert.equal(renamed.name, '管理员改名')
|
||||
assert.equal(renamed.membershipVersion, '2')
|
||||
await act(member, 'disband', undefined, 409)
|
||||
await act(owner, 'remove', member.user.id)
|
||||
await expectHint([ownerSocket, memberSocket], () => act(owner, 'remove', member.user.id))
|
||||
await json(path, 'GET', member.token, undefined, 404)
|
||||
assert.deepEqual(await json('/groups', 'GET', member.token), [])
|
||||
assert.equal((await json(path, 'GET', owner.token)).membershipVersion, '3')
|
||||
await act(owner, 'disband')
|
||||
await expectHint([ownerSocket, memberSocket], () => act(owner, 'invite', member.user.id))
|
||||
await expectHint([ownerSocket, memberSocket], () => act(owner, 'disband'))
|
||||
await json(path, 'GET', owner.token, undefined, 404)
|
||||
assert.deepEqual(await json('/groups', 'GET', member.token), [])
|
||||
assert.deepEqual(unrelated, [])
|
||||
})
|
||||
|
||||
test('群密文和实时提示只投递到名单设备,移除或撤销阻断旧世代', { timeout: 25_000 }, async (t) => {
|
||||
|
||||
@@ -34,11 +34,14 @@ async function connect(owner, member, ownerName, memberName) {
|
||||
}
|
||||
|
||||
async function invite(owner, member, memberName, group) {
|
||||
await work(member).getByRole('link', { name: '群组' }).click()
|
||||
await member.getByRole('heading', { name: '群组', exact: true }).waitFor()
|
||||
await member.getByText('选择或创建群组。').waitFor()
|
||||
await owner.getByLabel('邀请联系人').selectOption({ label: memberName })
|
||||
await owner.getByRole('button', { name: '发送邀请' }).click()
|
||||
await work(member).getByRole('link', { name: '群组' }).click()
|
||||
await member.getByRole('link', { name: new RegExp(group) }).click()
|
||||
await member.getByRole('link', { name: new RegExp(group + '.*待接受邀请') }).click({ timeout: 4500 })
|
||||
await member.getByRole('button', { name: '接受邀请' }).click()
|
||||
await owner.getByRole('list', { name: '群成员' }).getByText(memberName + ' · 成员', { exact: true }).waitFor({ timeout: 4500 })
|
||||
await chat(member).getByRole('button', { name: '启用本机群聊' }).waitFor()
|
||||
}
|
||||
|
||||
@@ -310,7 +313,7 @@ test('Windows 与 Web 加密群聊支持消息操作、附件、语音和成员
|
||||
const member = owner.getByRole('list', { name: '群成员' }).getByRole('listitem').filter({ hasText: names[2] })
|
||||
await member.getByRole('button', { name: '移除成员' }).click()
|
||||
await owner.getByRole('button', { name: '确认操作' }).click()
|
||||
await removed.getByRole('heading', { name: group }).waitFor({ state: 'hidden' })
|
||||
await removed.getByRole('heading', { name: group }).waitFor({ state: 'hidden', timeout: 4500 })
|
||||
const fetchRemovedVoice = () => fetch(base + desktopVoice, { headers: { Authorization: 'Bearer ' + removedIdentity.token } })
|
||||
assert.equal((await fetchRemovedVoice()).status, 404)
|
||||
assert.equal((await fetch(base + '/api/v1/devices/' + removedIdentity.device.id, {
|
||||
|
||||
Reference in new issue
Block a user