@magda/typescript-common 2.3.2 → 3.0.0-alpha.0

package/dist/test/connectors/runConnectorTest.js

@@ -1,44 +1,24 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.runConnectorTest = void 0;
-const cross_spawn_1 = __importDefault(require("cross-spawn"));
-const assert_1 = __importDefault(require("assert"));
-const path_1 = __importDefault(require("path"));
-const MockRegistry_1 = require("./MockRegistry");
-const resolve_1 = __importDefault(require("resolve"));
+import spawn from "cross-spawn";
+import * as assert from "assert";
+import * as path from "path";
+import { MockRegistry } from "./MockRegistry.js";
 /**
  * Hoping to re-use this functionality for all black-box style connector
  * testing.
  */
-function runConnectorTest(TEST_CASES, Catalog, options = {}) {
+export function runConnectorTest(TEST_CASES, Catalog, options = {}) {
     describe("connector", function () {
         this.timeout(30000);
         const registryPort = 5000 + Math.round(5000 * Math.random());
         const catalogPort = registryPort + 1;
         function run() {
             return new Promise((resolve, reject) => {
-                const tsconfigPath = path_1.default.resolve("tsconfig.json");
-                const tsNodeExec = path_1.default.resolve(path_1.default.dirname(resolve_1.default.sync("ts-node", {
-                    basedir: process.cwd()
-                })), "./bin.js");
+                const tsconfigPath = path.resolve("tsconfig.json");
+                const nodeExec = "node";
                 const command = [
-                    "-r",
-                    resolve_1.default.sync("tsconfig-paths/register", {
-                        basedir: process.cwd()
-                    }),
-                    "./src",
+                    "--import",
+                    "tsx/esm",
+                    "./src/index.ts",
                     "--id=connector",
                     "--name=Connector",
                     `--sourceUrl=http://localhost:${catalogPort}`,
@@ -47,10 +27,13 @@ function runConnectorTest(TEST_CASES, Catalog, options = {}) {
                     "--userId=user",
                     "--tenantId=1"
                 ];
-                const proc = cross_spawn_1.default(tsNodeExec, command, {
+                const proc = spawn(nodeExec, command, {
                     stdio: "inherit",
-                    cwd: path_1.default.dirname(tsconfigPath),
-                    env: Object.assign(Object.assign({}, (process.env ? process.env : {})), { TS_NODE_PROJECT: tsconfigPath })
+                    cwd: path.dirname(tsconfigPath),
+                    env: {
+                        ...(process.env ? process.env : {}),
+                        TS_NODE_PROJECT: tsconfigPath
+                    }
                 });
                 proc.on("error", (err) => {
                     console.log("Failed to start subprocess.", err);
@@ -68,39 +51,34 @@ function runConnectorTest(TEST_CASES, Catalog, options = {}) {
         }
         let servers = [];
         let registry;
-        beforeEach(function () {
-            return __awaiter(this, void 0, void 0, function* () {
-                servers.push((registry = yield new MockRegistry_1.MockRegistry().run(registryPort)));
-            });
+        beforeEach(async function () {
+            servers.push((registry = await new MockRegistry().run(registryPort)));
         });
         afterEach(function () {
             servers.forEach((server) => server.server.close());
         });
         TEST_CASES.forEach(function (testCase, index) {
-            it(`should run ${index}`, function () {
-                return __awaiter(this, void 0, void 0, function* () {
-                    const catalog = new Catalog(testCase.input);
-                    yield catalog.run(catalogPort).then((catalog) => {
-                        servers.push(catalog);
-                        return run().then(() => {
-                            Object.values(registry.records).forEach((record) => {
-                                record.sourceTag = "stag";
-                                if (record.aspects &&
-                                    record.aspects.source &&
-                                    record.aspects.source.url) {
-                                    record.aspects.source.url = record.aspects.source.url.replace(`http://localhost:${catalogPort}`, "SOURCE");
-                                }
-                            });
-                            if (options.cleanRegistry) {
-                                options.cleanRegistry(registry);
+            it(`should run ${index}`, async function () {
+                const catalog = new Catalog(testCase.input);
+                await catalog.run(catalogPort).then((catalog) => {
+                    servers.push(catalog);
+                    return run().then(() => {
+                        Object.values(registry.records).forEach((record) => {
+                            record.sourceTag = "stag";
+                            if (record.aspects &&
+                                record.aspects.source &&
+                                record.aspects.source.url) {
+                                record.aspects.source.url = record.aspects.source.url.replace(`http://localhost:${catalogPort}`, "SOURCE");
                             }
-                            assert_1.default.deepStrictEqual(registry.records, testCase.output);
                         });
+                        if (options.cleanRegistry) {
+                            options.cleanRegistry(registry);
+                        }
+                        assert.deepStrictEqual(registry.records, testCase.output);
                     });
                 });
             });
         });
     });
 }
-exports.runConnectorTest = runConnectorTest;
 //# sourceMappingURL=runConnectorTest.js.map

package/dist/test/connectors/runConnectorTest.js.map

@@ -1 +1 @@
-{"version":3,"file":"runConnectorTest.js","sourceRoot":"","sources":["../../../src/test/connectors/runConnectorTest.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"runConnectorTest.js","sourceRoot":"","sources":["../../../src/test/connectors/runConnectorTest.ts"],"names":[],"mappings":"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"}

package/dist/test/createMockAuthDecisionQueryClient.d.ts

@@ -1,6 +1,6 @@
-import AuthDecisionQueryClient, { AuthDecisionReqConfig } from "../opa/AuthDecisionQueryClient";
-import AuthDecision from "../opa/AuthDecision";
-declare type AuthDecisionRequestHandler = (config: AuthDecisionReqConfig, jwtToken?: string) => Promise<AuthDecision>;
-export declare type MockAuthDecisionClientConfig = AuthDecision | AuthDecisionRequestHandler;
+import AuthDecisionQueryClient, { AuthDecisionReqConfig } from "../opa/AuthDecisionQueryClient.js";
+import AuthDecision from "../opa/AuthDecision.js";
+type AuthDecisionRequestHandler = (config: AuthDecisionReqConfig, jwtToken?: string) => Promise<AuthDecision>;
+export type MockAuthDecisionClientConfig = AuthDecision | AuthDecisionRequestHandler;
 declare function createMockAuthDecisionQueryClient(authDecisionOrHandler: MockAuthDecisionClientConfig): AuthDecisionQueryClient;
 export default createMockAuthDecisionQueryClient;

package/dist/test/createMockAuthDecisionQueryClient.js

@@ -1,12 +1,7 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const AuthDecisionQueryClient_1 = __importDefault(require("../opa/AuthDecisionQueryClient"));
-const sinon_1 = __importDefault(require("sinon"));
+import AuthDecisionQueryClient from "../opa/AuthDecisionQueryClient.js";
+import sinon from "sinon";
 function createMockAuthDecisionQueryClient(authDecisionOrHandler) {
-    const authClient = sinon_1.default.createStubInstance(AuthDecisionQueryClient_1.default);
+    const authClient = sinon.createStubInstance(AuthDecisionQueryClient);
     if (typeof authDecisionOrHandler === "function") {
         authClient.getAuthDecision.callsFake(authDecisionOrHandler);
     }
@@ -15,5 +10,5 @@ function createMockAuthDecisionQueryClient(authDecisionOrHandler) {
     }
     return authClient;
 }
-exports.default = createMockAuthDecisionQueryClient;
+export default createMockAuthDecisionQueryClient;
 //# sourceMappingURL=createMockAuthDecisionQueryClient.js.map

package/dist/test/createMockAuthDecisionQueryClient.js.map

@@ -1 +1 @@
-{"version":3,"file":"createMockAuthDecisionQueryClient.js","sourceRoot":"","sources":["../../src/test/createMockAuthDecisionQueryClient.ts"],"names":[],"mappings":";;;;;AAAA,6FAEwC;AAExC,kDAA0B;AAW1B,SAAS,iCAAiC,CACtC,qBAAmD;IAEnD,MAAM,UAAU,GAAG,eAAK,CAAC,kBAAkB,CAAC,iCAAuB,CAAC,CAAC;IACrE,IAAI,OAAO,qBAAqB,KAAK,UAAU,EAAE;QAC7C,UAAU,CAAC,eAAe,CAAC,SAAS,CAAC,qBAAqB,CAAC,CAAC;KAC/D;SAAM;QACH,UAAU,CAAC,eAAe,CAAC,OAAO,CAAC,qBAAqB,CAAC,CAAC;KAC7D;IACD,OAAO,UAAU,CAAC;AACtB,CAAC;AAED,kBAAe,iCAAiC,CAAC"}
+{"version":3,"file":"createMockAuthDecisionQueryClient.js","sourceRoot":"","sources":["../../src/test/createMockAuthDecisionQueryClient.ts"],"names":[],"mappings":"AAAA,OAAO,uBAEN,MAAM,mCAAmC,CAAC;AAE3C,OAAO,KAAK,MAAM,OAAO,CAAC;AAW1B,SAAS,iCAAiC,CACtC,qBAAmD;IAEnD,MAAM,UAAU,GAAG,KAAK,CAAC,kBAAkB,CAAC,uBAAuB,CAAC,CAAC;IACrE,IAAI,OAAO,qBAAqB,KAAK,UAAU,EAAE;QAC7C,UAAU,CAAC,eAAe,CAAC,SAAS,CAAC,qBAAqB,CAAC,CAAC;KAC/D;SAAM;QACH,UAAU,CAAC,eAAe,CAAC,OAAO,CAAC,qBAAqB,CAAC,CAAC;KAC7D;IACD,OAAO,UAAU,CAAC;AACtB,CAAC;AAED,eAAe,iCAAiC,CAAC"}

package/dist/test/db/getTestDBConfig.js

@@ -1,5 +1,3 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
 function getTestDBConfig() {
     const { POSTGRES_HOST: host, POSTGRES_DB: database, POSTGRES_USER: user, POSTGRES_PASSWORD: password } = process.env;
     return {
@@ -9,5 +7,5 @@ function getTestDBConfig() {
         password: password ? password : "password"
     };
 }
-exports.default = getTestDBConfig;
+export default getTestDBConfig;
 //# sourceMappingURL=getTestDBConfig.js.map

package/dist/test/db/getTestDBConfig.js.map

@@ -1 +1 @@
-{"version":3,"file":"getTestDBConfig.js","sourceRoot":"","sources":["../../../src/test/db/getTestDBConfig.ts"],"names":[],"mappings":";;AAAA,SAAS,eAAe;IACpB,MAAM,EACF,aAAa,EAAE,IAAI,EACnB,WAAW,EAAE,QAAQ,EACrB,aAAa,EAAE,IAAI,EACnB,iBAAiB,EAAE,QAAQ,EAC9B,GAAG,OAAO,CAAC,GAAG,CAAC;IAEhB,OAAO;QACH,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,WAAW;QAC/B,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,UAAU;QAC1C,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,UAAU;QAC9B,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,UAAU;KAC7C,CAAC;AACN,CAAC;AAED,kBAAe,eAAe,CAAC"}
+{"version":3,"file":"getTestDBConfig.js","sourceRoot":"","sources":["../../../src/test/db/getTestDBConfig.ts"],"names":[],"mappings":"AAAA,SAAS,eAAe;IACpB,MAAM,EACF,aAAa,EAAE,IAAI,EACnB,WAAW,EAAE,QAAQ,EACrB,aAAa,EAAE,IAAI,EACnB,iBAAiB,EAAE,QAAQ,EAC9B,GAAG,OAAO,CAAC,GAAG,CAAC;IAEhB,OAAO;QACH,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,WAAW;QAC/B,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,UAAU;QAC1C,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,UAAU;QAC9B,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,UAAU;KAC7C,CAAC;AACN,CAAC;AAED,eAAe,eAAe,CAAC"}

package/dist/test/db/runMigrationSql.js

@@ -1,23 +1,8 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.deleteAllTables = void 0;
-const fs_extra_1 = __importDefault(require("fs-extra"));
-const recursive_readdir_1 = __importDefault(require("recursive-readdir"));
-const getTestDBConfig_1 = __importDefault(require("./getTestDBConfig"));
-const path_1 = __importDefault(require("path"));
-const fs_1 = __importDefault(require("fs"));
+import fse from "fs-extra";
+import recursive from "recursive-readdir";
+import getTestDBConfig from "./getTestDBConfig.js";
+import * as path from "path";
+import * as fs from "fs";
 function getVersionNumber(fileName) {
     const matches = fileName.match(/^V(\d+(_\d+)*)/i);
     if (!matches || matches.length < 2)
@@ -29,54 +14,48 @@ function getVersionNumber(fileName) {
     return verNum;
 }
 function replaceEnvVar(sql) {
-    const config = getTestDBConfig_1.default();
+    const config = getTestDBConfig();
     return sql
         .replace(/\$\{clientUserName\}/g, config.user)
         .replace(/\$\{clientPassword\}/g, config.password);
 }
-function deleteAllTables(pool) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const result = yield pool.query("SELECT tablename FROM pg_catalog.pg_tables WHERE schemaname = 'public'");
-        if (!result || !result.rows || !result.rows.length)
-            return;
-        yield pool.query(result.rows
-            .map((r) => `DROP TABLE "${r["tablename"]}" CASCADE`)
-            .join(";\n"));
-    });
+export async function deleteAllTables(pool) {
+    const result = await pool.query("SELECT tablename FROM pg_catalog.pg_tables WHERE schemaname = 'public'");
+    if (!result || !result.rows || !result.rows.length)
+        return;
+    await pool.query(result.rows
+        .map((r) => `DROP TABLE "${r["tablename"]}" CASCADE`)
+        .join(";\n"));
 }
-exports.deleteAllTables = deleteAllTables;
 /**
  * rebuilt a clean (i.e. in initial state) auth db in test database
  *
  * @param pool
  * @param deleteAllTable
  */
-function runMigrationSql(pool, sqlDir, deleteAllTable = false) {
-    return __awaiter(this, void 0, void 0, function* () {
-        if (!fs_1.default.existsSync(sqlDir)) {
-            throw new Error("Path `sqlDir` doesn't exist!");
-        }
-        if (!fs_1.default.lstatSync(sqlDir).isDirectory()) {
-            throw new Error("`sqlDir` is not a path to a directory");
-        }
-        const files = yield recursive_readdir_1.default(sqlDir, ["*,sql"]);
-        const fileObjects = files
-            .map((f) => ({
-            path: f,
-            version: getVersionNumber(path_1.default.basename(f))
-        }))
-            .sort((a, b) => a.version - b.version);
-        if (!fileObjects.length)
-            throw new Error("Can't find any DB migration SQL files.");
-        if (deleteAllTable) {
-            yield deleteAllTables(pool);
-        }
-        for (let i = 0; i < fileObjects.length; i++) {
-            const file = fileObjects[i];
-            const fileContent = replaceEnvVar(yield fs_extra_1.default.readFile(file.path, { encoding: "utf-8" }));
-            yield pool.query(fileContent);
-        }
-    });
+export default async function runMigrationSql(pool, sqlDir, deleteAllTable = false) {
+    if (!fs.existsSync(sqlDir)) {
+        throw new Error("Path `sqlDir` doesn't exist!");
+    }
+    if (!fs.lstatSync(sqlDir).isDirectory()) {
+        throw new Error("`sqlDir` is not a path to a directory");
+    }
+    const files = await recursive(sqlDir, ["*,sql"]);
+    const fileObjects = files
+        .map((f) => ({
+        path: f,
+        version: getVersionNumber(path.basename(f))
+    }))
+        .sort((a, b) => a.version - b.version);
+    if (!fileObjects.length)
+        throw new Error("Can't find any DB migration SQL files.");
+    if (deleteAllTable) {
+        await deleteAllTables(pool);
+    }
+    for (let i = 0; i < fileObjects.length; i++) {
+        const file = fileObjects[i];
+        const fileContent = replaceEnvVar(await fse.readFile(file.path, { encoding: "utf-8" }));
+        await pool.query(fileContent);
+    }
 }
-exports.default = runMigrationSql;
 //# sourceMappingURL=runMigrationSql.js.map

package/dist/test/db/runMigrationSql.js.map

@@ -1 +1 @@
-{"version":3,"file":"runMigrationSql.js","sourceRoot":"","sources":["../../../src/test/db/runMigrationSql.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"runMigrationSql.js","sourceRoot":"","sources":["../../../src/test/db/runMigrationSql.ts"],"names":[],"mappings":"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"}

package/dist/test/express/status.spec.js

@@ -1,18 +1,31 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
+import { installStatusRouter, createServiceProbe } from "../../express/status.js";
+import request from "supertest";
+import express from "express";
+import assert from "assert";
+import delay from "../../delay.js";
+describe("overall probe process", function () {
+    this.timeout(30000);
+    it("should be ready after required service online", async function () {
+        const app = express();
+        installStatusRouter(app, {
+            key: Math.random().toString(),
+            forceRun: true,
+            probes: {
+                a: async () => {
+                    await delay(1000);
+                    return {
+                        ready: true
+                    };
+                }
+            },
+            probeUpdateMs: 200
+        });
+        const agent = request.agent(app);
+        await agent.get("/status/ready").expect(500);
+        await delay(2000);
+        await agent.get("/status/ready").expect(200);
     });
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const status_1 = require("../../express/status");
-const request = require("supertest");
-const express = require("express");
-const assert = require("assert");
+});
 setup("status - default", undefined, (agent) => {
     it("should always be live", function (done) {
         agent.get("/status/live").expect(200, "OK").end(done);
@@ -23,73 +36,75 @@ setup("status - default", undefined, (agent) => {
 });
 setup("status - not ready to ready", {
     probes: {
-        a: () => __awaiter(void 0, void 0, void 0, function* () {
+        a: async () => {
             console.log("here");
-            yield sleep(500);
+            await delay(500);
             console.log("after");
             return {
                 ready: true
             };
-        })
+        }
     },
-    probeUpdateMs: 1000
+    probeUpdateMs: 200
 }, (agent) => {
     it("should be ready after a while", function (done) {
         agent
             .get("/status/ready")
             .expect(500)
-            .end(() => __awaiter(this, void 0, void 0, function* () {
-            yield sleep(1000);
+            .end(async () => {
+            await delay(1000);
             agent.get("/status/ready").expect(200).end(done);
-        }));
+        });
     });
 });
 setup("status - not ready", {
     probes: {
-        a: () => __awaiter(void 0, void 0, void 0, function* () {
+        a: async () => {
             return {
                 ready: true
             };
-        })
+        }
     },
     probeUpdateMs: 10
 }, (agent) => {
     it("should be ready with probes", function (done) {
-        sleep(100).then(function () {
+        delay(100).then(function () {
             agent.get("/status/ready").expect(200).end(done);
         });
     });
     it("should be ready with probes", function (done) {
-        sleep(100).then(function () {
+        delay(100).then(function () {
             agent.get("/status/readySync").expect(200).end(done);
         });
     });
 });
 setup("status - error", {
     probes: {
-        a: () => __awaiter(void 0, void 0, void 0, function* () {
+        a: async () => {
             throw "ERROR";
-        })
+        }
     },
     probeUpdateMs: 10
 }, (agent) => {
     it("should error", function (done) {
-        sleep(100).then(function () {
+        delay(100).then(function () {
             agent.get("/status/ready").expect(500).end(done);
         });
     });
 });
-setup("status - error", {
+setup("status - no error consider as ready", {
     probes: {
-        a: () => __awaiter(void 0, void 0, void 0, function* () {
+        a: async () => {
+            // as long as no error, consider as ready
+            // event if not return a status data object. e.g. {ready: true}
             return null;
-        })
+        }
     },
     probeUpdateMs: 60
 }, (agent) => {
-    it("should error", function (done) {
-        sleep(100).then(function () {
-            agent.get("/status/ready").expect(500).end(done);
+    it("should be ready", function (done) {
+        delay(100).then(function () {
+            agent.get("/status/ready").expect(200).end(done);
         });
     });
 });
@@ -104,55 +119,49 @@ describe("request", function () {
     afterEach(function () {
         server.close();
     });
-    it("should succeed", function () {
-        return __awaiter(this, void 0, void 0, function* () {
-            status_1.installStatusRouter(app, {});
-            let return_;
-            return_ = yield status_1.createServiceProbe(`http://127.0.0.1:${port}`)();
-            assert.deepEqual(return_.ready, true);
-            return_ = yield status_1.createServiceProbe(`http://127.0.0.1:${port}`, "/status/ready")();
-            assert.deepEqual(return_.ready, true);
-        });
+    it("should succeed", async function () {
+        installStatusRouter(app, {});
+        let return_;
+        return_ = await createServiceProbe(`http://127.0.0.1:${port}`)();
+        assert.deepEqual(return_.ready, true);
+        return_ = await createServiceProbe(`http://127.0.0.1:${port}`, "/status/ready")();
+        assert.deepEqual(return_.ready, true);
     });
-    it("should fail", function () {
-        return __awaiter(this, void 0, void 0, function* () {
-            app.use("/status/ready", function (req, res) {
-                res.status(500).json({ ready: false });
-            });
-            try {
-                yield status_1.createServiceProbe(`http://127.0.0.1:${port}`)();
-                throw "ERROR";
-            }
-            catch (return_) {
-                assert.deepEqual(return_, {
-                    ready: false,
-                    statusCode: 500
-                });
-            }
+    it("should fail", async function () {
+        app.use("/status/ready", function (req, res) {
+            res.status(500).json({ ready: false });
         });
+        try {
+            await createServiceProbe(`http://127.0.0.1:${port}`)();
+            throw "ERROR";
+        }
+        catch (return_) {
+            assert.deepEqual(return_, {
+                ready: false,
+                statusCode: 500
+            });
+        }
     });
-    it("should fail", function () {
-        return __awaiter(this, void 0, void 0, function* () {
-            try {
-                yield status_1.createServiceProbe(`http://127.0.0.1:${port + 6}`)();
-                throw "ERROR";
-            }
-            catch (return_) {
-                assert.notDeepEqual(return_, "ERROR");
-            }
-        });
+    it("should fail", async function () {
+        try {
+            await createServiceProbe(`http://127.0.0.1:${port + 6}`)();
+            throw "ERROR";
+        }
+        catch (return_) {
+            assert.notDeepEqual(return_, "ERROR");
+        }
     });
 });
-function sleep(time) {
-    return new Promise((resolve) => setTimeout(resolve, time));
-}
 function setup(text, options, callback) {
     describe(text, function () {
+        this.timeout(30000);
         if (options) {
             options.forceRun = true;
+            // --- manually set key to avoid status probe overwritten by other tests
+            options.key = Math.random().toString();
         }
         const app = express();
-        status_1.installStatusRouter(app, options);
+        installStatusRouter(app, options);
         const agent = request.agent(app);
         callback(agent, options);
     });

package/dist/test/express/status.spec.js.map

@@ -1 +1 @@
-{"version":3,"file":"status.spec.js","sourceRoot":"","sources":["../../../src/test/express/status.spec.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"status.spec.js","sourceRoot":"","sources":["../../../src/test/express/status.spec.ts"],"names":[],"mappings":"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"}

package/dist/test/fakeArgv.js

@@ -1,7 +1,8 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-function fakeArgv(options) {
-    return Object.assign(Object.assign({}, options), { $0: "", _: [] });
+export default function fakeArgv(options) {
+    return {
+        ...options,
+        $0: "",
+        _: []
+    };
 }
-exports.default = fakeArgv;
 //# sourceMappingURL=fakeArgv.js.map

package/dist/test/fakeArgv.js.map

@@ -1 +1 @@
-{"version":3,"file":"fakeArgv.js","sourceRoot":"","sources":["../../src/test/fakeArgv.ts"],"names":[],"mappings":";;AAEA,SAAwB,QAAQ,CAAC,OAAY;IACzC,uCACO,OAAO,KACV,EAAE,EAAE,EAAE,EACN,CAAC,EAAE,EAAE,IACP;AACN,CAAC;AAND,2BAMC"}
+{"version":3,"file":"fakeArgv.js","sourceRoot":"","sources":["../../src/test/fakeArgv.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,OAAO,UAAU,QAAQ,CAAC,OAAY;IACzC,OAAO;QACH,GAAG,OAAO;QACV,EAAE,EAAE,EAAE;QACN,CAAC,EAAE,EAAE;KACR,CAAC;AACN,CAAC"}