@applitools/ec-client 1.6.1 → 1.7.0

package/CHANGELOG.md

@@ -1,5 +1,63 @@
 # Changelog
 
+## [1.7.0](https://github.com/applitools/eyes.sdk.javascript1/compare/js/ec-client@1.6.2...js/ec-client@1.7.0) (2023-07-13)
+
+
+### Features
+
+* added internal function to prepare environment before running tunnels ([3d19ec3](https://github.com/applitools/eyes.sdk.javascript1/commit/3d19ec3b274702ffdf26b766b7351ec1f4b66a6d))
+
+
+### Dependencies
+
+* @applitools/driver bumped from 1.13.0 to 1.13.1
+  #### Bug Fixes
+
+  * replaced NML prefixed appium env vars with APPLITOOLS prefixed ([8905b90](https://github.com/applitools/eyes.sdk.javascript1/commit/8905b90e7c4ec6e310f6e52c03bbcc7acf1ff2ab))
+* @applitools/tunnel-client bumped from 1.0.2 to 1.1.0
+  #### Features
+
+  * added internal function to prepare environment before running tunnels ([3d19ec3](https://github.com/applitools/eyes.sdk.javascript1/commit/3d19ec3b274702ffdf26b766b7351ec1f4b66a6d))
+
+
+  #### Bug Fixes
+
+  * prevent tunnel binaries from overriding itself ([5609a36](https://github.com/applitools/eyes.sdk.javascript1/commit/5609a36c93622c9b8eeb4b4ab25f95907df8baa4))
+
+
+
+* @applitools/spec-driver-webdriver bumped from 1.0.37 to 1.0.38
+
+* @applitools/execution-grid-tunnel bumped to 2.1.8
+
+
+## [1.6.2](https://github.com/applitools/eyes.sdk.javascript1/compare/js/ec-client@1.6.1...js/ec-client@1.6.2) (2023-07-10)
+
+
+### Bug Fixes
+
+* fixed issue that caused creation of unnecessary tunnels ([b38fe37](https://github.com/applitools/eyes.sdk.javascript1/commit/b38fe3754f97c5f312ceffd74406255654466ab7))
+* start tunnels with proper regional server ([2a34ed8](https://github.com/applitools/eyes.sdk.javascript1/commit/2a34ed8cd72dc9ac54957348cbe8ba9e67032340))
+
+
+### Dependencies
+
+* @applitools/core-base bumped from 1.3.0 to 1.4.0
+  #### Features
+
+  * support custom property per renderer ([#1715](https://github.com/applitools/eyes.sdk.javascript1/issues/1715)) ([8cf6b1f](https://github.com/applitools/eyes.sdk.javascript1/commit/8cf6b1fb0563b2485ca18eebc2efd236c2287db8))
+
+
+
+* @applitools/image bumped from 1.0.36 to 1.1.0
+  #### Features
+
+  * prevent animated gif images from playing in ufg ([#1721](https://github.com/applitools/eyes.sdk.javascript1/issues/1721)) ([30f39cc](https://github.com/applitools/eyes.sdk.javascript1/commit/30f39cc8ef2cdfa1d85bd7a0037b818db1b52e1b))
+* @applitools/tunnel-client bumped from 1.0.1 to 1.0.2
+  #### Bug Fixes
+
+  * start tunnels with proper regional server ([2a34ed8](https://github.com/applitools/eyes.sdk.javascript1/commit/2a34ed8cd72dc9ac54957348cbe8ba9e67032340))
+
 ## [1.6.1](https://github.com/applitools/eyes.sdk.javascript1/compare/js/ec-client@1.6.0...js/ec-client@1.6.1) (2023-07-05)
 
 

package/dist/commands/start-session.js

@@ -24,8 +24,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeStartSession = void 0;
-//@ts-ignore
-const execution_grid_tunnel_1 = require("@applitools/execution-grid-tunnel");
+const tunnel_client_1 = require("@applitools/tunnel-client");
 const abort_controller_1 = require("abort-controller");
 const utils = __importStar(require("@applitools/utils"));
 const SERVER_URLS = {
@@ -73,8 +72,8 @@ function makeStartSession({ settings, req, tunnels }) {
         }
         if (options.tunnel && tunnels) {
             // TODO should be removed once tunnel spawning issue is solved
-            await (0, execution_grid_tunnel_1.prepareEnvironment)();
-            session.tunnels = await tunnels.acquire(session.credentials);
+            await (0, tunnel_client_1.prepareTunnelEnvironment)({ settings: { tunnelServerUrl: session.serverUrl }, logger });
+            session.tunnels = await tunnels.acquire({ ...session.credentials, tunnelServerUrl: session.serverUrl });
         }
         const applitoolsCapabilities = Object.fromEntries([
             ...Object.entries(options).map(([key, value]) => [`applitools:${key}`, value]),

package/dist/tunnels/manager.js

@@ -54,6 +54,7 @@ async function makeTunnelManager({ settings, logger, }) {
 exports.makeTunnelManager = makeTunnelManager;
 function makePool(options) {
     const pool = new Map();
+    const pending = new Set();
     return {
         acquire,
         add,
@@ -65,12 +66,29 @@ function makePool(options) {
     async function acquire(resourceOptions) {
         let resource = await get();
         if (!resource) {
-            resource = await options.create(resourceOptions);
+            resource = await create(resourceOptions);
             await add(resource);
         }
         await use(resource);
         return resource;
     }
+    async function create(resourceOptions) {
+        const availableItem = [...pending].reduce((availableItem, item) => {
+            return (!options.maxInuse || item.waiting < options.maxInuse) &&
+                (!availableItem || availableItem.waiting > item.waiting)
+                ? item
+                : availableItem;
+        }, null);
+        if (availableItem) {
+            availableItem.waiting += 1;
+            return availableItem.resource;
+        }
+        const resource = options.create(resourceOptions);
+        const item = { resource, waiting: 1 };
+        resource.finally(() => pending.delete(item));
+        pending.add(item);
+        return resource;
+    }
     async function add(resource) {
         var _a, _b;
         const item = {
@@ -87,11 +105,13 @@ function makePool(options) {
     }
     async function get() {
         var _a;
-        const freeItem = Array.from(pool.values()).reduce((freeItem, item) => !item.destroyed &&
-            (!options.maxInuse || item.inuse < options.maxInuse) &&
-            (!freeItem || freeItem.inuse > item.inuse)
-            ? item
-            : freeItem, null);
+        const freeItem = [...pool.values()].reduce((freeItem, item) => {
+            return !item.destroyed &&
+                (!options.maxInuse || item.inuse < options.maxInuse) &&
+                (!freeItem || freeItem.inuse > item.inuse)
+                ? item
+                : freeItem;
+        }, null);
         return (_a = freeItem === null || freeItem === void 0 ? void 0 : freeItem.resource) !== null && _a !== void 0 ? _a : null;
     }
     async function use(resource) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applitools/ec-client",
-  "version": "1.6.1",
+  "version": "1.7.0",
   "homepage": "https://applitools.com",
   "bugs": {
     "url": "https://github.com/applitools/eyes.sdk.javascript1/issues"
@@ -52,14 +52,13 @@
     "test:it": "MOCHA_GROUP=it run --top-level mocha './test/it/*.spec.ts'"
   },
   "dependencies": {
-    "@applitools/core-base": "1.3.0",
-    "@applitools/driver": "1.13.0",
-    "@applitools/execution-grid-tunnel": "2.1.6",
+    "@applitools/core-base": "1.4.0",
+    "@applitools/driver": "1.13.1",
     "@applitools/logger": "2.0.5",
     "@applitools/req": "1.4.0",
     "@applitools/socket": "1.1.5",
-    "@applitools/spec-driver-webdriver": "1.0.37",
-    "@applitools/tunnel-client": "1.0.1",
+    "@applitools/spec-driver-webdriver": "1.0.38",
+    "@applitools/tunnel-client": "1.1.0",
     "@applitools/utils": "1.5.0",
     "abort-controller": "3.0.0",
     "webdriver": "7",