refactor: use proxies to fake global objects

package.json

@@ -107,7 +107,6 @@
     "less-loader": "^12.1.0",
     "lint-staged": "^15.2.0",
     "mini-css-extract-plugin": "^2.7.7",
-    "mockdate": "^3.0.5",
     "null-loader": "^4.0.1",
     "patch-package": "^8.0.0",
     "postcss": "^8.4.33",

packages/keybr-database/lib/model.test.ts

@@ -1,7 +1,7 @@
 import { newKnex } from "@keybr/config";
 import { PublicId } from "@keybr/publicid";
+import { fake } from "@keybr/test-env-time";
 import test from "ava";
-import MockDate from "mockdate";
 import { ValidationError } from "objection";
 import { User, UserExternalId, UserLoginRequest } from "./model.ts";
 import { createSchema } from "./schema.ts";
@@ -17,11 +17,11 @@ test.beforeEach(async () => {
 });
 
 test.beforeEach(() => {
-  MockDate.set(now);
+  fake.date.set(now);
 });
 
 test.afterEach(() => {
-  MockDate.reset();
+  fake.date.reset();
 });
 
 test("validate models", (t) => {

packages/keybr-database/package.json

@@ -12,7 +12,9 @@
     "@keybr/publicid": "*",
     "@keybr/rand": "*"
   },
-  "devDependencies": {},
+  "devDependencies": {
+    "@keybr/test-env-time": "*"
+  },
   "scripts": {
     "clean": "rm -fr .types",
     "compile": "tsc",

packages/keybr-highscores/lib/factory.test.ts

@@ -1,9 +1,9 @@
 import { DataDir } from "@keybr/config";
 import { Layout } from "@keybr/keyboard";
 import { ResultFaker } from "@keybr/result";
+import { fake } from "@keybr/test-env-time";
 import { removeDir } from "@sosimple/fsx";
 import test from "ava";
-import MockDate from "mockdate";
 import { HighScoresFactory } from "./factory.ts";
 import { type HighScoresRow } from "./highscores.ts";
 
@@ -16,11 +16,11 @@ test.beforeEach(async () => {
 });
 
 test.beforeEach(() => {
-  MockDate.set(now);
+  fake.date.set(now);
 });
 
 test.afterEach(() => {
-  MockDate.reset();
+  fake.date.reset();
 });
 
 test.afterEach(async () => {

packages/keybr-highscores/lib/highscores.test.ts

@@ -1,6 +1,6 @@
 import { Layout } from "@keybr/keyboard";
+import { fake } from "@keybr/test-env-time";
 import test from "ava";
-import MockDate from "mockdate";
 import { HighScores, type HighScoresRow } from "./highscores.ts";
 
 const now = new Date("2001-02-03T04:05:06Z");
@@ -18,11 +18,11 @@ const template: HighScoresRow = {
 };
 
 test.beforeEach(() => {
-  MockDate.set(now);
+  fake.date.set(now);
 });
 
 test.afterEach(() => {
-  MockDate.reset();
+  fake.date.reset();
 });
 
 test("do not insert if result is old", (t) => {

packages/keybr-highscores/package.json

@@ -9,7 +9,9 @@
     "@keybr/keyboard": "*",
     "@keybr/result": "*"
   },
-  "devDependencies": {},
+  "devDependencies": {
+    "@keybr/test-env-time": "*"
+  },
   "scripts": {
     "clean": "rm -fr .types",
     "compile": "tsc",

packages/keybr-multiplayer-server/lib/room.test.ts

@@ -12,12 +12,8 @@ import {
   type PlayerState,
 } from "@keybr/multiplayer-shared";
 import { type AnonymousUser } from "@keybr/pages-shared";
+import { fake } from "@keybr/test-env-time";
 import { Timer } from "@keybr/timer";
-import {
-  resetFakeTimers,
-  runTimers,
-  setFakeTimers,
-} from "@keybr/timer/lib/fake.ts";
 import test from "ava";
 import { Game } from "./game.ts";
 import { Player } from "./player.ts";
@@ -26,12 +22,12 @@ import { Services } from "./services.ts";
 import { FakeSession } from "./testing/fake-session.ts";
 
 test.beforeEach(() => {
-  setFakeTimers();
+  fake.timers.set();
   Timer.now = () => 0;
 });
 
 test.afterEach(() => {
-  resetFakeTimers();
+  fake.timers.reset();
   Timer.now = () => 0;
 });
 
@@ -48,13 +44,13 @@ test.serial("join and start", async (t) => {
 
   player0.join(room);
   player0.onMessage({ type: PLAYER_ANNOUNCE_ID, signature: 0xdeadbabe });
-  await runTimers();
+  await fake.timers.run();
   t.is(player0.room, room);
   t.is(player1.room, null);
 
   player1.join(room);
   player1.onMessage({ type: PLAYER_ANNOUNCE_ID, signature: 0xdeadbabe });
-  await runTimers();
+  await fake.timers.run();
   t.is(player0.room, room);
   t.is(player1.room, room);
 
@@ -301,31 +297,31 @@ test.serial("join and leave", async (t) => {
 
   // Player 0 joins room 0.
   player0.join(room0);
-  await runTimers();
+  await fake.timers.run();
   t.is(player0.room, room0);
   t.is(player1.room, null);
 
   // Repeat again.
   player0.join(room0);
-  await runTimers();
+  await fake.timers.run();
   t.is(player0.room, room0);
   t.is(player1.room, null);
 
   // Player 1 joins room 0.
   room0.join(player1);
-  await runTimers();
+  await fake.timers.run();
   t.is(player0.room, room0);
   t.is(player1.room, room0);
 
   // Repeat again.
   room0.join(player1);
-  await runTimers();
+  await fake.timers.run();
   t.is(player0.room, room0);
   t.is(player1.room, room0);
 
   // Joint another room.
   room1.join(player1);
-  await runTimers();
+  await fake.timers.run();
   t.is(player0.room, room0);
   t.is(player1.room, room1);
 

packages/keybr-multiplayer-server/package.json

@@ -11,7 +11,9 @@
     "@keybr/textinput": "*",
     "@keybr/timer": "*"
   },
-  "devDependencies": {},
+  "devDependencies": {
+    "@keybr/test-env-time": "*"
+  },
   "scripts": {
     "clean": "rm -fr .types",
     "compile": "tsc",

packages/keybr-multiplayer-ui/package.json

@@ -13,7 +13,6 @@
     "@keybr/textinput": "*",
     "@keybr/textinput-events": "*",
     "@keybr/textinput-ui": "*",
-    "@keybr/timer": "*",
     "@keybr/widget": "*"
   },
   "devDependencies": {},

packages/keybr-oauth/lib/token.test.ts

@@ -1,17 +1,13 @@
+import { fake } from "@keybr/test-env-time";
 import test from "ava";
-import MockDate from "mockdate";
 import { AccessToken } from "./token.ts";
 
-test.beforeEach(() => {
-  MockDate.reset();
-});
-
 test.afterEach(() => {
-  MockDate.reset();
+  fake.date.reset();
 });
 
 test("construct token from response", (t) => {
-  MockDate.set(new Date("2001-02-03T04:05:06Z"));
+  fake.date.set(new Date("2001-02-03T04:05:06Z"));
 
   const token = new AccessToken({
     access_token: "token",
@@ -31,7 +27,7 @@ test("construct token from response", (t) => {
 });
 
 test("check expired", (t) => {
-  MockDate.set(new Date("2001-01-01T00:00:00Z"));
+  fake.date.set(new Date("2001-01-01T00:00:00Z"));
 
   const token = new AccessToken({
     access_token: "token",
@@ -41,19 +37,19 @@ test("check expired", (t) => {
 
   t.false(token.expired());
 
-  MockDate.set(new Date("2001-01-01T00:58:59Z"));
+  fake.date.set(new Date("2001-01-01T00:58:59Z"));
 
   t.false(token.expired());
   t.false(token.expired(60));
   t.false(token.expired(0));
 
-  MockDate.set(new Date("2001-01-01T00:59:00Z"));
+  fake.date.set(new Date("2001-01-01T00:59:00Z"));
 
   t.true(token.expired());
   t.true(token.expired(60));
   t.false(token.expired(0));
 
-  MockDate.set(new Date("2001-01-01T01:00:00Z"));
+  fake.date.set(new Date("2001-01-01T01:00:00Z"));
 
   t.true(token.expired());
   t.true(token.expired(0));

packages/keybr-oauth/package.json

@@ -5,7 +5,9 @@
   "main": "lib/index.ts",
   "types": ".types/index.d.ts",
   "dependencies": {},
-  "devDependencies": {},
+  "devDependencies": {
+    "@keybr/test-env-time": "*"
+  },
   "scripts": {
     "clean": "rm -fr .types",
     "compile": "tsc",