@allurereport/plugin-testops 3.2.0 → 3.3.1

package/dist/client.d.ts

@@ -5,6 +5,7 @@ export declare class TestOpsClient {
         baseUrl: string;
         projectId: string;
         accessToken: string;
+        limit?: number;
     });
     get launchUrl(): string | undefined;
     issueOauthToken(): Promise<void>;
@@ -16,5 +17,6 @@ export declare class TestOpsClient {
         trs: TestResult[];
         attachmentsResolver: (tr: TestResult) => Promise<any>;
         fixturesResolver: (tr: TestResult) => Promise<any>;
+        onProgress?: () => void;
     }): Promise<void>;
 }

package/dist/client.js

@@ -9,10 +9,11 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _TestOpsClient_accessToken, _TestOpsClient_projectId, _TestOpsClient_oauthToken, _TestOpsClient_client, _TestOpsClient_launch, _TestOpsClient_session, _TestOpsClient_uploadInProgress;
+var _TestOpsClient_accessToken, _TestOpsClient_projectId, _TestOpsClient_oauthToken, _TestOpsClient_client, _TestOpsClient_launch, _TestOpsClient_session, _TestOpsClient_uploadInProgress, _TestOpsClient_uploadLimit;
 import axios from "axios";
 import FormData from "form-data";
 import chunk from "lodash.chunk";
+import pLimit from "p-limit";
 export class TestOpsClient {
     constructor(params) {
         _TestOpsClient_accessToken.set(this, void 0);
@@ -22,6 +23,7 @@ export class TestOpsClient {
         _TestOpsClient_launch.set(this, void 0);
         _TestOpsClient_session.set(this, void 0);
         _TestOpsClient_uploadInProgress.set(this, false);
+        _TestOpsClient_uploadLimit.set(this, 1);
         if (!params.accessToken) {
             throw new Error("accessToken is required");
         }
@@ -31,12 +33,18 @@ export class TestOpsClient {
         if (!params.baseUrl) {
             throw new Error("baseUrl is required");
         }
+        if (params.limit && params.limit > 5) {
+            throw new Error("limit can't be greater than 5");
+        }
         __classPrivateFieldSet(this, _TestOpsClient_accessToken, params.accessToken, "f");
         __classPrivateFieldSet(this, _TestOpsClient_projectId, params.projectId, "f");
         __classPrivateFieldSet(this, _TestOpsClient_client, axios.create({
             baseURL: params.baseUrl,
             validateStatus: (status) => status >= 200 && status < 400,
         }), "f");
+        if (params.limit) {
+            __classPrivateFieldSet(this, _TestOpsClient_uploadLimit, params.limit, "f");
+        }
     }
     get launchUrl() {
         if (!__classPrivateFieldGet(this, _TestOpsClient_launch, "f")) {
@@ -126,8 +134,9 @@ export class TestOpsClient {
         if (!__classPrivateFieldGet(this, _TestOpsClient_session, "f")) {
             throw new Error("Session isn't created! Call createSession first");
         }
-        const { trs, attachmentsResolver, fixturesResolver } = params;
+        const { trs, attachmentsResolver, fixturesResolver, onProgress } = params;
         const trsChunks = chunk(trs, 100);
+        const uploadLimitFn = pLimit(__classPrivateFieldGet(this, _TestOpsClient_uploadLimit, "f"));
         await Promise.all(trsChunks.map(async (trsChunk) => {
             const { data } = await __classPrivateFieldGet(this, _TestOpsClient_client, "f").post("/api/upload/test-result", {
                 testSessionId: __classPrivateFieldGet(this, _TestOpsClient_session, "f").id,
@@ -142,7 +151,7 @@ export class TestOpsClient {
                 },
             });
             const trsTestOpsIdsByUuid = data.results.reduce((acc, { id, uuid }) => ({ ...acc, [uuid]: id }), {});
-            await Promise.all(trsChunk.map(async (tr) => {
+            await Promise.all(trsChunk.map((tr) => uploadLimitFn(async () => {
                 const trTestOpsId = trsTestOpsIdsByUuid[tr.id];
                 const attachments = await attachmentsResolver(tr);
                 const fixtures = await fixturesResolver(tr);
@@ -173,8 +182,9 @@ export class TestOpsClient {
                         },
                     });
                 }
-            }));
+                onProgress?.();
+            })));
         }));
     }
 }
-_TestOpsClient_accessToken = new WeakMap(), _TestOpsClient_projectId = new WeakMap(), _TestOpsClient_oauthToken = new WeakMap(), _TestOpsClient_client = new WeakMap(), _TestOpsClient_launch = new WeakMap(), _TestOpsClient_session = new WeakMap(), _TestOpsClient_uploadInProgress = new WeakMap();
+_TestOpsClient_accessToken = new WeakMap(), _TestOpsClient_projectId = new WeakMap(), _TestOpsClient_oauthToken = new WeakMap(), _TestOpsClient_client = new WeakMap(), _TestOpsClient_launch = new WeakMap(), _TestOpsClient_session = new WeakMap(), _TestOpsClient_uploadInProgress = new WeakMap(), _TestOpsClient_uploadLimit = new WeakMap();

package/dist/index.d.ts

@@ -1,2 +1,2 @@
-export type { TestopsUploaderPluginOptions } from "./model.js";
-export { TestopsUploaderPlugin as default } from "./plugin.js";
+export type { TestopsPluginOptions as TestopsUploaderPluginOptions } from "./model.js";
+export { TestopsPlugin as default } from "./plugin.js";

package/dist/index.js

@@ -1 +1 @@
-export { TestopsUploaderPlugin as default } from "./plugin.js";
+export { TestopsPlugin as default } from "./plugin.js";

package/dist/model.d.ts

@@ -6,9 +6,10 @@ export type TestopsUploaderOptions = {
     launchName: string;
     launchTags: string[];
     filter?: (testResult: TestResult) => boolean;
+    limit?: number;
 };
 export type TemplateManifest = Record<string, string>;
-export type TestopsUploaderPluginOptions = TestopsUploaderOptions;
+export type TestopsPluginOptions = TestopsUploaderOptions;
 export type TestOpsSession = {
     id: number;
     jobId: number;

package/dist/plugin.d.ts

@@ -1,9 +1,9 @@
 import { type AllureStore, type Plugin, type PluginContext, type PluginSummary } from "@allurereport/plugin-api";
-import type { TestopsUploaderPluginOptions } from "./model.js";
-export declare class TestopsUploaderPlugin implements Plugin {
+import type { TestopsPluginOptions } from "./model.js";
+export declare class TestopsPlugin implements Plugin {
     #private;
-    readonly options: TestopsUploaderPluginOptions;
-    constructor(options: TestopsUploaderPluginOptions);
+    readonly options: TestopsPluginOptions;
+    constructor(options: TestopsPluginOptions);
     get ciMode(): boolean | undefined;
     start(_context: PluginContext, store: AllureStore): Promise<void>;
     update(_context: PluginContext, store: AllureStore): Promise<void>;

package/dist/plugin.js

@@ -9,32 +9,33 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _TestopsUploaderPlugin_instances, _TestopsUploaderPlugin_ci, _TestopsUploaderPlugin_client, _TestopsUploaderPlugin_launchName, _TestopsUploaderPlugin_launchTags, _TestopsUploaderPlugin_uploadedTestResultsIds, _TestopsUploaderPlugin_upload, _TestopsUploaderPlugin_startUpload, _TestopsUploaderPlugin_stopUpload;
+var _TestopsPlugin_instances, _TestopsPlugin_ci, _TestopsPlugin_client, _TestopsPlugin_launchName, _TestopsPlugin_launchTags, _TestopsPlugin_uploadedTestResultsIds, _TestopsPlugin_upload, _TestopsPlugin_startUpload, _TestopsPlugin_stopUpload;
 import { detect } from "@allurereport/ci";
 import { getWorstStatus } from "@allurereport/core-api";
-import { convertToSummaryTestResult, } from "@allurereport/plugin-api";
+import { createPluginSummary, } from "@allurereport/plugin-api";
 import { env } from "node:process";
+import ProgressBar from "progress";
 import { TestOpsClient } from "./client.js";
 import { resolvePluginOptions, unwrapStepsAttachments } from "./utils.js";
-export class TestopsUploaderPlugin {
+export class TestopsPlugin {
     constructor(options) {
-        _TestopsUploaderPlugin_instances.add(this);
+        _TestopsPlugin_instances.add(this);
         this.options = options;
-        _TestopsUploaderPlugin_ci.set(this, void 0);
-        _TestopsUploaderPlugin_client.set(this, void 0);
-        _TestopsUploaderPlugin_launchName.set(this, "");
-        _TestopsUploaderPlugin_launchTags.set(this, []);
-        _TestopsUploaderPlugin_uploadedTestResultsIds.set(this, []);
+        _TestopsPlugin_ci.set(this, void 0);
+        _TestopsPlugin_client.set(this, void 0);
+        _TestopsPlugin_launchName.set(this, "");
+        _TestopsPlugin_launchTags.set(this, []);
+        _TestopsPlugin_uploadedTestResultsIds.set(this, []);
         const { accessToken, endpoint, projectId, launchName, launchTags } = resolvePluginOptions(options);
-        __classPrivateFieldSet(this, _TestopsUploaderPlugin_ci, detect(), "f");
+        __classPrivateFieldSet(this, _TestopsPlugin_ci, detect(), "f");
         if ([accessToken, endpoint, projectId].every(Boolean)) {
-            __classPrivateFieldSet(this, _TestopsUploaderPlugin_client, new TestOpsClient({
+            __classPrivateFieldSet(this, _TestopsPlugin_client, new TestOpsClient({
                 baseUrl: endpoint,
                 accessToken,
                 projectId,
             }), "f");
-            __classPrivateFieldSet(this, _TestopsUploaderPlugin_launchName, launchName, "f");
-            __classPrivateFieldSet(this, _TestopsUploaderPlugin_launchTags, launchTags, "f");
+            __classPrivateFieldSet(this, _TestopsPlugin_launchName, launchName, "f");
+            __classPrivateFieldSet(this, _TestopsPlugin_launchTags, launchTags, "f");
         }
         if (!accessToken) {
             console.warn("TestOps access token is missing. Please provide a valid access token in the plugin options.");
@@ -47,64 +48,56 @@ export class TestopsUploaderPlugin {
         }
     }
     get ciMode() {
-        return __classPrivateFieldGet(this, _TestopsUploaderPlugin_ci, "f") && __classPrivateFieldGet(this, _TestopsUploaderPlugin_ci, "f").type !== "local";
+        return __classPrivateFieldGet(this, _TestopsPlugin_ci, "f") && __classPrivateFieldGet(this, _TestopsPlugin_ci, "f").type !== "local";
     }
     async start(_context, store) {
-        if (!__classPrivateFieldGet(this, _TestopsUploaderPlugin_client, "f")) {
+        if (!__classPrivateFieldGet(this, _TestopsPlugin_client, "f")) {
             return;
         }
-        await __classPrivateFieldGet(this, _TestopsUploaderPlugin_instances, "m", _TestopsUploaderPlugin_startUpload).call(this);
-        await __classPrivateFieldGet(this, _TestopsUploaderPlugin_instances, "m", _TestopsUploaderPlugin_upload).call(this, store, { issueNewToken: false });
-        console.info(`TestOps launch has been created: ${__classPrivateFieldGet(this, _TestopsUploaderPlugin_client, "f").launchUrl}`);
+        await __classPrivateFieldGet(this, _TestopsPlugin_instances, "m", _TestopsPlugin_startUpload).call(this);
+        await __classPrivateFieldGet(this, _TestopsPlugin_instances, "m", _TestopsPlugin_upload).call(this, store, { issueNewToken: false });
+        console.info(`TestOps launch has been created: ${__classPrivateFieldGet(this, _TestopsPlugin_client, "f").launchUrl}`);
     }
     async update(_context, store) {
-        if (!__classPrivateFieldGet(this, _TestopsUploaderPlugin_client, "f")) {
+        if (!__classPrivateFieldGet(this, _TestopsPlugin_client, "f")) {
             return;
         }
-        await __classPrivateFieldGet(this, _TestopsUploaderPlugin_instances, "m", _TestopsUploaderPlugin_upload).call(this, store);
+        await __classPrivateFieldGet(this, _TestopsPlugin_instances, "m", _TestopsPlugin_upload).call(this, store);
     }
     async done(_context, store) {
-        if (!__classPrivateFieldGet(this, _TestopsUploaderPlugin_client, "f")) {
+        if (!__classPrivateFieldGet(this, _TestopsPlugin_client, "f")) {
             return;
         }
         const allTrs = (await store.allTestResults()).filter((tr) => this.options.filter ? this.options.filter(tr) : true);
         const worstStatus = getWorstStatus(allTrs.map(({ status }) => status));
-        await __classPrivateFieldGet(this, _TestopsUploaderPlugin_instances, "m", _TestopsUploaderPlugin_upload).call(this, store);
-        await __classPrivateFieldGet(this, _TestopsUploaderPlugin_instances, "m", _TestopsUploaderPlugin_stopUpload).call(this, worstStatus || "unknown");
+        await __classPrivateFieldGet(this, _TestopsPlugin_instances, "m", _TestopsPlugin_upload).call(this, store);
+        await __classPrivateFieldGet(this, _TestopsPlugin_instances, "m", _TestopsPlugin_stopUpload).call(this, worstStatus || "unknown");
     }
     async info(context, store) {
-        if (!__classPrivateFieldGet(this, _TestopsUploaderPlugin_client, "f")?.launchUrl) {
+        if (!__classPrivateFieldGet(this, _TestopsPlugin_client, "f")?.launchUrl) {
             return undefined;
         }
-        const allTrs = (await store.allTestResults()).filter((tr) => this.options.filter ? this.options.filter(tr) : true);
-        const newTrs = await store.allNewTestResults();
-        const retryTrs = allTrs.filter((tr) => !!tr?.retries?.length);
-        const flakyTrs = allTrs.filter((tr) => !!tr?.flaky);
-        const duration = allTrs.reduce((acc, { duration: trDuration = 0 }) => acc + trDuration, 0);
-        const worstStatus = getWorstStatus(allTrs.map(({ status }) => status));
-        const createdAt = allTrs.reduce((acc, { stop }) => Math.max(acc, stop || 0), 0);
         return {
-            name: __classPrivateFieldGet(this, _TestopsUploaderPlugin_launchName, "f"),
-            remoteHref: __classPrivateFieldGet(this, _TestopsUploaderPlugin_client, "f").launchUrl,
-            stats: await store.testsStatistic(this.options.filter),
-            status: worstStatus ?? "passed",
-            duration,
-            createdAt,
-            plugin: "Awesome",
-            newTests: newTrs.map(convertToSummaryTestResult),
-            flakyTests: flakyTrs.map(convertToSummaryTestResult),
-            retryTests: retryTrs.map(convertToSummaryTestResult),
-            meta: {
-                reportId: context.reportUuid,
-            },
+            ...(await createPluginSummary({
+                name: __classPrivateFieldGet(this, _TestopsPlugin_launchName, "f"),
+                plugin: "TestOps",
+                meta: {
+                    reportId: context.reportUuid,
+                },
+                filter: this.options.filter,
+                history: context.history,
+                ci: context.ci,
+                store,
+            })),
+            remoteHref: __classPrivateFieldGet(this, _TestopsPlugin_client, "f").launchUrl,
         };
     }
 }
-_TestopsUploaderPlugin_ci = new WeakMap(), _TestopsUploaderPlugin_client = new WeakMap(), _TestopsUploaderPlugin_launchName = new WeakMap(), _TestopsUploaderPlugin_launchTags = new WeakMap(), _TestopsUploaderPlugin_uploadedTestResultsIds = new WeakMap(), _TestopsUploaderPlugin_instances = new WeakSet(), _TestopsUploaderPlugin_upload = async function _TestopsUploaderPlugin_upload(store, options) {
+_TestopsPlugin_ci = new WeakMap(), _TestopsPlugin_client = new WeakMap(), _TestopsPlugin_launchName = new WeakMap(), _TestopsPlugin_launchTags = new WeakMap(), _TestopsPlugin_uploadedTestResultsIds = new WeakMap(), _TestopsPlugin_instances = new WeakSet(), _TestopsPlugin_upload = async function _TestopsPlugin_upload(store, options) {
     const { issueNewToken = true } = options ?? {};
     const allTrs = await store.allTestResults();
     const trsToUpload = allTrs.filter((tr) => {
-        const uploaded = __classPrivateFieldGet(this, _TestopsUploaderPlugin_uploadedTestResultsIds, "f").includes(tr.id);
+        const uploaded = __classPrivateFieldGet(this, _TestopsPlugin_uploadedTestResultsIds, "f").includes(tr.id);
         if (this.options.filter) {
             return this.options.filter(tr) && !uploaded;
         }
@@ -120,11 +113,17 @@ _TestopsUploaderPlugin_ci = new WeakMap(), _TestopsUploaderPlugin_client = new W
         };
     });
     if (issueNewToken) {
-        await __classPrivateFieldGet(this, _TestopsUploaderPlugin_client, "f").issueOauthToken();
+        await __classPrivateFieldGet(this, _TestopsPlugin_client, "f").issueOauthToken();
     }
-    await __classPrivateFieldGet(this, _TestopsUploaderPlugin_client, "f").createSession(env);
-    await __classPrivateFieldGet(this, _TestopsUploaderPlugin_client, "f").uploadTestResults({
+    const progressBar = new ProgressBar("Uploading test results [:bar] :current/:total", {
+        total: allTrsWithAttachments.length,
+        width: 20,
+    });
+    progressBar.render();
+    await __classPrivateFieldGet(this, _TestopsPlugin_client, "f").createSession(env);
+    await __classPrivateFieldGet(this, _TestopsPlugin_client, "f").uploadTestResults({
         trs: allTrsWithAttachments,
+        onProgress: () => progressBar.tick(),
         attachmentsResolver: async (tr) => {
             const attachments = await store.attachmentsByTrId(tr.id);
             return await Promise.all(attachments.map(async (attachment) => {
@@ -145,20 +144,20 @@ _TestopsUploaderPlugin_ci = new WeakMap(), _TestopsUploaderPlugin_client = new W
             }));
         },
     });
-    __classPrivateFieldGet(this, _TestopsUploaderPlugin_uploadedTestResultsIds, "f").push(...allTrsWithAttachments.map((tr) => tr.id));
-}, _TestopsUploaderPlugin_startUpload = async function _TestopsUploaderPlugin_startUpload() {
-    if (!__classPrivateFieldGet(this, _TestopsUploaderPlugin_client, "f")) {
+    __classPrivateFieldGet(this, _TestopsPlugin_uploadedTestResultsIds, "f").push(...allTrsWithAttachments.map((tr) => tr.id));
+}, _TestopsPlugin_startUpload = async function _TestopsPlugin_startUpload() {
+    if (!__classPrivateFieldGet(this, _TestopsPlugin_client, "f")) {
         return;
     }
-    await __classPrivateFieldGet(this, _TestopsUploaderPlugin_client, "f").issueOauthToken();
-    await __classPrivateFieldGet(this, _TestopsUploaderPlugin_client, "f").createLaunch(__classPrivateFieldGet(this, _TestopsUploaderPlugin_launchName, "f"), __classPrivateFieldGet(this, _TestopsUploaderPlugin_launchTags, "f"));
+    await __classPrivateFieldGet(this, _TestopsPlugin_client, "f").issueOauthToken();
+    await __classPrivateFieldGet(this, _TestopsPlugin_client, "f").createLaunch(__classPrivateFieldGet(this, _TestopsPlugin_launchName, "f"), __classPrivateFieldGet(this, _TestopsPlugin_launchTags, "f"));
     if (!this.ciMode) {
         return;
     }
-    await __classPrivateFieldGet(this, _TestopsUploaderPlugin_client, "f").startUpload(__classPrivateFieldGet(this, _TestopsUploaderPlugin_ci, "f"));
-}, _TestopsUploaderPlugin_stopUpload = async function _TestopsUploaderPlugin_stopUpload(status) {
-    if (!this.ciMode || !__classPrivateFieldGet(this, _TestopsUploaderPlugin_client, "f")) {
+    await __classPrivateFieldGet(this, _TestopsPlugin_client, "f").startUpload(__classPrivateFieldGet(this, _TestopsPlugin_ci, "f"));
+}, _TestopsPlugin_stopUpload = async function _TestopsPlugin_stopUpload(status) {
+    if (!this.ciMode || !__classPrivateFieldGet(this, _TestopsPlugin_client, "f")) {
         return;
     }
-    await __classPrivateFieldGet(this, _TestopsUploaderPlugin_client, "f").stopUpload(__classPrivateFieldGet(this, _TestopsUploaderPlugin_ci, "f"), status);
+    await __classPrivateFieldGet(this, _TestopsPlugin_client, "f").stopUpload(__classPrivateFieldGet(this, _TestopsPlugin_ci, "f"), status);
 };

package/dist/utils.d.ts

@@ -1,4 +1,4 @@
 import type { TestStepResult } from "@allurereport/core-api";
-import type { TestopsUploaderPluginOptions } from "./model.js";
+import type { TestopsPluginOptions } from "./model.js";
 export declare const unwrapStepsAttachments: (steps: TestStepResult[]) => TestStepResult[];
-export declare const resolvePluginOptions: (options: TestopsUploaderPluginOptions) => Omit<TestopsUploaderPluginOptions, "filter">;
+export declare const resolvePluginOptions: (options: TestopsPluginOptions) => Omit<TestopsPluginOptions, "filter">;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@allurereport/plugin-testops",
-  "version": "3.2.0",
+  "version": "3.3.1",
   "description": "Allure Plugin TestOps",
   "keywords": [
     "allure",
@@ -32,13 +32,15 @@
     "test": "rimraf ./out && vitest run"
   },
   "dependencies": {
-    "@allurereport/ci": "3.2.0",
-    "@allurereport/core-api": "3.2.0",
-    "@allurereport/plugin-api": "3.2.0",
-    "@allurereport/reader-api": "3.2.0",
+    "@allurereport/ci": "3.3.1",
+    "@allurereport/core-api": "3.3.1",
+    "@allurereport/plugin-api": "3.3.1",
+    "@allurereport/reader-api": "3.3.1",
     "axios": "^1.13.5",
     "form-data": "^4.0.5",
-    "lodash.chunk": "^4.2.0"
+    "lodash.chunk": "^4.2.0",
+    "p-limit": "^7.3.0",
+    "progress": "^2.0.3"
   },
   "devDependencies": {
     "@stylistic/eslint-plugin": "^2.6.1",
@@ -47,6 +49,7 @@
     "@types/form-data": "^2.5.2",
     "@types/lodash.chunk": "^4",
     "@types/node": "^20.17.9",
+    "@types/progress": "^2",
     "@typescript-eslint/eslint-plugin": "^8.0.0",
     "@typescript-eslint/parser": "^8.0.0",
     "@vitest/runner": "^2.1.9",