@applitools/eyes-cypress 3.35.1 → 3.36.1

package/CHANGELOG.md

@@ -1,5 +1,39 @@
 # Changelog
 
+## [3.36.1](https://github.com/applitools/eyes.sdk.javascript1/compare/js/eyes-cypress@3.36.0...js/eyes-cypress@3.36.1) (2023-08-08)
+
+
+### Dependencies
+
+* @applitools/core bumped to 3.8.1
+  #### Bug Fixes
+
+  * some fix ([5dc537a](https://github.com/applitools/eyes.sdk.javascript1/commit/5dc537aa5d40933c21f21b8f138f7ff944c064a8))
+* @applitools/eyes bumped to 1.7.1
+
+
+## [3.36.0](https://github.com/applitools/eyes.sdk.javascript1/compare/js/eyes-cypress@3.35.1...js/eyes-cypress@3.36.0) (2023-08-08)
+
+
+### Features
+
+* rework log event on opent eyes ([#1842](https://github.com/applitools/eyes.sdk.javascript1/issues/1842)) ([532756b](https://github.com/applitools/eyes.sdk.javascript1/commit/532756b75c1023967c3781316148c890dbcfaac8))
+
+
+### Dependencies
+
+* @applitools/core bumped to 3.8.0
+  #### Features
+
+  * rework log event on opent eyes ([#1842](https://github.com/applitools/eyes.sdk.javascript1/issues/1842)) ([532756b](https://github.com/applitools/eyes.sdk.javascript1/commit/532756b75c1023967c3781316148c890dbcfaac8))
+* @applitools/eyes bumped to 1.7.0
+  #### Features
+
+  * rework log event on opent eyes ([#1842](https://github.com/applitools/eyes.sdk.javascript1/issues/1842)) ([532756b](https://github.com/applitools/eyes.sdk.javascript1/commit/532756b75c1023967c3781316148c890dbcfaac8))
+
+
+
+
 ## [3.35.1](https://github.com/applitools/eyes.sdk.javascript1/compare/js/eyes-cypress@3.35.0...js/eyes-cypress@3.35.1) (2023-08-08)
 
 

package/dist/plugin/extractEnvironment.js

@@ -0,0 +1,16 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.extractEnvironment = void 0;
+function extractEnvironment(options) {
+    var _a;
+    const versions = {};
+    try {
+        const { name, version } = require('cypress/package.json');
+        versions[name] = version;
+    }
+    catch {
+        // NOTE: ignore error
+    }
+    return { versions, testingType: (_a = options === null || options === void 0 ? void 0 : options.testingType) !== null && _a !== void 0 ? _a : 'e2e' };
+}
+exports.extractEnvironment = extractEnvironment;

package/dist/plugin/index.js

@@ -9,7 +9,7 @@ const server_1 = __importDefault(require("./server"));
 const logger_1 = require("@applitools/logger");
 const { config, eyesConfig } = (0, config_1.default)();
 const logger = (0, logger_1.makeLogger)({ level: config.showLogs ? 'info' : 'silent' });
-const startServer = (0, server_1.default)({ logger, eyesConfig, config });
+const startServer = (0, server_1.default)({ logger, eyesConfig });
 const pluginExport = (0, pluginExport_1.default)({
     startServer,
     eyesConfig: Object.assign({}, eyesConfig, { appliConfFile: config }),

package/dist/plugin/server.js

@@ -11,8 +11,8 @@ const fs_1 = __importDefault(require("fs"));
 const https_1 = require("https");
 const ws_1 = require("ws");
 const util_1 = require("util");
-const PUBLIC_CLOUD = 'https://eyesapi.applitools.com';
-function makeStartServer({ logger, eyesConfig, config, }) {
+const extractEnvironment_1 = require("../plugin/extractEnvironment");
+function makeStartServer({ logger, eyesConfig }) {
     return async function startServer(options) {
         const key = fs_1.default.readFileSync(path_1.default.resolve(__dirname, '../../src/pem/server.key'));
         const cert = fs_1.default.readFileSync(path_1.default.resolve(__dirname, '../../src/pem/server.cert'));
@@ -27,11 +27,13 @@ function makeStartServer({ logger, eyesConfig, config, }) {
             https.close();
             closeUniversalServer();
         });
+        const environment = (0, extractEnvironment_1.extractEnvironment)(options);
         const { port: universalPort, close: closeUniversalServer } = await (0, core_1.makeCoreServer)({
             idleTimeout: 0,
             printStdout: true,
             singleton: false,
             portResolutionMode: 'random',
+            environment,
             debug: eyesConfig.universalDebug,
         });
         const managers = [];
@@ -49,33 +51,7 @@ function makeStartServer({ logger, eyesConfig, config, }) {
             socketWithClient.on('message', (message) => {
                 const msg = JSON.parse(message);
                 logger.log('==> ', message.toString().slice(0, 1000));
-                if (msg.name === 'Core.makeCore') {
-                    logger.log('==> ', 'Core.logEvent');
-                    socketWithUniversal.request('Core.logEvent', {
-                        settings: {
-                            eyesServerUrl: config.serverUrl ? config.serverUrl : PUBLIC_CLOUD,
-                            apiKey: config.apiKey,
-                            agentId: `eyes.cypress/${require('../../package.json').version}`,
-                            proxy: config.proxy,
-                            level: 'Notice',
-                            event: {
-                                type: 'CypressTestingType',
-                                testingType: (options === null || options === void 0 ? void 0 : options.testingType) === 'component' ? 'component' : 'e2e',
-                                cypressVersion: require('cypress/package.json').version,
-                            },
-                        },
-                        logger,
-                    });
-                }
-                if (msg.name === 'Core.makeSDK') {
-                    const newMessage = Buffer.from(JSON.stringify({
-                        name: msg.name,
-                        key: msg.key,
-                        payload: Object.assign(msg.payload, { cwd: process.cwd() }),
-                    }), 'utf-8');
-                    socketWithUniversal.send(newMessage);
-                }
-                else if (msg.name === 'Test.printTestResults') {
+                if (msg.name === 'Test.printTestResults') {
                     try {
                         if (msg.payload.resultConfig.tapDirPath && msg.payload.resultConfig.shouldCreateTapFile) {
                             handleTestResults_1.default.handleBatchResultsFile(msg.payload.testResults, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applitools/eyes-cypress",
-  "version": "3.35.1",
+  "version": "3.36.1",
   "repository": {
     "type": "git",
     "url": "git://github.com/applitools/eyes.sdk.javascript1.git",
@@ -54,8 +54,8 @@
     "setup": "run --top-level xvfb:setup"
   },
   "dependencies": {
-    "@applitools/core": "3.7.0",
-    "@applitools/eyes": "1.6.7",
+    "@applitools/core": "3.8.1",
+    "@applitools/eyes": "1.7.1",
     "@applitools/functional-commons": "1.6.0",
     "@applitools/logger": "2.0.7",
     "@applitools/utils": "1.5.0",
@@ -68,7 +68,7 @@
   "devDependencies": {
     "@applitools/api-extractor": "^1.2.21",
     "@applitools/bongo": "^5.4.3",
-    "@applitools/generic": "^3.3.5",
+    "@applitools/generic": "^3.3.7",
     "@applitools/snaptdout": "1.0.1",
     "@applitools/test-server": "^1.2.2",
     "@applitools/test-utils": "^1.5.17",

package/src/browser/commands.js

@@ -120,9 +120,9 @@ Cypress.Commands.add('eyesOpen', function (args = {}) {
       socket.connect(`wss://localhost:${Cypress.config('eyesPort')}/eyes`)
       connectedToUniversal = true
       socket.emit('Core.makeCore', {
+        spec: Object.keys(spec).concat(['isSelector', 'isDriver', 'isElement']), // TODO fix spec.isSelector and spec.isDriver and spec.isElement in driver
         agentId: `eyes.cypress/${require('../../package.json').version}`,
         cwd: Cypress.config('projectRoot'),
-        spec: Object.keys(spec).concat(['isSelector', 'isDriver', 'isElement']), // TODO fix spec.isSelector and spec.isDriver and spec.isElement in driver
       })
 
       manager =

package/src/plugin/extractEnvironment.ts

@@ -0,0 +1,10 @@
+export function extractEnvironment(options: Cypress.PluginConfigOptions): Record<string, any> {
+  const versions = {} as Record<string, string>
+  try {
+    const {name, version} = require('cypress/package.json')
+    versions[name] = version
+  } catch {
+    // NOTE: ignore error
+  }
+  return {versions, testingType: options?.testingType ?? 'e2e'}
+}

package/src/plugin/index.ts

@@ -30,7 +30,7 @@ export type EyesPluginConfig = {
 const {config, eyesConfig} = makeConfig()
 const logger = makeLogger({level: config.showLogs ? 'info' : 'silent'})
 
-const startServer = makeStartServer({logger, eyesConfig, config})
+const startServer = makeStartServer({logger, eyesConfig})
 
 const pluginExport = makePluginExport({
   startServer,

package/src/plugin/server.ts

@@ -9,6 +9,7 @@ import {type Logger} from '@applitools/logger'
 import {AddressInfo} from 'net'
 import {promisify} from 'util'
 import {EyesPluginConfig} from './index'
+import {extractEnvironment} from '../plugin/extractEnvironment'
 
 export type StartServerReturn = {
   server: Omit<SocketWithUniversal, 'disconnect' | 'ref' | 'unref' | 'send' | 'request' | 'setPassthroughListener'>
@@ -17,16 +18,8 @@ export type StartServerReturn = {
   closeBatches: (settings: CloseBatchSettings | CloseBatchSettings[]) => Promise<void>
   closeUniversalServer: () => void
 }
-const PUBLIC_CLOUD = 'https://eyesapi.applitools.com'
-export default function makeStartServer({
-  logger,
-  eyesConfig,
-  config,
-}: {
-  logger: Logger
-  eyesConfig: EyesPluginConfig
-  config: any
-}) {
+
+export default function makeStartServer({logger, eyesConfig}: {logger: Logger; eyesConfig: EyesPluginConfig}) {
   return async function startServer(options?: Cypress.PluginConfigOptions): Promise<StartServerReturn> {
     const key = fs.readFileSync(path.resolve(__dirname, '../../src/pem/server.key'))
     const cert = fs.readFileSync(path.resolve(__dirname, '../../src/pem/server.cert'))
@@ -44,11 +37,13 @@ export default function makeStartServer({
       closeUniversalServer()
     })
 
+    const environment = extractEnvironment(options)
     const {port: universalPort, close: closeUniversalServer} = await makeCoreServer({
       idleTimeout: 0,
       printStdout: true,
       singleton: false,
       portResolutionMode: 'random',
+      environment,
       debug: eyesConfig.universalDebug,
     })
 
@@ -71,35 +66,7 @@ export default function makeStartServer({
       socketWithClient.on('message', (message: string) => {
         const msg = JSON.parse(message)
         logger.log('==> ', message.toString().slice(0, 1000))
-        if (msg.name === 'Core.makeCore') {
-          logger.log('==> ', 'Core.logEvent')
-          socketWithUniversal.request('Core.logEvent', {
-            settings: {
-              eyesServerUrl: config.serverUrl ? config.serverUrl : PUBLIC_CLOUD,
-              apiKey: config.apiKey,
-              agentId: `eyes.cypress/${require('../../package.json').version}`,
-              proxy: config.proxy,
-              level: 'Notice',
-              event: {
-                type: 'CypressTestingType',
-                testingType: options?.testingType === 'component' ? 'component' : 'e2e',
-                cypressVersion: require('cypress/package.json').version,
-              },
-            },
-            logger,
-          })
-        }
-        if (msg.name === 'Core.makeSDK') {
-          const newMessage = Buffer.from(
-            JSON.stringify({
-              name: msg.name,
-              key: msg.key,
-              payload: Object.assign(msg.payload, {cwd: process.cwd()}),
-            }),
-            'utf-8',
-          )
-          socketWithUniversal.send(newMessage)
-        } else if (msg.name === 'Test.printTestResults') {
+        if (msg.name === 'Test.printTestResults') {
           try {
             if (msg.payload.resultConfig.tapDirPath && msg.payload.resultConfig.shouldCreateTapFile) {
               handleTestResults.handleBatchResultsFile(msg.payload.testResults, {