@fluidframework/test-utils 2.0.0-dev.2.3.0.115467 → 2.0.0-dev.4.1.0.148229

package/src/timeoutUtils.ts

@@ -3,61 +3,211 @@
  * Licensed under the MIT License.
  */
 
-import { Container } from "@fluidframework/container-loader";
+import { assert, Deferred } from "@fluidframework/common-utils";
 
+// @deprecated this value is no longer used
 export const defaultTimeoutDurationMs = 250;
 
+// TestTimeout class manage tracking of test timeout. It create a timer when timeout is in effect,
+// and provide a promise that will be reject before the test timeout happen with a `timeBuffer` of 15 ms.
+// Once rejected, a new TestTimeout object will be create for the timeout.
+
+const timeBuffer = 15; // leave 15 ms leeway for finish processing
+
+class TestTimeout {
+	private timeout: number = 0;
+	private timer: NodeJS.Timeout | undefined;
+	private readonly deferred: Deferred<void>;
+	private rejected = false;
+
+	private static instance: TestTimeout = new TestTimeout();
+	public static reset(runnable: Mocha.Runnable) {
+		TestTimeout.clear();
+		TestTimeout.instance.resetTimer(runnable);
+	}
+
+	public static clear() {
+		if (TestTimeout.instance.rejected) {
+			TestTimeout.instance = new TestTimeout();
+		} else {
+			TestTimeout.instance.clearTimer();
+		}
+	}
+
+	public static getInstance() {
+		return TestTimeout.instance;
+	}
+
+	public async getPromise() {
+		return this.deferred.promise;
+	}
+
+	public getTimeout() {
+		return this.timeout;
+	}
+
+	private constructor() {
+		this.deferred = new Deferred();
+		// Ignore rejection for timeout promise if no one is waiting for it.
+		this.deferred.promise.catch(() => {});
+	}
+
+	private resetTimer(runnable: Mocha.Runnable) {
+		assert(!this.timer, "clearTimer should have been called before reset");
+		assert(!this.deferred.isCompleted, "can't reset a completed TestTimeout");
+
+		// Check the test timeout setting
+		const timeout = runnable.timeout();
+		if (!(Number.isFinite(timeout) && timeout > 0)) {
+			return;
+		}
+
+		// subtract a buffer
+		this.timeout = Math.max(timeout - timeBuffer, 1);
+
+		// Set up timer to reject near the test timeout.
+		this.timer = setTimeout(() => {
+			this.deferred.reject(this);
+			this.rejected = true;
+		}, this.timeout);
+	}
+	private clearTimer() {
+		if (this.timer) {
+			clearTimeout(this.timer);
+			this.timer = undefined;
+		}
+	}
+}
+
+// only register if we are running with mocha-test-setup loaded
+if (globalThis.getMochaModule !== undefined) {
+	// patching resetTimeout and clearTimeout on the runnable object
+	// so we can track when test timeout are enforced
+	const mochaModule = globalThis.getMochaModule() as typeof Mocha;
+	const runnablePrototype = mochaModule.Runnable.prototype;
+	// eslint-disable-next-line @typescript-eslint/unbound-method
+	const oldResetTimeoutFunc = runnablePrototype.resetTimeout;
+	runnablePrototype.resetTimeout = function (this: Mocha.Runnable) {
+		oldResetTimeoutFunc.call(this);
+		TestTimeout.reset(this);
+	};
+	// eslint-disable-next-line @typescript-eslint/unbound-method
+	const oldClearTimeoutFunc = runnablePrototype.clearTimeout;
+	runnablePrototype.clearTimeout = function (this: Mocha.Runnable) {
+		TestTimeout.clear();
+		oldClearTimeoutFunc.call(this);
+	};
+}
+
 export interface TimeoutWithError {
-    durationMs?: number;
-    reject?: true;
-    errorMsg?: string;
+	/**
+	 * Timeout duration in milliseconds, if it is great than 0 and not Infinity
+	 * If it is undefined, then it will use test timeout if we are in side the test function
+	 * Otherwise, there is no timeout
+	 */
+	durationMs?: number;
+	reject?: true;
+	errorMsg?: string;
 }
 export interface TimeoutWithValue<T = void> {
-    durationMs?: number;
-    reject: false;
-    value: T;
+	/**
+	 * Timeout duration in milliseconds, if it is great than 0 and not Infinity
+	 * If it is undefined, then it will use test timeout if we are in side the test function
+	 * Otherwise, there is no timeout
+	 */
+	durationMs?: number;
+	reject: false;
+	value: T;
 }
 
+export type PromiseExecutor<T = void> = (
+	resolve: (value: T | PromiseLike<T>) => void,
+	reject: (reason?: any) => void,
+) => void;
+
 export async function timeoutAwait<T = void>(
-    promise: PromiseLike<T>,
-    timeoutOptions: TimeoutWithError | TimeoutWithValue<T> = {},
+	promise: PromiseLike<T>,
+	timeoutOptions: TimeoutWithError | TimeoutWithValue<T> = {},
 ) {
-    return Promise.race([promise, timeoutPromise<T>(() => { }, timeoutOptions)]);
+	return Promise.race([promise, timeoutPromise<T>(() => {}, timeoutOptions)]);
 }
 
-export async function ensureContainerConnected(container: Container): Promise<void> {
-    if (!container.connected) {
-        return timeoutPromise((resolve) => container.once("connected", () => resolve()));
-    }
+// Create a promise based on the timeout options
+async function getTimeoutPromise<T = void>(
+	executor: (
+		resolve: (value: T | PromiseLike<T>) => void,
+		reject: (reason?: any) => void,
+	) => void,
+	timeoutOptions: TimeoutWithError | TimeoutWithValue<T>,
+	err: Error | undefined,
+) {
+	const timeout = timeoutOptions.durationMs ?? 0;
+	if (timeout <= 0 || !Number.isFinite(timeout)) {
+		return new Promise(executor);
+	}
+
+	return new Promise<T>((resolve, reject) => {
+		const timeoutRejections = () => {
+			// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+			const errorObject = err!;
+			errorObject.message = `${errorObject.message} (${timeout}ms)`;
+			reject(err);
+		};
+		const timer = setTimeout(
+			() =>
+				timeoutOptions.reject === false
+					? resolve(timeoutOptions.value)
+					: timeoutRejections(),
+			timeout,
+		);
+
+		executor(
+			(value) => {
+				clearTimeout(timer);
+				resolve(value);
+			},
+			(reason) => {
+				clearTimeout(timer);
+				reject(reason);
+			},
+		);
+	});
 }
 
+// Create a promise based on test timeout and the timeout options
 export async function timeoutPromise<T = void>(
-    executor: (resolve: (value: T | PromiseLike<T>) => void, reject: (reason?: any) => void) => void,
-    timeoutOptions: TimeoutWithError | TimeoutWithValue<T> = {},
+	executor: (
+		resolve: (value: T | PromiseLike<T>) => void,
+		reject: (reason?: any) => void,
+	) => void,
+	timeoutOptions: TimeoutWithError | TimeoutWithValue<T> = {},
 ): Promise<T> {
-    const timeout =
-        timeoutOptions.durationMs !== undefined
-        && Number.isFinite(timeoutOptions.durationMs)
-        && timeoutOptions.durationMs > 0
-            ? timeoutOptions.durationMs : defaultTimeoutDurationMs;
-    // create the timeout error outside the async task, so its callstack includes
-    // the original call site, this makes it easier to debug
-    const err = timeoutOptions.reject === false
-        ? undefined
-        : new Error(`${timeoutOptions.errorMsg ?? "Timed out"}(${timeout}ms)`);
-    return new Promise<T>((resolve, reject) => {
-        const timer = setTimeout(
-            () => timeoutOptions.reject === false ? resolve(timeoutOptions.value) : reject(err),
-            timeout);
-
-        executor(
-            (value) => {
-                clearTimeout(timer);
-                resolve(value);
-            },
-            (reason) => {
-                clearTimeout(timer);
-                reject(reason);
-            });
-    });
+	// create the timeout error outside the async task, so its callstack includes
+	// the original call site, this makes it easier to debug
+	const err =
+		timeoutOptions.reject === false
+			? undefined
+			: new Error(timeoutOptions.errorMsg ?? "Timed out");
+	const executorPromise = getTimeoutPromise(executor, timeoutOptions, err);
+
+	const currentTestTimeout = TestTimeout.getInstance();
+	if (currentTestTimeout === undefined) {
+		return executorPromise;
+	}
+
+	return Promise.race([executorPromise, currentTestTimeout.getPromise()]).catch((e) => {
+		if (e === currentTestTimeout) {
+			if (timeoutOptions.reject !== false) {
+				// If the rejection is because of the timeout then
+				// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+				const errorObject = err!;
+				errorObject.message = `${
+					timeoutOptions.errorMsg ?? "Test timed out"
+				} (${currentTestTimeout.getTimeout()}ms)`;
+				throw errorObject;
+			}
+			return timeoutOptions.value;
+		}
+		throw e;
+	}) as Promise<T>;
 }

package/tsconfig.json

@@ -1,14 +1,11 @@
 {
-    "extends": "@fluidframework/build-common/ts-common-config.json",
-    "exclude": [
-        "src/test/**/*"
-    ],
-    "compilerOptions": {
-        "rootDir": "./src",
-        "outDir": "./dist",
-        "composite": true
-    },
-    "include": [
-        "src/**/*"
-    ]
+	"extends": "@fluidframework/build-common/ts-common-config.json",
+	"exclude": ["src/test/**/*"],
+	"compilerOptions": {
+		"rootDir": "./src",
+		"outDir": "./dist",
+		"composite": true,
+		"types": ["mocha", "node"],
+	},
+	"include": ["src/**/*"],
 }