@applitools/ec-client 1.2.15 → 1.2.16

package/dist/proxy-server.js

@@ -121,6 +121,7 @@ async function makeServer({ settings, logger }) {
             resolve({
                 url: `http://localhost:${address.port}`,
                 port: address.port,
+                unref: () => server.unref(),
                 close: () => server.close(),
             });
         });

package/dist/tunnels/manager-client.js

@@ -3,23 +3,38 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeTunnelManagerClient = void 0;
 const manager_server_1 = require("./manager-server");
 const socket_1 = require("@applitools/socket");
+const fs_1 = require("fs");
 const net_1 = require("net");
 async function makeTunnelManagerClient({ settings, } = {}) {
     const path = process.env.APPLITOOLS_TUNNEL_MANAGER_SOCK ||
         (process.platform === 'win32' ? '\\\\.\\pipe\\applitools-tunnel-manager' : '/tmp/applitools-tunnel-manager.sock');
     const socket = (0, socket_1.makeSocket)((0, net_1.createConnection)({ path }), { transport: 'ipc' });
+    let server;
     socket.once('error', async (error) => {
-        if (['ECONNREFUSED', 'ENOENT'].includes(error.code)) {
-            await (0, manager_server_1.makeTunnelManagerServerProcess)({ settings, path, unlink: error.code === 'ECONNREFUSED' });
+        try {
+            if (['ECONNREFUSED', 'ENOENT'].includes(error.code)) {
+                if (error.code === 'ECONNREFUSED') {
+                    try {
+                        await fs_1.promises.unlink(path);
+                    }
+                    catch { }
+                }
+                server = await (0, manager_server_1.makeTunnelManagerServerProcess)({ settings, path });
+            }
+        }
+        finally {
             socket.use((0, net_1.createConnection)({ path }));
         }
     });
     socket.once('ready', () => socket.target.unref());
     return {
-        create: (options) => socket.request('Tunnel.create', options),
+        create: (options) => {
+            return socket.request('Tunnel.create', options);
+        },
         destroy: (options) => socket.request('Tunnel.destroy', options),
         acquire: (options) => socket.request('Tunnel.acquire', options),
         release: (options) => socket.request('Tunnel.release', options),
+        close: () => server === null || server === void 0 ? void 0 : server.close(),
     };
 }
 exports.makeTunnelManagerClient = makeTunnelManagerClient;

package/dist/tunnels/manager-server.js

@@ -30,15 +30,12 @@ const logger_1 = require("@applitools/logger");
 const socket_1 = require("@applitools/socket");
 const manager_1 = require("./manager");
 const child_process_1 = require("child_process");
-const fs_1 = require("fs");
 const path = __importStar(require("path"));
 const os = __importStar(require("os"));
 const LOG_DIRNAME = (_a = process.env.APPLITOOLS_LOG_DIR) !== null && _a !== void 0 ? _a : path.resolve(os.tmpdir(), `applitools-tunnel-logs`);
-async function makeTunnelManagerServer({ settings, path, unlink, idleTimeout = 600000, // 10min
+async function makeTunnelManagerServer({ settings, path, idleTimeout = 600000, // 10min
  }) {
     var _a;
-    if (unlink)
-        await fs_1.promises.unlink(path);
     const server = await new Promise((resolve, reject) => {
         const server = (0, net_1.createServer)().listen({ path });
         server.on('error', error => reject(error));
@@ -56,7 +53,7 @@ async function makeTunnelManagerServer({ settings, path, unlink, idleTimeout = 6
     let idle;
     let serverClosed = false;
     if (idleTimeout)
-        idle = setTimeout(() => server.close(), idleTimeout);
+        idle = setTimeout(close, idleTimeout);
     server.on('close', () => {
         if (idle)
             clearTimeout(idle);
@@ -64,24 +61,29 @@ async function makeTunnelManagerServer({ settings, path, unlink, idleTimeout = 6
     });
     const sockets = new Set();
     server.on('connection', client => {
-        const socket = (0, socket_1.makeSocket)(client, { transport: 'ipc', logger });
-        sockets.add(socket);
-        socket.on('close', () => sockets.delete(socket));
         if (idle) {
             clearTimeout(idle);
             idle = null;
-            socket.on('close', () => {
-                sockets.delete(socket);
-                if (sockets.size > 0 || serverClosed)
-                    return;
-                idle = setTimeout(() => server.close(), idleTimeout);
-            });
         }
+        const socket = (0, socket_1.makeSocket)(client, { transport: 'ipc', logger });
+        sockets.add(socket);
+        socket.on('close', () => {
+            sockets.delete(socket);
+            if (sockets.size > 0 || serverClosed)
+                return;
+            idle = setTimeout(close, idleTimeout);
+        });
         socket.command('Tunnel.create', manager.create);
         socket.command('Tunnel.destroy', manager.destroy);
         socket.command('Tunnel.acquire', manager.acquire);
         socket.command('Tunnel.release', manager.release);
     });
+    return { close };
+    async function close() {
+        server.close();
+        manager.close();
+        process.kill(0);
+    }
 }
 exports.makeTunnelManagerServer = makeTunnelManagerServer;
 async function makeTunnelManagerServerProcess(options) {
@@ -97,7 +99,7 @@ async function makeTunnelManagerServerProcess(options) {
         server.on('error', reject);
         server.once('message', ({ name }) => {
             if (name === 'started') {
-                resolve({ cleanup: () => server.kill() });
+                resolve({ close: async () => void server.kill() });
                 clearTimeout(timeout);
                 server.channel.unref();
             }

package/dist/tunnels/manager.js

@@ -52,7 +52,7 @@ async function makeTunnelManager({ settings, logger, }) {
         },
     });
     const pools = new Map();
-    return { create, destroy, acquire, release, cleanup };
+    return { create, destroy, acquire, release, close };
     async function acquire(credentials) {
         const key = JSON.stringify(credentials);
         let pool = pools.get(key);
@@ -118,7 +118,7 @@ async function makeTunnelManager({ settings, logger, }) {
         server = { port, close: cleanupFunction };
         return `http://localhost:${port}`;
     }
-    async function cleanup() {
+    async function close() {
         await (server === null || server === void 0 ? void 0 : server.close());
     }
 }
@@ -154,7 +154,7 @@ function makePool(options) {
             item.timers.expiration = setTimeout(() => destroy(resource), options.timeout.expiration);
             item.expireAt = Date.now() + options.timeout.expiration;
         }
-        pool.set(resource, item);
+        pool.set(JSON.stringify(resource), item);
     }
     async function get() {
         var _a;
@@ -167,7 +167,7 @@ function makePool(options) {
     }
     async function use(resource) {
         var _a, _b;
-        const item = pool.get(resource);
+        const item = pool.get(JSON.stringify(resource));
         if (!item)
             return false;
         if ((_a = item.timers) === null || _a === void 0 ? void 0 : _a.idle)
@@ -177,7 +177,7 @@ function makePool(options) {
     }
     async function release(resource) {
         var _a, _b;
-        const item = pool.get(resource);
+        const item = pool.get(JSON.stringify(resource));
         if (!item)
             return false;
         item.inuse -= 1;
@@ -196,7 +196,7 @@ function makePool(options) {
     }
     async function destroy(resource) {
         var _a, _b, _c, _d;
-        const item = pool.get(resource);
+        const item = pool.get(JSON.stringify(resource));
         if (!item)
             return false;
         item.destroyed = true;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applitools/ec-client",
-  "version": "1.2.15",
+  "version": "1.2.16",
   "homepage": "https://applitools.com",
   "bugs": {
     "url": "https://github.com/applitools/eyes.sdk.javascript1/issues"
@@ -60,20 +60,20 @@
     "deps": "bongo deps",
     "preversion": "bongo preversion",
     "version": "bongo version",
-    "postversion": "bongo postversion --skip-release-notification"
+    "postversion": "bongo postversion"
   },
   "dependencies": {
-    "@applitools/execution-grid-tunnel": "1.0.19",
-    "@applitools/logger": "1.1.47",
-    "@applitools/req": "1.1.31",
-    "@applitools/socket": "1.0.9",
-    "@applitools/utils": "1.3.31",
+    "@applitools/execution-grid-tunnel": "1.0.20",
+    "@applitools/logger": "1.1.48",
+    "@applitools/req": "1.1.32",
+    "@applitools/socket": "1.0.10",
+    "@applitools/utils": "1.3.32",
     "abort-controller": "3.0.0",
     "yargs": "17.6.2"
   },
   "devDependencies": {
-    "@applitools/bongo": "^2.2.5",
-    "@applitools/test-server": "^1.1.27",
+    "@applitools/bongo": "^3.0.1",
+    "@applitools/test-server": "^1.1.28",
     "@types/node": "^12.20.55",
     "@types/node-fetch": "^2.6.1",
     "@types/selenium-webdriver": "^4.0.19",

package/types/tunnels/manager-client.d.ts

@@ -1,4 +1,6 @@
 import { type TunnelManager, type TunnelManagerSettings } from './manager';
 export declare function makeTunnelManagerClient({ settings, }?: {
     settings?: TunnelManagerSettings;
-}): Promise<TunnelManager>;
+}): Promise<TunnelManager & {
+    close(): Promise<void>;
+}>;

package/types/tunnels/manager-server.d.ts

@@ -1,9 +1,12 @@
 import { type TunnelManagerSettings } from './manager';
+export type TunnelManagerServer = {
+    close(): Promise<void>;
+};
 export type TunnelManagerServerOptions = {
     settings?: TunnelManagerSettings;
     idleTimeout?: number;
     path: string;
     unlink?: boolean;
 };
-export declare function makeTunnelManagerServer({ settings, path, unlink, idleTimeout, }: TunnelManagerServerOptions): Promise<void>;
-export declare function makeTunnelManagerServerProcess(options: TunnelManagerServerOptions): Promise<unknown>;
+export declare function makeTunnelManagerServer({ settings, path, idleTimeout, }: TunnelManagerServerOptions): Promise<TunnelManagerServer>;
+export declare function makeTunnelManagerServerProcess(options: TunnelManagerServerOptions): Promise<TunnelManagerServer>;

package/types/tunnels/manager.d.ts

@@ -28,5 +28,5 @@ export declare function makeTunnelManager({ settings, logger, }: {
     settings?: TunnelManagerSettings;
     logger: Logger;
 }): Promise<TunnelManager & {
-    cleanup(): Promise<void>;
+    close(): Promise<void>;
 }>;

package/types/types.d.ts

@@ -2,6 +2,7 @@ import { type Proxy } from '@applitools/req';
 export interface ECClient {
     readonly url: string;
     readonly port: number;
+    unref(): void;
     close(): void;
 }
 export interface ECClientSettings {