@testring/plugin-selenium-driver 0.6.11 → 0.6.13

package/dist/plugin/index.js

@@ -14,6 +14,7 @@ const webdriverio_1 = require("webdriverio");
 const deepmerge = require("deepmerge");
 const child_process_1 = require("@testring/child-process");
 const logger_1 = require("@testring/logger");
+const dwnld_collector_crx_1 = require("@testring/dwnld-collector-crx");
 const devtool_extension_1 = require("@testring/devtool-extension");
 const code_coverage_client_1 = require("@nullcc/code-coverage-client");
 // Stupidly needed thing for making our own requests
@@ -32,7 +33,7 @@ const DEFAULT_CONFIG = {
             args: [],
         },
     },
-    cdpCoverage: false
+    cdpCoverage: false,
 };
 function delay(timeout) {
     return new Promise((resolve) => setTimeout(() => resolve(), timeout));
@@ -73,6 +74,7 @@ class SeleniumPlugin {
     }
     // eslint-disable-next-line sonarjs/cognitive-complexity
     createConfig(config) {
+        var _a, _b;
         let mergedConfig = deepmerge.all([DEFAULT_CONFIG, config], {
             clone: true,
         });
@@ -127,6 +129,17 @@ class SeleniumPlugin {
         if (!mergedConfig.hostname && mergedConfig.host) {
             mergedConfig.hostname = mergedConfig.host;
         }
+        const googleChromeOptions = (_a = mergedConfig.capabilities) === null || _a === void 0 ? void 0 : _a['goog:chromeOptions'];
+        if ((_b = googleChromeOptions === null || googleChromeOptions === void 0 ? void 0 : googleChromeOptions.args) === null || _b === void 0 ? void 0 : _b.includes('--headless=new')) {
+            const extensions = googleChromeOptions.extensions;
+            const dowldMonitorCrx = (0, dwnld_collector_crx_1.getCrxBase64)();
+            if (extensions) {
+                extensions.push(dowldMonitorCrx);
+            }
+            else {
+                googleChromeOptions.extensions = [dowldMonitorCrx];
+            }
+        }
         return mergedConfig;
     }
     initIntervals() {
@@ -259,7 +272,11 @@ class SeleniumPlugin {
             if (this.expiredBrowserClients.has(applicant)) {
                 throw Error(`This session expired in ${this.config.clientTimeout}ms`);
             }
-            const _config = deepmerge.all([{}, this.config, config || {}]);
+            const _config = deepmerge.all([
+                {},
+                this.config,
+                config || {},
+            ]);
             const client = yield (0, webdriverio_1.remote)(_config);
             let sessionId;
             if (client.sessionId) {
@@ -324,7 +341,7 @@ class SeleniumPlugin {
         // Creating our delete selenium session to be able to close
         // session if it's id is changed while we are running test
         client.addCommand('deleteSessionId', function (sessionId) {
-            const { w3cCaps, jsonwpCaps, } = this.options.requestedCapabilities;
+            const { w3cCaps, jsonwpCaps } = this.options.requestedCapabilities;
             const sessionDeleteRequest = new WebDriverRequest('DELETE', '/session/:sessionId', {
                 capabilities: w3cCaps,
                 desiredCapabilities: jsonwpCaps, // JSONWP compliant

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@testring/plugin-selenium-driver",
-  "version": "0.6.11",
+  "version": "0.6.13",
   "main": "./dist/index.js",
   "typings": "./src/index.ts",
   "repository": {
@@ -11,11 +11,12 @@
   "license": "MIT",
   "dependencies": {
     "@nullcc/code-coverage-client": "1.4.2",
-    "@testring/child-process": "0.6.11",
-    "@testring/devtool-extension": "0.6.11",
-    "@testring/logger": "0.6.11",
-    "@testring/plugin-api": "0.6.11",
-    "@testring/types": "0.6.11",
+    "@testring/child-process": "0.6.13",
+    "@testring/devtool-extension": "0.6.13",
+    "@testring/dwnld-collector-crx": "0.6.13",
+    "@testring/logger": "0.6.13",
+    "@testring/plugin-api": "0.6.13",
+    "@testring/types": "0.6.13",
     "@types/deepmerge": "2.2.0",
     "@types/node": "18.11.18",
     "chromedriver": "*",

package/src/plugin/index.ts

@@ -8,6 +8,7 @@ import * as deepmerge from 'deepmerge';
 
 import {spawn} from '@testring/child-process';
 import {loggerClient} from '@testring/logger';
+import {getCrxBase64} from '@testring/dwnld-collector-crx';
 import {absoluteExtensionPath} from '@testring/devtool-extension';
 import {CDPCoverageCollector} from '@nullcc/code-coverage-client';
 
@@ -49,7 +50,7 @@ const DEFAULT_CONFIG: SeleniumPluginConfig = {
             args: [] as string[],
         },
     },
-    cdpCoverage: false
+    cdpCoverage: false,
 };
 
 function delay(timeout) {
@@ -185,6 +186,17 @@ export class SeleniumPlugin implements IBrowserProxyPlugin {
             mergedConfig.hostname = mergedConfig.host;
         }
 
+        const googleChromeOptions = mergedConfig.capabilities?.['goog:chromeOptions'];
+        if (googleChromeOptions?.args?.includes('--headless=new')) {
+            const extensions = googleChromeOptions.extensions;
+            const dowldMonitorCrx = getCrxBase64();
+            if (extensions) {
+                extensions.push(dowldMonitorCrx);
+            } else {
+                googleChromeOptions.extensions = [dowldMonitorCrx];
+            }
+        }
+
         return mergedConfig;
     }
 
@@ -331,7 +343,10 @@ export class SeleniumPlugin implements IBrowserProxyPlugin {
         }
     }
 
-    private async createClient(applicant: string, config?: Partial<WebdriverIO.Config>): Promise<void> {
+    private async createClient(
+        applicant: string,
+        config?: Partial<WebdriverIO.Config>,
+    ): Promise<void> {
         await this.waitForReadyState;
         const clientData = this.browserClients.get(applicant);
 
@@ -350,7 +365,11 @@ export class SeleniumPlugin implements IBrowserProxyPlugin {
             );
         }
 
-        const _config: any = deepmerge.all([{}, this.config, config as any || {}]);
+        const _config: any = deepmerge.all([
+            {},
+            this.config,
+            (config as any) || {},
+        ]);
         const client = await remote(_config);
 
         let sessionId: string;
@@ -424,10 +443,8 @@ export class SeleniumPlugin implements IBrowserProxyPlugin {
         client.addCommand(
             'deleteSessionId',
             function (sessionId) {
-                const {
-                    w3cCaps,
-                    jsonwpCaps,
-                } = this.options.requestedCapabilities;
+                const {w3cCaps, jsonwpCaps} =
+                    this.options.requestedCapabilities;
 
                 const sessionDeleteRequest = new WebDriverRequest(
                     'DELETE',
@@ -1189,7 +1206,7 @@ export class SeleniumPlugin implements IBrowserProxyPlugin {
                     },
                 },
             },
-        } as any)
+        } as any);
     }
 }