@applitools/visual-grid-client - npm Package Compare versions

Comparing version 5.2.1 to 5.3.1

browser.js

@@ -5,2 +5,3 @@ 'use strict';
 const extractResources = require('./src/browser-util/extractResources');
+const {processDocument} = require('./src/browser-util/processResources');
 
@@ -10,2 +11,3 @@ module.exports = {
   extractResources,
+  processDocument,
 };

package.json

 {
   "name": "@applitools/visual-grid-client",
-  "version": "5.2.1",
+  "version": "5.3.1",
   "description": "",
@@ -38,3 +38,3 @@ "main": "src/visual-grid-client.js",
   "dependencies": {
-    "@applitools/eyes.sdk.core": "^1.11.0",
+    "@applitools/eyes.sdk.core": "^2.0.0",
     "@applitools/functional-commons": "^1.0.19",
@@ -41,0 +41,0 @@ "@applitools/http-commons": "^1.1.1",

src/sdk/checkWindow.js

 'use strict';
-const absolutizeUrl = require('./absolutizeUrl');
-const mapKeys = require('lodash.mapkeys');
-const mapValues = require('lodash.mapvalues');
+
 const saveData = require('../troubleshoot/saveData');
 const createRenderRequests = require('./createRenderRequests');
 const createCheckSettings = require('./createCheckSettings');
+
 const {presult} = require('@applitools/functional-commons');
@@ -15,6 +14,5 @@ const {RectangleSize, Location} = require('@applitools/eyes.sdk.core');
   saveDebugData,
-  extractCssResourcesFromCdt,
+  createRGridDOMAndGetResourceMapping,
   renderBatch,
   waitForRenderedStatus,
-  getAllResources,
   renderInfo,
@@ -35,2 +33,3 @@ logger,
     resourceContents = {},
+    frames = [],
     url,
@@ -52,10 +51,9 @@ cdt,
     }
-    const resourceUrlsWithCss = resourceUrls.concat(extractCssResourcesFromCdt(cdt, url));
-    const absoluteUrls = resourceUrlsWithCss.map(resourceUrl => absolutizeUrl(resourceUrl, url));
-    const absoluteResourceContents = mapValues(
-      mapKeys(resourceContents, (_value, key) => absolutizeUrl(key, url)),
-      ({url: resourceUrl, type, value}) => ({url: absolutizeUrl(resourceUrl, url), type, value}),
-    );
-
-    const getResourcesPromise = getAllResources(absoluteUrls, absoluteResourceContents);
+    const getResourcesPromise = createRGridDOMAndGetResourceMapping({
+      resourceUrls,
+      resourceContents,
+      cdt,
+      url,
+      frames,
+    });
     const renderPromise = presult(startRender());
@@ -159,3 +157,3 @@
 
-      const resources = await getResourcesPromise;
+      const {rGridDom: dom, allResources: resources} = await getResourcesPromise;
 
@@ -169,4 +167,4 @@ if (getError()) {
         url,
-        resources,
-        cdt,
+        dom,
+        resources: Object.values(resources),
         browsers,
@@ -173,0 +171,0 @@ renderInfo,

src/sdk/createRenderRequests.js

 'use strict';
 
 const {RenderRequest, RenderInfo} = require('@applitools/eyes.sdk.core');
-const createRGridDom = require('./createRGridDom');
 const createEmulationInfo = require('./createEmulationInfo');
@@ -11,3 +10,3 @@ const calculateSelectorsToFindRegionsFor = require('./calculateSelectorsToFindRegionsFor');
   resources,
-  cdt,
+  dom,
   browsers,
@@ -23,3 +22,2 @@ renderInfo,
 }) {
-  const rGridDom = createRGridDom({resources, cdt});
   const selectorsToFindRegionsFor = calculateSelectorsToFindRegionsFor({
@@ -43,13 +41,21 @@ sizeMode,
 
-      return new RenderRequest(
-        renderInfo.getResultsUrl(),
+      return new RenderRequest({
+        webhook: renderInfo.getResultsUrl(),
         url,
-        rGridDom,
-        RenderInfo.fromObject({width, height, sizeMode, selector, region, emulationInfo}),
-        'Linux',
-        name,
+        resources,
+        dom,
+        renderInfo: RenderInfo.fromObject({
+          width,
+          height,
+          sizeMode,
+          selector,
+          region,
+          emulationInfo,
+        }),
+        platform: 'Linux',
+        browserName: name,
         scriptHooks,
         selectorsToFindRegionsFor,
         sendDom,
-      );
+      });
     },
@@ -56,0 +62,0 @@ );

src/sdk/openEyes.js

@@ -37,6 +37,5 @@ 'use strict';
   logger,
-  extractCssResourcesFromCdt,
   renderBatch,
   waitForRenderedStatus,
-  getAllResources,
+  createRGridDOMAndGetResourceMapping,
   renderThroat,
@@ -148,6 +147,5 @@ getRenderInfoPromise,
       saveDebugData,
-      extractCssResourcesFromCdt,
+      createRGridDOMAndGetResourceMapping,
       renderBatch,
       waitForRenderedStatus,
-      getAllResources,
       renderInfo,
@@ -154,0 +152,0 @@ logger,

src/sdk/putResources.js

@@ -12,3 +12,3 @@ 'use strict';
   const putPromises = {};
-  return async function putResources(rGridDom, runningRender, wrapper) {
+  return async function putResources(rGridDom, runningRender, wrapper, allResources = []) {
     const resources = []; // this will contain all the resources that need to be PUT (asked for + not already sent)
@@ -22,3 +22,3 @@ const existingPromises = [];
     if (needMoreResources) {
-      for (const resource of rGridDom.getResources()) {
+      for (const resource of allResources) {
         if (needMoreResources.includes(resource.getUrl())) {
@@ -25,0 +25,0 @@ processResource(resource, resources, existingPromises);

src/sdk/renderBatch.js

@@ -15,3 +15,8 @@ 'use strict';
           renderRequest.setRenderId(runningRender.getRenderId());
-          await putResources(renderRequest.getDom(), runningRender, wrapper);
+          await putResources(
+            renderRequest.getDom(),
+            runningRender,
+            wrapper,
+            renderRequest.getResources(),
+          );
         }
@@ -18,0 +23,0 @@ for (const resource of renderRequest.getResources()) {

src/sdk/renderingGridClient.js

@@ -15,2 +15,4 @@ 'use strict';
 const makeOpenEyesLimitedConcurrency = require('./openEyesLimitedConcurrency');
+const makeCreateRGridDOMAndGetResourceMapping = require('./createRGridDOMAndGetResourceMapping');
+const makeParseInlineCssFromCdt = require('./parseInlineCssFromCdt');
 const getBatch = require('./getBatch');
@@ -76,2 +78,7 @@
   });
+  const parseInlineCssFromCdt = makeParseInlineCssFromCdt(extractCssResourcesFromCdt);
+  const createRGridDOMAndGetResourceMapping = makeCreateRGridDOMAndGetResourceMapping({
+    getAllResources,
+    parseInlineCssFromCdt,
+  });
 
@@ -105,9 +112,8 @@ const {batchId: defaultBatchId, batchName: defaultBatchName} = getBatch({batchName, batchId});
     logger,
-    extractCssResourcesFromCdt,
     renderBatch,
     waitForRenderedStatus,
-    getAllResources,
     renderThroat,
     getRenderInfoPromise,
     setRenderInfoPromise,
+    createRGridDOMAndGetResourceMapping,
   });
@@ -114,0 +120,0 @@ const openEyesLimitedConcurrency = makeOpenEyesLimitedConcurrency(openEyes, openEyesConcurrency);

New alerts

Uses eval

Supply chain risk

Package uses dynamic code execution (e.g., eval()), which is a dangerous practice. This can prevent the code from running in certain environments and increases the risk that the code may contain exploits or malicious behavior.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

75063

increased by8.81%

Number of package files

46

increased by6.98%

Lines of code

1987

increased by10.45%

Worsened metrics

Number of medium supply chain risk alerts

4

increased by100%

Dependency changes

• + Added@applitools/eyes.sdk.core@2.3.0(transitive)

• - Removed@applitools/eyes.sdk.core@1.11.0(transitive)

• Updated@applitools/eyes.sdk.core@^2.0.0