testplane 8.21.1 → 8.22.1

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.
Files changed (135) hide show
  1. package/build/package.json +15 -9
  2. package/build/src/browser/browser.d.ts +6 -2
  3. package/build/src/browser/browser.js +2 -0
  4. package/build/src/browser/browser.js.map +1 -1
  5. package/build/src/browser/existing-browser.d.ts +2 -0
  6. package/build/src/browser/existing-browser.js +3 -3
  7. package/build/src/browser/existing-browser.js.map +1 -1
  8. package/build/src/browser/new-browser.d.ts +5 -2
  9. package/build/src/browser/new-browser.js +53 -7
  10. package/build/src/browser/new-browser.js.map +1 -1
  11. package/build/src/browser-installer/chrome/browser.d.ts +3 -0
  12. package/build/src/browser-installer/chrome/browser.js +67 -0
  13. package/build/src/browser-installer/chrome/browser.js.map +1 -0
  14. package/build/src/browser-installer/chrome/driver.d.ts +3 -0
  15. package/build/src/browser-installer/chrome/driver.js +65 -0
  16. package/build/src/browser-installer/chrome/driver.js.map +1 -0
  17. package/build/src/browser-installer/chrome/index.d.ts +14 -0
  18. package/build/src/browser-installer/chrome/index.js +34 -0
  19. package/build/src/browser-installer/chrome/index.js.map +1 -0
  20. package/build/src/browser-installer/chromium/browser.d.ts +3 -0
  21. package/build/src/browser-installer/chromium/browser.js +46 -0
  22. package/build/src/browser-installer/chromium/browser.js.map +1 -0
  23. package/build/src/browser-installer/chromium/driver.d.ts +1 -0
  24. package/build/src/browser-installer/chromium/driver.js +41 -0
  25. package/build/src/browser-installer/chromium/driver.js.map +1 -0
  26. package/build/src/browser-installer/chromium/index.d.ts +2 -0
  27. package/build/src/browser-installer/chromium/index.js +8 -0
  28. package/build/src/browser-installer/chromium/index.js.map +1 -0
  29. package/build/src/browser-installer/chromium/revisions/linux.d.ts +2 -0
  30. package/build/src/browser-installer/chromium/revisions/linux.js +45 -0
  31. package/build/src/browser-installer/chromium/revisions/linux.js.map +1 -0
  32. package/build/src/browser-installer/chromium/revisions/mac.d.ts +2 -0
  33. package/build/src/browser-installer/chromium/revisions/mac.js +45 -0
  34. package/build/src/browser-installer/chromium/revisions/mac.js.map +1 -0
  35. package/build/src/browser-installer/chromium/revisions/mac_arm.d.ts +2 -0
  36. package/build/src/browser-installer/chromium/revisions/mac_arm.js +25 -0
  37. package/build/src/browser-installer/chromium/revisions/mac_arm.js.map +1 -0
  38. package/build/src/browser-installer/chromium/revisions/win32.d.ts +2 -0
  39. package/build/src/browser-installer/chromium/revisions/win32.js +45 -0
  40. package/build/src/browser-installer/chromium/revisions/win32.js.map +1 -0
  41. package/build/src/browser-installer/chromium/revisions/win64.d.ts +2 -0
  42. package/build/src/browser-installer/chromium/revisions/win64.js +45 -0
  43. package/build/src/browser-installer/chromium/revisions/win64.js.map +1 -0
  44. package/build/src/browser-installer/chromium/utils.d.ts +4 -0
  45. package/build/src/browser-installer/chromium/utils.js +61 -0
  46. package/build/src/browser-installer/chromium/utils.js.map +1 -0
  47. package/build/src/browser-installer/constants.d.ts +13 -0
  48. package/build/src/browser-installer/constants.js +17 -0
  49. package/build/src/browser-installer/constants.js.map +1 -0
  50. package/build/src/browser-installer/edge/driver.d.ts +3 -0
  51. package/build/src/browser-installer/edge/driver.js +36 -0
  52. package/build/src/browser-installer/edge/driver.js.map +1 -0
  53. package/build/src/browser-installer/edge/index.d.ts +13 -0
  54. package/build/src/browser-installer/edge/index.js +30 -0
  55. package/build/src/browser-installer/edge/index.js.map +1 -0
  56. package/build/src/browser-installer/firefox/browser.d.ts +3 -0
  57. package/build/src/browser-installer/firefox/browser.js +38 -0
  58. package/build/src/browser-installer/firefox/browser.js.map +1 -0
  59. package/build/src/browser-installer/firefox/driver.d.ts +3 -0
  60. package/build/src/browser-installer/firefox/driver.js +30 -0
  61. package/build/src/browser-installer/firefox/driver.js.map +1 -0
  62. package/build/src/browser-installer/firefox/index.d.ts +14 -0
  63. package/build/src/browser-installer/firefox/index.js +40 -0
  64. package/build/src/browser-installer/firefox/index.js.map +1 -0
  65. package/build/src/browser-installer/firefox/utils.d.ts +2 -0
  66. package/build/src/browser-installer/firefox/utils.js +16 -0
  67. package/build/src/browser-installer/firefox/utils.js.map +1 -0
  68. package/build/src/browser-installer/index.d.ts +4 -0
  69. package/build/src/browser-installer/index.js +12 -0
  70. package/build/src/browser-installer/index.js.map +1 -0
  71. package/build/src/browser-installer/install.d.ts +32 -0
  72. package/build/src/browser-installer/install.js +106 -0
  73. package/build/src/browser-installer/install.js.map +1 -0
  74. package/build/src/browser-installer/registry/cli-progress-bar.d.ts +5 -0
  75. package/build/src/browser-installer/registry/cli-progress-bar.js +30 -0
  76. package/build/src/browser-installer/registry/cli-progress-bar.js.map +1 -0
  77. package/build/src/browser-installer/registry/index.d.ts +8 -0
  78. package/build/src/browser-installer/registry/index.js +161 -0
  79. package/build/src/browser-installer/registry/index.js.map +1 -0
  80. package/build/src/browser-installer/run.d.ts +12 -0
  81. package/build/src/browser-installer/run.js +43 -0
  82. package/build/src/browser-installer/run.js.map +1 -0
  83. package/build/src/browser-installer/safari/index.d.ts +11 -0
  84. package/build/src/browser-installer/safari/index.js +27 -0
  85. package/build/src/browser-installer/safari/index.js.map +1 -0
  86. package/build/src/browser-installer/utils.d.ts +35 -0
  87. package/build/src/browser-installer/utils.js +148 -0
  88. package/build/src/browser-installer/utils.js.map +1 -0
  89. package/build/src/browser-pool/basic-pool.d.ts +1 -0
  90. package/build/src/browser-pool/basic-pool.js +3 -1
  91. package/build/src/browser-pool/basic-pool.js.map +1 -1
  92. package/build/src/browser-pool/webdriver-pool.d.ts +17 -0
  93. package/build/src/browser-pool/webdriver-pool.js +69 -0
  94. package/build/src/browser-pool/webdriver-pool.js.map +1 -0
  95. package/build/src/bundle/@wdio-utils.d.ts +1 -0
  96. package/build/src/bundle/@wdio-utils.js +7 -0
  97. package/build/src/bundle/@wdio-utils.js.map +1 -0
  98. package/build/src/bundle/{index.js → cjs/index.js} +24261 -3721
  99. package/build/src/bundle/glob-extra.d.ts +3 -0
  100. package/build/src/bundle/glob-extra.js +8 -0
  101. package/build/src/bundle/glob-extra.js.map +1 -0
  102. package/build/src/{test-reader → bundle}/test-transformer.js +4 -3
  103. package/build/src/bundle/test-transformer.js.map +1 -0
  104. package/build/src/cli/commands/install-deps/index.d.ts +2 -0
  105. package/build/src/cli/commands/install-deps/index.js +72 -0
  106. package/build/src/cli/commands/install-deps/index.js.map +1 -0
  107. package/build/src/cli/constants.d.ts +1 -0
  108. package/build/src/cli/constants.js +1 -0
  109. package/build/src/cli/constants.js.map +1 -1
  110. package/build/src/cli/index.js +3 -1
  111. package/build/src/cli/index.js.map +1 -1
  112. package/build/src/config/types.d.ts +4 -8
  113. package/build/src/constants/config.d.ts +1 -0
  114. package/build/src/constants/config.js +1 -0
  115. package/build/src/constants/config.js.map +1 -1
  116. package/build/src/dev-server/utils.d.ts +5 -5
  117. package/build/src/dev-server/utils.js +4 -0
  118. package/build/src/dev-server/utils.js.map +1 -1
  119. package/build/src/runner/browser-env/vite/browser-modules/tsconfig.tsbuildinfo +1 -1
  120. package/build/src/test-reader/sets-builder/index.js +1 -1
  121. package/build/src/test-reader/sets-builder/index.js.map +1 -1
  122. package/build/src/test-reader/sets-builder/test-set.d.ts +1 -1
  123. package/build/src/test-reader/sets-builder/test-set.js +1 -1
  124. package/build/src/test-reader/sets-builder/test-set.js.map +1 -1
  125. package/build/src/test-reader/test-parser.js +1 -1
  126. package/build/src/test-reader/test-parser.js.map +1 -1
  127. package/build/src/testplane.d.ts +2 -1
  128. package/build/src/testplane.js +2 -2
  129. package/build/src/testplane.js.map +1 -1
  130. package/build/src/vendors/uglifyify/index.d.ts +0 -0
  131. package/build/src/vendors/uglifyify/index.js +2 -0
  132. package/build/src/vendors/uglifyify/index.js.map +1 -0
  133. package/package.json +15 -9
  134. package/build/src/test-reader/test-transformer.js.map +0 -1
  135. /package/build/src/{test-reader → bundle}/test-transformer.d.ts +0 -0
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "testplane",
3
- "version": "8.21.1",
3
+ "version": "8.22.1",
4
4
  "description": "Tests framework based on mocha and wdio",
5
5
  "main": "build/src/index.js",
6
6
  "files": [
@@ -10,7 +10,7 @@
10
10
  "scripts": {
11
11
  "build": "tsc --build && npm run copy-static && npm run build-bundles",
12
12
  "copy-static": "copyfiles 'src/browser/client-scripts/*' build",
13
- "build-node-bundle": "esbuild ./src/bundle/index.ts --outdir=./build/src/bundle --bundle --format=cjs --platform=node --target=ES2021",
13
+ "build-node-bundle": "esbuild ./src/bundle/cjs/index.ts --outdir=./build/src/bundle/cjs --bundle --format=cjs --platform=node --target=ES2021",
14
14
  "build-browser-bundle": "node ./src/browser/client-scripts/build.js",
15
15
  "build-bundles": "concurrently -c 'auto' 'npm:build-browser-bundle' 'npm:build-node-bundle --minify'",
16
16
  "check-types": "tsc --project tsconfig.spec.json",
@@ -54,26 +54,25 @@
54
54
  "@babel/code-frame": "7.24.2",
55
55
  "@gemini-testing/commander": "2.15.4",
56
56
  "@jspm/core": "2.0.1",
57
- "@types/debug": "4.1.12",
58
- "@types/yallist": "4.0.4",
57
+ "@puppeteer/browsers": "2.4.0",
59
58
  "@vitest/spy": "2.1.4",
60
- "@wdio/globals": "8.39.0",
61
59
  "@wdio/protocols": "8.38.0",
62
- "@wdio/types": "8.39.0",
63
60
  "@wdio/utils": "8.39.0",
64
- "@wdio/utils-cjs": "npm:@wdio/utils@7.26.0",
65
61
  "bluebird": "3.5.1",
66
62
  "chalk": "2.4.2",
67
63
  "clear-require": "1.0.1",
64
+ "cli-progress": "3.12.0",
68
65
  "debug": "2.6.9",
69
66
  "devtools": "8.39.0",
67
+ "edgedriver": "5.6.1",
70
68
  "error-stack-parser": "2.1.4",
71
69
  "expect-webdriverio": "3.6.0",
70
+ "extract-zip": "2.0.1",
72
71
  "fastq": "1.13.0",
73
72
  "fs-extra": "5.0.0",
73
+ "geckodriver": "4.5.0",
74
74
  "gemini-configparser": "1.4.1",
75
75
  "get-port": "5.1.1",
76
- "glob-extra": "5.0.2",
77
76
  "import-meta-resolve": "4.0.0",
78
77
  "local-pkg": "0.4.3",
79
78
  "lodash": "4.17.21",
@@ -96,6 +95,7 @@
96
95
  "urijs": "1.19.11",
97
96
  "url-join": "4.0.1",
98
97
  "vite": "5.1.6",
98
+ "wait-port": "1.1.0",
99
99
  "webdriverio": "8.39.0",
100
100
  "worker-farm": "1.7.0",
101
101
  "yallist": "3.1.1"
@@ -110,7 +110,7 @@
110
110
  "@commitlint/config-conventional": "^19.0.3",
111
111
  "@cspotcode/source-map-support": "0.8.0",
112
112
  "@sinonjs/fake-timers": "10.3.0",
113
- "@swc/core": "1.3.40",
113
+ "@swc/core": "1.9.2",
114
114
  "@types/babel__code-frame": "7.0.6",
115
115
  "@types/babel__core": "7.20.5",
116
116
  "@types/bluebird": "3.5.38",
@@ -118,6 +118,8 @@
118
118
  "@types/chai": "4.3.4",
119
119
  "@types/chai-as-promised": "7.1.5",
120
120
  "@types/clear-require": "3.2.1",
121
+ "@types/cli-progress": "3.11.6",
122
+ "@types/debug": "4.1.12",
121
123
  "@types/escape-string-regexp": "2.0.1",
122
124
  "@types/fs-extra": "11.0.4",
123
125
  "@types/lodash": "4.14.191",
@@ -130,8 +132,11 @@
130
132
  "@types/sinonjs__fake-timers": "8.1.2",
131
133
  "@types/urijs": "1.19.25",
132
134
  "@types/url-join": "4.0.3",
135
+ "@types/yallist": "4.0.4",
133
136
  "@typescript-eslint/eslint-plugin": "6.12.0",
134
137
  "@typescript-eslint/parser": "6.12.0",
138
+ "@wdio/types": "8.39.0",
139
+ "@wdio/utils-cjs": "npm:@wdio/utils@7.26.0",
135
140
  "aliasify": "1.9.0",
136
141
  "app-module-path": "2.2.0",
137
142
  "browserify": "13.3.0",
@@ -144,6 +149,7 @@
144
149
  "eslint": "8.25.0",
145
150
  "eslint-config-gemini-testing": "2.8.0",
146
151
  "eslint-config-prettier": "8.7.0",
152
+ "glob-extra": "5.0.2",
147
153
  "husky": "0.11.4",
148
154
  "jsdom": "^24.0.0",
149
155
  "jsdom-global": "3.0.2",
@@ -1,13 +1,15 @@
1
- import { RemoteCapability } from "@wdio/types/build/Capabilities";
2
1
  import { Config } from "../config";
3
2
  import { AsyncEmitter } from "../events";
4
3
  import { BrowserConfig } from "../config/browser-config";
5
4
  import Callstack from "./history/callstack";
5
+ import type { WdProcess, WebdriverPool } from "../browser-pool/webdriver-pool";
6
+ import type { Capabilities } from "@wdio/types";
6
7
  export type BrowserOpts = {
7
8
  id: string;
8
9
  version?: string;
9
10
  state?: Record<string, unknown>;
10
11
  emitter?: AsyncEmitter;
12
+ wdPool?: WebdriverPool;
11
13
  };
12
14
  export type BrowserState = {
13
15
  testXReqId?: string;
@@ -25,6 +27,8 @@ export declare class Browser {
25
27
  protected _callstackHistory: Callstack | null;
26
28
  protected _state: BrowserState;
27
29
  protected _customCommands: Set<CustomCommend>;
30
+ protected _wdPool?: WebdriverPool;
31
+ protected _wdProcess: WdProcess | null;
28
32
  id: string;
29
33
  version?: string;
30
34
  static create<T extends Browser>(this: new (config: Config, opts: BrowserOpts) => T, config: Config, opts: BrowserOpts): T;
@@ -44,7 +48,7 @@ export declare class Browser {
44
48
  get sessionId(): string;
45
49
  get config(): BrowserConfig;
46
50
  get state(): BrowserState;
47
- get capabilities(): RemoteCapability;
51
+ get capabilities(): Capabilities.RemoteCapability;
48
52
  get callstackHistory(): Callstack;
49
53
  get customCommands(): CustomCommend[];
50
54
  }
@@ -35,11 +35,13 @@ class Browser {
35
35
  this._debug = config.system.debug;
36
36
  this._session = null;
37
37
  this._callstackHistory = null;
38
+ this._wdProcess = null;
38
39
  this._state = {
39
40
  ...opts.state,
40
41
  isBroken: false,
41
42
  };
42
43
  this._customCommands = new Set();
44
+ this._wdPool = opts.wdPool;
43
45
  }
44
46
  setHttpTimeout(timeout) {
45
47
  if (timeout === null) {
@@ -1 +1 @@
1
- {"version":3,"file":"browser.js","sourceRoot":"","sources":["../../../src/browser/browser.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"browser.js","sourceRoot":"","sources":["../../../src/browser/browser.ts"],"names":[],"mappings":"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"}
@@ -71,6 +71,8 @@ declare class ExistingBrowser extends Browser {
71
71
  _callstackHistory: import("./history/callstack") | null;
72
72
  _state: import("./browser").BrowserState;
73
73
  _customCommands: Set<import("./browser").CustomCommend>;
74
+ _wdPool?: import("../browser-pool/webdriver-pool").WebdriverPool | undefined;
75
+ _wdProcess: import("../browser-pool/webdriver-pool").WdProcess | null;
74
76
  id: string;
75
77
  version?: string | undefined;
76
78
  setHttpTimeout(timeout: number | null): void;
@@ -4,7 +4,7 @@ const url = require("url");
4
4
  const Promise = require("bluebird");
5
5
  const _ = require("lodash");
6
6
  const webdriverio = require("webdriverio");
7
- const { sessionEnvironmentDetector } = require("@wdio/utils-cjs");
7
+ const { sessionEnvironmentDetector } = require("../bundle/@wdio-utils");
8
8
  const { Browser } = require("./browser");
9
9
  const commandsList = require("./commands");
10
10
  const Camera = require("./camera");
@@ -68,7 +68,7 @@ module.exports = class ExistingBrowser extends Browser {
68
68
  throw new Error(`Prepare screenshot failed with error type '${result.error}' and error message: ${result.message}`);
69
69
  }
70
70
  // https://github.com/webdriverio/webdriverio/issues/11396
71
- if (this._config.automationProtocol === "webdriver" && opts.disableAnimation) {
71
+ if (this._config.automationProtocol === WEBDRIVER_PROTOCOL && opts.disableAnimation) {
72
72
  await this._disableIframeAnimations();
73
73
  }
74
74
  return result;
@@ -292,7 +292,7 @@ module.exports = class ExistingBrowser extends Browser {
292
292
  }
293
293
  async _cleanupPageAnimations() {
294
294
  await this._cleanupFrameAnimations();
295
- if (this._config.automationProtocol === "webdriver") {
295
+ if (this._config.automationProtocol === WEBDRIVER_PROTOCOL) {
296
296
  await this._cleanupIframeAnimations();
297
297
  }
298
298
  }
@@ -1 +1 @@
1
- {"version":3,"file":"existing-browser.js","sourceRoot":"","sources":["../../../src/browser/existing-browser.js"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"existing-browser.js","sourceRoot":"","sources":["../../../src/browser/existing-browser.js"],"names":[],"mappings":"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"}
@@ -15,10 +15,13 @@ export declare class NewBrowser extends Browser {
15
15
  quit(): Promise<void>;
16
16
  protected _createSession(): Promise<WebdriverIO.Browser>;
17
17
  protected _setPageLoadTimeout(): Promise<void>;
18
- protected _getSessionOpts(): RemoteOptions;
19
- protected _extendCapabilities(config: BrowserConfig): WebdriverIO.Capabilities;
18
+ protected _isLocalGridUrl(): boolean;
19
+ protected _getSessionOpts(): Promise<RemoteOptions>;
20
+ protected _extendCapabilities(config: BrowserConfig): Promise<WebdriverIO.Capabilities>;
20
21
  protected _addHeadlessCapability(headless: BrowserConfig["headless"], capabilities: WebdriverIO.Capabilities): WebdriverIO.Capabilities;
21
22
  protected _extendCapabilitiesByVersion(): WebdriverIO.Capabilities;
23
+ protected _getLocalWebdriverGridUrl(): Promise<string>;
24
+ protected _addExecutablePath(config: BrowserConfig, capabilities: WebdriverIO.Capabilities): Promise<WebdriverIO.Capabilities>;
22
25
  protected _getGridHost(url: URI): string;
23
26
  protected _getQueryParams(query: string): Record<string, string>;
24
27
  }
@@ -14,6 +14,8 @@ const history_1 = require("./history");
14
14
  const logger_1 = require("../utils/logger");
15
15
  const runtime_config_1 = require("../config/runtime-config");
16
16
  const config_1 = require("../constants/config");
17
+ const defaults_1 = require("../config/defaults");
18
+ const browser_installer_1 = require("../browser-installer");
17
19
  const DEFAULT_PORT = 4444;
18
20
  const headlessBrowserOptions = {
19
21
  chrome: {
@@ -35,6 +37,10 @@ const headlessBrowserOptions = {
35
37
  capabilityName: "ms:edgeOptions",
36
38
  getArgs: () => ["--headless"],
37
39
  },
40
+ microsoftedge: {
41
+ capabilityName: "ms:edgeOptions",
42
+ getArgs: () => ["--headless"],
43
+ },
38
44
  };
39
45
  class NewBrowser extends browser_1.Browser {
40
46
  constructor(config, opts) {
@@ -60,13 +66,18 @@ class NewBrowser extends browser_1.Browser {
60
66
  try {
61
67
  this.setHttpTimeout(this._config.sessionQuitTimeout);
62
68
  await this._session.deleteSession();
69
+ this._wdProcess?.free();
63
70
  }
64
71
  catch (e) {
65
72
  (0, logger_1.warn)(`WARNING: Can not close session: ${e.message}`);
73
+ this._wdProcess?.kill();
74
+ }
75
+ finally {
76
+ this._wdProcess = null;
66
77
  }
67
78
  }
68
- _createSession() {
69
- const sessionOpts = this._getSessionOpts();
79
+ async _createSession() {
80
+ const sessionOpts = await this._getSessionOpts();
70
81
  return (0, webdriverio_1.remote)(sessionOpts);
71
82
  }
72
83
  async _setPageLoadTimeout() {
@@ -87,10 +98,22 @@ class NewBrowser extends browser_1.Browser {
87
98
  }
88
99
  }
89
100
  }
90
- _getSessionOpts() {
101
+ _isLocalGridUrl() {
102
+ return this._config.gridUrl === config_1.LOCAL_GRID_URL || (0, runtime_config_1.getInstance)().local;
103
+ }
104
+ async _getSessionOpts() {
91
105
  const config = this._config;
92
- const gridUri = new urijs_1.default(config.gridUrl);
93
- const capabilities = this._extendCapabilities(config);
106
+ let gridUrl;
107
+ if (this._isLocalGridUrl() && config.automationProtocol === config_1.WEBDRIVER_PROTOCOL) {
108
+ gridUrl = await this._getLocalWebdriverGridUrl();
109
+ }
110
+ else {
111
+ // if automationProtocol is not "webdriver", fallback to default grid url from "local"
112
+ // because in "devtools" protocol we dont need gridUrl, but it still has to be valid URL
113
+ gridUrl = config.gridUrl === config_1.LOCAL_GRID_URL ? defaults_1.gridUrl : config.gridUrl;
114
+ }
115
+ const gridUri = new urijs_1.default(gridUrl);
116
+ const capabilities = await this._extendCapabilities(config);
94
117
  const { devtools } = (0, runtime_config_1.getInstance)();
95
118
  const options = {
96
119
  protocol: gridUri.protocol(),
@@ -114,13 +137,16 @@ class NewBrowser extends browser_1.Browser {
114
137
  ? this._extendCapabilitiesByVersion()
115
138
  : config.desiredCapabilities;
116
139
  const capabilitiesWithAddedHeadless = this._addHeadlessCapability(config.headless, capabilitiesExtendedByVersion);
117
- return capabilitiesWithAddedHeadless;
140
+ return this._isLocalGridUrl()
141
+ ? this._addExecutablePath(config, capabilitiesWithAddedHeadless)
142
+ : Promise.resolve(capabilitiesWithAddedHeadless);
118
143
  }
119
144
  _addHeadlessCapability(headless, capabilities) {
120
145
  if (!headless) {
121
146
  return capabilities;
122
147
  }
123
- const capabilitySettings = headlessBrowserOptions[capabilities.browserName];
148
+ const browserNameLowerCase = capabilities.browserName?.toLocaleLowerCase();
149
+ const capabilitySettings = headlessBrowserOptions[browserNameLowerCase];
124
150
  if (!capabilitySettings) {
125
151
  (0, logger_1.warn)(`WARNING: Headless setting is not supported for ${capabilities.browserName} browserName`);
126
152
  return capabilities;
@@ -139,6 +165,26 @@ class NewBrowser extends browser_1.Browser {
139
165
  const versionKeyName = desiredCapabilities.browserVersion || sessionEnvFlags.isW3C ? "browserVersion" : "version";
140
166
  return (0, lodash_1.assign)({}, desiredCapabilities, { [versionKeyName]: this.version });
141
167
  }
168
+ async _getLocalWebdriverGridUrl() {
169
+ if (!this._wdPool) {
170
+ throw new Error("webdriver pool is not defined");
171
+ }
172
+ if (this._wdProcess) {
173
+ return this._wdProcess.gridUrl;
174
+ }
175
+ this._wdProcess = await this._wdPool.getWebdriver(this._config.desiredCapabilities?.browserName, this._config.desiredCapabilities?.browserVersion, { debug: this._config.system.debug });
176
+ return this._wdProcess.gridUrl;
177
+ }
178
+ async _addExecutablePath(config, capabilities) {
179
+ const browserNameLowerCase = config.desiredCapabilities?.browserName?.toLowerCase();
180
+ const executablePath = await (0, browser_installer_1.installBrowser)(this._config.desiredCapabilities?.browserName, this._config.desiredCapabilities?.browserVersion);
181
+ if (executablePath) {
182
+ const { capabilityName } = headlessBrowserOptions[browserNameLowerCase];
183
+ capabilities[capabilityName] ||= {};
184
+ capabilities[capabilityName].binary ||= executablePath;
185
+ }
186
+ return capabilities;
187
+ }
142
188
  _getGridHost(url) {
143
189
  return new urijs_1.default({
144
190
  username: url.username(),
@@ -1 +1 @@
1
- {"version":3,"file":"new-browser.js","sourceRoot":"","sources":["../../../src/browser/new-browser.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"new-browser.js","sourceRoot":"","sources":["../../../src/browser/new-browser.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,3 @@
1
+ export declare const installChrome: (version: string, { force }?: {
2
+ force?: boolean | undefined;
3
+ }) => Promise<string>;
@@ -0,0 +1,67 @@
1
+ "use strict";
2
+ var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
3
+ if (k2 === undefined) k2 = k;
4
+ var desc = Object.getOwnPropertyDescriptor(m, k);
5
+ if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
6
+ desc = { enumerable: true, get: function() { return m[k]; } };
7
+ }
8
+ Object.defineProperty(o, k2, desc);
9
+ }) : (function(o, m, k, k2) {
10
+ if (k2 === undefined) k2 = k;
11
+ o[k2] = m[k];
12
+ }));
13
+ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
14
+ Object.defineProperty(o, "default", { enumerable: true, value: v });
15
+ }) : function(o, v) {
16
+ o["default"] = v;
17
+ });
18
+ var __importStar = (this && this.__importStar) || function (mod) {
19
+ if (mod && mod.__esModule) return mod;
20
+ var result = {};
21
+ if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
22
+ __setModuleDefault(result, mod);
23
+ return result;
24
+ };
25
+ Object.defineProperty(exports, "__esModule", { value: true });
26
+ exports.installChrome = void 0;
27
+ const browsers_1 = require("@puppeteer/browsers");
28
+ const constants_1 = require("../constants");
29
+ const utils_1 = require("../utils");
30
+ const registry_1 = require("../registry");
31
+ const utils_2 = require("../utils");
32
+ const installChrome = async (version, { force = false } = {}) => {
33
+ const milestone = (0, utils_1.getMilestone)(version);
34
+ if (Number(milestone) < constants_1.MIN_CHROME_FOR_TESTING_VERSION) {
35
+ (0, utils_1.browserInstallerDebug)(`couldn't install chrome@${version}, installing chromium instead`);
36
+ const { installChromium } = await Promise.resolve().then(() => __importStar(require("../chromium")));
37
+ return installChromium(version, { force });
38
+ }
39
+ const platform = (0, utils_1.getBrowserPlatform)();
40
+ const existingLocallyBrowserVersion = (0, registry_1.getMatchedBrowserVersion)(utils_1.Browser.CHROME, platform, version);
41
+ if (existingLocallyBrowserVersion && !force) {
42
+ (0, utils_1.browserInstallerDebug)(`A locally installed chrome@${version} browser was found. Skipping the installation`);
43
+ return (0, registry_1.getBinaryPath)(utils_1.Browser.CHROME, platform, existingLocallyBrowserVersion);
44
+ }
45
+ const normalizedVersion = (0, utils_2.normalizeChromeVersion)(version);
46
+ const buildId = await (0, browsers_1.resolveBuildId)(utils_1.Browser.CHROME, platform, normalizedVersion);
47
+ const cacheDir = (0, utils_1.getBrowsersDir)();
48
+ const canBeInstalled = await (0, browsers_1.canDownload)({ browser: utils_1.Browser.CHROME, platform, buildId, cacheDir });
49
+ if (!canBeInstalled) {
50
+ throw new Error([
51
+ `chrome@${version} can't be installed.`,
52
+ `Probably the version '${version}' is invalid, please try another version.`,
53
+ "Version examples: '120', '120.0'",
54
+ ].join("\n"));
55
+ }
56
+ const installFn = (downloadProgressCallback) => (0, browsers_1.install)({
57
+ platform,
58
+ buildId,
59
+ cacheDir,
60
+ downloadProgressCallback,
61
+ browser: utils_1.Browser.CHROME,
62
+ unpack: true,
63
+ }).then(result => result.executablePath);
64
+ return (0, registry_1.installBinary)(utils_1.Browser.CHROME, platform, buildId, installFn);
65
+ };
66
+ exports.installChrome = installChrome;
67
+ //# sourceMappingURL=browser.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"browser.js","sourceRoot":"","sources":["../../../../src/browser-installer/chrome/browser.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,kDAA+F;AAC/F,4CAA8D;AAC9D,oCAOkB;AAClB,0CAAqF;AACrF,oCAAkD;AAE3C,MAAM,aAAa,GAAG,KAAK,EAAE,OAAe,EAAE,EAAE,KAAK,GAAG,KAAK,EAAE,GAAG,EAAE,EAAmB,EAAE;IAC5F,MAAM,SAAS,GAAG,IAAA,oBAAY,EAAC,OAAO,CAAC,CAAC;IAExC,IAAI,MAAM,CAAC,SAAS,CAAC,GAAG,0CAA8B,EAAE,CAAC;QACrD,IAAA,6BAAqB,EAAC,2BAA2B,OAAO,+BAA+B,CAAC,CAAC;QAEzF,MAAM,EAAE,eAAe,EAAE,GAAG,wDAAa,aAAa,GAAC,CAAC;QAExD,OAAO,eAAe,CAAC,OAAO,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC;IAC/C,CAAC;IAED,MAAM,QAAQ,GAAG,IAAA,0BAAkB,GAAE,CAAC;IACtC,MAAM,6BAA6B,GAAG,IAAA,mCAAwB,EAAC,eAAO,CAAC,MAAM,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC;IAElG,IAAI,6BAA6B,IAAI,CAAC,KAAK,EAAE,CAAC;QAC1C,IAAA,6BAAqB,EAAC,8BAA8B,OAAO,+CAA+C,CAAC,CAAC;QAE5G,OAAO,IAAA,wBAAa,EAAC,eAAO,CAAC,MAAM,EAAE,QAAQ,EAAE,6BAA6B,CAAC,CAAC;IAClF,CAAC;IAED,MAAM,iBAAiB,GAAG,IAAA,8BAAsB,EAAC,OAAO,CAAC,CAAC;IAC1D,MAAM,OAAO,GAAG,MAAM,IAAA,yBAAc,EAAC,eAAO,CAAC,MAAM,EAAE,QAAQ,EAAE,iBAAiB,CAAC,CAAC;IAElF,MAAM,QAAQ,GAAG,IAAA,sBAAc,GAAE,CAAC;IAClC,MAAM,cAAc,GAAG,MAAM,IAAA,sBAAW,EAAC,EAAE,OAAO,EAAE,eAAO,CAAC,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,QAAQ,EAAE,CAAC,CAAC;IAEnG,IAAI,CAAC,cAAc,EAAE,CAAC;QAClB,MAAM,IAAI,KAAK,CACX;YACI,UAAU,OAAO,sBAAsB;YACvC,yBAAyB,OAAO,2CAA2C;YAC3E,kCAAkC;SACrC,CAAC,IAAI,CAAC,IAAI,CAAC,CACf,CAAC;IACN,CAAC;IAED,MAAM,SAAS,GAAG,CAAC,wBAAkD,EAAmB,EAAE,CACtF,IAAA,kBAAgB,EAAC;QACb,QAAQ;QACR,OAAO;QACP,QAAQ;QACR,wBAAwB;QACxB,OAAO,EAAE,eAAO,CAAC,MAAM;QACvB,MAAM,EAAE,IAAI;KACf,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC;IAE7C,OAAO,IAAA,wBAAa,EAAC,eAAO,CAAC,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,SAAS,CAAC,CAAC;AACvE,CAAC,CAAC;AA/CW,QAAA,aAAa,iBA+CxB"}
@@ -0,0 +1,3 @@
1
+ export declare const installChromeDriver: (chromeVersion: string, { force }?: {
2
+ force?: boolean | undefined;
3
+ }) => Promise<string>;
@@ -0,0 +1,65 @@
1
+ "use strict";
2
+ var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
3
+ if (k2 === undefined) k2 = k;
4
+ var desc = Object.getOwnPropertyDescriptor(m, k);
5
+ if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
6
+ desc = { enumerable: true, get: function() { return m[k]; } };
7
+ }
8
+ Object.defineProperty(o, k2, desc);
9
+ }) : (function(o, m, k, k2) {
10
+ if (k2 === undefined) k2 = k;
11
+ o[k2] = m[k];
12
+ }));
13
+ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
14
+ Object.defineProperty(o, "default", { enumerable: true, value: v });
15
+ }) : function(o, v) {
16
+ o["default"] = v;
17
+ });
18
+ var __importStar = (this && this.__importStar) || function (mod) {
19
+ if (mod && mod.__esModule) return mod;
20
+ var result = {};
21
+ if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
22
+ __setModuleDefault(result, mod);
23
+ return result;
24
+ };
25
+ Object.defineProperty(exports, "__esModule", { value: true });
26
+ exports.installChromeDriver = void 0;
27
+ const browsers_1 = require("@puppeteer/browsers");
28
+ const constants_1 = require("../constants");
29
+ const utils_1 = require("../utils");
30
+ const registry_1 = require("../registry");
31
+ const installChromeDriver = async (chromeVersion, { force = false } = {}) => {
32
+ const platform = (0, utils_1.getBrowserPlatform)();
33
+ const existingLocallyDriverVersion = (0, registry_1.getMatchedDriverVersion)(utils_1.Driver.CHROMEDRIVER, platform, chromeVersion);
34
+ if (existingLocallyDriverVersion && !force) {
35
+ (0, utils_1.browserInstallerDebug)(`A locally installed chromedriver for chrome@${chromeVersion} was found. Skipping the installation`);
36
+ return (0, registry_1.getBinaryPath)(utils_1.Driver.CHROMEDRIVER, platform, existingLocallyDriverVersion);
37
+ }
38
+ const milestone = (0, utils_1.getMilestone)(chromeVersion);
39
+ if (Number(milestone) < constants_1.MIN_CHROMEDRIVER_FOR_TESTING_VERSION) {
40
+ (0, utils_1.browserInstallerDebug)(`installing chromedriver for chrome@${chromeVersion} from chromedriver.storage.googleapis.com manually`);
41
+ const { installChromeDriverManually } = await Promise.resolve().then(() => __importStar(require("../chromium")));
42
+ return installChromeDriverManually(milestone);
43
+ }
44
+ const buildId = await (0, browsers_1.resolveBuildId)(utils_1.Driver.CHROMEDRIVER, platform, milestone);
45
+ const cacheDir = (0, utils_1.getChromeDriverDir)();
46
+ const canBeInstalled = await (0, browsers_1.canDownload)({ browser: utils_1.Driver.CHROMEDRIVER, platform, buildId, cacheDir });
47
+ if (!canBeInstalled) {
48
+ throw new Error([
49
+ `chromedriver@${buildId} can't be installed.`,
50
+ `Probably the major browser version '${milestone}' is invalid`,
51
+ "Correct chrome version examples: '123', '124'",
52
+ ].join("\n"));
53
+ }
54
+ const installFn = (downloadProgressCallback) => (0, browsers_1.install)({
55
+ platform,
56
+ buildId,
57
+ cacheDir: (0, utils_1.getChromeDriverDir)(),
58
+ browser: utils_1.Driver.CHROMEDRIVER,
59
+ unpack: true,
60
+ downloadProgressCallback,
61
+ }).then(result => result.executablePath);
62
+ return (0, registry_1.installBinary)(utils_1.Driver.CHROMEDRIVER, platform, buildId, installFn);
63
+ };
64
+ exports.installChromeDriver = installChromeDriver;
65
+ //# sourceMappingURL=driver.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"driver.js","sourceRoot":"","sources":["../../../../src/browser-installer/chrome/driver.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,kDAA+F;AAC/F,4CAAoE;AACpE,oCAOkB;AAClB,0CAAoF;AAE7E,MAAM,mBAAmB,GAAG,KAAK,EAAE,aAAqB,EAAE,EAAE,KAAK,GAAG,KAAK,EAAE,GAAG,EAAE,EAAmB,EAAE;IACxG,MAAM,QAAQ,GAAG,IAAA,0BAAkB,GAAE,CAAC;IACtC,MAAM,4BAA4B,GAAG,IAAA,kCAAuB,EAAC,cAAM,CAAC,YAAY,EAAE,QAAQ,EAAE,aAAa,CAAC,CAAC;IAE3G,IAAI,4BAA4B,IAAI,CAAC,KAAK,EAAE,CAAC;QACzC,IAAA,6BAAqB,EACjB,+CAA+C,aAAa,uCAAuC,CACtG,CAAC;QAEF,OAAO,IAAA,wBAAa,EAAC,cAAM,CAAC,YAAY,EAAE,QAAQ,EAAE,4BAA4B,CAAC,CAAC;IACtF,CAAC;IAED,MAAM,SAAS,GAAG,IAAA,oBAAY,EAAC,aAAa,CAAC,CAAC;IAE9C,IAAI,MAAM,CAAC,SAAS,CAAC,GAAG,gDAAoC,EAAE,CAAC;QAC3D,IAAA,6BAAqB,EACjB,sCAAsC,aAAa,oDAAoD,CAC1G,CAAC;QAEF,MAAM,EAAE,2BAA2B,EAAE,GAAG,wDAAa,aAAa,GAAC,CAAC;QAEpE,OAAO,2BAA2B,CAAC,SAAS,CAAC,CAAC;IAClD,CAAC;IAED,MAAM,OAAO,GAAG,MAAM,IAAA,yBAAc,EAAC,cAAM,CAAC,YAAY,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC;IAE/E,MAAM,QAAQ,GAAG,IAAA,0BAAkB,GAAE,CAAC;IACtC,MAAM,cAAc,GAAG,MAAM,IAAA,sBAAW,EAAC,EAAE,OAAO,EAAE,cAAM,CAAC,YAAY,EAAE,QAAQ,EAAE,OAAO,EAAE,QAAQ,EAAE,CAAC,CAAC;IAExG,IAAI,CAAC,cAAc,EAAE,CAAC;QAClB,MAAM,IAAI,KAAK,CACX;YACI,gBAAgB,OAAO,sBAAsB;YAC7C,uCAAuC,SAAS,cAAc;YAC9D,+CAA+C;SAClD,CAAC,IAAI,CAAC,IAAI,CAAC,CACf,CAAC;IACN,CAAC;IAED,MAAM,SAAS,GAAG,CAAC,wBAAkD,EAAmB,EAAE,CACtF,IAAA,kBAAgB,EAAC;QACb,QAAQ;QACR,OAAO;QACP,QAAQ,EAAE,IAAA,0BAAkB,GAAE;QAC9B,OAAO,EAAE,cAAM,CAAC,YAAY;QAC5B,MAAM,EAAE,IAAI;QACZ,wBAAwB;KAC3B,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC;IAE7C,OAAO,IAAA,wBAAa,EAAC,cAAM,CAAC,YAAY,EAAE,QAAQ,EAAE,OAAO,EAAE,SAAS,CAAC,CAAC;AAC5E,CAAC,CAAC;AAlDW,QAAA,mBAAmB,uBAkD9B"}
@@ -0,0 +1,14 @@
1
+ /// <reference types="node" />
2
+ /// <reference types="node" />
3
+ /// <reference types="node" />
4
+ import { type ChildProcess } from "child_process";
5
+ import { installChrome } from "./browser";
6
+ import { installChromeDriver } from "./driver";
7
+ export { installChrome, installChromeDriver };
8
+ export declare const runChromeDriver: (chromeVersion: string, { debug }?: {
9
+ debug?: boolean | undefined;
10
+ }) => Promise<{
11
+ gridUrl: string;
12
+ process: ChildProcess;
13
+ port: number;
14
+ }>;
@@ -0,0 +1,34 @@
1
+ "use strict";
2
+ var __importDefault = (this && this.__importDefault) || function (mod) {
3
+ return (mod && mod.__esModule) ? mod : { "default": mod };
4
+ };
5
+ Object.defineProperty(exports, "__esModule", { value: true });
6
+ exports.runChromeDriver = exports.installChromeDriver = exports.installChrome = void 0;
7
+ const child_process_1 = require("child_process");
8
+ const get_port_1 = __importDefault(require("get-port"));
9
+ const wait_port_1 = __importDefault(require("wait-port"));
10
+ const utils_1 = require("../../dev-server/utils");
11
+ const constants_1 = require("../constants");
12
+ const utils_2 = require("../utils");
13
+ const browser_1 = require("./browser");
14
+ Object.defineProperty(exports, "installChrome", { enumerable: true, get: function () { return browser_1.installChrome; } });
15
+ const driver_1 = require("./driver");
16
+ Object.defineProperty(exports, "installChromeDriver", { enumerable: true, get: function () { return driver_1.installChromeDriver; } });
17
+ const runChromeDriver = async (chromeVersion, { debug = false } = {}) => {
18
+ const [chromeDriverPath] = await Promise.all([(0, driver_1.installChromeDriver)(chromeVersion), (0, browser_1.installChrome)(chromeVersion)]);
19
+ const milestone = (0, utils_2.getMilestone)(chromeVersion);
20
+ const randomPort = await (0, get_port_1.default)();
21
+ const chromeDriver = (0, child_process_1.spawn)(chromeDriverPath, [`--port=${randomPort}`, debug ? `--verbose` : "--silent"], {
22
+ windowsHide: true,
23
+ detached: false,
24
+ });
25
+ if (debug) {
26
+ (0, utils_1.pipeLogsWithPrefix)(chromeDriver, `[chromedriver@${milestone}] `);
27
+ }
28
+ const gridUrl = `http://127.0.0.1:${randomPort}`;
29
+ process.once("exit", () => chromeDriver.kill());
30
+ await (0, wait_port_1.default)({ port: randomPort, output: "silent", timeout: constants_1.DRIVER_WAIT_TIMEOUT });
31
+ return { gridUrl, process: chromeDriver, port: randomPort };
32
+ };
33
+ exports.runChromeDriver = runChromeDriver;
34
+ //# sourceMappingURL=index.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/browser-installer/chrome/index.ts"],"names":[],"mappings":";;;;;;AAAA,iDAAyD;AACzD,wDAA+B;AAC/B,0DAAiC;AACjC,kDAA4D;AAC5D,4CAAmD;AACnD,oCAAwC;AACxC,uCAA0C;AAGjC,8FAHA,uBAAa,OAGA;AAFtB,qCAA+C;AAEvB,oGAFf,4BAAmB,OAEe;AAEpC,MAAM,eAAe,GAAG,KAAK,EAChC,aAAqB,EACrB,EAAE,KAAK,GAAG,KAAK,EAAE,GAAG,EAAE,EAC2C,EAAE;IACnE,MAAM,CAAC,gBAAgB,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC,IAAA,4BAAmB,EAAC,aAAa,CAAC,EAAE,IAAA,uBAAa,EAAC,aAAa,CAAC,CAAC,CAAC,CAAC;IAEjH,MAAM,SAAS,GAAG,IAAA,oBAAY,EAAC,aAAa,CAAC,CAAC;IAC9C,MAAM,UAAU,GAAG,MAAM,IAAA,kBAAO,GAAE,CAAC;IAEnC,MAAM,YAAY,GAAG,IAAA,qBAAK,EAAC,gBAAgB,EAAE,CAAC,UAAU,UAAU,EAAE,EAAE,KAAK,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,UAAU,CAAC,EAAE;QACrG,WAAW,EAAE,IAAI;QACjB,QAAQ,EAAE,KAAK;KAClB,CAAC,CAAC;IAEH,IAAI,KAAK,EAAE,CAAC;QACR,IAAA,0BAAkB,EAAC,YAAY,EAAE,iBAAiB,SAAS,IAAI,CAAC,CAAC;IACrE,CAAC;IAED,MAAM,OAAO,GAAG,oBAAoB,UAAU,EAAE,CAAC;IAEjD,OAAO,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC,YAAY,CAAC,IAAI,EAAE,CAAC,CAAC;IAEhD,MAAM,IAAA,mBAAQ,EAAC,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,+BAAmB,EAAE,CAAC,CAAC;IAErF,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC;AAChE,CAAC,CAAC;AAzBW,QAAA,eAAe,mBAyB1B"}