Compare commits

...
Sign in to create a new pull request.

1 commit

Author SHA1 Message Date
nick-delirium
4b68e79ab4
ui: support filekey for mob preloading 2025-01-28 16:11:24 +01:00
6 changed files with 16 additions and 9 deletions

View file

@ -88,7 +88,7 @@ function WebPlayer(props: any) {
); );
if (usePrefetched) { if (usePrefetched) {
if (mobData?.data) { if (mobData?.data) {
WebPlayerInst.preloadFirstFile(mobData?.data); WebPlayerInst.preloadFirstFile(mobData?.data, mobData?.fileKey);
} }
} }
setContextValue({ player: WebPlayerInst, store: PlayerStore }); setContextValue({ player: WebPlayerInst, store: PlayerStore });

View file

@ -137,7 +137,7 @@ export default class SessionStore {
previousId = ''; previousId = '';
nextId = ''; nextId = '';
userTimezone = ''; userTimezone = '';
prefetchedMobUrls: Record<string, { data: Uint8Array; entryNum: number }> = {}; prefetchedMobUrls: Record<string, { data: Uint8Array; entryNum: number, fileKey?: string }> = {};
prefetched: boolean = false; prefetched: boolean = false;
fetchFailed: boolean = false; fetchFailed: boolean = false;
loadingLiveSessions: boolean = false; loadingLiveSessions: boolean = false;
@ -161,11 +161,11 @@ export default class SessionStore {
} }
getFirstMob = async (sessionId: string) => { getFirstMob = async (sessionId: string) => {
const { domURL } = await sessionService.getFirstMobUrl(sessionId); const { domURL, fileKey } = await sessionService.getFirstMobUrl(sessionId);
await loadFile(domURL[0], (data) => this.setPrefetchedMobUrl(sessionId, data)); await loadFile(domURL[0], (data) => this.setPrefetchedMobUrl(sessionId, data, fileKey));
} }
setPrefetchedMobUrl = (sessionId: string, fileData: Uint8Array) => { setPrefetchedMobUrl = (sessionId: string, fileData: Uint8Array, fileKey?: string) => {
const keys = Object.keys(this.prefetchedMobUrls); const keys = Object.keys(this.prefetchedMobUrls);
const toLimit = 10 - keys.length; const toLimit = 10 - keys.length;
if (toLimit < 0) { if (toLimit < 0) {
@ -181,6 +181,7 @@ export default class SessionStore {
: 0; : 0;
this.prefetchedMobUrls[sessionId] = { this.prefetchedMobUrls[sessionId] = {
data: fileData, data: fileData,
fileKey,
entryNum: nextEntryNum, entryNum: nextEntryNum,
}; };
} }

View file

@ -34,6 +34,9 @@ const unpack = (b: Uint8Array): Uint8Array => {
); );
data = uData; data = uData;
} }
if (!isGzip && !isZstd) {
console.debug('No unpacking needed', Math.floor(b.byteLength / 1024) + 'kb');
}
return data; return data;
}; };

View file

@ -214,7 +214,10 @@ export default class MessageLoader {
} }
preloaded = false; preloaded = false;
async preloadFirstFile(data: Uint8Array) { async preloadFirstFile(data: Uint8Array, fileKey?: string) {
if (fileKey) {
this.session.fileKey = fileKey;
}
this.mobParser = this.createNewParser(true, this.processMessages, 'p:dom'); this.mobParser = this.createNewParser(true, this.processMessages, 'p:dom');
try { try {

View file

@ -86,8 +86,8 @@ export default class WebPlayer extends Player {
window.playerJumpToTime = this.jump.bind(this) window.playerJumpToTime = this.jump.bind(this)
} }
preloadFirstFile(data: Uint8Array) { preloadFirstFile(data: Uint8Array, fileKey?: string) {
void this.messageLoader.preloadFirstFile(data) void this.messageLoader.preloadFirstFile(data, fileKey)
} }
reinit(session: SessionFilesInfo) { reinit(session: SessionFilesInfo) {

View file

@ -46,7 +46,7 @@ export default class SettingsService {
.catch((e) => Promise.reject(e)); .catch((e) => Promise.reject(e));
} }
getFirstMobUrl(sessionId: string): Promise<{ domURL: string[] }> { getFirstMobUrl(sessionId: string): Promise<{ domURL: string[], fileKey?: string }> {
return this.client return this.client
.get(`/sessions/${sessionId}/first-mob`) .get(`/sessions/${sessionId}/first-mob`)
.then((r) => r.json()) .then((r) => r.json())