@applitools/ec-client 1.2.28 → 1.2.30

package/dist/client.js

@@ -24,11 +24,13 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeECClient = void 0;
+const logger_1 = require("@applitools/logger");
 const server_1 = require("./server");
 const utils = __importStar(require("@applitools/utils"));
-async function makeECClient({ settings, logger, } = {}) {
+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;
+    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);

package/dist/commands/start-session.js

@@ -84,7 +84,7 @@ function makeStartSession({ settings, req, tunnels }) {
         const queueKey = JSON.stringify(session.credentials);
         let queue = queues.get(queueKey);
         if (!queue) {
-            queue = (0, queue_1.makeQueue)({ logger: logger.extend({ tags: { queue: queueKey } }) });
+            queue = (0, queue_1.makeQueue)({ logger: logger.extend({ tags: [`queue-${queueKey}`] }) });
             queues.set(queueKey, queue);
         }
         request.socket.on('close', () => queue.cancel(task));

package/dist/server.js

@@ -25,7 +25,6 @@ var __importStar = (this && this.__importStar) || function (mod) {
 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");
@@ -36,9 +35,9 @@ 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 }) {
+async function makeServer({ settings, logger: mainLogger, }) {
     var _a, _b;
-    const serverLogger = logger ? logger.extend({ label: 'ec-client' }) : (0, logger_1.makeLogger)({ label: 'ec-client', colors: true });
+    const serverLogger = mainLogger.extend();
     const req = (0, req_proxy_1.makeReqProxy)({
         targetUrl: settings.serverUrl,
         proxy: settings.proxy,
@@ -66,9 +65,8 @@ async function makeServer({ settings, logger }) {
         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() },
-        });
+        const requestLogger = serverLogger.extend({ tags: [`proxy-request-${utils.general.shortid()}`] });
+        requestLogger.log(`Received request [${request.method}] ${request.url}`);
         router.post('/session', async () => {
             const session = await commands.startSession({ request, response, logger: requestLogger });
             sessions.set(session.sessionId, session);

package/dist/tunnels/manager-server.js

@@ -43,9 +43,11 @@ async function makeTunnelManagerServer({ settings, path, idleTimeout = 600000, /
     });
     const logger = (0, logger_1.makeLogger)({
         handler: { type: 'rolling file', name: 'ec-tunnel-manager', dirname: LOG_DIRNAME },
-        label: 'ec-tunnel-manager',
         level: 'info',
-        colors: false,
+        format: {
+            label: 'ec-tunnel-manager',
+            colors: false,
+        },
     });
     logger.log('Server is started');
     const manager = await (0, manager_1.makeTunnelManager)({ settings, logger });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applitools/ec-client",
-  "version": "1.2.28",
+  "version": "1.2.30",
   "homepage": "https://applitools.com",
   "bugs": {
     "url": "https://github.com/applitools/eyes.sdk.javascript1/issues"
@@ -63,21 +63,21 @@
     "postversion": "bongo postversion"
   },
   "dependencies": {
-    "@applitools/core-base": "1.1.53",
-    "@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.29",
-    "@applitools/utils": "1.3.35",
+    "@applitools/core-base": "1.1.54",
+    "@applitools/driver": "1.11.51",
+    "@applitools/execution-grid-tunnel": "2.1.0",
+    "@applitools/logger": "2.0.0",
+    "@applitools/req": "1.2.6",
+    "@applitools/socket": "1.0.14",
+    "@applitools/spec-driver-webdriver": "1.0.31",
+    "@applitools/utils": "1.3.36",
     "abort-controller": "3.0.0",
     "webdriver": "7",
     "yargs": "17.6.2"
   },
   "devDependencies": {
     "@applitools/bongo": "^3.0.3",
-    "@applitools/test-server": "^1.1.31",
+    "@applitools/test-server": "^1.2.0",
     "@applitools/test-utils": "^1.5.16",
     "@types/node": "^12.20.55",
     "@types/node-fetch": "^2.6.1",

package/types/client.d.ts

@@ -1,6 +1,6 @@
 import type { ECClient, ECClientSettings } from './types';
 import { type Logger } from '@applitools/logger';
-export declare function makeECClient({ settings, logger, }?: {
+export declare function makeECClient({ settings, logger: defaultLogger, }?: {
     settings?: Partial<ECClientSettings>;
     logger?: Logger;
 }): Promise<ECClient>;

package/types/server.d.ts

@@ -1,6 +1,6 @@
 import type { ECClient, ECClientSettings } from './types';
 import { type Logger } from '@applitools/logger';
-export declare function makeServer({ settings, logger }: {
+export declare function makeServer({ settings, logger: mainLogger, }: {
     settings: ECClientSettings;
-    logger?: Logger;
+    logger: Logger;
 }): Promise<ECClient>;