refactor: remove hasTimeorigin

Author: John Doe

packages/utils/src/lib/clock-epoch.ts

@@ -5,13 +5,6 @@ export type Microseconds = number;
 export type Milliseconds = number;
 export type EpochMilliseconds = number;
 
-const hasPerf = (): boolean =>
-  typeof performance !== 'undefined' && typeof performance.now === 'function';
-const hasTimeOrigin = (): boolean =>
-  hasPerf() &&
-  typeof (performance as { timeOrigin: number | undefined }).timeOrigin ===
-    'number';
-
 const msToUs = (ms: number): Microseconds => Math.round(ms * 1000);
 const usToUs = (us: number): Microseconds => Math.round(us);
 
@@ -26,11 +19,6 @@ export type EpochClockOptions = {
   tid?: number;
 };
 
-type MaybePerformance = typeof performance & {
-  timeOrigin?: number;
-  now?: number;
-};
-
 /**
  * Creates epoch-based clock utility.
  * Epoch time has been the time since January 1, 1970 (UNIX epoch).
@@ -41,27 +29,17 @@ export function epochClock(init: EpochClockOptions = {}) {
   const pid = init.pid ?? process.pid;
   const tid = init.tid ?? threadId;
 
-  const timeOriginMs = hasTimeOrigin()
-    ? (performance as MaybePerformance).timeOrigin
-    : Date.now();
+  const timeOriginMs = performance.timeOrigin;
 
-  const epochNowUs = (): Microseconds => {
-    if (hasTimeOrigin()) {
-      return msToUs(timeOriginMs + performance.now());
-    }
-    return msToUs(Date.now());
-  };
+  const epochNowUs = (): Microseconds =>
+    msToUs(timeOriginMs + performance.now());
 
   const fromEpochUs = usToUs;
 
   const fromEpochMs = msToUs;
 
-  const fromPerfMs = (perfMs: Milliseconds): Microseconds => {
-    if (hasTimeOrigin()) {
-      return msToUs(timeOriginMs + perfMs);
-    }
-    return epochNowUs() - msToUs(performance.now() - perfMs);
-  };
+  const fromPerfMs = (perfMs: Milliseconds): Microseconds =>
+    msToUs(timeOriginMs + perfMs);
 
   const fromEntryStartTimeMs = fromPerfMs;
   const fromDateNowMs = fromEpochMs;
@@ -71,7 +49,6 @@ export function epochClock(init: EpochClockOptions = {}) {
     pid,
     tid,
 
-    hasTimeOrigin,
     epochNowUs,
     msToUs,
     usToUs,

packages/utils/src/lib/clock-epoch.unit.test.ts

@@ -36,46 +36,12 @@ describe('epochClock', () => {
     );
   });
 
-  it('should return undefined if performance.timeOrigin is NOT present', () => {
-    vi.stubGlobal('performance', {
-      ...performance,
-      timeOrigin: undefined,
-    });
-    const c = epochClock();
-    expect(c.hasTimeOrigin()).toBe(false);
-  });
-
-  it('should return timeorigin if performance.timeOrigin is present', () => {
-    const c = epochClock();
-    expect(c.hasTimeOrigin()).toBe(true);
-  });
-
   it('should support performance clock by default for epochNowUs', () => {
     const c = epochClock();
     expect(c.timeOriginMs).toBe(500_000);
     expect(c.epochNowUs()).toBe(1_000_000_000); // timeOrigin + (Date.now() - timeOrigin) = Date.now()
   });
 
-  it('should fallback to Date clock by if performance clock is not given in epochNowUs', () => {
-    vi.stubGlobal('performance', {
-      ...performance,
-      timeOrigin: undefined,
-    });
-    const c = epochClock();
-    expect(c.timeOriginMs).toBe(1_000_000);
-    expect(c.epochNowUs()).toBe(1_000_000_000); // Date.now() * 1000 when performance unavailable
-  });
-
-  it('should fallback to Date clock by if performance clock is NOT given', () => {
-    vi.stubGlobal('performance', {
-      ...performance,
-      timeOrigin: undefined,
-    });
-    const c = epochClock();
-    expect(c.timeOriginMs).toBe(1_000_000);
-    expect(c.fromPerfMs(100)).toBe(500_100_000); // epochNowUs() - msToUs(performance.now() - perfMs)
-  });
-
   it.each([
     [1_000_000_000, 1_000_000_000],
     [1_001_000_000, 1_001_000_000],

testing/test-setup/src/lib/process.setup-file.ts

@@ -1,13 +1,22 @@
 import process from 'node:process';
+import { threadId } from 'node:worker_threads';
 import { afterEach, beforeEach, vi } from 'vitest';
 
 export const MOCK_PID = 10_001;
+export const MOCK_TID = 1;
+
+// Mock immediately when the setup file loads for default exports using process.pid or threadId
+const processMock = vi.spyOn(process, 'pid', 'get').mockReturnValue(MOCK_PID);
+const threadIdMock = vi
+  .spyOn({ threadId }, 'threadId', 'get')
+  .mockReturnValue(MOCK_TID);
 
-const processMock = vi.spyOn(process, 'pid', 'get');
 beforeEach(() => {
   processMock.mockReturnValue(MOCK_PID);
+  threadIdMock.mockReturnValue(MOCK_TID);
 });
 
 afterEach(() => {
   processMock.mockClear();
+  threadIdMock.mockClear();
 });