@applitools/ec-client 1.2.19 → 1.2.21

package/dist/{cli.js → cli/cli.js}

@@ -4,9 +4,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+const client_1 = require("../client");
+const manager_server_1 = require("../tunnels/manager-server");
 const yargs_1 = __importDefault(require("yargs"));
-const client_1 = require("./client");
-const manager_server_1 = require("./tunnels/manager-server");
 yargs_1.default
     .command({
     command: '*',

package/dist/client.js

@@ -24,31 +24,36 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeECClient = void 0;
-const proxy_server_1 = require("./proxy-server");
+const server_1 = require("./server");
 const utils = __importStar(require("@applitools/utils"));
 async function makeECClient({ settings, logger, } = {}) {
-    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;
-    var _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14;
+    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;
     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 = (_1 = settings.tunnel).serverUrl) !== null && _e !== void 0 ? _e : (_1.serverUrl = utils.general.getEnvValue('EG_TUNNEL_URL'));
-    (_f = (_2 = settings.tunnel).groupSize) !== null && _f !== void 0 ? _f : (_2.groupSize = (_g = utils.general.getEnvValue('TUNNEL_GROUP_SIZE', 'number')) !== null && _g !== void 0 ? _g : 2);
-    (_h = (_3 = settings.tunnel).pool) !== null && _h !== void 0 ? _h : (_3.pool = {});
-    (_j = (_4 = settings.tunnel.pool).maxInuse) !== null && _j !== void 0 ? _j : (_4.maxInuse = (_k = utils.general.getEnvValue('TUNNEL_POOL_MAX_INUSE', 'number')) !== null && _k !== void 0 ? _k : 4);
-    (_l = (_5 = settings.tunnel.pool).timeout) !== null && _l !== void 0 ? _l : (_5.timeout = {});
-    (_m = (_6 = settings.tunnel.pool.timeout).idle) !== null && _m !== void 0 ? _m : (_6.idle = (_o = utils.general.getEnvValue('TUNNEL_POOL_TIMEOUT_IDLE', 'number')) !== null && _o !== void 0 ? _o : 10 * 60000);
-    (_p = (_7 = settings.tunnel.pool.timeout).expiration) !== null && _p !== void 0 ? _p : (_7.expiration = (_q = utils.general.getEnvValue('TUNNEL_POOL_TIMEOUT_EXPIRATION', 'number')) !== null && _q !== void 0 ? _q : 30000);
-    (_r = settings.capabilities) !== null && _r !== void 0 ? _r : (settings.capabilities = {});
-    (_s = (_8 = settings.capabilities).eyesServerUrl) !== null && _s !== void 0 ? _s : (_8.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 = (_9 = settings.capabilities).apiKey) !== null && _v !== void 0 ? _v : (_9.apiKey = utils.general.getEnvValue('API_KEY'));
-    (_w = (_10 = settings.capabilities).tunnel) !== null && _w !== void 0 ? _w : (_10.tunnel = utils.general.getEnvValue('TUNNEL', 'boolean'));
-    (_x = (_11 = settings.capabilities).useSelfHealing) !== null && _x !== void 0 ? _x : (_11.useSelfHealing = utils.general.getEnvValue('USE_SELF_HEALING', 'boolean'));
-    (_y = (_12 = settings.capabilities).sessionName) !== null && _y !== void 0 ? _y : (_12.sessionName = utils.general.getEnvValue('SESSION_NAME'));
-    (_z = (_13 = settings.capabilities).timeout) !== null && _z !== void 0 ? _z : (_13.timeout = utils.general.getEnvValue('EG_TIMEOUT', 'number'));
-    (_0 = (_14 = settings.capabilities).inactivityTimeout) !== null && _0 !== void 0 ? _0 : (_14.inactivityTimeout = utils.general.getEnvValue('EG_INACTIVITY_TIMEOUT', 'number'));
-    const server = await (0, proxy_server_1.makeServer)({ settings: settings, logger });
+    (_e = (_7 = settings.tunnel).serverUrl) !== null && _e !== void 0 ? _e : (_7.serverUrl = 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 : 10 * 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'));
+    const server = await (0, server_1.makeServer)({ settings: settings, logger });
     return server;
 }
 exports.makeECClient = makeECClient;

package/dist/commands/end-session.js

@@ -0,0 +1,22 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.makeEndSession = void 0;
+function makeEndSession({ req, tunnels }) {
+    return async function endSession({ session, request, response, logger, }) {
+        var _a, _b;
+        var _c;
+        logger.log(`Request was intercepted with sessionId:`, session.sessionId);
+        await req(request.url, { 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 = []);
+            session.tests.ended.push(session.tests.current);
+            session.tests.current = undefined;
+        }
+        if (session.tunnels && tunnels) {
+            await tunnels.release(session.tunnels);
+            logger.log(`Tunnels with id ${session.tunnels.map(tunnel => tunnel.tunnelId)} was released for session with id ${session.sessionId}`);
+        }
+    };
+}
+exports.makeEndSession = makeEndSession;

package/dist/commands/execute-script.js

@@ -0,0 +1,112 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.makeExecuteScript = void 0;
+const driver_1 = require("@applitools/driver");
+const spec = __importStar(require("@applitools/spec-driver-webdriver"));
+const utils = __importStar(require("@applitools/utils"));
+function makeExecuteScript({ req, core }) {
+    return async function executeScript({ session, request, response, logger, }) {
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r;
+        var _s, _t;
+        const requestBody = await utils.streams.toJSON(request);
+        if ((_a = requestBody.script) === null || _a === void 0 ? void 0 : _a.startsWith('applitools:')) {
+            logger.log(`Custom script execution was intercepted with body:`, requestBody);
+            const [options] = (_b = requestBody.args) !== null && _b !== void 0 ? _b : [];
+            if (requestBody.script === 'applitools:startTest') {
+                if ((_c = session.tests) === null || _c === void 0 ? void 0 : _c.current) {
+                    await session.tests.current.abort({ settings: { testMetadata: session.metadata }, logger });
+                    (_d = (_s = session.tests).ended) !== null && _d !== void 0 ? _d : (_s.ended = []);
+                    session.tests.ended.push(session.tests.current);
+                    session.tests.current = undefined;
+                }
+                const driver = await (0, driver_1.makeDriver)({
+                    driver: spec.transformDriver({
+                        sessionId: session.sessionId,
+                        serverUrl: session.serverUrl,
+                        capabilities: session.capabilities,
+                        proxy: session.proxy,
+                    }),
+                    spec,
+                    logger,
+                });
+                const environment = await driver.getEnvironment();
+                (_e = session.tests) !== null && _e !== void 0 ? _e : (session.tests = {});
+                session.tests.current = await core.openFunctionalSession({
+                    settings: {
+                        serverUrl: session.credentials.eyesServerUrl,
+                        apiKey: session.credentials.apiKey,
+                        proxy: session.proxy,
+                        appName: (_g = (_f = options === null || options === void 0 ? void 0 : options.appName) !== null && _f !== void 0 ? _f : session.options.appName) !== null && _g !== void 0 ? _g : (await driver.getTitle()),
+                        testName: (_h = options === null || options === void 0 ? void 0 : options.testName) !== null && _h !== void 0 ? _h : session.options.testName,
+                        properties: [{ value: 'Execution Cloud', name: 'Yes' }],
+                        batch: { ...session.options.batch, ...options === null || options === void 0 ? void 0 : options.batch },
+                        environment: {
+                            hostingApp: `${(_j = environment.browserName) !== null && _j !== void 0 ? _j : ''} ${(_k = environment.browserVersion) !== null && _k !== void 0 ? _k : ''}`.trim(),
+                            os: `${(_l = environment.platformName) !== null && _l !== void 0 ? _l : ''} ${(_m = environment.platformVersion) !== null && _m !== void 0 ? _m : ''}`.trim(),
+                            deviceName: environment.deviceName,
+                            viewportSize: await driver.getViewportSize(),
+                            ecSessionId: session.sessionId,
+                        },
+                    },
+                    logger,
+                });
+                response.writeHead(200).end(JSON.stringify({ value: null }));
+                return;
+            }
+            else if (requestBody.script === 'applitools:endTest') {
+                if ((_o = session.tests) === null || _o === void 0 ? void 0 : _o.current) {
+                    await session.tests.current.close({
+                        settings: { status: options === null || options === void 0 ? void 0 : options.status, testMetadata: session.metadata },
+                        logger,
+                    });
+                    (_p = (_t = session.tests).ended) !== null && _p !== void 0 ? _p : (_t.ended = []);
+                    session.tests.ended.push(session.tests.current);
+                    session.tests.current = undefined;
+                }
+                response.writeHead(200).end(JSON.stringify({ value: null }));
+                return;
+            }
+            else if (requestBody.script === 'applitools:getResults') {
+                if ((_q = session.tests) === null || _q === void 0 ? void 0 : _q.ended) {
+                    const results = await Promise.all(session.tests.ended.map(test => test.getResults({ logger })));
+                    response.writeHead(200).end(JSON.stringify({ value: results.flat() }));
+                }
+                else {
+                    response.writeHead(200).end(JSON.stringify({ value: [] }));
+                }
+                return;
+            }
+            else if (requestBody.script === 'applitools:metadata') {
+                logger.log('Session metadata requested, returning', session.metadata);
+                response.writeHead(200).end(JSON.stringify({ value: (_r = session.metadata) !== null && _r !== void 0 ? _r : [] }));
+                session.metadata = [];
+                return;
+            }
+        }
+        await req(request.url, { body: requestBody, io: { request, response }, logger });
+    };
+}
+exports.makeExecuteScript = makeExecuteScript;

package/dist/commands/find-element.js

@@ -0,0 +1,23 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.makeFindElement = void 0;
+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 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);
+            (_c = session.metadata) !== null && _c !== void 0 ? _c : (session.metadata = []);
+            session.metadata.push(responseBody.appliCustomData.selfHealing);
+        }
+        else {
+            logger.log('No self-healing metadata found');
+        }
+        response
+            .writeHead(proxyResponse.status, Object.fromEntries(proxyResponse.headers.entries()))
+            .end(JSON.stringify(responseBody));
+    };
+}
+exports.makeFindElement = makeFindElement;

package/dist/commands/start-session.js

@@ -0,0 +1,118 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.makeStartSession = void 0;
+const queue_1 = require("../utils/queue");
+const utils = __importStar(require("@applitools/utils"));
+const RETRY_BACKOFF = [
+    ...Array(5).fill(2000),
+    ...Array(4).fill(5000),
+    10000, // all next tries with delay 10s
+];
+function makeStartSession({ settings, req, tunnels }) {
+    const queues = new Map();
+    return async function createSession({ request, response, logger, }) {
+        var _a, _b, _c;
+        const requestBody = await utils.streams.toJSON(request);
+        logger.log(`Request was intercepted with body:`, requestBody);
+        const capabilities = (_b = (_a = requestBody.capabilities) === null || _a === void 0 ? void 0 : _a.alwaysMatch) !== null && _b !== void 0 ? _b : requestBody.desiredCapabilities;
+        const options = {
+            ...settings.options,
+            ...capabilities === null || capabilities === void 0 ? void 0 : capabilities['applitools:options'],
+            ...(capabilities &&
+                Object.fromEntries(Object.entries(capabilities).map(([key, value]) => [key.replace(/^applitools:/, ''), value]))),
+        };
+        const session = {
+            credentials: { eyesServerUrl: options.eyesServerUrl, apiKey: options.apiKey },
+            options,
+        };
+        if (options.tunnel && tunnels) {
+            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]));
+        if (requestBody.capabilities) {
+            requestBody.capabilities.alwaysMatch = { ...(_c = requestBody.capabilities) === null || _c === void 0 ? void 0 : _c.alwaysMatch, ...applitoolsCapabilities };
+        }
+        if (requestBody.desiredCapabilities) {
+            requestBody.desiredCapabilities = { ...requestBody.desiredCapabilities, ...applitoolsCapabilities };
+        }
+        logger.log('Request body has modified:', requestBody);
+        const queueKey = JSON.stringify(session.credentials);
+        let queue = queues.get(queueKey);
+        if (!queue) {
+            queue = (0, queue_1.makeQueue)({ logger: logger.extend({ tags: { queue: queueKey } }) });
+            queues.set(queueKey, queue);
+        }
+        request.socket.on('close', () => queue.cancel(task));
+        return queue.run(task);
+        async function task(signal, attempt = 1) {
+            var _a, _b, _c;
+            var _d;
+            // do not start the task if it is already aborted
+            if (signal.aborted)
+                return queue.pause;
+            const proxyResponse = await req(request.url, {
+                body: requestBody,
+                io: { request, response, handle: false },
+                // TODO uncomment when we can throw different abort reasons for task cancelation and timeout abortion
+                // signal,
+                logger,
+            });
+            const responseBody = await proxyResponse.json();
+            logger.log(`Response was intercepted with body:`, responseBody);
+            if (['CONCURRENCY_LIMIT_REACHED', 'NO_AVAILABLE_DRIVER_POD'].includes((_b = (_a = responseBody.value) === null || _a === void 0 ? void 0 : _a.data) === null || _b === void 0 ? void 0 : _b.appliErrorCode)) {
+                queue.cork();
+                // after query is corked the task might be aborted
+                if (signal.aborted)
+                    return queue.pause;
+                await utils.general.sleep(RETRY_BACKOFF[Math.min(attempt, RETRY_BACKOFF.length - 1)]);
+                logger.log(`Attempt (${attempt}) to create session was failed with applitools status code:`, responseBody.value.data.appliErrorCode);
+                return task(signal, attempt + 1);
+            }
+            else {
+                queue.uncork();
+                if (responseBody.value) {
+                    (_c = (_d = responseBody.value).capabilities) !== null && _c !== void 0 ? _c : (_d.capabilities = {});
+                    responseBody.value.capabilities['applitools:isECClient'] = true;
+                    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
+                    .writeHead(proxyResponse.status, Object.fromEntries(proxyResponse.headers.entries()))
+                    .end(JSON.stringify(responseBody));
+                return session;
+            }
+        }
+    };
+}
+exports.makeStartSession = makeStartSession;

package/dist/server.js

@@ -0,0 +1,123 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.makeServer = void 0;
+const http_1 = require("http");
+const logger_1 = require("@applitools/logger");
+const core_base_1 = require("@applitools/core-base");
+const router_1 = require("./utils/router");
+const manager_1 = require("./tunnels/manager");
+const manager_client_1 = require("./tunnels/manager-client");
+const req_proxy_1 = require("./req-proxy");
+const start_session_1 = require("./commands/start-session");
+const execute_script_1 = require("./commands/execute-script");
+const end_session_1 = require("./commands/end-session");
+const find_element_1 = require("./commands/find-element");
+const utils = __importStar(require("@applitools/utils"));
+async function makeServer({ settings, logger }) {
+    var _a, _b;
+    const serverLogger = logger ? logger.extend({ label: 'ec-client' }) : (0, logger_1.makeLogger)({ label: 'ec-client', colors: true });
+    const req = (0, req_proxy_1.makeReqProxy)({
+        targetUrl: settings.serverUrl,
+        proxy: settings.proxy,
+        retry: {
+            validate: async ({ response, error }) => {
+                if (error)
+                    return !utils.types.instanceOf(error, 'AbortError');
+                if (response)
+                    return response.status >= 500 && !utils.types.has(await response.clone().json(), 'value');
+                return false;
+            },
+            limit: 10,
+            timeout: 5000,
+        },
+    });
+    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.serverUrl)
+        ? await (0, manager_1.makeTunnelManager)({ settings: settings.tunnel, logger: serverLogger })
+        : await (0, manager_client_1.makeTunnelManagerClient)({ settings: settings.tunnel });
+    const sessions = new Map();
+    const commands = {
+        startSession: (0, start_session_1.makeStartSession)({ settings, req, tunnels }),
+        endSession: (0, end_session_1.makeEndSession)({ req, tunnels }),
+        executeScript: (0, execute_script_1.makeExecuteScript)({ req, core }),
+        findElement: (0, find_element_1.makeFindElement)({ req }),
+    };
+    const server = (0, http_1.createServer)((0, router_1.makeCallback)(({ router, request, response }) => {
+        const requestLogger = serverLogger.extend({
+            tags: { request: `[${request.method}] ${request.url}`, requestId: utils.general.guid() },
+        });
+        router.post('/session', async () => {
+            const session = await commands.startSession({ request, response, logger: requestLogger });
+            sessions.set(session.sessionId, session);
+        });
+        router.post('/session/:sessionId/execute/sync', async ({ match }) => {
+            const session = sessions.get(match.groups.sessionId);
+            await commands.executeScript({ session, request, response, logger: requestLogger });
+        });
+        router.post('/session/:sessionId/element', async ({ match }) => {
+            const session = sessions.get(match.groups.sessionId);
+            await commands.findElement({ session, request, response, logger: requestLogger });
+        });
+        router.delete('/session/:sessionId', async ({ match }) => {
+            const session = sessions.get(match.groups.sessionId);
+            await commands.endSession({ session, request, response, logger: requestLogger });
+            sessions.delete(session.sessionId);
+        });
+        router.any(async () => {
+            requestLogger.log('Passthrough request');
+            await req(request.url, { io: { request, response }, logger: requestLogger });
+        });
+        router.catch(async ({ error }) => {
+            requestLogger.error(`Error during processing request`, error);
+            if (response.writableEnded)
+                return;
+            response
+                .writeHead(500)
+                .end(JSON.stringify({ value: { error: 'internal proxy server error', message: error.message, stacktrace: '' } }));
+        });
+        router.finally(async () => {
+            requestLogger.log(`Request was responded with status ${response.statusCode}`);
+        });
+    }));
+    server.listen({ port: (_b = settings.port) !== null && _b !== void 0 ? _b : 0, hostname: 'localhost' });
+    return new Promise((resolve, reject) => {
+        server.on('listening', () => {
+            const address = server.address();
+            serverLogger.log(`Proxy server has started on port ${address.port}`);
+            resolve({
+                url: `http://localhost:${address.port}`,
+                port: address.port,
+                unref: () => server.unref(),
+                close: () => server.close(),
+            });
+        });
+        server.on('error', async (err) => {
+            serverLogger.fatal('Error starting proxy server', err);
+            reject(err);
+        });
+    });
+}
+exports.makeServer = makeServer;

package/dist/tunnels/manager-server.js

@@ -88,7 +88,7 @@ async function makeTunnelManagerServer({ settings, path, idleTimeout = 600000, /
 exports.makeTunnelManagerServer = makeTunnelManagerServer;
 async function makeTunnelManagerServerProcess(options) {
     return new Promise((resolve, reject) => {
-        const server = (0, child_process_1.fork)(path.resolve(__dirname, '../../dist/cli.js'), [`tunnel-manager`, `--config=${JSON.stringify(options)}`], {
+        const server = (0, child_process_1.fork)(path.resolve(__dirname, '../../dist/cli/cli.js'), [`tunnel-manager`, `--config=${JSON.stringify(options)}`], {
             stdio: ['ignore', 'ignore', 'ignore', 'ipc'],
             detached: true,
         });

package/dist/{queue.js → utils/queue.js}

@@ -34,6 +34,7 @@ function makeQueue({ logger }) {
         get corked() {
             return corked;
         },
+        pause: Symbol('pause queue'),
         run,
         cancel,
         cork,

package/dist/utils/router.js

@@ -0,0 +1,49 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.makeCallback = void 0;
+function makeCallback(handler) {
+    return async function callback(request, response) {
+        const routes = [];
+        const fallbacks = [];
+        const catches = [];
+        const finals = [];
+        const router = {
+            get: (pattern, callback) => routes.push({ method: 'GET', pattern, callback }),
+            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 }),
+            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) {
+                    const regexp = pattern instanceof RegExp
+                        ? pattern
+                        : new RegExp(`^${pattern.replace(/:([^\/]+)/g, (_, name) => `(?<${name}>[^/]+)`)}/?$`);
+                    const match = request.url.match(regexp);
+                    if (match) {
+                        await callback({ match });
+                        return;
+                    }
+                }
+            }
+            for (const { callback } of fallbacks) {
+                await callback();
+            }
+        }
+        catch (error) {
+            for (const { callback } of catches) {
+                await callback({ error });
+            }
+        }
+        finally {
+            for (const { callback } of finals) {
+                await callback();
+            }
+        }
+    };
+}
+exports.makeCallback = makeCallback;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applitools/ec-client",
-  "version": "1.2.19",
+  "version": "1.2.21",
   "homepage": "https://applitools.com",
   "bugs": {
     "url": "https://github.com/applitools/eyes.sdk.javascript1/issues"
@@ -63,17 +63,22 @@
     "postversion": "bongo postversion"
   },
   "dependencies": {
-    "@applitools/execution-grid-tunnel": "1.0.22",
+    "@applitools/core-base": "1.1.49",
+    "@applitools/driver": "1.11.42",
+    "@applitools/execution-grid-tunnel": "1.0.24",
     "@applitools/logger": "1.1.48",
-    "@applitools/req": "1.1.33",
+    "@applitools/req": "1.1.35",
     "@applitools/socket": "1.0.10",
+    "@applitools/spec-driver-webdriver": "1.0.23",
     "@applitools/utils": "1.3.32",
     "abort-controller": "3.0.0",
+    "webdriver": "7",
     "yargs": "17.6.2"
   },
   "devDependencies": {
     "@applitools/bongo": "^3.0.3",
     "@applitools/test-server": "^1.1.28",
+    "@applitools/test-utils": "^1.5.16",
     "@types/node": "^12.20.55",
     "@types/node-fetch": "^2.6.1",
     "@types/selenium-webdriver": "^4.0.19",

package/types/commands/end-session.d.ts

@@ -0,0 +1,16 @@
+import type { ECSession } from '../types';
+import { type IncomingMessage, type ServerResponse } from 'http';
+import { type Logger } from '@applitools/logger';
+import { type ReqProxy } from '../req-proxy';
+import { type TunnelManager } from '../tunnels/manager';
+type Options = {
+    req: ReqProxy;
+    tunnels?: TunnelManager;
+};
+export declare function makeEndSession({ req, tunnels }: Options): ({ session, request, response, logger, }: {
+    session: ECSession;
+    request: IncomingMessage;
+    response: ServerResponse;
+    logger: Logger;
+}) => Promise<void>;
+export {};

package/types/commands/execute-script.d.ts

@@ -0,0 +1,16 @@
+import type { ECSession } from '../types';
+import { type IncomingMessage, type ServerResponse } from 'http';
+import { type Core } from '@applitools/core-base';
+import { type Logger } from '@applitools/logger';
+import { type ReqProxy } from '../req-proxy';
+type Options = {
+    core: Core;
+    req: ReqProxy;
+};
+export declare function makeExecuteScript({ req, core }: Options): ({ session, request, response, logger, }: {
+    session: ECSession;
+    request: IncomingMessage;
+    response: ServerResponse;
+    logger: Logger;
+}) => Promise<void>;
+export {};

package/types/commands/find-element.d.ts

@@ -0,0 +1,14 @@
+import type { ECSession } from '../types';
+import { type IncomingMessage, type ServerResponse } from 'http';
+import { type Logger } from '@applitools/logger';
+import { type ReqProxy } from '../req-proxy';
+type Options = {
+    req: ReqProxy;
+};
+export declare function makeFindElement({ req }: Options): ({ session, request, response, logger, }: {
+    session: ECSession;
+    request: IncomingMessage;
+    response: ServerResponse;
+    logger: Logger;
+}) => Promise<void>;
+export {};

package/types/commands/start-session.d.ts

@@ -0,0 +1,16 @@
+import type { ECSession, ECClientSettings } from '../types';
+import { type IncomingMessage, type ServerResponse } from 'http';
+import { type Logger } from '@applitools/logger';
+import { type ReqProxy } from '../req-proxy';
+import { type TunnelManager } from '../tunnels/manager';
+type Options = {
+    settings: ECClientSettings;
+    req: ReqProxy;
+    tunnels?: TunnelManager;
+};
+export declare function makeStartSession({ settings, req, tunnels }: Options): ({ request, response, logger, }: {
+    request: IncomingMessage;
+    response: ServerResponse;
+    logger: Logger;
+}) => Promise<ECSession>;
+export {};

package/types/req-proxy.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="node" />
 import { type IncomingMessage, type ServerResponse } from 'http';
 import { type Logger } from '@applitools/logger';
-import { type Proxy, type Retry, type Options } from '@applitools/req';
+import { type Req, type Proxy, type Retry, type Options } from '@applitools/req';
 export type ReqProxyConfig = {
     targetUrl: string;
     proxy?: Proxy;
@@ -16,4 +16,5 @@ export type ReqProxyOptions = Options & {
     };
     logger?: Logger;
 };
-export declare function makeReqProxy(config: ReqProxyConfig): import("@applitools/req").Req<ReqProxyOptions>;
+export type ReqProxy = Req<ReqProxyOptions>;
+export declare function makeReqProxy(config: ReqProxyConfig): Req<ReqProxyOptions>;

package/types/types.d.ts

@@ -1,4 +1,6 @@
 import { type Proxy } from '@applitools/req';
+import { type Batch, type FunctionalSession } from '@applitools/core-base';
+import { type Tunnel } from './tunnels/manager';
 export interface ECClient {
     readonly url: string;
     readonly port: number;
@@ -8,7 +10,7 @@ export interface ECClient {
 export interface ECClientSettings {
     serverUrl: string;
     proxy?: Proxy;
-    capabilities?: ECCapabilities;
+    options?: ECCapabilitiesOptions;
     port?: number;
     /** @internal */
     tunnel?: {
@@ -23,10 +25,13 @@ export interface ECClientSettings {
         };
     };
 }
-export interface ECCapabilities {
+export interface ECCapabilitiesOptions {
     eyesServerUrl?: string;
     apiKey?: string;
     sessionName?: string;
+    appName?: string;
+    testName?: string;
+    batch?: Batch;
     useSelfHealing?: boolean;
     tunnel?: boolean;
     timeout?: number;
@@ -34,3 +39,20 @@ export interface ECCapabilities {
     requestDriverTimeout?: number;
     selfHealingMaxRetryTime?: number;
 }
+export interface ECSession {
+    serverUrl: string;
+    sessionId: string;
+    proxy?: Proxy;
+    credentials: {
+        eyesServerUrl: string;
+        apiKey: string;
+    };
+    capabilities: Record<string, any>;
+    options: ECCapabilitiesOptions;
+    tunnels?: Tunnel[];
+    metadata?: any[];
+    tests?: {
+        current?: FunctionalSession;
+        ended?: FunctionalSession[];
+    };
+}

package/types/{queue.d.ts → utils/queue.d.ts}

@@ -2,6 +2,7 @@ import { type Logger } from '@applitools/logger';
 import { type AbortSignal } from 'abort-controller';
 export type Queue = {
     readonly corked: boolean;
+    readonly pause: never;
     run<TResult>(task: Task<TResult>): Promise<TResult>;
     cancel(task: (signal: AbortSignal) => Promise<any>): void;
     cork(): void;

package/types/utils/router.d.ts

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

package/dist/proxy-server.js

@@ -1,232 +0,0 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.makeServer = void 0;
-const http_1 = require("http");
-const logger_1 = require("@applitools/logger");
-const queue_1 = require("./queue");
-const manager_1 = require("./tunnels/manager");
-const manager_client_1 = require("./tunnels/manager-client");
-const req_proxy_1 = require("./req-proxy");
-const utils = __importStar(require("@applitools/utils"));
-const RETRY_BACKOFF = [
-    ...Array(5).fill(2000),
-    ...Array(4).fill(5000),
-    10000, // all next tries with delay 10s
-];
-const RETRY_ERROR_CODES = ['CONCURRENCY_LIMIT_REACHED', 'NO_AVAILABLE_DRIVER_POD'];
-async function makeServer({ settings, logger }) {
-    var _a, _b;
-    const serverLogger = logger ? logger.extend({ label: 'ec-client' }) : (0, logger_1.makeLogger)({ label: 'ec-client', colors: true });
-    const req = (0, req_proxy_1.makeReqProxy)({
-        targetUrl: settings.serverUrl,
-        proxy: settings.proxy,
-        retry: {
-            validate: async ({ response, error }) => {
-                if (error)
-                    return !utils.types.instanceOf(error, 'AbortError');
-                if (response)
-                    return response.status >= 500 && !utils.types.has(await response.clone().json(), 'value');
-                return false;
-            },
-            limit: 10,
-            timeout: 5000,
-        },
-    });
-    const tunnelManager = ((_a = settings.tunnel) === null || _a === void 0 ? void 0 : _a.serverUrl)
-        ? await (0, manager_1.makeTunnelManager)({ settings: settings.tunnel, logger: serverLogger })
-        : await (0, manager_client_1.makeTunnelManagerClient)({ settings: settings.tunnel });
-    const sessions = new Map();
-    const queues = new Map();
-    const server = (0, http_1.createServer)(async (request, response) => {
-        var _a, _b, _c, _d;
-        const url = request.url;
-        const requestLogger = serverLogger.extend({
-            tags: { request: `[${request.method}] ${request.url}`, requestId: utils.general.guid() },
-        });
-        try {
-            if (request.method === 'POST' && /^\/session\/?$/.test(url)) {
-                return await createSession({ request, response, logger: requestLogger });
-            }
-            else if (request.method === 'DELETE' && /^\/session\/[^\/]+\/?$/.test(url)) {
-                return await deleteSession({ request, response, logger: requestLogger });
-            }
-            else if (request.method === 'POST' && /^\/session\/[^\/]+\/element\/?$/.test(url)) {
-                requestLogger.log('Inspecting element lookup request to collect self-healing metadata');
-                const proxyResponse = await req(url, { io: { request, response, handle: false }, logger: requestLogger });
-                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) {
-                    requestLogger.log('Self-healed locators detected', responseBody.appliCustomData.selfHealing);
-                    const session = sessions.get(getSessionId(url));
-                    (_c = session.metadata) !== null && _c !== void 0 ? _c : (session.metadata = []);
-                    session.metadata.push(responseBody.appliCustomData.selfHealing);
-                }
-                else {
-                    requestLogger.log('No self-healing metadata found');
-                }
-                response
-                    .writeHead(proxyResponse.status, Object.fromEntries(proxyResponse.headers.entries()))
-                    .end(JSON.stringify(responseBody));
-            }
-            else if (request.method === 'GET' && /^\/session\/[^\/]+\/applitools\/metadata?$/.test(url)) {
-                const session = sessions.get(getSessionId(url));
-                requestLogger.log('Session metadata requested, returning', session.metadata);
-                response.writeHead(200).end(JSON.stringify({ value: (_d = session.metadata) !== null && _d !== void 0 ? _d : [] }));
-                session.metadata = [];
-            }
-            else {
-                requestLogger.log('Passthrough request');
-                return await req(url, { io: { request, response }, logger: requestLogger });
-            }
-        }
-        catch (err) {
-            requestLogger.error(`Error during processing request:`, err);
-            if (!response.writableEnded) {
-                response
-                    .writeHead(500)
-                    .end(JSON.stringify({ value: { error: 'internal proxy server error', message: err.message, stacktrace: '' } }));
-            }
-        }
-        finally {
-            requestLogger.log(`Request was responded with status ${response.statusCode}`);
-        }
-    });
-    server.listen({ port: (_b = settings.port) !== null && _b !== void 0 ? _b : 0, hostname: 'localhost' });
-    return new Promise((resolve, reject) => {
-        server.on('listening', () => {
-            const address = server.address();
-            serverLogger.log(`Proxy server has started on port ${address.port}`);
-            resolve({
-                url: `http://localhost:${address.port}`,
-                port: address.port,
-                unref: () => server.unref(),
-                close: () => server.close(),
-            });
-        });
-        server.on('error', async (err) => {
-            serverLogger.fatal('Error starting proxy server', err);
-            reject(err);
-        });
-    });
-    async function createSession({ request, response, logger, }) {
-        var _a, _b, _c;
-        const requestBody = await utils.streams.toJSON(request);
-        logger.log(`Request was intercepted with body:`, requestBody);
-        const capabilities = (_b = (_a = requestBody.capabilities) === null || _a === void 0 ? void 0 : _a.alwaysMatch) !== null && _b !== void 0 ? _b : requestBody.desiredCapabilities;
-        const options = {
-            ...settings.capabilities,
-            ...capabilities === null || capabilities === void 0 ? void 0 : capabilities['applitools:options'],
-            ...(capabilities &&
-                Object.entries(capabilities).reduce((capabilities, [key, value]) => {
-                    if (key.startsWith('applitools:')) {
-                        capabilities[key.replace(/^applitools:/, '')] = value;
-                    }
-                    return capabilities;
-                }, {})),
-        };
-        const session = {
-            credentials: { eyesServerUrl: options.eyesServerUrl, apiKey: options.apiKey },
-        };
-        if (options.tunnel) {
-            session.tunnels = await tunnelManager.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]));
-        if (requestBody.capabilities) {
-            requestBody.capabilities.alwaysMatch = { ...(_c = requestBody.capabilities) === null || _c === void 0 ? void 0 : _c.alwaysMatch, ...applitoolsCapabilities };
-        }
-        if (requestBody.desiredCapabilities) {
-            requestBody.desiredCapabilities = { ...requestBody.desiredCapabilities, ...applitoolsCapabilities };
-        }
-        logger.log('Request body has modified:', requestBody);
-        const queueKey = JSON.stringify(session.credentials);
-        let queue = queues.get(queueKey);
-        if (!queue) {
-            queue = (0, queue_1.makeQueue)({ logger: logger.extend({ tags: { queue: queueKey } }) });
-            queues.set(queueKey, queue);
-        }
-        request.socket.on('close', () => queue.cancel(task));
-        await queue.run(task);
-        async function task(signal, attempt = 1) {
-            var _a, _b, _c;
-            var _d;
-            // do not start the task if it is already aborted
-            if (signal.aborted)
-                return;
-            const proxyResponse = await req(request.url, {
-                body: requestBody,
-                io: { request, response, handle: false },
-                // TODO uncomment when we can throw different abort reasons for task cancelation and timeout abortion
-                // signal,
-                logger,
-            });
-            const responseBody = await proxyResponse.json();
-            logger.log(`Response was intercepted with body:`, responseBody);
-            if (RETRY_ERROR_CODES.includes((_b = (_a = responseBody.value) === null || _a === void 0 ? void 0 : _a.data) === null || _b === void 0 ? void 0 : _b.appliErrorCode)) {
-                queue.cork();
-                // after query is corked the task might be aborted
-                if (signal.aborted)
-                    return;
-                await utils.general.sleep(RETRY_BACKOFF[Math.min(attempt, RETRY_BACKOFF.length - 1)]);
-                logger.log(`Attempt (${attempt}) to create session was failed with applitools status code:`, responseBody.value.data.appliErrorCode);
-                return task(signal, attempt + 1);
-            }
-            else {
-                queue.uncork();
-                if (responseBody.value) {
-                    sessions.set(responseBody.value.sessionId, session);
-                    (_c = (_d = responseBody.value).capabilities) !== null && _c !== void 0 ? _c : (_d.capabilities = {});
-                    responseBody.value.capabilities['applitools:isECClient'] = true;
-                    if (proxyResponse.headers.has('content-length')) {
-                        proxyResponse.headers.set('content-length', Buffer.byteLength(JSON.stringify(responseBody)).toString());
-                    }
-                }
-                response
-                    .writeHead(proxyResponse.status, Object.fromEntries(proxyResponse.headers.entries()))
-                    .end(JSON.stringify(responseBody));
-                return;
-            }
-        }
-    }
-    async function deleteSession({ request, response, logger, }) {
-        const url = request.url;
-        const sessionId = getSessionId(url);
-        logger.log(`Request was intercepted with sessionId:`, sessionId);
-        await req(url, { io: { request, response }, logger });
-        const session = sessions.get(sessionId);
-        if (session.tunnels) {
-            await tunnelManager.release(session.tunnels);
-            logger.log(`Tunnels with id ${session.tunnels.map(tunnel => tunnel.tunnelId)} was released for session with id ${sessionId}`);
-        }
-        sessions.delete(sessionId);
-    }
-}
-exports.makeServer = makeServer;
-function getSessionId(requestUrl) {
-    var _a;
-    return (_a = requestUrl === null || requestUrl === void 0 ? void 0 : requestUrl.split('/')[2]) !== null && _a !== void 0 ? _a : '';
-}