@allurereport/service 3.0.0-beta.20 → 3.0.0-beta.22

package/dist/history.d.ts

@@ -1,8 +1,8 @@
-import type { AllureHistory, HistoryDataPoint } from "@allurereport/core-api";
+import type { AllureHistory } from "@allurereport/core-api";
 import type { AllureServiceClient } from "./service.js";
 export declare class AllureRemoteHistory implements AllureHistory {
     readonly allureServiceClient: AllureServiceClient;
     constructor(allureServiceClient: AllureServiceClient);
-    readHistory(branch?: string): Promise<HistoryDataPoint[]>;
-    appendHistory(data: HistoryDataPoint, branch?: string): Promise<void>;
+    readHistory(branch: string): Promise<import("@allurereport/core-api").HistoryDataPoint[]>;
+    appendHistory(): Promise<void>;
 }

package/dist/history.js

@@ -5,9 +5,7 @@ export class AllureRemoteHistory {
     }
     async readHistory(branch) {
         try {
-            const res = await this.allureServiceClient.downloadHistory({
-                branch,
-            });
+            const res = await this.allureServiceClient.downloadHistory(branch);
             return res;
         }
         catch (err) {
@@ -17,10 +15,6 @@ export class AllureRemoteHistory {
             throw err;
         }
     }
-    async appendHistory(data, branch) {
-        await this.allureServiceClient.appendHistory({
-            history: data,
-            branch,
-        });
+    async appendHistory() {
     }
 }

package/dist/service.d.ts

@@ -5,20 +5,28 @@ export declare class AllureServiceClient {
     readonly config: Config["allureService"] & {
         pollingDelay?: number;
     };
-    project: string | undefined;
+    currentProjectUuid: string | undefined;
     constructor(config: Config["allureService"] & {
         pollingDelay?: number;
     });
     setProject(project: string): void;
-    login(): Promise<string>;
+    login(): Promise<any>;
     logout(): Promise<void>;
     profile(): Promise<{
         email: string;
     }>;
     projects(): Promise<{
-        id: string;
-        name: string;
-    }[]>;
+        projects: {
+            id: string;
+            name: string;
+        }[];
+    }>;
+    project(uuid: string): Promise<{
+        project: {
+            id: string;
+            name: string;
+        };
+    }>;
     createProject(payload: {
         name: string;
     }): Promise<{
@@ -26,26 +34,19 @@ export declare class AllureServiceClient {
         name: string;
     }>;
     deleteProject(payload: {
-        name: string;
-    }): Promise<{
         id: string;
-        name: string;
-    }>;
-    appendHistory(payload: {
-        history: HistoryDataPoint;
-        branch?: string;
     }): Promise<unknown>;
-    downloadHistory(payload?: {
-        branch?: string;
-    }): Promise<HistoryDataPoint[]>;
+    downloadHistory(branch: string): Promise<HistoryDataPoint[]>;
     createReport(payload: {
         reportName: string;
         reportUuid?: string;
+        branch?: string;
     }): Promise<{
         url: string;
     }>;
     completeReport(payload: {
         reportUuid: string;
+        historyPoint: HistoryDataPoint;
     }): Promise<unknown>;
     addReportAsset(payload: {
         filename: string;
@@ -54,7 +55,7 @@ export declare class AllureServiceClient {
     }): Promise<unknown>;
     addReportFile(payload: {
         reportUuid: string;
-        pluginId: string;
+        pluginId?: string;
         filename: string;
         file?: Buffer;
         filepath?: string;

package/dist/service.js

@@ -9,14 +9,16 @@ 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 _AllureServiceClient_client, _AllureServiceClient_url, _AllureServiceClient_pollingDelay;
+var _AllureServiceClient_instances, _AllureServiceClient_client, _AllureServiceClient_url, _AllureServiceClient_pollingDelay, _AllureServiceClient_getClientUrl;
 import { readFile } from "node:fs/promises";
 import { join as joinPosix } from "node:path/posix";
 import open from "open";
 import { createServiceHttpClient } from "./utils/http.js";
 import { decryptExchangeToken, deleteAccessToken, writeAccessToken, writeExchangeToken } from "./utils/token.js";
+const ASSET_MAX_FILE_SIZE = 200 * 1024 * 1024;
 export class AllureServiceClient {
     constructor(config) {
+        _AllureServiceClient_instances.add(this);
         this.config = config;
         _AllureServiceClient_client.set(this, void 0);
         _AllureServiceClient_url.set(this, void 0);
@@ -27,14 +29,15 @@ export class AllureServiceClient {
         __classPrivateFieldSet(this, _AllureServiceClient_url, config.url, "f");
         __classPrivateFieldSet(this, _AllureServiceClient_client, createServiceHttpClient(__classPrivateFieldGet(this, _AllureServiceClient_url, "f"), config?.accessToken), "f");
         __classPrivateFieldSet(this, _AllureServiceClient_pollingDelay, config?.pollingDelay ?? 2500, "f");
-        this.project = config?.project;
+        this.currentProjectUuid = config?.project;
     }
     setProject(project) {
-        this.project = project;
+        this.currentProjectUuid = project;
     }
     async login() {
+        const clientUrl = await __classPrivateFieldGet(this, _AllureServiceClient_instances, "m", _AllureServiceClient_getClientUrl).call(this);
         const exchangeToken = await writeExchangeToken();
-        const connectUrl = new URL("/connect", __classPrivateFieldGet(this, _AllureServiceClient_url, "f"));
+        const connectUrl = new URL("/connect", clientUrl);
         connectUrl.searchParams.set("token", decryptExchangeToken(exchangeToken));
         await open(connectUrl.toString());
         let currentExchangeAttemptTimeout;
@@ -42,7 +45,7 @@ export class AllureServiceClient {
             const makeExchangeAttempt = () => {
                 return globalThis.setTimeout(async () => {
                     const token = decryptExchangeToken(exchangeToken);
-                    const { accessToken } = await __classPrivateFieldGet(this, _AllureServiceClient_client, "f").post("/api/auth/tokens/exchange", {
+                    const { accessToken } = await __classPrivateFieldGet(this, _AllureServiceClient_client, "f").post("/auth/exchange", {
                         headers: {
                             "Content-Type": "application/json",
                         },
@@ -66,67 +69,53 @@ export class AllureServiceClient {
         await deleteAccessToken();
     }
     async profile() {
-        return __classPrivateFieldGet(this, _AllureServiceClient_client, "f").get("/api/user/profile");
+        const { user } = await __classPrivateFieldGet(this, _AllureServiceClient_client, "f").get("/user/profile");
+        return user;
     }
     async projects() {
-        return __classPrivateFieldGet(this, _AllureServiceClient_client, "f").get("/api/projects/list");
+        return __classPrivateFieldGet(this, _AllureServiceClient_client, "f").get("/projects");
+    }
+    async project(uuid) {
+        return __classPrivateFieldGet(this, _AllureServiceClient_client, "f").get(`/projects/${uuid}`);
     }
     async createProject(payload) {
-        return __classPrivateFieldGet(this, _AllureServiceClient_client, "f").post("/api/projects/create", {
+        const { project } = await __classPrivateFieldGet(this, _AllureServiceClient_client, "f").post("/projects", {
             body: payload,
         });
+        return project;
     }
     async deleteProject(payload) {
-        return __classPrivateFieldGet(this, _AllureServiceClient_client, "f").post("/api/projects/delete", {
-            body: payload,
-        });
-    }
-    async appendHistory(payload) {
-        if (!this.project) {
-            throw new Error("Project is not set");
-        }
-        return __classPrivateFieldGet(this, _AllureServiceClient_client, "f").post("/api/history/append", {
-            headers: {
-                "Content-Type": "application/json",
-            },
-            body: {
-                ...payload,
-                project: this.project,
-            },
-        });
+        return __classPrivateFieldGet(this, _AllureServiceClient_client, "f").delete(`/projects/${payload.id}`);
     }
-    async downloadHistory(payload) {
-        if (!this.project) {
+    async downloadHistory(branch) {
+        if (!this.currentProjectUuid) {
             throw new Error("Project is not set");
         }
-        return __classPrivateFieldGet(this, _AllureServiceClient_client, "f").get("/api/history/download", {
-            params: {
-                project: this.project,
-                ...payload,
-            },
-        });
+        const { history } = await __classPrivateFieldGet(this, _AllureServiceClient_client, "f").get(`/projects/${this.currentProjectUuid}/${branch}/history`);
+        return history;
     }
     async createReport(payload) {
-        const { reportName, reportUuid } = payload;
-        if (!this.project) {
+        const { reportName, reportUuid, branch } = payload;
+        if (!this.currentProjectUuid) {
             throw new Error("Project is not set");
         }
-        return __classPrivateFieldGet(this, _AllureServiceClient_client, "f").post("/api/reports/create", {
+        return __classPrivateFieldGet(this, _AllureServiceClient_client, "f").post("/reports", {
             body: {
-                project: this.project,
+                projectUuid: this.currentProjectUuid,
                 reportName,
                 reportUuid,
+                branch,
             },
         });
     }
     async completeReport(payload) {
-        const { reportUuid } = payload;
-        if (!this.project) {
+        const { reportUuid, historyPoint } = payload;
+        if (!this.currentProjectUuid) {
             throw new Error("Project is not set");
         }
-        return __classPrivateFieldGet(this, _AllureServiceClient_client, "f").post("/api/reports/complete", {
+        return __classPrivateFieldGet(this, _AllureServiceClient_client, "f").post(`/reports/${reportUuid}/complete`, {
             body: {
-                id: reportUuid,
+                historyPoint,
             },
         });
     }
@@ -139,10 +128,13 @@ export class AllureServiceClient {
         if (!content) {
             content = await readFile(filepath);
         }
+        if (content.length > ASSET_MAX_FILE_SIZE) {
+            throw new Error(`Asset size exceeds the maximum allowed size of ${ASSET_MAX_FILE_SIZE / (1024 * 1024)}MB`);
+        }
         const form = new FormData();
         form.set("filename", filename);
         form.set("file", content);
-        return __classPrivateFieldGet(this, _AllureServiceClient_client, "f").post("/api/assets/upload", {
+        return __classPrivateFieldGet(this, _AllureServiceClient_client, "f").post("/assets/upload", {
             body: form,
             headers: {
                 "Content-Type": "multipart/form-data",
@@ -158,10 +150,13 @@ export class AllureServiceClient {
         if (!content) {
             content = await readFile(filepath);
         }
+        if (content.length > ASSET_MAX_FILE_SIZE) {
+            throw new Error(`Report file size exceeds the maximum allowed size of ${ASSET_MAX_FILE_SIZE / (1024 * 1024)}MB`);
+        }
         const form = new FormData();
-        form.set("filename", joinPosix(pluginId, filename));
+        form.set("filename", pluginId ? joinPosix(pluginId, filename) : filename);
         form.set("file", content);
-        await __classPrivateFieldGet(this, _AllureServiceClient_client, "f").post(`/api/reports/upload/${reportUuid}`, {
+        await __classPrivateFieldGet(this, _AllureServiceClient_client, "f").post(`/reports/${reportUuid}/upload`, {
             body: form,
             headers: {
                 "Content-Type": "multipart/form-data",
@@ -170,4 +165,7 @@ export class AllureServiceClient {
         return joinPosix(__classPrivateFieldGet(this, _AllureServiceClient_url, "f"), reportUuid, filename);
     }
 }
-_AllureServiceClient_client = new WeakMap(), _AllureServiceClient_url = new WeakMap(), _AllureServiceClient_pollingDelay = new WeakMap();
+_AllureServiceClient_client = new WeakMap(), _AllureServiceClient_url = new WeakMap(), _AllureServiceClient_pollingDelay = new WeakMap(), _AllureServiceClient_instances = new WeakSet(), _AllureServiceClient_getClientUrl = async function _AllureServiceClient_getClientUrl() {
+    const { url } = await __classPrivateFieldGet(this, _AllureServiceClient_client, "f").get("/info");
+    return url;
+};

package/dist/utils/http.js

@@ -1,4 +1,4 @@
-import axios, { AxiosError } from "axios";
+import axios, { isAxiosError } from "axios";
 import { DEFAULT_HISTORY_SERVICE_URL } from "../model.js";
 import { readAccessToken } from "./token.js";
 export class KnownError extends Error {
@@ -46,15 +46,16 @@ export const createServiceHttpClient = (historyServiceURL = DEFAULT_HISTORY_SERV
             return res.data;
         }
         catch (err) {
-            if (!(err instanceof AxiosError)) {
+            const axiosError = isAxiosError(err);
+            if (!axiosError) {
                 throw err;
             }
             const { status = 500 } = err.response ?? {};
+            const errorMessage = err.response?.data?.error || err.response?.data || err.message;
             if (status < 500) {
-                throw new KnownError(err.response?.data ?? err.message, status);
+                throw new KnownError(errorMessage, status);
             }
-            const { response, message, errors, stack } = err;
-            throw new UnknownError(response?.data ?? errors?.[0]?.message?.trim?.() ?? message, stack);
+            throw new UnknownError(errorMessage, err.stack);
         }
     };
     return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@allurereport/service",
-  "version": "3.0.0-beta.20",
+  "version": "3.0.0-beta.22",
   "description": "Allure Service API",
   "keywords": [
     "allure",
@@ -30,9 +30,9 @@
     "test": "rimraf ./out && vitest run"
   },
   "dependencies": {
-    "@allurereport/core-api": "3.0.0-beta.20",
-    "@allurereport/plugin-api": "3.0.0-beta.20",
-    "axios": "^1.8.4",
+    "@allurereport/core-api": "3.0.0-beta.22",
+    "@allurereport/plugin-api": "3.0.0-beta.22",
+    "axios": "^1.13.1",
     "open": "^10.1.0"
   },
   "devDependencies": {