testcontainers 10.24.1 → 10.25.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 (9) hide show
  1. package/build/docker-compose-environment/docker-compose-environment.d.ts +2 -0
  2. package/build/docker-compose-environment/docker-compose-environment.js +6 -1
  3. package/build/docker-compose-environment/docker-compose-environment.js.map +1 -1
  4. package/build/version.d.ts +1 -1
  5. package/build/version.js +1 -1
  6. package/build/wait-strategies/log-wait-strategy.d.ts +0 -4
  7. package/build/wait-strategies/log-wait-strategy.js +35 -23
  8. package/build/wait-strategies/log-wait-strategy.js.map +1 -1
  9. package/package.json +1 -1
package/build/docker-compose-environment/docker-compose-environment.d.ts CHANGED
@@ -13,6 +13,7 @@ export declare class DockerComposeEnvironment {
13
13
  private profiles;
14
14
  private environment;
15
15
  private pullPolicy;
16
+ private defaultWaitStrategy;
16
17
  private waitStrategy;
17
18
  private startupTimeout?;
18
19
  constructor(composeFilePath: string, composeFiles: string | string[], uuid?: Uuid);
@@ -22,6 +23,7 @@ export declare class DockerComposeEnvironment {
22
23
  withProfiles(...profiles: string[]): this;
23
24
  withNoRecreate(): this;
24
25
  withPullPolicy(pullPolicy: ImagePullPolicy): this;
26
+ withDefaultWaitStrategy(waitStrategy: WaitStrategy): this;
25
27
  withWaitStrategy(containerName: string, waitStrategy: WaitStrategy): this;
26
28
  withStartupTimeout(startupTimeout: number): this;
27
29
  withProjectName(projectName: string): this;
package/build/docker-compose-environment/docker-compose-environment.js CHANGED
@@ -21,6 +21,7 @@ class DockerComposeEnvironment {
21
21
  profiles = [];
22
22
  environment = {};
23
23
  pullPolicy = pull_policy_1.PullPolicy.defaultPolicy();
24
+ defaultWaitStrategy = wait_1.Wait.forListeningPorts();
24
25
  waitStrategy = {};
25
26
  startupTimeout;
26
27
  constructor(composeFilePath, composeFiles, uuid = new common_1.RandomUuid()) {
@@ -53,6 +54,10 @@ class DockerComposeEnvironment {
53
54
  this.pullPolicy = pullPolicy;
54
55
  return this;
55
56
  }
57
+ withDefaultWaitStrategy(waitStrategy) {
58
+ this.defaultWaitStrategy = waitStrategy;
59
+ return this;
60
+ }
56
61
  withWaitStrategy(containerName, waitStrategy) {
57
62
  this.waitStrategy[containerName] = waitStrategy;
58
63
  return this;
@@ -110,7 +115,7 @@ class DockerComposeEnvironment {
110
115
  const boundPorts = bound_ports_1.BoundPorts.fromInspectResult(client.info.containerRuntime.hostIps, mappedInspectResult);
111
116
  const waitStrategy = this.waitStrategy[containerName]
112
117
  ? this.waitStrategy[containerName]
113
- : wait_1.Wait.forListeningPorts();
118
+ : this.defaultWaitStrategy;
114
119
  if (this.startupTimeout !== undefined) {
115
120
  waitStrategy.withStartupTimeout(this.startupTimeout);
116
121
  }
package/build/docker-compose-environment/docker-compose-environment.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"docker-compose-environment.js","sourceRoot":"","sources":["../../src/docker-compose-environment/docker-compose-environment.ts"],"names":[],"mappings":";;;AACA,sCAAgE;AAChE,4DAA4F;AAC5F,8FAAyF;AACzF,6CAA6C;AAE7C,sDAAkD;AAClD,oEAA+D;AAC/D,sDAAmE;AACnE,kDAA+C;AAC/C,8EAAyE;AAEzE,6FAAuF;AAEvF,MAAa,wBAAwB;IAClB,eAAe,CAAS;IACxB,YAAY,CAAoB;IAEzC,WAAW,CAAS;IACpB,KAAK,GAAG,KAAK,CAAC;IACd,QAAQ,GAAG,IAAI,CAAC;IAChB,eAAe,GAAG,EAAE,CAAC;IACrB,QAAQ,GAAa,EAAE,CAAC;IACxB,WAAW,GAAgB,EAAE,CAAC;IAC9B,UAAU,GAAoB,wBAAU,CAAC,aAAa,EAAE,CAAC;IACzD,YAAY,GAA8C,EAAE,CAAC;IAC7D,cAAc,CAAU;IAEhC,YAAY,eAAuB,EAAE,YAA+B,EAAE,OAAa,IAAI,mBAAU,EAAE;QACjG,IAAI,CAAC,eAAe,GAAG,eAAe,CAAC;QACvC,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;QACjC,IAAI,CAAC,WAAW,GAAG,kBAAkB,IAAI,CAAC,QAAQ,EAAE,EAAE,CAAC;IACzD,CAAC;IAEM,SAAS;QACd,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;QAClB,OAAO,IAAI,CAAC;IACd,CAAC;IAEM,eAAe,CAAC,WAAwB;QAC7C,IAAI,CAAC,WAAW,GAAG,EAAE,GAAG,IAAI,CAAC,WAAW,EAAE,GAAG,WAAW,EAAE,CAAC;QAC3D,OAAO,IAAI,CAAC;IACd,CAAC;IAEM,mBAAmB,CAAC,eAAuB;QAChD,IAAI,CAAC,eAAe,GAAG,eAAe,CAAC;QACvC,OAAO,IAAI,CAAC;IACd,CAAC;IAEM,YAAY,CAAC,GAAG,QAAkB;QACvC,IAAI,CAAC,QAAQ,GAAG,CAAC,GAAG,IAAI,CAAC,QAAQ,EAAE,GAAG,QAAQ,CAAC,CAAC;QAChD,OAAO,IAAI,CAAC;IACd,CAAC;IAEM,cAAc;QACnB,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAC;QACtB,IAAI,CAAC,WAAW,GAAG,qBAAqB,CAAC;QACzC,OAAO,IAAI,CAAC;IACd,CAAC;IAEM,cAAc,CAAC,UAA2B;QAC/C,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,OAAO,IAAI,CAAC;IACd,CAAC;IAEM,gBAAgB,CAAC,aAAqB,EAAE,YAA0B;QACvE,IAAI,CAAC,YAAY,CAAC,aAAa,CAAC,GAAG,YAAY,CAAC;QAChD,OAAO,IAAI,CAAC;IACd,CAAC;IAEM,kBAAkB,CAAC,cAAsB;QAC9C,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;QACrC,OAAO,IAAI,CAAC;IACd,CAAC;IAEM,eAAe,CAAC,WAAmB;QACxC,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;QAC/B,OAAO,IAAI,CAAC;IACd,CAAC;IAEM,KAAK,CAAC,EAAE,CAAC,QAAwB;QACtC,YAAG,CAAC,IAAI,CAAC,uCAAuC,IAAI,CAAC,WAAW,MAAM,CAAC,CAAC;QACxE,MAAM,MAAM,GAAG,MAAM,IAAA,6CAAyB,GAAE,CAAC;QACjD,MAAM,MAAM,GAAG,MAAM,IAAA,kBAAS,EAAC,MAAM,CAAC,CAAC;QACvC,MAAM,CAAC,iBAAiB,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QAE3C,MAAM,OAAO,GAAG;YACd,QAAQ,EAAE,IAAI,CAAC,eAAe;YAC9B,KAAK,EAAE,IAAI,CAAC,YAAY;YACxB,WAAW,EAAE,IAAI,CAAC,WAAW;SAC9B,CAAC;QAEF,MAAM,cAAc,GAAG,EAAE,CAAC;QAC1B,IAAI,IAAI,CAAC,KAAK,EAAE;YACd,cAAc,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;SAChC;QACD,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE;YAClB,cAAc,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;SACtC;QAED,MAAM,cAAc,GAAa,EAAE,CAAC;QACpC,IAAI,IAAI,CAAC,eAAe,EAAE;YACxB,cAAc,CAAC,IAAI,CAAC,YAAY,EAAE,IAAI,CAAC,eAAe,CAAC,CAAC;SACzD;QACD,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,cAAc,CAAC,IAAI,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC,CAAC;QAE9E,IAAI,IAAI,CAAC,UAAU,CAAC,UAAU,EAAE,EAAE;YAChC,MAAM,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;SAC9C;QACD,MAAM,MAAM,CAAC,OAAO,CAAC,EAAE,CACrB;YACE,GAAG,OAAO;YACV,cAAc;YACd,cAAc;YACd,WAAW,EAAE,EAAE,GAAG,IAAI,CAAC,WAAW,EAAE;SACrC,EACD,QAAQ,CACT,CAAC;QAEF,MAAM,iBAAiB,GAAG,CAAC,MAAM,MAAM,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC,CAAC,MAAM,CAC9D,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,MAAM,CAAC,4BAA4B,CAAC,KAAK,IAAI,CAAC,WAAW,CACnF,CAAC;QACF,MAAM,qBAAqB,GAAG,iBAAiB,CAAC,MAAM,CACpD,CAAC,cAAwB,EAAE,gBAA+B,EAAE,EAAE,CAAC;YAC7D,GAAG,cAAc;YACjB,gBAAgB,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC;SAClC,EACD,EAAE,CACH,CAAC;QACF,YAAG,CAAC,IAAI,CAAC,uBAAuB,qBAAqB,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QAEvE,MAAM,wBAAwB,GAAG,CAC/B,MAAM,OAAO,CAAC,GAAG,CACf,iBAAiB,CAAC,GAAG,CAAC,KAAK,EAAE,gBAAgB,EAAE,EAAE;YAC/C,MAAM,SAAS,GAAG,MAAM,CAAC,SAAS,CAAC,OAAO,CAAC,gBAAgB,CAAC,EAAE,CAAC,CAAC;YAChE,MAAM,aAAa,GAAG,IAAA,6CAAyB,EAAC,IAAI,CAAC,WAAW,EAAE,gBAAgB,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;YAE7F,MAAM,aAAa,GAAG,MAAM,MAAM,CAAC,SAAS,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;YAChE,MAAM,mBAAmB,GAAG,IAAA,qCAAgB,EAAC,aAAa,CAAC,CAAC;YAC5D,MAAM,UAAU,GAAG,wBAAU,CAAC,iBAAiB,CAAC,MAAM,CAAC,IAAI,CAAC,gBAAgB,CAAC,OAAO,EAAE,mBAAmB,CAAC,CAAC;YAC3G,MAAM,YAAY,GAAG,IAAI,CAAC,YAAY,CAAC,aAAa,CAAC;gBACnD,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,aAAa,CAAC;gBAClC,CAAC,CAAC,WAAI,CAAC,iBAAiB,EAAE,CAAC;YAC7B,IAAI,IAAI,CAAC,cAAc,KAAK,SAAS,EAAE;gBACrC,YAAY,CAAC,kBAAkB,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;aACtD;YAED,IAAI,qBAAY,CAAC,OAAO,EAAE,EAAE;gBAC1B,CAAC,MAAM,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;qBACrC,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,qBAAY,CAAC,KAAK,CAAC,GAAG,aAAa,KAAK,IAAI,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;qBAC5E,EAAE,CAAC,KAAK,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,qBAAY,CAAC,KAAK,CAAC,GAAG,aAAa,KAAK,IAAI,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC;aAChF;YAED,IAAI;gBACF,MAAM,IAAA,qCAAgB,EAAC,MAAM,EAAE,SAAS,EAAE,YAAY,EAAE,UAAU,CAAC,CAAC;aACrE;YAAC,OAAO,GAAG,EAAE;gBACZ,IAAI;oBACF,MAAM,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC,CAAC;iBACzE;gBAAC,MAAM;oBACN,YAAG,CAAC,IAAI,CAAC,0DAA0D,CAAC,CAAC;iBACtE;gBACD,MAAM,GAAG,CAAC;aACX;YAED,OAAO,IAAI,mDAAuB,CAChC,SAAS,EACT,MAAM,CAAC,IAAI,CAAC,gBAAgB,CAAC,IAAI,EACjC,aAAa,EACb,UAAU,EACV,aAAa,EACb,YAAY,EACZ,IAAI,CACL,CAAC;QACJ,CAAC,CAAC,CACH,CACF,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,uBAAuB,EAAE,EAAE;YACxC,MAAM,aAAa,GAAG,uBAAuB,CAAC,OAAO,EAAE,CAAC;YACxD,OAAO,EAAE,GAAG,GAAG,EAAE,CAAC,aAAa,CAAC,EAAE,uBAAuB,EAAE,CAAC;QAC9D,CAAC,EAAE,EAAE,CAAC,CAAC;QAEP,YAAG,CAAC,IAAI,CAAC,mCAAmC,CAAC,CAAC;QAE9C,OAAO,IAAI,oEAA+B,CAAC,wBAAwB,EAAE;YACnE,GAAG,OAAO;YACV,cAAc;YACd,WAAW,EAAE,IAAI,CAAC,WAAW;SAC9B,CAAC,CAAC;IACL,CAAC;CACF;AA9KD,4DA8KC"}
1
+ {"version":3,"file":"docker-compose-environment.js","sourceRoot":"","sources":["../../src/docker-compose-environment/docker-compose-environment.ts"],"names":[],"mappings":"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"}
package/build/version.d.ts CHANGED
@@ -1 +1 @@
1
- export declare const LIB_VERSION = "10.24.1";
1
+ export declare const LIB_VERSION = "10.25.0";
package/build/version.js CHANGED
@@ -1,5 +1,5 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.LIB_VERSION = void 0;
4
- exports.LIB_VERSION = "10.24.1";
4
+ exports.LIB_VERSION = "10.25.0";
5
5
  //# sourceMappingURL=version.js.map
package/build/wait-strategies/log-wait-strategy.d.ts CHANGED
@@ -7,8 +7,4 @@ export declare class LogWaitStrategy extends AbstractWaitStrategy {
7
7
  private readonly times;
8
8
  constructor(message: Log | RegExp, times: number);
9
9
  waitUntilReady(container: Dockerode.Container, boundPorts: BoundPorts, startTime?: Date): Promise<void>;
10
- handleTimeout(containerId: string): Promise<void>;
11
- handleLogs(container: Dockerode.Container, startTime?: Date): Promise<void>;
12
- matches(line: string): boolean;
13
- throwError(containerId: string, message: string): void;
14
10
  }
package/build/wait-strategies/log-wait-strategy.js CHANGED
@@ -5,7 +5,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
5
5
  Object.defineProperty(exports, "__esModule", { value: true });
6
6
  exports.LogWaitStrategy = void 0;
7
7
  const byline_1 = __importDefault(require("byline"));
8
- const promises_1 = require("timers/promises");
9
8
  const common_1 = require("../common");
10
9
  const container_runtime_1 = require("../container-runtime");
11
10
  const wait_strategy_1 = require("./wait-strategy");
@@ -18,32 +17,45 @@ class LogWaitStrategy extends wait_strategy_1.AbstractWaitStrategy {
18
17
  this.times = times;
19
18
  }
20
19
  async waitUntilReady(container, boundPorts, startTime) {
21
- await Promise.race([this.handleTimeout(container.id), this.handleLogs(container, startTime)]);
22
- }
23
- async handleTimeout(containerId) {
24
- await (0, promises_1.setTimeout)(this.startupTimeout);
25
- this.throwError(containerId, `Log message "${this.message}" not received after ${this.startupTimeout}ms`);
26
- }
27
- async handleLogs(container, startTime) {
28
20
  common_1.log.debug(`Waiting for log message "${this.message}"...`, { containerId: container.id });
29
21
  const client = await (0, container_runtime_1.getContainerRuntimeClient)();
30
22
  const stream = await client.container.logs(container, { since: startTime ? startTime.getTime() / 1000 : 0 });
31
- let matches = 0;
32
- for await (const line of (0, byline_1.default)(stream)) {
33
- if (this.matches(line)) {
34
- if (++matches === this.times) {
35
- return common_1.log.debug(`Log wait strategy complete`, { containerId: container.id });
23
+ return new Promise((resolve, reject) => {
24
+ const timeout = setTimeout(() => {
25
+ const message = `Log message "${this.message}" not received after ${this.startupTimeout}ms`;
26
+ common_1.log.error(message, { containerId: container.id });
27
+ reject(new Error(message));
28
+ }, this.startupTimeout);
29
+ const comparisonFn = (line) => {
30
+ if (this.message instanceof RegExp) {
31
+ return this.message.test(line);
36
32
  }
37
- }
38
- }
39
- this.throwError(container.id, `Log stream ended and message "${this.message}" was not received`);
40
- }
41
- matches(line) {
42
- return this.message instanceof RegExp ? this.message.test(line) : line.includes(this.message);
43
- }
44
- throwError(containerId, message) {
45
- common_1.log.error(message, { containerId });
46
- throw new Error(message);
33
+ else {
34
+ return line.includes(this.message);
35
+ }
36
+ };
37
+ let count = 0;
38
+ const lineProcessor = (line) => {
39
+ if (comparisonFn(line)) {
40
+ if (++count === this.times) {
41
+ stream.destroy();
42
+ clearTimeout(timeout);
43
+ common_1.log.debug(`Log wait strategy complete`, { containerId: container.id });
44
+ resolve();
45
+ }
46
+ }
47
+ };
48
+ (0, byline_1.default)(stream)
49
+ .on("data", lineProcessor)
50
+ .on("err", lineProcessor)
51
+ .on("end", () => {
52
+ stream.destroy();
53
+ clearTimeout(timeout);
54
+ const message = `Log stream ended and message "${this.message}" was not received`;
55
+ common_1.log.error(message, { containerId: container.id });
56
+ reject(new Error(message));
57
+ });
58
+ });
47
59
  }
48
60
  }
49
61
  exports.LogWaitStrategy = LogWaitStrategy;
package/build/wait-strategies/log-wait-strategy.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"log-wait-strategy.js","sourceRoot":"","sources":["../../src/wait-strategies/log-wait-strategy.ts"],"names":[],"mappings":";;;;;;AAAA,oDAA4B;AAE5B,8CAA6C;AAC7C,sCAAgC;AAChC,4DAAiE;AAEjE,mDAAuD;AAIvD,MAAa,eAAgB,SAAQ,oCAAoB;IAEpC;IACA;IAFnB,YACmB,OAAqB,EACrB,KAAa;QAE9B,KAAK,EAAE,CAAC;QAHS,YAAO,GAAP,OAAO,CAAc;QACrB,UAAK,GAAL,KAAK,CAAQ;IAGhC,CAAC;IAEM,KAAK,CAAC,cAAc,CAAC,SAA8B,EAAE,UAAsB,EAAE,SAAgB;QAClG,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,EAAE,CAAC,EAAE,IAAI,CAAC,UAAU,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC;IAChG,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,WAAmB;QACrC,MAAM,IAAA,qBAAU,EAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QACtC,IAAI,CAAC,UAAU,CAAC,WAAW,EAAE,gBAAgB,IAAI,CAAC,OAAO,wBAAwB,IAAI,CAAC,cAAc,IAAI,CAAC,CAAC;IAC5G,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,SAA8B,EAAE,SAAgB;QAC/D,YAAG,CAAC,KAAK,CAAC,4BAA4B,IAAI,CAAC,OAAO,MAAM,EAAE,EAAE,WAAW,EAAE,SAAS,CAAC,EAAE,EAAE,CAAC,CAAC;QACzF,MAAM,MAAM,GAAG,MAAM,IAAA,6CAAyB,GAAE,CAAC;QACjD,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,SAAS,EAAE,EAAE,KAAK,EAAE,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;QAE7G,IAAI,OAAO,GAAG,CAAC,CAAC;QAChB,IAAI,KAAK,EAAE,MAAM,IAAI,IAAI,IAAA,gBAAM,EAAC,MAAM,CAAC,EAAE;YACvC,IAAI,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;gBACtB,IAAI,EAAE,OAAO,KAAK,IAAI,CAAC,KAAK,EAAE;oBAC5B,OAAO,YAAG,CAAC,KAAK,CAAC,4BAA4B,EAAE,EAAE,WAAW,EAAE,SAAS,CAAC,EAAE,EAAE,CAAC,CAAC;iBAC/E;aACF;SACF;QAED,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,EAAE,iCAAiC,IAAI,CAAC,OAAO,oBAAoB,CAAC,CAAC;IACnG,CAAC;IAED,OAAO,CAAC,IAAY;QAClB,OAAO,IAAI,CAAC,OAAO,YAAY,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAChG,CAAC;IAED,UAAU,CAAC,WAAmB,EAAE,OAAe;QAC7C,YAAG,CAAC,KAAK,CAAC,OAAO,EAAE,EAAE,WAAW,EAAE,CAAC,CAAC;QACpC,MAAM,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC;IAC3B,CAAC;CACF;AA1CD,0CA0CC"}
1
+ {"version":3,"file":"log-wait-strategy.js","sourceRoot":"","sources":["../../src/wait-strategies/log-wait-strategy.ts"],"names":[],"mappings":";;;;;;AAAA,oDAA4B;AAE5B,sCAAgC;AAChC,4DAAiE;AAEjE,mDAAuD;AAIvD,MAAa,eAAgB,SAAQ,oCAAoB;IAEpC;IACA;IAFnB,YACmB,OAAqB,EACrB,KAAa;QAE9B,KAAK,EAAE,CAAC;QAHS,YAAO,GAAP,OAAO,CAAc;QACrB,UAAK,GAAL,KAAK,CAAQ;IAGhC,CAAC;IAEM,KAAK,CAAC,cAAc,CAAC,SAA8B,EAAE,UAAsB,EAAE,SAAgB;QAClG,YAAG,CAAC,KAAK,CAAC,4BAA4B,IAAI,CAAC,OAAO,MAAM,EAAE,EAAE,WAAW,EAAE,SAAS,CAAC,EAAE,EAAE,CAAC,CAAC;QACzF,MAAM,MAAM,GAAG,MAAM,IAAA,6CAAyB,GAAE,CAAC;QACjD,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,SAAS,EAAE,EAAE,KAAK,EAAE,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;QAC7G,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACrC,MAAM,OAAO,GAAG,UAAU,CAAC,GAAG,EAAE;gBAC9B,MAAM,OAAO,GAAG,gBAAgB,IAAI,CAAC,OAAO,wBAAwB,IAAI,CAAC,cAAc,IAAI,CAAC;gBAC5F,YAAG,CAAC,KAAK,CAAC,OAAO,EAAE,EAAE,WAAW,EAAE,SAAS,CAAC,EAAE,EAAE,CAAC,CAAC;gBAClD,MAAM,CAAC,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC;YAC7B,CAAC,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;YAExB,MAAM,YAAY,GAA8B,CAAC,IAAY,EAAE,EAAE;gBAC/D,IAAI,IAAI,CAAC,OAAO,YAAY,MAAM,EAAE;oBAClC,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;iBAChC;qBAAM;oBACL,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;iBACpC;YACH,CAAC,CAAC;YAEF,IAAI,KAAK,GAAG,CAAC,CAAC;YACd,MAAM,aAAa,GAAG,CAAC,IAAY,EAAE,EAAE;gBACrC,IAAI,YAAY,CAAC,IAAI,CAAC,EAAE;oBACtB,IAAI,EAAE,KAAK,KAAK,IAAI,CAAC,KAAK,EAAE;wBAC1B,MAAM,CAAC,OAAO,EAAE,CAAC;wBACjB,YAAY,CAAC,OAAO,CAAC,CAAC;wBACtB,YAAG,CAAC,KAAK,CAAC,4BAA4B,EAAE,EAAE,WAAW,EAAE,SAAS,CAAC,EAAE,EAAE,CAAC,CAAC;wBACvE,OAAO,EAAE,CAAC;qBACX;iBACF;YACH,CAAC,CAAC;YAEF,IAAA,gBAAM,EAAC,MAAM,CAAC;iBACX,EAAE,CAAC,MAAM,EAAE,aAAa,CAAC;iBACzB,EAAE,CAAC,KAAK,EAAE,aAAa,CAAC;iBACxB,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE;gBACd,MAAM,CAAC,OAAO,EAAE,CAAC;gBACjB,YAAY,CAAC,OAAO,CAAC,CAAC;gBACtB,MAAM,OAAO,GAAG,iCAAiC,IAAI,CAAC,OAAO,oBAAoB,CAAC;gBAClF,YAAG,CAAC,KAAK,CAAC,OAAO,EAAE,EAAE,WAAW,EAAE,SAAS,CAAC,EAAE,EAAE,CAAC,CAAC;gBAClD,MAAM,CAAC,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC;YAC7B,CAAC,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;IACL,CAAC;CACF;AAnDD,0CAmDC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "testcontainers",
3
- "version": "10.24.1",
3
+ "version": "10.25.0",
4
4
  "author": "Cristian Greco",
5
5
  "license": "MIT",
6
6
  "keywords": [