@wdio/browserstack-service 7.35.0 → 7.36.0

package/build/insights-handler.js

@@ -8,7 +8,7 @@ const logger_1 = __importDefault(require("@wdio/logger"));
 const uuid_1 = require("uuid");
 const reporter_1 = __importDefault(require("./reporter"));
 const util_1 = require("./util");
-const request_handler_1 = __importDefault(require("./request-handler"));
+const listener_1 = __importDefault(require("./testOps/listener"));
 const constants_1 = require("./constants");
 const log = (0, logger_1.default)('@wdio/browserstack-service');
 class _InsightsHandler {
@@ -18,7 +18,6 @@ class _InsightsHandler {
         this._tests = {};
         this._hooks = {};
         this._commands = {};
-        this._requestQueueHandler = request_handler_1.default.getInstance();
         this._currentTest = {};
         this._currentHook = {};
         this._cucumberData = {
@@ -26,6 +25,7 @@ class _InsightsHandler {
             scenariosStarted: false,
             steps: []
         };
+        this.listener = listener_1.default.getInstance();
         this.appendTestItemLog = async (stdLog) => {
             try {
                 if (this._currentHook.uuid && !this._currentHook.finished && (this._framework === 'mocha' || this._framework === 'cucumber')) {
@@ -35,17 +35,13 @@ class _InsightsHandler {
                     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]);
                 }
             }
             catch (error) {
                 log.debug(`Exception in uploading log data to Observability with error : ${error}`);
             }
         };
-        this._requestQueueHandler.start();
         this._platformMeta = {
             browserName: browserCaps === null || browserCaps === void 0 ? void 0 : browserCaps.browserName,
             browserVersion: browserCaps === null || browserCaps === void 0 ? void 0 : browserCaps.browserVersion,
@@ -90,7 +86,7 @@ class _InsightsHandler {
         };
         this.setCurrentHook({ uuid: hookUUID });
         this.attachHookData(context, hookUUID);
-        await this.sendTestRunEvent(test, 'HookRunStarted');
+        this.listener.hookStarted(this.getRunData(test, 'HookRunStarted'));
     }
     async afterHook(test, result) {
         if (!(0, util_1.frameworkSupportsHook)('after', this._framework)) {
@@ -111,7 +107,7 @@ class _InsightsHandler {
             };
         }
         this.setCurrentHook({ uuid: this._tests[fullTitle].uuid, finished: true });
-        await this.sendTestRunEvent(test, 'HookRunFinished', result);
+        this.listener.hookFinished(this.getRunData(test, 'HookRunFinished', result));
         const hookType = (0, util_1.getHookType)(test.title);
         /*
             If any of the `beforeAll`, `beforeEach`, `afterEach` then the tests after the hook won't run in mocha (https://github.com/mochajs/mocha/issues/4392)
@@ -128,7 +124,7 @@ class _InsightsHandler {
                         startedAt: (new Date()).toISOString(),
                         finishedAt: (new Date()).toISOString()
                     };
-                    await this.sendTestRunEvent(skippedTest, 'TestRunSkipped');
+                    this.listener.testFinished(this.getRunData(skippedTest, 'TestRunSkipped'));
                 }
             };
             /*
@@ -157,7 +153,7 @@ class _InsightsHandler {
             uuid: uuid,
             startedAt: (new Date()).toISOString()
         };
-        await this.sendTestRunEvent(test, 'TestRunStarted');
+        this.listener.testStarted(this.getRunData(test, 'TestRunStarted'));
     }
     async afterTest(test, result) {
         if (this._framework !== 'mocha')
@@ -167,7 +163,7 @@ class _InsightsHandler {
             ...(this._tests[fullTitle] || {}),
             finishedAt: (new Date()).toISOString()
         };
-        await this.sendTestRunEvent(test, 'TestRunFinished', result);
+        this.listener.testFinished(this.getRunData(test, 'TestRunFinished', result));
     }
     /**
       * Cucumber Only
@@ -206,11 +202,11 @@ class _InsightsHandler {
             };
         }
         this._tests[uniqueId] = testMetaData;
-        await this.sendTestRunEventForCucumber(world, 'TestRunStarted');
+        this.listener.testStarted(this.getTestRunDataForCucumber(world, 'TestRunStarted'));
     }
     async afterScenario(world) {
         this._cucumberData.scenario = undefined;
-        await this.sendTestRunEventForCucumber(world, 'TestRunFinished');
+        this.listener.testFinished(this.getTestRunDataForCucumber(world, 'TestRunFinished'));
     }
     async beforeStep(step, scenario) {
         var _a;
@@ -286,7 +282,7 @@ class _InsightsHandler {
                 };
             }),
         };
-        await this.sendTestRunEventForCucumber(null, 'TestRunSkipped', testMetaData);
+        this.listener.testFinished(this.getTestRunDataForCucumber(null, 'TestRunSkipped', testMetaData));
     }
     async processCucumberHook(test, params, result) {
         const hookType = this.getCucumberHookType(test);
@@ -307,12 +303,12 @@ class _InsightsHandler {
                 hookType: hookType
             };
             this._tests[hookId] = hookMetaData;
-            await this.sendHookRunEvent(hookMetaData, 'HookRunStarted');
+            this.listener.hookStarted(this.getHookRunDataForCucumber(hookMetaData, 'HookRunStarted'));
         }
         else {
             this._tests[hookId].finishedAt = (new Date()).toISOString();
             this.setCurrentHook({ uuid: this._tests[hookId].uuid, finished: true });
-            await this.sendHookRunEvent(this._tests[hookId], 'HookRunFinished', result);
+            this.listener.hookFinished(this.getHookRunDataForCucumber(this._tests[hookId], 'HookRunFinished', result));
             if (hookType === 'BEFORE_ALL' && result && !result.passed) {
                 const { feature, uri } = this._cucumberData;
                 if (!feature) {
@@ -333,21 +329,6 @@ class _InsightsHandler {
             }
         }
     }
-    //@ts-ignore
-    async uploadPending(waitTimeout = constants_1.DEFAULT_WAIT_TIMEOUT_FOR_PENDING_UPLOADS, waitInterval = constants_1.DEFAULT_WAIT_INTERVAL_FOR_PENDING_UPLOADS) {
-        if (this._requestQueueHandler.pendingUploads <= 0 || waitTimeout <= 0) {
-            return;
-        }
-        await (0, util_1.sleep)(waitInterval);
-        return this.uploadPending(waitTimeout - waitInterval);
-    }
-    async teardown() {
-        this._requestQueueHandler.tearDownInvoked = true;
-        await this._requestQueueHandler.shutdown();
-    }
-    /**
-     * misc methods
-     */
     async browserCommand(commandType, args, test) {
         if (commandType === 'client:beforeCommand') {
             this._commands[`${args.sessionId}_${args.method}_${args.endpoint}`] = args;
@@ -362,16 +343,13 @@ class _InsightsHandler {
             return;
         }
         // log screenshot
-        if (Boolean(process.env.BS_TESTOPS_ALLOW_SCREENSHOTS) && (0, util_1.isScreenshotCommand)(args) && args.result.value) {
-            await (0, util_1.uploadEventData)([{
-                    event_type: 'LogCreated',
-                    logs: [{
-                            test_run_uuid: testMeta.uuid,
-                            timestamp: new Date().toISOString(),
-                            message: args.result.value,
-                            kind: 'TEST_SCREENSHOT'
-                        }]
-                }], constants_1.DATA_SCREENSHOT_ENDPOINT);
+        if (Boolean(process.env[constants_1.TESTOPS_SCREENSHOT_ENV]) && (0, util_1.isScreenshotCommand)(args) && args.result.value) {
+            await this.listener.onScreenshot([{
+                    test_run_uuid: testMeta.uuid,
+                    timestamp: new Date().toISOString(),
+                    message: args.result.value,
+                    kind: 'TEST_SCREENSHOT'
+                }]);
         }
         const dataKey = `${args.sessionId}_${args.method}_${args.endpoint}`;
         const requestData = this._commands[dataKey];
@@ -379,32 +357,17 @@ class _InsightsHandler {
             return;
         }
         // log http request
-        const req = this._requestQueueHandler.add({
-            event_type: 'LogCreated',
-            logs: [{
-                    test_run_uuid: testMeta.uuid,
-                    timestamp: new Date().toISOString(),
-                    kind: 'HTTP',
-                    http_response: {
-                        path: requestData.endpoint,
-                        method: requestData.method,
-                        body: requestData.body,
-                        response: args.result
-                    }
-                }]
-        });
-        if (req.proceed && req.data) {
-            await (0, util_1.uploadEventData)(req.data, req.url);
-        }
-    }
-    /*
-     * private methods
-     */
-    async sendData(data) {
-        const req = this._requestQueueHandler.add(data);
-        if (req.proceed && req.data) {
-            await (0, util_1.uploadEventData)(req.data, req.url);
-        }
+        this.listener.logCreated([{
+                test_run_uuid: testMeta.uuid,
+                timestamp: new Date().toISOString(),
+                kind: 'HTTP',
+                http_response: {
+                    path: requestData.endpoint,
+                    method: requestData.method,
+                    body: requestData.body,
+                    response: args.result
+                }
+            }]);
     }
     attachHookData(context, hookId) {
         if (context.currentTest && context.currentTest.parent) {
@@ -542,7 +505,7 @@ class _InsightsHandler {
         }
         return;
     }
-    async sendTestRunEvent(test, eventType, results) {
+    getRunData(test, eventType, results) {
         var _a;
         const fullTitle = (0, util_1.getUniqueIdentifier)(test, this._framework);
         const testMetaData = this._tests[fullTitle];
@@ -595,24 +558,14 @@ class _InsightsHandler {
             testData.result = 'skipped';
             eventType = 'TestRunFinished';
         }
-        const uploadData = {
-            event_type: eventType,
-        };
         /* istanbul ignore if */
         if (eventType.match(/HookRun/)) {
             testData.hook_type = ((_a = testData.name) === null || _a === void 0 ? void 0 : _a.toLowerCase()) ? (0, util_1.getHookType)(testData.name.toLowerCase()) : 'undefined';
             testData.test_run_id = this.getTestRunId(test.ctx);
-            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 sendTestRunEventForCucumber(worldObj, eventType, testMetaData = null) {
+    getTestRunDataForCucumber(worldObj, eventType, testMetaData = null) {
         const world = worldObj;
         const dataHub = testMetaData ? testMetaData : (this._tests[(0, util_1.getUniqueIdentifierForCucumber)(world)] || {});
         const { feature, scenario, steps, uuid, startedAt, finishedAt } = dataHub;
@@ -686,18 +639,10 @@ class _InsightsHandler {
         }
         if (eventType === 'TestRunSkipped') {
             testData.result = 'skipped';
-            eventType = 'TestRunFinished';
-        }
-        const uploadData = {
-            event_type: eventType,
-            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 sendHookRunEvent(hookData, eventType, result) {
+    getHookRunDataForCucumber(hookData, eventType, result) {
         const { uri, feature } = this._cucumberData;
         const testData = {
             uuid: hookData.uuid,
@@ -734,24 +679,18 @@ class _InsightsHandler {
                 testData.integrations[provider] = this.getIntegrationsObject();
             }
         }
-        const uploadData = {
-            event_type: eventType,
-            hook_run: testData
-        };
-        const req = this._requestQueueHandler.add(uploadData);
-        if (req.proceed && req.data) {
-            await (0, util_1.uploadEventData)(req.data, req.url);
-        }
+        return testData;
     }
     getIntegrationsObject() {
-        var _a, _b, _c, _d, _e, _f;
+        var _a, _b;
+        const browserCaps = this._browser.capabilities;
         return {
-            capabilities: (_a = this._platformMeta) === null || _a === void 0 ? void 0 : _a.caps,
-            session_id: (_b = this._platformMeta) === null || _b === void 0 ? void 0 : _b.sessionId,
-            browser: (_c = this._platformMeta) === null || _c === void 0 ? void 0 : _c.browserName,
-            browser_version: (_d = this._platformMeta) === null || _d === void 0 ? void 0 : _d.browserVersion,
-            platform: (_e = this._platformMeta) === null || _e === void 0 ? void 0 : _e.platformName,
-            product: (_f = this._platformMeta) === null || _f === void 0 ? void 0 : _f.product
+            capabilities: browserCaps,
+            session_id: (_a = this._browser) === null || _a === void 0 ? void 0 : _a.sessionId,
+            browser: browserCaps === null || browserCaps === void 0 ? void 0 : browserCaps.browserName,
+            browser_version: browserCaps === null || browserCaps === void 0 ? void 0 : browserCaps.browserVersion,
+            platform: browserCaps === null || browserCaps === void 0 ? void 0 : browserCaps.platformName,
+            product: (_b = this._platformMeta) === null || _b === void 0 ? void 0 : _b.product
         };
     }
     getIdentifier(test) {

package/build/instrumentation/funnelInstrumentation.d.ts

@@ -0,0 +1,6 @@
+import type BrowserStackConfig from '../config';
+export declare function sendStart(config: BrowserStackConfig): Promise<void>;
+export declare function sendFinish(config: BrowserStackConfig): Promise<void>;
+export declare function saveFunnelData(eventType: string, config: BrowserStackConfig): string;
+export declare function fireFunnelRequest(data: any): Promise<void>;
+//# sourceMappingURL=funnelInstrumentation.d.ts.map

package/build/instrumentation/funnelInstrumentation.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"funnelInstrumentation.d.ts","sourceRoot":"","sources":["../../src/instrumentation/funnelInstrumentation.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,kBAAkB,MAAM,WAAW,CAAA;AAsB/C,wBAAsB,SAAS,CAAC,MAAM,EAAE,kBAAkB,iBAEzD;AAED,wBAAsB,UAAU,CAAC,MAAM,EAAE,kBAAkB,iBAE1D;AAED,wBAAgB,cAAc,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,kBAAkB,GAAG,MAAM,CAOpF;AAGD,wBAAsB,iBAAiB,CAAC,IAAI,EAAE,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC,CAOhE"}

package/build/instrumentation/funnelInstrumentation.js

@@ -0,0 +1,127 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.fireFunnelRequest = exports.saveFunnelData = exports.sendFinish = exports.sendStart = void 0;
+const node_os_1 = __importDefault(require("node:os"));
+const node_util_1 = __importDefault(require("node:util"));
+const node_path_1 = __importDefault(require("node:path"));
+const node_fs_1 = __importDefault(require("node:fs"));
+const got_1 = __importDefault(require("got"));
+const usageStats_1 = __importDefault(require("../testOps/usageStats"));
+const bstackLogger_1 = require("../bstackLogger");
+const constants_1 = require("../constants");
+const data_store_1 = require("../data-store");
+async function fireFunnelTestEvent(eventType, config) {
+    if (!config.userName || !config.accessKey) {
+        bstackLogger_1.BStackLogger.debug('username/accesskey not passed');
+        return;
+    }
+    try {
+        const data = buildEventData(eventType, config);
+        await fireFunnelRequest(data);
+        bstackLogger_1.BStackLogger.debug('Funnel event success');
+        if (eventType === 'SDKTestSuccessful') {
+            config.sentFunnelData();
+        }
+    }
+    catch (error) {
+        bstackLogger_1.BStackLogger.debug('Exception in sending funnel data: ' + error);
+    }
+}
+async function sendStart(config) {
+    await fireFunnelTestEvent('SDKTestAttempted', config);
+}
+exports.sendStart = sendStart;
+async function sendFinish(config) {
+    await fireFunnelTestEvent('SDKTestSuccessful', config);
+}
+exports.sendFinish = sendFinish;
+function saveFunnelData(eventType, config) {
+    const data = buildEventData(eventType, config);
+    bstackLogger_1.BStackLogger.ensureLogsFolder();
+    const filePath = node_path_1.default.join(bstackLogger_1.BStackLogger.logFolderPath, 'funnelData.json');
+    node_fs_1.default.writeFileSync(filePath, JSON.stringify(data));
+    return filePath;
+}
+exports.saveFunnelData = saveFunnelData;
+// Called from two different process
+async function fireFunnelRequest(data) {
+    bstackLogger_1.BStackLogger.debug('Sending SDK event with data ' + node_util_1.default.inspect(data, { depth: 6 }));
+    await got_1.default.post(constants_1.FUNNEL_INSTRUMENTATION_URL, {
+        headers: {
+            'content-type': 'application/json'
+        }, username: data.userName, password: data.accessKey, json: data
+    });
+}
+exports.fireFunnelRequest = fireFunnelRequest;
+function getProductList(config) {
+    const products = [];
+    if (config.testObservability.enabled) {
+        products.push('observability');
+    }
+    if (config.accessibility) {
+        products.push('accessibility');
+    }
+    if (config.percy) {
+        products.push('percy');
+    }
+    if (config.automate) {
+        products.push('automate');
+    }
+    if (config.appAutomate) {
+        products.push('app-automate');
+    }
+    return products;
+}
+function getProductMap(config) {
+    return {
+        'observability': config.testObservability.enabled,
+        'accessibility': config.accessibility,
+        'percy': config.percy,
+        'automate': config.automate,
+        'app_automate': config.appAutomate
+    };
+}
+function buildEventData(eventType, config) {
+    const eventProperties = {
+        // Framework Details
+        language_framework: getLanguageFramework(config.framework),
+        referrer: getReferrer(config.framework),
+        language: 'WebdriverIO',
+        languageVersion: process.version,
+        // Build Details
+        buildName: config.buildName || 'undefined',
+        buildIdentifier: String(config.buildIdentifier),
+        // Host details
+        os: node_os_1.default.type() || 'unknown',
+        hostname: node_os_1.default.hostname() || 'unknown',
+        // Product Details
+        productMap: getProductMap(config),
+        product: getProductList(config),
+    };
+    if (eventType === 'SDKTestSuccessful') {
+        const workerData = (0, data_store_1.getDataFromWorkers)();
+        eventProperties.productUsage = getProductUsage(workerData);
+    }
+    return {
+        userName: config.userName,
+        accessKey: config.accessKey,
+        event_type: eventType,
+        detectedFramework: 'WebdriverIO-' + config.framework,
+        event_properties: eventProperties
+    };
+}
+function getProductUsage(workersData) {
+    return {
+        testObservability: usageStats_1.default.getInstance().getFormattedData(workersData)
+    };
+}
+function getLanguageFramework(framework) {
+    return 'WebdriverIO_' + framework;
+}
+function getReferrer(framework) {
+    const fullName = framework ? 'WebdriverIO-' + framework : 'WebdriverIO';
+    return `${fullName}/${constants_1.BSTACK_SERVICE_VERSION}`;
+}

package/build/launcher.d.ts

@@ -16,10 +16,9 @@ export default class BrowserstackLauncherService implements Services.ServiceInst
     private _accessibilityAutomation?;
     private _percy?;
     private _percyBestPlatformCaps?;
-    _testOpsBuildStopped?: boolean;
+    private readonly browserStackConfig;
     constructor(_options: BrowserstackConfig & Options.Testrunner, capabilities: Capabilities.RemoteCapability, _config: Options.Testrunner);
     onWorkerStart(cid: any, caps: any): Promise<void>;
-    setupExitHandlers(): 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>;

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;AAOlE,OAAO,KAAK,EAAE,GAAG,EAAE,SAAS,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,UAAU,EAAE,MAAM,SAAS,CAAA;AAqBhG,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;IAC1D,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;IAgGjC,aAAa,CAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG;IAaxC,iBAAiB;IAUX,SAAS,CAAE,MAAM,CAAC,EAAE,OAAO,CAAC,UAAU,EAAE,YAAY,CAAC,EAAE,YAAY,CAAC,kBAAkB;IAwJtF,UAAU;IAmEV,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;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,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,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"}