Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

avoid cached scrollbacks if stream contains a renderable event #1292

Merged
merged 2 commits into from
Oct 18, 2024
Merged

avoid cached scrollbacks if stream contains a renderable event #1292

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d9bffef
avoid cached scrollbacks if stream contains a renderable event
erikolsson Oct 18, 2024
a1ddc74
only check channel streams
erikolsson Oct 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 43 additions & 6 deletions packages/sdk/src/syncedStream.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { StreamEvents } from './streamEvents'
import { isChannelStreamId, isDMChannelStreamId, isGDMChannelStreamId } from './id'
import { ISyncedStream } from './syncedStreamsLoop'

const CACHED_SCROLLBACK_COUNT = 3
const MAX_CACHED_SCROLLBACK_COUNT = 3
export class SyncedStream extends Stream implements ISyncedStream {
log: DLogger
isUpToDate = false
Expand Down Expand Up @@ -46,10 +46,18 @@ export class SyncedStream extends Stream implements ISyncedStream {
return false
}

const prependedMiniblocks = await this.cachedScrollback(
miniblocks[0].header.prevSnapshotMiniblockNum,
miniblocks[0].header.miniblockNum,
)
const isChannelStream =
isChannelStreamId(this.streamId) ||
isDMChannelStreamId(this.streamId) ||
isGDMChannelStreamId(this.streamId)
const prependedMiniblocks = isChannelStream
? hasTopLevelRenderableEvent(miniblocks)
? []
: await this.cachedScrollback(
miniblocks[0].header.prevSnapshotMiniblockNum,
miniblocks[0].header.miniblockNum,
)
: []

const snapshotEventIds = eventIdsFromSnapshot(snapshot)
const eventIds = miniblocks.flatMap((mb) => mb.events.map((e) => e.hashStr))
Expand Down Expand Up @@ -210,7 +218,7 @@ export class SyncedStream extends Stream implements ISyncedStream {
return []
}
let miniblocks: ParsedMiniblock[] = []
for (let i = 0; i < CACHED_SCROLLBACK_COUNT; i++) {
for (let i = 0; i < MAX_CACHED_SCROLLBACK_COUNT; i++) {
if (toExclusive <= 0n) {
break
}
Expand All @@ -223,6 +231,9 @@ export class SyncedStream extends Stream implements ISyncedStream {
miniblocks = [...result, ...miniblocks]
fromInclusive = result[0].header.prevSnapshotMiniblockNum
toExclusive = result[0].header.miniblockNum
if (hasTopLevelRenderableEvent(miniblocks)) {
break
}
} else {
break
}
Expand Down Expand Up @@ -261,3 +272,29 @@ function eventIdsFromSnapshot(snapshot: Snapshot): string[] {
return [...usernameEventIds, ...displayNameEventIds]
}
}

function hasTopLevelRenderableEvent(miniblocks: ParsedMiniblock[]): boolean {
for (const mb of miniblocks) {
if (topLevelRenderableEventInMiniblock(mb)) {
return true
}
}
return false
}

function topLevelRenderableEventInMiniblock(miniblock: ParsedMiniblock): boolean {
for (const e of miniblock.events) {
switch (e.event.payload.case) {
case 'channelPayload':
case 'gdmChannelPayload':
case 'dmChannelPayload':
switch (e.event.payload.value.content.case) {
case 'message':
if (!e.event.payload.value.content.value.refEventId) {
return true
}
}
}
}
return false
}
Loading