Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions packages/core/src/utils/time.ts
Original file line number Diff line number Diff line change
Expand Up @@ -125,9 +125,9 @@ function getBrowserTimeOrigin(): number | undefined {
return navigationStart;
}

// TODO: We should probably fall back to Date.now() - performance.now(), since this is still more accurate than just Date.now() (?)
// Either both timeOrigin and navigationStart are skewed or neither is available, fallback to Date.
return dateNow;
// Either both timeOrigin and navigationStart are skewed or neither is available, fallback to subtracting
// `performance.now()` from `Date.now()`.
return dateNow - performanceNow;
}

/**
Expand Down
28 changes: 25 additions & 3 deletions packages/core/test/lib/utils/time.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,12 @@ describe('browserPerformanceTimeOrigin', () => {
vi.unstubAllGlobals();
});

it('returns `Date.now()` if `performance.timeOrigin` is not reliable', async () => {
it('returns `Date.now() - performance.now()` if `performance.timeOrigin` is not reliable', async () => {
const currentTimeMs = 1767778040866;

const unreliableTime = currentTimeMs - RELIABLE_THRESHOLD_MS - 2_000;

const timeSincePageloadMs = 1_234.789;
const timeSincePageloadMs = 1_234.56789;

vi.useFakeTimers();
vi.setSystemTime(new Date(currentTimeMs));
Expand All @@ -46,7 +46,29 @@ describe('browserPerformanceTimeOrigin', () => {
});

const timeOrigin = await getFreshPerformanceTimeOrigin();
expect(timeOrigin).toBe(1767778040866);
expect(timeOrigin).toBe(currentTimeMs - timeSincePageloadMs);

vi.useRealTimers();
vi.unstubAllGlobals();
});

it('returns `Date.now() - performance.now()` if neither `performance.timeOrigin` nor `performance.timing.navigationStart` are available', async () => {
const currentTimeMs = 1767778040866;

const timeSincePageloadMs = 1_234.56789;

vi.useFakeTimers();
vi.setSystemTime(new Date(currentTimeMs));
vi.stubGlobal('performance', {
timeOrigin: undefined,
timing: {
navigationStart: undefined,
},
now: () => timeSincePageloadMs,
});

const timeOrigin = await getFreshPerformanceTimeOrigin();
expect(timeOrigin).toBe(currentTimeMs - timeSincePageloadMs);

vi.useRealTimers();
vi.unstubAllGlobals();
Expand Down
Loading