testplane 8.20.0-alpha.0 → 8.20.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.
Files changed (225) hide show
  1. package/README.md +2 -2
  2. package/build/package.json +23 -15
  3. package/build/src/base-testplane.js +1 -1
  4. package/build/src/base-testplane.js.map +1 -1
  5. package/build/src/browser/browser.d.ts +48 -29
  6. package/build/src/browser/browser.js +29 -23
  7. package/build/src/browser/browser.js.map +1 -1
  8. package/build/src/browser/client-bridge/error.d.ts +3 -0
  9. package/build/src/browser/client-bridge/error.js +3 -0
  10. package/build/src/browser/client-bridge/error.js.map +1 -1
  11. package/build/src/browser/client-scripts/bundle.compat.js +1 -1
  12. package/build/src/browser/client-scripts/bundle.native.js +1 -1
  13. package/build/src/browser/client-scripts/index.js +1 -1
  14. package/build/src/browser/commands/assert-view/errors/assert-view-error.d.ts +3 -0
  15. package/build/src/browser/commands/assert-view/errors/assert-view-error.js +3 -0
  16. package/build/src/browser/commands/assert-view/errors/assert-view-error.js.map +1 -1
  17. package/build/src/browser/commands/assert-view/errors/image-diff-error.d.ts +3 -0
  18. package/build/src/browser/commands/assert-view/errors/image-diff-error.js +3 -0
  19. package/build/src/browser/commands/assert-view/errors/image-diff-error.js.map +1 -1
  20. package/build/src/browser/commands/assert-view/errors/no-ref-image-error.d.ts +3 -0
  21. package/build/src/browser/commands/assert-view/errors/no-ref-image-error.js +3 -0
  22. package/build/src/browser/commands/assert-view/errors/no-ref-image-error.js.map +1 -1
  23. package/build/src/browser/commands/assert-view/index.js +23 -3
  24. package/build/src/browser/commands/assert-view/index.js.map +1 -1
  25. package/build/src/browser/commands/getPuppeteer.js +35 -2
  26. package/build/src/browser/commands/getPuppeteer.js.map +1 -1
  27. package/build/src/browser/commands/runStep.d.ts +3 -2
  28. package/build/src/browser/commands/runStep.js +9 -4
  29. package/build/src/browser/commands/runStep.js.map +1 -1
  30. package/build/src/browser/commands/types.d.ts +3 -1
  31. package/build/src/browser/core-error.d.ts +3 -0
  32. package/build/src/browser/core-error.js +3 -0
  33. package/build/src/browser/core-error.js.map +1 -1
  34. package/build/src/browser/existing-browser.d.ts +117 -10
  35. package/build/src/browser/existing-browser.js +26 -1
  36. package/build/src/browser/existing-browser.js.map +1 -1
  37. package/build/src/browser/history/callstack.js +9 -10
  38. package/build/src/browser/history/callstack.js.map +1 -1
  39. package/build/src/browser/history/index.js +8 -7
  40. package/build/src/browser/history/index.js.map +1 -1
  41. package/build/src/browser/history/utils.d.ts +0 -13
  42. package/build/src/browser/history/utils.js +2 -14
  43. package/build/src/browser/history/utils.js.map +1 -1
  44. package/build/src/browser/new-browser.d.ts +21 -29
  45. package/build/src/browser/new-browser.js +38 -29
  46. package/build/src/browser/new-browser.js.map +1 -1
  47. package/build/src/browser/screen-shooter/viewport/coord-validator/errors/height-viewport-error.d.ts +1 -0
  48. package/build/src/browser/screen-shooter/viewport/coord-validator/errors/height-viewport-error.js +1 -0
  49. package/build/src/browser/screen-shooter/viewport/coord-validator/errors/height-viewport-error.js.map +1 -1
  50. package/build/src/browser/screen-shooter/viewport/coord-validator/errors/offset-viewport-error.d.ts +1 -0
  51. package/build/src/browser/screen-shooter/viewport/coord-validator/errors/offset-viewport-error.js +1 -0
  52. package/build/src/browser/screen-shooter/viewport/coord-validator/errors/offset-viewport-error.js.map +1 -1
  53. package/build/src/browser/stacktrace/constants.d.ts +1 -0
  54. package/build/src/browser/stacktrace/constants.js +5 -1
  55. package/build/src/browser/stacktrace/constants.js.map +1 -1
  56. package/build/src/browser/stacktrace/index.js +3 -1
  57. package/build/src/browser/stacktrace/index.js.map +1 -1
  58. package/build/src/browser/stacktrace/utils.d.ts +1 -1
  59. package/build/src/browser/stacktrace/utils.js +35 -12
  60. package/build/src/browser/stacktrace/utils.js.map +1 -1
  61. package/build/src/browser-pool/basic-pool.d.ts +16 -13
  62. package/build/src/browser-pool/basic-pool.js +21 -15
  63. package/build/src/browser-pool/basic-pool.js.map +1 -1
  64. package/build/src/browser-pool/caching-pool.d.ts +22 -20
  65. package/build/src/browser-pool/caching-pool.js +20 -23
  66. package/build/src/browser-pool/caching-pool.js.map +1 -1
  67. package/build/src/browser-pool/cancelled-error.d.ts +3 -0
  68. package/build/src/browser-pool/cancelled-error.js +3 -0
  69. package/build/src/browser-pool/cancelled-error.js.map +1 -1
  70. package/build/src/browser-pool/index.d.ts +2 -2
  71. package/build/src/browser-pool/index.js +8 -8
  72. package/build/src/browser-pool/index.js.map +1 -1
  73. package/build/src/browser-pool/limited-pool.d.ts +24 -29
  74. package/build/src/browser-pool/limited-pool.js +33 -36
  75. package/build/src/browser-pool/limited-pool.js.map +1 -1
  76. package/build/src/browser-pool/limited-use-set.d.ts +21 -12
  77. package/build/src/browser-pool/limited-use-set.js +12 -17
  78. package/build/src/browser-pool/limited-use-set.js.map +1 -1
  79. package/build/src/browser-pool/per-browser-limited-pool.d.ts +10 -9
  80. package/build/src/browser-pool/per-browser-limited-pool.js +14 -10
  81. package/build/src/browser-pool/per-browser-limited-pool.js.map +1 -1
  82. package/build/src/browser-pool/types.d.ts +11 -0
  83. package/build/src/browser-pool/types.js +3 -0
  84. package/build/src/browser-pool/types.js.map +1 -0
  85. package/build/src/browser-pool/utils.d.ts +1 -1
  86. package/build/src/browser-pool/utils.js +4 -1
  87. package/build/src/browser-pool/utils.js.map +1 -1
  88. package/build/src/bundle/index.js +347 -88
  89. package/build/src/cli/commands/list-tests/index.d.ts +4 -0
  90. package/build/src/cli/commands/list-tests/index.js +55 -0
  91. package/build/src/cli/commands/list-tests/index.js.map +1 -0
  92. package/build/src/cli/constants.d.ts +3 -0
  93. package/build/src/cli/constants.js +7 -0
  94. package/build/src/cli/constants.js.map +1 -0
  95. package/build/src/cli/index.d.ts +4 -1
  96. package/build/src/cli/index.js +40 -48
  97. package/build/src/cli/index.js.map +1 -1
  98. package/build/src/cli/info.d.ts +2 -1
  99. package/build/src/cli/info.js +4 -1
  100. package/build/src/cli/info.js.map +1 -1
  101. package/build/src/config/types.d.ts +20 -4
  102. package/build/src/errors/abort-on-reconnect-error.d.ts +3 -0
  103. package/build/src/errors/abort-on-reconnect-error.js +3 -0
  104. package/build/src/errors/abort-on-reconnect-error.js.map +1 -1
  105. package/build/src/errors/testplane-internal-error.d.ts +3 -0
  106. package/build/src/errors/testplane-internal-error.js +3 -0
  107. package/build/src/errors/testplane-internal-error.js.map +1 -1
  108. package/build/src/events/index.d.ts +1 -1
  109. package/build/src/events/index.js.map +1 -1
  110. package/build/src/index.d.ts +9 -3
  111. package/build/src/runner/browser-env/vite/browser-modules/mocha/parser.d.ts +0 -1
  112. package/build/src/runner/browser-env/vite/browser-modules/mocha/parser.js.map +1 -1
  113. package/build/src/runner/browser-env/vite/browser-modules/tsconfig.tsbuildinfo +1 -1
  114. package/build/src/runner/browser-env/vite/browser-modules/types.d.ts +1 -2
  115. package/build/src/runner/runner.d.ts +2 -1
  116. package/build/src/runner/runner.js.map +1 -1
  117. package/build/src/test-collection/constants.d.ts +5 -0
  118. package/build/src/test-collection/constants.js +9 -0
  119. package/build/src/test-collection/constants.js.map +1 -0
  120. package/build/src/test-collection/formatters/list.d.ts +2 -0
  121. package/build/src/test-collection/formatters/list.js +33 -0
  122. package/build/src/test-collection/formatters/list.js.map +1 -0
  123. package/build/src/test-collection/formatters/tree.d.ts +2 -0
  124. package/build/src/test-collection/formatters/tree.js +92 -0
  125. package/build/src/test-collection/formatters/tree.js.map +1 -0
  126. package/build/src/{test-collection.d.ts → test-collection/index.d.ts} +34 -2
  127. package/build/src/{test-collection.js → test-collection/index.js} +34 -2
  128. package/build/src/test-collection/index.js.map +1 -0
  129. package/build/src/test-reader/build-instructions.d.ts +27 -30
  130. package/build/src/test-reader/build-instructions.js +21 -18
  131. package/build/src/test-reader/build-instructions.js.map +1 -1
  132. package/build/src/test-reader/index.d.ts +12 -8
  133. package/build/src/test-reader/index.js +53 -48
  134. package/build/src/test-reader/index.js.map +1 -1
  135. package/build/src/test-reader/mocha-reader/index.d.ts +2 -1
  136. package/build/src/test-reader/mocha-reader/index.js +82 -4
  137. package/build/src/test-reader/mocha-reader/index.js.map +1 -1
  138. package/build/src/test-reader/mocha-reader/tree-builder-decorator.js +2 -2
  139. package/build/src/test-reader/mocha-reader/tree-builder-decorator.js.map +1 -1
  140. package/build/src/test-reader/mocha-reader/utils.d.ts +4 -0
  141. package/build/src/test-reader/mocha-reader/utils.js +11 -0
  142. package/build/src/test-reader/mocha-reader/utils.js.map +1 -1
  143. package/build/src/test-reader/sets-builder/index.d.ts +14 -10
  144. package/build/src/test-reader/sets-builder/index.js +110 -91
  145. package/build/src/test-reader/sets-builder/index.js.map +1 -1
  146. package/build/src/test-reader/sets-builder/set-collection.d.ts +7 -8
  147. package/build/src/test-reader/sets-builder/set-collection.js +40 -40
  148. package/build/src/test-reader/sets-builder/set-collection.js.map +1 -1
  149. package/build/src/test-reader/sets-builder/test-set.d.ts +19 -14
  150. package/build/src/test-reader/sets-builder/test-set.js +88 -59
  151. package/build/src/test-reader/sets-builder/test-set.js.map +1 -1
  152. package/build/src/test-reader/test-object/configurable-test-object.d.ts +3 -2
  153. package/build/src/test-reader/test-object/configurable-test-object.js +5 -2
  154. package/build/src/test-reader/test-object/configurable-test-object.js.map +1 -1
  155. package/build/src/test-reader/test-object/suite.d.ts +2 -2
  156. package/build/src/test-reader/test-object/suite.js +2 -2
  157. package/build/src/test-reader/test-object/suite.js.map +1 -1
  158. package/build/src/test-reader/test-object/test.d.ts +2 -2
  159. package/build/src/test-reader/test-object/test.js +3 -2
  160. package/build/src/test-reader/test-object/test.js.map +1 -1
  161. package/build/src/test-reader/test-object/types.d.ts +5 -0
  162. package/build/src/test-reader/test-parser-api.d.ts +1 -1
  163. package/build/src/test-reader/test-parser.d.ts +23 -15
  164. package/build/src/test-reader/test-parser.js +57 -58
  165. package/build/src/test-reader/test-parser.js.map +1 -1
  166. package/build/src/test-reader/tree-builder.d.ts +13 -9
  167. package/build/src/test-reader/tree-builder.js +3 -3
  168. package/build/src/test-reader/tree-builder.js.map +1 -1
  169. package/build/src/testplane.d.ts +8 -4
  170. package/build/src/testplane.js +4 -4
  171. package/build/src/testplane.js.map +1 -1
  172. package/build/src/types/helpers.d.ts +1 -0
  173. package/build/src/types/helpers.js +3 -0
  174. package/build/src/types/helpers.js.map +1 -0
  175. package/build/src/types/index.d.ts +27 -16
  176. package/build/src/types/index.js +15 -0
  177. package/build/src/types/index.js.map +1 -1
  178. package/build/src/utils/cli.d.ts +15 -0
  179. package/build/src/utils/cli.js +42 -0
  180. package/build/src/utils/cli.js.map +1 -0
  181. package/build/src/utils/processor.js +3 -2
  182. package/build/src/utils/processor.js.map +1 -1
  183. package/build/src/utils/typescript.d.ts +1 -1
  184. package/build/src/utils/typescript.js +13 -8
  185. package/build/src/utils/typescript.js.map +1 -1
  186. package/build/src/validators.d.ts +1 -1
  187. package/build/src/validators.js +14 -8
  188. package/build/src/validators.js.map +1 -1
  189. package/build/src/worker/browser-env/runner/test-runner/index.js +2 -2
  190. package/build/src/worker/browser-env/runner/test-runner/index.js.map +1 -1
  191. package/build/src/worker/index.d.ts +1 -1
  192. package/build/src/worker/runner/browser-agent.d.ts +22 -18
  193. package/build/src/worker/runner/browser-agent.js +6 -3
  194. package/build/src/worker/runner/browser-agent.js.map +1 -1
  195. package/build/src/worker/runner/browser-pool.d.ts +1 -2
  196. package/build/src/worker/runner/caching-test-parser.d.ts +20 -21
  197. package/build/src/worker/runner/caching-test-parser.js +13 -11
  198. package/build/src/worker/runner/caching-test-parser.js.map +1 -1
  199. package/build/src/worker/runner/index.d.ts +1 -1
  200. package/build/src/worker/runner/index.js +2 -2
  201. package/build/src/worker/runner/index.js.map +1 -1
  202. package/build/src/worker/runner/sequence-test-parser.d.ts +14 -13
  203. package/build/src/worker/runner/sequence-test-parser.js +16 -10
  204. package/build/src/worker/runner/sequence-test-parser.js.map +1 -1
  205. package/build/src/worker/runner/simple-test-parser.d.ts +13 -10
  206. package/build/src/worker/runner/simple-test-parser.js +17 -11
  207. package/build/src/worker/runner/simple-test-parser.js.map +1 -1
  208. package/build/src/worker/runner/test-runner/index.js +2 -2
  209. package/build/src/worker/runner/test-runner/index.js.map +1 -1
  210. package/build/src/worker/runner/test-runner/types.d.ts +1 -1
  211. package/build/src/worker/testplane-facade.d.ts +1 -12
  212. package/build/src/worker/testplane-facade.js +25 -21
  213. package/build/src/worker/testplane-facade.js.map +1 -1
  214. package/build/src/worker/testplane.d.ts +2 -1
  215. package/build/src/worker/testplane.js +3 -3
  216. package/build/src/worker/testplane.js.map +1 -1
  217. package/package.json +23 -15
  218. package/typings/clear-require.d.ts +3 -0
  219. package/typings/escape-string-regexp.d.ts +3 -0
  220. package/typings/global.d.ts +10 -7
  221. package/build/src/browser-pool/pool.d.ts +0 -13
  222. package/build/src/browser-pool/pool.js +0 -18
  223. package/build/src/browser-pool/pool.js.map +0 -1
  224. package/build/src/test-collection.js.map +0 -1
  225. package/typings/api.d.ts +0 -8
@@ -1,18 +1,24 @@
1
- export = CachingPool;
2
- declare class CachingPool extends Pool {
3
- /**
4
- * @constructor
5
- * @extends BasicPool
6
- * @param {BasicPool} underlyingPool
7
- */
8
- constructor(underlyingPool: BasicPool, config: any);
9
- log: debug.Debugger;
1
+ import debug from "debug";
2
+ import { BasicPool } from "./basic-pool";
3
+ import { Config } from "../config";
4
+ import { Pool } from "./types";
5
+ import { NewBrowser } from "../browser/new-browser";
6
+ export type FreeBrowserOpts = {
7
+ hasFreeSlots?: boolean;
8
+ force?: boolean;
9
+ compositeIdForNextRequest?: string;
10
+ };
11
+ export declare class CachingPool implements Pool {
12
+ private _caches;
13
+ private _config;
10
14
  underlyingPool: BasicPool;
11
- _caches: {};
12
- _config: any;
13
- _getCacheFor(id: any, version: any): any;
14
- getBrowser(id: any, opts?: {}): any;
15
- _initPool(browserId: any, version: any): void;
15
+ log: debug.Debugger;
16
+ constructor(underlyingPool: BasicPool, config: Config);
17
+ private _getCacheFor;
18
+ getBrowser(id: string, opts?: {
19
+ version?: string;
20
+ }): Promise<NewBrowser>;
21
+ private _initPool;
16
22
  /**
17
23
  * Free browser
18
24
  * @param {Browser} browser session instance
@@ -21,10 +27,6 @@ declare class CachingPool extends Pool {
21
27
  * not be cached
22
28
  * @returns {Promise<undefined>}
23
29
  */
24
- freeBrowser(browser: Browser, options?: {
25
- force?: boolean | undefined;
26
- } | undefined): Promise<undefined>;
30
+ freeBrowser(browser: NewBrowser, options?: FreeBrowserOpts): Promise<void>;
31
+ cancel(): void;
27
32
  }
28
- import Pool = require("./pool");
29
- import debug = require("debug");
30
- import Promise = require("bluebird");
@@ -1,24 +1,21 @@
1
1
  "use strict";
2
- const Promise = require("bluebird");
3
- const Pool = require("./pool");
4
- const LimitedUseSet = require("./limited-use-set");
5
- const debug = require("debug");
6
- const { buildCompositeBrowserId } = require("./utils");
7
- module.exports = class CachingPool extends Pool {
8
- /**
9
- * @constructor
10
- * @extends BasicPool
11
- * @param {BasicPool} underlyingPool
12
- */
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.CachingPool = void 0;
7
+ const debug_1 = __importDefault(require("debug"));
8
+ const limited_use_set_1 = require("./limited-use-set");
9
+ const utils_1 = require("./utils");
10
+ class CachingPool {
13
11
  constructor(underlyingPool, config) {
14
- super();
15
- this.log = debug("testplane:pool:caching");
12
+ this.log = (0, debug_1.default)("testplane:pool:caching");
16
13
  this.underlyingPool = underlyingPool;
17
14
  this._caches = {};
18
15
  this._config = config;
19
16
  }
20
17
  _getCacheFor(id, version) {
21
- const compositeId = buildCompositeBrowserId(id, version);
18
+ const compositeId = (0, utils_1.buildCompositeBrowserId)(id, version);
22
19
  this.log(`request for ${compositeId}`);
23
20
  if (!this._caches[compositeId]) {
24
21
  this.log(`init for ${compositeId}`);
@@ -26,29 +23,28 @@ module.exports = class CachingPool extends Pool {
26
23
  }
27
24
  return this._caches[compositeId];
28
25
  }
29
- getBrowser(id, opts = {}) {
26
+ async getBrowser(id, opts = {}) {
30
27
  const { version } = opts;
31
28
  const cache = this._getCacheFor(id, version);
32
29
  const browser = cache.pop();
33
30
  if (!browser) {
34
- this.log(`no cached browser for ${buildCompositeBrowserId(id, version)}, requesting new`);
31
+ this.log(`no cached browser for ${(0, utils_1.buildCompositeBrowserId)(id, version)}, requesting new`);
35
32
  return this.underlyingPool.getBrowser(id, opts);
36
33
  }
37
34
  this.log(`has cached browser ${browser.fullId}`);
38
35
  return browser
39
36
  .reset()
40
37
  .catch(e => {
41
- const reject = Promise.reject.bind(null, e);
42
- return this.underlyingPool.freeBrowser(browser).then(reject, reject);
38
+ return this.underlyingPool.freeBrowser(browser).then(() => Promise.reject(e), () => Promise.reject(e));
43
39
  })
44
40
  .then(() => browser);
45
41
  }
46
42
  _initPool(browserId, version) {
47
- const compositeId = buildCompositeBrowserId(browserId, version);
43
+ const compositeId = (0, utils_1.buildCompositeBrowserId)(browserId, version);
48
44
  const freeBrowser = this.underlyingPool.freeBrowser.bind(this.underlyingPool);
49
45
  const { testsPerSession } = this._config.forBrowser(browserId);
50
- this._caches[compositeId] = new LimitedUseSet({
51
- formatItem: item => item.fullId,
46
+ this._caches[compositeId] = new limited_use_set_1.LimitedUseSet({
47
+ formatItem: (item) => item.fullId,
52
48
  // browser does not get put in a set on first usages, so if
53
49
  // we want to limit it usage to N times, we must set N-1 limit
54
50
  // for the set.
@@ -64,7 +60,7 @@ module.exports = class CachingPool extends Pool {
64
60
  * not be cached
65
61
  * @returns {Promise<undefined>}
66
62
  */
67
- freeBrowser(browser, options = {}) {
63
+ async freeBrowser(browser, options = {}) {
68
64
  const shouldFreeForNextRequest = () => {
69
65
  const { compositeIdForNextRequest } = options;
70
66
  if (!compositeIdForNextRequest) {
@@ -86,5 +82,6 @@ module.exports = class CachingPool extends Pool {
86
82
  this.log("cancel");
87
83
  this.underlyingPool.cancel();
88
84
  }
89
- };
85
+ }
86
+ exports.CachingPool = CachingPool;
90
87
  //# sourceMappingURL=caching-pool.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"caching-pool.js","sourceRoot":"","sources":["../../../src/browser-pool/caching-pool.js"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"caching-pool.js","sourceRoot":"","sources":["../../../src/browser-pool/caching-pool.ts"],"names":[],"mappings":"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"}
@@ -1,3 +1,6 @@
1
+ /**
2
+ * @category Errors
3
+ */
1
4
  export declare class CancelledError extends Error {
2
5
  name: string;
3
6
  message: string;
@@ -1,6 +1,9 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.CancelledError = void 0;
4
+ /**
5
+ * @category Errors
6
+ */
4
7
  class CancelledError extends Error {
5
8
  constructor() {
6
9
  super();
@@ -1 +1 @@
1
- {"version":3,"file":"cancelled-error.js","sourceRoot":"","sources":["../../../src/browser-pool/cancelled-error.ts"],"names":[],"mappings":";;;AAAA,MAAa,cAAe,SAAQ,KAAK;IAIrC;QACI,KAAK,EAAE,CAAC;QAJZ,SAAI,GAAG,gBAAgB,CAAC;QACxB,YAAO,GAAG,+BAA+B,CAAC;QAItC,KAAK,CAAC,iBAAiB,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC;IAClD,CAAC;CACJ;AARD,wCAQC"}
1
+ {"version":3,"file":"cancelled-error.js","sourceRoot":"","sources":["../../../src/browser-pool/cancelled-error.ts"],"names":[],"mappings":";;;AAAA;;GAEG;AACH,MAAa,cAAe,SAAQ,KAAK;IAIrC;QACI,KAAK,EAAE,CAAC;QAJZ,SAAI,GAAG,gBAAgB,CAAC;QACxB,YAAO,GAAG,+BAA+B,CAAC;QAItC,KAAK,CAAC,iBAAiB,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC;IAClD,CAAC;CACJ;AARD,wCAQC"}
@@ -1,5 +1,5 @@
1
- import LimitedPool from "./limited-pool";
2
- import PerBrowserLimitedPool from "./per-browser-limited-pool";
1
+ import { LimitedPool } from "./limited-pool";
2
+ import { PerBrowserLimitedPool } from "./per-browser-limited-pool";
3
3
  import { Config } from "../config";
4
4
  import { AsyncEmitter } from "../events";
5
5
  export type BrowserPool = LimitedPool | PerBrowserLimitedPool;
@@ -5,16 +5,16 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
5
5
  Object.defineProperty(exports, "__esModule", { value: true });
6
6
  exports.create = void 0;
7
7
  const lodash_1 = __importDefault(require("lodash"));
8
- const basic_pool_1 = __importDefault(require("./basic-pool"));
9
- const limited_pool_1 = __importDefault(require("./limited-pool"));
10
- const per_browser_limited_pool_1 = __importDefault(require("./per-browser-limited-pool"));
11
- const caching_pool_1 = __importDefault(require("./caching-pool"));
8
+ const basic_pool_1 = require("./basic-pool");
9
+ const limited_pool_1 = require("./limited-pool");
10
+ const per_browser_limited_pool_1 = require("./per-browser-limited-pool");
11
+ const caching_pool_1 = require("./caching-pool");
12
12
  const create = function (config, emitter) {
13
- let pool = basic_pool_1.default.create(config, emitter);
14
- pool = new caching_pool_1.default(pool, config);
15
- pool = new per_browser_limited_pool_1.default(pool, config);
13
+ let pool = basic_pool_1.BasicPool.create(config, emitter);
14
+ pool = new caching_pool_1.CachingPool(pool, config);
15
+ pool = new per_browser_limited_pool_1.PerBrowserLimitedPool(pool, config);
16
16
  if (lodash_1.default.isFinite(config.system.parallelLimit)) {
17
- pool = new limited_pool_1.default(pool, {
17
+ pool = new limited_pool_1.LimitedPool(pool, {
18
18
  limit: config.system.parallelLimit,
19
19
  isSpecificBrowserLimiter: false,
20
20
  });
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/browser-pool/index.ts"],"names":[],"mappings":";;;;;;AAAA,oDAAuB;AACvB,8DAAqC;AACrC,kEAAyC;AACzC,0FAA+D;AAC/D,kEAAyC;AAMlC,MAAM,MAAM,GAAG,UAAU,MAAc,EAAE,OAAqB;IACjE,IAAI,IAAI,GAAkE,oBAAS,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAE5G,IAAI,GAAG,IAAI,sBAAW,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IACrC,IAAI,GAAG,IAAI,kCAAqB,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IAE/C,IAAI,gBAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,EAAE,CAAC;QAC1C,IAAI,GAAG,IAAI,sBAAW,CAAC,IAAI,EAAE;YACzB,KAAK,EAAE,MAAM,CAAC,MAAM,CAAC,aAAa;YAClC,wBAAwB,EAAE,KAAK;SAClC,CAAC,CAAC;IACP,CAAC;IAED,OAAO,IAAI,CAAC;AAChB,CAAC,CAAC;AAdW,QAAA,MAAM,UAcjB"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/browser-pool/index.ts"],"names":[],"mappings":";;;;;;AAAA,oDAAuB;AACvB,6CAAyC;AACzC,iDAA6C;AAC7C,yEAAmE;AACnE,iDAA6C;AAMtC,MAAM,MAAM,GAAG,UAAU,MAAc,EAAE,OAAqB;IACjE,IAAI,IAAI,GAAkE,sBAAS,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAE5G,IAAI,GAAG,IAAI,0BAAW,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IACrC,IAAI,GAAG,IAAI,gDAAqB,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IAE/C,IAAI,gBAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,EAAE,CAAC;QAC1C,IAAI,GAAG,IAAI,0BAAW,CAAC,IAAI,EAAE;YACzB,KAAK,EAAE,MAAM,CAAC,MAAM,CAAC,aAAa;YAClC,wBAAwB,EAAE,KAAK;SAClC,CAAC,CAAC;IACP,CAAC;IAED,OAAO,IAAI,CAAC;AAChB,CAAC,CAAC;AAdW,QAAA,MAAM,UAcjB"}
@@ -1,31 +1,26 @@
1
- export = LimitedPool;
2
- declare class LimitedPool extends Pool {
3
- static create(underlyingPool: any, opts: any): import("./limited-pool");
4
- /**
5
- * @extends BasicPool
6
- * @param {Number} limit
7
- * @param {BasicPool} underlyingPool
8
- */
9
- constructor(underlyingPool: BasicPool, opts: any);
1
+ import debug from "debug";
2
+ import { BrowserOpts, Pool } from "./types";
3
+ import { Browser } from "../browser/browser";
4
+ export interface LimitedPoolOpts {
5
+ limit: number;
6
+ isSpecificBrowserLimiter?: boolean;
7
+ }
8
+ export declare class LimitedPool implements Pool {
9
+ private _limit;
10
+ private _launched;
11
+ private _requests;
12
+ private _requestQueue;
13
+ private _highPriorityRequestQueue;
14
+ private _isSpecificBrowserLimiter;
10
15
  log: debug.Debugger;
11
- underlyingPool: BasicPool;
12
- _limit: any;
13
- _launched: number;
14
- _requests: number;
15
- _requestQueue: any;
16
- _highPriorityRequestQueue: any;
17
- _isSpecificBrowserLimiter: any;
18
- getBrowser(id: any, opts?: {}): Promise<any>;
19
- freeBrowser(browser: any, opts?: {}): any;
20
- _getBrowser(id: any, opts?: {}): Promise<Browser>;
21
- /**
22
- * @param {String} id
23
- * @returns {Promise<Browser>}
24
- */
25
- _newBrowser(id: string, opts: any): Promise<Browser>;
26
- _lookAtNextRequest(): any;
27
- _launchNextBrowser(): void;
16
+ underlyingPool: Pool;
17
+ static create(underlyingPool: Pool, opts: LimitedPoolOpts): LimitedPool;
18
+ constructor(underlyingPool: Pool, opts: LimitedPoolOpts);
19
+ getBrowser(id: string, opts?: BrowserOpts): Promise<Browser>;
20
+ freeBrowser(browser: Browser, opts?: BrowserOpts): Promise<void>;
21
+ cancel(): void;
22
+ private _getBrowser;
23
+ private _newBrowser;
24
+ private _lookAtNextRequest;
25
+ private _launchNextBrowser;
28
26
  }
29
- import Pool = require("./pool");
30
- import debug = require("debug");
31
- import Promise = require("bluebird");
@@ -1,46 +1,46 @@
1
1
  "use strict";
2
- const _ = require("lodash");
3
- const Promise = require("bluebird");
4
- const yallist = require("yallist");
5
- const Pool = require("./pool");
6
- const { CancelledError } = require("./cancelled-error");
7
- const debug = require("debug");
8
- const { buildCompositeBrowserId } = require("./utils");
9
- module.exports = class LimitedPool extends Pool {
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.LimitedPool = void 0;
7
+ const debug_1 = __importDefault(require("debug"));
8
+ const lodash_1 = __importDefault(require("lodash"));
9
+ const yallist_1 = __importDefault(require("yallist"));
10
+ const cancelled_error_1 = require("./cancelled-error");
11
+ const utils_1 = require("./utils");
12
+ class LimitedPool {
10
13
  static create(underlyingPool, opts) {
11
14
  return new LimitedPool(underlyingPool, opts);
12
15
  }
13
- /**
14
- * @extends BasicPool
15
- * @param {Number} limit
16
- * @param {BasicPool} underlyingPool
17
- */
18
16
  constructor(underlyingPool, opts) {
19
- super();
20
- this.log = debug("testplane:pool:limited");
17
+ this.log = (0, debug_1.default)("testplane:pool:limited");
21
18
  this.underlyingPool = underlyingPool;
22
19
  this._limit = opts.limit;
23
20
  this._launched = 0;
24
21
  this._requests = 0;
25
- this._requestQueue = yallist.create();
26
- this._highPriorityRequestQueue = yallist.create();
27
- this._isSpecificBrowserLimiter = _.isBoolean(opts.isSpecificBrowserLimiter)
22
+ this._requestQueue = yallist_1.default.create();
23
+ this._highPriorityRequestQueue = yallist_1.default.create();
24
+ this._isSpecificBrowserLimiter = lodash_1.default.isBoolean(opts.isSpecificBrowserLimiter)
28
25
  ? opts.isSpecificBrowserLimiter
29
26
  : true;
30
27
  }
31
- getBrowser(id, opts = {}) {
28
+ async getBrowser(id, opts = {}) {
32
29
  const optsToPrint = JSON.stringify(opts);
33
30
  this.log(`get browser ${id} with opts:${optsToPrint} (launched ${this._launched}, limit ${this._limit})`);
34
31
  ++this._requests;
35
- return this._getBrowser(id, opts).catch(e => {
32
+ try {
33
+ return await this._getBrowser(id, opts);
34
+ }
35
+ catch (e) {
36
36
  --this._requests;
37
- return Promise.reject(e);
38
- });
37
+ return await Promise.reject(e);
38
+ }
39
39
  }
40
- freeBrowser(browser, opts = {}) {
40
+ async freeBrowser(browser, opts = {}) {
41
41
  --this._requests;
42
42
  const nextRequest = this._lookAtNextRequest();
43
- const compositeIdForNextRequest = nextRequest && buildCompositeBrowserId(nextRequest.id, nextRequest.opts.version);
43
+ const compositeIdForNextRequest = nextRequest && (0, utils_1.buildCompositeBrowserId)(nextRequest.id, nextRequest.opts.version);
44
44
  const hasFreeSlots = this._launched < this._limit;
45
45
  const shouldFreeUnusedResource = this._isSpecificBrowserLimiter && this._launched > this._requests;
46
46
  const force = opts.force || shouldFreeUnusedResource;
@@ -50,14 +50,14 @@ module.exports = class LimitedPool extends Pool {
50
50
  }
51
51
  cancel() {
52
52
  this.log("cancel");
53
- const reject_ = entry => entry.reject(new CancelledError());
53
+ const reject_ = (entry) => entry.reject(new cancelled_error_1.CancelledError());
54
54
  this._highPriorityRequestQueue.forEach(reject_);
55
55
  this._requestQueue.forEach(reject_);
56
- this._highPriorityRequestQueue = yallist.create();
57
- this._requestQueue = yallist.create();
56
+ this._highPriorityRequestQueue = yallist_1.default.create();
57
+ this._requestQueue = yallist_1.default.create();
58
58
  this.underlyingPool.cancel();
59
59
  }
60
- _getBrowser(id, opts = {}) {
60
+ async _getBrowser(id, opts = {}) {
61
61
  if (this._launched < this._limit) {
62
62
  this.log("can launch one more");
63
63
  this._launched++;
@@ -66,14 +66,10 @@ module.exports = class LimitedPool extends Pool {
66
66
  this.log("queuing the request");
67
67
  const queue = opts.highPriority ? this._highPriorityRequestQueue : this._requestQueue;
68
68
  return new Promise((resolve, reject) => {
69
- queue.push({ id, opts, resolve, reject });
69
+ queue.push({ id, opts, resolve: resolve, reject: reject });
70
70
  });
71
71
  }
72
- /**
73
- * @param {String} id
74
- * @returns {Promise<Browser>}
75
- */
76
- _newBrowser(id, opts) {
72
+ async _newBrowser(id, opts) {
77
73
  this.log(`launching new browser ${id} with opts:${JSON.stringify(opts)}`);
78
74
  return this.underlyingPool.getBrowser(id, opts).catch(e => {
79
75
  this._launchNextBrowser();
@@ -86,7 +82,7 @@ module.exports = class LimitedPool extends Pool {
86
82
  _launchNextBrowser() {
87
83
  const queued = this._highPriorityRequestQueue.shift() || this._requestQueue.shift();
88
84
  if (queued) {
89
- const compositeId = buildCompositeBrowserId(queued.id, queued.opts.version);
85
+ const compositeId = (0, utils_1.buildCompositeBrowserId)(queued.id, queued.opts.version);
90
86
  this.log(`has queued requests for ${compositeId}`);
91
87
  this.log(`remaining queue length: ${this._requestQueue.length}`);
92
88
  this._newBrowser(queued.id, queued.opts).then(queued.resolve, queued.reject);
@@ -95,5 +91,6 @@ module.exports = class LimitedPool extends Pool {
95
91
  this._launched--;
96
92
  }
97
93
  }
98
- };
94
+ }
95
+ exports.LimitedPool = LimitedPool;
99
96
  //# sourceMappingURL=limited-pool.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"limited-pool.js","sourceRoot":"","sources":["../../../src/browser-pool/limited-pool.js"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"limited-pool.js","sourceRoot":"","sources":["../../../src/browser-pool/limited-pool.ts"],"names":[],"mappings":"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"}
@@ -1,14 +1,23 @@
1
- export = LimitedUseSet;
2
- declare class LimitedUseSet {
3
- constructor(opts: any);
4
- _useCounts: WeakMap<object, any>;
5
- _useLimit: any;
6
- _finalize: any;
7
- _formatItem: any;
8
- _objects: any[];
1
+ import debug from "debug";
2
+ /**
3
+ * Set implementation which allows to get and put an object
4
+ * there only limited amout of times. After limit is reached
5
+ * attempt to put an object there causes the object to be finalized.
6
+ */
7
+ export interface LimitedUseSetOpts<T> {
8
+ useLimit: number;
9
+ finalize: (value: T) => Promise<void>;
10
+ formatItem: (value: T) => string;
11
+ }
12
+ export declare class LimitedUseSet<T extends object = object> {
13
+ private _useCounts;
14
+ private _useLimit;
15
+ private _finalize;
16
+ private _formatItem;
17
+ private _objects;
9
18
  log: debug.Debugger;
10
- push(value: any): any;
11
- _isOverLimit(value: any): boolean;
12
- pop(): any;
19
+ constructor(opts: LimitedUseSetOpts<T>);
20
+ push(value: T): Promise<void>;
21
+ private _isOverLimit;
22
+ pop(): T | null;
13
23
  }
14
- import debug = require("debug");
@@ -1,25 +1,19 @@
1
1
  "use strict";
2
- const _ = require("lodash");
3
- const debug = require("debug");
4
- /**
5
- * Set implementation which allows to get and put an object
6
- * there only limited amout of times. After limit is reached
7
- * attempt to put an object there causes the object to be finalized.
8
- *
9
- * @constructor
10
- * @param {Number} useLimit number of times object can be popped from set
11
- * before finalizing.
12
- * @param {Function} finalize callback which will be called when value in
13
- * set needs to be finalized.
14
- */
15
- module.exports = class LimitedUseSet {
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.LimitedUseSet = void 0;
7
+ const lodash_1 = __importDefault(require("lodash"));
8
+ const debug_1 = __importDefault(require("debug"));
9
+ class LimitedUseSet {
16
10
  constructor(opts) {
17
11
  this._useCounts = new WeakMap();
18
12
  this._useLimit = opts.useLimit;
19
13
  this._finalize = opts.finalize;
20
- this._formatItem = opts.formatItem || _.identity;
14
+ this._formatItem = opts.formatItem || lodash_1.default.identity;
21
15
  this._objects = [];
22
- this.log = debug("testplane:pool:limited-use-set");
16
+ this.log = (0, debug_1.default)("testplane:pool:limited-use-set");
23
17
  }
24
18
  push(value) {
25
19
  const formatedItem = this._formatItem(value);
@@ -50,5 +44,6 @@ module.exports = class LimitedUseSet {
50
44
  this._useCounts.set(result, useCount + 1);
51
45
  return result;
52
46
  }
53
- };
47
+ }
48
+ exports.LimitedUseSet = LimitedUseSet;
54
49
  //# sourceMappingURL=limited-use-set.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"limited-use-set.js","sourceRoot":"","sources":["../../../src/browser-pool/limited-use-set.js"],"names":[],"mappings":"AAAA,YAAY,CAAC;AAEb,MAAM,CAAC,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;AAC5B,MAAM,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;AAE/B;;;;;;;;;;GAUG;AACH,MAAM,CAAC,OAAO,GAAG,MAAM,aAAa;IAChC,YAAY,IAAI;QACZ,IAAI,CAAC,UAAU,GAAG,IAAI,OAAO,EAAE,CAAC;QAChC,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,QAAQ,CAAC;QAC/B,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,QAAQ,CAAC;QAC/B,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,UAAU,IAAI,CAAC,CAAC,QAAQ,CAAC;QACjD,IAAI,CAAC,QAAQ,GAAG,EAAE,CAAC;QAEnB,IAAI,CAAC,GAAG,GAAG,KAAK,CAAC,gCAAgC,CAAC,CAAC;IACvD,CAAC;IAED,IAAI,CAAC,KAAK;QACN,MAAM,YAAY,GAAG,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;QAE7C,IAAI,CAAC,GAAG,CAAC,QAAQ,YAAY,EAAE,CAAC,CAAC;QAEjC,IAAI,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,EAAE,CAAC;YAC3B,IAAI,CAAC,GAAG,CAAC,0BAA0B,YAAY,EAAE,CAAC,CAAC;YACnD,OAAO,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;QACjC,CAAC;QAED,IAAI,CAAC,GAAG,CAAC,mBAAmB,YAAY,EAAE,CAAC,CAAC;QAC5C,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAE1B,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;IAC7B,CAAC;IAED,YAAY,CAAC,KAAK;QACd,IAAI,IAAI,CAAC,SAAS,KAAK,CAAC,EAAE,CAAC;YACvB,OAAO,IAAI,CAAC;QAChB,CAAC;QAED,OAAO,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,IAAI,CAAC,SAAS,CAAC;IACtF,CAAC;IAED,GAAG;QACC,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC7B,OAAO,IAAI,CAAC;QAChB,CAAC;QAED,MAAM,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC;QACnC,MAAM,QAAQ,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAClD,MAAM,YAAY,GAAG,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;QAE9C,IAAI,CAAC,GAAG,CAAC,WAAW,YAAY,EAAE,CAAC,CAAC;QACpC,IAAI,CAAC,GAAG,CAAC,sBAAsB,YAAY,IAAI,QAAQ,EAAE,CAAC,CAAC;QAE3D,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,MAAM,EAAE,QAAQ,GAAG,CAAC,CAAC,CAAC;QAE1C,OAAO,MAAM,CAAC;IAClB,CAAC;CACJ,CAAC"}
1
+ {"version":3,"file":"limited-use-set.js","sourceRoot":"","sources":["../../../src/browser-pool/limited-use-set.ts"],"names":[],"mappings":";;;;;;AAAA,oDAAuB;AACvB,kDAA0B;AAc1B,MAAa,aAAa;IAQtB,YAAY,IAA0B;QAClC,IAAI,CAAC,UAAU,GAAG,IAAI,OAAO,EAAE,CAAC;QAChC,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,QAAQ,CAAC;QAC/B,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,QAAQ,CAAC;QAC/B,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,UAAU,IAAI,gBAAC,CAAC,QAAQ,CAAC;QACjD,IAAI,CAAC,QAAQ,GAAG,EAAE,CAAC;QAEnB,IAAI,CAAC,GAAG,GAAG,IAAA,eAAK,EAAC,gCAAgC,CAAC,CAAC;IACvD,CAAC;IAED,IAAI,CAAC,KAAQ;QACT,MAAM,YAAY,GAAG,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;QAE7C,IAAI,CAAC,GAAG,CAAC,QAAQ,YAAY,EAAE,CAAC,CAAC;QAEjC,IAAI,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,EAAE,CAAC;YAC3B,IAAI,CAAC,GAAG,CAAC,0BAA0B,YAAY,EAAE,CAAC,CAAC;YACnD,OAAO,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;QACjC,CAAC;QAED,IAAI,CAAC,GAAG,CAAC,mBAAmB,YAAY,EAAE,CAAC,CAAC;QAC5C,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAE1B,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;IAC7B,CAAC;IAEO,YAAY,CAAC,KAAQ;QACzB,IAAI,IAAI,CAAC,SAAS,KAAK,CAAC,EAAE,CAAC;YACvB,OAAO,IAAI,CAAC;QAChB,CAAC;QAED,OAAO,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,KAAK,CAAE,IAAI,IAAI,CAAC,SAAS,CAAC;IACvF,CAAC;IAED,GAAG;QACC,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC7B,OAAO,IAAI,CAAC;QAChB,CAAC;QAED,MAAM,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAG,CAAC;QACpC,MAAM,QAAQ,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAClD,MAAM,YAAY,GAAG,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;QAE9C,IAAI,CAAC,GAAG,CAAC,WAAW,YAAY,EAAE,CAAC,CAAC;QACpC,IAAI,CAAC,GAAG,CAAC,sBAAsB,YAAY,IAAI,QAAQ,EAAE,CAAC,CAAC;QAE3D,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,MAAM,EAAE,QAAQ,GAAG,CAAC,CAAC,CAAC;QAE1C,OAAO,MAAM,CAAC;IAClB,CAAC;CACJ;AA1DD,sCA0DC"}
@@ -1,11 +1,12 @@
1
- export = PerBrowserLimitedPool;
2
- declare class PerBrowserLimitedPool extends Pool {
3
- constructor(underlyingPool: any, config: any);
1
+ import debug from "debug";
2
+ import { Pool } from "./types";
3
+ import { Config } from "../config";
4
+ import { Browser } from "../browser/browser";
5
+ export declare class PerBrowserLimitedPool implements Pool {
4
6
  log: debug.Debugger;
5
- _browserPools: _.Dictionary<any>;
6
- getBrowser(id: any, opts: any): any;
7
- freeBrowser(browser: any, opts: any): any;
7
+ private _browserPools;
8
+ constructor(underlyingPool: Pool, config: Config);
9
+ getBrowser(id: string, opts?: object): Promise<Browser>;
10
+ freeBrowser(browser: Browser, opts?: object): Promise<void>;
11
+ cancel(): void;
8
12
  }
9
- import Pool = require("./pool");
10
- import debug = require("debug");
11
- import _ = require("lodash");
@@ -1,14 +1,17 @@
1
1
  "use strict";
2
- const _ = require("lodash");
3
- const Pool = require("./pool");
4
- const LimitedPool = require("./limited-pool");
5
- const debug = require("debug");
6
- module.exports = class PerBrowserLimitedPool extends Pool {
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.PerBrowserLimitedPool = void 0;
7
+ const debug_1 = __importDefault(require("debug"));
8
+ const lodash_1 = require("lodash");
9
+ const limited_pool_1 = require("./limited-pool");
10
+ class PerBrowserLimitedPool {
7
11
  constructor(underlyingPool, config) {
8
- super();
9
- this.log = debug("testplane:pool:per-browser-limited");
12
+ this.log = (0, debug_1.default)("testplane:pool:per-browser-limited");
10
13
  const ids = config.getBrowserIds();
11
- this._browserPools = _.zipObject(ids, ids.map(id => LimitedPool.create(underlyingPool, {
14
+ this._browserPools = (0, lodash_1.zipObject)(ids, ids.map(id => limited_pool_1.LimitedPool.create(underlyingPool, {
12
15
  limit: config.forBrowser(id).sessionsPerBrowser,
13
16
  })));
14
17
  }
@@ -22,7 +25,8 @@ module.exports = class PerBrowserLimitedPool extends Pool {
22
25
  }
23
26
  cancel() {
24
27
  this.log("cancel");
25
- _.forEach(this._browserPools, pool => pool.cancel());
28
+ (0, lodash_1.forEach)(this._browserPools, pool => pool.cancel());
26
29
  }
27
- };
30
+ }
31
+ exports.PerBrowserLimitedPool = PerBrowserLimitedPool;
28
32
  //# sourceMappingURL=per-browser-limited-pool.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"per-browser-limited-pool.js","sourceRoot":"","sources":["../../../src/browser-pool/per-browser-limited-pool.js"],"names":[],"mappings":"AAAA,YAAY,CAAC;AAEb,MAAM,CAAC,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;AAC5B,MAAM,IAAI,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;AAC/B,MAAM,WAAW,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAC;AAC9C,MAAM,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;AAE/B,MAAM,CAAC,OAAO,GAAG,MAAM,qBAAsB,SAAQ,IAAI;IACrD,YAAY,cAAc,EAAE,MAAM;QAC9B,KAAK,EAAE,CAAC;QAER,IAAI,CAAC,GAAG,GAAG,KAAK,CAAC,oCAAoC,CAAC,CAAC;QAEvD,MAAM,GAAG,GAAG,MAAM,CAAC,aAAa,EAAE,CAAC;QACnC,IAAI,CAAC,aAAa,GAAG,CAAC,CAAC,SAAS,CAC5B,GAAG,EACH,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CACT,WAAW,CAAC,MAAM,CAAC,cAAc,EAAE;YAC/B,KAAK,EAAE,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,kBAAkB;SAClD,CAAC,CACL,CACJ,CAAC;IACN,CAAC;IAED,UAAU,CAAC,EAAE,EAAE,IAAI;QACf,IAAI,CAAC,GAAG,CAAC,WAAW,EAAE,eAAe,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAE7D,OAAO,IAAI,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC,UAAU,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;IACvD,CAAC;IAED,WAAW,CAAC,OAAO,EAAE,IAAI;QACrB,IAAI,CAAC,GAAG,CAAC,QAAQ,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;QAEnC,OAAO,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,WAAW,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IACrE,CAAC;IAED,MAAM;QACF,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QACnB,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,aAAa,EAAE,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC;IACzD,CAAC;CACJ,CAAC"}
1
+ {"version":3,"file":"per-browser-limited-pool.js","sourceRoot":"","sources":["../../../src/browser-pool/per-browser-limited-pool.ts"],"names":[],"mappings":";;;;;;AAAA,kDAA0B;AAC1B,mCAA4C;AAK5C,iDAA6C;AAE7C,MAAa,qBAAqB;IAI9B,YAAY,cAAoB,EAAE,MAAc;QAC5C,IAAI,CAAC,GAAG,GAAG,IAAA,eAAK,EAAC,oCAAoC,CAAC,CAAC;QAEvD,MAAM,GAAG,GAAG,MAAM,CAAC,aAAa,EAAE,CAAC;QACnC,IAAI,CAAC,aAAa,GAAG,IAAA,kBAAS,EAC1B,GAAG,EACH,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CACT,0BAAW,CAAC,MAAM,CAAC,cAAc,EAAE;YAC/B,KAAK,EAAE,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,kBAAkB;SAClD,CAAC,CACL,CACJ,CAAC;IACN,CAAC;IAED,UAAU,CAAC,EAAU,EAAE,IAAa;QAChC,IAAI,CAAC,GAAG,CAAC,WAAW,EAAE,eAAe,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAE7D,OAAO,IAAI,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC,UAAU,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;IACvD,CAAC;IAED,WAAW,CAAC,OAAgB,EAAE,IAAa;QACvC,IAAI,CAAC,GAAG,CAAC,QAAQ,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;QAEnC,OAAO,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,WAAW,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IACrE,CAAC;IAED,MAAM;QACF,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QACnB,IAAA,gBAAO,EAAC,IAAI,CAAC,aAAa,EAAE,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC;IACvD,CAAC;CACJ;AAlCD,sDAkCC"}
@@ -0,0 +1,11 @@
1
+ import { Browser } from "../browser/browser";
2
+ export interface Pool<T extends Browser = Browser> {
3
+ getBrowser(id: string, opts?: object): Promise<T>;
4
+ freeBrowser(browser: T, opts?: object): Promise<void>;
5
+ cancel(): void;
6
+ }
7
+ export interface BrowserOpts {
8
+ force?: boolean;
9
+ version?: string;
10
+ highPriority?: boolean;
11
+ }
@@ -0,0 +1,3 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ //# sourceMappingURL=types.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/browser-pool/types.ts"],"names":[],"mappings":""}
@@ -1 +1 @@
1
- export function buildCompositeBrowserId(browserId: any, version: any): any;
1
+ export declare const buildCompositeBrowserId: (browserId: string, version?: string) => string;