@applitools/ec-client 1.5.0 → 1.6.1

package/CHANGELOG.md

@@ -1,5 +1,57 @@
 # Changelog
 
+## [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)
+
+
+### Dependencies
+
+* @applitools/tunnel-client bumped from 1.0.0 to 1.0.1
+  #### Bug Fixes
+
+  * re-release ([438a9aa](https://github.com/applitools/eyes.sdk.javascript1/commit/438a9aa6331ba76d6bdc7d94e8f27d7ae45730da))
+
+## [1.6.0](https://github.com/applitools/eyes.sdk.javascript1/compare/js/ec-client@1.5.0...js/ec-client@1.6.0) (2023-07-05)
+
+
+### Features
+
+* added support of regional execution cloud servers ([#1711](https://github.com/applitools/eyes.sdk.javascript1/issues/1711)) ([2e26c69](https://github.com/applitools/eyes.sdk.javascript1/commit/2e26c6944bb15f6121fb37c1dba95aba162c1f6a))
+* support dns caching ([#1680](https://github.com/applitools/eyes.sdk.javascript1/issues/1680)) ([9bbff34](https://github.com/applitools/eyes.sdk.javascript1/commit/9bbff34f50c9d18758b55a6bcb45571ca1148180))
+
+
+### Bug Fixes
+
+* fixed auto tunnel cleanup after unexpected end of the process ([3c1ad08](https://github.com/applitools/eyes.sdk.javascript1/commit/3c1ad0837d2d3560becc6d89370aa878becb3270))
+
+
+### Dependencies
+
+* @applitools/core-base bumped from 1.2.1 to 1.3.0
+  #### Features
+
+  * support dns caching ([#1680](https://github.com/applitools/eyes.sdk.javascript1/issues/1680)) ([9bbff34](https://github.com/applitools/eyes.sdk.javascript1/commit/9bbff34f50c9d18758b55a6bcb45571ca1148180))
+
+
+
+* @applitools/req bumped from 1.3.3 to 1.4.0
+  #### Features
+
+  * support dns caching ([#1680](https://github.com/applitools/eyes.sdk.javascript1/issues/1680)) ([9bbff34](https://github.com/applitools/eyes.sdk.javascript1/commit/9bbff34f50c9d18758b55a6bcb45571ca1148180))
+* @applitools/driver bumped from 1.12.4 to 1.13.0
+  #### Features
+
+  * added auto applitools lib detection ([#1707](https://github.com/applitools/eyes.sdk.javascript1/issues/1707)) ([7d439b5](https://github.com/applitools/eyes.sdk.javascript1/commit/7d439b52af55f3b0596c9d35d6ba85c717448023))
+* @applitools/tunnel-client bumped from 0.1.1 to 1.0.0
+  #### Features
+
+  * added binaries and made them available in jfrog ([92033fe](https://github.com/applitools/eyes.sdk.javascript1/commit/92033fed7edc58bbc4a4e37269068418fe3afc3d))
+  * release as 1.0.0 ([93bf312](https://github.com/applitools/eyes.sdk.javascript1/commit/93bf31205b07d19bc2cb4f50b974c7bad0f49cea))
+
+
+
+* @applitools/spec-driver-webdriver bumped from 1.0.36 to 1.0.37
+
+
 ## [1.5.0](https://github.com/applitools/eyes.sdk.javascript1/compare/js/ec-client@1.4.0...js/ec-client@1.5.0) (2023-06-28)
 
 

package/dist/client.js

@@ -28,33 +28,35 @@ const logger_1 = require("@applitools/logger");
 const server_1 = require("./server");
 const utils = __importStar(require("@applitools/utils"));
 async function makeECClient({ settings, logger: defaultLogger, } = {}) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6;
-    var _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6, _7, _8, _9;
+    var _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29;
     const logger = (0, logger_1.makeLogger)({ logger: defaultLogger, format: { label: 'ec-client' } });
     settings !== null && settings !== void 0 ? settings : (settings = {});
-    (_a = settings.serverUrl) !== null && _a !== void 0 ? _a : (settings.serverUrl = (_b = utils.general.getEnvValue('EG_SERVER_URL')) !== null && _b !== void 0 ? _b : 'https://exec-wus.applitools.com');
-    (_c = settings.proxy) !== null && _c !== void 0 ? _c : (settings.proxy = utils.general.getEnvValue('PROXY_URL') ? { url: utils.general.getEnvValue('PROXY_URL') } : undefined);
-    (_d = settings.tunnel) !== null && _d !== void 0 ? _d : (settings.tunnel = {});
-    (_e = (_7 = settings.tunnel).serviceUrl) !== null && _e !== void 0 ? _e : (_7.serviceUrl = utils.general.getEnvValue('EG_TUNNEL_URL'));
-    (_f = (_8 = settings.tunnel).groupSize) !== null && _f !== void 0 ? _f : (_8.groupSize = (_g = utils.general.getEnvValue('TUNNEL_GROUP_SIZE', 'number')) !== null && _g !== void 0 ? _g : 2);
-    (_h = (_9 = settings.tunnel).pool) !== null && _h !== void 0 ? _h : (_9.pool = {});
-    (_j = (_10 = settings.tunnel.pool).maxInuse) !== null && _j !== void 0 ? _j : (_10.maxInuse = (_k = utils.general.getEnvValue('TUNNEL_POOL_MAX_INUSE', 'number')) !== null && _k !== void 0 ? _k : 4);
-    (_l = (_11 = settings.tunnel.pool).timeout) !== null && _l !== void 0 ? _l : (_11.timeout = {});
-    (_m = (_12 = settings.tunnel.pool.timeout).idle) !== null && _m !== void 0 ? _m : (_12.idle = (_o = utils.general.getEnvValue('TUNNEL_POOL_TIMEOUT_IDLE', 'number')) !== null && _o !== void 0 ? _o : 20 * 60000);
-    (_p = (_13 = settings.tunnel.pool.timeout).expiration) !== null && _p !== void 0 ? _p : (_13.expiration = (_q = utils.general.getEnvValue('TUNNEL_POOL_TIMEOUT_EXPIRATION', 'number')) !== null && _q !== void 0 ? _q : 30000);
-    (_r = settings.options) !== null && _r !== void 0 ? _r : (settings.options = {});
-    (_s = (_14 = settings.options).eyesServerUrl) !== null && _s !== void 0 ? _s : (_14.eyesServerUrl = (_u = (_t = utils.general.getEnvValue('EYES_SERVER_URL')) !== null && _t !== void 0 ? _t : utils.general.getEnvValue('SERVER_URL')) !== null && _u !== void 0 ? _u : 'https://eyesapi.applitools.com');
-    (_v = (_15 = settings.options).apiKey) !== null && _v !== void 0 ? _v : (_15.apiKey = utils.general.getEnvValue('API_KEY'));
-    (_w = (_16 = settings.options).batch) !== null && _w !== void 0 ? _w : (_16.batch = {});
-    (_x = (_17 = settings.options.batch).id) !== null && _x !== void 0 ? _x : (_17.id = (_y = utils.general.getEnvValue('BATCH_ID')) !== null && _y !== void 0 ? _y : `generated-${utils.general.guid()}`);
-    (_z = (_18 = settings.options.batch).name) !== null && _z !== void 0 ? _z : (_18.name = utils.general.getEnvValue('BATCH_NAME'));
-    (_0 = (_19 = settings.options.batch).sequenceName) !== null && _0 !== void 0 ? _0 : (_19.sequenceName = utils.general.getEnvValue('BATCH_SEQUENCE'));
-    (_1 = (_20 = settings.options.batch).notifyOnCompletion) !== null && _1 !== void 0 ? _1 : (_20.notifyOnCompletion = utils.general.getEnvValue('BATCH_NOTIFY', 'boolean'));
-    (_2 = (_21 = settings.options).tunnel) !== null && _2 !== void 0 ? _2 : (_21.tunnel = utils.general.getEnvValue('TUNNEL', 'boolean'));
-    (_3 = (_22 = settings.options).useSelfHealing) !== null && _3 !== void 0 ? _3 : (_22.useSelfHealing = utils.general.getEnvValue('USE_SELF_HEALING', 'boolean'));
-    (_4 = (_23 = settings.options).sessionName) !== null && _4 !== void 0 ? _4 : (_23.sessionName = utils.general.getEnvValue('SESSION_NAME'));
-    (_5 = (_24 = settings.options).timeout) !== null && _5 !== void 0 ? _5 : (_24.timeout = utils.general.getEnvValue('EG_TIMEOUT', 'number'));
-    (_6 = (_25 = settings.options).inactivityTimeout) !== null && _6 !== void 0 ? _6 : (_25.inactivityTimeout = utils.general.getEnvValue('EG_INACTIVITY_TIMEOUT', 'number'));
+    (_a = settings.serverUrl) !== null && _a !== void 0 ? _a : (settings.serverUrl = (_c = (_b = utils.general.getEnvValue('EXECUTION_CLOUD_URL')) !== null && _b !== void 0 ? _b : utils.general.getEnvValue('EG_SERVER_URL')) !== null && _c !== void 0 ? _c : 'https://exec-wus.applitools.com');
+    (_d = settings.proxy) !== null && _d !== void 0 ? _d : (settings.proxy = utils.general.getEnvValue('PROXY_URL') ? { url: utils.general.getEnvValue('PROXY_URL') } : undefined);
+    (_e = settings.useDnsCache) !== null && _e !== void 0 ? _e : (settings.useDnsCache = utils.general.getEnvValue('USE_DNS_CACHE', 'boolean'));
+    (_f = settings.tunnel) !== null && _f !== void 0 ? _f : (settings.tunnel = {});
+    (_g = (_10 = settings.tunnel).serviceUrl) !== null && _g !== void 0 ? _g : (_10.serviceUrl = utils.general.getEnvValue('EG_TUNNEL_URL'));
+    (_h = (_11 = settings.tunnel).groupSize) !== null && _h !== void 0 ? _h : (_11.groupSize = (_j = utils.general.getEnvValue('TUNNEL_GROUP_SIZE', 'number')) !== null && _j !== void 0 ? _j : 2);
+    (_k = (_12 = settings.tunnel).pool) !== null && _k !== void 0 ? _k : (_12.pool = {});
+    (_l = (_13 = settings.tunnel.pool).maxInuse) !== null && _l !== void 0 ? _l : (_13.maxInuse = (_m = utils.general.getEnvValue('TUNNEL_POOL_MAX_INUSE', 'number')) !== null && _m !== void 0 ? _m : 4);
+    (_o = (_14 = settings.tunnel.pool).timeout) !== null && _o !== void 0 ? _o : (_14.timeout = {});
+    (_p = (_15 = settings.tunnel.pool.timeout).idle) !== null && _p !== void 0 ? _p : (_15.idle = (_q = utils.general.getEnvValue('TUNNEL_POOL_TIMEOUT_IDLE', 'number')) !== null && _q !== void 0 ? _q : 20 * 60000);
+    (_r = (_16 = settings.tunnel.pool.timeout).expiration) !== null && _r !== void 0 ? _r : (_16.expiration = (_s = utils.general.getEnvValue('TUNNEL_POOL_TIMEOUT_EXPIRATION', 'number')) !== null && _s !== void 0 ? _s : 30000);
+    (_t = settings.options) !== null && _t !== void 0 ? _t : (settings.options = {});
+    (_u = (_17 = settings.options).eyesServerUrl) !== null && _u !== void 0 ? _u : (_17.eyesServerUrl = (_w = (_v = utils.general.getEnvValue('EYES_SERVER_URL')) !== null && _v !== void 0 ? _v : utils.general.getEnvValue('SERVER_URL')) !== null && _w !== void 0 ? _w : 'https://eyesapi.applitools.com');
+    (_x = (_18 = settings.options).apiKey) !== null && _x !== void 0 ? _x : (_18.apiKey = utils.general.getEnvValue('API_KEY'));
+    (_y = (_19 = settings.options).region) !== null && _y !== void 0 ? _y : (_19.region = utils.general.getEnvValue('EXECUTION_CLOUD_REGION'));
+    (_z = (_20 = settings.options).batch) !== null && _z !== void 0 ? _z : (_20.batch = {});
+    (_0 = (_21 = settings.options.batch).id) !== null && _0 !== void 0 ? _0 : (_21.id = (_1 = utils.general.getEnvValue('BATCH_ID')) !== null && _1 !== void 0 ? _1 : `generated-${utils.general.guid()}`);
+    (_2 = (_22 = settings.options.batch).name) !== null && _2 !== void 0 ? _2 : (_22.name = utils.general.getEnvValue('BATCH_NAME'));
+    (_3 = (_23 = settings.options.batch).sequenceName) !== null && _3 !== void 0 ? _3 : (_23.sequenceName = utils.general.getEnvValue('BATCH_SEQUENCE'));
+    (_4 = (_24 = settings.options.batch).notifyOnCompletion) !== null && _4 !== void 0 ? _4 : (_24.notifyOnCompletion = utils.general.getEnvValue('BATCH_NOTIFY', 'boolean'));
+    (_5 = (_25 = settings.options).tunnel) !== null && _5 !== void 0 ? _5 : (_25.tunnel = utils.general.getEnvValue('TUNNEL', 'boolean'));
+    (_6 = (_26 = settings.options).useSelfHealing) !== null && _6 !== void 0 ? _6 : (_26.useSelfHealing = utils.general.getEnvValue('USE_SELF_HEALING', 'boolean'));
+    (_7 = (_27 = settings.options).sessionName) !== null && _7 !== void 0 ? _7 : (_27.sessionName = utils.general.getEnvValue('SESSION_NAME'));
+    (_8 = (_28 = settings.options).timeout) !== null && _8 !== void 0 ? _8 : (_28.timeout = utils.general.getEnvValue('EG_TIMEOUT', 'number'));
+    (_9 = (_29 = settings.options).inactivityTimeout) !== null && _9 !== void 0 ? _9 : (_29.inactivityTimeout = utils.general.getEnvValue('EG_INACTIVITY_TIMEOUT', 'number'));
     const server = await (0, server_1.makeServer)({ settings: settings, logger });
     return server;
 }

package/dist/commands/end-session.js

@@ -6,7 +6,7 @@ function makeEndSession({ req, tunnels }) {
         var _a, _b;
         var _c;
         logger.log(`Request was intercepted with sessionId:`, session.sessionId);
-        await req(request.url, { io: { request, response }, logger });
+        await req(request.url, { baseUrl: session.serverUrl, io: { request, response }, logger });
         if ((_a = session.tests) === null || _a === void 0 ? void 0 : _a.current) {
             await session.tests.current.abort({ settings: { testMetadata: session.metadata }, logger });
             (_b = (_c = session.tests).ended) !== null && _b !== void 0 ? _b : (_c.ended = []);

package/dist/commands/execute-script.js

@@ -107,7 +107,7 @@ function makeExecuteScript({ req, core }) {
                 return;
             }
         }
-        await req(request.url, { body: requestBody, io: { request, response }, logger });
+        await req(request.url, { baseUrl: session.serverUrl, body: requestBody, io: { request, response }, logger });
     };
 }
 exports.makeExecuteScript = makeExecuteScript;

package/dist/commands/find-element.js

@@ -5,7 +5,11 @@ function makeFindElement({ req }) {
     return async function findElement({ session, request, response, logger, }) {
         var _a, _b, _c;
         logger.log('Inspecting element lookup request to collect self-healing metadata');
-        const proxyResponse = await req(request.url, { io: { request, response, handle: false }, logger });
+        const proxyResponse = await req(request.url, {
+            baseUrl: session.serverUrl,
+            io: { request, response, handle: false },
+            logger,
+        });
         const responseBody = Buffer.from(await proxyResponse.arrayBuffer());
         const parsed = JSON.parse(responseBody.toString('utf8'));
         if ((_b = (_a = parsed === null || parsed === void 0 ? void 0 : parsed.appliCustomData) === null || _a === void 0 ? void 0 : _a.selfHealing) === null || _b === void 0 ? void 0 : _b.successfulSelector) {

package/dist/commands/start-session.js

@@ -28,6 +28,10 @@ exports.makeStartSession = void 0;
 const execution_grid_tunnel_1 = require("@applitools/execution-grid-tunnel");
 const abort_controller_1 = require("abort-controller");
 const utils = __importStar(require("@applitools/utils"));
+const SERVER_URLS = {
+    'us-west': 'https://exec-wus.applitools.com',
+    australia: 'https://exec-au.applitools.com',
+};
 const RETRY_BACKOFF = [
     ...Array(5).fill(2000),
     ...Array(4).fill(5000),
@@ -36,7 +40,7 @@ const RETRY_BACKOFF = [
 function makeStartSession({ settings, req, tunnels }) {
     const queues = new Map();
     return async function createSession({ request, response, logger, }) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
         const requestBody = await utils.streams.toJSON(request);
         logger.log(`Request was intercepted with body:`, requestBody);
         let capabilities = {};
@@ -56,25 +60,33 @@ function makeStartSession({ settings, req, tunnels }) {
                 Object.fromEntries(Object.entries(capabilities).map(([key, value]) => [key.replace(/^applitools:/, ''), value]))),
         };
         const session = {
+            serverUrl: settings.serverUrl,
+            proxy: settings.proxy,
             credentials: { eyesServerUrl: options.eyesServerUrl, apiKey: options.apiKey },
             options,
         };
+        if (options.region) {
+            if (SERVER_URLS[options.region])
+                session.serverUrl = SERVER_URLS[options.region];
+            else
+                throw new Error(`Failed to create session in unknown region ${options.region}`);
+        }
         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);
-            session.tunnels.forEach((tunnel, index) => {
-                options[`x-tunnel-id-${index}`] = tunnel.tunnelId;
-            });
         }
-        const applitoolsCapabilities = Object.fromEntries(Object.entries(options).map(([key, value]) => [`applitools:${key}`, value]));
+        const applitoolsCapabilities = Object.fromEntries([
+            ...Object.entries(options).map(([key, value]) => [`applitools:${key}`, value]),
+            ...((_g = (_f = session.tunnels) === null || _f === void 0 ? void 0 : _f.map((tunnel, index) => [`applitools:x-tunnel-id-${index}`, tunnel.tunnelId])) !== null && _g !== void 0 ? _g : []),
+        ]);
         if (!utils.types.isEmpty(requestBody.desiredCapabilities)) {
             requestBody.desiredCapabilities = { ...requestBody.desiredCapabilities, ...applitoolsCapabilities };
         }
-        else if (!utils.types.isEmpty((_f = requestBody.capabilities) === null || _f === void 0 ? void 0 : _f.alwaysMatch)) {
-            requestBody.capabilities.alwaysMatch = { ...(_g = requestBody.capabilities) === null || _g === void 0 ? void 0 : _g.alwaysMatch, ...applitoolsCapabilities };
+        else if (!utils.types.isEmpty((_h = requestBody.capabilities) === null || _h === void 0 ? void 0 : _h.alwaysMatch)) {
+            requestBody.capabilities.alwaysMatch = { ...(_j = requestBody.capabilities) === null || _j === void 0 ? void 0 : _j.alwaysMatch, ...applitoolsCapabilities };
         }
-        else if (!utils.types.isEmpty((_j = (_h = requestBody.capabilities) === null || _h === void 0 ? void 0 : _h.firstMatch) === null || _j === void 0 ? void 0 : _j[0])) {
+        else if (!utils.types.isEmpty((_l = (_k = requestBody.capabilities) === null || _k === void 0 ? void 0 : _k.firstMatch) === null || _l === void 0 ? void 0 : _l[0])) {
             requestBody.capabilities.firstMatch = [{ ...requestBody.capabilities.firstMatch[0], ...applitoolsCapabilities }];
         }
         else {
@@ -98,6 +110,7 @@ function makeStartSession({ settings, req, tunnels }) {
             if (signal.aborted)
                 return queue.pause;
             const proxyResponse = await req(request.url, {
+                baseUrl: session.serverUrl,
                 body: requestBody,
                 io: { request, response, handle: false },
                 // TODO uncomment when we can throw different abort reasons for task cancelation and timeout abortion
@@ -123,9 +136,7 @@ function makeStartSession({ settings, req, tunnels }) {
                     if (proxyResponse.headers.has('content-length')) {
                         proxyResponse.headers.set('content-length', Buffer.byteLength(JSON.stringify(responseBody)).toString());
                     }
-                    session.serverUrl = settings.serverUrl;
                     session.sessionId = responseBody.value.sessionId;
-                    session.proxy = settings.proxy;
                     session.capabilities = responseBody.value.capabilities;
                 }
                 response

package/dist/req-proxy.js

@@ -30,6 +30,7 @@ function makeReqProxy(config) {
     return (0, req_1.makeReq)({
         baseUrl: config.targetUrl,
         proxy: config.proxy,
+        useDnsCache: config.useDnsCache,
         retry: config.retry,
         hooks: {
             afterOptionsMerged({ options }) {

package/dist/server.js

@@ -39,7 +39,6 @@ async function makeServer({ settings, logger: mainLogger, }) {
     var _a, _b;
     const serverLogger = mainLogger.extend();
     const req = (0, req_proxy_1.makeReqProxy)({
-        targetUrl: settings.serverUrl,
         proxy: settings.proxy,
         retry: {
             validate: async ({ response, error }) => {
@@ -52,6 +51,7 @@ async function makeServer({ settings, logger: mainLogger, }) {
             limit: 10,
             timeout: 5000,
         },
+        useDnsCache: settings.useDnsCache,
     });
     const core = (0, core_base_1.makeCore)({ agentId: `js/ec-client/${require('../package.json').version}` });
     const tunnels = ((_a = settings.tunnel) === null || _a === void 0 ? void 0 : _a.serviceUrl)
@@ -84,9 +84,13 @@ async function makeServer({ settings, logger: mainLogger, }) {
             await commands.endSession({ session, request, response, logger: requestLogger });
             sessions.delete(session.sessionId);
         });
-        router.any(async () => {
+        router.any(/^\/session\/(?<sessionId>[^\/]+).*$/, async ({ match }) => {
             requestLogger.log('Passthrough request');
-            await req(request.url, { io: { request, response }, logger: requestLogger });
+            const session = sessions.get(match.groups.sessionId);
+            await req(request.url, { baseUrl: session.serverUrl, io: { request, response }, logger: requestLogger });
+        });
+        router.fallback(async () => {
+            throw new Error('Unknown request');
         });
         router.catch(async ({ error }) => {
             requestLogger.error(`Error during processing request`, error);

package/dist/tunnels/manager-server.js

@@ -63,26 +63,26 @@ async function makeTunnelManagerServer({ settings, path, idleTimeout = 600000, /
     });
     const sockets = new Set();
     server.on('connection', client => {
-        const store = new Map();
+        const store = [];
         if (idle)
             idle = clearTimeout(idle);
         const socket = (0, socket_1.makeSocket)(client, { transport: 'ipc', logger });
         sockets.add(socket);
         socket.on('close', async () => {
-            logger.log('Connection is closed, remaining tunnels are going to be released');
-            sockets.delete(socket);
-            await Promise.all(Array.from(store.values(), manager.release)).catch(logger.error);
+            logger.log('Connection is closed, remaining tunnels are going to be released', store);
+            await Promise.all(store.map(manager.release)).catch(logger.error);
             if (sockets.size === 0 && !serverClosed)
                 idle = setTimeout(close, idleTimeout);
         });
         socket.command('Tunnel.acquire', async (credentials) => {
             const tunnels = await manager.acquire(credentials);
-            store.set(JSON.stringify(tunnels), tunnels);
+            store.push(tunnels);
             return tunnels;
         });
         socket.command('Tunnel.release', async (tunnels) => {
             await manager.release(tunnels);
-            store.delete(JSON.stringify(tunnels));
+            const storeIndex = store.findIndex(storedTunnels => tunnels.every((tunnel, index) => tunnel.tunnelId === storedTunnels[index].tunnelId));
+            tunnels.splice(storeIndex, 1);
         });
     });
     return { close };

package/dist/utils/router.js

@@ -12,14 +12,15 @@ function makeCallback(handler) {
             post: (pattern, callback) => routes.push({ method: 'POST', pattern, callback }),
             put: (pattern, callback) => routes.push({ method: 'PUT', pattern, callback }),
             delete: (pattern, callback) => routes.push({ method: 'DELETE', pattern, callback }),
-            any: callback => fallbacks.push({ callback }),
+            any: (pattern, callback) => routes.push({ pattern, callback }),
+            fallback: callback => fallbacks.push({ callback }),
             catch: callback => catches.push({ callback }),
             finally: callback => finals.push({ callback }),
         };
         handler({ router, request, response });
         try {
             for (const { method, pattern, callback } of routes) {
-                if (request.method === method && request.url) {
+                if ((!method || request.method === method) && request.url) {
                     const regexp = pattern instanceof RegExp
                         ? pattern
                         : new RegExp(`^${pattern.replace(/:([^\/]+)/g, (_, name) => `(?<${name}>[^/]+)`)}/?$`);

package/package.json

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

package/types/req-proxy.d.ts

@@ -3,10 +3,11 @@ import { type IncomingMessage, type ServerResponse } from 'http';
 import { type Logger } from '@applitools/logger';
 import { type Req, type Proxy, type Retry, type Options } from '@applitools/req';
 export type ReqProxyConfig = {
-    targetUrl: string;
+    targetUrl?: string;
     proxy?: Proxy;
     retry?: Retry | Retry[];
     logger?: Logger;
+    useDnsCache?: boolean;
 };
 export type ReqProxyOptions = Options & {
     io: {

package/types/types.d.ts

@@ -10,6 +10,7 @@ export interface ECClient {
 export interface ECClientSettings {
     serverUrl: string;
     proxy?: Proxy;
+    useDnsCache?: boolean;
     options?: ECCapabilitiesOptions;
     port?: number;
     /** @internal */
@@ -18,6 +19,7 @@ export interface ECClientSettings {
 export interface ECCapabilitiesOptions {
     eyesServerUrl?: string;
     apiKey?: string;
+    region?: 'us-west' | 'australia';
     sessionName?: string;
     appName?: string;
     testName?: string;
@@ -31,8 +33,8 @@ export interface ECCapabilitiesOptions {
 }
 export interface ECSession {
     serverUrl: string;
-    sessionId: string;
     proxy?: Proxy;
+    sessionId: string;
     credentials: {
         eyesServerUrl: string;
         apiKey: string;

package/types/utils/router.d.ts

@@ -1,24 +1,27 @@
 /// <reference types="node" />
 import { type IncomingMessage, type ServerResponse } from 'http';
-type Router = {
-    get: (pattern: string | RegExp, callback: (options: {
+interface Router {
+    get(pattern: string | RegExp, callback: (options: {
         match: RegExpMatchArray;
-    }) => Promise<void> | void) => void;
-    post: (pattern: string | RegExp, callback: (options: {
+    }) => Promise<void> | void): void;
+    post(pattern: string | RegExp, callback: (options: {
         match: RegExpMatchArray;
-    }) => Promise<void> | void) => void;
-    put: (pattern: string | RegExp, callback: (options: {
+    }) => Promise<void> | void): void;
+    put(pattern: string | RegExp, callback: (options: {
         match: RegExpMatchArray;
-    }) => Promise<void> | void) => void;
-    delete: (pattern: string | RegExp, callback: (options: {
+    }) => Promise<void> | void): void;
+    delete(pattern: string | RegExp, callback: (options: {
         match: RegExpMatchArray;
-    }) => Promise<void> | void) => void;
-    any: (callback: () => Promise<void> | void) => void;
-    catch: (callback: (options: {
+    }) => Promise<void> | void): void;
+    any(pattern: string | RegExp, callback: (options: {
+        match: RegExpMatchArray;
+    }) => Promise<void> | void): void;
+    fallback(callback: () => Promise<void> | void): void;
+    catch(callback: (options: {
         error: any;
-    }) => Promise<void> | void) => void;
-    finally: (callback: () => Promise<void> | void) => void;
-};
+    }) => Promise<void> | void): void;
+    finally(callback: () => Promise<void> | void): void;
+}
 export declare function makeCallback(handler: (options: {
     router: Router;
     request: IncomingMessage;