diff --git a/src/client/room/ThreadTimeline.ts b/src/client/room/ThreadTimeline.ts index f92f5063..7255e84e 100644 --- a/src/client/room/ThreadTimeline.ts +++ b/src/client/room/ThreadTimeline.ts @@ -162,8 +162,7 @@ export class ThreadTimeline implements TimelineView, Disposable { this.syncThreadMeta(events); } - const eventsWithRemoteEcho = this.outbox.getSentEventIds().filter((e) => this.findEvent(e)); - this.outbox.removeByEventIds(eventsWithRemoteEcho); + this.outbox.handleRemoteEcho(events); } private async getMessages( diff --git a/src/client/room/Timeline.ts b/src/client/room/Timeline.ts index ce3f9d1c..5684a0e5 100644 --- a/src/client/room/Timeline.ts +++ b/src/client/room/Timeline.ts @@ -103,8 +103,7 @@ export class Timeline implements TimelineView, Disposable { this.batchManager.handleSync(messageEvents, limited, prevToken); - const eventsWithRemoteEcho = this.outbox.getSentEventIds().filter((e) => this.findEvent(e)); - this.outbox.removeByEventIds(eventsWithRemoteEcho); + this.outbox.handleRemoteEcho(messageEvents); } private syncThreads( diff --git a/src/client/room/local-event/LocalEventOutbox.ts b/src/client/room/local-event/LocalEventOutbox.ts index 23b532b5..73fe1c60 100644 --- a/src/client/room/local-event/LocalEventOutbox.ts +++ b/src/client/room/local-event/LocalEventOutbox.ts @@ -1,6 +1,8 @@ import { ObservableValue } from 'neurone/lib/utils/observable'; +import { MessageEventWithoutRoomId } from 'neurone/lib/api/types'; import { EventSenderSuccess, LocalEventSender } from './LocalEventSender'; import { randomStr } from '../../../app/utils/common'; +import { rUnsigned } from '../../reader'; export class LocalEventOutbox { private readonly publishKey = randomStr(); @@ -34,21 +36,22 @@ export class LocalEventOutbox { this.senders.publish(this.publishKey, n); } - public removeByEventIds(eventIds: readonly string[]): void { - const ids = new Set(eventIds); + public handleRemoteEcho(events: MessageEventWithoutRoomId[]): void { + const waitingSenders = this.items.filter((sender) => { + const { txnId } = sender.localEvent; + const eventId = + sender.state.read instanceof EventSenderSuccess ? sender.state.read.eventId : undefined; - const n = this.items.filter( - (s) => !(s.state.read instanceof EventSenderSuccess && ids.has(s.state.read.eventId)) - ); - if (n.length === this.items.length) { + const received = events.some( + (event) => rUnsigned.transactionId(event.unsigned) === txnId || event.event_id === eventId + ); + + return !received; + }); + + if (waitingSenders.length === this.items.length) { return; } - this.senders.publish(this.publishKey, n); - } - - public getSentEventIds(): string[] { - return this.items - .map((s) => (s.state.read instanceof EventSenderSuccess ? s.state.read.eventId : undefined)) - .filter((eId) => typeof eId === 'string'); + this.senders.publish(this.publishKey, waitingSenders); } }