testplane 8.41.1 → 8.42.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 +1 -1
- package/build/src/browser/cdp/domains/fetch.d.ts +9 -0
- package/build/src/browser/cdp/domains/fetch.js +12 -0
- package/build/src/browser/cdp/domains/fetch.js.map +1 -0
- package/build/src/browser/cdp/domains/network.d.ts +24 -0
- package/build/src/browser/cdp/domains/network.js +12 -0
- package/build/src/browser/cdp/domains/network.js.map +1 -0
- package/build/src/browser/cdp/index.d.ts +4 -0
- package/build/src/browser/cdp/index.js +10 -0
- package/build/src/browser/cdp/index.js.map +1 -1
- package/build/src/browser/cdp/selectivity/css-selectivity.js +4 -1
- package/build/src/browser/cdp/selectivity/css-selectivity.js.map +1 -1
- package/build/src/browser/cdp/selectivity/fs-cache.js +2 -2
- package/build/src/browser/cdp/selectivity/fs-cache.js.map +1 -1
- package/build/src/browser/cdp/selectivity/hash-writer.d.ts +2 -2
- package/build/src/browser/cdp/selectivity/hash-writer.js +18 -59
- package/build/src/browser/cdp/selectivity/hash-writer.js.map +1 -1
- package/build/src/browser/cdp/selectivity/index.d.ts +1 -0
- package/build/src/browser/cdp/selectivity/index.js +68 -3
- package/build/src/browser/cdp/selectivity/index.js.map +1 -1
- package/build/src/browser/cdp/selectivity/js-selectivity.js +13 -20
- package/build/src/browser/cdp/selectivity/js-selectivity.js.map +1 -1
- package/build/src/browser/cdp/selectivity/json-utils.d.ts +5 -0
- package/build/src/browser/cdp/selectivity/json-utils.js +16 -6
- package/build/src/browser/cdp/selectivity/json-utils.js.map +1 -1
- package/build/src/browser/cdp/selectivity/merge-dumps/index.d.ts +2 -0
- package/build/src/browser/cdp/selectivity/merge-dumps/index.js +28 -0
- package/build/src/browser/cdp/selectivity/merge-dumps/index.js.map +1 -0
- package/build/src/browser/cdp/selectivity/merge-dumps/merge-hashes.d.ts +2 -0
- package/build/src/browser/cdp/selectivity/merge-dumps/merge-hashes.js +39 -0
- package/build/src/browser/cdp/selectivity/merge-dumps/merge-hashes.js.map +1 -0
- package/build/src/browser/cdp/selectivity/merge-dumps/merge-tests.d.ts +2 -0
- package/build/src/browser/cdp/selectivity/merge-dumps/merge-tests.js +128 -0
- package/build/src/browser/cdp/selectivity/merge-dumps/merge-tests.js.map +1 -0
- package/build/src/browser/cdp/selectivity/runner.d.ts +3 -0
- package/build/src/browser/cdp/selectivity/runner.js +78 -3
- package/build/src/browser/cdp/selectivity/runner.js.map +1 -1
- package/build/src/browser/cdp/selectivity/testplane-selectivity.js +13 -0
- package/build/src/browser/cdp/selectivity/testplane-selectivity.js.map +1 -1
- package/build/src/browser/cdp/selectivity/types.d.ts +2 -1
- package/build/src/browser/cdp/selectivity/used-dumps-tracker.d.ts +7 -0
- package/build/src/browser/cdp/selectivity/used-dumps-tracker.js +25 -0
- package/build/src/browser/cdp/selectivity/used-dumps-tracker.js.map +1 -0
- package/build/src/browser/cdp/selectivity/utils.d.ts +6 -5
- package/build/src/browser/cdp/selectivity/utils.js +51 -13
- package/build/src/browser/cdp/selectivity/utils.js.map +1 -1
- package/build/src/cli/commands/selectivity-merge-dumps/index.d.ts +2 -0
- package/build/src/cli/commands/selectivity-merge-dumps/index.js +50 -0
- package/build/src/cli/commands/selectivity-merge-dumps/index.js.map +1 -0
- package/build/src/cli/constants.d.ts +1 -0
- package/build/src/cli/constants.js +1 -0
- package/build/src/cli/constants.js.map +1 -1
- package/build/src/config/defaults.d.ts +1 -0
- package/build/src/config/defaults.js +1 -0
- package/build/src/config/defaults.js.map +1 -1
- package/build/src/config/types.d.ts +1 -0
- package/build/src/testplane.js +10 -3
- package/build/src/testplane.js.map +1 -1
- package/package.json +1 -1
package/build/package.json
CHANGED
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
import { CDPEventEmitter } from "../emitter";
|
|
2
|
+
export interface FetchEvents {
|
|
3
|
+
authRequired: Record<string, unknown>;
|
|
4
|
+
requestPaused: Record<string, unknown>;
|
|
5
|
+
}
|
|
6
|
+
/** @link https://chromedevtools.github.io/devtools-protocol/1-3/Fetch/ */
|
|
7
|
+
export declare class CDFetch extends CDPEventEmitter<FetchEvents> {
|
|
8
|
+
constructor();
|
|
9
|
+
}
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.CDFetch = void 0;
|
|
4
|
+
const emitter_1 = require("../emitter");
|
|
5
|
+
/** @link https://chromedevtools.github.io/devtools-protocol/1-3/Fetch/ */
|
|
6
|
+
class CDFetch extends emitter_1.CDPEventEmitter {
|
|
7
|
+
constructor() {
|
|
8
|
+
super();
|
|
9
|
+
}
|
|
10
|
+
}
|
|
11
|
+
exports.CDFetch = CDFetch;
|
|
12
|
+
//# sourceMappingURL=fetch.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"fetch.js","sourceRoot":"","sources":["../../../../../src/browser/cdp/domains/fetch.ts"],"names":[],"mappings":";;;AAAA,wCAA6C;AAO7C,0EAA0E;AAC1E,MAAa,OAAQ,SAAQ,yBAA4B;IACrD;QACI,KAAK,EAAE,CAAC;IACZ,CAAC;CACJ;AAJD,0BAIC"}
|
|
@@ -0,0 +1,24 @@
|
|
|
1
|
+
import { CDPEventEmitter } from "../emitter";
|
|
2
|
+
export interface NetworkEvents {
|
|
3
|
+
dataReceived: Record<string, unknown>;
|
|
4
|
+
eventSourceMessageReceived: Record<string, unknown>;
|
|
5
|
+
loadingFailed: Record<string, unknown>;
|
|
6
|
+
loadingFinished: Record<string, unknown>;
|
|
7
|
+
requestServedFromCache: Record<string, unknown>;
|
|
8
|
+
requestWillBeSent: Record<string, unknown>;
|
|
9
|
+
responseReceived: Record<string, unknown>;
|
|
10
|
+
webSocketClosed: Record<string, unknown>;
|
|
11
|
+
webSocketCreated: Record<string, unknown>;
|
|
12
|
+
webSocketFrameError: Record<string, unknown>;
|
|
13
|
+
webSocketFrameReceived: Record<string, unknown>;
|
|
14
|
+
webSocketFrameSent: Record<string, unknown>;
|
|
15
|
+
webSocketHandshakeResponseReceived: Record<string, unknown>;
|
|
16
|
+
webSocketWillSendHandshakeRequest: Record<string, unknown>;
|
|
17
|
+
webTransportClosed: Record<string, unknown>;
|
|
18
|
+
webTransportConnectionEstablished: Record<string, unknown>;
|
|
19
|
+
webTransportCreated: Record<string, unknown>;
|
|
20
|
+
}
|
|
21
|
+
/** @link https://chromedevtools.github.io/devtools-protocol/1-3/Network/ */
|
|
22
|
+
export declare class CDPNetwork extends CDPEventEmitter<NetworkEvents> {
|
|
23
|
+
constructor();
|
|
24
|
+
}
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.CDPNetwork = void 0;
|
|
4
|
+
const emitter_1 = require("../emitter");
|
|
5
|
+
/** @link https://chromedevtools.github.io/devtools-protocol/1-3/Network/ */
|
|
6
|
+
class CDPNetwork extends emitter_1.CDPEventEmitter {
|
|
7
|
+
constructor() {
|
|
8
|
+
super();
|
|
9
|
+
}
|
|
10
|
+
}
|
|
11
|
+
exports.CDPNetwork = CDPNetwork;
|
|
12
|
+
//# sourceMappingURL=network.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"network.js","sourceRoot":"","sources":["../../../../../src/browser/cdp/domains/network.ts"],"names":[],"mappings":";;;AAAA,wCAA6C;AAsB7C,4EAA4E;AAC5E,MAAa,UAAW,SAAQ,yBAA8B;IAC1D;QACI,KAAK,EAAE,CAAC;IACZ,CAAC;CACJ;AAJD,gCAIC"}
|
|
@@ -7,6 +7,8 @@ import { CDPDebugger } from "./domains/debugger";
|
|
|
7
7
|
import { CDPRuntime } from "./domains/runtime";
|
|
8
8
|
import { CDPDom } from "./domains/dom";
|
|
9
9
|
import { CDPCss } from "./domains/css";
|
|
10
|
+
import { CDPNetwork } from "./domains/network";
|
|
11
|
+
import { CDFetch } from "./domains/fetch";
|
|
10
12
|
export declare class CDP {
|
|
11
13
|
private readonly _connection;
|
|
12
14
|
readonly target: CDPTarget;
|
|
@@ -15,6 +17,8 @@ export declare class CDP {
|
|
|
15
17
|
readonly runtime: CDPRuntime;
|
|
16
18
|
readonly dom: CDPDom;
|
|
17
19
|
readonly css: CDPCss;
|
|
20
|
+
readonly network: CDPNetwork;
|
|
21
|
+
readonly fetch: CDFetch;
|
|
18
22
|
static create(browser: Browser): Promise<CDP | null>;
|
|
19
23
|
constructor(connection: CDPConnection);
|
|
20
24
|
request<T = Record<string, unknown>>(method: CDPRequest["method"], params?: CDPRequest["params"] | null, cdpSessionId?: CDPSessionId | null): Promise<T>;
|
|
@@ -8,6 +8,8 @@ const debugger_1 = require("./domains/debugger");
|
|
|
8
8
|
const runtime_1 = require("./domains/runtime");
|
|
9
9
|
const dom_1 = require("./domains/dom");
|
|
10
10
|
const css_1 = require("./domains/css");
|
|
11
|
+
const network_1 = require("./domains/network");
|
|
12
|
+
const fetch_1 = require("./domains/fetch");
|
|
11
13
|
class CDP {
|
|
12
14
|
static async create(browser) {
|
|
13
15
|
// "isChrome" is "true" when automationProtocol is "devtools"
|
|
@@ -26,6 +28,8 @@ class CDP {
|
|
|
26
28
|
this.runtime = new runtime_1.CDPRuntime(connection);
|
|
27
29
|
this.dom = new dom_1.CDPDom(connection);
|
|
28
30
|
this.css = new css_1.CDPCss(connection);
|
|
31
|
+
this.network = new network_1.CDPNetwork();
|
|
32
|
+
this.fetch = new fetch_1.CDFetch();
|
|
29
33
|
this._connection.onEventMessage = this._onEventMessage.bind(this);
|
|
30
34
|
}
|
|
31
35
|
async request(method, params, cdpSessionId) {
|
|
@@ -58,6 +62,12 @@ class CDP {
|
|
|
58
62
|
case "CSS":
|
|
59
63
|
this.css.emit(method, cdpEventMessage.params);
|
|
60
64
|
break;
|
|
65
|
+
case "Network":
|
|
66
|
+
this.network.emit(method, cdpEventMessage.params);
|
|
67
|
+
break;
|
|
68
|
+
case "Fetch":
|
|
69
|
+
this.fetch.emit(method, cdpEventMessage.params);
|
|
70
|
+
break;
|
|
61
71
|
}
|
|
62
72
|
}
|
|
63
73
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/browser/cdp/index.ts"],"names":[],"mappings":";;;AAEA,6CAA6C;AAC7C,6CAA6C;AAC7C,iDAAiD;AACjD,iDAAiD;AACjD,+CAA+C;AAC/C,uCAAuC;AACvC,uCAAuC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/browser/cdp/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -25,7 +25,10 @@ class CSSSelectivity {
|
|
|
25
25
|
return;
|
|
26
26
|
}
|
|
27
27
|
if (!sourceURL || !sourceMapURL) {
|
|
28
|
-
this._stylesSourceMap[styleSheetId] ||=
|
|
28
|
+
this._stylesSourceMap[styleSheetId] ||= null;
|
|
29
|
+
return;
|
|
30
|
+
}
|
|
31
|
+
if (this._stylesSourceMap[styleSheetId]) {
|
|
29
32
|
return;
|
|
30
33
|
}
|
|
31
34
|
const sourceMapResolvedUrl = (0, node_url_1.resolve)(sourceURL, sourceMapURL);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"css-selectivity.js","sourceRoot":"","sources":["../../../../../src/browser/cdp/selectivity/css-selectivity.ts"],"names":[],"mappings":";;;;;;AAAA,mCAAiC;AACjC,0DAA6B;AAC7B,uCAAiD;AACjD,iEAA+E;AAC/E,mCAMiB;AACjB,yCAAqH;AACrH,mCAA2C;AAM3C,MAAa,cAAc;IAQvB,YAAY,GAAQ,EAAE,SAAuB,EAAE,UAAU,GAAG,EAAE;QAJtD,4BAAuB,GAA4D,IAAI,CAAC;QACxF,qBAAgB,GAAmD,EAAE,CAAC;QACtE,gCAA2B,GAA2C,EAAE,CAAC;QAG7E,IAAI,CAAC,IAAI,GAAG,GAAG,CAAC;QAChB,IAAI,CAAC,UAAU,GAAG,SAAS,CAAC;QAC5B,IAAI,CAAC,WAAW,GAAG,UAAU,CAAC;IAClC,CAAC;IAEO,aAAa,CAAC,EAAE,MAAM,EAAE,EAAE,YAAY,EAAE,SAAS,EAAE,YAAY,EAAE,EAAgC;QACrG,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC;YACnB,OAAO;QACX,CAAC;QAED,IAAI,CAAC,SAAS,IAAI,CAAC,YAAY,EAAE,CAAC;YAC9B,IAAI,CAAC,gBAAgB,CAAC,YAAY,CAAC,KAAK,
|
|
1
|
+
{"version":3,"file":"css-selectivity.js","sourceRoot":"","sources":["../../../../../src/browser/cdp/selectivity/css-selectivity.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
6
6
|
exports.setCachedSelectivityFile = exports.getCachedSelectivityFile = exports.hasCachedSelectivityFile = exports.CacheType = void 0;
|
|
7
7
|
const node_os_1 = __importDefault(require("node:os"));
|
|
8
8
|
const node_path_1 = __importDefault(require("node:path"));
|
|
9
|
+
const node_perf_hooks_1 = require("node:perf_hooks");
|
|
9
10
|
const p_limit_1 = __importDefault(require("p-limit"));
|
|
10
11
|
const proper_lockfile_1 = __importDefault(require("proper-lockfile"));
|
|
11
12
|
const fs_extra_1 = __importDefault(require("fs-extra"));
|
|
@@ -16,7 +17,6 @@ exports.CacheType = {
|
|
|
16
17
|
Asset: "a",
|
|
17
18
|
};
|
|
18
19
|
// Cache is considered fresh if it was created after process start
|
|
19
|
-
const processStartTime = Number(new Date());
|
|
20
20
|
const tmpDir = node_path_1.default.join(node_os_1.default.tmpdir(), constants_1.SELECTIVITY_CACHE_DIRECTIRY);
|
|
21
21
|
// https://nodejs.org/api/cli.html#uv_threadpool_sizesize
|
|
22
22
|
const libUVLimited = (0, p_limit_1.default)((process.env.UV_THREADPOOL_SIZE && Number(process.env.UV_THREADPOOL_SIZE)) || 16);
|
|
@@ -26,7 +26,7 @@ const ensureSelectivityCacheDirectory = async () => {
|
|
|
26
26
|
const wasModifiedAfterProcessStart = async (flagFilePath) => {
|
|
27
27
|
try {
|
|
28
28
|
const stats = await libUVLimited(() => fs_extra_1.default.stat(flagFilePath));
|
|
29
|
-
return stats.mtimeMs >=
|
|
29
|
+
return stats.mtimeMs >= node_perf_hooks_1.performance.timeOrigin;
|
|
30
30
|
}
|
|
31
31
|
catch {
|
|
32
32
|
return false;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fs-cache.js","sourceRoot":"","sources":["../../../../../src/browser/cdp/selectivity/fs-cache.ts"],"names":[],"mappings":";;;;;;AAAA,sDAAyB;AACzB,0DAA6B;AAC7B,sDAA6B;AAC7B,sEAAuC;AACvC,wDAA0B;AAC1B,kDAA+C;AAC/C,2CAA0F;AAE7E,QAAA,SAAS,GAAG;IACrB,QAAQ,EAAE,GAAG;IACb,KAAK,EAAE,GAAG;CACJ,CAAC;AAIX,kEAAkE;AAClE,MAAM,
|
|
1
|
+
{"version":3,"file":"fs-cache.js","sourceRoot":"","sources":["../../../../../src/browser/cdp/selectivity/fs-cache.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,8 +11,8 @@ export declare class HashWriter {
|
|
|
11
11
|
private _addFileDependency;
|
|
12
12
|
private _addPatternDependency;
|
|
13
13
|
private _addModuleDependency;
|
|
14
|
-
addPatternDependencyHash(
|
|
14
|
+
addPatternDependencyHash(dependencyPattern: string): void;
|
|
15
15
|
addTestDependencyHashes(dependencies: NormalizedDependencies): void;
|
|
16
|
-
|
|
16
|
+
save(readExisting?: boolean): Promise<void>;
|
|
17
17
|
}
|
|
18
18
|
export declare const getHashWriter: ((testDependenciesPath: string, compression: SelectivityCompressionType) => HashWriter) & import("lodash").MemoizedFunction;
|
|
@@ -12,7 +12,7 @@ const json_utils_1 = require("./json-utils");
|
|
|
12
12
|
class HashWriter {
|
|
13
13
|
constructor(testDependenciesPath, compression) {
|
|
14
14
|
this._hashProvider = new hash_provider_1.HashProvider();
|
|
15
|
-
// "
|
|
15
|
+
// "Promise<string>" - file/module hash, "Promise<Error>" - calculating hash error
|
|
16
16
|
this._stagedFileHashes = new Map();
|
|
17
17
|
this._stagedModuleHashes = new Map();
|
|
18
18
|
this._stagedPatternHashes = new Map();
|
|
@@ -41,82 +41,41 @@ class HashWriter {
|
|
|
41
41
|
const value = this._hashProvider.calculateForFile(filePath).catch(err => err);
|
|
42
42
|
this._stagedModuleHashes.set(modulePath, value);
|
|
43
43
|
}
|
|
44
|
-
addPatternDependencyHash(
|
|
45
|
-
return this._addPatternDependency(
|
|
44
|
+
addPatternDependencyHash(dependencyPattern) {
|
|
45
|
+
return this._addPatternDependency(dependencyPattern);
|
|
46
46
|
}
|
|
47
47
|
addTestDependencyHashes(dependencies) {
|
|
48
48
|
dependencies.css.forEach(dependency => this._addFileDependency(dependency));
|
|
49
49
|
dependencies.js.forEach(dependency => this._addFileDependency(dependency));
|
|
50
50
|
dependencies.modules.forEach(dependency => this._addModuleDependency(dependency));
|
|
51
51
|
}
|
|
52
|
-
async
|
|
52
|
+
async save(readExisting) {
|
|
53
53
|
const hasStaged = Boolean(this._stagedFileHashes.size || this._stagedModuleHashes.size || this._stagedPatternHashes.size);
|
|
54
54
|
if (!hasStaged) {
|
|
55
55
|
return;
|
|
56
56
|
}
|
|
57
|
-
const
|
|
58
|
-
|
|
59
|
-
const stagedPatternNames = Array.from(this._stagedPatternHashes.keys());
|
|
60
|
-
const filterMatchingHashes = async (keys, src, dest) => {
|
|
61
|
-
const remainingKeys = [];
|
|
62
|
-
for (const key of keys) {
|
|
63
|
-
const oldValue = dest[key];
|
|
64
|
-
const newValue = await src.get(key);
|
|
65
|
-
if (newValue === null) {
|
|
66
|
-
continue;
|
|
67
|
-
}
|
|
68
|
-
if (newValue === oldValue) {
|
|
69
|
-
src.set(key, null);
|
|
70
|
-
}
|
|
71
|
-
else {
|
|
72
|
-
remainingKeys.push(key);
|
|
73
|
-
}
|
|
74
|
-
}
|
|
75
|
-
return remainingKeys;
|
|
76
|
-
};
|
|
77
|
-
const writeTo = async (keys, src, dest) => {
|
|
78
|
-
let needsReSort = false;
|
|
57
|
+
const writeTo = async (src, dest) => {
|
|
58
|
+
const keys = Array.from(src.keys());
|
|
79
59
|
for (const key of keys) {
|
|
80
60
|
const hash = await src.get(key);
|
|
81
|
-
if (!hash) {
|
|
82
|
-
continue;
|
|
83
|
-
}
|
|
84
61
|
if (hash instanceof Error) {
|
|
85
62
|
throw hash;
|
|
86
63
|
}
|
|
87
|
-
needsReSort = needsReSort || !Object.hasOwn(dest, key);
|
|
88
64
|
dest[key] = hash;
|
|
89
65
|
}
|
|
90
|
-
|
|
91
|
-
(0, utils_1.shallowSortObject)(dest);
|
|
92
|
-
}
|
|
93
|
-
};
|
|
94
|
-
const markAsCommited = (keys, src) => {
|
|
95
|
-
keys.forEach(key => src.set(key, null));
|
|
66
|
+
(0, utils_1.shallowSortObject)(dest);
|
|
96
67
|
};
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
]);
|
|
109
|
-
if (!updatedFiles.length && !updatedModules.length && !updatedPatterns.length) {
|
|
110
|
-
return;
|
|
111
|
-
}
|
|
112
|
-
await Promise.all([
|
|
113
|
-
writeTo(updatedModules, this._stagedModuleHashes, existingHashesContent.modules),
|
|
114
|
-
writeTo(updatedFiles, this._stagedFileHashes, existingHashesContent.files),
|
|
115
|
-
writeTo(updatedPatterns, this._stagedPatternHashes, existingHashesContent.patterns),
|
|
116
|
-
]);
|
|
117
|
-
await (0, json_utils_1.writeJsonWithCompression)(this._selectivityHashesPath, existingHashesContent, this._compresion);
|
|
118
|
-
markAsCommited(updatedModules, this._stagedModuleHashes);
|
|
119
|
-
markAsCommited(updatedFiles, this._stagedFileHashes);
|
|
68
|
+
const fileContents = readExisting
|
|
69
|
+
? await (0, utils_1.readHashFileContents)(this._selectivityHashesPath, this._compresion)
|
|
70
|
+
: {
|
|
71
|
+
files: {},
|
|
72
|
+
modules: {},
|
|
73
|
+
patterns: {},
|
|
74
|
+
};
|
|
75
|
+
await writeTo(this._stagedFileHashes, fileContents.files);
|
|
76
|
+
await writeTo(this._stagedModuleHashes, fileContents.modules);
|
|
77
|
+
await writeTo(this._stagedPatternHashes, fileContents.patterns);
|
|
78
|
+
await (0, json_utils_1.writeJsonWithCompression)(this._selectivityHashesPath, fileContents, this._compresion);
|
|
120
79
|
}
|
|
121
80
|
}
|
|
122
81
|
exports.HashWriter = HashWriter;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hash-writer.js","sourceRoot":"","sources":["../../../../../src/browser/cdp/selectivity/hash-writer.ts"],"names":[],"mappings":";;;;;;AAAA,mCAAiC;AACjC,0DAA6B;AAC7B,mDAA+C;AAC/C,mCAA4F;AAC5F,6CAAwD;AAGxD,MAAa,UAAU;IASnB,YAAY,oBAA4B,EAAE,WAAuC;QARhE,kBAAa,GAAG,IAAI,4BAAY,EAAE,CAAC;QACpD,
|
|
1
|
+
{"version":3,"file":"hash-writer.js","sourceRoot":"","sources":["../../../../../src/browser/cdp/selectivity/hash-writer.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,5 +7,6 @@ type StopSelectivityFn = (test: Test, shouldWrite: boolean) => Promise<void>;
|
|
|
7
7
|
* Not using "Promise.all" here because all hashes are already calculated and cached at the start
|
|
8
8
|
*/
|
|
9
9
|
export declare const updateSelectivityHashes: (config: Config) => Promise<void>;
|
|
10
|
+
export declare const clearUnusedSelectivityDumps: (config: Config) => Promise<void>;
|
|
10
11
|
export declare const startSelectivity: (browser: ExistingBrowser) => Promise<StopSelectivityFn>;
|
|
11
12
|
export {};
|
|
@@ -1,6 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
2
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.startSelectivity = exports.updateSelectivityHashes = void 0;
|
|
6
|
+
exports.startSelectivity = exports.clearUnusedSelectivityDumps = exports.updateSelectivityHashes = void 0;
|
|
7
|
+
const node_path_1 = __importDefault(require("node:path"));
|
|
8
|
+
const fs_extra_1 = __importDefault(require("fs-extra"));
|
|
4
9
|
const css_selectivity_1 = require("./css-selectivity");
|
|
5
10
|
const js_selectivity_1 = require("./js-selectivity");
|
|
6
11
|
const test_dependencies_writer_1 = require("./test-dependencies-writer");
|
|
@@ -11,16 +16,21 @@ const testplane_selectivity_1 = require("./testplane-selectivity");
|
|
|
11
16
|
const hash_reader_1 = require("./hash-reader");
|
|
12
17
|
const events_1 = require("../../../events");
|
|
13
18
|
const modes_1 = require("./modes");
|
|
19
|
+
const debug_1 = require("./debug");
|
|
20
|
+
const used_dumps_tracker_1 = require("./used-dumps-tracker");
|
|
14
21
|
/**
|
|
15
22
|
* Called at the end of successfull testplane run
|
|
16
23
|
* Not using "Promise.all" here because all hashes are already calculated and cached at the start
|
|
17
24
|
*/
|
|
18
25
|
const updateSelectivityHashes = async (config) => {
|
|
19
26
|
const browserIds = config.getBrowserIds();
|
|
27
|
+
const processedRoots = new Set();
|
|
20
28
|
for (const browserId of browserIds) {
|
|
21
29
|
const browserConfig = config.forBrowser(browserId);
|
|
22
30
|
const { enabled, testDependenciesPath, compression, disableSelectivityPatterns } = browserConfig.selectivity;
|
|
23
|
-
|
|
31
|
+
const shouldReadExistingHashes = (0, modes_1.selectivityShouldRead)(enabled);
|
|
32
|
+
const rootKey = `${shouldReadExistingHashes}#${testDependenciesPath}#${compression}`;
|
|
33
|
+
if (!(0, modes_1.selectivityShouldWrite)(enabled) || processedRoots.has(rootKey)) {
|
|
24
34
|
continue;
|
|
25
35
|
}
|
|
26
36
|
const hashReader = (0, hash_reader_1.getHashReader)(testDependenciesPath, compression);
|
|
@@ -32,14 +42,69 @@ const updateSelectivityHashes = async (config) => {
|
|
|
32
42
|
}
|
|
33
43
|
}
|
|
34
44
|
try {
|
|
35
|
-
await hashWriter.
|
|
45
|
+
await hashWriter.save(shouldReadExistingHashes);
|
|
36
46
|
}
|
|
37
47
|
catch (cause) {
|
|
38
48
|
throw new Error("Selectivity: couldn't save test dependencies hash", { cause });
|
|
39
49
|
}
|
|
50
|
+
processedRoots.add(rootKey);
|
|
40
51
|
}
|
|
41
52
|
};
|
|
42
53
|
exports.updateSelectivityHashes = updateSelectivityHashes;
|
|
54
|
+
const clearUnusedSelectivityDumps = async (config) => {
|
|
55
|
+
const usedDumpsTracker = (0, used_dumps_tracker_1.getUsedDumpsTracker)();
|
|
56
|
+
const browserIds = config.getBrowserIds();
|
|
57
|
+
const selectivityRoots = [];
|
|
58
|
+
for (const browserId of browserIds) {
|
|
59
|
+
const browserConfig = config.forBrowser(browserId);
|
|
60
|
+
const { enabled, testDependenciesPath } = browserConfig.selectivity;
|
|
61
|
+
if ((0, modes_1.selectivityShouldWrite)(enabled) && !selectivityRoots.includes(testDependenciesPath)) {
|
|
62
|
+
selectivityRoots.push(testDependenciesPath);
|
|
63
|
+
}
|
|
64
|
+
}
|
|
65
|
+
let filesTotal = 0;
|
|
66
|
+
let filesDeleted = 0;
|
|
67
|
+
// eslint-disable-next-line no-bitwise
|
|
68
|
+
const rwMode = fs_extra_1.default.constants.R_OK | fs_extra_1.default.constants.W_OK;
|
|
69
|
+
await Promise.all(selectivityRoots.map(async (selectivityRoot) => {
|
|
70
|
+
if (!usedDumpsTracker.usedDumpsFor(selectivityRoot)) {
|
|
71
|
+
return;
|
|
72
|
+
}
|
|
73
|
+
const testsPath = (0, utils_1.getSelectivityTestsPath)(selectivityRoot);
|
|
74
|
+
const accessError = await fs_extra_1.default.access(testsPath, rwMode).catch((err) => err);
|
|
75
|
+
if (accessError) {
|
|
76
|
+
if (!("code" in accessError && accessError.code === "ENOENT")) {
|
|
77
|
+
(0, debug_1.debugSelectivity)(`Couldn't access "${testsPath}" to clear stale files: %O`, accessError);
|
|
78
|
+
}
|
|
79
|
+
return;
|
|
80
|
+
}
|
|
81
|
+
const testsFileNames = await fs_extra_1.default.readdir(testsPath);
|
|
82
|
+
filesTotal += testsFileNames.length;
|
|
83
|
+
for (const testFileName of testsFileNames) {
|
|
84
|
+
const extensionPosition = testFileName.indexOf(".json");
|
|
85
|
+
// If the file does not look like selectivity test dependencies, skip it
|
|
86
|
+
if (extensionPosition === -1) {
|
|
87
|
+
continue;
|
|
88
|
+
}
|
|
89
|
+
const dumpId = testFileName.slice(0, extensionPosition);
|
|
90
|
+
if (!usedDumpsTracker.wasUsed(dumpId, selectivityRoot)) {
|
|
91
|
+
const filePath = node_path_1.default.join(testsPath, testFileName);
|
|
92
|
+
await fs_extra_1.default
|
|
93
|
+
.unlink(filePath)
|
|
94
|
+
.then(() => {
|
|
95
|
+
filesDeleted++;
|
|
96
|
+
})
|
|
97
|
+
.catch(err => {
|
|
98
|
+
(0, debug_1.debugSelectivity)(`Couldn't remove stale file "${filePath}": %O`, err);
|
|
99
|
+
});
|
|
100
|
+
}
|
|
101
|
+
}
|
|
102
|
+
}));
|
|
103
|
+
if (filesDeleted) {
|
|
104
|
+
(0, debug_1.debugSelectivity)(`Out of ${filesTotal} dump files, ${filesDeleted} were considered as outdated and deleted`);
|
|
105
|
+
}
|
|
106
|
+
};
|
|
107
|
+
exports.clearUnusedSelectivityDumps = clearUnusedSelectivityDumps;
|
|
43
108
|
const startSelectivity = async (browser) => {
|
|
44
109
|
const { enabled, compression, sourceRoot, testDependenciesPath, mapDependencyRelativePath } = browser.config.selectivity;
|
|
45
110
|
if (!(0, modes_1.selectivityShouldWrite)(enabled) || !browser.publicAPI.isChromium) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/browser/cdp/selectivity/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/browser/cdp/selectivity/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -29,8 +29,11 @@ class JSSelectivity {
|
|
|
29
29
|
}
|
|
30
30
|
this._scriptIdToSourceUrl[scriptId] ||= url;
|
|
31
31
|
if (!url || !sourceMapURL) {
|
|
32
|
-
this._scriptsSource[scriptId] ||=
|
|
33
|
-
this._scriptsSourceMap[scriptId] ||=
|
|
32
|
+
this._scriptsSource[scriptId] ||= null;
|
|
33
|
+
this._scriptsSourceMap[scriptId] ||= null;
|
|
34
|
+
return;
|
|
35
|
+
}
|
|
36
|
+
if (this._scriptsSource[scriptId] && this._scriptsSourceMap[scriptId]) {
|
|
34
37
|
return;
|
|
35
38
|
}
|
|
36
39
|
this._scriptsSource[scriptId] ||= (0, fs_cache_1.hasCachedSelectivityFile)(fs_cache_1.CacheType.Asset, url).then(isCached => {
|
|
@@ -94,18 +97,18 @@ class JSSelectivity {
|
|
|
94
97
|
return null;
|
|
95
98
|
}
|
|
96
99
|
const coverage = await this._cdp.profiler.takePreciseCoverage(this._sessionId);
|
|
97
|
-
const scriptsWithUrl = coverage.result.filter(script => script.url);
|
|
98
100
|
// If we haven't got "scriptParsed" event for the script, pull up source code + source map manually
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
101
|
+
coverage.result.forEach(({ scriptId, url }) => {
|
|
102
|
+
const fixedUrl = url || this._scriptIdToSourceUrl[scriptId];
|
|
103
|
+
// Was processed with "this._processScript" or anonymous
|
|
104
|
+
if ((this._scriptsSource[scriptId] && this._scriptsSourceMap[scriptId]) || !fixedUrl) {
|
|
102
105
|
return;
|
|
103
106
|
}
|
|
104
107
|
// Not dropping sources to fs the end of test (when "stop" is called) because we use it immediately
|
|
105
108
|
const scriptSourcePromise = this._cdp.debugger
|
|
106
109
|
.getScriptSource(this._sessionId, scriptId)
|
|
107
110
|
.then(({ scriptSource }) => {
|
|
108
|
-
(0, fs_cache_1.setCachedSelectivityFile)(fs_cache_1.CacheType.Asset,
|
|
111
|
+
(0, fs_cache_1.setCachedSelectivityFile)(fs_cache_1.CacheType.Asset, fixedUrl, scriptSource).catch(() => { });
|
|
109
112
|
return scriptSource;
|
|
110
113
|
})
|
|
111
114
|
.catch((err) => err);
|
|
@@ -127,7 +130,7 @@ class JSSelectivity {
|
|
|
127
130
|
if ((0, utils_1.isDataProtocol)(sourceMapURL)) {
|
|
128
131
|
return (0, utils_1.fetchTextWithBrowserFallback)(sourceMapURL, this._cdp.runtime, this._sessionId).catch((err) => err);
|
|
129
132
|
}
|
|
130
|
-
const resolvedSourceMapUrl = (0, node_url_1.resolve)(
|
|
133
|
+
const resolvedSourceMapUrl = (0, node_url_1.resolve)(fixedUrl, sourceMapURL);
|
|
131
134
|
this._scriptIdToSourceMapUrl[scriptId] ||= resolvedSourceMapUrl;
|
|
132
135
|
try {
|
|
133
136
|
const cachedSourceMaps = await (0, fs_cache_1.getCachedSelectivityFile)(fs_cache_1.CacheType.Asset, resolvedSourceMapUrl);
|
|
@@ -181,19 +184,9 @@ class JSSelectivity {
|
|
|
181
184
|
if (!sourceString || !sourceMapsString) {
|
|
182
185
|
throw new Error(`JS Selectivity: fs-cache is broken for ${sourceUrl}`);
|
|
183
186
|
}
|
|
184
|
-
const
|
|
185
|
-
grouppedByScriptCoverage[scriptId].forEach(entry => {
|
|
186
|
-
entry.functions.forEach(fn => {
|
|
187
|
-
fn.ranges.forEach(range => {
|
|
188
|
-
startOffsetsSet.add(range.startOffset);
|
|
189
|
-
});
|
|
190
|
-
});
|
|
191
|
-
});
|
|
192
|
-
const dependingSourceFiles = (0, utils_1.extractSourceFilesDeps)(sourceString, sourceMapsString, Array.from(startOffsetsSet), this._sourceRoot);
|
|
187
|
+
const dependingSourceFiles = (0, utils_1.extractSourceFilesDeps)(sourceString, sourceMapsString, grouppedByScriptCoverage[scriptId], this._sourceRoot, isSourceCodeFile);
|
|
193
188
|
for (const sourceFile of dependingSourceFiles.values()) {
|
|
194
|
-
|
|
195
|
-
totalDependingSourceFiles.add(sourceFile);
|
|
196
|
-
}
|
|
189
|
+
totalDependingSourceFiles.add(sourceFile);
|
|
197
190
|
}
|
|
198
191
|
}));
|
|
199
192
|
return totalDependingSourceFiles;
|