@wdio/browserstack-service 8.32.4 → 8.33.0

package/build/reporter.js

@@ -2,16 +2,15 @@ import path from 'node:path';
 import WDIOReporter from '@wdio/reporter';
 import * as url from 'node:url';
 import { v4 as uuidv4 } from 'uuid';
-import { getCloudProvider, uploadEventData, o11yClassErrorHandler, getGitMetaData, removeAnsiColors, getHookType, pushDataToQueue, getPlatformVersion } from './util.js';
-import RequestQueueHandler from './request-handler.js';
+import { getCloudProvider, o11yClassErrorHandler, getGitMetaData, removeAnsiColors, getHookType, getPlatformVersion } from './util.js';
 import { BStackLogger } from './bstackLogger.js';
+import Listener from './testOps/listener.js';
 class _TestReporter extends WDIOReporter {
     _capabilities = {};
     _config;
     _observability = true;
     _sessionId;
     _suiteName;
-    _requestQueueHandler = RequestQueueHandler.getInstance();
     _suites = [];
     static _tests = {};
     _gitConfigPath;
@@ -19,6 +18,7 @@ class _TestReporter extends WDIOReporter {
     _currentHook = {};
     _currentTest = {};
     _userCaps = {};
+    listener = Listener.getInstance();
     async onRunnerStart(runnerStats) {
         this._capabilities = runnerStats.capabilities;
         this._userCaps = this.getUserCaps(runnerStats);
@@ -48,10 +48,7 @@ class _TestReporter extends WDIOReporter {
             stdLog.test_run_uuid = this._currentTest.uuid;
         }
         if (stdLog.hook_run_uuid || stdLog.test_run_uuid) {
-            await pushDataToQueue({
-                event_type: 'LogCreated',
-                logs: [stdLog]
-            });
+            this.listener.logCreated([stdLog]);
         }
     }
     setCurrentHook(hookDetails) {
@@ -124,7 +121,7 @@ class _TestReporter extends WDIOReporter {
             return;
         }
         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')) {
@@ -138,7 +135,7 @@ class _TestReporter extends WDIOReporter {
         _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')) {
@@ -151,7 +148,7 @@ class _TestReporter extends WDIOReporter {
             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')) {
@@ -170,7 +167,7 @@ class _TestReporter extends WDIOReporter {
         if (!hookStats.state && !hookStats.error) {
             hookStats.state = 'passed';
         }
-        await this.sendTestRunEvent(hookStats, 'HookRunFinished');
+        this.listener.hookFinished(await this.getRunData(hookStats, 'HookRunFinished'));
     }
     getHookIdentifier(hookStats) {
         return `${hookStats.title} for ${this._suites.at(-1)?.title}`;
@@ -182,9 +179,9 @@ class _TestReporter extends WDIOReporter {
         }
         testStats.start ||= new Date();
         testStats.end ||= new Date();
-        await this.sendTestRunEvent(testStats, 'TestRunSkipped');
+        this.listener.testFinished(await this.getRunData(testStats, 'TestRunSkipped'));
     }
-    async sendTestRunEvent(testStats, eventType) {
+    async getRunData(testStats, eventType) {
         const framework = this._config?.framework;
         const scopes = this._suites.map(s => s.title);
         const identifier = testStats.type === 'test' ? testStats.fullTitle : this.getHookIdentifier(testStats);
@@ -240,23 +237,10 @@ class _TestReporter extends WDIOReporter {
                 }
             }
         }
-        if (eventType === 'TestRunSkipped') {
-            eventType = 'TestRunFinished';
-        }
-        const uploadData = {
-            event_type: eventType,
-        };
         if (eventType.match(/HookRun/)) {
             testData.hook_type = testData.name?.toLowerCase() ? 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 uploadEventData(req.data, req.url);
         }
+        return testData;
     }
 }
 // https://github.com/microsoft/TypeScript/issues/6543

package/build/request-handler.d.ts

@@ -1,25 +1,17 @@
 import type { UploadType } from './types.js';
 export default class RequestQueueHandler {
     private queue;
-    private started;
     private pollEventBatchInterval?;
-    pendingUploads: number;
+    private readonly callback?;
     static 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;
+    sendBatch(): Promise<void>;
+    callCallback: (data: UploadType[], kind: string) => Promise<void>;
     resetEventBatchPolling(): void;
     removeEventBatchPolling(tag: string): void;
     shouldProceed(): boolean;

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

@@ -1 +1 @@
-{"version":3,"file":"request-handler.d.ts","sourceRoot":"","sources":["../src/request-handler.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,YAAY,CAAA;AAI5C,MAAM,CAAC,OAAO,OAAO,mBAAmB;IACpC,OAAO,CAAC,KAAK,CAAmB;IAChC,OAAO,CAAC,OAAO,CAAQ;IACvB,OAAO,CAAC,sBAAsB,CAAC,CAAgC;IACxD,cAAc,SAAI;IACzB,OAAc,eAAe,UAAQ;IAErC,MAAM,CAAC,QAAQ,EAAE,mBAAmB,CAAA;IAGpC,OAAO;WAEO,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":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,YAAY,CAAA;AAG5C,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;IACpC,OAAc,eAAe,UAAQ;IAErC,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;IAUd,sBAAsB;IAIhB,SAAS;IASf,YAAY,SAAgB,UAAU,EAAE,QAAQ,MAAM,mBAGrD;IAED,sBAAsB;IAKtB,uBAAuB,CAAE,GAAG,EAAE,MAAM;IAOpC,aAAa;CAOhB"}

package/build/request-handler.js

@@ -1,76 +1,59 @@
-import { DATA_BATCH_SIZE, DATA_BATCH_INTERVAL, DATA_BATCH_ENDPOINT, BATCH_EVENT_TYPES, DATA_SCREENSHOT_ENDPOINT } from './constants.js';
-import { batchAndPostEvents } from './util.js';
+import { DATA_BATCH_SIZE, DATA_BATCH_INTERVAL, TESTOPS_BUILD_COMPLETED_ENV } from './constants.js';
 import { BStackLogger } from './bstackLogger.js';
 export default class RequestQueueHandler {
     queue = [];
-    started = false;
     pollEventBatchInterval;
-    pendingUploads = 0;
+    callback;
     static tearDownInvoked = false;
     static instance;
     // making it private to use singleton pattern
-    constructor() { }
-    static getInstance() {
-        if (!RequestQueueHandler.instance) {
-            RequestQueueHandler.instance = new RequestQueueHandler();
-        }
-        return RequestQueueHandler.instance;
+    constructor(callback) {
+        this.callback = callback;
+        this.startEventBatchPolling();
     }
-    start() {
-        if (!this.started) {
-            this.started = true;
-            this.startEventBatchPolling();
+    static getInstance(callback) {
+        if (!RequestQueueHandler.instance && callback) {
+            RequestQueueHandler.instance = new RequestQueueHandler(callback);
         }
+        return RequestQueueHandler.instance;
     }
     add(event) {
-        if (!process.env.BS_TESTOPS_BUILD_COMPLETED) {
-            return {
-                proceed: false
-            };
-        }
-        if (!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: DATA_SCREENSHOT_ENDPOINT
-            };
+        if (!process.env[TESTOPS_BUILD_COMPLETED_ENV]) {
+            throw new Error('Observability build start not completed yet.');
         }
         this.queue.push(event);
         BStackLogger.debug(`Added data to request queue. Queue length = ${this.queue.length}`);
-        let data;
         const shouldProceed = this.shouldProceed();
         if (shouldProceed) {
-            data = this.queue.splice(0, DATA_BATCH_SIZE);
-            this.resetEventBatchPolling();
-            BStackLogger.debug(`Sending data from request queue. Data length = ${data.length}, Queue length after removal = ${this.queue.length}`);
+            this.sendBatch().catch((e) => {
+                BStackLogger.debug('Exception in sending batch: ' + e);
+            });
         }
-        return {
-            proceed: shouldProceed,
-            data: data,
-            url: DATA_BATCH_ENDPOINT
-        };
     }
     async shutdown() {
+        BStackLogger.debug('shutdown started');
         this.removeEventBatchPolling('Shutting down');
         while (this.queue.length > 0) {
             const data = this.queue.splice(0, DATA_BATCH_SIZE);
-            await batchAndPostEvents(DATA_BATCH_ENDPOINT, 'SHUTDOWN_QUEUE', data);
+            await this.callCallback(data, 'SHUTDOWN_QUEUE');
         }
+        BStackLogger.debug('shutdown ended');
     }
     startEventBatchPolling() {
-        this.pollEventBatchInterval = setInterval(async () => {
-            if (this.queue.length > 0) {
-                const data = this.queue.splice(0, DATA_BATCH_SIZE);
-                BStackLogger.debug(`Sending data from request queue. Data length = ${data.length}, Queue length after removal = ${this.queue.length}`);
-                await batchAndPostEvents(DATA_BATCH_ENDPOINT, 'INTERVAL_QUEUE', data);
-            }
-        }, DATA_BATCH_INTERVAL);
+        this.pollEventBatchInterval = setInterval(this.sendBatch.bind(this), DATA_BATCH_INTERVAL);
+    }
+    async sendBatch() {
+        const data = this.queue.splice(0, DATA_BATCH_SIZE);
+        if (data.length === 0) {
+            return;
+        }
+        BStackLogger.debug(`Sending data from request queue. Data length = ${data.length}, Queue length after removal = ${this.queue.length}`);
+        await this.callCallback(data, 'INTERVAL_QUEUE');
     }
+    callCallback = async (data, kind) => {
+        BStackLogger.debug('calling callback with kind ' + kind);
+        this.callback && await this.callback(data);
+    };
     resetEventBatchPolling() {
         this.removeEventBatchPolling('Resetting');
         this.startEventBatchPolling();
@@ -79,7 +62,6 @@ export default class RequestQueueHandler {
         if (this.pollEventBatchInterval) {
             BStackLogger.debug(`${tag} request queue`);
             clearInterval(this.pollEventBatchInterval);
-            this.started = false;
         }
     }
     shouldProceed() {

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

@@ -3,11 +3,14 @@ import PerformanceTester from './performance-tester.js';
 import { getBrowserDescription, getBrowserCapabilities, isBrowserstackCapability, getParentSuiteName, isBrowserstackSession, patchConsoleLogs } from './util.js';
 import InsightsHandler from './insights-handler.js';
 import TestReporter from './reporter.js';
-import { DEFAULT_OPTIONS } from './constants.js';
+import { DEFAULT_OPTIONS, PERF_MEASUREMENT_ENV } from './constants.js';
 import CrashReporter from './crash-reporter.js';
 import AccessibilityHandler from './accessibility-handler.js';
 import { BStackLogger } from './bstackLogger.js';
 import PercyHandler from './Percy/Percy-Handler.js';
+import Listener from './testOps/listener.js';
+import { saveWorkerData } from './data-store.js';
+import UsageStats from './testOps/usageStats.js';
 export default class BrowserstackService {
     _caps;
     _config;
@@ -41,7 +44,7 @@ export default class BrowserstackService {
         this._turboScale = this._options.turboScale;
         if (this._observability) {
             this._config.reporters?.push(TestReporter);
-            if (process.env.BROWSERSTACK_O11Y_PERF_MEASUREMENT) {
+            if (process.env[PERF_MEASUREMENT_ENV]) {
                 PerformanceTester.startMonitoring('performance-report-service.csv');
             }
         }
@@ -207,10 +210,10 @@ export default class BrowserstackService {
                 ...(hasReasons ? { reason: this._failReasons.join('\n') } : {})
             });
         }
-        await this._insightsHandler?.uploadPending();
-        await this._insightsHandler?.teardown();
+        await Listener.getInstance().onWorkerEnd();
         await this._percyHandler?.teardown();
-        if (process.env.BROWSERSTACK_O11Y_PERF_MEASUREMENT) {
+        this.saveWorkerData();
+        if (process.env[PERF_MEASUREMENT_ENV]) {
             await PerformanceTester.stopAndGenerate('performance-service.html');
             PerformanceTester.calculateTimes([
                 'onRunnerStart', 'onSuiteStart', 'onSuiteEnd',
@@ -405,4 +408,9 @@ export default class BrowserstackService {
         }
         return (await this._browser.execute(script));
     }
+    saveWorkerData() {
+        saveWorkerData({
+            usageStats: UsageStats.getInstance().getDataToSave()
+        });
+    }
 }

package/build/testOps/featureStats.d.ts

@@ -0,0 +1,45 @@
+import type { FeatureStatsOverview } from '../types.js';
+interface FeatureStatsMap {
+    [groupId: string]: FeatureStats;
+}
+interface JSONConversionSettings {
+    omitGroups?: boolean;
+    onlyGroups?: boolean;
+    nestedGroups?: boolean;
+}
+declare class FeatureStats {
+    private triggeredCount;
+    private sentCount;
+    private failedCount;
+    private groups;
+    mark(status: string, groupId: string): void;
+    triggered(groupId?: string): void;
+    sent(groupId?: string): void;
+    failed(groupId?: string): void;
+    success(groupId?: string): void;
+    createGroup(groupId: string): FeatureStats;
+    getTriggeredCount(): number;
+    getSentCount(): number;
+    getFailedCount(): number;
+    getUsageForGroup(groupId: string): FeatureStats;
+    getOverview(): FeatureStatsOverview;
+    getGroups(): FeatureStatsMap;
+    add(featureStats: FeatureStats): void;
+    toJSON(config?: JSONConversionSettings): {
+        triggeredCount: number;
+        sentCount: number;
+        failedCount: number;
+    } | {
+        groups: Record<string, FeatureStatsOverview>;
+        triggeredCount: number;
+        sentCount: number;
+        failedCount: number;
+    } | {
+        [x: string]: FeatureStatsOverview;
+    } | {
+        groups: Record<string, FeatureStatsOverview>;
+    };
+    static fromJSON(json: any): FeatureStats;
+}
+export default FeatureStats;
+//# sourceMappingURL=featureStats.d.ts.map

package/build/testOps/featureStats.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"featureStats.d.ts","sourceRoot":"","sources":["../../src/testOps/featureStats.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAA;AAGvD,UAAU,eAAe;IACrB,CAAC,OAAO,EAAE,MAAM,GAAG,YAAY,CAAC;CACnC;AAED,UAAU,sBAAsB;IAC5B,UAAU,CAAC,EAAE,OAAO,CAAA;IACpB,UAAU,CAAC,EAAE,OAAO,CAAA;IACpB,YAAY,CAAC,EAAE,OAAO,CAAA;CACzB;AAED,cAAM,YAAY;IACd,OAAO,CAAC,cAAc,CAAY;IAClC,OAAO,CAAC,SAAS,CAAY;IAC7B,OAAO,CAAC,WAAW,CAAY;IAC/B,OAAO,CAAC,MAAM,CAAsB;IAE7B,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,IAAI;IAkB3C,SAAS,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI;IAOjC,IAAI,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI;IAO5B,MAAM,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI;IAO9B,OAAO,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI;IAI/B,WAAW,CAAC,OAAO,EAAE,MAAM,GAAG,YAAY;IAO1C,iBAAiB,IAAI,MAAM;IAI3B,YAAY,IAAI,MAAM;IAItB,cAAc,IAAI,MAAM;IAIxB,gBAAgB,CAAC,OAAO,EAAE,MAAM,GAAG,YAAY;IAI/C,WAAW,IAAI,oBAAoB;IAInC,SAAS,IAAI,eAAe;IAI5B,GAAG,CAAC,YAAY,EAAE,YAAY,GAAG,IAAI;IAarC,MAAM,CAAC,MAAM,GAAE,sBAA2B;;;;;;;;;;;;;;WAqBnC,QAAQ,CAAC,IAAI,EAAE,GAAG,GAAG,YAAY;CAkBlD;AAED,eAAe,YAAY,CAAA"}

package/build/testOps/featureStats.js

@@ -0,0 +1,116 @@
+import { BStackLogger } from '../bstackLogger.js';
+import { isObjectEmpty } from '../util.js';
+class FeatureStats {
+    triggeredCount = 0;
+    sentCount = 0;
+    failedCount = 0;
+    groups = {};
+    mark(status, groupId) {
+        switch (status) {
+            case 'triggered':
+                this.triggered(groupId);
+                break;
+            case 'success':
+            case 'sent':
+                this.sent(groupId);
+                break;
+            case 'failed':
+                this.failed(groupId);
+                break;
+            default:
+                BStackLogger.debug('Request to mark usage for unknown status - ' + status);
+                break;
+        }
+    }
+    triggered(groupId) {
+        this.triggeredCount += 1;
+        if (groupId) {
+            this.createGroup(groupId).triggered();
+        }
+    }
+    sent(groupId) {
+        this.sentCount += 1;
+        if (groupId) {
+            this.createGroup(groupId).sent();
+        }
+    }
+    failed(groupId) {
+        this.failedCount += 1;
+        if (groupId) {
+            this.createGroup(groupId).failed();
+        }
+    }
+    success(groupId) {
+        this.sent(groupId);
+    }
+    createGroup(groupId) {
+        if (!this.groups[groupId]) {
+            this.groups[groupId] = new FeatureStats();
+        }
+        return this.groups[groupId];
+    }
+    getTriggeredCount() {
+        return this.triggeredCount;
+    }
+    getSentCount() {
+        return this.sentCount;
+    }
+    getFailedCount() {
+        return this.failedCount;
+    }
+    getUsageForGroup(groupId) {
+        return this.groups[groupId] || new FeatureStats();
+    }
+    getOverview() {
+        return { triggeredCount: this.triggeredCount, sentCount: this.sentCount, failedCount: this.failedCount };
+    }
+    getGroups() {
+        return this.groups;
+    }
+    add(featureStats) {
+        this.triggeredCount += featureStats.getTriggeredCount();
+        this.sentCount += featureStats.getSentCount();
+        this.failedCount += featureStats.getFailedCount();
+        Object.entries(featureStats.getGroups()).forEach(([groupId, group]) => {
+            this.createGroup(groupId).add(group);
+        });
+    }
+    // omitGroups: true/false -> Include groups or not
+    // onlyGroups: true/false -> data includes only groups
+    // nestedGroups: true/false -> groups will be nested in groups if true
+    toJSON(config = {}) {
+        const overviewData = !config.onlyGroups ? {
+            triggeredCount: this.triggeredCount,
+            sentCount: this.sentCount,
+            failedCount: this.failedCount
+        } : {};
+        const groupsData = {};
+        if (!config.omitGroups) {
+            Object.entries(this.groups).forEach(([groupId, group]) => {
+                groupsData[groupId] = group.toJSON(); // Currently Nested groups are only overviews
+            });
+        }
+        const group = config.nestedGroups ? { groups: groupsData } : groupsData;
+        return {
+            ...overviewData,
+            ...group
+        };
+    }
+    static fromJSON(json) {
+        const stats = new FeatureStats();
+        if (!json || isObjectEmpty(json)) {
+            return stats;
+        }
+        stats.triggeredCount = json.triggeredCount;
+        stats.sentCount = json.sentCount;
+        stats.failedCount = json.failedCount;
+        if (!json.groups) {
+            return stats;
+        }
+        Object.entries(json.groups).forEach(([groupId, group]) => {
+            stats.groups[groupId] = FeatureStats.fromJSON(group);
+        });
+        return stats;
+    }
+}
+export default FeatureStats;

package/build/testOps/featureUsage.d.ts

@@ -0,0 +1,22 @@
+declare class FeatureUsage {
+    private isTriggered?;
+    private status?;
+    private error?;
+    constructor(isTriggered?: boolean);
+    getTriggered(): boolean | undefined;
+    setTriggered(triggered: boolean): void;
+    setStatus(status: string): void;
+    setError(error: string): void;
+    triggered(): void;
+    failed(e: unknown): void;
+    success(): void;
+    getStatus(): string | undefined;
+    getError(): string | undefined;
+    toJSON(): {
+        isTriggered: boolean | undefined;
+        status: string | undefined;
+        error: string | undefined;
+    };
+}
+export default FeatureUsage;
+//# sourceMappingURL=featureUsage.d.ts.map

package/build/testOps/featureUsage.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"featureUsage.d.ts","sourceRoot":"","sources":["../../src/testOps/featureUsage.ts"],"names":[],"mappings":"AAEA,cAAM,YAAY;IACd,OAAO,CAAC,WAAW,CAAC,CAAS;IAC7B,OAAO,CAAC,MAAM,CAAC,CAAQ;IACvB,OAAO,CAAC,KAAK,CAAC,CAAQ;gBAEV,WAAW,CAAC,EAAE,OAAO;IAM1B,YAAY,IAAI,OAAO,GAAG,SAAS;IAInC,YAAY,CAAC,SAAS,EAAE,OAAO,GAAG,IAAI;IAItC,SAAS,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;IAI/B,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;IAI7B,SAAS,IAAI,IAAI;IAIjB,MAAM,CAAC,CAAC,EAAE,OAAO,GAAG,IAAI;IAKxB,OAAO,IAAI,IAAI;IAIf,SAAS,IAAI,MAAM,GAAG,SAAS;IAI/B,QAAQ,IAAI,MAAM,GAAG,SAAS;IAI9B,MAAM;;;;;CAOhB;AAED,eAAe,YAAY,CAAA"}

package/build/testOps/featureUsage.js

@@ -0,0 +1,47 @@
+import { getErrorString } from '../util.js';
+class FeatureUsage {
+    isTriggered;
+    status;
+    error;
+    constructor(isTriggered) {
+        if (isTriggered !== undefined) {
+            this.isTriggered = isTriggered;
+        }
+    }
+    getTriggered() {
+        return this.isTriggered;
+    }
+    setTriggered(triggered) {
+        this.isTriggered = triggered;
+    }
+    setStatus(status) {
+        this.status = status;
+    }
+    setError(error) {
+        this.error = error;
+    }
+    triggered() {
+        this.isTriggered = true;
+    }
+    failed(e) {
+        this.status = 'failed';
+        this.error = getErrorString(e);
+    }
+    success() {
+        this.status = 'success';
+    }
+    getStatus() {
+        return this.status;
+    }
+    getError() {
+        return this.error;
+    }
+    toJSON() {
+        return {
+            isTriggered: this.isTriggered,
+            status: this.status,
+            error: this.error
+        };
+    }
+}
+export default FeatureUsage;

package/build/testOps/listener.d.ts

@@ -0,0 +1,33 @@
+import type { CBTData, LogData, ScreenshotLog, TestData } from '../types.js';
+declare class Listener {
+    private static instance;
+    private readonly usageStats;
+    private readonly testStartedStats;
+    private readonly testFinishedStats;
+    private readonly hookStartedStats;
+    private readonly hookFinishedStats;
+    private readonly cbtSessionStats;
+    private readonly logEvents;
+    private requestBatcher?;
+    private pendingUploads;
+    private constructor();
+    static getInstance(): Listener;
+    onWorkerEnd(): Promise<void>;
+    uploadPending(waitTimeout?: number, waitInterval?: number): Promise<unknown>;
+    teardown(): Promise<void>;
+    hookStarted(hookData: TestData): void;
+    hookFinished(hookData: TestData): void;
+    testStarted(testData: TestData): void;
+    testFinished(testData: TestData): void;
+    logCreated(logs: LogData[]): void;
+    onScreenshot(jsonArray: ScreenshotLog[]): Promise<void>;
+    cbtSessionCreated(data: CBTData): void;
+    private markLogs;
+    private getResult;
+    private sendBatchEvents;
+    private eventsFailed;
+    private eventsSuccess;
+    private getEventForHook;
+}
+export default Listener;
+//# sourceMappingURL=listener.d.ts.map

package/build/testOps/listener.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"listener.d.ts","sourceRoot":"","sources":["../../src/testOps/listener.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,aAAa,EAAE,QAAQ,EAAc,MAAM,aAAa,CAAA;AAWxF,cAAM,QAAQ;IACV,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAU;IACjC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAuC;IAClE,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAiD;IAClF,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAkD;IACpF,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAiD;IAClF,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAkD;IACpF,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAgD;IAChF,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAyC;IACnE,OAAO,CAAC,cAAc,CAAC,CAAqB;IAC5C,OAAO,CAAC,cAAc,CAAI;IAG1B,OAAO;WAGO,WAAW,IAAI,QAAQ;IAOxB,WAAW;IASlB,aAAa,CAAC,WAAW,SAA2C,EAAE,YAAY,SAA4C,GAAG,OAAO,CAAC,OAAO,CAAC;IASjJ,QAAQ;IAOP,WAAW,CAAC,QAAQ,EAAE,QAAQ,GAAG,IAAI;IAUrC,YAAY,CAAC,QAAQ,EAAE,QAAQ,GAAG,IAAI;IAUtC,WAAW,CAAC,QAAQ,EAAE,QAAQ,GAAG,IAAI;IAUrC,YAAY,CAAC,QAAQ,EAAE,QAAQ,GAAG,IAAI;IAUtC,UAAU,CAAC,IAAI,EAAE,OAAO,EAAE,GAAG,IAAI;IAY3B,YAAY,CAAC,SAAS,EAAE,aAAa,EAAE;IAgB7C,iBAAiB,CAAC,IAAI,EAAE,OAAO,GAAG,IAAI;IAU7C,OAAO,CAAC,QAAQ;IAgBhB,OAAO,CAAC,SAAS;IAMjB,OAAO,CAAC,eAAe;IAoBvB,OAAO,CAAC,YAAY;IAmBpB,OAAO,CAAC,aAAa;IAmBrB,OAAO,CAAC,eAAe;CAK1B;AAED,eAAe,QAAQ,CAAA"}