Skip to content

Commit 1f84835

Browse files
kalvinnchauam
andauthored
perf: preserve unchanged thread row identities (#171)
Signed-off-by: Kalvin Chau <[email protected]> Signed-off-by: am <6e30cd56c30e030cd31bb0939b94a7c257c9a09d5ba2d92cf2735da45629f248@buzz.block.builderlab.xyz> Co-authored-by: am <6e30cd56c30e030cd31bb0939b94a7c257c9a09d5ba2d92cf2735da45629f248@buzz.block.builderlab.xyz>
1 parent ee2051d commit 1f84835

8 files changed

Lines changed: 620 additions & 37 deletions

File tree

‎src/features/messages/MessageRow.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ export const MessageRow = memo(function MessageRow({
8282
agentPubkeys,
8383
}: MessageRowProps) {
8484
const resolveName = useIdentityNames(session?.names);
85-
const directory = useReferenceDirectory(session);
85+
const directory = useReferenceDirectory(session, participantProfiles);
8686
const threadUnread = useThreadUnread(
8787
row.replyCount > 0 && onOpenThread ? unread : undefined,
8888
row.channelId,

‎src/features/messages/ReferenceText.tsx‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,15 @@ const profilesSnapshot = () => emptyProfiles;
2323
const channelsSnapshot = () => undefined;
2424
const agentsSnapshot = () => undefined;
2525

26-
export function useReferenceDirectory(session: RelaySession | undefined) {
26+
export function useReferenceDirectory(
27+
session: RelaySession | undefined,
28+
selectedProfiles?: ReadonlyMap<string, Profile>,
29+
) {
2730
const profiles = useSyncExternalStore(
28-
session?.profiles?.subscribe ?? noop,
29-
session?.profiles?.snapshot ?? profilesSnapshot,
31+
selectedProfiles ? noop : (session?.profiles?.subscribe ?? noop),
32+
selectedProfiles
33+
? () => selectedProfiles
34+
: (session?.profiles?.snapshot ?? profilesSnapshot),
3035
profilesSnapshot,
3136
);
3237
const channels = useSyncExternalStore(
Lines changed: 165 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,165 @@
1+
// @vitest-environment jsdom
2+
import "@testing-library/jest-dom/vitest";
3+
import {
4+
act,
5+
cleanup,
6+
fireEvent,
7+
render,
8+
screen,
9+
waitFor,
10+
} from "@testing-library/react";
11+
import { StrictMode } from "react";
12+
import { afterAll, afterEach, expect, it, vi } from "vitest";
13+
import type { ChannelMessage } from "../relay/contracts";
14+
import { createRelaySession } from "../relay/session";
15+
import type { LiveCallbacks } from "../relay/live";
16+
import {
17+
keypair,
18+
message,
19+
profile,
20+
scriptedTransport,
21+
signed,
22+
} from "../relay/testing";
23+
import { ThreadPanel } from "./ThreadPanel";
24+
25+
const bodyRender = vi.fn();
26+
vi.mock("./MessageMarkdown", () => ({
27+
MessageMarkdown: ({ row }: { row: ChannelMessage }) => {
28+
bodyRender(row.content);
29+
return <span>{row.content}</span>;
30+
},
31+
}));
32+
vi.mock("./MessageComposer", () => ({ MessageComposer: () => null }));
33+
vi.mock("./MediaAttachment", () => ({
34+
MediaAttachment: ({ seekTo }: { seekTo?: number }) => (
35+
<span data-testid="video-seek">{seekTo ?? "none"}</span>
36+
),
37+
}));
38+
39+
class TestResizeObserver {
40+
observe() {}
41+
unobserve() {}
42+
disconnect() {}
43+
}
44+
vi.stubGlobal("ResizeObserver", TestResizeObserver);
45+
46+
afterAll(() => {
47+
vi.unstubAllGlobals();
48+
});
49+
afterEach(() => {
50+
cleanup();
51+
vi.clearAllMocks();
52+
});
53+
54+
it("retains mounted rows through a deferred real-session page and profile noise", async () => {
55+
const relay = keypair();
56+
const viewer = keypair();
57+
const aliceKey = keypair();
58+
const bobKey = keypair();
59+
const wire = scriptedTransport(viewer.pubkey, relay.pubkey);
60+
let traffic!: LiveCallbacks;
61+
const owner = createRelaySession({
62+
...wire.transport,
63+
subscribe(callbacks) {
64+
traffic = callbacks;
65+
return { update() {}, retry() {}, dispose() {} };
66+
},
67+
});
68+
const root = message(aliceKey, "a", "Root body", 1, [
69+
["imeta", "url https://example.com/video.mp4", "m video/mp4"],
70+
]);
71+
const reply = message(bobKey, "a", "⏱ 0:42 — Reply body", 2, [
72+
["e", root.id, "", "root"],
73+
["e", root.id, "", "reply"],
74+
]);
75+
traffic.receive([
76+
root,
77+
reply,
78+
profile(aliceKey, { name: "Alice" }),
79+
profile(bobKey, { name: "Bob" }),
80+
]);
81+
const session = owner.session;
82+
83+
render(
84+
<StrictMode>
85+
<ThreadPanel
86+
session={session}
87+
scope="identity-test"
88+
channelName="A"
89+
channelId="a"
90+
messageId={root.id}
91+
close={() => {}}
92+
onOpenLink={() => false}
93+
/>
94+
</StrictMode>,
95+
);
96+
97+
await waitFor(() =>
98+
expect(wire.pending.some((request) => !request.signal?.aborted)).toBe(true),
99+
);
100+
const initial = wire.pending.find((request) => !request.signal?.aborted);
101+
if (!initial) throw new Error("Initial thread page was not requested");
102+
initial.respond([root, reply]);
103+
expect(await screen.findByText("Alice")).toBeInTheDocument();
104+
expect(screen.getByText("Bob")).toBeInTheDocument();
105+
expect(await screen.findByText("Loading thread…")).toBeInTheDocument();
106+
await waitFor(() =>
107+
expect(
108+
wire.pending.filter(
109+
(request) => request !== initial && !request.signal?.aborted,
110+
),
111+
).toHaveLength(1),
112+
);
113+
const page = wire.pending.find(
114+
(request) => request !== initial && !request.signal?.aborted,
115+
);
116+
if (!page) throw new Error("Deferred thread page was not requested");
117+
bodyRender.mockClear();
118+
119+
// An unrelated signed profile preserves the selected map, but the shared
120+
// name service still invalidates every mounted row. Do not claim zero renders.
121+
await act(async () => {
122+
traffic.receive([profile(keypair(), { name: "Other" })]);
123+
});
124+
expect(bodyRender.mock.calls).toEqual([
125+
["Root body"],
126+
["Root body"],
127+
["Reply body"],
128+
["Reply body"],
129+
]);
130+
bodyRender.mockClear();
131+
132+
const appended = message(bobKey, "a", "Appended reply body", 3, [
133+
["e", root.id, "", "root"],
134+
["e", root.id, "", "reply"],
135+
]);
136+
await act(async () => page.respond([root, appended]));
137+
expect(await screen.findByText("Appended reply body")).toBeInTheDocument();
138+
expect(bodyRender.mock.calls).toEqual([
139+
["Appended reply body"],
140+
["Appended reply body"],
141+
]);
142+
bodyRender.mockClear();
143+
144+
fireEvent.click(screen.getByRole("button", { name: "0:42" }));
145+
expect(screen.getByTestId("video-seek")).toHaveTextContent("42");
146+
bodyRender.mockClear();
147+
148+
const edited = signed(bobKey, {
149+
kind: 40003,
150+
content: "Edited reply body",
151+
created_at: 4,
152+
tags: [["e", reply.id]],
153+
});
154+
traffic.receive([edited]);
155+
expect(await screen.findByText("Edited reply body")).toBeInTheDocument();
156+
expect(bodyRender).toHaveBeenCalledWith("Edited reply body");
157+
bodyRender.mockClear();
158+
159+
await act(async () => {
160+
traffic.receive([profile(bobKey, { name: "Robert" }, 1_700_000_001)]);
161+
});
162+
expect(await screen.findAllByText("Robert")).toHaveLength(2);
163+
expect(bodyRender).toHaveBeenCalled();
164+
owner.dispose();
165+
});

‎src/features/messages/ThreadPanel.tsx‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -268,6 +268,12 @@ function ThreadMessages({
268268
seconds: number;
269269
request: number;
270270
}>();
271+
const handleMediaTime = useCallback((seconds: number) => {
272+
setMediaSeek((current) => ({
273+
seconds,
274+
request: (current?.request ?? 0) + 1,
275+
}));
276+
}, []);
271277
const rootId = snapshot.root?.id;
272278
const openRootMedia = useCallback(
273279
(
@@ -438,15 +444,7 @@ function ThreadMessages({
438444
canOpenLink={canOpenLink}
439445
day={false}
440446
retry={session.messages.retry}
441-
{...(videoAttachment
442-
? {
443-
onMediaTime: (seconds: number) =>
444-
setMediaSeek((current) => ({
445-
seconds,
446-
request: (current?.request ?? 0) + 1,
447-
})),
448-
}
449-
: {})}
447+
{...(videoAttachment ? { onMediaTime: handleMediaTime } : {})}
450448
{...(onOpenMediaReview && rootId
451449
? { onOpenMediaReview: openRootMedia }
452450
: {})}

‎src/features/relay/react.ts‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,10 @@ export function useRowProfiles(
2828
queries: ProfileQueries,
2929
rows: readonly ChannelMessage[],
3030
) {
31+
const ids = [...new Set(rows.flatMap(rowProfileIds))].sort().join(":");
3132
const selection = useMemo(
32-
() => selectProfiles(queries, [...new Set(rows.flatMap(rowProfileIds))]),
33-
[queries, rows],
33+
() => selectProfiles(queries, ids ? ids.split(":") : []),
34+
[queries, ids],
3435
);
3536
return useSyncExternalStore(
3637
selection.subscribe,

‎src/features/relay/row-identity.ts‎

Lines changed: 79 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
1+
import type { ChannelMessage } from "./contracts";
2+
3+
function sameArray<T>(
4+
left: readonly T[] | undefined,
5+
right: readonly T[] | undefined,
6+
same: (a: T, b: T) => boolean = Object.is,
7+
) {
8+
return (
9+
left === right ||
10+
(!!left &&
11+
!!right &&
12+
left.length === right.length &&
13+
left.every((value, index) => same(value, right[index] as T)))
14+
);
15+
}
16+
17+
function sameRow(left: ChannelMessage, right: ChannelMessage) {
18+
return (
19+
left.id === right.id &&
20+
left.channelId === right.channelId &&
21+
left.delivery === right.delivery &&
22+
left.deliveryError === right.deliveryError &&
23+
left.authorId === right.authorId &&
24+
left.createdAt === right.createdAt &&
25+
left.content === right.content &&
26+
left.agentEnvelope === right.agentEnvelope &&
27+
left.membership?.type === right.membership?.type &&
28+
left.membership?.actor === right.membership?.actor &&
29+
left.membership?.target === right.membership?.target &&
30+
left.edited === right.edited &&
31+
left.attachmentContentRemoved === right.attachmentContentRemoved &&
32+
sameArray(left.mentions, right.mentions) &&
33+
sameArray(
34+
left.attachments,
35+
right.attachments,
36+
(a, b) =>
37+
a.url === b.url &&
38+
a.kind === b.kind &&
39+
a.mime === b.mime &&
40+
a.size === b.size &&
41+
a.name === b.name &&
42+
a.duration === b.duration &&
43+
a.dimensions?.width === b.dimensions?.width &&
44+
a.dimensions?.height === b.dimensions?.height &&
45+
a.blurhash === b.blurhash &&
46+
a.previewUrl === b.previewUrl,
47+
) &&
48+
sameArray(
49+
left.emoji,
50+
right.emoji,
51+
(a, b) => a.shortcode === b.shortcode && a.url === b.url,
52+
) &&
53+
sameArray(
54+
left.reactions,
55+
right.reactions,
56+
(a, b) =>
57+
a.content === b.content &&
58+
a.emoji?.shortcode === b.emoji?.shortcode &&
59+
a.emoji?.url === b.emoji?.url,
60+
) &&
61+
left.threadRootId === right.threadRootId &&
62+
left.replyCount === right.replyCount &&
63+
sameArray(left.participants, right.participants)
64+
);
65+
}
66+
67+
/** Reuse immutable rows whose complete folded value is unchanged. */
68+
export function shareMessageRows(
69+
previous: readonly ChannelMessage[],
70+
next: readonly ChannelMessage[],
71+
) {
72+
if (!previous.length) return next;
73+
const byId = new Map(previous.map((row) => [row.id, row]));
74+
const shared = next.map((row) => {
75+
const existing = byId.get(row.id);
76+
return existing && sameRow(existing, row) ? existing : row;
77+
});
78+
return sameArray(previous, shared) ? previous : shared;
79+
}

0 commit comments

Comments
 (0)