增加加密群消息引用、编辑和撤回
This commit is contained in:
1 parent
de722039d6
commit
7beb0cf795
7 files changed
+177
-36
No files matched your search
+67
-10
@@ -7,8 +7,8 @@ import MediaPreview from './MediaPreview.vue'
|
||||
import VoiceMessage from './VoiceMessage.vue'
|
||||
import VoiceRecorder from './VoiceRecorder.vue'
|
||||
import { enableChat, trust } from './chat'
|
||||
import { discardPendingGroupMessage, groupAttachmentPath, publishGroup, sendGroupMessage, synchronizeGroup } from './group-chat'
|
||||
import type { GroupDetail, GroupDevice } from './group-chat'
|
||||
import { discardPendingGroupMessage, groupAttachmentPath, groupQuote, publishGroup, sendGroupMessage, synchronizeGroup } from './group-chat'
|
||||
import type { GroupDetail, GroupDevice, GroupLine } from './group-chat'
|
||||
|
||||
const props = defineProps<{ group: GroupDetail }>()
|
||||
const session = useSession()
|
||||
@@ -17,12 +17,15 @@ const code = ref('')
|
||||
const codes = ref<Record<string, string>>({})
|
||||
const selected = ref<Record<string, string>>({})
|
||||
const draft = ref('')
|
||||
const replying = ref<GroupLine>()
|
||||
const editing = ref<GroupLine>()
|
||||
const recalling = ref<GroupLine>()
|
||||
const file = ref<File>()
|
||||
const pendingVoice = ref<{ file: File; epoch: string }>()
|
||||
const busy = ref(false)
|
||||
const error = ref('')
|
||||
const ready = computed(() => view.value?.ready && view.value.current?.membershipVersion === props.group.membershipVersion)
|
||||
const recordingEpoch = computed(() => ready.value ? view.value?.current?.id : undefined)
|
||||
const currentEpoch = computed(() => ready.value ? view.value?.current?.id : undefined)
|
||||
const members = computed(() => props.group.members.filter((member) => member.state === 'active' && member.id !== session.identity?.user.id))
|
||||
const canPublish = computed(() => Boolean(view.value && !view.value.current && members.value.every((member) =>
|
||||
view.value?.devices.some((device) => device.user === member.id && device.id === selected.value[member.id] && pinned(device)))))
|
||||
@@ -86,8 +89,31 @@ function send() {
|
||||
const identity = session.identity
|
||||
if (identity) void run(async () => {
|
||||
const text = draft.value
|
||||
await sendGroupMessage(identity, props.group, text, session.authorized)
|
||||
if (editing.value?.epoch) {
|
||||
await sendGroupMessage(identity, props.group, { action: 'edit', id: editing.value.id, epoch: editing.value.epoch, text }, session.authorized)
|
||||
} else {
|
||||
await sendGroupMessage(identity, props.group, replying.value ? { text, reply: replying.value } : text, session.authorized)
|
||||
}
|
||||
if (draft.value === text) draft.value = ''
|
||||
editing.value = undefined
|
||||
replying.value = undefined
|
||||
await refresh()
|
||||
})
|
||||
}
|
||||
|
||||
function edit(line: GroupLine) {
|
||||
editing.value = line
|
||||
replying.value = undefined
|
||||
draft.value = line.text
|
||||
}
|
||||
|
||||
function recall() {
|
||||
const identity = session.identity
|
||||
const { id, epoch } = recalling.value ?? {}
|
||||
if (!identity || !id || !epoch) return
|
||||
void run(async () => {
|
||||
await sendGroupMessage(identity, props.group, { action: 'recall', id, epoch }, session.authorized)
|
||||
recalling.value = undefined
|
||||
await refresh()
|
||||
})
|
||||
}
|
||||
@@ -125,7 +151,14 @@ function discard() {
|
||||
}
|
||||
|
||||
watch(() => props.group.membershipVersion, () => void run(refresh))
|
||||
watch([pendingVoice, busy, recordingEpoch, () => view.value?.hasPending], ([voice, inProgress, epoch, hasPending]) => {
|
||||
watch(currentEpoch, (epoch, previous) => {
|
||||
if (!previous || epoch === previous) return
|
||||
if (editing.value || replying.value) draft.value = ''
|
||||
editing.value = undefined
|
||||
replying.value = undefined
|
||||
recalling.value = undefined
|
||||
})
|
||||
watch([pendingVoice, busy, currentEpoch, () => view.value?.hasPending], ([voice, inProgress, epoch, hasPending]) => {
|
||||
const identity = session.identity
|
||||
if (!voice || !identity) return
|
||||
if (voice.epoch !== epoch) {
|
||||
@@ -180,27 +213,50 @@ onBeforeUnmount(() => clearInterval(timer))
|
||||
<button v-if="group.role === 'owner' && !view?.current" class="primary" :disabled="busy || !canPublish" @click="establish">建立群加密会话</button>
|
||||
</details>
|
||||
<ul v-if="view?.lines.length" class="group-chat-lines" aria-label="群消息记录">
|
||||
<li v-for="line in view.lines" :key="line.id">
|
||||
<li v-for="line in view.lines" :key="[line.epoch, line.sender, line.id].join('/')">
|
||||
<small>{{ line.name }} · {{ new Date(line.time).toLocaleString() }}</small>
|
||||
<VoiceMessage v-if="line.attachment?.voice" :attachment="line.attachment" :path="groupAttachmentPath(group, line.attachment.id)" />
|
||||
<blockquote v-if="line.quote">{{ line.quote }}</blockquote>
|
||||
<p v-if="line.recalled" class="muted">消息已撤回</p>
|
||||
<VoiceMessage v-else-if="line.attachment?.voice" :attachment="line.attachment" :path="groupAttachmentPath(group, line.attachment.id)" />
|
||||
<template v-else-if="line.attachment">
|
||||
<p>{{ line.attachment.name }} · {{ new Intl.NumberFormat().format(line.attachment.size) }} 字节</p>
|
||||
<MediaPreview v-if="line.attachment.media" :attachment="line.attachment" :path="groupAttachmentPath(group, line.attachment.id)" />
|
||||
<button type="button" class="plain" :disabled="busy" @click="download(line.attachment)">下载 {{ line.attachment.name }}</button>
|
||||
</template>
|
||||
<p v-else>{{ line.text }}</p>
|
||||
<small v-if="line.edited && !line.recalled" class="muted">已编辑</small>
|
||||
<div v-if="currentEpoch && line.epoch === currentEpoch && !line.recalled" class="message-actions">
|
||||
<button type="button" class="plain" :disabled="busy || view.hasPending || !!editing" @click="replying = line">引用</button>
|
||||
<template v-if="line.sender === session.identity?.device.id">
|
||||
<button v-if="!line.attachment" type="button" class="plain" :disabled="busy || view.hasPending" @click="edit(line)">编辑</button>
|
||||
<button type="button" class="plain" :disabled="busy || view.hasPending" @click="recalling = line">撤回</button>
|
||||
</template>
|
||||
</div>
|
||||
</li>
|
||||
</ul>
|
||||
<div v-if="ready && recalling" class="confirmation">
|
||||
<p>撤回后,群成员的聊天界面会更新。成员可能已保存副本。</p>
|
||||
<button type="button" class="plain" :disabled="busy || view?.hasPending" @click="recall">确认撤回</button>
|
||||
<button type="button" class="plain" @click="recalling = undefined">取消</button>
|
||||
</div>
|
||||
<p v-if="view?.hasPending" role="status">
|
||||
{{ view.stalePending ? '待发消息属于旧会话。' : '消息待投递,将自动重试。' }}
|
||||
<button v-if="view.stalePending" class="plain" :disabled="busy" @click="discard">清除待发消息</button>
|
||||
</p>
|
||||
<form v-if="ready" class="group-chat-composer" @submit.prevent="send">
|
||||
<div v-if="editing" class="chat-quote">
|
||||
<span>编辑消息</span>
|
||||
<button type="button" class="plain" @click="editing = undefined; draft = ''">取消编辑</button>
|
||||
</div>
|
||||
<div v-else-if="replying" class="chat-quote">
|
||||
<span>引用 {{ groupQuote(replying) }}</span>
|
||||
<button type="button" class="plain" @click="replying = undefined">取消引用</button>
|
||||
</div>
|
||||
<label>群消息<textarea v-model="draft" rows="3" maxlength="8000" required /></label>
|
||||
<button class="primary" :disabled="busy || view?.hasPending || !draft.trim()">发送群消息</button>
|
||||
<button class="primary" :disabled="busy || view?.hasPending || !draft.trim()">{{ editing ? '保存编辑' : '发送群消息' }}</button>
|
||||
</form>
|
||||
<div v-if="ready" class="group-chat-composer">
|
||||
<VoiceRecorder v-if="recordingEpoch" :key="recordingEpoch" :epoch="recordingEpoch" :disabled="busy || view?.hasPending || !!pendingVoice"
|
||||
<div v-if="ready && !editing" class="group-chat-composer">
|
||||
<VoiceRecorder v-if="currentEpoch" :key="currentEpoch" :epoch="currentEpoch" :disabled="busy || view?.hasPending || !!pendingVoice"
|
||||
@send="sendVoice" @error="error = $event" />
|
||||
<label>选择群附件 <input type="file" :disabled="busy || view?.hasPending" @change="chooseFile"></label>
|
||||
<div v-if="file" class="message-actions">
|
||||
@@ -220,6 +276,7 @@ onBeforeUnmount(() => clearInterval(timer))
|
||||
.group-device-member { margin-block: .75rem; }
|
||||
.group-chat-lines { display: grid; gap: .75rem; max-height: 24rem; overflow-y: auto; margin: 0; padding: .7rem 0; list-style: none; }
|
||||
.group-chat-lines p { white-space: pre-wrap; overflow-wrap: anywhere; }
|
||||
.group-chat-lines blockquote { margin: .25rem 0; padding-inline-start: .5rem; border-inline-start: 2px solid currentColor; overflow-wrap: anywhere; }
|
||||
.group-chat-composer { display: grid; gap: .55rem; }
|
||||
.group-chat-composer textarea { display: block; width: 100%; resize: vertical; font: inherit; }
|
||||
.group-chat button { justify-self: start; }
|
||||
|
||||
@@ -170,7 +170,7 @@ async function flush(state: ChatState, save: (state: ChatState) => Promise<void>
|
||||
return unavailable
|
||||
}
|
||||
|
||||
function applyMutation(line: ChatLine, mutation: Mutation) {
|
||||
export function applyMutation(line: Pick<ChatLine, 'text' | 'attachment' | 'quote' | 'recalled' | 'edited'>, mutation: Mutation) {
|
||||
if (line.recalled) return
|
||||
if (mutation.action === 'recall') {
|
||||
line.recalled = true
|
||||
|
||||
+57
-19
@@ -1,9 +1,9 @@
|
||||
import { APIError } from '../api'
|
||||
import { base64, decode } from './engine'
|
||||
import { replenishPackages, update, verifiedPeer, verify } from './chat'
|
||||
import { applyMutation, replenishPackages, update, verifiedPeer, verify } from './chat'
|
||||
import type { Call, ChatIdentity, Package, Peer } from './chat'
|
||||
import { decodeMessage, encodeAttachment, sealAttachment } from './attachments'
|
||||
import type { Attachment } from './attachments'
|
||||
import { decodeMessage, encodeAttachment, encodeMutation, encodeReply, sealAttachment } from './attachments'
|
||||
import type { Attachment, Mutation } from './attachments'
|
||||
|
||||
export type GroupMember = { id: string; username: string; state: 'active' | 'invited'; role: 'owner' | 'admin' | 'member' }
|
||||
export type GroupDetail = { id: string; membershipVersion: string; members: GroupMember[]; role: GroupMember['role'] }
|
||||
@@ -12,15 +12,20 @@ type Epoch = { id: string; creatorDevice: string; membershipVersion: string; wel
|
||||
type Publishing = { id: string; membershipVersion: string; devices: { device: string; wire?: string }[] }
|
||||
type Outgoing = { id: string; epoch: string; wire: string }
|
||||
type Packet = Outgoing & { sequence: string; senderDevice: string; createdAt: string; attachmentId?: string }
|
||||
type Line = { id: string; user: string; sender: string; name: string; text: string; time: string; attachment?: Attachment }
|
||||
export type GroupLine = {
|
||||
id: string; user: string; sender: string; name: string; text: string; time: string; epoch?: string
|
||||
attachment?: Attachment; quote?: string; edited?: boolean; recalled?: boolean
|
||||
}
|
||||
type LineRef = Pick<GroupLine, 'id' | 'sender' | 'epoch'>
|
||||
type GroupContent = string | File | { text: string; reply: LineRef } | (Mutation & { epoch: string })
|
||||
type Verified = { user: string; key: string; name: string }
|
||||
type VerifiedEpoch = { version: string; roster: Record<string, Verified> }
|
||||
export type GroupChatState = {
|
||||
cursor: string
|
||||
lines: Line[]
|
||||
lines: GroupLine[]
|
||||
epochs: Record<string, VerifiedEpoch>
|
||||
pendingEpoch?: Publishing
|
||||
pendingMessage?: Pick<Packet, 'id' | 'epoch' | 'wire'> & { line: Line }
|
||||
pendingMessage?: Outgoing & { line: GroupLine; mutation?: Mutation }
|
||||
}
|
||||
|
||||
const encoder = new TextEncoder()
|
||||
@@ -33,6 +38,22 @@ function local(chats: Record<string, GroupChatState>, group: string) {
|
||||
return chats[group] ??= { cursor: '0', lines: [], epochs: {} }
|
||||
}
|
||||
|
||||
function finishPending(chat: GroupChatState, pending: NonNullable<GroupChatState['pendingMessage']>) {
|
||||
pending.line.epoch ??= pending.epoch
|
||||
if (pending.mutation) applyGroupMutation(chat, pending.epoch, pending.line.sender, pending.mutation)
|
||||
else chat.lines.push(pending.line)
|
||||
delete chat.pendingMessage
|
||||
}
|
||||
|
||||
function applyGroupMutation(chat: GroupChatState, epoch: string, sender: string, mutation: Mutation) {
|
||||
const target = chat.lines.find((line) => line.id === mutation.id && line.epoch === epoch && line.sender === sender)
|
||||
if (target) applyMutation(target, mutation)
|
||||
}
|
||||
|
||||
export function groupQuote(line: GroupLine) {
|
||||
return (line.text || line.attachment?.name || '').slice(0, 240)
|
||||
}
|
||||
|
||||
function activeMembers(group: GroupDetail) {
|
||||
return group.members.filter((member) => member.state === 'active')
|
||||
}
|
||||
@@ -137,8 +158,7 @@ async function sendPending(group: GroupDetail, chat: GroupChatState, call: Call)
|
||||
await call(path(group) + '/messages', 'POST', {
|
||||
id: pending.id, epoch: pending.epoch, wire: pending.wire, attachmentId: pending.line.attachment?.id,
|
||||
})
|
||||
chat.lines.push(pending.line)
|
||||
delete chat.pendingMessage
|
||||
finishPending(chat, pending)
|
||||
}
|
||||
|
||||
export function synchronizeGroup(identity: ChatIdentity, group: GroupDetail, call: Call) {
|
||||
@@ -192,8 +212,7 @@ export function synchronizeGroup(identity: ChatIdentity, group: GroupDetail, cal
|
||||
const pending = chat.pendingMessage
|
||||
if (pending && pending.id === item.id && pending.epoch === item.epoch && pending.wire === item.wire &&
|
||||
pending.line.attachment?.id === item.attachmentId) {
|
||||
chat.lines.push(pending.line)
|
||||
delete chat.pendingMessage
|
||||
finishPending(chat, pending)
|
||||
}
|
||||
} else {
|
||||
if (item.epoch === current?.id && !ready) break
|
||||
@@ -204,10 +223,13 @@ export function synchronizeGroup(identity: ChatIdentity, group: GroupDetail, cal
|
||||
const bytes = engine.decrypt_group(await groupID(group.id, item.epoch), item.senderDevice, decode(sender.key),
|
||||
aad(group.id, item.epoch, item.id, item.senderDevice), decode(item.wire))
|
||||
state.engine = base64(engine.snapshot())
|
||||
const { text, attachment, quote } = decodeMessage(bytes)
|
||||
const { text, attachment, quote, mutation } = decodeMessage(bytes)
|
||||
if (attachment?.id !== item.attachmentId) throw new Error('群附件标识不匹配')
|
||||
if (attachment || (!quote && text.length > 0 && bytes.length <= 8000)) {
|
||||
chat.lines.push({ id: item.id, user: sender.user, name: sender.name, sender: item.senderDevice, text, attachment, time: item.createdAt })
|
||||
if (mutation) {
|
||||
applyGroupMutation(chat, item.epoch, item.senderDevice, mutation)
|
||||
} else if (attachment || quote || (text.length > 0 && bytes.length <= 8000)) {
|
||||
chat.lines.push({ id: item.id, epoch: item.epoch, user: sender.user, name: sender.name,
|
||||
sender: item.senderDevice, text, quote, attachment, time: item.createdAt })
|
||||
}
|
||||
} catch {
|
||||
warning ||= '已跳过无法通过验证的群消息'
|
||||
@@ -239,11 +261,12 @@ export function discardPendingGroupMessage(identity: ChatIdentity, group: GroupD
|
||||
})
|
||||
}
|
||||
|
||||
export function sendGroupMessage(identity: ChatIdentity, group: GroupDetail, message: string | File, call: Call, expectedEpoch?: string) {
|
||||
export function sendGroupMessage(identity: ChatIdentity, group: GroupDetail, message: GroupContent, call: Call, expectedEpoch?: string) {
|
||||
return update(identity, async (state, save, factory) => {
|
||||
const text = typeof message === 'string' ? message.trim() : ''
|
||||
const text = (typeof message === 'string' ? message : message instanceof File ? '' : message.text ?? '').trim()
|
||||
let content: Uint8Array = encoder.encode(text)
|
||||
if (typeof message === 'string' && (content.length === 0 || content.length > 8000)) throw new Error('消息须为 1 至 8000 字节')
|
||||
if (!(message instanceof File) && !(typeof message === 'object' && 'action' in message && message.action === 'recall') &&
|
||||
(content.length === 0 || content.length > 8000)) throw new Error('消息须为 1 至 8000 字节')
|
||||
const chat = local(state.groupChats ??= {}, group.id)
|
||||
const epochs = await call<Epoch[]>(path(group) + '/epochs')
|
||||
const epoch = epochs.find((item) => item.current && item.membershipVersion === group.membershipVersion)
|
||||
@@ -254,17 +277,32 @@ export function sendGroupMessage(identity: ChatIdentity, group: GroupDetail, mes
|
||||
const own = chat.epochs[epoch.id]!.roster[identity.device.id]
|
||||
if (!own) throw new Error('当前设备未加入群加密世代')
|
||||
let attachment: Attachment | undefined
|
||||
if (typeof message !== 'string') {
|
||||
let quote: string | undefined
|
||||
let mutation: Mutation | undefined
|
||||
if (message instanceof File) {
|
||||
const sealed = await sealAttachment(message)
|
||||
attachment = sealed.attachment
|
||||
await call(groupAttachmentPath(group, attachment.id) + '?' + new URLSearchParams({ epoch: epoch.id }), 'POST', sealed.ciphertext)
|
||||
content = encodeAttachment(attachment)
|
||||
} else if (typeof message === 'object' && 'reply' in message) {
|
||||
const target = chat.lines.find((line) => line.epoch === epoch.id && line.epoch === message.reply.epoch &&
|
||||
line.id === message.reply.id && line.sender === message.reply.sender)
|
||||
if (!target || target.recalled) throw new Error('当前会话中没有可引用的消息')
|
||||
quote = groupQuote(target)
|
||||
content = encodeReply(text, quote)
|
||||
} else if (typeof message === 'object') {
|
||||
const target = chat.lines.find((line) => line.epoch === epoch.id && line.epoch === message.epoch &&
|
||||
line.id === message.id && line.sender === identity.device.id)
|
||||
if (!target || target.recalled || (message.action === 'edit' && target.attachment)) throw new Error('此群消息无法更新')
|
||||
mutation = message.action === 'edit' ? { action: 'edit', id: target.id, text } : { action: 'recall', id: target.id }
|
||||
content = encodeMutation(mutation)
|
||||
}
|
||||
const engine = factory.DeviceMls.restore(decode(state.engine))
|
||||
try {
|
||||
const wire = engine.encrypt(await groupID(group.id, epoch.id), aad(group.id, epoch.id, id, identity.device.id), content)
|
||||
chat.pendingMessage = { id, epoch: epoch.id, wire: base64(wire),
|
||||
line: { id, user: identity.user.id, name: own.name, sender: identity.device.id, text, attachment, time: new Date().toISOString() } }
|
||||
chat.pendingMessage = { id, epoch: epoch.id, wire: base64(wire), mutation,
|
||||
line: { id, epoch: epoch.id, user: identity.user.id, name: own.name, sender: identity.device.id,
|
||||
text, quote, attachment, time: new Date().toISOString() } }
|
||||
state.engine = base64(engine.snapshot())
|
||||
await save(state)
|
||||
} finally {
|
||||
|
||||
Reference in new issue
Block a user