@applitools/ec-client 1.2.27 → 1.2.28

package/dist/commands/find-element.js

@@ -6,18 +6,17 @@ function makeFindElement({ req }) {
         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 responseBody = await proxyResponse.json();
-        if ((_b = (_a = responseBody === null || responseBody === void 0 ? void 0 : responseBody.appliCustomData) === null || _a === void 0 ? void 0 : _a.selfHealing) === null || _b === void 0 ? void 0 : _b.successfulSelector) {
-            logger.log('Self-healed locators detected', responseBody.appliCustomData.selfHealing);
+        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) {
+            logger.log('Self-healed locators detected', parsed.appliCustomData.selfHealing);
             (_c = session.metadata) !== null && _c !== void 0 ? _c : (session.metadata = []);
-            session.metadata.push(responseBody.appliCustomData.selfHealing);
+            session.metadata.push(parsed.appliCustomData.selfHealing);
         }
         else {
             logger.log('No self-healing metadata found');
         }
-        response
-            .writeHead(proxyResponse.status, Object.fromEntries(proxyResponse.headers.entries()))
-            .end(JSON.stringify(responseBody));
+        response.writeHead(proxyResponse.status, Object.fromEntries(proxyResponse.headers.entries())).end(responseBody);
     };
 }
 exports.makeFindElement = makeFindElement;

package/dist/commands/start-session.js

@@ -25,6 +25,8 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeStartSession = void 0;
 const queue_1 = require("../utils/queue");
+//@ts-ignore
+const execution_grid_tunnel_1 = require("@applitools/execution-grid-tunnel");
 const utils = __importStar(require("@applitools/utils"));
 const RETRY_BACKOFF = [
     ...Array(5).fill(2000),
@@ -58,6 +60,8 @@ function makeStartSession({ settings, req, tunnels }) {
             options,
         };
         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;

package/dist/tunnels/manager.js

@@ -22,17 +22,26 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeTunnelManager = void 0;
 const req_1 = require("@applitools/req");
 //@ts-ignore
-const execution_grid_tunnel_1 = __importDefault(require("@applitools/execution-grid-tunnel"));
+const execution_grid_tunnel_1 = require("@applitools/execution-grid-tunnel");
 const utils = __importStar(require("@applitools/utils"));
 async function makeTunnelManager({ settings, logger, }) {
     let server;
+    const getTunnelServiceUrl = utils.general.cachify(async () => {
+        const { port, cleanupFunction } = await (0, execution_grid_tunnel_1.startEgTunnelService)({ logger });
+        server = {
+            port,
+            async close() {
+                await cleanupFunction();
+                server = undefined;
+                getTunnelServiceUrl.clearCache();
+            },
+        };
+        return `http://localhost:${port}`;
+    });
     const req = (0, req_1.makeReq)({
         retry: {
             validate: async ({ response }) => {
@@ -52,7 +61,7 @@ async function makeTunnelManager({ settings, logger, }) {
         },
     });
     const pools = new Map();
-    return { create, destroy, acquire, release, close };
+    return { create, destroy, acquire, release, close: async () => server === null || server === void 0 ? void 0 : server.close() };
     async function acquire(credentials) {
         const key = JSON.stringify(credentials);
         let pool = pools.get(key);
@@ -77,7 +86,7 @@ async function makeTunnelManager({ settings, logger, }) {
         var _a, _b;
         if (!(settings === null || settings === void 0 ? void 0 : settings.serverUrl)) {
             settings !== null && settings !== void 0 ? settings : (settings = {});
-            settings.serverUrl = await open();
+            settings.serverUrl = await getTunnelServiceUrl();
         }
         const response = await req('/tunnels', {
             method: 'POST',
@@ -97,7 +106,7 @@ async function makeTunnelManager({ settings, logger, }) {
         var _a, _b;
         if (!(settings === null || settings === void 0 ? void 0 : settings.serverUrl)) {
             settings !== null && settings !== void 0 ? settings : (settings = {});
-            settings.serverUrl = await open();
+            settings.serverUrl = await getTunnelServiceUrl();
         }
         const response = await req(`/tunnels/${tunnel.tunnelId}`, {
             method: 'DELETE',
@@ -113,14 +122,6 @@ async function makeTunnelManager({ settings, logger, }) {
         logger.error(`Failed to delete tunnel with status ${response.status} and code ${(_a = body === null || body === void 0 ? void 0 : body.message) !== null && _a !== void 0 ? _a : 'UNKNOWN_ERROR'}`);
         throw new Error(`Failed to delete tunnel with code ${(_b = body === null || body === void 0 ? void 0 : body.message) !== null && _b !== void 0 ? _b : 'UNKNOWN_ERROR'}`);
     }
-    async function open() {
-        const { port, cleanupFunction } = await (0, execution_grid_tunnel_1.default)({ logger });
-        server = { port, close: cleanupFunction };
-        return `http://localhost:${port}`;
-    }
-    async function close() {
-        await (server === null || server === void 0 ? void 0 : server.close());
-    }
 }
 exports.makeTunnelManager = makeTunnelManager;
 function makePool(options) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applitools/ec-client",
-  "version": "1.2.27",
+  "version": "1.2.28",
   "homepage": "https://applitools.com",
   "bugs": {
     "url": "https://github.com/applitools/eyes.sdk.javascript1/issues"
@@ -64,12 +64,12 @@
   },
   "dependencies": {
     "@applitools/core-base": "1.1.53",
-    "@applitools/driver": "1.11.47",
-    "@applitools/execution-grid-tunnel": "1.0.24",
+    "@applitools/driver": "1.11.48",
+    "@applitools/execution-grid-tunnel": "2.0.1",
     "@applitools/logger": "1.1.52",
     "@applitools/req": "1.2.5",
     "@applitools/socket": "1.0.13",
-    "@applitools/spec-driver-webdriver": "1.0.28",
+    "@applitools/spec-driver-webdriver": "1.0.29",
     "@applitools/utils": "1.3.35",
     "abort-controller": "3.0.0",
     "webdriver": "7",