@wdio/browserstack-service 7.34.0 → 7.36.0

package/build/launcher.d.ts

@@ -1,9 +1,9 @@
 import * as BrowserstackLocalLauncher from 'browserstack-local';
 import type { Capabilities, Services, Options } from '@wdio/types';
-import type { App, AppConfig, AppUploadResponse, BrowserstackConfig } from './types';
+import type { App, AppConfig, AppUploadResponse, BrowserstackConfig, UserConfig } from './types';
 type BrowserstackLocal = BrowserstackLocalLauncher.Local & {
     pid?: number;
-    stop(callback: (err?: any) => void): void;
+    stop(callback: (err?: Error) => void): void;
 };
 export default class BrowserstackLauncherService implements Services.ServiceInstance {
     private _options;
@@ -14,11 +14,15 @@ export default class BrowserstackLauncherService implements Services.ServiceInst
     private _buildTag?;
     private _buildIdentifier?;
     private _accessibilityAutomation?;
-    _testOpsBuildStopped?: boolean;
+    private _percy?;
+    private _percyBestPlatformCaps?;
+    private readonly browserStackConfig;
     constructor(_options: BrowserstackConfig & Options.Testrunner, capabilities: Capabilities.RemoteCapability, _config: Options.Testrunner);
-    setupExitHandlers(): void;
+    onWorkerStart(cid: any, caps: any): Promise<void>;
     onPrepare(config?: Options.Testrunner, capabilities?: Capabilities.RemoteCapabilities): Promise<unknown>;
     onComplete(): Promise<unknown>;
+    setupPercy(options: BrowserstackConfig & Options.Testrunner, config: Options.Testrunner, bsConfig: UserConfig): Promise<void>;
+    stopPercy(): Promise<void>;
     _uploadApp(app: App): Promise<AppUploadResponse>;
     /**
      * @param  {String | AppConfig}  appConfig    <string>: should be "app file path" or "app_url" or "custom_id" or "shareable_id".

package/build/launcher.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"launcher.d.ts","sourceRoot":"","sources":["../src/launcher.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,yBAAyB,MAAM,oBAAoB,CAAA;AAE/D,OAAO,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,aAAa,CAAA;AAMlE,OAAO,KAAK,EAAE,GAAG,EAAE,SAAS,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,SAAS,CAAA;AAkBpF,KAAK,iBAAiB,GAAG,yBAAyB,CAAC,KAAK,GAAG;IACvD,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,QAAQ,EAAE,CAAC,GAAG,CAAC,EAAE,GAAG,KAAK,IAAI,GAAG,IAAI,CAAC;CAC7C,CAAA;AAED,MAAM,CAAC,OAAO,OAAO,2BAA4B,YAAW,QAAQ,CAAC,eAAe;IAU5E,OAAO,CAAC,QAAQ;IAEhB,OAAO,CAAC,OAAO;IAXnB,iBAAiB,CAAC,EAAE,iBAAiB,CAAA;IACrC,OAAO,CAAC,UAAU,CAAC,CAAQ;IAC3B,OAAO,CAAC,YAAY,CAAC,CAAQ;IAC7B,OAAO,CAAC,SAAS,CAAC,CAAQ;IAC1B,OAAO,CAAC,gBAAgB,CAAC,CAAQ;IACjC,OAAO,CAAC,wBAAwB,CAAC,CAAS;IACnC,oBAAoB,CAAC,EAAE,OAAO,CAAA;gBAGzB,QAAQ,EAAE,kBAAkB,GAAG,OAAO,CAAC,UAAU,EACzD,YAAY,EAAE,YAAY,CAAC,gBAAgB,EACnC,OAAO,EAAE,OAAO,CAAC,UAAU;IA+FvC,iBAAiB;IAUX,SAAS,CAAE,MAAM,CAAC,EAAE,OAAO,CAAC,UAAU,EAAE,YAAY,CAAC,EAAE,YAAY,CAAC,kBAAkB;IA4ItF,UAAU;IA6DV,UAAU,CAAC,GAAG,EAAC,GAAG,GAAG,OAAO,CAAC,iBAAiB,CAAC;IAkBrD;;;OAGG;IACG,YAAY,CAAE,SAAS,EAAE,SAAS,GAAG,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC;IAyBhE,qBAAqB,CAAC,YAAY,CAAC,EAAE,YAAY,CAAC,kBAAkB,EAAE,OAAO,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;KAAE;IAiFvH,WAAW,CAAC,YAAY,CAAC,EAAE,YAAY,CAAC,kBAAkB,EAAE,OAAO,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,EAAC,MAAM;IAoF3F,sBAAsB,CAAC,YAAY,CAAC,EAAE,YAAY,CAAC,kBAAkB;IAyCrE;;;OAGG;IACH,oBAAoB;IA6BpB,sBAAsB,CAAC,QAAQ,CAAC,EAAC,MAAM,EAAE,SAAS,CAAC,EAAC,MAAM,EAAE,eAAe,CAAC,EAAC,MAAM;CAQtF"}
+{"version":3,"file":"launcher.d.ts","sourceRoot":"","sources":["../src/launcher.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,yBAAyB,MAAM,oBAAoB,CAAA;AAE/D,OAAO,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,aAAa,CAAA;AAMlE,OAAO,KAAK,EAAE,GAAG,EAAE,SAAS,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,UAAU,EAAE,MAAM,SAAS,CAAA;AA8BhG,KAAK,iBAAiB,GAAG,yBAAyB,CAAC,KAAK,GAAG;IACvD,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,QAAQ,EAAE,CAAC,GAAG,CAAC,EAAE,KAAK,KAAK,IAAI,GAAG,IAAI,CAAC;CAC/C,CAAA;AAED,MAAM,CAAC,OAAO,OAAO,2BAA4B,YAAW,QAAQ,CAAC,eAAe;IAY5E,OAAO,CAAC,QAAQ;IAEhB,OAAO,CAAC,OAAO;IAbnB,iBAAiB,CAAC,EAAE,iBAAiB,CAAA;IACrC,OAAO,CAAC,UAAU,CAAC,CAAQ;IAC3B,OAAO,CAAC,YAAY,CAAC,CAAQ;IAC7B,OAAO,CAAC,SAAS,CAAC,CAAQ;IAC1B,OAAO,CAAC,gBAAgB,CAAC,CAAQ;IACjC,OAAO,CAAC,wBAAwB,CAAC,CAAS;IAC1C,OAAO,CAAC,MAAM,CAAC,CAAO;IACtB,OAAO,CAAC,sBAAsB,CAAC,CAAkC;IACjE,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAoB;gBAG3C,QAAQ,EAAE,kBAAkB,GAAG,OAAO,CAAC,UAAU,EACzD,YAAY,EAAE,YAAY,CAAC,gBAAgB,EACnC,OAAO,EAAE,OAAO,CAAC,UAAU;IAsGjC,aAAa,CAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG;IAalC,SAAS,CAAE,MAAM,CAAC,EAAE,OAAO,CAAC,UAAU,EAAE,YAAY,CAAC,EAAE,YAAY,CAAC,kBAAkB;IA2JtF,UAAU;IAqEV,UAAU,CAAC,OAAO,EAAE,kBAAkB,GAAG,OAAO,CAAC,UAAU,EAAE,MAAM,EAAE,OAAO,CAAC,UAAU,EAAE,QAAQ,EAAE,UAAU;IAuB7G,SAAS;IAYT,UAAU,CAAC,GAAG,EAAC,GAAG,GAAG,OAAO,CAAC,iBAAiB,CAAC;IAqBrD;;;OAGG;IACG,YAAY,CAAE,SAAS,EAAE,SAAS,GAAG,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC;IAyBhE,qBAAqB,CAAC,YAAY,CAAC,EAAE,YAAY,CAAC,kBAAkB,EAAE,OAAO,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;KAAE;IAiFvH,WAAW,CAAC,YAAY,CAAC,EAAE,YAAY,CAAC,kBAAkB,EAAE,OAAO,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,EAAC,MAAM;IAoF3F,sBAAsB,CAAC,YAAY,CAAC,EAAE,YAAY,CAAC,kBAAkB;IAyCrE;;;OAGG;IACH,oBAAoB;IA6BpB,sBAAsB,CAAC,QAAQ,CAAC,EAAC,MAAM,EAAE,SAAS,CAAC,EAAC,MAAM,EAAE,eAAe,CAAC,EAAC,MAAM;CAQtF"}

package/build/launcher.js

@@ -36,21 +36,27 @@ const os_1 = __importDefault(require("os"));
 const webdriverio_1 = require("webdriverio");
 const BrowserstackLocalLauncher = __importStar(require("browserstack-local"));
 const logger_1 = __importDefault(require("@wdio/logger"));
-const node_child_process_1 = require("node:child_process");
 // @ts-ignore
 const package_json_1 = require("../package.json");
 const crash_reporter_1 = __importDefault(require("./crash-reporter"));
+const PercyHelper_1 = require("./Percy/PercyHelper");
 const constants_1 = require("./constants");
 const util_2 = require("./util");
 const performance_tester_1 = __importDefault(require("./performance-tester"));
+const PercyLogger_1 = require("./Percy/PercyLogger");
+const exitHandler_1 = require("./exitHandler");
+const config_1 = __importDefault(require("./config"));
+const funnelInstrumentation_1 = require("./instrumentation/funnelInstrumentation");
 const log = (0, logger_1.default)('@wdio/browserstack-service');
 class BrowserstackLauncherService {
     constructor(_options, capabilities, _config) {
         this._options = _options;
         this._config = _config;
+        PercyLogger_1.PercyLogger.clearLogFile();
+        (0, exitHandler_1.setupExitHandlers)();
         // added to maintain backward compatibility with webdriverIO v5
-        this.setupExitHandlers();
         this._config || (this._config = _options);
+        this.browserStackConfig = config_1.default.getInstance(_options, _config);
         if (Array.isArray(capabilities)) {
             capabilities.forEach((capability) => {
                 var _a, _b;
@@ -124,7 +130,9 @@ class BrowserstackLauncherService {
                 }
             });
         }
-        if (process.env.BROWSERSTACK_O11Y_PERF_MEASUREMENT) {
+        this.browserStackConfig.buildIdentifier = this._buildIdentifier;
+        this.browserStackConfig.buildName = this._buildName;
+        if (process.env[constants_1.PERF_MEASUREMENT_ENV]) {
             performance_tester_1.default.startMonitoring('performance-report-launcher.csv');
         }
         this._accessibilityAutomation || (this._accessibilityAutomation = (0, util_2.isTrue)(this._options.accessibility));
@@ -133,8 +141,8 @@ class BrowserstackLauncherService {
         this._options.testObservability = this._options.testObservability == false ? false : true;
         if (this._options.testObservability &&
             // update files to run if it's a rerun
-            process.env.BROWSERSTACK_RERUN && process.env.BROWSERSTACK_RERUN_TESTS) {
-            this._config.specs = process.env.BROWSERSTACK_RERUN_TESTS.split(',');
+            process.env[constants_1.RERUN_ENV] && process.env[constants_1.RERUN_TESTS_ENV]) {
+            this._config.specs = process.env[constants_1.RERUN_TESTS_ENV].split(',');
         }
         try {
             crash_reporter_1.default.setConfigDetails(this._config, capabilities, this._options);
@@ -143,16 +151,22 @@ class BrowserstackLauncherService {
             log.error(`[Crash_Report_Upload] Config processing failed due to ${error}`);
         }
     }
-    setupExitHandlers() {
-        process.on('exit', (code) => {
-            if (!!process.env.BS_TESTOPS_JWT && !this._testOpsBuildStopped) {
-                const childProcess = (0, node_child_process_1.spawn)('node', [`${path_1.default.join(__dirname, 'cleanup.js')}`], { detached: true, stdio: 'inherit', env: { ...process.env } });
-                childProcess.unref();
-                process.exit(code);
+    async onWorkerStart(cid, caps) {
+        try {
+            if (this._options.percy && this._percyBestPlatformCaps) {
+                const isThisBestPercyPlatform = (0, util_2.ObjectsAreEqual)(caps, this._percyBestPlatformCaps);
+                if (isThisBestPercyPlatform) {
+                    process.env.BEST_PLATFORM_CID = cid;
+                }
             }
-        });
+        }
+        catch (err) {
+            PercyLogger_1.PercyLogger.error(`Error while setting best platform for Percy snapshot at worker start ${err}`);
+        }
     }
     async onPrepare(config, capabilities) {
+        // // Send Funnel start request
+        await (0, funnelInstrumentation_1.sendStart)(this.browserStackConfig);
         /**
          * Upload app to BrowserStack if valid file path to app is given.
          * Update app value of capability directly if app_url, custom_id, shareable_id is given
@@ -239,6 +253,18 @@ class BrowserstackLauncherService {
                 buildIdentifier: this._buildIdentifier
             });
         }
+        if (this._options.percy) {
+            try {
+                const bestPlatformPercyCaps = (0, PercyHelper_1.getBestPlatformForPercySnapshot)(capabilities);
+                this._percyBestPlatformCaps = bestPlatformPercyCaps;
+                await this.setupPercy(this._options, this._config, {
+                    projectName: this._projectName
+                });
+            }
+            catch (err) {
+                PercyLogger_1.PercyLogger.error(`Error while setting up Percy ${err}`);
+            }
+        }
         if (!this._options.browserstackLocal) {
             return log.info('browserstackLocal is not enabled - skipping...');
         }
@@ -288,12 +314,12 @@ class BrowserstackLauncherService {
         if (this._options.testObservability) {
             log.debug('Sending stop launch event');
             await (0, util_2.stopBuildUpstream)();
-            if (process.env.BS_TESTOPS_BUILD_HASHED_ID) {
-                console.log(`\nVisit https://observability.browserstack.com/builds/${process.env.BS_TESTOPS_BUILD_HASHED_ID} to view build report, insights, and many more debugging information all at one place!\n`);
-                this._testOpsBuildStopped = true;
+            if (process.env[constants_1.TESTOPS_BUILD_ID_ENV]) {
+                console.log(`\nVisit https://observability.browserstack.com/builds/${process.env[constants_1.TESTOPS_BUILD_ID_ENV]} to view build report, insights, and many more debugging information all at one place!\n`);
+                this.browserStackConfig.testObservability.buildStopped = true;
             }
         }
-        if (process.env.BROWSERSTACK_O11Y_PERF_MEASUREMENT) {
+        if (process.env[constants_1.PERF_MEASUREMENT_ENV]) {
             await performance_tester_1.default.stopAndGenerate('performance-launcher.html');
             performance_tester_1.default.calculateTimes(['launchTestSession', 'stopBuildUpstream']);
             if (!process.env.START_TIME) {
@@ -302,6 +328,11 @@ class BrowserstackLauncherService {
             const duration = (new Date()).getTime() - (new Date(process.env.START_TIME)).getTime();
             log.info(`Total duration is ${duration / 1000} s`);
         }
+        if (this._options.percy) {
+            await this.stopPercy();
+        }
+        PercyLogger_1.PercyLogger.clearLogger();
+        await (0, funnelInstrumentation_1.sendFinish)(this.browserStackConfig);
         if (!this.browserstackLocal || !this.browserstackLocal.isRunning()) {
             return;
         }
@@ -331,11 +362,49 @@ class BrowserstackLauncherService {
             return Promise.reject(err);
         });
     }
+    async setupPercy(options, config, bsConfig) {
+        var _a;
+        if ((_a = this._percy) === null || _a === void 0 ? void 0 : _a.isRunning()) {
+            return;
+        }
+        try {
+            this._percy = await (0, PercyHelper_1.startPercy)(options, config, bsConfig);
+            if (!this._percy) {
+                throw new Error('Could not start percy, check percy logs for info.');
+            }
+            PercyLogger_1.PercyLogger.info('Percy started successfully');
+            let signal = 0;
+            const handler = async () => {
+                signal++;
+                signal === 1 && await this.stopPercy();
+            };
+            process.on('beforeExit', handler);
+            process.on('SIGINT', handler);
+            process.on('SIGTERM', handler);
+        }
+        catch (err) {
+            PercyLogger_1.PercyLogger.debug(`Error in percy setup ${err}`);
+        }
+    }
+    async stopPercy() {
+        if (!this._percy || !this._percy.isRunning()) {
+            return;
+        }
+        try {
+            await (0, PercyHelper_1.stopPercy)(this._percy);
+            PercyLogger_1.PercyLogger.info('Percy stopped');
+        }
+        catch (err) {
+            PercyLogger_1.PercyLogger.error(`Error occured while stopping percy : ${err}`);
+        }
+    }
     async _uploadApp(app) {
         log.info(`uploading app ${app.app} ${app.customId ? `and custom_id: ${app.customId}` : ''} to browserstack`);
         const form = new form_data_1.default();
-        if (app.app)
-            form.append('file', fs_1.default.createReadStream(app.app));
+        if (app.app) {
+            const fileName = path_1.default.basename(app.app);
+            form.append('file', fs_1.default.createReadStream(app.app), fileName);
+        }
         if (app.customId)
             form.append('custom_id', app.customId);
         const res = await got_1.default.post('https://api-cloud.browserstack.com/app-automate/upload', {

package/build/reporter.d.ts

@@ -1,18 +1,18 @@
 import WDIOReporter, { SuiteStats, TestStats, RunnerStats, HookStats } from '@wdio/reporter';
-import type { CurrentRunInfo, StdLog, TestMeta } from './types';
+import type { CurrentRunInfo, StdLog, TestData, TestMeta } from './types';
 declare class _TestReporter extends WDIOReporter {
     private _capabilities;
     private _config?;
     private _observability;
     private _sessionId?;
     private _suiteName?;
-    private _requestQueueHandler;
     private _suites;
     private static _tests;
     private _gitConfigPath?;
     private _gitConfigured;
     private _currentHook;
     private _currentTest;
+    private listener;
     onRunnerStart(runnerStats: RunnerStats): Promise<void>;
     registerListeners(): void;
     appendTestItemLog(stdLog: StdLog): Promise<void>;
@@ -27,7 +27,7 @@ declare class _TestReporter extends WDIOReporter {
     onHookStart(hookStats: HookStats): Promise<void>;
     onHookEnd(hookStats: HookStats): Promise<void>;
     getHookIdentifier(hookStats: HookStats): string;
-    sendTestRunEvent(testStats: TestStats | HookStats, eventType: string): Promise<void>;
+    getRunData(testStats: TestStats | HookStats, eventType: string): Promise<TestData>;
     onTestSkip(testStats: TestStats): Promise<void>;
 }
 declare const TestReporter: typeof _TestReporter;

package/build/reporter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"reporter.d.ts","sourceRoot":"","sources":["../src/reporter.ts"],"names":[],"mappings":"AAEA,OAAO,YAAY,EAAE,EAAE,UAAU,EAAE,SAAS,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAA;AAO5F,OAAO,KAAK,EAAsB,cAAc,EAAE,MAAM,EAAY,QAAQ,EAAc,MAAM,SAAS,CAAA;AAczG,cAAM,aAAc,SAAQ,YAAY;IACpC,OAAO,CAAC,aAAa,CAAgC;IACrD,OAAO,CAAC,OAAO,CAAC,CAAyC;IACzD,OAAO,CAAC,cAAc,CAAO;IAC7B,OAAO,CAAC,UAAU,CAAC,CAAQ;IAC3B,OAAO,CAAC,UAAU,CAAC,CAAQ;IAC3B,OAAO,CAAC,oBAAoB,CAAoC;IAChE,OAAO,CAAC,OAAO,CAAmB;IAClC,OAAO,CAAC,MAAM,CAAC,MAAM,CAA+B;IACpD,OAAO,CAAC,cAAc,CAAC,CAAQ;IAC/B,OAAO,CAAC,cAAc,CAAiB;IACvC,OAAO,CAAC,YAAY,CAAqB;IACzC,OAAO,CAAC,YAAY,CAAqB;IAEnC,aAAa,CAAE,WAAW,EAAE,WAAW;IAS7C,iBAAiB;IAQJ,iBAAiB,CAAC,MAAM,EAAE,MAAM;IAc7C,cAAc,CAAC,WAAW,EAAE,cAAc;IAapC,YAAY;IAWlB,MAAM,CAAC,QAAQ;IAIf,YAAY,CAAE,UAAU,EAAE,UAAU;IAoBpC,UAAU;IAIV,cAAc,CAAC,QAAQ,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM;IAe1C,SAAS,CAAC,SAAS,EAAE,SAAS;IAQ9B,WAAW,CAAC,SAAS,EAAE,SAAS;IAahC,WAAW,CAAC,SAAS,EAAE,SAAS;IAehC,SAAS,CAAC,SAAS,EAAE,SAAS;IAqBpC,iBAAiB,CAAC,SAAS,EAAE,SAAS;IAIhC,gBAAgB,CAAC,SAAS,EAAE,SAAS,GAAC,SAAS,EAAE,SAAS,EAAE,MAAM;IAkFlE,UAAU,CAAE,SAAS,EAAE,SAAS;CAQzC;AAED,QAAA,MAAM,YAAY,EAAE,OAAO,aAAoD,CAAA;AAC/E,KAAK,YAAY,GAAG,aAAa,CAAA;AACjC,eAAe,YAAY,CAAA"}
+{"version":3,"file":"reporter.d.ts","sourceRoot":"","sources":["../src/reporter.ts"],"names":[],"mappings":"AAEA,OAAO,YAAY,EAAE,EAAE,UAAU,EAAE,SAAS,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAA;AAO5F,OAAO,KAAK,EAAsB,cAAc,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAA;AAY7F,cAAM,aAAc,SAAQ,YAAY;IACpC,OAAO,CAAC,aAAa,CAAgC;IACrD,OAAO,CAAC,OAAO,CAAC,CAAyC;IACzD,OAAO,CAAC,cAAc,CAAO;IAC7B,OAAO,CAAC,UAAU,CAAC,CAAQ;IAC3B,OAAO,CAAC,UAAU,CAAC,CAAQ;IAC3B,OAAO,CAAC,OAAO,CAAmB;IAClC,OAAO,CAAC,MAAM,CAAC,MAAM,CAA+B;IACpD,OAAO,CAAC,cAAc,CAAC,CAAQ;IAC/B,OAAO,CAAC,cAAc,CAAiB;IACvC,OAAO,CAAC,YAAY,CAAqB;IACzC,OAAO,CAAC,YAAY,CAAqB;IACzC,OAAO,CAAC,QAAQ,CAAyB;IAEnC,aAAa,CAAE,WAAW,EAAE,WAAW;IAS7C,iBAAiB;IAQJ,iBAAiB,CAAC,MAAM,EAAE,MAAM;IAW7C,cAAc,CAAC,WAAW,EAAE,cAAc;IAapC,YAAY;IAWlB,MAAM,CAAC,QAAQ;IAIf,YAAY,CAAE,UAAU,EAAE,UAAU;IAoBpC,UAAU;IAIV,cAAc,CAAC,QAAQ,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM;IAe1C,SAAS,CAAC,SAAS,EAAE,SAAS;IAQ9B,WAAW,CAAC,SAAS,EAAE,SAAS;IAahC,WAAW,CAAC,SAAS,EAAE,SAAS;IAehC,SAAS,CAAC,SAAS,EAAE,SAAS;IAqBpC,iBAAiB,CAAC,SAAS,EAAE,SAAS;IAIhC,UAAU,CAAC,SAAS,EAAE,SAAS,GAAC,SAAS,EAAE,SAAS,EAAE,MAAM;IAwE5D,UAAU,CAAE,SAAS,EAAE,SAAS;CAQzC;AAED,QAAA,MAAM,YAAY,EAAE,OAAO,aAAoD,CAAA;AAC/E,KAAK,YAAY,GAAG,aAAa,CAAA;AACjC,eAAe,YAAY,CAAA"}

package/build/reporter.js

@@ -9,18 +9,18 @@ const reporter_1 = __importDefault(require("@wdio/reporter"));
 const uuid_1 = require("uuid");
 const logger_1 = __importDefault(require("@wdio/logger"));
 const util_1 = require("./util");
-const request_handler_1 = __importDefault(require("./request-handler"));
+const listener_1 = __importDefault(require("./testOps/listener"));
 const log = (0, logger_1.default)('@wdio/browserstack-service');
 class _TestReporter extends reporter_1.default {
     constructor() {
         super(...arguments);
         this._capabilities = {};
         this._observability = true;
-        this._requestQueueHandler = request_handler_1.default.getInstance();
         this._suites = [];
         this._gitConfigured = false;
         this._currentHook = {};
         this._currentTest = {};
+        this.listener = listener_1.default.getInstance();
     }
     async onRunnerStart(runnerStats) {
         this._capabilities = runnerStats.capabilities;
@@ -47,10 +47,7 @@ class _TestReporter extends reporter_1.default {
             stdLog.test_run_uuid = this._currentTest.uuid;
         }
         if (stdLog.hook_run_uuid || stdLog.test_run_uuid) {
-            await (0, util_1.pushDataToQueue)({
-                event_type: 'LogCreated',
-                logs: [stdLog]
-            });
+            this.listener.logCreated([stdLog]);
         }
     }
     setCurrentHook(hookDetails) {
@@ -122,7 +119,7 @@ class _TestReporter extends reporter_1.default {
         if (testStats.fullTitle === '<unknown test>')
             return;
         testStats.end || (testStats.end = new Date());
-        await this.sendTestRunEvent(testStats, 'TestRunFinished');
+        this.listener.testFinished(await this.getRunData(testStats, 'TestRunFinished'));
     }
     async onTestStart(testStats) {
         if (!this.needToSendData('test', 'start'))
@@ -134,7 +131,7 @@ class _TestReporter extends reporter_1.default {
         _TestReporter._tests[testStats.fullTitle] = {
             uuid: uuid,
         };
-        await this.sendTestRunEvent(testStats, 'TestRunStarted');
+        this.listener.testStarted(await this.getRunData(testStats, 'TestRunStarted'));
     }
     async onHookStart(hookStats) {
         if (!this.needToSendData('hook', 'start')) {
@@ -147,7 +144,7 @@ class _TestReporter extends reporter_1.default {
             uuid: hookId,
             startedAt: (new Date()).toISOString()
         };
-        await this.sendTestRunEvent(hookStats, 'HookRunStarted');
+        this.listener.hookStarted(await this.getRunData(hookStats, 'HookRunStarted'));
     }
     async onHookEnd(hookStats) {
         if (!this.needToSendData('hook', 'end')) {
@@ -166,13 +163,13 @@ class _TestReporter extends reporter_1.default {
         if (!hookStats.state && !hookStats.error) {
             hookStats.state = 'passed';
         }
-        await this.sendTestRunEvent(hookStats, 'HookRunFinished');
+        this.listener.hookFinished(await this.getRunData(hookStats, 'HookRunFinished'));
     }
     getHookIdentifier(hookStats) {
         var _a;
         return `${hookStats.title} for ${(_a = this._suites.at(-1)) === null || _a === void 0 ? void 0 : _a.title}`;
     }
-    async sendTestRunEvent(testStats, eventType) {
+    async getRunData(testStats, eventType) {
         var _a, _b, _c, _d, _e, _f;
         const framework = (_a = this._config) === null || _a === void 0 ? void 0 : _a.framework;
         const scopes = this._suites.map(s => s.title);
@@ -231,20 +228,10 @@ class _TestReporter extends reporter_1.default {
         if (eventType == 'TestRunSkipped') {
             eventType = 'TestRunFinished';
         }
-        const uploadData = {
-            event_type: eventType,
-        };
         if (eventType.match(/HookRun/)) {
             testData.hook_type = ((_f = testData.name) === null || _f === void 0 ? void 0 : _f.toLowerCase()) ? (0, util_1.getHookType)(testData.name.toLowerCase()) : 'undefined';
-            uploadData.hook_run = testData;
-        }
-        else {
-            uploadData.test_run = testData;
-        }
-        const req = this._requestQueueHandler.add(uploadData);
-        if (req.proceed && req.data) {
-            await (0, util_1.uploadEventData)(req.data, req.url);
         }
+        return testData;
     }
     async onTestSkip(testStats) {
         // cucumber steps call this method. We don't want step skipped state so skip for cucumber
@@ -252,7 +239,7 @@ class _TestReporter extends reporter_1.default {
             return;
         testStats.start || (testStats.start = new Date());
         testStats.end || (testStats.end = new Date());
-        await this.sendTestRunEvent(testStats, 'TestRunSkipped');
+        this.listener.testFinished(await this.getRunData(testStats, 'TestRunSkipped'));
     }
 }
 _TestReporter._tests = {};

package/build/request-handler.d.ts

@@ -1,27 +1,19 @@
 import type { UploadType } from './types';
 export default class RequestQueueHandler {
     private queue;
-    private started;
     private pollEventBatchInterval?;
-    pendingUploads: number;
+    private readonly callback?;
     tearDownInvoked: boolean;
     static instance: RequestQueueHandler;
     private constructor();
-    static getInstance(): RequestQueueHandler;
-    start(): void;
-    add(event: UploadType): {
-        proceed: boolean;
-        data?: undefined;
-        url?: undefined;
-    } | {
-        proceed: boolean;
-        data: UploadType[] | undefined;
-        url: string;
-    };
+    static getInstance(callback?: Function): RequestQueueHandler;
+    add(event: UploadType): void;
     shutdown(): Promise<void>;
     startEventBatchPolling(): void;
     resetEventBatchPolling(): void;
     removeEventBatchPolling(tag: string): void;
+    sendBatch(): Promise<void>;
+    callCallback: (data: UploadType[], kind: string) => Promise<void>;
     shouldProceed(): boolean;
 }
 //# sourceMappingURL=request-handler.d.ts.map

package/build/request-handler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"request-handler.d.ts","sourceRoot":"","sources":["../src/request-handler.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,SAAS,CAAA;AAKzC,MAAM,CAAC,OAAO,OAAO,mBAAmB;IACpC,OAAO,CAAC,KAAK,CAAmB;IAChC,OAAO,CAAC,OAAO,CAAQ;IACvB,OAAO,CAAC,sBAAsB,CAAC,CAAgC;IACxD,cAAc,SAAI;IAClB,eAAe,UAAQ;IAE9B,MAAM,CAAC,QAAQ,EAAE,mBAAmB,CAAA;IAGpC,OAAO;WAGO,WAAW,IAAI,mBAAmB;IAOhD,KAAK;IAOL,GAAG,CAAE,KAAK,EAAE,UAAU;;;;;;;;;IAuChB,QAAQ;IAQd,sBAAsB;IAUtB,sBAAsB;IAKtB,uBAAuB,CAAE,GAAG,EAAE,MAAM;IAQpC,aAAa;CAOhB"}
+{"version":3,"file":"request-handler.d.ts","sourceRoot":"","sources":["../src/request-handler.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,SAAS,CAAA;AAKzC,MAAM,CAAC,OAAO,OAAO,mBAAmB;IACpC,OAAO,CAAC,KAAK,CAAmB;IAChC,OAAO,CAAC,sBAAsB,CAAC,CAAgC;IAC/D,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAU;IAC7B,eAAe,UAAQ;IAE9B,MAAM,CAAC,QAAQ,EAAE,mBAAmB,CAAA;IAGpC,OAAO;WAKO,WAAW,CAAC,QAAQ,CAAC,EAAE,QAAQ,GAAG,mBAAmB;IAOnE,GAAG,CAAE,KAAK,EAAE,UAAU;IAehB,QAAQ;IAQd,sBAAsB;IAItB,sBAAsB;IAKtB,uBAAuB,CAAE,GAAG,EAAE,MAAM;IAO9B,SAAS;IASf,YAAY,SAAgB,UAAU,EAAE,QAAQ,MAAM,mBAGrD;IAED,aAAa;CAOhB"}

package/build/request-handler.js

@@ -5,76 +5,48 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const logger_1 = __importDefault(require("@wdio/logger"));
 const constants_1 = require("./constants");
-const util_1 = require("./util");
+const bstackLogger_1 = require("./bstackLogger");
 const log = (0, logger_1.default)('@wdio/browserstack-service');
 class RequestQueueHandler {
     // making it private to use singleton pattern
-    constructor() {
+    constructor(callback) {
         this.queue = [];
-        this.started = false;
-        this.pendingUploads = 0;
         this.tearDownInvoked = false;
+        this.callCallback = async (data, kind) => {
+            bstackLogger_1.BStackLogger.debug('calling callback with kind ' + kind);
+            this.callback && await this.callback(data);
+        };
+        this.callback = callback;
+        this.startEventBatchPolling();
     }
-    static getInstance() {
-        if (!RequestQueueHandler.instance) {
-            RequestQueueHandler.instance = new RequestQueueHandler();
+    static getInstance(callback) {
+        if (!RequestQueueHandler.instance && callback) {
+            RequestQueueHandler.instance = new RequestQueueHandler(callback);
         }
         return RequestQueueHandler.instance;
     }
-    start() {
-        if (!this.started) {
-            this.started = true;
-            this.startEventBatchPolling();
-        }
-    }
     add(event) {
-        if (!process.env.BS_TESTOPS_BUILD_COMPLETED) {
-            return {
-                proceed: false
-            };
-        }
-        if (!constants_1.BATCH_EVENT_TYPES.includes(event.event_type)) {
-            return {
-                proceed: true
-            };
-        }
-        if (event.logs && event.logs[0] && event.logs[0].kind === 'TEST_SCREENSHOT') {
-            return {
-                proceed: true,
-                data: [event],
-                url: constants_1.DATA_SCREENSHOT_ENDPOINT
-            };
+        if (!process.env[constants_1.TESTOPS_BUILD_COMPLETED_ENV]) {
+            throw new Error('Observability build start not completed yet.');
         }
         this.queue.push(event);
-        log.debug(`Added data to request queue. Queue length = ${this.queue.length}`);
-        let data;
+        bstackLogger_1.BStackLogger.debug(`Added data to request queue. Queue length = ${this.queue.length}`);
         const shouldProceed = this.shouldProceed();
         if (shouldProceed) {
-            data = this.queue.splice(0, constants_1.DATA_BATCH_SIZE);
-            this.resetEventBatchPolling();
-            log.debug(`Sending data from request queue. Data length = ${data.length}, Queue length after removal = ${this.queue.length}`);
+            this.sendBatch().catch((e) => {
+                bstackLogger_1.BStackLogger.debug('Exception in sending batch: ' + e);
+            });
         }
-        return {
-            proceed: shouldProceed,
-            data: data,
-            url: constants_1.DATA_BATCH_ENDPOINT
-        };
     }
     async shutdown() {
         this.removeEventBatchPolling('Shutting down');
         while (this.queue.length > 0) {
             const data = this.queue.splice(0, constants_1.DATA_BATCH_SIZE);
-            await (0, util_1.batchAndPostEvents)(constants_1.DATA_BATCH_ENDPOINT, 'SHUTDOWN_QUEUE', data);
+            await this.callCallback(data, 'SHUTDOWN_QUEUE');
         }
     }
     startEventBatchPolling() {
-        this.pollEventBatchInterval = setInterval(async () => {
-            if (this.queue.length > 0) {
-                const data = this.queue.splice(0, constants_1.DATA_BATCH_SIZE);
-                log.debug(`Sending data from request queue. Data length = ${data.length}, Queue length after removal = ${this.queue.length}`);
-                await (0, util_1.batchAndPostEvents)(constants_1.DATA_BATCH_ENDPOINT, 'INTERVAL_QUEUE', data);
-            }
-        }, constants_1.DATA_BATCH_INTERVAL);
+        this.pollEventBatchInterval = setInterval(this.sendBatch.bind(this), constants_1.DATA_BATCH_INTERVAL);
     }
     resetEventBatchPolling() {
         this.removeEventBatchPolling('Resetting');
@@ -84,9 +56,16 @@ class RequestQueueHandler {
         if (this.pollEventBatchInterval) {
             log.debug(`${tag} request queue`);
             clearInterval(this.pollEventBatchInterval);
-            this.started = false;
         }
     }
+    async sendBatch() {
+        const data = this.queue.splice(0, constants_1.DATA_BATCH_SIZE);
+        if (data.length === 0) {
+            return;
+        }
+        bstackLogger_1.BStackLogger.debug(`Sending data from request queue. Data length = ${data.length}, Queue length after removal = ${this.queue.length}`);
+        await this.callCallback(data, 'INTERVAL_QUEUE');
+    }
     shouldProceed() {
         if (this.tearDownInvoked) {
             log.debug('Force request-queue shutdown, as test run event is received after teardown');

package/build/service.d.ts

@@ -20,6 +20,8 @@ export default class BrowserstackService implements Services.ServiceInstance {
     private _accessibility;
     private _accessibilityHandler?;
     private _turboScale;
+    private _percy;
+    private _percyHandler?;
     constructor(options: BrowserstackConfig & Options.Testrunner, _caps: Capabilities.RemoteCapability, _config: Options.Testrunner);
     _updateCaps(fn: (caps: Capabilities.Capabilities | Capabilities.DesiredCapabilities) => void): void;
     beforeSession(config: Omit<Options.Testrunner, 'capabilities'>): void;
@@ -58,5 +60,6 @@ export default class BrowserstackService implements Services.ServiceInstance {
     private _setSessionName;
     private _setAnnotation;
     private _executeCommand;
+    private saveWorkerData;
 }
 //# sourceMappingURL=service.d.ts.map

package/build/service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../src/service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../src/service.ts"],"names":[],"mappings":"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"}