automation_model 1.0.543-dev → 1.0.543-stage
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/lib/api.d.ts +1 -0
- package/lib/api.js +8 -7
- package/lib/api.js.map +1 -1
- package/lib/auto_page.d.ts +5 -2
- package/lib/auto_page.js +101 -5
- package/lib/auto_page.js.map +1 -1
- package/lib/browser_manager.d.ts +3 -2
- package/lib/browser_manager.js +85 -39
- package/lib/browser_manager.js.map +1 -1
- package/lib/command_common.d.ts +1 -1
- package/lib/command_common.js +45 -13
- package/lib/command_common.js.map +1 -1
- package/lib/error-messages.js +18 -0
- package/lib/error-messages.js.map +1 -1
- package/lib/generation_scripts.d.ts +4 -0
- package/lib/generation_scripts.js +2 -0
- package/lib/generation_scripts.js.map +1 -0
- package/lib/init_browser.d.ts +4 -2
- package/lib/init_browser.js +52 -6
- package/lib/init_browser.js.map +1 -1
- package/lib/locate_element.js +10 -10
- package/lib/locate_element.js.map +1 -1
- package/lib/locator_log.d.ts +26 -0
- package/lib/locator_log.js +69 -0
- package/lib/locator_log.js.map +1 -0
- package/lib/network.js +51 -12
- package/lib/network.js.map +1 -1
- package/lib/stable_browser.d.ts +51 -18
- package/lib/stable_browser.js +630 -541
- package/lib/stable_browser.js.map +1 -1
- package/lib/test_context.d.ts +2 -0
- package/lib/test_context.js +1 -0
- package/lib/test_context.js.map +1 -1
- package/lib/utils.d.ts +14 -1
- package/lib/utils.js +344 -6
- package/lib/utils.js.map +1 -1
- package/package.json +7 -7
- /package/lib/{axe → scripts}/axe.mini.js +0 -0
package/lib/command_common.js
CHANGED
|
@@ -1,16 +1,13 @@
|
|
|
1
1
|
import { getHumanReadableErrorMessage } from "./error-messages.js";
|
|
2
|
-
import {
|
|
2
|
+
import { LocatorLog } from "./locator_log.js";
|
|
3
|
+
import { _fixUsingParams, maskValue } from "./utils.js";
|
|
3
4
|
export async function _preCommand(state, stable) {
|
|
4
5
|
if (!state) {
|
|
5
6
|
return;
|
|
6
7
|
}
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
state.selectors = JSON.parse(JSON.stringify(state.selectors));
|
|
11
|
-
if (originalSelectors.frame) {
|
|
12
|
-
state.selectors.frame = originalSelectors.frame;
|
|
13
|
-
}
|
|
8
|
+
let allowDisabled = false;
|
|
9
|
+
if (state.allowDisabled) {
|
|
10
|
+
allowDisabled = true;
|
|
14
11
|
}
|
|
15
12
|
if (state.locate !== false) {
|
|
16
13
|
state.locate = true;
|
|
@@ -29,15 +26,27 @@ export async function _preCommand(state, stable) {
|
|
|
29
26
|
}
|
|
30
27
|
state.info = {};
|
|
31
28
|
if (state.value) {
|
|
32
|
-
state.value =
|
|
29
|
+
state.value = _fixUsingParams(state.value, state._params);
|
|
33
30
|
state.info.value = state.value;
|
|
34
31
|
}
|
|
35
32
|
if (state.attribute) {
|
|
36
33
|
state.info.attribute = state.attribute;
|
|
37
34
|
}
|
|
35
|
+
if (state.selectors) {
|
|
36
|
+
_validateSelectors(state.selectors);
|
|
37
|
+
const originalSelectors = state.selectors;
|
|
38
|
+
state.selectors = JSON.parse(JSON.stringify(state.selectors));
|
|
39
|
+
if (originalSelectors.frame) {
|
|
40
|
+
state.selectors.frame = originalSelectors.frame;
|
|
41
|
+
}
|
|
42
|
+
}
|
|
38
43
|
state.startTime = Date.now();
|
|
39
44
|
state.info.selectors = state.selectors;
|
|
40
45
|
state.info.log = state.log ? state.log : "";
|
|
46
|
+
if (state.selectors) {
|
|
47
|
+
state.info.locatorLog = new LocatorLog();
|
|
48
|
+
state.info.locatorLog.mission = state.info.log.trim();
|
|
49
|
+
}
|
|
41
50
|
state.info.operation = state.operation;
|
|
42
51
|
state.info.failCause = {};
|
|
43
52
|
state.error = null;
|
|
@@ -48,7 +57,7 @@ export async function _preCommand(state, stable) {
|
|
|
48
57
|
if (state.options && state.options.timeout) {
|
|
49
58
|
timeout = state.options.timeout;
|
|
50
59
|
}
|
|
51
|
-
state.element = await stable._locate(state.selectors, state.info, state._params, timeout);
|
|
60
|
+
state.element = await stable._locate(state.selectors, state.info, state._params, timeout, allowDisabled);
|
|
52
61
|
}
|
|
53
62
|
if (state.scroll === true) {
|
|
54
63
|
await stable.scrollIfNeeded(state.element, state.info);
|
|
@@ -73,7 +82,16 @@ export async function _commandError(state, error, stable) {
|
|
|
73
82
|
if (!state.info.failCause) {
|
|
74
83
|
state.info.failCause = {};
|
|
75
84
|
}
|
|
76
|
-
stable.logger.error(state.text + " failed
|
|
85
|
+
stable.logger.error(state.text + " failed");
|
|
86
|
+
if (error && error.message) {
|
|
87
|
+
stable.logger.error(error.message);
|
|
88
|
+
}
|
|
89
|
+
if (state.info.locatorLog) {
|
|
90
|
+
const lines = state.info.locatorLog.toString().split("\n");
|
|
91
|
+
for (let line of lines) {
|
|
92
|
+
stable.logger.error(line);
|
|
93
|
+
}
|
|
94
|
+
}
|
|
77
95
|
const { screenshotId, screenshotPath } = await stable._screenShot(state.options, state.world, state.info);
|
|
78
96
|
state.screenshotId = screenshotId;
|
|
79
97
|
state.screenshotPath = screenshotPath;
|
|
@@ -90,7 +108,20 @@ export async function _commandError(state, error, stable) {
|
|
|
90
108
|
throw error;
|
|
91
109
|
}
|
|
92
110
|
}
|
|
93
|
-
export async function _screenshot(state, stable) {
|
|
111
|
+
export async function _screenshot(state, stable, specificElement) {
|
|
112
|
+
// let focusedElement = null;
|
|
113
|
+
// if (specificElement !== undefined) {
|
|
114
|
+
// focusedElement = specificElement;
|
|
115
|
+
// } else {
|
|
116
|
+
// focusedElement = state.element;
|
|
117
|
+
// }
|
|
118
|
+
// const { screenshotId, screenshotPath } = await stable._screenShot(
|
|
119
|
+
// state.options,
|
|
120
|
+
// state.world,
|
|
121
|
+
// state.info,
|
|
122
|
+
// focusedElement
|
|
123
|
+
// );
|
|
124
|
+
// ;
|
|
94
125
|
const { screenshotId, screenshotPath } = await stable._screenShot(state.options, state.world, state.info);
|
|
95
126
|
state.screenshotId = screenshotId;
|
|
96
127
|
state.screenshotPath = screenshotPath;
|
|
@@ -111,7 +142,7 @@ export function _commandFinally(state, stable) {
|
|
|
111
142
|
status: "FAILED",
|
|
112
143
|
startTime: state.startTime,
|
|
113
144
|
endTime: state.endTime,
|
|
114
|
-
message: state.error?.message,
|
|
145
|
+
message: state?.info?.errorMessage ?? state.error?.message,
|
|
115
146
|
}
|
|
116
147
|
: {
|
|
117
148
|
status: "PASSED",
|
|
@@ -119,6 +150,7 @@ export function _commandFinally(state, stable) {
|
|
|
119
150
|
endTime: state.endTime,
|
|
120
151
|
},
|
|
121
152
|
info: state.info,
|
|
153
|
+
locatorLog: state.info.locatorLog ? state.info.locatorLog.toString() : null,
|
|
122
154
|
};
|
|
123
155
|
if (state.originalValue && state.info) {
|
|
124
156
|
state.info.value = maskValue(state.originalValue);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"command_common.js","sourceRoot":"","sources":["../../src/command_common.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"command_common.js","sourceRoot":"","sources":["../../src/command_common.ts"],"names":[],"mappings":"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"}
|
package/lib/error-messages.js
CHANGED
|
@@ -140,6 +140,18 @@ const classifyErrorFromInfo = (error, info) => {
|
|
|
140
140
|
errorMessage: error.message,
|
|
141
141
|
};
|
|
142
142
|
}
|
|
143
|
+
if (failCause.enabled === false) {
|
|
144
|
+
return {
|
|
145
|
+
errorType: "ElementDisabled",
|
|
146
|
+
errorMessage: failCause.lastError,
|
|
147
|
+
};
|
|
148
|
+
}
|
|
149
|
+
if (failCause.visible === false) {
|
|
150
|
+
return {
|
|
151
|
+
errorType: "ElementNotVisible",
|
|
152
|
+
errorMessage: failCause.lastError,
|
|
153
|
+
};
|
|
154
|
+
}
|
|
143
155
|
if (failCause.textNotFound) {
|
|
144
156
|
return {
|
|
145
157
|
errorType: "TextNotFoundError",
|
|
@@ -164,6 +176,12 @@ const classifyErrorFromInfo = (error, info) => {
|
|
|
164
176
|
errorMessage: failCause.lastError ?? `Found ${failCause.count} elements`,
|
|
165
177
|
};
|
|
166
178
|
}
|
|
179
|
+
if (failCause.assertionFailed) {
|
|
180
|
+
return {
|
|
181
|
+
errorType: "AssertionError",
|
|
182
|
+
errorMessage: failCause.lastError,
|
|
183
|
+
};
|
|
184
|
+
}
|
|
167
185
|
return {
|
|
168
186
|
errorType: "UnknownError",
|
|
169
187
|
errorMessage: error.message,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"error-messages.js","sourceRoot":"","sources":["../../src/error-messages.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"error-messages.js","sourceRoot":"","sources":["../../src/error-messages.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"generation_scripts.js","sourceRoot":"","sources":["../../src/generation_scripts.ts"],"names":[],"mappings":""}
|
package/lib/init_browser.d.ts
CHANGED
|
@@ -3,6 +3,8 @@ import { TestContext } from "./test_context.js";
|
|
|
3
3
|
import { StableBrowser } from "./stable_browser.js";
|
|
4
4
|
import { Browser as PlaywrightBrowser } from "playwright";
|
|
5
5
|
import { Browser } from "./browser_manager.js";
|
|
6
|
-
|
|
6
|
+
import { InitScripts } from "./generation_scripts.js";
|
|
7
|
+
declare const getContext: (environment: Environment | null, headless: boolean | undefined, world: any, logger?: null, appName?: string | null, createStable?: boolean, stable?: StableBrowser | null, moveToRight?: number, reportFolder?: string | null, initScripts?: InitScripts | null, storageState?: any | null) => Promise<TestContext>;
|
|
8
|
+
declare const refreshBrowser: (stable: any, sessionPath: string, world: any) => Promise<void>;
|
|
7
9
|
declare const closeBrowser: (browser?: Browser | PlaywrightBrowser) => Promise<void>;
|
|
8
|
-
export { getContext, closeBrowser };
|
|
10
|
+
export { getContext, closeBrowser, refreshBrowser };
|
package/lib/init_browser.js
CHANGED
|
@@ -7,7 +7,7 @@ import { StableBrowser } from "./stable_browser.js";
|
|
|
7
7
|
import { Api } from "./api.js";
|
|
8
8
|
// let environment = null;
|
|
9
9
|
// init browser create context and page, if context and page are not null
|
|
10
|
-
const getContext = async function (environment, headless = false, world, logger, appName, createStable = true, stable = null, moveToRight = -1, reportFolder = null) {
|
|
10
|
+
const getContext = async function (environment, headless = false, world, logger, appName, createStable = true, stable = null, moveToRight = -1, reportFolder = null, initScripts = null, storageState = null) {
|
|
11
11
|
if (environment === null) {
|
|
12
12
|
environment = initEnvironment();
|
|
13
13
|
}
|
|
@@ -53,7 +53,8 @@ const getContext = async function (environment, headless = false, world, logger,
|
|
|
53
53
|
userAgent = configuration.overrideUserAgent;
|
|
54
54
|
}
|
|
55
55
|
}
|
|
56
|
-
|
|
56
|
+
let usedStorageState = null;
|
|
57
|
+
usedStorageState = { cookies, origins };
|
|
57
58
|
let downloadsPath = "downloads";
|
|
58
59
|
if (reportFolder) {
|
|
59
60
|
downloadsPath = path.join(reportFolder, "downloads");
|
|
@@ -68,16 +69,32 @@ const getContext = async function (environment, headless = false, world, logger,
|
|
|
68
69
|
if (stable && stable.context) {
|
|
69
70
|
stable.context.downloadsPath = downloadsPath;
|
|
70
71
|
}
|
|
71
|
-
|
|
72
|
+
// check if data.json exists in the report folder
|
|
73
|
+
// and if it contain storageState field, if so, use it
|
|
74
|
+
if (reportFolder) {
|
|
75
|
+
const dataFile = path.join(reportFolder, "data.json");
|
|
76
|
+
if (fs.existsSync(dataFile)) {
|
|
77
|
+
const data = fs.readFileSync(dataFile, "utf8");
|
|
78
|
+
const dataObject = JSON.parse(data);
|
|
79
|
+
if (dataObject.storageState) {
|
|
80
|
+
console.log("Init browser with storage state");
|
|
81
|
+
usedStorageState = dataObject.storageState;
|
|
82
|
+
}
|
|
83
|
+
}
|
|
84
|
+
}
|
|
85
|
+
if (storageState) {
|
|
86
|
+
usedStorageState = storageState;
|
|
87
|
+
}
|
|
88
|
+
let browser = await browserManager.createBrowser(headless, usedStorageState, extensionPath, userDataDirPath, reportFolder ? reportFolder : ".", userAgent, channel, configuration, initScripts);
|
|
72
89
|
let context = new TestContext();
|
|
73
90
|
context.browser = browser.browser;
|
|
74
91
|
context.browserObject = browser;
|
|
75
92
|
context.playContext = browser.context;
|
|
76
93
|
context.page = browser.page;
|
|
77
|
-
context.headless = headless;
|
|
78
94
|
context.environment = environment;
|
|
79
95
|
context.browserName = browser.browser ? browser.browser.browserType().name() : "unknown";
|
|
80
96
|
context.reportFolder = reportFolder;
|
|
97
|
+
context.initScripts = initScripts;
|
|
81
98
|
if (createStable) {
|
|
82
99
|
context.stable = new StableBrowser(context.browser, context.page, logger, context, world);
|
|
83
100
|
}
|
|
@@ -111,6 +128,32 @@ const getContext = async function (environment, headless = false, world, logger,
|
|
|
111
128
|
// await _initCookies(context);
|
|
112
129
|
return context;
|
|
113
130
|
};
|
|
131
|
+
const refreshBrowser = async function (stable, sessionPath, world) {
|
|
132
|
+
await stable.context.browserObject.close();
|
|
133
|
+
stable.context.pages = [];
|
|
134
|
+
let storageState = null;
|
|
135
|
+
if (sessionPath) {
|
|
136
|
+
if (!fs.existsSync(sessionPath)) {
|
|
137
|
+
throw new Error("Session path not found: " + sessionPath);
|
|
138
|
+
}
|
|
139
|
+
const data = fs.readFileSync(sessionPath, "utf8");
|
|
140
|
+
storageState = JSON.parse(data).storageState;
|
|
141
|
+
}
|
|
142
|
+
const newContext = await getContext(stable.context.environment, stable.context.headless, world, null, stable.context.appName, false, stable, -1, stable.context.reportFolder, stable.context.initScripts, storageState);
|
|
143
|
+
// clone all the new context properties to the old context
|
|
144
|
+
stable.context.browser = newContext.browser;
|
|
145
|
+
stable.context.browserObject = newContext.browserObject;
|
|
146
|
+
stable.context.playContext = newContext.playContext;
|
|
147
|
+
stable.context.page = newContext.page;
|
|
148
|
+
stable.page = newContext.page;
|
|
149
|
+
stable.context.pages.push(newContext.page);
|
|
150
|
+
stable.context.headless = newContext.headless;
|
|
151
|
+
stable.context.environment = newContext.environment;
|
|
152
|
+
stable.context.browserName = newContext.browserName;
|
|
153
|
+
stable.context.reportFolder = newContext.reportFolder;
|
|
154
|
+
stable.context.initScripts = newContext.initScripts;
|
|
155
|
+
await stable.goto(stable.context.environment.baseUrl);
|
|
156
|
+
};
|
|
114
157
|
const closeBrowser = async function (browser) {
|
|
115
158
|
await browserManager.closeBrowser(browser);
|
|
116
159
|
};
|
|
@@ -139,7 +182,10 @@ const initEnvironment = function () {
|
|
|
139
182
|
}
|
|
140
183
|
}
|
|
141
184
|
}
|
|
142
|
-
//
|
|
185
|
+
// check if the envFile is not empty and exists
|
|
186
|
+
if (!envFile || !fs.existsSync(envFile)) {
|
|
187
|
+
throw new Error(envFile + " not found");
|
|
188
|
+
}
|
|
143
189
|
const data = fs.readFileSync(envFile, "utf8");
|
|
144
190
|
//console.log("data", data);
|
|
145
191
|
const envObject = JSON.parse(data);
|
|
@@ -165,5 +211,5 @@ const checkForEnvArg = function () {
|
|
|
165
211
|
}
|
|
166
212
|
return null;
|
|
167
213
|
};
|
|
168
|
-
export { getContext, closeBrowser };
|
|
214
|
+
export { getContext, closeBrowser, refreshBrowser };
|
|
169
215
|
//# sourceMappingURL=init_browser.js.map
|
package/lib/init_browser.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"init_browser.js","sourceRoot":"","sources":["../../src/init_browser.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAGpD,OAAO,EAAE,GAAG,EAAE,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"init_browser.js","sourceRoot":"","sources":["../../src/init_browser.ts"],"names":[],"mappings":"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"}
|
package/lib/locate_element.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import fs from "fs";
|
|
2
1
|
import axios from "axios";
|
|
3
2
|
import * as path from "path";
|
|
4
3
|
import { fileURLToPath } from "url";
|
|
4
|
+
import { _getServerUrl } from "./utils.js";
|
|
5
5
|
// Get __filename and __dirname in ESM
|
|
6
6
|
const __filename = fileURLToPath(import.meta.url);
|
|
7
7
|
const __dirname = path.dirname(__filename);
|
|
@@ -9,14 +9,14 @@ export async function locate_element(context, elementDescription, operation = "c
|
|
|
9
9
|
// load the axe-core library to all of the frames in the page
|
|
10
10
|
// read the axe-core library from the file system placed in the same folder as the script file, name axe.mini.js
|
|
11
11
|
// Construct the path to axe.min.js relative to the current file
|
|
12
|
-
let axeMinJsPath = path.join(__dirname, "..", "
|
|
13
|
-
// Check if the file exists
|
|
14
|
-
if (!fs.existsSync(axeMinJsPath)) {
|
|
15
|
-
|
|
16
|
-
}
|
|
17
|
-
// Read the content of axe.min.js synchronously
|
|
18
|
-
const axeMinJsContent = fs.readFileSync(axeMinJsPath, "utf-8");
|
|
19
|
-
await Promise.all(context.stable.page.frames().map((frame) => frame.evaluate(axeMinJsContent)));
|
|
12
|
+
// let axeMinJsPath = path.join(__dirname, "..", "scripts", "axe.mini.js");
|
|
13
|
+
// // Check if the file exists
|
|
14
|
+
// if (!fs.existsSync(axeMinJsPath)) {
|
|
15
|
+
// axeMinJsPath = path.join(__dirname, "scripts", "axe.mini.js");
|
|
16
|
+
// }
|
|
17
|
+
// // Read the content of axe.min.js synchronously
|
|
18
|
+
// const axeMinJsContent = fs.readFileSync(axeMinJsPath, "utf-8");
|
|
19
|
+
// await Promise.all(context.stable.page.frames().map((frame: any) => frame.evaluate(axeMinJsContent)));
|
|
20
20
|
const frames = await context.stable.page.frames();
|
|
21
21
|
// for each frame create a tree of the accessibility nodes
|
|
22
22
|
const frameDump = [];
|
|
@@ -171,7 +171,7 @@ export async function locate_element(context, elementDescription, operation = "c
|
|
|
171
171
|
}
|
|
172
172
|
}
|
|
173
173
|
traverseDFS(frameDump[0]);
|
|
174
|
-
let serviceUrl =
|
|
174
|
+
let serviceUrl = _getServerUrl();
|
|
175
175
|
const config = {
|
|
176
176
|
method: "post",
|
|
177
177
|
url: `${serviceUrl}/api/runs/locate-element/locate`,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"locate_element.js","sourceRoot":"","sources":["../../src/locate_element.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"locate_element.js","sourceRoot":"","sources":["../../src/locate_element.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAC7B,OAAO,EAAE,aAAa,EAAE,MAAM,KAAK,CAAC;AACpC,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAE3C,sCAAsC;AACtC,MAAM,UAAU,GAAG,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAClD,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;AAE3C,MAAM,CAAC,KAAK,UAAU,cAAc,CAClC,OAAY,EACZ,kBAA0B,EAC1B,SAAS,GAAG,OAAO,EACnB,QAAuB,IAAI;IAE3B,6DAA6D;IAC7D,gHAAgH;IAChH,gEAAgE;IAChE,2EAA2E;IAC3E,8BAA8B;IAC9B,sCAAsC;IACtC,mEAAmE;IACnE,IAAI;IAEJ,kDAAkD;IAClD,kEAAkE;IAClE,wGAAwG;IAExG,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;IAClD,0DAA0D;IAC1D,MAAM,SAAS,GAAU,EAAE,CAAC;IAC5B,IAAI,WAAW,GAAG,CAAC,CAAC;IACpB,IAAI,cAAc,GAAG,CAAC,CAAC;IACvB,IAAI,sBAAsB,GAAG,CAAC,CAAC;IAC/B,MAAM,WAAW,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;IAC5D,MAAM,kBAAkB,GAAU,EAAE,CAAC;IACrC,KAAK,IAAI,KAAK,IAAI,MAAM,EAAE;QACxB,aAAa;QACb,IAAI,MAAM,GAAQ,IAAI,CAAC;QACvB,IAAI;YACF,MAAM,GAAG,MAAM,KAAK,CAAC,QAAQ;YAC3B,aAAa;YACb,CAAC,CAAC,WAAW,EAAE,cAAc,EAAE,sBAAsB,EAAE,WAAW,CAAC,EAAE,EAAE;gBACrE,IAAI,WAAW,GAAG,CAAC,CAAC;gBACpB,MAAM,kBAAkB,GAAU,EAAE,CAAC;gBACrC,MAAM,eAAe,GAAG;oBACtB,MAAM;oBACN,QAAQ;oBACR,KAAK;oBACL,UAAU;oBACV,kBAAkB;oBAClB,eAAe;oBACf,UAAU;oBACV,SAAS;oBACT,UAAU;oBACV,UAAU;oBACV,OAAO;oBACP,WAAW;oBACX,QAAQ;oBACR,MAAM;oBACN,KAAK;oBACL,UAAU;oBACV,WAAW;oBACX,UAAU;iBACX,CAAC;gBAEF,SAAS,sBAAsB,CAAC,OAAY;oBAC1C,IAAI,CAAC,OAAO,EAAE;wBACZ,OAAO,KAAK,CAAC;qBACd;oBACD,aAAa;oBACb,IAAI,MAAM,GAAG,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAC,OAAO,CAAC,CAAC;oBAC1D,IAAI,MAAM,EAAE;wBACV,OAAO,KAAK,CAAC;qBACd;oBACD,IAAI,OAAO,CAAC,OAAO,KAAK,QAAQ,EAAE;wBAChC,OAAO,IAAI,CAAC;qBACb;oBACD,aAAa;oBACb,IAAI,KAAK,GAAG,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;oBAC9C,IAAI,CAAC,KAAK,EAAE;wBACV,OAAO,KAAK,CAAC;qBACd;oBACD,OAAO,IAAI,CAAC;gBACd,CAAC;gBACD,SAAS,aAAa,CAAC,OAAY;oBACjC,MAAM,KAAK,GAAG,OAAO,CAAC,UAAU,CAAC;oBACjC,MAAM,MAAM,GAAQ,EAAE,CAAC;oBACvB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;wBACrC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;wBACvC,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,OAAO,EAAE;4BAC7B,mBAAmB;4BACnB,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC;yBACpE;qBACF;oBACD,OAAO,MAAM,CAAC;gBAChB,CAAC;gBACD,SAAS,uBAAuB,CAAC,OAAY,EAAE,kBAAuB;oBACpE,oCAAoC;oBAEpC,MAAM,MAAM,GAAG;wBACb,GAAG,EAAE,OAAO,CAAC,OAAO;wBACpB,aAAa;wBACb,IAAI,EAAE,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC;wBACvC,aAAa;wBACb,OAAO,EAAE,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,OAAO,CAAC;wBAC3C,aAAa;wBACb,IAAI,EAAE,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC;wBAC9C,UAAU,EAAE,aAAa,CAAC,OAAO,CAAC;wBAClC,aAAa;wBACb,UAAU,EAAE,WAAW;qBACxB,CAAC;oBACF,IAAI,eAAe,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE;wBACzC,aAAa;wBACb,MAAM,CAAC,aAAa,GAAG,sBAAsB,CAAC;wBAC9C,OAAO,CAAC,YAAY,CAAC,eAAe,EAAE,WAAW,GAAG,WAAW,GAAG,GAAG,GAAG,sBAAsB,CAAC,CAAC;wBAChG,8FAA8F;wBAC9F,sBAAsB,EAAE,CAAC;wBACzB,kBAAkB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;qBACjC;oBACD,IAAI,OAAO,CAAC,OAAO,KAAK,QAAQ,EAAE;wBAChC,aAAa;wBACb,MAAM,CAAC,gBAAgB,GAAG,cAAc,CAAC;wBACzC,cAAc,EAAE,CAAC;qBAClB;oBAED,OAAO,MAAM,CAAC;gBAChB,CAAC;gBACD,kFAAkF;gBAClF,SAAS,sBAAsB,CAAC,IAAS,EAAE,QAAa;oBACtD,qCAAqC;oBACrC,IAAI,CAAC,QAAQ,CAAC,QAAQ,EAAE;wBACtB,QAAQ,CAAC,QAAQ,GAAG,EAAE,CAAC;qBACxB;oBACD,yDAAyD;oBACzD,KAAK,IAAI,KAAK,IAAI,IAAI,CAAC,QAAQ,EAAE;wBAC/B,IAAI,sBAAsB,CAAC,KAAK,CAAC,EAAE;4BACjC,MAAM,iBAAiB,GAAG,uBAAuB,CAAC,KAAK,EAAE,kBAAkB,CAAC,CAAC;4BAC7E,aAAa;4BACb,iFAAiF;4BACjF,mDAAmD;4BACnD,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;4BAC1C,sBAAsB,CAAC,KAAK,EAAE,iBAAiB,CAAC,CAAC;yBAClD;6BAAM;4BACL,sBAAsB,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;yBACzC;qBACF;gBACH,CAAC;gBACD,aAAa;gBACb,GAAG,CAAC,KAAK,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC;gBACrC,MAAM,IAAI,GAAG,uBAAuB,CAAC,QAAQ,CAAC,IAAI,EAAE,kBAAkB,CAAC,CAAC;gBACxE,sBAAsB,CAAC,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;gBAC5C,OAAO,IAAI,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,cAAc,EAAE,sBAAsB,EAAE,kBAAkB,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;YACvG,CAAC,EACD,CAAC,WAAW,EAAE,cAAc,EAAE,sBAAsB,EAAE,WAAW,CAAC,CACnE,CAAC;YACF,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;YACtC,cAAc,GAAG,UAAU,CAAC,cAAc,CAAC;YAC3C,sBAAsB,GAAG,UAAU,CAAC,sBAAsB,CAAC;YAC3D,SAAS,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;YAChC,kBAAkB,CAAC,IAAI,CAAC,GAAG,UAAU,CAAC,kBAAkB,CAAC,CAAC;YAC1D,WAAW,EAAE,CAAC;SACf;QAAC,OAAO,CAAC,EAAE;YACV,SAAS;SACV;KACF;IACD,SAAS,WAAW,CAAC,IAAS;QAC5B,uCAAuC;QACvC,IAAI,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE;YAC7C,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,KAAU,EAAE,EAAE;gBACnC,IAAI,KAAK,CAAC,GAAG,KAAK,QAAQ,EAAE;oBAC1B,IAAI,KAAK,CAAC,gBAAgB,IAAI,SAAS,CAAC,MAAM,IAAI,KAAK,CAAC,gBAAgB,EAAE;wBACxE,KAAK,CAAC,QAAQ,GAAG,CAAC,SAAS,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC,CAAC;qBACtD;iBACF;gBACD,IAAI,KAAK,CAAC,UAAU,EAAE;oBACpB,WAAW,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;iBAC/B;qBAAM;oBACL,WAAW,CAAC,KAAK,CAAC,CAAC;iBACpB;YACH,CAAC,CAAC,CAAC;SACJ;IACH,CAAC;IACD,WAAW,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;IAC1B,IAAI,UAAU,GAAG,aAAa,EAAE,CAAC;IACjC,MAAM,MAAM,GAAG;QACb,MAAM,EAAE,MAAM;QACd,GAAG,EAAE,GAAG,UAAU,iCAAiC;QACnD,OAAO,EAAE;YACP,UAAU,EAAE,MAAM;YAClB,cAAc,EAAE,kBAAkB;YAClC,aAAa,EAAE,UAAU,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE;SAC7C;QACD,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;YACnB,kBAAkB,EAAE,kBAAkB;YACtC,SAAS,EAAE,SAAS;YACpB,IAAI,EAAE,SAAS,CAAC,CAAC,CAAC;YAClB,KAAK,EAAE,KAAK;SACb,CAAC;KACH,CAAC;IAEF,IAAI,MAAM,GAAG,MAAM,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IACzC,4CAA4C;IAC5C,IAAI,MAAM,CAAC,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,IAAI,MAAM,CAAC,IAAI,CAAC,MAAM,KAAK,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE;QAC/F,OAAO,CAAC,KAAK,CAAC,0BAA0B,CAAC,CAAC;QAC1C,OAAO,IAAI,CAAC;KACb;IACD,MAAM,UAAU,GAAG;QACjB,MAAM,EAAE,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM;QACjC,aAAa,EAAE,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,aAAa;QAC/C,UAAU,EAAE,CAAC,CAAC;QACd,KAAK,EAAE,IAAI;QACX,GAAG,EAAE,EAAE;KACR,CAAC;IACF,IAAI,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,aAAa,KAAK,CAAC,CAAC,EAAE;QAC3C,kFAAkF;QAClF,MAAM,iBAAiB,GAAG,kBAAkB,CAAC,IAAI,CAC/C,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,aAAa,KAAK,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,aAAa,CACxE,CAAC;QACF,IAAI,iBAAiB,EAAE;YACrB,UAAU,CAAC,UAAU,GAAG,iBAAiB,CAAC,UAAU,CAAC;YACrD,UAAU,CAAC,KAAK,GAAG,MAAM,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;YACjD,UAAU,CAAC,GAAG,GAAG,4BAA4B,WAAW,IAAI,UAAU,CAAC,aAAa,IAAI,CAAC;SAC1F;KACF;IACD,wCAAwC;IACxC,OAAO,UAAU,CAAC;AACpB,CAAC"}
|
|
@@ -0,0 +1,26 @@
|
|
|
1
|
+
export declare const LocatorStatus: {
|
|
2
|
+
NOT_FOUND: string;
|
|
3
|
+
FOUND_NOT_ENABLED: string;
|
|
4
|
+
FOUND_NOT_VISIBLE: string;
|
|
5
|
+
FOUND_NOT_UNIQUE: string;
|
|
6
|
+
FOUND: string;
|
|
7
|
+
ERROR: string;
|
|
8
|
+
};
|
|
9
|
+
interface Event {
|
|
10
|
+
start: number;
|
|
11
|
+
end: number;
|
|
12
|
+
locatorStatus: string;
|
|
13
|
+
}
|
|
14
|
+
export declare class LocatorLog {
|
|
15
|
+
selectors: any;
|
|
16
|
+
timeout: number;
|
|
17
|
+
startTime: number;
|
|
18
|
+
events: {
|
|
19
|
+
[key: string]: Event[];
|
|
20
|
+
};
|
|
21
|
+
mission: string;
|
|
22
|
+
constructor();
|
|
23
|
+
setLocatorSearchStatus(locatorString: string, status: string): void;
|
|
24
|
+
toString(): string;
|
|
25
|
+
}
|
|
26
|
+
export {};
|
|
@@ -0,0 +1,69 @@
|
|
|
1
|
+
export const LocatorStatus = {
|
|
2
|
+
NOT_FOUND: "NOT_FOUND",
|
|
3
|
+
FOUND_NOT_ENABLED: "FOUND_NOT_ENABLED",
|
|
4
|
+
FOUND_NOT_VISIBLE: "FOUND_NOT_VISIBLE",
|
|
5
|
+
FOUND_NOT_UNIQUE: "FOUND_NOT_UNIQUE",
|
|
6
|
+
FOUND: "FOUND",
|
|
7
|
+
ERROR: "ERROR",
|
|
8
|
+
};
|
|
9
|
+
export class LocatorLog {
|
|
10
|
+
selectors;
|
|
11
|
+
timeout = -1;
|
|
12
|
+
startTime = -1;
|
|
13
|
+
// locators: string[] = [];
|
|
14
|
+
events = {};
|
|
15
|
+
mission = "";
|
|
16
|
+
constructor() {
|
|
17
|
+
// this.selectors = selectors;
|
|
18
|
+
// if (selectors.locators) {
|
|
19
|
+
// for (let locator of selectors.locators) {
|
|
20
|
+
// this.locators.push(JSON.stringify(locator));
|
|
21
|
+
// }
|
|
22
|
+
// }
|
|
23
|
+
this.startTime = Date.now();
|
|
24
|
+
}
|
|
25
|
+
setLocatorSearchStatus(locatorString, status) {
|
|
26
|
+
if (!this.events[locatorString]) {
|
|
27
|
+
this.events[locatorString] = [];
|
|
28
|
+
}
|
|
29
|
+
const locatorEvents = this.events[locatorString];
|
|
30
|
+
if (locatorEvents.length === 0) {
|
|
31
|
+
locatorEvents.push({
|
|
32
|
+
start: Date.now(),
|
|
33
|
+
end: Date.now(),
|
|
34
|
+
locatorStatus: status,
|
|
35
|
+
});
|
|
36
|
+
}
|
|
37
|
+
else {
|
|
38
|
+
const lastEvent = locatorEvents[locatorEvents.length - 1];
|
|
39
|
+
if (lastEvent.locatorStatus !== status) {
|
|
40
|
+
lastEvent.end = Date.now();
|
|
41
|
+
locatorEvents.push({
|
|
42
|
+
start: Date.now(),
|
|
43
|
+
end: Date.now(),
|
|
44
|
+
locatorStatus: status,
|
|
45
|
+
});
|
|
46
|
+
}
|
|
47
|
+
else {
|
|
48
|
+
lastEvent.end = Date.now();
|
|
49
|
+
}
|
|
50
|
+
}
|
|
51
|
+
}
|
|
52
|
+
toString() {
|
|
53
|
+
let result = this.mission + "\n";
|
|
54
|
+
// go over all the keys in the events object
|
|
55
|
+
let locatorIndex = 0;
|
|
56
|
+
for (let locatorString in this.events) {
|
|
57
|
+
const locatorEvents = this.events[locatorString];
|
|
58
|
+
result += `#${locatorIndex + 1} ${locatorString}\n`;
|
|
59
|
+
locatorIndex++;
|
|
60
|
+
for (let event of locatorEvents) {
|
|
61
|
+
const startSecondAfterStart = (event.start - this.startTime) / 1000;
|
|
62
|
+
const duration = (event.end - event.start) / 1000;
|
|
63
|
+
result += ` ${Math.trunc(startSecondAfterStart)}s ${Math.trunc(duration)}s ${event.locatorStatus}\n`;
|
|
64
|
+
}
|
|
65
|
+
}
|
|
66
|
+
return result;
|
|
67
|
+
}
|
|
68
|
+
}
|
|
69
|
+
//# sourceMappingURL=locator_log.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"locator_log.js","sourceRoot":"","sources":["../../src/locator_log.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,aAAa,GAAG;IAC3B,SAAS,EAAE,WAAW;IACtB,iBAAiB,EAAE,mBAAmB;IACtC,iBAAiB,EAAE,mBAAmB;IACtC,gBAAgB,EAAE,kBAAkB;IACpC,KAAK,EAAE,OAAO;IACd,KAAK,EAAE,OAAO;CACf,CAAC;AAMF,MAAM,OAAO,UAAU;IACrB,SAAS,CAAM;IACf,OAAO,GAAW,CAAC,CAAC,CAAC;IACrB,SAAS,GAAW,CAAC,CAAC,CAAC;IACvB,6BAA6B;IAC7B,MAAM,GAA+B,EAAE,CAAC;IACxC,OAAO,GAAW,EAAE,CAAC;IACrB;QACE,iCAAiC;QACjC,4BAA4B;QAC5B,8CAA8C;QAC9C,mDAAmD;QACnD,MAAM;QACN,IAAI;QACJ,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IAC9B,CAAC;IACD,sBAAsB,CAAC,aAAqB,EAAE,MAAc;QAC1D,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,EAAE;YAC/B,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,GAAG,EAAE,CAAC;SACjC;QACD,MAAM,aAAa,GAAG,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;QACjD,IAAI,aAAa,CAAC,MAAM,KAAK,CAAC,EAAE;YAC9B,aAAa,CAAC,IAAI,CAAC;gBACjB,KAAK,EAAE,IAAI,CAAC,GAAG,EAAE;gBACjB,GAAG,EAAE,IAAI,CAAC,GAAG,EAAE;gBACf,aAAa,EAAE,MAAM;aACtB,CAAC,CAAC;SACJ;aAAM;YACL,MAAM,SAAS,GAAG,aAAa,CAAC,aAAa,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;YAC1D,IAAI,SAAS,CAAC,aAAa,KAAK,MAAM,EAAE;gBACtC,SAAS,CAAC,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;gBAC3B,aAAa,CAAC,IAAI,CAAC;oBACjB,KAAK,EAAE,IAAI,CAAC,GAAG,EAAE;oBACjB,GAAG,EAAE,IAAI,CAAC,GAAG,EAAE;oBACf,aAAa,EAAE,MAAM;iBACtB,CAAC,CAAC;aACJ;iBAAM;gBACL,SAAS,CAAC,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;aAC5B;SACF;IACH,CAAC;IACD,QAAQ;QACN,IAAI,MAAM,GAAG,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;QACjC,4CAA4C;QAC5C,IAAI,YAAY,GAAG,CAAC,CAAC;QACrB,KAAK,IAAI,aAAa,IAAI,IAAI,CAAC,MAAM,EAAE;YACrC,MAAM,aAAa,GAAG,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;YACjD,MAAM,IAAI,IAAI,YAAY,GAAG,CAAC,IAAI,aAAa,IAAI,CAAC;YACpD,YAAY,EAAE,CAAC;YACf,KAAK,IAAI,KAAK,IAAI,aAAa,EAAE;gBAC/B,MAAM,qBAAqB,GAAG,CAAC,KAAK,CAAC,KAAK,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,IAAI,CAAC;gBACpE,MAAM,QAAQ,GAAG,CAAC,KAAK,CAAC,GAAG,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC;gBAClD,MAAM,IAAI,KAAK,IAAI,CAAC,KAAK,CAAC,qBAAqB,CAAC,KAAK,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,KAAK,KAAK,CAAC,aAAa,IAAI,CAAC;aACvG;SACF;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;CAIF"}
|