testplane 9.1.0 → 9.2.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/build/package.json +3 -3
- package/build/src/base-testplane.d.ts +17 -1
- package/build/src/base-testplane.js +43 -9
- package/build/src/base-testplane.js.map +1 -1
- package/build/src/browser/browser.d.ts +3 -0
- package/build/src/browser/browser.js +4 -2
- package/build/src/browser/browser.js.map +1 -1
- package/build/src/browser/cdp/selectivity/click-command-guard.d.ts +10 -0
- package/build/src/browser/cdp/selectivity/click-command-guard.js +57 -0
- package/build/src/browser/cdp/selectivity/click-command-guard.js.map +1 -0
- package/build/src/browser/cdp/selectivity/coverage-hooks.d.ts +13 -0
- package/build/src/browser/cdp/selectivity/coverage-hooks.js +43 -0
- package/build/src/browser/cdp/selectivity/coverage-hooks.js.map +1 -0
- package/build/src/browser/cdp/selectivity/index.js +61 -33
- package/build/src/browser/cdp/selectivity/index.js.map +1 -1
- package/build/src/browser/cdp/selectivity/js-selectivity.d.ts +1 -0
- package/build/src/browser/cdp/selectivity/js-selectivity.js +26 -18
- package/build/src/browser/cdp/selectivity/js-selectivity.js.map +1 -1
- package/build/src/browser/cdp/selectivity/navigation-guard.d.ts +18 -0
- package/build/src/browser/cdp/selectivity/navigation-guard.js +234 -0
- package/build/src/browser/cdp/selectivity/navigation-guard.js.map +1 -0
- package/build/src/browser/cdp/selectivity/testplane-selectivity.js +19 -19
- package/build/src/browser/cdp/selectivity/testplane-selectivity.js.map +1 -1
- package/build/src/browser/client-scripts/screen-shooter/build/bundle.compat.js +2 -2
- package/build/src/browser/client-scripts/screen-shooter/build/bundle.native.js +2 -2
- package/build/src/browser/client-scripts/screen-shooter/tsc-out/client-scripts/screen-shooter/implementation.js +52 -84
- package/build/src/browser/client-scripts/screen-shooter/tsc-out/client-scripts/screen-shooter/operations.js +4 -1
- package/build/src/browser/commands/assert-view/index.js +25 -2
- package/build/src/browser/commands/assert-view/index.js.map +1 -1
- package/build/src/browser/existing-browser.js +8 -1
- package/build/src/browser/existing-browser.js.map +1 -1
- package/build/src/browser/history/index.d.ts +4 -2
- package/build/src/browser/history/index.js +146 -67
- package/build/src/browser/history/index.js.map +1 -1
- package/build/src/browser/new-browser.js +1 -1
- package/build/src/browser/new-browser.js.map +1 -1
- package/build/src/browser/screen-shooter/elements-screen-shooter.d.ts +5 -0
- package/build/src/browser/screen-shooter/elements-screen-shooter.js +102 -55
- package/build/src/browser/screen-shooter/elements-screen-shooter.js.map +1 -1
- package/build/src/browser/screen-shooter/viewport-screen-shooter.d.ts +4 -0
- package/build/src/browser/screen-shooter/viewport-screen-shooter.js +29 -7
- package/build/src/browser/screen-shooter/viewport-screen-shooter.js.map +1 -1
- package/build/src/browser-pool/basic-pool.d.ts +4 -3
- package/build/src/browser-pool/basic-pool.js +39 -7
- package/build/src/browser-pool/basic-pool.js.map +1 -1
- package/build/src/browser-pool/caching-pool.d.ts +3 -2
- package/build/src/browser-pool/caching-pool.js +19 -7
- package/build/src/browser-pool/caching-pool.js.map +1 -1
- package/build/src/browser-pool/index.d.ts +2 -1
- package/build/src/browser-pool/index.js +8 -4
- package/build/src/browser-pool/index.js.map +1 -1
- package/build/src/browser-pool/limited-pool.d.ts +5 -1
- package/build/src/browser-pool/limited-pool.js +42 -4
- package/build/src/browser-pool/limited-pool.js.map +1 -1
- package/build/src/browser-pool/per-browser-limited-pool.d.ts +2 -2
- package/build/src/browser-pool/per-browser-limited-pool.js +2 -1
- package/build/src/browser-pool/per-browser-limited-pool.js.map +1 -1
- package/build/src/browser-pool/types.d.ts +8 -0
- package/build/src/cli/commands/config/index.js +7 -3
- package/build/src/cli/commands/config/index.js.map +1 -1
- package/build/src/cli/commands/install-deps/index.js +46 -38
- package/build/src/cli/commands/install-deps/index.js.map +1 -1
- package/build/src/cli/commands/list-browsers/index.js +15 -11
- package/build/src/cli/commands/list-browsers/index.js.map +1 -1
- package/build/src/cli/commands/list-tests/index.js +25 -21
- package/build/src/cli/commands/list-tests/index.js.map +1 -1
- package/build/src/cli/commands/selectivity-merge-dumps/index.js +12 -5
- package/build/src/cli/commands/selectivity-merge-dumps/index.js.map +1 -1
- package/build/src/cli/index.js +10 -6
- package/build/src/cli/index.js.map +1 -1
- package/build/src/config/defaults.d.ts +5 -0
- package/build/src/config/defaults.js +4 -0
- package/build/src/config/defaults.js.map +1 -1
- package/build/src/config/index.d.ts +6 -4
- package/build/src/config/index.js +60 -19
- package/build/src/config/index.js.map +1 -1
- package/build/src/config/options.js +26 -0
- package/build/src/config/options.js.map +1 -1
- package/build/src/config/types.d.ts +19 -0
- package/build/src/constants/process-messages.d.ts +3 -0
- package/build/src/constants/process-messages.js +4 -1
- package/build/src/constants/process-messages.js.map +1 -1
- package/build/src/events/async-emitter/index.d.ts +38 -0
- package/build/src/events/async-emitter/index.js +248 -5
- package/build/src/events/async-emitter/index.js.map +1 -1
- package/build/src/events/index.d.ts +3 -0
- package/build/src/events/index.js +1 -0
- package/build/src/events/index.js.map +1 -1
- package/build/src/index.d.ts +2 -1
- package/build/src/profiler/analysis/aggregator.d.ts +19 -0
- package/build/src/profiler/analysis/aggregator.js +229 -0
- package/build/src/profiler/analysis/aggregator.js.map +1 -0
- package/build/src/profiler/analysis/analyzers.d.ts +10 -0
- package/build/src/profiler/analysis/analyzers.js +1228 -0
- package/build/src/profiler/analysis/analyzers.js.map +1 -0
- package/build/src/profiler/analysis/compact.d.ts +5 -0
- package/build/src/profiler/analysis/compact.js +46 -0
- package/build/src/profiler/analysis/compact.js.map +1 -0
- package/build/src/profiler/analysis/finding-order.d.ts +4 -0
- package/build/src/profiler/analysis/finding-order.js +28 -0
- package/build/src/profiler/analysis/finding-order.js.map +1 -0
- package/build/src/profiler/analysis/outliers.d.ts +6 -0
- package/build/src/profiler/analysis/outliers.js +49 -0
- package/build/src/profiler/analysis/outliers.js.map +1 -0
- package/build/src/profiler/analysis/policy-v1.d.ts +71 -0
- package/build/src/profiler/analysis/policy-v1.js +43 -0
- package/build/src/profiler/analysis/policy-v1.js.map +1 -0
- package/build/src/profiler/collectors/module-graph.d.ts +14 -0
- package/build/src/profiler/collectors/module-graph.js +99 -0
- package/build/src/profiler/collectors/module-graph.js.map +1 -0
- package/build/src/profiler/collectors/pool-observer.d.ts +9 -0
- package/build/src/profiler/collectors/pool-observer.js +40 -0
- package/build/src/profiler/collectors/pool-observer.js.map +1 -0
- package/build/src/profiler/manager.d.ts +55 -0
- package/build/src/profiler/manager.js +343 -0
- package/build/src/profiler/manager.js.map +1 -0
- package/build/src/profiler/output/console.d.ts +6 -0
- package/build/src/profiler/output/console.js +443 -0
- package/build/src/profiler/output/console.js.map +1 -0
- package/build/src/profiler/output/json.d.ts +2 -0
- package/build/src/profiler/output/json.js +24 -0
- package/build/src/profiler/output/json.js.map +1 -0
- package/build/src/profiler/retention/operation-store.d.ts +22 -0
- package/build/src/profiler/retention/operation-store.js +110 -0
- package/build/src/profiler/retention/operation-store.js.map +1 -0
- package/build/src/profiler/retention/policy-v1.d.ts +22 -0
- package/build/src/profiler/retention/policy-v1.js +49 -0
- package/build/src/profiler/retention/policy-v1.js.map +1 -0
- package/build/src/profiler/retention/result-budget.d.ts +2 -0
- package/build/src/profiler/retention/result-budget.js +117 -0
- package/build/src/profiler/retention/result-budget.js.map +1 -0
- package/build/src/profiler/retention/serialized-budget.d.ts +5 -0
- package/build/src/profiler/retention/serialized-budget.js +58 -0
- package/build/src/profiler/retention/serialized-budget.js.map +1 -0
- package/build/src/profiler/retention/streaming-statistics.d.ts +38 -0
- package/build/src/profiler/retention/streaming-statistics.js +191 -0
- package/build/src/profiler/retention/streaming-statistics.js.map +1 -0
- package/build/src/profiler/retention/top-k.d.ts +13 -0
- package/build/src/profiler/retention/top-k.js +57 -0
- package/build/src/profiler/retention/top-k.js.map +1 -0
- package/build/src/profiler/runtime/async-activity.d.ts +19 -0
- package/build/src/profiler/runtime/async-activity.js +113 -0
- package/build/src/profiler/runtime/async-activity.js.map +1 -0
- package/build/src/profiler/runtime/bootstrap-probe.d.ts +42 -0
- package/build/src/profiler/runtime/bootstrap-probe.js +91 -0
- package/build/src/profiler/runtime/bootstrap-probe.js.map +1 -0
- package/build/src/profiler/runtime/clock.d.ts +22 -0
- package/build/src/profiler/runtime/clock.js +15 -0
- package/build/src/profiler/runtime/clock.js.map +1 -0
- package/build/src/profiler/runtime/event-observer.d.ts +4 -0
- package/build/src/profiler/runtime/event-observer.js +142 -0
- package/build/src/profiler/runtime/event-observer.js.map +1 -0
- package/build/src/profiler/runtime/noop.d.ts +20 -0
- package/build/src/profiler/runtime/noop.js +37 -0
- package/build/src/profiler/runtime/noop.js.map +1 -0
- package/build/src/profiler/runtime/runtime.d.ts +95 -0
- package/build/src/profiler/runtime/runtime.js +1343 -0
- package/build/src/profiler/runtime/runtime.js.map +1 -0
- package/build/src/profiler/runtime/types.d.ts +88 -0
- package/build/src/profiler/runtime/types.js +3 -0
- package/build/src/profiler/runtime/types.js.map +1 -0
- package/build/src/profiler/sanitize.d.ts +15 -0
- package/build/src/profiler/sanitize.js +194 -0
- package/build/src/profiler/sanitize.js.map +1 -0
- package/build/src/profiler/schema/index.d.ts +1 -0
- package/build/src/profiler/schema/index.js +18 -0
- package/build/src/profiler/schema/index.js.map +1 -0
- package/build/src/profiler/schema/v1.d.ts +281 -0
- package/build/src/profiler/schema/v1.js +3 -0
- package/build/src/profiler/schema/v1.js.map +1 -0
- package/build/src/runner/browser-env/vite/browser-modules/mocha/index.js +30 -0
- package/build/src/runner/browser-env/vite/browser-modules/mocha/index.js.map +1 -1
- package/build/src/runner/browser-env/vite/browser-modules/tsconfig.tsbuildinfo +1 -1
- package/build/src/runner/browser-env/vite/browser-modules/types.d.ts +31 -6
- package/build/src/runner/browser-env/vite/browser-modules/types.js +8 -8
- package/build/src/runner/browser-env/vite/browser-modules/types.js.map +1 -1
- package/build/src/runner/browser-env/vite/plugins/generate-index-html.d.ts +7 -1
- package/build/src/runner/browser-env/vite/plugins/generate-index-html.js +28 -6
- package/build/src/runner/browser-env/vite/plugins/generate-index-html.js.map +1 -1
- package/build/src/runner/browser-env/vite/server.js +17 -1
- package/build/src/runner/browser-env/vite/server.js.map +1 -1
- package/build/src/runner/browser-env/vite/socket.js +4 -0
- package/build/src/runner/browser-env/vite/socket.js.map +1 -1
- package/build/src/runner/browser-env/vite/types.d.ts +9 -7
- package/build/src/runner/browser-env/vite/types.js +8 -8
- package/build/src/runner/browser-env/vite/types.js.map +1 -1
- package/build/src/runner/browser-env/vite/utils.js +9 -2
- package/build/src/runner/browser-env/vite/utils.js.map +1 -1
- package/build/src/runner/browser-runner.d.ts +3 -1
- package/build/src/runner/browser-runner.js +4 -2
- package/build/src/runner/browser-runner.js.map +1 -1
- package/build/src/runner/index.d.ts +3 -1
- package/build/src/runner/index.js +7 -4
- package/build/src/runner/index.js.map +1 -1
- package/build/src/runner/test-runner/index.d.ts +2 -1
- package/build/src/runner/test-runner/index.js +2 -2
- package/build/src/runner/test-runner/index.js.map +1 -1
- package/build/src/runner/test-runner/insistant-test-runner.d.ts +2 -1
- package/build/src/runner/test-runner/insistant-test-runner.js +3 -2
- package/build/src/runner/test-runner/insistant-test-runner.js.map +1 -1
- package/build/src/runner/test-runner/regular-test-runner.d.ts +9 -3
- package/build/src/runner/test-runner/regular-test-runner.js +77 -16
- package/build/src/runner/test-runner/regular-test-runner.js.map +1 -1
- package/build/src/signal-handler.js +14 -5
- package/build/src/signal-handler.js.map +1 -1
- package/build/src/test-reader/index.d.ts +2 -1
- package/build/src/test-reader/index.js +19 -10
- package/build/src/test-reader/index.js.map +1 -1
- package/build/src/test-reader/mocha-reader/index.d.ts +2 -1
- package/build/src/test-reader/mocha-reader/index.js +41 -24
- package/build/src/test-reader/mocha-reader/index.js.map +1 -1
- package/build/src/test-reader/mocha-reader/tree-builder-decorator.js +2 -2
- package/build/src/test-reader/mocha-reader/tree-builder-decorator.js.map +1 -1
- package/build/src/test-reader/mocha-reader/utils.d.ts +2 -0
- package/build/src/test-reader/mocha-reader/utils.js +18 -2
- package/build/src/test-reader/mocha-reader/utils.js.map +1 -1
- package/build/src/test-reader/test-object/hook.d.ts +4 -2
- package/build/src/test-reader/test-object/hook.js +3 -1
- package/build/src/test-reader/test-object/hook.js.map +1 -1
- package/build/src/test-reader/test-parser.d.ts +2 -1
- package/build/src/test-reader/test-parser.js +48 -4
- package/build/src/test-reader/test-parser.js.map +1 -1
- package/build/src/testplane.d.ts +6 -2
- package/build/src/testplane.js +82 -27
- package/build/src/testplane.js.map +1 -1
- package/build/src/types/index.d.ts +4 -1
- package/build/src/types/index.js.map +1 -1
- package/build/src/utils/exit-code.d.ts +1 -0
- package/build/src/utils/exit-code.js +28 -0
- package/build/src/utils/exit-code.js.map +1 -0
- package/build/src/utils/module-observer-registry.d.ts +43 -0
- package/build/src/utils/module-observer-registry.js +257 -0
- package/build/src/utils/module-observer-registry.js.map +1 -0
- package/build/src/utils/processor.js +1 -0
- package/build/src/utils/processor.js.map +1 -1
- package/build/src/utils/workers-registry.d.ts +48 -1
- package/build/src/utils/workers-registry.js +162 -4
- package/build/src/utils/workers-registry.js.map +1 -1
- package/build/src/worker/browser-env/runner/test-runner/execution-thread.js +15 -1
- package/build/src/worker/browser-env/runner/test-runner/execution-thread.js.map +1 -1
- package/build/src/worker/browser-env/runner/test-runner/index.js +20 -0
- package/build/src/worker/browser-env/runner/test-runner/index.js.map +1 -1
- package/build/src/worker/index.js +39 -1
- package/build/src/worker/index.js.map +1 -1
- package/build/src/worker/runner/browser-pool.d.ts +3 -2
- package/build/src/worker/runner/browser-pool.js +5 -3
- package/build/src/worker/runner/browser-pool.js.map +1 -1
- package/build/src/worker/runner/caching-test-parser.d.ts +6 -1
- package/build/src/worker/runner/caching-test-parser.js +40 -4
- package/build/src/worker/runner/caching-test-parser.js.map +1 -1
- package/build/src/worker/runner/index.d.ts +10 -9
- package/build/src/worker/runner/index.js +52 -6
- package/build/src/worker/runner/index.js.map +1 -1
- package/build/src/worker/runner/sequence-test-parser.d.ts +4 -1
- package/build/src/worker/runner/sequence-test-parser.js +17 -3
- package/build/src/worker/runner/sequence-test-parser.js.map +1 -1
- package/build/src/worker/runner/simple-test-parser.d.ts +3 -1
- package/build/src/worker/runner/simple-test-parser.js +4 -2
- package/build/src/worker/runner/simple-test-parser.js.map +1 -1
- package/build/src/worker/runner/test-runner/execution-thread.d.ts +20 -2
- package/build/src/worker/runner/test-runner/execution-thread.js +37 -2
- package/build/src/worker/runner/test-runner/execution-thread.js.map +1 -1
- package/build/src/worker/runner/test-runner/hook-runner.d.ts +1 -1
- package/build/src/worker/runner/test-runner/hook-runner.js +4 -4
- package/build/src/worker/runner/test-runner/hook-runner.js.map +1 -1
- package/build/src/worker/runner/test-runner/index.d.ts +8 -7
- package/build/src/worker/runner/test-runner/index.js +36 -25
- package/build/src/worker/runner/test-runner/index.js.map +1 -1
- package/build/src/worker/runner/test-runner/types.d.ts +8 -1
- package/build/src/worker/testplane-facade.js +63 -4
- package/build/src/worker/testplane-facade.js.map +1 -1
- package/build/src/worker/testplane.d.ts +6 -0
- package/build/src/worker/testplane.js +7 -1
- package/build/src/worker/testplane.js.map +1 -1
- package/package.json +3 -3
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"basic-pool.js","sourceRoot":"","sources":["../../../src/browser-pool/basic-pool.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,kDAA0B;AAC1B,oDAAuB;AAGvB,uDAAmD;AACnD,sCAAuD;AAIvD,qDAAiD;AAEjD,MAAa,SAAS;
|
|
1
|
+
{"version":3,"file":"basic-pool.js","sourceRoot":"","sources":["../../../src/browser-pool/basic-pool.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import debug from "debug";
|
|
2
2
|
import { BasicPool } from "./basic-pool";
|
|
3
3
|
import { Config } from "../config";
|
|
4
|
-
import { Pool } from "./types";
|
|
4
|
+
import { Pool, PoolObserver } from "./types";
|
|
5
5
|
import { NewBrowser } from "../browser/new-browser";
|
|
6
6
|
export type FreeBrowserOpts = {
|
|
7
7
|
hasFreeSlots?: boolean;
|
|
@@ -11,9 +11,10 @@ export type FreeBrowserOpts = {
|
|
|
11
11
|
export declare class CachingPool implements Pool {
|
|
12
12
|
private _caches;
|
|
13
13
|
private _config;
|
|
14
|
+
private _observer?;
|
|
14
15
|
underlyingPool: BasicPool;
|
|
15
16
|
log: debug.Debugger;
|
|
16
|
-
constructor(underlyingPool: BasicPool, config: Config);
|
|
17
|
+
constructor(underlyingPool: BasicPool, config: Config, observer?: PoolObserver);
|
|
17
18
|
private _getCacheFor;
|
|
18
19
|
getBrowser(id: string, opts?: {
|
|
19
20
|
version?: string;
|
|
@@ -8,11 +8,12 @@ const debug_1 = __importDefault(require("debug"));
|
|
|
8
8
|
const limited_use_set_1 = require("./limited-use-set");
|
|
9
9
|
const utils_1 = require("./utils");
|
|
10
10
|
class CachingPool {
|
|
11
|
-
constructor(underlyingPool, config) {
|
|
11
|
+
constructor(underlyingPool, config, observer) {
|
|
12
12
|
this.log = (0, debug_1.default)("testplane:pool:caching");
|
|
13
13
|
this.underlyingPool = underlyingPool;
|
|
14
14
|
this._caches = {};
|
|
15
15
|
this._config = config;
|
|
16
|
+
this._observer = isPoolObserver(observer) ? observer : undefined;
|
|
16
17
|
}
|
|
17
18
|
_getCacheFor(id, version) {
|
|
18
19
|
const compositeId = (0, utils_1.buildCompositeBrowserId)(id, version);
|
|
@@ -32,12 +33,18 @@ class CachingPool {
|
|
|
32
33
|
return this.underlyingPool.getBrowser(id, opts);
|
|
33
34
|
}
|
|
34
35
|
this.log(`has cached browser ${browser.fullId}`);
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
36
|
+
this._observer?.record("sessionReused", { browserId: id });
|
|
37
|
+
const resetOperation = this._observer?.start("browser.session.reset", { browserId: id, reused: true });
|
|
38
|
+
try {
|
|
39
|
+
await browser.reset();
|
|
40
|
+
resetOperation?.end();
|
|
41
|
+
return browser;
|
|
42
|
+
}
|
|
43
|
+
catch (error) {
|
|
44
|
+
resetOperation?.end("failed");
|
|
45
|
+
await this.underlyingPool.freeBrowser(browser).catch(() => undefined);
|
|
46
|
+
throw error;
|
|
47
|
+
}
|
|
41
48
|
}
|
|
42
49
|
_initPool(browserId, version) {
|
|
43
50
|
const compositeId = (0, utils_1.buildCompositeBrowserId)(browserId, version);
|
|
@@ -73,9 +80,11 @@ class CachingPool {
|
|
|
73
80
|
const force = options.force || shouldFreeForNextRequest();
|
|
74
81
|
this.log(`free ${browser.fullId} force=${force}`);
|
|
75
82
|
if (force) {
|
|
83
|
+
this._observer?.record("sessionFreed", { browserId: browser.id, cached: false });
|
|
76
84
|
return this.underlyingPool.freeBrowser(browser);
|
|
77
85
|
}
|
|
78
86
|
const cache = this._getCacheFor(browser.id, browser.version);
|
|
87
|
+
this._observer?.record("sessionFreed", { browserId: browser.id, cached: true });
|
|
79
88
|
return cache.push(browser);
|
|
80
89
|
}
|
|
81
90
|
cancel() {
|
|
@@ -84,4 +93,7 @@ class CachingPool {
|
|
|
84
93
|
}
|
|
85
94
|
}
|
|
86
95
|
exports.CachingPool = CachingPool;
|
|
96
|
+
function isPoolObserver(value) {
|
|
97
|
+
return typeof value?.start === "function" && typeof value.record === "function";
|
|
98
|
+
}
|
|
87
99
|
//# sourceMappingURL=caching-pool.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"caching-pool.js","sourceRoot":"","sources":["../../../src/browser-pool/caching-pool.ts"],"names":[],"mappings":";;;;;;AAAA,kDAA0B;AAE1B,uDAAkD;AAClD,mCAAkD;AAQlD,MAAa,WAAW;
|
|
1
|
+
{"version":3,"file":"caching-pool.js","sourceRoot":"","sources":["../../../src/browser-pool/caching-pool.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,5 +2,6 @@ import { LimitedPool } from "./limited-pool";
|
|
|
2
2
|
import { PerBrowserLimitedPool } from "./per-browser-limited-pool";
|
|
3
3
|
import { Config } from "../config";
|
|
4
4
|
import { AsyncEmitter } from "../events";
|
|
5
|
+
import type { ProfilerRuntimeLike } from "../profiler/runtime/types";
|
|
5
6
|
export type BrowserPool = LimitedPool | PerBrowserLimitedPool;
|
|
6
|
-
export declare const create: (config: Config, emitter: AsyncEmitter) => BrowserPool;
|
|
7
|
+
export declare const create: (config: Config, emitter: AsyncEmitter, profiler?: ProfilerRuntimeLike) => BrowserPool;
|
|
@@ -9,14 +9,18 @@ const basic_pool_1 = require("./basic-pool");
|
|
|
9
9
|
const limited_pool_1 = require("./limited-pool");
|
|
10
10
|
const per_browser_limited_pool_1 = require("./per-browser-limited-pool");
|
|
11
11
|
const caching_pool_1 = require("./caching-pool");
|
|
12
|
-
const
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
12
|
+
const pool_observer_1 = require("../profiler/collectors/pool-observer");
|
|
13
|
+
const noop_1 = require("../profiler/runtime/noop");
|
|
14
|
+
const create = function (config, emitter, profiler = noop_1.noopProfilerRuntime) {
|
|
15
|
+
const observer = profiler.isEnabled() ? new pool_observer_1.ProfilerPoolObserver(profiler) : undefined;
|
|
16
|
+
let pool = basic_pool_1.BasicPool.create(config, emitter, observer);
|
|
17
|
+
pool = new caching_pool_1.CachingPool(pool, config, observer);
|
|
18
|
+
pool = new per_browser_limited_pool_1.PerBrowserLimitedPool(pool, config, observer);
|
|
16
19
|
if (lodash_1.default.isFinite(config.system.parallelLimit)) {
|
|
17
20
|
pool = new limited_pool_1.LimitedPool(pool, {
|
|
18
21
|
limit: config.system.parallelLimit,
|
|
19
22
|
isSpecificBrowserLimiter: false,
|
|
23
|
+
...(observer && { observer }),
|
|
20
24
|
});
|
|
21
25
|
}
|
|
22
26
|
return pool;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/browser-pool/index.ts"],"names":[],"mappings":";;;;;;AAAA,oDAAuB;AACvB,6CAAyC;AACzC,iDAA6C;AAC7C,yEAAmE;AACnE,iDAA6C;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/browser-pool/index.ts"],"names":[],"mappings":";;;;;;AAAA,oDAAuB;AACvB,6CAAyC;AACzC,iDAA6C;AAC7C,yEAAmE;AACnE,iDAA6C;AAG7C,wEAA4E;AAC5E,mDAA+D;AAMxD,MAAM,MAAM,GAAG,UAClB,MAAc,EACd,OAAqB,EACrB,WAAgC,0BAAmB;IAEnD,MAAM,QAAQ,GAA6B,QAAQ,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,IAAI,oCAAoB,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IACjH,IAAI,IAAI,GAAkE,sBAAS,CAAC,MAAM,CACtF,MAAM,EACN,OAAO,EACP,QAAQ,CACX,CAAC;IAEF,IAAI,GAAG,IAAI,0BAAW,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC;IAC/C,IAAI,GAAG,IAAI,gDAAqB,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC;IAEzD,IAAI,gBAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,EAAE,CAAC;QAC1C,IAAI,GAAG,IAAI,0BAAW,CAAC,IAAI,EAAE;YACzB,KAAK,EAAE,MAAM,CAAC,MAAM,CAAC,aAAa;YAClC,wBAAwB,EAAE,KAAK;YAC/B,GAAG,CAAC,QAAQ,IAAI,EAAE,QAAQ,EAAE,CAAC;SAChC,CAAC,CAAC;IACP,CAAC;IAED,OAAO,IAAI,CAAC;AAChB,CAAC,CAAC;AAxBW,QAAA,MAAM,UAwBjB"}
|
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
import debug from "debug";
|
|
2
|
-
import { BrowserOpts, Pool } from "./types";
|
|
2
|
+
import { BrowserOpts, Pool, PoolObserver } from "./types";
|
|
3
3
|
import { Browser } from "../browser/browser";
|
|
4
4
|
export interface LimitedPoolOpts {
|
|
5
5
|
limit: number;
|
|
6
6
|
isSpecificBrowserLimiter?: boolean;
|
|
7
|
+
observer?: PoolObserver;
|
|
7
8
|
}
|
|
8
9
|
export declare class LimitedPool implements Pool {
|
|
9
10
|
private _limit;
|
|
@@ -12,6 +13,7 @@ export declare class LimitedPool implements Pool {
|
|
|
12
13
|
private _requestQueue;
|
|
13
14
|
private _highPriorityRequestQueue;
|
|
14
15
|
private _isSpecificBrowserLimiter;
|
|
16
|
+
private _observer?;
|
|
15
17
|
log: debug.Debugger;
|
|
16
18
|
underlyingPool: Pool;
|
|
17
19
|
static create(underlyingPool: Pool, opts: LimitedPoolOpts): LimitedPool;
|
|
@@ -23,4 +25,6 @@ export declare class LimitedPool implements Pool {
|
|
|
23
25
|
private _newBrowser;
|
|
24
26
|
private _lookAtNextRequest;
|
|
25
27
|
private _launchNextBrowser;
|
|
28
|
+
private _limiterKind;
|
|
29
|
+
private _sampleState;
|
|
26
30
|
}
|
|
@@ -24,21 +24,25 @@ class LimitedPool {
|
|
|
24
24
|
this._isSpecificBrowserLimiter = lodash_1.default.isBoolean(opts.isSpecificBrowserLimiter)
|
|
25
25
|
? opts.isSpecificBrowserLimiter
|
|
26
26
|
: true;
|
|
27
|
+
this._observer = opts.observer;
|
|
27
28
|
}
|
|
28
29
|
async getBrowser(id, opts = {}) {
|
|
29
30
|
const optsToPrint = JSON.stringify(opts);
|
|
30
31
|
this.log(`get browser ${id} with opts:${optsToPrint} (launched ${this._launched}, limit ${this._limit})`);
|
|
31
32
|
++this._requests;
|
|
33
|
+
this._sampleState(id);
|
|
32
34
|
try {
|
|
33
35
|
return await this._getBrowser(id, opts);
|
|
34
36
|
}
|
|
35
37
|
catch (e) {
|
|
36
38
|
--this._requests;
|
|
39
|
+
this._sampleState(id);
|
|
37
40
|
return await Promise.reject(e);
|
|
38
41
|
}
|
|
39
42
|
}
|
|
40
43
|
async freeBrowser(browser, opts = {}) {
|
|
41
44
|
--this._requests;
|
|
45
|
+
this._sampleState(browser.id);
|
|
42
46
|
const nextRequest = this._lookAtNextRequest();
|
|
43
47
|
const compositeIdForNextRequest = nextRequest && (0, utils_1.buildCompositeBrowserId)(nextRequest.id, nextRequest.opts.version);
|
|
44
48
|
const hasFreeSlots = this._launched < this._limit;
|
|
@@ -46,11 +50,14 @@ class LimitedPool {
|
|
|
46
50
|
const force = opts.force || shouldFreeUnusedResource;
|
|
47
51
|
const optsForFree = { force, compositeIdForNextRequest, hasFreeSlots };
|
|
48
52
|
this.log(`free browser ${browser.fullId} with opts:${JSON.stringify(optsForFree)}`);
|
|
49
|
-
return this.underlyingPool.freeBrowser(browser, optsForFree).finally(() => this._launchNextBrowser());
|
|
53
|
+
return this.underlyingPool.freeBrowser(browser, optsForFree).finally(() => this._launchNextBrowser(browser.id));
|
|
50
54
|
}
|
|
51
55
|
cancel(error = new cancelled_error_1.CancelledError()) {
|
|
52
56
|
this.log("cancel");
|
|
53
57
|
const reject_ = (entry) => entry.reject(error);
|
|
58
|
+
const interrupt_ = (entry) => entry.waitOperation?.end("interrupted");
|
|
59
|
+
this._highPriorityRequestQueue.forEach(interrupt_);
|
|
60
|
+
this._requestQueue.forEach(interrupt_);
|
|
54
61
|
this._highPriorityRequestQueue.forEach(reject_);
|
|
55
62
|
this._requestQueue.forEach(reject_);
|
|
56
63
|
this._highPriorityRequestQueue = yallist_1.default.create();
|
|
@@ -61,36 +68,67 @@ class LimitedPool {
|
|
|
61
68
|
if (this._launched < this._limit) {
|
|
62
69
|
this.log("can launch one more");
|
|
63
70
|
this._launched++;
|
|
71
|
+
this._sampleState(id);
|
|
64
72
|
return this._newBrowser(id, opts);
|
|
65
73
|
}
|
|
66
74
|
this.log("queuing the request");
|
|
67
75
|
const queue = opts.highPriority ? this._highPriorityRequestQueue : this._requestQueue;
|
|
76
|
+
const limiter = this._limiterKind();
|
|
77
|
+
const waitOperation = this._observer?.start("browser.pool.wait", {
|
|
78
|
+
browserId: id,
|
|
79
|
+
limiter,
|
|
80
|
+
limit: this._limit,
|
|
81
|
+
highPriority: Boolean(opts.highPriority),
|
|
82
|
+
});
|
|
68
83
|
return new Promise((resolve, reject) => {
|
|
69
|
-
queue.push({
|
|
84
|
+
queue.push({
|
|
85
|
+
id,
|
|
86
|
+
opts,
|
|
87
|
+
resolve: resolve,
|
|
88
|
+
reject: reject,
|
|
89
|
+
waitOperation,
|
|
90
|
+
});
|
|
91
|
+
this._sampleState(id);
|
|
70
92
|
});
|
|
71
93
|
}
|
|
72
94
|
async _newBrowser(id, opts) {
|
|
73
95
|
this.log(`launching new browser ${id} with opts:${JSON.stringify(opts)}`);
|
|
74
96
|
return this.underlyingPool.getBrowser(id, opts).catch(e => {
|
|
75
|
-
this._launchNextBrowser();
|
|
97
|
+
this._launchNextBrowser(id);
|
|
76
98
|
return Promise.reject(e);
|
|
77
99
|
});
|
|
78
100
|
}
|
|
79
101
|
_lookAtNextRequest() {
|
|
80
102
|
return this._highPriorityRequestQueue.get(0) || this._requestQueue.get(0);
|
|
81
103
|
}
|
|
82
|
-
_launchNextBrowser() {
|
|
104
|
+
_launchNextBrowser(browserId) {
|
|
83
105
|
const queued = this._highPriorityRequestQueue.shift() || this._requestQueue.shift();
|
|
84
106
|
if (queued) {
|
|
85
107
|
const compositeId = (0, utils_1.buildCompositeBrowserId)(queued.id, queued.opts.version);
|
|
86
108
|
this.log(`has queued requests for ${compositeId}`);
|
|
87
109
|
this.log(`remaining queue length: ${this._requestQueue.length}`);
|
|
110
|
+
queued.waitOperation?.end();
|
|
111
|
+
this._sampleState(queued.id);
|
|
88
112
|
this._newBrowser(queued.id, queued.opts).then(queued.resolve, queued.reject);
|
|
89
113
|
}
|
|
90
114
|
else {
|
|
91
115
|
this._launched--;
|
|
116
|
+
this._sampleState(browserId);
|
|
92
117
|
}
|
|
93
118
|
}
|
|
119
|
+
_limiterKind() {
|
|
120
|
+
return this._isSpecificBrowserLimiter ? "browser" : "global";
|
|
121
|
+
}
|
|
122
|
+
_sampleState(browserId) {
|
|
123
|
+
const dimensions = { browserId, limiter: this._limiterKind() };
|
|
124
|
+
this._observer?.record("queueDepth", {
|
|
125
|
+
...dimensions,
|
|
126
|
+
limit: this._limit,
|
|
127
|
+
value: this._highPriorityRequestQueue.length + this._requestQueue.length,
|
|
128
|
+
});
|
|
129
|
+
this._observer?.record("requestsActive", { ...dimensions, limit: this._limit, value: this._requests });
|
|
130
|
+
this._observer?.record("sessionsLaunched", { ...dimensions, limit: this._limit, value: this._launched });
|
|
131
|
+
}
|
|
94
132
|
}
|
|
95
133
|
exports.LimitedPool = LimitedPool;
|
|
96
134
|
//# sourceMappingURL=limited-pool.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"limited-pool.js","sourceRoot":"","sources":["../../../src/browser-pool/limited-pool.ts"],"names":[],"mappings":";;;;;;AAAA,kDAA0B;AAC1B,oDAAuB;AACvB,sDAA8B;AAG9B,uDAAmD;AACnD,mCAAkD;
|
|
1
|
+
{"version":3,"file":"limited-pool.js","sourceRoot":"","sources":["../../../src/browser-pool/limited-pool.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
import debug from "debug";
|
|
2
|
-
import { Pool } from "./types";
|
|
2
|
+
import { Pool, PoolObserver } from "./types";
|
|
3
3
|
import { Config } from "../config";
|
|
4
4
|
import { Browser } from "../browser/browser";
|
|
5
5
|
export declare class PerBrowserLimitedPool implements Pool {
|
|
6
6
|
log: debug.Debugger;
|
|
7
7
|
private _browserPools;
|
|
8
|
-
constructor(underlyingPool: Pool, config: Config);
|
|
8
|
+
constructor(underlyingPool: Pool, config: Config, observer?: PoolObserver);
|
|
9
9
|
getBrowser(id: string, opts?: object): Promise<Browser>;
|
|
10
10
|
freeBrowser(browser: Browser, opts?: object): Promise<void>;
|
|
11
11
|
cancel(error?: Error): void;
|
|
@@ -9,11 +9,12 @@ const lodash_1 = require("lodash");
|
|
|
9
9
|
const limited_pool_1 = require("./limited-pool");
|
|
10
10
|
const cancelled_error_1 = require("./cancelled-error");
|
|
11
11
|
class PerBrowserLimitedPool {
|
|
12
|
-
constructor(underlyingPool, config) {
|
|
12
|
+
constructor(underlyingPool, config, observer) {
|
|
13
13
|
this.log = (0, debug_1.default)("testplane:pool:per-browser-limited");
|
|
14
14
|
const ids = config.getBrowserIds();
|
|
15
15
|
this._browserPools = (0, lodash_1.zipObject)(ids, ids.map(id => limited_pool_1.LimitedPool.create(underlyingPool, {
|
|
16
16
|
limit: config.forBrowser(id).sessionsPerBrowser,
|
|
17
|
+
...(observer && { observer }),
|
|
17
18
|
})));
|
|
18
19
|
}
|
|
19
20
|
getBrowser(id, opts) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"per-browser-limited-pool.js","sourceRoot":"","sources":["../../../src/browser-pool/per-browser-limited-pool.ts"],"names":[],"mappings":";;;;;;AAAA,kDAA0B;AAC1B,mCAA4C;AAK5C,iDAA6C;AAC7C,uDAAmD;AAEnD,MAAa,qBAAqB;IAI9B,YAAY,cAAoB,EAAE,MAAc;
|
|
1
|
+
{"version":3,"file":"per-browser-limited-pool.js","sourceRoot":"","sources":["../../../src/browser-pool/per-browser-limited-pool.ts"],"names":[],"mappings":";;;;;;AAAA,kDAA0B;AAC1B,mCAA4C;AAK5C,iDAA6C;AAC7C,uDAAmD;AAEnD,MAAa,qBAAqB;IAI9B,YAAY,cAAoB,EAAE,MAAc,EAAE,QAAuB;QACrE,IAAI,CAAC,GAAG,GAAG,IAAA,eAAK,EAAC,oCAAoC,CAAC,CAAC;QAEvD,MAAM,GAAG,GAAG,MAAM,CAAC,aAAa,EAAE,CAAC;QACnC,IAAI,CAAC,aAAa,GAAG,IAAA,kBAAS,EAC1B,GAAG,EACH,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CACT,0BAAW,CAAC,MAAM,CAAC,cAAc,EAAE;YAC/B,KAAK,EAAE,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,kBAAkB;YAC/C,GAAG,CAAC,QAAQ,IAAI,EAAE,QAAQ,EAAE,CAAC;SAChC,CAAC,CACL,CACJ,CAAC;IACN,CAAC;IAED,UAAU,CAAC,EAAU,EAAE,IAAa;QAChC,IAAI,CAAC,GAAG,CAAC,WAAW,EAAE,eAAe,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAE7D,OAAO,IAAI,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC,UAAU,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;IACvD,CAAC;IAED,WAAW,CAAC,OAAgB,EAAE,IAAa;QACvC,IAAI,CAAC,GAAG,CAAC,QAAQ,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;QAEnC,OAAO,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,WAAW,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IACrE,CAAC;IAED,MAAM,CAAC,QAAe,IAAI,gCAAc,EAAE;QACtC,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QACnB,IAAA,gBAAO,EAAC,IAAI,CAAC,aAAa,EAAE,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;IAC5D,CAAC;CACJ;AAnCD,sDAmCC"}
|
|
@@ -9,3 +9,11 @@ export interface BrowserOpts {
|
|
|
9
9
|
version?: string;
|
|
10
10
|
highPriority?: boolean;
|
|
11
11
|
}
|
|
12
|
+
export type PoolLimiterKind = "browser" | "global";
|
|
13
|
+
export interface PoolObserverOperation {
|
|
14
|
+
end(status?: "completed" | "failed" | "interrupted"): void;
|
|
15
|
+
}
|
|
16
|
+
export interface PoolObserver {
|
|
17
|
+
start(kind: string, data: Record<string, string | number | boolean | null>): PoolObserverOperation;
|
|
18
|
+
record(event: string, data: Record<string, string | number | boolean | null>): void;
|
|
19
|
+
}
|
|
@@ -26,6 +26,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
26
26
|
exports.registerCmd = void 0;
|
|
27
27
|
const constants_1 = require("../../constants");
|
|
28
28
|
const logger = __importStar(require("../../../utils/logger"));
|
|
29
|
+
const exit_code_1 = require("../../../utils/exit-code");
|
|
29
30
|
const { CONFIG: commandName } = constants_1.CliCommands;
|
|
30
31
|
const registerCmd = (cliTool, testplane) => {
|
|
31
32
|
cliTool
|
|
@@ -35,14 +36,17 @@ const registerCmd = (cliTool, testplane) => {
|
|
|
35
36
|
.option("--space <count>", "white spaces count to insert into the JSON output", Number, 0)
|
|
36
37
|
.action(async (options) => {
|
|
37
38
|
const { space } = options;
|
|
39
|
+
let exitCode = 0;
|
|
38
40
|
try {
|
|
39
|
-
|
|
40
|
-
|
|
41
|
+
await testplane.profileCliCommand(commandName, () => {
|
|
42
|
+
console.info(JSON.stringify(testplane.config, null, space));
|
|
43
|
+
});
|
|
41
44
|
}
|
|
42
45
|
catch (err) {
|
|
43
46
|
logger.error(err.stack || err);
|
|
44
|
-
|
|
47
|
+
exitCode = 1;
|
|
45
48
|
}
|
|
49
|
+
process.exit((0, exit_code_1.resolveExitCode)(exitCode));
|
|
46
50
|
});
|
|
47
51
|
};
|
|
48
52
|
exports.registerCmd = registerCmd;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/cli/commands/config/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AACA,+CAA8C;AAC9C,8DAAgD;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/cli/commands/config/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AACA,+CAA8C;AAC9C,8DAAgD;AAChD,wDAA2D;AAE3D,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,GAAG,uBAAW,CAAC;AAErC,MAAM,WAAW,GAAG,CAAC,OAAyB,EAAE,SAAoB,EAAQ,EAAE;IACjF,OAAO;SACF,OAAO,CAAC,WAAW,CAAC;SACpB,WAAW,CAAC,4FAA4F,CAAC;SACzG,MAAM,CAAC,qBAAqB,EAAE,4BAA4B,CAAC;SAC3D,MAAM,CAAC,iBAAiB,EAAE,mDAAmD,EAAE,MAAM,EAAE,CAAC,CAAC;SACzF,MAAM,CAAC,KAAK,EAAE,OAAyB,EAAE,EAAE;QACxC,MAAM,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC;QAC1B,IAAI,QAAQ,GAAG,CAAC,CAAC;QAEjB,IAAI,CAAC;YACD,MAAM,SAAS,CAAC,iBAAiB,CAAC,WAAW,EAAE,GAAG,EAAE;gBAChD,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC;YAChE,CAAC,CAAC,CAAC;QACP,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACX,MAAM,CAAC,KAAK,CAAE,GAAa,CAAC,KAAK,IAAI,GAAG,CAAC,CAAC;YAC1C,QAAQ,GAAG,CAAC,CAAC;QACjB,CAAC;QACD,OAAO,CAAC,IAAI,CAAC,IAAA,2BAAe,EAAC,QAAQ,CAAC,CAAC,CAAC;IAC5C,CAAC,CAAC,CAAC;AACX,CAAC,CAAC;AApBW,QAAA,WAAW,eAoBtB"}
|
|
@@ -26,6 +26,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
26
26
|
exports.registerCmd = void 0;
|
|
27
27
|
const constants_1 = require("../../constants");
|
|
28
28
|
const logger = __importStar(require("../../../utils/logger"));
|
|
29
|
+
const exit_code_1 = require("../../../utils/exit-code");
|
|
29
30
|
const { INSTALL_DEPS: commandName } = constants_1.CliCommands;
|
|
30
31
|
const logResult = (browsersInstallPerStatus, logType, status, heading, formatLine) => {
|
|
31
32
|
if (!browsersInstallPerStatus[status].length) {
|
|
@@ -40,52 +41,59 @@ const registerCmd = (cliTool, testplane) => {
|
|
|
40
41
|
.option("-c, --config <path>", "path to configuration file")
|
|
41
42
|
.arguments("[browsers...]")
|
|
42
43
|
.action(async (browsers) => {
|
|
43
|
-
const { installBrowsersWithDrivers, BrowserInstallStatus } = await Promise.resolve().then(() => __importStar(require("../../../browser-installer")));
|
|
44
44
|
try {
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
if (browser in testplane.config.browsers) {
|
|
50
|
-
const browserConfig = testplane.config.browsers[browser];
|
|
51
|
-
const { browserName, browserVersion } = browserConfig.desiredCapabilities || {};
|
|
52
|
-
return { browserName, browserVersion };
|
|
45
|
+
await testplane.profileCliCommand(commandName, async () => {
|
|
46
|
+
const { installBrowsersWithDrivers, BrowserInstallStatus } = await Promise.resolve().then(() => __importStar(require("../../../browser-installer")));
|
|
47
|
+
if (!browsers.length) {
|
|
48
|
+
browsers = Object.keys(testplane.config.browsers);
|
|
53
49
|
}
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
50
|
+
const browsersToInstall = browsers.map(browser => {
|
|
51
|
+
if (browser in testplane.config.browsers) {
|
|
52
|
+
const browserConfig = testplane.config.browsers[browser];
|
|
53
|
+
const { browserName, browserVersion } = browserConfig.desiredCapabilities || {};
|
|
54
|
+
return { browserName, browserVersion };
|
|
55
|
+
}
|
|
56
|
+
else if (browser.includes("@")) {
|
|
57
|
+
const [browserName, browserVersion] = browser.split("@", 2);
|
|
58
|
+
return { browserName, browserVersion };
|
|
59
|
+
}
|
|
60
|
+
else {
|
|
61
|
+
throw new Error([
|
|
62
|
+
`Unknown browser: ${browser}.`,
|
|
63
|
+
`Expected config's <browserId> or '<browserName>@<browserVersion>' (example: "chrome@130")`,
|
|
64
|
+
].join("\n"));
|
|
65
|
+
}
|
|
66
|
+
});
|
|
67
|
+
const browsersInstallResult = await installBrowsersWithDrivers(browsersToInstall);
|
|
68
|
+
const browserTags = Object.keys(browsersInstallResult);
|
|
69
|
+
const browsersInstallPerStatus = {
|
|
70
|
+
[BrowserInstallStatus.Ok]: [],
|
|
71
|
+
[BrowserInstallStatus.Skip]: [],
|
|
72
|
+
[BrowserInstallStatus.Error]: [],
|
|
73
|
+
};
|
|
74
|
+
for (const tag of browserTags) {
|
|
75
|
+
const result = browsersInstallResult[tag];
|
|
76
|
+
const bucket = browsersInstallPerStatus[result.status];
|
|
77
|
+
if ("reason" in result) {
|
|
78
|
+
bucket.push({ tag, reason: result.reason });
|
|
79
|
+
}
|
|
80
|
+
else {
|
|
81
|
+
bucket.push({ tag });
|
|
82
|
+
}
|
|
57
83
|
}
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
84
|
+
logResult(browsersInstallPerStatus, "log", BrowserInstallStatus.Ok, "These browsers are downloaded successfully:", ({ tag }) => `- ${tag}`);
|
|
85
|
+
logResult(browsersInstallPerStatus, "warn", BrowserInstallStatus.Skip, "Browser install for these browsers was skipped:", ({ tag, reason }) => `- ${tag}: ${reason}`);
|
|
86
|
+
logResult(browsersInstallPerStatus, "error", BrowserInstallStatus.Error, "An error occured while trying to download these browsers:", ({ tag, reason }) => `- ${tag}: ${reason}`);
|
|
87
|
+
const isSuccessful = !browsersInstallPerStatus[BrowserInstallStatus.Error].length;
|
|
88
|
+
if (!isSuccessful) {
|
|
89
|
+
process.exitCode = (0, exit_code_1.resolveExitCode)(1);
|
|
63
90
|
}
|
|
91
|
+
return isSuccessful;
|
|
64
92
|
});
|
|
65
|
-
const browsersInstallResult = await installBrowsersWithDrivers(browsersToInstall);
|
|
66
|
-
const browserTags = Object.keys(browsersInstallResult);
|
|
67
|
-
const browsersInstallPerStatus = {
|
|
68
|
-
[BrowserInstallStatus.Ok]: [],
|
|
69
|
-
[BrowserInstallStatus.Skip]: [],
|
|
70
|
-
[BrowserInstallStatus.Error]: [],
|
|
71
|
-
};
|
|
72
|
-
for (const tag of browserTags) {
|
|
73
|
-
const result = browsersInstallResult[tag];
|
|
74
|
-
const bucket = browsersInstallPerStatus[result.status];
|
|
75
|
-
if ("reason" in result) {
|
|
76
|
-
bucket.push({ tag, reason: result.reason });
|
|
77
|
-
}
|
|
78
|
-
else {
|
|
79
|
-
bucket.push({ tag });
|
|
80
|
-
}
|
|
81
|
-
}
|
|
82
|
-
logResult(browsersInstallPerStatus, "log", BrowserInstallStatus.Ok, "These browsers are downloaded successfully:", ({ tag }) => `- ${tag}`);
|
|
83
|
-
logResult(browsersInstallPerStatus, "warn", BrowserInstallStatus.Skip, "Browser install for these browsers was skipped:", ({ tag, reason }) => `- ${tag}: ${reason}`);
|
|
84
|
-
logResult(browsersInstallPerStatus, "error", BrowserInstallStatus.Error, "An error occured while trying to download these browsers:", ({ tag, reason }) => `- ${tag}: ${reason}`);
|
|
85
93
|
}
|
|
86
94
|
catch (err) {
|
|
87
95
|
logger.error(err.stack || err);
|
|
88
|
-
process.exit(1);
|
|
96
|
+
process.exit((0, exit_code_1.resolveExitCode)(1));
|
|
89
97
|
}
|
|
90
98
|
});
|
|
91
99
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/cli/commands/install-deps/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AACA,+CAA8C;AAC9C,8DAAgD;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/cli/commands/install-deps/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -30,6 +30,7 @@ exports.registerCmd = void 0;
|
|
|
30
30
|
const lodash_1 = __importDefault(require("lodash"));
|
|
31
31
|
const constants_1 = require("../../constants");
|
|
32
32
|
const logger = __importStar(require("../../../utils/logger"));
|
|
33
|
+
const exit_code_1 = require("../../../utils/exit-code");
|
|
33
34
|
const { LIST_BROWSERS: commandName } = constants_1.CliCommands;
|
|
34
35
|
const BrowsersListOutputType = {
|
|
35
36
|
IDS: "ids",
|
|
@@ -76,22 +77,25 @@ const registerCmd = (cliTool, testplane) => {
|
|
|
76
77
|
.option("--format [format]", "return browsers in specified format ('json' / 'plain')", String, BrowsersListOutputFormat.JSON)
|
|
77
78
|
.action(async (options) => {
|
|
78
79
|
const { type, format } = options;
|
|
80
|
+
let exitCode = 0;
|
|
79
81
|
try {
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
82
|
+
await testplane.profileCliCommand(commandName, () => {
|
|
83
|
+
validateOption(BrowsersListOutputType, type, "type");
|
|
84
|
+
validateOption(BrowsersListOutputFormat, format, "format");
|
|
85
|
+
const browsersSorted = type === BrowsersListOutputType.IDS
|
|
86
|
+
? extractBrowserIds(testplane.config)
|
|
87
|
+
: extractBrowserTags(testplane.config, format);
|
|
88
|
+
const outputResult = format === BrowsersListOutputFormat.PLAIN
|
|
89
|
+
? browsersSorted.join(" ")
|
|
90
|
+
: JSON.stringify(browsersSorted);
|
|
91
|
+
console.info(outputResult);
|
|
92
|
+
});
|
|
90
93
|
}
|
|
91
94
|
catch (err) {
|
|
92
95
|
logger.error(err.stack || err);
|
|
93
|
-
|
|
96
|
+
exitCode = 1;
|
|
94
97
|
}
|
|
98
|
+
process.exit((0, exit_code_1.resolveExitCode)(exitCode));
|
|
95
99
|
});
|
|
96
100
|
};
|
|
97
101
|
exports.registerCmd = registerCmd;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/cli/commands/list-browsers/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,oDAAuB;AAEvB,+CAA8C;AAC9C,8DAAgD;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/cli/commands/list-browsers/index.ts"],"names":[],"mappings":"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"}
|