@allurereport/core 3.6.2 → 3.7.0

package/dist/config.js

@@ -256,7 +256,7 @@ export const getPluginInstance = (config, predicate) => {
     return config?.plugins?.find(predicate);
 };
 const isModuleNotFoundError = (err) => {
-    return err instanceof Error && "code" in err && err.code === "ERR_MODULE_NOT_FOUND";
+    return (err instanceof Error && "code" in err && (err.code === "ERR_MODULE_NOT_FOUND" || err.code === "MODULE_NOT_FOUND"));
 };
 export const resolvePlugin = async (path) => {
     if (!path.startsWith("@allurereport/plugin-")) {

package/dist/report.js

@@ -23,7 +23,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 { AllureRemoteHistory, AllureServiceClient, KnownError, UnknownError } from "@allurereport/service";
+import { AllureLegacyServiceClient, AllureRemoteHistory, AllureServiceClient, KnownError, UnknownError, } from "@allurereport/service";
 import { generateSummary } from "@allurereport/summary";
 import { glob } from "glob";
 import ZipReadStream from "node-stream-zip";
@@ -39,6 +39,11 @@ import { RealtimeEventsDispatcher, RealtimeSubscriber } from "./utils/event.js";
 import { resolveDumpAttachmentPath, UnsafeDumpPathError } from "./utils/safeDumpPath.js";
 const { version } = JSON.parse(readFileSync(new URL("../package.json", import.meta.url), "utf8"));
 const initRequired = "report is not initialised. Call the start() method first.";
+const remoteReportParams = (ci) => {
+    const repo = ci?.repoName;
+    const branch = ci?.jobRunBranch;
+    return repo && branch ? { repo, branch } : {};
+};
 export class AllureReport {
     constructor(opts) {
         _AllureReport_instances.add(this);
@@ -121,7 +126,7 @@ export class AllureReport {
             });
         };
         this.start = async () => {
-            const branch = __classPrivateFieldGet(this, _AllureReport_ci, "f")?.jobRunBranch;
+            const remoteParams = remoteReportParams(__classPrivateFieldGet(this, _AllureReport_ci, "f"));
             await __classPrivateFieldGet(this, _AllureReport_store, "f").readHistory();
             if (__classPrivateFieldGet(this, _AllureReport_executionStage, "f") === "running") {
                 throw new Error("the report is already started");
@@ -148,13 +153,13 @@ export class AllureReport {
                     __classPrivateFieldGet(this, _AllureReport_realtimeDispatcher, "f").sendGlobalAttachment(new PathResultFile(absoluteFilePath, originalFileName), originalFileName);
                 }
             }
-            if (__classPrivateFieldGet(this, _AllureReport_allureServiceClient, "f") && __classPrivateFieldGet(this, _AllureReport_instances, "a", _AllureReport_publish_get) && branch) {
-                const { url } = await __classPrivateFieldGet(this, _AllureReport_allureServiceClient, "f").createReport({
+            if (__classPrivateFieldGet(this, _AllureReport_allureServiceClient, "f") && __classPrivateFieldGet(this, _AllureReport_instances, "a", _AllureReport_publish_get)) {
+                const url = await __classPrivateFieldGet(this, _AllureReport_allureServiceClient, "f").createReport({
                     reportUuid: this.reportUuid,
                     reportName: __classPrivateFieldGet(this, _AllureReport_reportName, "f"),
-                    branch,
+                    ...remoteParams,
                 });
-                this.reportUrl = url;
+                this.reportUrl = url.href;
             }
             await __classPrivateFieldGet(this, _AllureReport_eachPlugin, "f").call(this, true, async (plugin, context) => {
                 await plugin.start?.(context, __classPrivateFieldGet(this, _AllureReport_store, "f"), __classPrivateFieldGet(this, _AllureReport_realtimeSubscriber, "f"));
@@ -349,7 +354,8 @@ export class AllureReport {
         };
         this.done = async () => {
             const summaries = [];
-            const remoteHrefs = [];
+            const remoteHrefs = new Set();
+            const remoteHrefsByPluginId = {};
             const cancelledPluginsIds = new Set();
             if (__classPrivateFieldGet(this, _AllureReport_executionStage, "f") !== "running") {
                 throw new Error(initRequired);
@@ -377,24 +383,37 @@ export class AllureReport {
                         })
                         : undefined;
                     const limitFn = pLimit(50);
+                    const uploadAbortController = new AbortController();
                     const fns = pluginFilesEntries.map(([filename, filepath]) => limitFn(async () => {
-                        if (cancelledPluginsIds.has(context.id)) {
+                        if (cancelledPluginsIds.has(context.id) || uploadAbortController.signal.aborted) {
                             return;
                         }
                         if (/^(data|widgets|index\.html$|summary\.json$)/.test(filename)) {
-                            await __classPrivateFieldGet(this, _AllureReport_allureServiceClient, "f").addReportFile({
+                            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,
                             });
                         }
+                        if (cancelledPluginsIds.has(context.id) || uploadAbortController.signal.aborted) {
+                            return;
+                        }
                         progressBar?.tick?.();
                     }));
                     progressBar?.render?.();
@@ -403,6 +422,13 @@ export class AllureReport {
                     }
                     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,
@@ -418,9 +444,12 @@ export class AllureReport {
                 summary.pluginId = context.id;
                 summary.pullRequestHref = __classPrivateFieldGet(this, _AllureReport_ci, "f")?.pullRequestUrl;
                 summary.jobHref = __classPrivateFieldGet(this, _AllureReport_ci, "f")?.jobRunUrl;
-                if (context.publish && this.reportUrl && !cancelledPluginsIds.has(context.id)) {
-                    summary.remoteHref = `${this.reportUrl}/${context.id}/`;
-                    remoteHrefs.push(summary.remoteHref);
+                if (context.publish && !cancelledPluginsIds.has(context.id)) {
+                    summary.remoteHref =
+                        remoteHrefsByPluginId[context.id] ?? (this.reportUrl ? `${this.reportUrl}/${context.id}/` : undefined);
+                    if (summary.remoteHref) {
+                        remoteHrefs.add(summary.remoteHref);
+                    }
                 }
                 summaries.push({
                     ...summary,
@@ -490,7 +519,7 @@ export class AllureReport {
                     }
                 }
             }
-            if (remoteHrefs.length > 0) {
+            if (remoteHrefs.size > 0) {
                 console.info("Next reports have been published:");
                 remoteHrefs.forEach((href) => {
                     console.info(`- ${href}`);
@@ -553,9 +582,14 @@ 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;
-        __classPrivateFieldSet(this, _AllureReport_allureServiceClient, allureServiceConfig?.accessToken
-            ? new AllureServiceClient(allureServiceConfig)
-            : undefined, "f");
+        if (allureServiceConfig?.accessToken) {
+            if (allureServiceConfig?.legacy) {
+                __classPrivateFieldSet(this, _AllureReport_allureServiceClient, new AllureLegacyServiceClient(allureServiceConfig), "f");
+            }
+            else if (allureServiceConfig?.url) {
+                __classPrivateFieldSet(this, _AllureReport_allureServiceClient, new AllureServiceClient(allureServiceConfig), "f");
+            }
+        }
         this.reportUuid = randomUUID();
         __classPrivateFieldSet(this, _AllureReport_ci, detect(), "f");
         const reportTitleSuffix = __classPrivateFieldGet(this, _AllureReport_ci, "f")?.pullRequestName ?? __classPrivateFieldGet(this, _AllureReport_ci, "f")?.jobRunName;
@@ -576,7 +610,7 @@ export class AllureReport {
         if (__classPrivateFieldGet(this, _AllureReport_allureServiceClient, "f")) {
             __classPrivateFieldSet(this, _AllureReport_history, new AllureRemoteHistory({
                 limit: historyLimit,
-                branch: __classPrivateFieldGet(this, _AllureReport_ci, "f")?.jobRunBranch,
+                ...remoteReportParams(__classPrivateFieldGet(this, _AllureReport_ci, "f")),
                 allureServiceClient: __classPrivateFieldGet(this, _AllureReport_allureServiceClient, "f"),
             }), "f");
         }

package/dist/store/convert.js

@@ -78,6 +78,7 @@ const processTestCase = ({ testCases }, raw) => {
         const testCase = {
             id,
             allureId,
+            externalId: raw.testId,
             name: raw.testCaseName ?? raw.name ?? __unknown,
             fullName: raw.fullName,
         };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@allurereport/core",
-  "version": "3.6.2",
+  "version": "3.7.0",
   "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.6.2",
-    "@allurereport/core-api": "3.6.2",
-    "@allurereport/plugin-agent": "3.6.2",
-    "@allurereport/plugin-allure2": "3.6.2",
-    "@allurereport/plugin-api": "3.6.2",
-    "@allurereport/plugin-awesome": "3.6.2",
-    "@allurereport/plugin-classic": "3.6.2",
-    "@allurereport/plugin-csv": "3.6.2",
-    "@allurereport/plugin-dashboard": "3.6.2",
-    "@allurereport/plugin-jira": "3.6.2",
-    "@allurereport/plugin-log": "3.6.2",
-    "@allurereport/plugin-progress": "3.6.2",
-    "@allurereport/plugin-slack": "3.6.2",
-    "@allurereport/plugin-testops": "3.6.2",
-    "@allurereport/plugin-testplan": "3.6.2",
-    "@allurereport/reader": "3.6.2",
-    "@allurereport/reader-api": "3.6.2",
-    "@allurereport/service": "3.6.2",
-    "@allurereport/summary": "3.6.2",
+    "@allurereport/ci": "3.7.0",
+    "@allurereport/core-api": "3.7.0",
+    "@allurereport/plugin-agent": "3.7.0",
+    "@allurereport/plugin-allure2": "3.7.0",
+    "@allurereport/plugin-api": "3.7.0",
+    "@allurereport/plugin-awesome": "3.7.0",
+    "@allurereport/plugin-classic": "3.7.0",
+    "@allurereport/plugin-csv": "3.7.0",
+    "@allurereport/plugin-dashboard": "3.7.0",
+    "@allurereport/plugin-jira": "3.7.0",
+    "@allurereport/plugin-log": "3.7.0",
+    "@allurereport/plugin-progress": "3.7.0",
+    "@allurereport/plugin-slack": "3.7.0",
+    "@allurereport/plugin-testops": "3.7.0",
+    "@allurereport/plugin-testplan": "3.7.0",
+    "@allurereport/reader": "3.7.0",
+    "@allurereport/reader-api": "3.7.0",
+    "@allurereport/service": "3.7.0",
+    "@allurereport/summary": "3.7.0",
     "glob": "^13.0.6",
     "handlebars": "^4.7.9",
     "node-stream-zip": "^1.15.0",