@allurereport/service 3.14.1 → 3.14.2

package/dist/model.d.ts

@@ -15,6 +15,7 @@ export type UploadReportPayload = {
     pluginId?: string;
     files: Record<string, string> | Record<string, string>[];
     onProgress?: (uploadedFilesDelta?: number) => void;
+    uploadBatchMaxBytes?: number;
 };
 export type UploadReportFilePayload = {
     filename: string;

package/dist/service.js

@@ -10,25 +10,15 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _AllureServiceClient_client, _AllureServiceClient_url;
-import { readFile } from "node:fs/promises";
 import { join as joinPosix } from "node:path/posix";
 import { ALLURE_SERVICE_STORAGE_PREFIX, } from "./model.js";
 import { createServiceHttpClient, uploadReport } from "./utils/http.js";
 import { parseServiceToken } from "./utils/token.js";
+import { createUploadForm } from "./utils/upload.js";
 const UPLOAD_CONTENT_TYPE = "application/octet-stream";
 const createUploadBlob = (content) => new Blob([content], { type: UPLOAD_CONTENT_TYPE });
 const createReportUrl = (baseUrl, reportUuid) => `${baseUrl}/${reportUuid}`;
 const createReportFileUrl = (baseUrl, reportUuid, reportFilename) => `${baseUrl}/${joinPosix(reportUuid, reportFilename)}`;
-const readUploadContent = async (payload) => {
-    const { file, filepath, signal } = payload;
-    if (file) {
-        return file;
-    }
-    if (!filepath) {
-        throw new Error("File or filepath is required");
-    }
-    return signal ? readFile(filepath, { signal }) : readFile(filepath);
-};
 export class AllureServiceClient {
     constructor(config) {
         this.config = config;
@@ -94,15 +84,7 @@ export class AllureServiceClient {
         if (files.length === 0) {
             return undefined;
         }
-        const entries = await Promise.all(files.map(async ({ filename, ...filePayload }) => ({
-            filename,
-            content: await readUploadContent({ filename, ...filePayload, signal: signal ?? filePayload.signal }),
-        })));
-        const form = new FormData();
-        for (const { filename, content } of entries) {
-            form.append("filename", filename);
-            form.append("file", createUploadBlob(content), filename);
-        }
+        const { form } = await createUploadForm(files, createUploadBlob, signal);
         return __classPrivateFieldGet(this, _AllureServiceClient_client, "f").post("/api/assets/upload", {
             body: form,
             headers: {
@@ -119,19 +101,7 @@ export class AllureServiceClient {
         if (files.length === 0) {
             return {};
         }
-        const entries = await Promise.all(files.map(async ({ filename, ...filePayload }) => {
-            const reportFilename = pluginId ? joinPosix(pluginId, filename) : filename;
-            return {
-                filename,
-                reportFilename,
-                content: await readUploadContent({ filename, ...filePayload, signal: signal ?? filePayload.signal }),
-            };
-        }));
-        const form = new FormData();
-        for (const { reportFilename, content } of entries) {
-            form.append("filename", reportFilename);
-            form.append("file", createUploadBlob(content), reportFilename);
-        }
+        const { entries, form } = await createUploadForm(files, createUploadBlob, signal, (filename) => pluginId ? joinPosix(pluginId, filename) : filename);
         await __classPrivateFieldGet(this, _AllureServiceClient_client, "f").post(`/api/reports/${reportUuid}/upload`, {
             body: form,
             headers: {
@@ -154,8 +124,9 @@ export class AllureServiceClient {
         return result[payload.filename];
     }
     async uploadReport(payload) {
+        const { uploadBatchMaxBytes: _uploadBatchMaxBytes, ...uploadPayload } = payload;
         return uploadReport({
-            ...payload,
+            ...uploadPayload,
             uploadConcurrency: this.config.uploadConcurrency,
             uploadMaxAttempts: this.config.uploadMaxAttempts,
             uploadMaxSimultaneousFailures: this.config.uploadMaxSimultaneousFailures,

package/dist/testops.d.ts

@@ -25,6 +25,15 @@ export declare class AllureTestOpsClient implements AllureServiceApiClient {
         filepath?: string;
         signal?: AbortSignal;
     }): Promise<unknown>;
+    addReportAssets(payload: {
+        files: {
+            filename: string;
+            file?: Buffer;
+            filepath?: string;
+            signal?: AbortSignal;
+        }[];
+        signal?: AbortSignal;
+    }): Promise<unknown>;
     addReportFile(payload: {
         reportUuid: string;
         pluginId?: string;
@@ -33,5 +42,18 @@ export declare class AllureTestOpsClient implements AllureServiceApiClient {
         filepath?: string;
         signal?: AbortSignal;
     }): Promise<string>;
+    addReportFiles(payload: {
+        reportUuid: string;
+        pluginId?: string;
+        files: {
+            filename: string;
+            file?: Buffer;
+            filepath?: string;
+            signal?: AbortSignal;
+        }[];
+        signal?: AbortSignal;
+    }): Promise<{
+        [k: string]: string;
+    }>;
     uploadReport(payload: UploadReportPayload): Promise<import("./model.js").UploadReportResult>;
 }

package/dist/testops.js

@@ -10,12 +10,13 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _AllureTestOpsClient_instances, _AllureTestOpsClient_url, _AllureTestOpsClient_accessToken, _AllureTestOpsClient_projectId, _AllureTestOpsClient_client, _AllureTestOpsClient_authorizedClient;
-import { readFile } from "node:fs/promises";
 import { extname, join as joinPosix } from "node:path/posix";
 import { ALLURE_SERVICE_TESTOPS_PREFIX, } from "./model.js";
 import { createServiceHttpClient, uploadReport } from "./utils/http.js";
 import { parseServiceToken } from "./utils/token.js";
+import { createUploadForm } from "./utils/upload.js";
 const DEFAULT_UPLOAD_CONTENT_TYPE = "application/octet-stream";
+const UPLOAD_BATCH_MAX_BYTES = 8 * 1024 * 1024;
 const CONTENT_TYPES = {
     ".css": "text/css",
     ".gif": "image/gif",
@@ -90,17 +91,8 @@ export class AllureTestOpsClient {
         return client.delete(`/api/test-report/${reportUuid}`);
     }
     async addReportAsset(payload) {
-        const { filename, file, filepath, signal } = payload;
-        if (!file && !filepath) {
-            throw new Error("File or filepath is required");
-        }
-        let content = file;
-        if (!content) {
-            content = signal ? await readFile(filepath, { signal }) : await readFile(filepath);
-        }
-        const form = new FormData();
-        form.set("filename", filename);
-        form.set("file", createUploadBlob(content, filename), filename);
+        const { file, filepath, filename, signal } = payload;
+        const { form } = await createUploadForm([{ filename, file, filepath, signal }], createUploadBlob, signal);
         const client = await __classPrivateFieldGet(this, _AllureTestOpsClient_instances, "m", _AllureTestOpsClient_authorizedClient).call(this);
         return client.post("/api/test-report/upload", {
             body: form,
@@ -110,19 +102,25 @@ export class AllureTestOpsClient {
             ...(signal ? { signal } : {}),
         });
     }
+    async addReportAssets(payload) {
+        const { files, signal } = payload;
+        if (files.length === 0) {
+            return undefined;
+        }
+        const { form } = await createUploadForm(files, createUploadBlob, signal);
+        const client = await __classPrivateFieldGet(this, _AllureTestOpsClient_instances, "m", _AllureTestOpsClient_authorizedClient).call(this);
+        return client.post("/api/test-report/upload/batch", {
+            body: form,
+            headers: {
+                "Content-Type": "multipart/form-data",
+            },
+            ...(signal ? { signal } : {}),
+        });
+    }
     async addReportFile(payload) {
-        const { reportUuid, filename, file, filepath, pluginId, signal } = payload;
+        const { reportUuid, pluginId, filename, file, filepath, signal } = payload;
         const reportFilename = pluginId ? joinPosix(pluginId, filename) : filename;
-        if (!file && !filepath) {
-            throw new Error("File or filepath is required");
-        }
-        let content = file;
-        if (!content) {
-            content = signal ? await readFile(filepath, { signal }) : await readFile(filepath);
-        }
-        const form = new FormData();
-        form.set("filename", reportFilename);
-        form.set("file", createUploadBlob(content, reportFilename), reportFilename);
+        const { form } = await createUploadForm([{ filename, file, filepath, signal }], createUploadBlob, signal, () => reportFilename);
         const client = await __classPrivateFieldGet(this, _AllureTestOpsClient_instances, "m", _AllureTestOpsClient_authorizedClient).call(this);
         await client.post(`/api/test-report/${reportUuid}/upload`, {
             body: form,
@@ -133,14 +131,36 @@ export class AllureTestOpsClient {
         });
         return createReportFileUrl(__classPrivateFieldGet(this, _AllureTestOpsClient_url, "f"), reportUuid, reportFilename);
     }
+    async addReportFiles(payload) {
+        const { reportUuid, pluginId, files, signal } = payload;
+        if (files.length === 0) {
+            return {};
+        }
+        const { entries, form } = await createUploadForm(files, createUploadBlob, signal, (filename) => pluginId ? joinPosix(pluginId, filename) : filename);
+        const client = await __classPrivateFieldGet(this, _AllureTestOpsClient_instances, "m", _AllureTestOpsClient_authorizedClient).call(this);
+        await client.post(`/api/test-report/${reportUuid}/upload/batch`, {
+            body: form,
+            headers: {
+                "Content-Type": "multipart/form-data",
+            },
+            ...(signal ? { signal } : {}),
+        });
+        return Object.fromEntries(entries.map(({ filename, reportFilename }) => [
+            filename,
+            createReportFileUrl(__classPrivateFieldGet(this, _AllureTestOpsClient_url, "f"), reportUuid, reportFilename),
+        ]));
+    }
     async uploadReport(payload) {
         return uploadReport({
             ...payload,
             uploadConcurrency: this.config.uploadConcurrency,
             uploadMaxAttempts: this.config.uploadMaxAttempts,
             uploadMaxSimultaneousFailures: this.config.uploadMaxSimultaneousFailures,
+            uploadBatchMaxBytes: UPLOAD_BATCH_MAX_BYTES,
             addReportAsset: this.addReportAsset.bind(this),
+            addReportAssets: this.addReportAssets.bind(this),
             addReportFile: this.addReportFile.bind(this),
+            addReportFiles: this.addReportFiles.bind(this),
         });
     }
 }

package/dist/utils/http.js

@@ -1,3 +1,4 @@
+import { stat } from "node:fs/promises";
 import axios, { isAxiosError } from "axios";
 import { isReportDataFile } from "./files.js";
 export class KnownError extends Error {
@@ -48,6 +49,33 @@ const createUploadFileBatches = (files) => {
     flushBatch();
     return batches;
 };
+const createUploadFileBatchesBySize = async (files, maxBytes) => {
+    const entries = Object.entries(files);
+    const batches = [];
+    let batch = {};
+    let batchFiles = 0;
+    let batchBytes = 0;
+    const flushBatch = () => {
+        if (batchFiles === 0) {
+            return;
+        }
+        batches.push(batch);
+        batch = {};
+        batchFiles = 0;
+        batchBytes = 0;
+    };
+    for (const [filename, filepath] of entries) {
+        const fileBytes = (await stat(filepath)).size;
+        if (batchFiles >= MAX_UPLOAD_BATCH_FILES || (batchBytes > 0 && batchBytes + fileBytes > maxBytes)) {
+            flushBatch();
+        }
+        batch[filename] = filepath;
+        batchFiles += 1;
+        batchBytes += fileBytes;
+    }
+    flushBatch();
+    return batches;
+};
 export const formatResponseErrorData = (data) => {
     if (data === undefined || data === null || data === "") {
         return undefined;
@@ -163,8 +191,17 @@ const uploadWithRetry = async (batchId, uploadAbortController, failedUploads, ma
     return false;
 };
 export const uploadReport = async (payload) => {
-    const { reportUuid, pluginId, files, onProgress, addReportAsset, addReportFile, uploadConcurrency, uploadMaxAttempts, uploadMaxSimultaneousFailures, } = payload;
-    const fileBatches = Array.isArray(files) ? files.flatMap(createUploadFileBatches) : createUploadFileBatches(files);
+    const { reportUuid, pluginId, files, onProgress, uploadBatchMaxBytes, uploadConcurrency, uploadMaxAttempts, uploadMaxSimultaneousFailures, } = payload;
+    let fileBatches;
+    if (uploadBatchMaxBytes === undefined) {
+        fileBatches = Array.isArray(files) ? files.flatMap(createUploadFileBatches) : createUploadFileBatches(files);
+    }
+    else if (Array.isArray(files)) {
+        fileBatches = (await Promise.all(files.map((fileBatch) => createUploadFileBatchesBySize(fileBatch, uploadBatchMaxBytes)))).flat();
+    }
+    else {
+        fileBatches = await createUploadFileBatchesBySize(files, uploadBatchMaxBytes);
+    }
     if (fileBatches.length === 0) {
         return {
             hrefs: {},

package/dist/utils/upload.d.ts

@@ -0,0 +1,10 @@
+import type { UploadReportFilePayload } from "../model.js";
+export declare const readUploadContent: (payload: UploadReportFilePayload) => Promise<Buffer<ArrayBufferLike>>;
+export declare const createUploadForm: (files: UploadReportFilePayload[], createUploadBlob: (content: Buffer, filename: string) => Blob, signal?: AbortSignal, mapFilename?: (filename: string) => string) => Promise<{
+    entries: {
+        filename: string;
+        reportFilename: string;
+        content: Buffer<ArrayBufferLike>;
+    }[];
+    form: import("undici-types").FormData;
+}>;

package/dist/utils/upload.js

@@ -0,0 +1,27 @@
+import { readFile } from "node:fs/promises";
+export const readUploadContent = async (payload) => {
+    const { file, filepath, signal } = payload;
+    if (file) {
+        return file;
+    }
+    if (!filepath) {
+        throw new Error("File or filepath is required");
+    }
+    return signal ? readFile(filepath, { signal }) : readFile(filepath);
+};
+export const createUploadForm = async (files, createUploadBlob, signal, mapFilename) => {
+    const entries = await Promise.all(files.map(async ({ filename, ...filePayload }) => {
+        const reportFilename = mapFilename ? mapFilename(filename) : filename;
+        return {
+            filename,
+            reportFilename,
+            content: await readUploadContent({ filename, ...filePayload, signal: signal ?? filePayload.signal }),
+        };
+    }));
+    const form = new FormData();
+    for (const { reportFilename, content } of entries) {
+        form.append("filename", reportFilename);
+        form.append("file", createUploadBlob(content, reportFilename), reportFilename);
+    }
+    return { entries, form };
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@allurereport/service",
-  "version": "3.14.1",
+  "version": "3.14.2",
   "description": "Allure Service API",
   "keywords": [
     "allure",
@@ -30,8 +30,8 @@
     "lint:fix": "oxlint --import-plugin --fix src test features stories"
   },
   "dependencies": {
-    "@allurereport/core-api": "3.14.1",
-    "@allurereport/plugin-api": "3.14.1",
+    "@allurereport/core-api": "3.14.2",
+    "@allurereport/plugin-api": "3.14.2",
     "axios": "^1.18.1",
     "open": "^11.0.0"
   },