@wdio/browserstack-service 7.35.0 → 7.37.0

package/build/launcher.js

@@ -36,7 +36,6 @@ 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"));
@@ -45,15 +44,19 @@ 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;
@@ -127,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));
@@ -136,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);
@@ -159,16 +164,9 @@ class BrowserstackLauncherService {
             PercyLogger_1.PercyLogger.error(`Error while setting best platform for Percy snapshot at worker start ${err}`);
         }
     }
-    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 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
@@ -316,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) {
@@ -334,6 +332,7 @@ class BrowserstackLauncherService {
             await this.stopPercy();
         }
         PercyLogger_1.PercyLogger.clearLogger();
+        await (0, funnelInstrumentation_1.sendFinish)(this.browserStackConfig);
         if (!this.browserstackLocal || !this.browserstackLocal.isRunning()) {
             return;
         }
@@ -402,8 +401,10 @@ class BrowserstackLauncherService {
     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,20 +1,22 @@
 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 _userCaps?;
+    private listener;
     onRunnerStart(runnerStats: RunnerStats): Promise<void>;
     registerListeners(): void;
+    private getUserCaps;
     appendTestItemLog(stdLog: StdLog): Promise<void>;
     setCurrentHook(hookDetails: CurrentRunInfo): void;
     configureGit(): Promise<void>;
@@ -27,7 +29,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;AAa7F,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,SAAS,CAAC,CAAoC;IACtD,OAAO,CAAC,QAAQ,CAAyB;IAEnC,aAAa,CAAE,WAAW,EAAE,WAAW;IAU7C,iBAAiB;IAQjB,OAAO,CAAC,WAAW;IAIN,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;IAyE5D,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,21 +9,23 @@ 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._userCaps = {};
+        this.listener = listener_1.default.getInstance();
     }
     async onRunnerStart(runnerStats) {
         this._capabilities = runnerStats.capabilities;
+        this._userCaps = this.getUserCaps(runnerStats);
         this._config = runnerStats.config;
         this._sessionId = runnerStats.sessionId;
         if (typeof this._config.testObservability !== 'undefined')
@@ -39,6 +41,10 @@ class _TestReporter extends reporter_1.default {
         process.removeAllListeners(`bs:addLog:${process.pid}`);
         process.on(`bs:addLog:${process.pid}`, this.appendTestItemLog.bind(this));
     }
+    getUserCaps(runnerStats) {
+        var _a;
+        return (_a = runnerStats.instanceOptions[runnerStats.sessionId]) === null || _a === void 0 ? void 0 : _a.capabilities;
+    }
     async appendTestItemLog(stdLog) {
         if (this._currentHook.uuid && !this._currentHook.finished) {
             stdLog.hook_run_uuid = this._currentHook.uuid;
@@ -47,10 +53,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 +125,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 +137,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 +150,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 +169,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);
@@ -214,6 +217,7 @@ class _TestReporter extends reporter_1.default {
                 browser: (_c = this._capabilities) === null || _c === void 0 ? void 0 : _c.browserName,
                 browser_version: (_d = this._capabilities) === null || _d === void 0 ? void 0 : _d.browserVersion,
                 platform: (_e = this._capabilities) === null || _e === void 0 ? void 0 : _e.platformName,
+                platform_version: (0, util_1.getPlatformVersion)(this._userCaps)
             };
         }
         if (eventType == 'TestRunFinished' || eventType == 'HookRunFinished') {
@@ -231,20 +235,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 +246,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/scripts/accessibility-scripts.d.ts

@@ -0,0 +1,26 @@
+declare class AccessibilityScripts {
+    private static instance;
+    performScan: string | null;
+    getResults: string | null;
+    getResultsSummary: string | null;
+    saveTestResults: string | null;
+    commandsToWrap: Array<any> | null;
+    browserstackFolderPath: string;
+    commandsPath: string;
+    private constructor();
+    static checkAndGetInstance(): AccessibilityScripts;
+    readFromExistingFile(): void;
+    update(data: {
+        commands: [any];
+        scripts: {
+            scan: null;
+            getResults: null;
+            getResultsSummary: null;
+            saveResults: null;
+        };
+    }): void;
+    store(): void;
+}
+declare const _default: AccessibilityScripts;
+export default _default;
+//# sourceMappingURL=accessibility-scripts.d.ts.map

package/build/scripts/accessibility-scripts.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"accessibility-scripts.d.ts","sourceRoot":"","sources":["../../src/scripts/accessibility-scripts.ts"],"names":[],"mappings":"AAIA,cAAM,oBAAoB;IACtB,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAoC;IAEpD,WAAW,EAAE,MAAM,GAAG,IAAI,CAAO;IACjC,UAAU,EAAE,MAAM,GAAG,IAAI,CAAO;IAChC,iBAAiB,EAAE,MAAM,GAAG,IAAI,CAAO;IACvC,eAAe,EAAE,MAAM,GAAG,IAAI,CAAO;IACrC,cAAc,EAAE,KAAK,CAAC,GAAG,CAAC,GAAG,IAAI,CAAO;IAExC,sBAAsB,SAA2C;IACjE,YAAY,SAA0D;IAG7E,OAAO;WAEO,mBAAmB;IAQ1B,oBAAoB;IAapB,MAAM,CAAC,IAAI,EAAE;QAAE,QAAQ,EAAE,CAAC,GAAG,CAAC,CAAC;QAAC,OAAO,EAAE;YAAE,IAAI,EAAE,IAAI,CAAC;YAAC,UAAU,EAAE,IAAI,CAAC;YAAC,iBAAiB,EAAE,IAAI,CAAC;YAAC,WAAW,EAAE,IAAI,CAAC;SAAE,CAAC;KAAE;IAYzH,KAAK;CAef;;AAED,wBAAyD"}

package/build/scripts/accessibility-scripts.js

@@ -0,0 +1,67 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const path_1 = __importDefault(require("path"));
+const fs_1 = __importDefault(require("fs"));
+const os_1 = __importDefault(require("os"));
+class AccessibilityScripts {
+    // don't allow to create instances from it other than through `checkAndGetInstance`
+    constructor() {
+        this.performScan = null;
+        this.getResults = null;
+        this.getResultsSummary = null;
+        this.saveTestResults = null;
+        this.commandsToWrap = null;
+        this.browserstackFolderPath = path_1.default.join(os_1.default.homedir(), '.browserstack');
+        this.commandsPath = path_1.default.join(this.browserstackFolderPath, 'commands.json');
+    }
+    static checkAndGetInstance() {
+        if (!AccessibilityScripts.instance) {
+            AccessibilityScripts.instance = new AccessibilityScripts();
+            AccessibilityScripts.instance.readFromExistingFile();
+        }
+        return AccessibilityScripts.instance;
+    }
+    readFromExistingFile() {
+        try {
+            if (fs_1.default.existsSync(this.commandsPath)) {
+                const data = fs_1.default.readFileSync(this.commandsPath, 'utf8');
+                if (data) {
+                    this.update(JSON.parse(data));
+                }
+            }
+        }
+        catch (error) {
+            /* Do nothing */
+        }
+    }
+    update(data) {
+        if (data.scripts) {
+            this.performScan = data.scripts.scan;
+            this.getResults = data.scripts.getResults;
+            this.getResultsSummary = data.scripts.getResultsSummary;
+            this.saveTestResults = data.scripts.saveResults;
+        }
+        if (data.commands && data.commands.length) {
+            this.commandsToWrap = data.commands;
+        }
+    }
+    store() {
+        if (!fs_1.default.existsSync(this.browserstackFolderPath)) {
+            fs_1.default.mkdirSync(this.browserstackFolderPath);
+        }
+        fs_1.default.writeFileSync(this.commandsPath, JSON.stringify({
+            commands: this.commandsToWrap,
+            scripts: {
+                scan: this.performScan,
+                getResults: this.getResults,
+                getResultsSummary: this.getResultsSummary,
+                saveResults: this.saveTestResults,
+            }
+        }));
+    }
+}
+AccessibilityScripts.instance = null;
+exports.default = AccessibilityScripts.checkAndGetInstance();

package/build/service.d.ts

@@ -60,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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"}

package/build/service.js

@@ -13,6 +13,9 @@ const reporter_1 = __importDefault(require("./reporter"));
 const performance_tester_1 = __importDefault(require("./performance-tester"));
 const accessibility_handler_1 = __importDefault(require("./accessibility-handler"));
 const Percy_Handler_1 = __importDefault(require("./Percy/Percy-Handler"));
+const listener_1 = __importDefault(require("./testOps/listener"));
+const data_store_1 = require("./data-store");
+const usageStats_1 = __importDefault(require("./testOps/usageStats"));
 const log = (0, logger_1.default)('@wdio/browserstack-service');
 class BrowserstackService {
     constructor(options, _caps, _config) {
@@ -33,7 +36,7 @@ class BrowserstackService {
         this._turboScale = this._options.turboScale;
         if (this._observability) {
             (_a = this._config.reporters) === null || _a === void 0 ? void 0 : _a.push(reporter_1.default);
-            if (process.env.BROWSERSTACK_O11Y_PERF_MEASUREMENT) {
+            if (process.env[constants_1.PERF_MEASUREMENT_ENV]) {
                 performance_tester_1.default.startMonitoring('performance-report-service.csv');
             }
         }
@@ -90,9 +93,18 @@ class BrowserstackService {
             try {
                 if (this._observability) {
                     (0, util_1.patchConsoleLogs)();
-                    this._insightsHandler = new insights_handler_1.default(this._browser, this._browser.capabilities, this._isAppAutomate(), this._browser.sessionId, this._config.framework);
+                    this._insightsHandler = new insights_handler_1.default(this._browser, this._browser.capabilities, this._isAppAutomate(), this._browser.sessionId, this._config.framework, this._caps);
                     await this._insightsHandler.before();
                 }
+                if (this._browser && (0, util_1.isBrowserstackSession)(this._browser)) {
+                    try {
+                        this._accessibilityHandler = new accessibility_handler_1.default(this._browser, this._caps, this._isAppAutomate(), this._config.framework, this._accessibility, this._options.accessibilityOptions);
+                        await this._accessibilityHandler.before(this._browser.sessionId);
+                    }
+                    catch (err) {
+                        log.error(`[Accessibility Test Run] Error in service class before function: ${err}`);
+                    }
+                }
                 /**
                  * register command event
                  */
@@ -121,15 +133,6 @@ class BrowserstackService {
                 }
             }
         }
-        if (this._browser && (0, util_1.isBrowserstackSession)(this._browser)) {
-            try {
-                this._accessibilityHandler = new accessibility_handler_1.default(this._browser, this._caps, this._isAppAutomate(), this._config.framework, this._accessibility, this._options.accessibilityOptions);
-                await this._accessibilityHandler.before();
-            }
-            catch (err) {
-                log.error(`[Accessibility Test Run] Error in service class before function: ${err}`);
-            }
-        }
         return await this._printSessionURL();
     }
     /**
@@ -189,7 +192,7 @@ class BrowserstackService {
         await ((_c = this._accessibilityHandler) === null || _c === void 0 ? void 0 : _c.afterTest(this._suiteTitle, test));
     }
     async after(result) {
-        var _a, _b, _c;
+        var _a;
         const { preferScenarioName, setSessionName, setSessionStatus } = this._options;
         // For Cucumber: Checks scenarios that ran (i.e. not skipped) on the session
         // Only 1 Scenario ran and option enabled => Redefine session name to Scenario's name
@@ -204,10 +207,10 @@ class BrowserstackService {
                 ...(hasReasons ? { reason: this._failReasons.join('\n') } : {})
             });
         }
-        await ((_a = this._insightsHandler) === null || _a === void 0 ? void 0 : _a.uploadPending());
-        await ((_b = this._insightsHandler) === null || _b === void 0 ? void 0 : _b.teardown());
-        await ((_c = this._percyHandler) === null || _c === void 0 ? void 0 : _c.teardown());
-        if (process.env.BROWSERSTACK_O11Y_PERF_MEASUREMENT) {
+        await listener_1.default.getInstance().onWorkerEnd();
+        await ((_a = this._percyHandler) === null || _a === void 0 ? void 0 : _a.teardown());
+        this.saveWorkerData();
+        if (process.env[constants_1.PERF_MEASUREMENT_ENV]) {
             await performance_tester_1.default.stopAndGenerate('performance-service.html');
             performance_tester_1.default.calculateTimes([
                 'onRunnerStart', 'onSuiteStart', 'onSuiteEnd',
@@ -408,5 +411,10 @@ class BrowserstackService {
         }
         return (await this._browser.execute(script));
     }
+    saveWorkerData() {
+        (0, data_store_1.saveWorkerData)({
+            usageStats: usageStats_1.default.getInstance().getDataToSave()
+        });
+    }
 }
 exports.default = BrowserstackService;