Skip to content

Fix that addAction wouldn't have any effect without a stop and start #1001

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

Merged
merged 3 commits into from
Sep 22, 2022
Merged

Fix that addAction wouldn't have any effect without a stop and start #1001

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4801f21
Fix that `addAction` wouldn't have any effect without a stop and star…
eoghanmurray Sep 15, 2022
9c570b6
Remove `addActions` as it has a bug-causing replacement of `this.acti…
eoghanmurray Sep 16, 2022
6b41521
Apply formatting changes
eoghanmurray Sep 22, 2022
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
4 changes: 1 addition & 3 deletions packages/rrweb/src/replay/machine.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,6 @@ export function createPlayerService(
}

const syncEvents = new Array<eventWithTime>();
const actions = new Array<actionWithDelay>();
for (const event of neededEvents) {
if (
lastPlayedTimestamp &&
Expand All @@ -202,7 +201,7 @@ export function createPlayerService(
syncEvents.push(event);
} else {
const castFn = getCastFn(event, false);
actions.push({
timer.addAction({
doAction: () => {
castFn();
},
Copy link
Contributor Author

@eoghanmurray eoghanmurray Sep 16, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

addAction directly here should be fine (before we apply syncEvents) because the timer hasn't started yet

Expand All @@ -212,7 +211,6 @@ export function createPlayerService(
}
applyEventsSynchronously(syncEvents);
emitter.emit(ReplayerEvents.Flush);
timer.addActions(actions);
timer.start();
},
pause(ctx) {
Expand Down
26 changes: 14 additions & 12 deletions packages/rrweb/src/replay/timer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,38 +25,40 @@ export class Timer {
this.liveMode = config.liveMode;
}
/**
* Add an action after the timer starts.
* Add an action, possibly after the timer starts.
*/
public addAction(action: actionWithDelay) {
if (
!this.actions.length ||
this.actions[this.actions.length - 1].delay <= action.delay
) {
// 'fast track'
this.actions.push(action);
return;
}
// binary search - events can arrive out of order in a realtime context
const index = this.findActionIndex(action);
this.actions.splice(index, 0, action);
}
/**
* Add all actions before the timer starts
*/
public addActions(actions: actionWithDelay[]) {
this.actions = this.actions.concat(actions);
}

public start() {
this.timeOffset = 0;
let lastTimestamp = performance.now();
const { actions } = this;
const check = () => {
const time = performance.now();
this.timeOffset += (time - lastTimestamp) * this.speed;
lastTimestamp = time;
while (actions.length) {
const action = actions[0];
while (this.actions.length) {
const action = this.actions[0];

if (this.timeOffset >= action.delay) {
actions.shift();
this.actions.shift();
action.doAction();
} else {
break;
}
}
if (actions.length > 0 || this.liveMode) {
if (this.actions.length > 0 || this.liveMode) {
this.raf = requestAnimationFrame(check);
}
};
Expand Down