@allurereport/core 3.8.1 → 3.8.2

package/dist/report.js

@@ -22,7 +22,7 @@ import { normalizeCategoriesConfig } from "@allurereport/core-api";
 import { AllureStoreDumpFiles, } from "@allurereport/plugin-api";
 import { allure1, allure2, attachments, cucumberjson, junitXml, readXcResultBundle } from "@allurereport/reader";
 import { PathResultFile } from "@allurereport/reader-api";
-import { AllureLegacyServiceClient, AllureRemoteHistory, AllureServiceClient, KnownError, UnknownError, } from "@allurereport/service";
+import { AllureRemoteHistory, AllureServiceClient, KnownError, UnknownError, } from "@allurereport/service";
 import { generateSummary } from "@allurereport/summary";
 import { glob } from "glob";
 import ZipReadStream from "node-stream-zip";
@@ -44,7 +44,11 @@ const remoteReportParams = (ci) => {
     const branch = ci?.jobRunBranch;
     return repo && branch ? { repo, branch } : {};
 };
+const REMOTE_UPLOAD_CONCURRENCY = 50;
+const REMOTE_UPLOAD_MAX_ATTEMPTS = 5;
+const REMOTE_UPLOAD_MAX_SIMULTANEOUS_FAILED = 5;
 const errorDetails = (err) => (err instanceof Error ? (err.stack ?? err.message) : String(err));
+const isAbortError = (err) => typeof err === "object" && err !== null && "name" in err && err?.name === "AbortError";
 export class AllureReport {
     constructor(opts) {
         _AllureReport_instances.add(this);
@@ -455,6 +459,8 @@ export class AllureReport {
             const remoteHrefs = new Set();
             const remoteHrefsByPluginId = {};
             const cancelledPluginsIds = new Set();
+            let remoteCleanupFailed = false;
+            const getSuccessfulPublishedPlugins = () => __classPrivateFieldGet(this, _AllureReport_plugins, "f").filter(({ enabled, id, options }) => enabled && !!options?.publish && !cancelledPluginsIds.has(id));
             if (__classPrivateFieldGet(this, _AllureReport_executionStage, "f") !== "running") {
                 throw new Error(initRequired);
             }
@@ -486,59 +492,97 @@ export class AllureReport {
                             width: 20,
                         })
                         : undefined;
-                    const limitFn = pLimit(50);
+                    const limitFn = pLimit(REMOTE_UPLOAD_CONCURRENCY);
                     const uploadAbortController = new AbortController();
-                    const fns = pluginFilesEntries.map(([filename, filepath]) => limitFn(async () => {
-                        if (cancelledPluginsIds.has(context.id) || uploadAbortController.signal.aborted) {
+                    const failedUploads = new Set();
+                    let terminalUploadError;
+                    let remoteReportDeleted = false;
+                    let fns = [];
+                    const cleanupFailedPluginUpload = async (err) => {
+                        if (remoteReportDeleted) {
                             return;
                         }
-                        if (/^(data|widgets|index\.html$|summary\.json$)/.test(filename)) {
-                            const uploadedFileUrl = await __classPrivateFieldGet(this, _AllureReport_allureServiceClient, "f").addReportFile({
+                        remoteReportDeleted = true;
+                        cancelledPluginsIds.add(context.id);
+                        uploadAbortController.abort();
+                        await Promise.allSettled(fns);
+                        const pluginRemoteHref = remoteHrefsByPluginId[context.id];
+                        if (pluginRemoteHref) {
+                            remoteHrefs.delete(pluginRemoteHref);
+                            delete remoteHrefsByPluginId[context.id];
+                        }
+                        try {
+                            await __classPrivateFieldGet(this, _AllureReport_allureServiceClient, "f").deleteReport({
                                 reportUuid: this.reportUuid,
                                 pluginId: context.id,
-                                filename,
-                                filepath,
-                                signal: uploadAbortController.signal,
                             });
-                            if (cancelledPluginsIds.has(context.id) || uploadAbortController.signal.aborted) {
-                                return;
-                            }
-                            if (filename === "index.html") {
-                                remoteHrefsByPluginId[context.id] = uploadedFileUrl;
-                                remoteHrefs.add(uploadedFileUrl);
-                            }
                         }
-                        else {
-                            await __classPrivateFieldGet(this, _AllureReport_allureServiceClient, "f").addReportAsset({
-                                filename,
-                                filepath,
-                                signal: uploadAbortController.signal,
-                            });
+                        catch (cleanupErr) {
+                            remoteCleanupFailed = true;
+                            console.error(`Plugin "${context.id}" upload cleanup has failed, the remote report won't be completed`);
+                            console.error(cleanupErr);
                         }
+                        console.error(`Plugin "${context.id}" upload has failed, the plugin won't be published`);
+                        console.error(err);
+                    };
+                    fns = pluginFilesEntries.map(([filename, filepath]) => limitFn(async () => {
                         if (cancelledPluginsIds.has(context.id) || uploadAbortController.signal.aborted) {
                             return;
                         }
-                        progressBar?.tick?.();
+                        for (let attempt = 1; attempt <= REMOTE_UPLOAD_MAX_ATTEMPTS; attempt++) {
+                            if (cancelledPluginsIds.has(context.id) || uploadAbortController.signal.aborted) {
+                                return;
+                            }
+                            try {
+                                if (/^(data|widgets|index\.html$|summary\.json$)/.test(filename)) {
+                                    const uploadedFileUrl = await __classPrivateFieldGet(this, _AllureReport_allureServiceClient, "f").addReportFile({
+                                        reportUuid: this.reportUuid,
+                                        pluginId: context.id,
+                                        filename,
+                                        filepath,
+                                        signal: uploadAbortController.signal,
+                                    });
+                                    if (cancelledPluginsIds.has(context.id) || uploadAbortController.signal.aborted) {
+                                        return;
+                                    }
+                                    if (filename === "index.html") {
+                                        remoteHrefsByPluginId[context.id] = uploadedFileUrl;
+                                        remoteHrefs.add(uploadedFileUrl);
+                                    }
+                                }
+                                else {
+                                    await __classPrivateFieldGet(this, _AllureReport_allureServiceClient, "f").addReportAsset({
+                                        filename,
+                                        filepath,
+                                        signal: uploadAbortController.signal,
+                                    });
+                                }
+                                failedUploads.delete(filename);
+                                progressBar?.tick?.();
+                                return;
+                            }
+                            catch (err) {
+                                if (cancelledPluginsIds.has(context.id) || uploadAbortController.signal.aborted) {
+                                    return;
+                                }
+                                if (isAbortError(err)) {
+                                    throw err;
+                                }
+                                failedUploads.add(filename);
+                                if (failedUploads.size > REMOTE_UPLOAD_MAX_SIMULTANEOUS_FAILED ||
+                                    attempt >= REMOTE_UPLOAD_MAX_ATTEMPTS) {
+                                    terminalUploadError ?? (terminalUploadError = err);
+                                    throw terminalUploadError;
+                                }
+                            }
+                        }
                     }));
                     progressBar?.render?.();
                     try {
                         await Promise.all(fns);
                     }
                     catch (err) {
-                        cancelledPluginsIds.add(context.id);
-                        uploadAbortController.abort();
-                        await Promise.allSettled(fns);
-                        const pluginRemoteHref = remoteHrefsByPluginId[context.id];
-                        if (pluginRemoteHref) {
-                            remoteHrefs.delete(pluginRemoteHref);
-                            delete remoteHrefsByPluginId[context.id];
-                        }
-                        await __classPrivateFieldGet(this, _AllureReport_allureServiceClient, "f").deleteReport({
-                            reportUuid: this.reportUuid,
-                            pluginId: context.id,
-                        });
-                        console.error(`Plugin "${context.id}" upload has failed, the plugin won't be published`);
-                        console.error(err);
+                        await cleanupFailedPluginUpload(terminalUploadError ?? err);
                     }
                 }
                 const summary = await plugin?.info?.(context, __classPrivateFieldGet(this, _AllureReport_store, "f"));
@@ -563,9 +607,7 @@ export class AllureReport {
             });
             if (summaries.length > 1) {
                 const summaryPath = await generateSummary(__classPrivateFieldGet(this, _AllureReport_output, "f"), summaries);
-                const publishedReports = __classPrivateFieldGet(this, _AllureReport_plugins, "f")
-                    .map((plugin) => !!plugin?.options?.publish && !cancelledPluginsIds.has(plugin.id))
-                    .filter(Boolean);
+                const publishedReports = getSuccessfulPublishedPlugins();
                 if (__classPrivateFieldGet(this, _AllureReport_instances, "a", _AllureReport_publish_get) && summaryPath && publishedReports.length > 1) {
                     await __classPrivateFieldGet(this, _AllureReport_allureServiceClient, "f")?.addReportFile({
                         reportUuid: this.reportUuid,
@@ -574,7 +616,8 @@ export class AllureReport {
                     });
                 }
             }
-            if (__classPrivateFieldGet(this, _AllureReport_instances, "a", _AllureReport_publish_get)) {
+            const publishedReports = getSuccessfulPublishedPlugins();
+            if (__classPrivateFieldGet(this, _AllureReport_instances, "a", _AllureReport_publish_get) && !remoteCleanupFailed && publishedReports.length > 0) {
                 await __classPrivateFieldGet(this, _AllureReport_allureServiceClient, "f")?.completeReport({
                     reportUuid: this.reportUuid,
                     historyPoint: historyDataPoint,
@@ -623,7 +666,7 @@ export class AllureReport {
                     }
                 }
             }
-            if (remoteHrefs.size > 0) {
+            if (!remoteCleanupFailed && remoteHrefs.size > 0) {
                 console.info("Next reports have been published:");
                 remoteHrefs.forEach((href) => {
                     console.info(`- ${href}`);
@@ -687,12 +730,7 @@ export class AllureReport {
         });
         const { name, readers = [allure1, allure2, cucumberjson, junitXml, attachments], plugins = [], known, reportFiles, realTime, historyPath, historyLimit, defaultLabels = {}, variables = {}, environment, allowedEnvironments, environments, output, hideLabels, qualityGate, dump, categories, allureService: allureServiceConfig, globalAttachments, } = opts;
         if (allureServiceConfig?.accessToken) {
-            if (allureServiceConfig?.legacy) {
-                __classPrivateFieldSet(this, _AllureReport_allureServiceClient, new AllureLegacyServiceClient(allureServiceConfig), "f");
-            }
-            else {
-                __classPrivateFieldSet(this, _AllureReport_allureServiceClient, new AllureServiceClient(allureServiceConfig), "f");
-            }
+            __classPrivateFieldSet(this, _AllureReport_allureServiceClient, new AllureServiceClient(allureServiceConfig), "f");
         }
         this.reportUuid = randomUUID();
         __classPrivateFieldSet(this, _AllureReport_ci, detect(), "f");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@allurereport/core",
-  "version": "3.8.1",
+  "version": "3.8.2",
   "description": "Collection of generic Allure utilities used across the entire project",
   "keywords": [
     "allure"
@@ -25,25 +25,25 @@
     "lint:fix": "oxlint --import-plugin --fix src test features stories"
   },
   "dependencies": {
-    "@allurereport/ci": "3.8.1",
-    "@allurereport/core-api": "3.8.1",
-    "@allurereport/plugin-agent": "3.8.1",
-    "@allurereport/plugin-allure2": "3.8.1",
-    "@allurereport/plugin-api": "3.8.1",
-    "@allurereport/plugin-awesome": "3.8.1",
-    "@allurereport/plugin-classic": "3.8.1",
-    "@allurereport/plugin-csv": "3.8.1",
-    "@allurereport/plugin-dashboard": "3.8.1",
-    "@allurereport/plugin-jira": "3.8.1",
-    "@allurereport/plugin-log": "3.8.1",
-    "@allurereport/plugin-progress": "3.8.1",
-    "@allurereport/plugin-slack": "3.8.1",
-    "@allurereport/plugin-testops": "3.8.1",
-    "@allurereport/plugin-testplan": "3.8.1",
-    "@allurereport/reader": "3.8.1",
-    "@allurereport/reader-api": "3.8.1",
-    "@allurereport/service": "3.8.1",
-    "@allurereport/summary": "3.8.1",
+    "@allurereport/ci": "3.8.2",
+    "@allurereport/core-api": "3.8.2",
+    "@allurereport/plugin-agent": "3.8.2",
+    "@allurereport/plugin-allure2": "3.8.2",
+    "@allurereport/plugin-api": "3.8.2",
+    "@allurereport/plugin-awesome": "3.8.2",
+    "@allurereport/plugin-classic": "3.8.2",
+    "@allurereport/plugin-csv": "3.8.2",
+    "@allurereport/plugin-dashboard": "3.8.2",
+    "@allurereport/plugin-jira": "3.8.2",
+    "@allurereport/plugin-log": "3.8.2",
+    "@allurereport/plugin-progress": "3.8.2",
+    "@allurereport/plugin-slack": "3.8.2",
+    "@allurereport/plugin-testops": "3.8.2",
+    "@allurereport/plugin-testplan": "3.8.2",
+    "@allurereport/reader": "3.8.2",
+    "@allurereport/reader-api": "3.8.2",
+    "@allurereport/service": "3.8.2",
+    "@allurereport/summary": "3.8.2",
     "glob": "^13.0.6",
     "handlebars": "^4.7.9",
     "node-stream-zip": "^1.15.0",