@muuktest/amikoo-reporter 1.0.5 → 1.1.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/amikooArtifacts.d.ts +22 -0
- package/dist/amikooArtifacts.d.ts.map +1 -0
- package/dist/amikooArtifacts.js +98 -0
- package/dist/amikooArtifacts.js.map +1 -0
- package/dist/apiUtils.d.ts +1 -0
- package/dist/apiUtils.d.ts.map +1 -1
- package/dist/apiUtils.js +8 -2
- package/dist/apiUtils.js.map +1 -1
- package/dist/controlHubReporter.d.ts +2 -0
- package/dist/controlHubReporter.d.ts.map +1 -1
- package/dist/controlHubReporter.js +12 -0
- package/dist/controlHubReporter.js.map +1 -1
- package/dist/reporterOrder.d.ts +2 -0
- package/dist/reporterOrder.d.ts.map +1 -0
- package/dist/reporterOrder.js +30 -0
- package/dist/reporterOrder.js.map +1 -0
- package/dist/s3Upload.d.ts +6 -0
- package/dist/s3Upload.d.ts.map +1 -0
- package/dist/s3Upload.js +39 -0
- package/dist/s3Upload.js.map +1 -0
- package/dist/zipUtils.d.ts +3 -0
- package/dist/zipUtils.d.ts.map +1 -0
- package/dist/zipUtils.js +165 -0
- package/dist/zipUtils.js.map +1 -0
- package/install.js +118 -22
- package/package.json +3 -1
|
@@ -0,0 +1,22 @@
|
|
|
1
|
+
export interface AmikooArtifact {
|
|
2
|
+
hash: string;
|
|
3
|
+
testTitle: string;
|
|
4
|
+
localPath: string;
|
|
5
|
+
attachmentName: string;
|
|
6
|
+
specFile: string;
|
|
7
|
+
}
|
|
8
|
+
interface UploadOptions {
|
|
9
|
+
token: string;
|
|
10
|
+
amikooKey: string;
|
|
11
|
+
signedUrlEndpoint?: string;
|
|
12
|
+
repoRoot: string;
|
|
13
|
+
}
|
|
14
|
+
export declare function collectAmikooArtifacts(result: {
|
|
15
|
+
attachments?: Array<{
|
|
16
|
+
name?: string;
|
|
17
|
+
path?: string;
|
|
18
|
+
}>;
|
|
19
|
+
}, testId: string, fullTitle: string, specFile: string): AmikooArtifact[];
|
|
20
|
+
export declare function uploadAmikooArtifacts(files: AmikooArtifact[], opts: UploadOptions): Promise<void>;
|
|
21
|
+
export {};
|
|
22
|
+
//# sourceMappingURL=amikooArtifacts.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"amikooArtifacts.d.ts","sourceRoot":"","sources":["../controlHub/amikooArtifacts.ts"],"names":[],"mappings":"AAOA,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,cAAc,EAAE,MAAM,CAAC;IACvB,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,UAAU,aAAa;IACrB,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;IAClB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,QAAQ,EAAE,MAAM,CAAC;CAClB;AAcD,wBAAgB,sBAAsB,CACpC,MAAM,EAAE;IAAE,WAAW,CAAC,EAAE,KAAK,CAAC;QAAE,IAAI,CAAC,EAAE,MAAM,CAAC;QAAC,IAAI,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC,CAAA;CAAE,EACjE,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,GACf,cAAc,EAAE,CAclB;AAED,wBAAsB,qBAAqB,CACzC,KAAK,EAAE,cAAc,EAAE,EACvB,IAAI,EAAE,aAAa,GAClB,OAAO,CAAC,IAAI,CAAC,CA0Bf"}
|
|
@@ -0,0 +1,98 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.collectAmikooArtifacts = collectAmikooArtifacts;
|
|
7
|
+
exports.uploadAmikooArtifacts = uploadAmikooArtifacts;
|
|
8
|
+
const fs_1 = __importDefault(require("fs"));
|
|
9
|
+
const path_1 = __importDefault(require("path"));
|
|
10
|
+
const os_1 = __importDefault(require("os"));
|
|
11
|
+
const apiUtils_1 = require("./apiUtils");
|
|
12
|
+
const zipUtils_1 = require("./zipUtils");
|
|
13
|
+
const s3Upload_1 = require("./s3Upload");
|
|
14
|
+
const SIGNED_URL_ENDPOINTS = {
|
|
15
|
+
prod: 'https://prgm4fborb.execute-api.us-east-2.amazonaws.com/prod/mcp/getSignedUrl',
|
|
16
|
+
staging: 'https://prgm4fborb.execute-api.us-east-2.amazonaws.com/staging/mcp/getSignedUrl',
|
|
17
|
+
};
|
|
18
|
+
function resolveSignedUrlEndpoint() {
|
|
19
|
+
if (process.env.AMIKOO_SIGNED_URL_ENDPOINT)
|
|
20
|
+
return process.env.AMIKOO_SIGNED_URL_ENDPOINT;
|
|
21
|
+
return (0, apiUtils_1.getControlHubUrl)() === 'https://app.amikoo.ai'
|
|
22
|
+
? SIGNED_URL_ENDPOINTS.prod
|
|
23
|
+
: SIGNED_URL_ENDPOINTS.staging;
|
|
24
|
+
}
|
|
25
|
+
function collectAmikooArtifacts(result, testId, fullTitle, specFile) {
|
|
26
|
+
const out = [];
|
|
27
|
+
for (const att of result.attachments || []) {
|
|
28
|
+
if (typeof att?.name === 'string' && att.name.startsWith('amikoo-') && att.path) {
|
|
29
|
+
out.push({
|
|
30
|
+
hash: testId,
|
|
31
|
+
testTitle: fullTitle,
|
|
32
|
+
localPath: att.path,
|
|
33
|
+
attachmentName: att.name.slice('amikoo-'.length),
|
|
34
|
+
specFile,
|
|
35
|
+
});
|
|
36
|
+
}
|
|
37
|
+
}
|
|
38
|
+
return out;
|
|
39
|
+
}
|
|
40
|
+
async function uploadAmikooArtifacts(files, opts) {
|
|
41
|
+
if (!files.length)
|
|
42
|
+
return;
|
|
43
|
+
if (!opts.amikooKey) {
|
|
44
|
+
console.warn('[amikoo-upload] AMIKOO_KEY missing; skipping artifact upload');
|
|
45
|
+
return;
|
|
46
|
+
}
|
|
47
|
+
const groups = new Map();
|
|
48
|
+
for (const f of files) {
|
|
49
|
+
const bucket = groups.get(f.hash) || [];
|
|
50
|
+
bucket.push(f);
|
|
51
|
+
groups.set(f.hash, bucket);
|
|
52
|
+
}
|
|
53
|
+
console.log(`[amikoo-upload] uploading ${groups.size} test(s)`);
|
|
54
|
+
const results = await Promise.allSettled(Array.from(groups.entries()).map(([hash, group]) => uploadSingleTest(hash, group, opts)));
|
|
55
|
+
const succeeded = results.filter(r => r.status === 'fulfilled').length;
|
|
56
|
+
const failed = results.length - succeeded;
|
|
57
|
+
console.log(`[amikoo-upload] summary: ${succeeded}/${results.length} succeeded, ${failed} failed`);
|
|
58
|
+
}
|
|
59
|
+
async function uploadSingleTest(hash, group, opts) {
|
|
60
|
+
const testTitle = group[0].testTitle;
|
|
61
|
+
const specFile = group[0].specFile;
|
|
62
|
+
const slug = sanitizeSlug(testTitle);
|
|
63
|
+
const zipPath = path_1.default.join(os_1.default.tmpdir(), `amikoo-${hash.slice(0, 8)}-${Date.now()}.zip`);
|
|
64
|
+
try {
|
|
65
|
+
await (0, zipUtils_1.buildZipForTest)(zipPath, specFile, group, opts.repoRoot);
|
|
66
|
+
const endpoint = opts.signedUrlEndpoint ?? resolveSignedUrlEndpoint();
|
|
67
|
+
const { sourcePath, signedUrl } = await (0, s3Upload_1.requestSignedUrl)(endpoint, opts.amikooKey, slug);
|
|
68
|
+
await (0, s3Upload_1.uploadZipToS3)(zipPath, signedUrl);
|
|
69
|
+
const upsertResponse = await apiUtils_1.api.post('/test_execution_data/upsert', opts.token, {
|
|
70
|
+
hash,
|
|
71
|
+
failureFilesPathInS3: sourcePath,
|
|
72
|
+
});
|
|
73
|
+
if (!upsertResponse.success) {
|
|
74
|
+
throw new Error(`upsert failed: ${upsertResponse.error}`);
|
|
75
|
+
}
|
|
76
|
+
console.log(`[amikoo-upload] ${slug} uploaded to ${sourcePath}`);
|
|
77
|
+
}
|
|
78
|
+
catch (error) {
|
|
79
|
+
const msg = error instanceof Error ? error.message : String(error);
|
|
80
|
+
console.error(`[amikoo-upload] ${slug} failed: ${msg}`);
|
|
81
|
+
throw error;
|
|
82
|
+
}
|
|
83
|
+
finally {
|
|
84
|
+
try {
|
|
85
|
+
fs_1.default.unlinkSync(zipPath);
|
|
86
|
+
}
|
|
87
|
+
catch { /* ignore */ }
|
|
88
|
+
}
|
|
89
|
+
}
|
|
90
|
+
function sanitizeSlug(title) {
|
|
91
|
+
return title
|
|
92
|
+
.toLowerCase()
|
|
93
|
+
.replace(/\s+/g, '_')
|
|
94
|
+
.replace(/[^a-z0-9_\-]/g, '_')
|
|
95
|
+
.replace(/_+/g, '_')
|
|
96
|
+
.replace(/^_+|_+$/g, '');
|
|
97
|
+
}
|
|
98
|
+
//# sourceMappingURL=amikooArtifacts.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"amikooArtifacts.js","sourceRoot":"","sources":["../controlHub/amikooArtifacts.ts"],"names":[],"mappings":"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"}
|
package/dist/apiUtils.d.ts
CHANGED
package/dist/apiUtils.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"apiUtils.d.ts","sourceRoot":"","sources":["../controlHub/apiUtils.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"apiUtils.d.ts","sourceRoot":"","sources":["../controlHub/apiUtils.ts"],"names":[],"mappings":"AAKA,wBAAgB,gBAAgB,IAAI,MAAM,CAIzC;AAID,KAAK,UAAU,GAAG,KAAK,GAAG,MAAM,GAAG,KAAK,GAAG,QAAQ,GAAG,OAAO,CAAC;AAE9D,UAAU,iBAAiB;IACzB,MAAM,EAAE,UAAU,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,GAAG,CAAC;CACZ;AAED,UAAU,WAAW,CAAC,CAAC,GAAG,GAAG;IAC3B,OAAO,EAAE,OAAO,CAAC;IACjB,IAAI,CAAC,EAAE,CAAC,CAAC;IACT,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED;;;;GAIG;AACH,wBAAsB,UAAU,CAAC,CAAC,GAAG,GAAG,EAAE,OAAO,EAAE,iBAAiB,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CA2C7F;AAGD,eAAO,MAAM,GAAG;UACR,CAAC,kBAAkB,MAAM,SAAS,MAAM;WAGvC,CAAC,kBAAkB,MAAM,SAAS,MAAM,SAAS,GAAG;UAGrD,CAAC,kBAAkB,MAAM,SAAS,MAAM,SAAS,GAAG;aAGjD,CAAC,kBAAkB,MAAM,SAAS,MAAM;CAElD,CAAC"}
|
package/dist/apiUtils.js
CHANGED
|
@@ -4,11 +4,17 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.api = void 0;
|
|
7
|
+
exports.getControlHubUrl = getControlHubUrl;
|
|
7
8
|
exports.apiRequest = apiRequest;
|
|
8
9
|
const dotenv_1 = __importDefault(require("dotenv"));
|
|
9
10
|
dotenv_1.default.config();
|
|
10
|
-
|
|
11
|
-
|
|
11
|
+
const DEFAULT_CONTROLHUB_URL = 'https://app.amikoo.ai';
|
|
12
|
+
function getControlHubUrl() {
|
|
13
|
+
const raw = (process.env.CONTROLHUB_URL || '').trim();
|
|
14
|
+
const url = raw || DEFAULT_CONTROLHUB_URL;
|
|
15
|
+
return url.replace(/\/+$/, '').toLowerCase();
|
|
16
|
+
}
|
|
17
|
+
const BASE_URL = getControlHubUrl();
|
|
12
18
|
/**
|
|
13
19
|
* Makes an API request to the amikoo-reporter backend
|
|
14
20
|
* @param options - The request options including method, endpoint, token, and optional body
|
package/dist/apiUtils.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"apiUtils.js","sourceRoot":"","sources":["../controlHub/apiUtils.ts"],"names":[],"mappings":";;;;;;
|
|
1
|
+
{"version":3,"file":"apiUtils.js","sourceRoot":"","sources":["../controlHub/apiUtils.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,9 @@
|
|
|
1
1
|
import { Reporter } from '@playwright/test/reporter';
|
|
2
|
+
import { AmikooArtifact } from './amikooArtifacts';
|
|
2
3
|
declare class MyReporter implements Reporter {
|
|
3
4
|
testExecutionData: any[];
|
|
4
5
|
videos: any[];
|
|
6
|
+
amikooFiles: AmikooArtifact[];
|
|
5
7
|
authInfo: any;
|
|
6
8
|
organizationId: string;
|
|
7
9
|
executionNumber: number;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"controlHubReporter.d.ts","sourceRoot":"","sources":["../controlHub/controlHubReporter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"controlHubReporter.d.ts","sourceRoot":"","sources":["../controlHub/controlHubReporter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AAKrD,OAAO,EAAyB,cAAc,EAA0B,MAAM,mBAAmB,CAAC;AAKlG,cAAM,UAAW,YAAW,QAAQ;IAElC,iBAAiB,EAAE,GAAG,EAAE,CAAM;IAC9B,MAAM,EAAE,GAAG,EAAE,CAAM;IACnB,WAAW,EAAE,cAAc,EAAE,CAAM;IACnC,QAAQ,EAAE,GAAG,CAAC;IACd,cAAc,EAAE,MAAM,CAAM;IAC5B,eAAe,EAAE,MAAM,CAAK;IAC5B,OAAO,EAAE,GAAG,EAAE,CAAM;IACpB,kBAAkB,EAAE,MAAM,CAAK;IAC/B,OAAO,EAAE,MAAM,CAAgB;IAC/B,gBAAgB,EAAE,OAAO,CAAS;IAClC,yBAAyB,EAAE,GAAG,EAAE,CAAM;IACtC,GAAG,EAAE,GAAG,CAAC;IACT,eAAe,EAAE,GAAG,EAAE,CAAM;IAE5B,OAAO,CAAC,YAAY,CAAU;IAC9B,OAAO,CAAC,MAAM,CAAU;IACxB,OAAO,CAAC,cAAc,CAAU;IAChC,OAAO,CAAC,YAAY,CAAU;IAC9B,OAAO,CAAC,KAAK,CAAU;IACvB,OAAO,CAAC,GAAG,CAAU;IACrB,OAAO,CAAC,SAAS,CAAa;IAC9B,OAAO,CAAC,mBAAmB,CAAuB;IAE5C,OAAO,CAAC,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG;IA+C/B,WAAW,CAAC,IAAI,EAAE,GAAG;IAIrB,OAAO,CAAC,KAAK,EAAE,GAAG;IAalB,SAAS,CAAC,IAAI,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG;IA8EhC,KAAK,CAAC,MAAM,EAAE,GAAG;CA+ExB;AACD,eAAe,UAAU,CAAC"}
|
|
@@ -7,12 +7,15 @@ const gitUtils_1 = require("./gitUtils");
|
|
|
7
7
|
const apiUtils_1 = require("./apiUtils");
|
|
8
8
|
const videoUtils_1 = require("./videoUtils");
|
|
9
9
|
const utils_1 = require("./utils");
|
|
10
|
+
const amikooArtifacts_1 = require("./amikooArtifacts");
|
|
11
|
+
const reporterOrder_1 = require("./reporterOrder");
|
|
10
12
|
const path_1 = __importDefault(require("path"));
|
|
11
13
|
const crypto_1 = __importDefault(require("crypto"));
|
|
12
14
|
class MyReporter {
|
|
13
15
|
constructor() {
|
|
14
16
|
this.testExecutionData = [];
|
|
15
17
|
this.videos = [];
|
|
18
|
+
this.amikooFiles = [];
|
|
16
19
|
this.organizationId = '';
|
|
17
20
|
this.executionNumber = 0;
|
|
18
21
|
this.hashIds = [];
|
|
@@ -25,6 +28,7 @@ class MyReporter {
|
|
|
25
28
|
this.onBeginDonePromises = [];
|
|
26
29
|
}
|
|
27
30
|
async onBegin(config, suite) {
|
|
31
|
+
(0, reporterOrder_1.checkReporterOrder)(config);
|
|
28
32
|
// Store initialization work as a promise that onTestEnd will await
|
|
29
33
|
const initPromise = (async () => {
|
|
30
34
|
try {
|
|
@@ -139,6 +143,7 @@ class MyReporter {
|
|
|
139
143
|
if (videoPath) {
|
|
140
144
|
this.videos.push({ path: videoPath, testId });
|
|
141
145
|
}
|
|
146
|
+
this.amikooFiles.push(...(0, amikooArtifacts_1.collectAmikooArtifacts)(result, testId, fullTitle, test.location.file));
|
|
142
147
|
}
|
|
143
148
|
catch (error) {
|
|
144
149
|
console.error(` ✖ Error processing test "${test.title}":`, error);
|
|
@@ -209,6 +214,13 @@ class MyReporter {
|
|
|
209
214
|
console.warn(' Execution report will not be sent to amikoo-reporter.');
|
|
210
215
|
console.warn(' Execution data will not be saved.\n');
|
|
211
216
|
}
|
|
217
|
+
if (this.access_token && this.amikooFiles.length) {
|
|
218
|
+
await (0, amikooArtifacts_1.uploadAmikooArtifacts)(this.amikooFiles, {
|
|
219
|
+
token: this.access_token,
|
|
220
|
+
amikooKey: this.key,
|
|
221
|
+
repoRoot: process.cwd(),
|
|
222
|
+
});
|
|
223
|
+
}
|
|
212
224
|
(0, utils_1.checkForUpdates)();
|
|
213
225
|
}
|
|
214
226
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"controlHubReporter.js","sourceRoot":"","sources":["../controlHub/controlHubReporter.ts"],"names":[],"mappings":";;;;;AACA,yCAA2C;AAC3C,yCAAiC;AACjC,6CAA6E;AAC7E,mCAA0H;AAC1H,gDAAwB;AACxB,oDAA4B;AAE5B,MAAM,UAAU;IAAhB;QAEE,sBAAiB,GAAU,EAAE,CAAC;QAC9B,WAAM,GAAU,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"controlHubReporter.js","sourceRoot":"","sources":["../controlHub/controlHubReporter.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"reporterOrder.d.ts","sourceRoot":"","sources":["../controlHub/reporterOrder.ts"],"names":[],"mappings":"AAGA,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,GAAG,GAAG,IAAI,CAuBpD"}
|
|
@@ -0,0 +1,30 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.checkReporterOrder = checkReporterOrder;
|
|
4
|
+
const AMIKOO_PLAYWRIGHT_PACKAGE = '@muuktest/amikoo-playwright/reporter';
|
|
5
|
+
const CONTROLHUB_PACKAGE = '@muuktest/amikoo-reporter';
|
|
6
|
+
function checkReporterOrder(config) {
|
|
7
|
+
const reporters = config?.reporter;
|
|
8
|
+
if (!Array.isArray(reporters))
|
|
9
|
+
return;
|
|
10
|
+
const describe = (r) => {
|
|
11
|
+
if (typeof r === 'string')
|
|
12
|
+
return r;
|
|
13
|
+
if (Array.isArray(r) && typeof r[0] === 'string')
|
|
14
|
+
return r[0];
|
|
15
|
+
return '';
|
|
16
|
+
};
|
|
17
|
+
const amikooIdx = reporters.findIndex((r) => describe(r).includes(AMIKOO_PLAYWRIGHT_PACKAGE));
|
|
18
|
+
const controlhubIdx = reporters.findIndex((r) => describe(r).includes(CONTROLHUB_PACKAGE));
|
|
19
|
+
if (amikooIdx >= 0 && controlhubIdx >= 0 && amikooIdx > controlhubIdx) {
|
|
20
|
+
const bar = '==============================================================';
|
|
21
|
+
console.warn(bar);
|
|
22
|
+
console.warn(' AMIKOO REPORTER ORDER WARNING');
|
|
23
|
+
console.warn(` ${CONTROLHUB_PACKAGE} is listed before`);
|
|
24
|
+
console.warn(` ${AMIKOO_PLAYWRIGHT_PACKAGE} in playwright.config.`);
|
|
25
|
+
console.warn(` Reorder so ${AMIKOO_PLAYWRIGHT_PACKAGE} runs first,`);
|
|
26
|
+
console.warn(' otherwise its per-test enrichment may not be finalized in time.');
|
|
27
|
+
console.warn(bar);
|
|
28
|
+
}
|
|
29
|
+
}
|
|
30
|
+
//# sourceMappingURL=reporterOrder.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"reporterOrder.js","sourceRoot":"","sources":["../controlHub/reporterOrder.ts"],"names":[],"mappings":";;AAGA,gDAuBC;AA1BD,MAAM,yBAAyB,GAAG,sCAAsC,CAAC;AACzE,MAAM,kBAAkB,GAAG,2BAA2B,CAAC;AAEvD,SAAgB,kBAAkB,CAAC,MAAW;IAC5C,MAAM,SAAS,GAAG,MAAM,EAAE,QAAQ,CAAC;IACnC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC;QAAE,OAAO;IAEtC,MAAM,QAAQ,GAAG,CAAC,CAAM,EAAU,EAAE;QAClC,IAAI,OAAO,CAAC,KAAK,QAAQ;YAAE,OAAO,CAAC,CAAC;QACpC,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC,KAAK,QAAQ;YAAE,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;QAC9D,OAAO,EAAE,CAAC;IACZ,CAAC,CAAC;IAEF,MAAM,SAAS,GAAG,SAAS,CAAC,SAAS,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,yBAAyB,CAAC,CAAC,CAAC;IACnG,MAAM,aAAa,GAAG,SAAS,CAAC,SAAS,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,kBAAkB,CAAC,CAAC,CAAC;IAEhG,IAAI,SAAS,IAAI,CAAC,IAAI,aAAa,IAAI,CAAC,IAAI,SAAS,GAAG,aAAa,EAAE,CAAC;QACtE,MAAM,GAAG,GAAG,gEAAgE,CAAC;QAC7E,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAClB,OAAO,CAAC,IAAI,CAAC,iCAAiC,CAAC,CAAC;QAChD,OAAO,CAAC,IAAI,CAAC,KAAK,kBAAkB,mBAAmB,CAAC,CAAC;QACzD,OAAO,CAAC,IAAI,CAAC,KAAK,yBAAyB,wBAAwB,CAAC,CAAC;QACrE,OAAO,CAAC,IAAI,CAAC,gBAAgB,yBAAyB,cAAc,CAAC,CAAC;QACtE,OAAO,CAAC,IAAI,CAAC,mEAAmE,CAAC,CAAC;QAClF,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACpB,CAAC;AACH,CAAC"}
|
|
@@ -0,0 +1,6 @@
|
|
|
1
|
+
export declare function requestSignedUrl(endpoint: string, amikooKey: string, testSlug: string): Promise<{
|
|
2
|
+
sourcePath: string;
|
|
3
|
+
signedUrl: string;
|
|
4
|
+
}>;
|
|
5
|
+
export declare function uploadZipToS3(zipPath: string, signedUrl: string): Promise<void>;
|
|
6
|
+
//# sourceMappingURL=s3Upload.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"s3Upload.d.ts","sourceRoot":"","sources":["../controlHub/s3Upload.ts"],"names":[],"mappings":"AAEA,wBAAsB,gBAAgB,CACpC,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC;IAAE,UAAU,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,CAAC,CAiBpD;AAED,wBAAsB,aAAa,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAerF"}
|
package/dist/s3Upload.js
ADDED
|
@@ -0,0 +1,39 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.requestSignedUrl = requestSignedUrl;
|
|
7
|
+
exports.uploadZipToS3 = uploadZipToS3;
|
|
8
|
+
const fs_1 = __importDefault(require("fs"));
|
|
9
|
+
async function requestSignedUrl(endpoint, amikooKey, testSlug) {
|
|
10
|
+
const response = await fetch(endpoint, {
|
|
11
|
+
method: 'POST',
|
|
12
|
+
headers: { 'Content-Type': 'application/json' },
|
|
13
|
+
body: JSON.stringify({ key: amikooKey, test_name: testSlug }),
|
|
14
|
+
});
|
|
15
|
+
if (!response.ok) {
|
|
16
|
+
throw new Error(`Signed URL request failed: ${response.status} ${response.statusText}`);
|
|
17
|
+
}
|
|
18
|
+
const data = await response.json();
|
|
19
|
+
if (!data?.sourcePath || !data?.signedUrl) {
|
|
20
|
+
throw new Error('Signed URL response missing sourcePath or signedUrl');
|
|
21
|
+
}
|
|
22
|
+
return { sourcePath: data.sourcePath, signedUrl: data.signedUrl };
|
|
23
|
+
}
|
|
24
|
+
async function uploadZipToS3(zipPath, signedUrl) {
|
|
25
|
+
const buffer = fs_1.default.readFileSync(zipPath);
|
|
26
|
+
const response = await fetch(signedUrl, {
|
|
27
|
+
method: 'PUT',
|
|
28
|
+
body: buffer,
|
|
29
|
+
headers: {
|
|
30
|
+
'Content-Type': 'application/zip',
|
|
31
|
+
'x-amz-server-side-encryption': 'AES256',
|
|
32
|
+
'x-amz-meta-purpose': 'muukmcp',
|
|
33
|
+
},
|
|
34
|
+
});
|
|
35
|
+
if (!response.ok) {
|
|
36
|
+
throw new Error(`S3 upload failed: ${response.status} ${response.statusText}`);
|
|
37
|
+
}
|
|
38
|
+
}
|
|
39
|
+
//# sourceMappingURL=s3Upload.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"s3Upload.js","sourceRoot":"","sources":["../controlHub/s3Upload.ts"],"names":[],"mappings":";;;;;AAEA,4CAqBC;AAED,sCAeC;AAxCD,4CAAoB;AAEb,KAAK,UAAU,gBAAgB,CACpC,QAAgB,EAChB,SAAiB,EACjB,QAAgB;IAEhB,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,QAAQ,EAAE;QACrC,MAAM,EAAE,MAAM;QACd,OAAO,EAAE,EAAE,cAAc,EAAE,kBAAkB,EAAE;QAC/C,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,GAAG,EAAE,SAAS,EAAE,SAAS,EAAE,QAAQ,EAAE,CAAC;KAC9D,CAAC,CAAC;IAEH,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;QACjB,MAAM,IAAI,KAAK,CAAC,8BAA8B,QAAQ,CAAC,MAAM,IAAI,QAAQ,CAAC,UAAU,EAAE,CAAC,CAAC;IAC1F,CAAC;IAED,MAAM,IAAI,GAAQ,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;IACxC,IAAI,CAAC,IAAI,EAAE,UAAU,IAAI,CAAC,IAAI,EAAE,SAAS,EAAE,CAAC;QAC1C,MAAM,IAAI,KAAK,CAAC,qDAAqD,CAAC,CAAC;IACzE,CAAC;IAED,OAAO,EAAE,UAAU,EAAE,IAAI,CAAC,UAAU,EAAE,SAAS,EAAE,IAAI,CAAC,SAAS,EAAE,CAAC;AACpE,CAAC;AAEM,KAAK,UAAU,aAAa,CAAC,OAAe,EAAE,SAAiB;IACpE,MAAM,MAAM,GAAG,YAAE,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;IACxC,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,SAAS,EAAE;QACtC,MAAM,EAAE,KAAK;QACb,IAAI,EAAE,MAAM;QACZ,OAAO,EAAE;YACP,cAAc,EAAE,iBAAiB;YACjC,8BAA8B,EAAE,QAAQ;YACxC,oBAAoB,EAAE,SAAS;SAChC;KACF,CAAC,CAAC;IAEH,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;QACjB,MAAM,IAAI,KAAK,CAAC,qBAAqB,QAAQ,CAAC,MAAM,IAAI,QAAQ,CAAC,UAAU,EAAE,CAAC,CAAC;IACjF,CAAC;AACH,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"zipUtils.d.ts","sourceRoot":"","sources":["../controlHub/zipUtils.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AASnD,wBAAsB,eAAe,CACnC,OAAO,EAAE,MAAM,EACf,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,cAAc,EAAE,EAC3B,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,IAAI,CAAC,CA2Bf"}
|
package/dist/zipUtils.js
ADDED
|
@@ -0,0 +1,165 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.buildZipForTest = buildZipForTest;
|
|
7
|
+
const fs_1 = __importDefault(require("fs"));
|
|
8
|
+
const path_1 = __importDefault(require("path"));
|
|
9
|
+
const archiver_1 = __importDefault(require("archiver"));
|
|
10
|
+
const SOURCE_EXTENSIONS = ['.ts', '.tsx', '.js', '.jsx', '.mjs', '.cjs', '.mts', '.cts'];
|
|
11
|
+
async function buildZipForTest(zipPath, specFile, artifacts, repoRoot) {
|
|
12
|
+
return new Promise((resolve, reject) => {
|
|
13
|
+
const output = fs_1.default.createWriteStream(zipPath);
|
|
14
|
+
const archive = (0, archiver_1.default)('zip', { zlib: { level: 9 } });
|
|
15
|
+
output.on('close', () => resolve());
|
|
16
|
+
archive.on('error', reject);
|
|
17
|
+
archive.pipe(output);
|
|
18
|
+
for (const art of artifacts) {
|
|
19
|
+
if (!fs_1.default.existsSync(art.localPath))
|
|
20
|
+
continue;
|
|
21
|
+
archive.file(art.localPath, { name: `failure-data/${art.attachmentName}` });
|
|
22
|
+
}
|
|
23
|
+
if (specFile && fs_1.default.existsSync(specFile)) {
|
|
24
|
+
const tsconfigPaths = loadTsconfigPaths(repoRoot);
|
|
25
|
+
const testFiles = collectTestFiles(specFile, repoRoot, tsconfigPaths);
|
|
26
|
+
for (const absPath of testFiles) {
|
|
27
|
+
const relPath = path_1.default.relative(repoRoot, absPath).split(path_1.default.sep).join('/');
|
|
28
|
+
archive.file(absPath, { name: `test-files/${relPath}` });
|
|
29
|
+
}
|
|
30
|
+
}
|
|
31
|
+
else if (specFile) {
|
|
32
|
+
console.warn(`[amikoo-upload] spec file not found on disk: ${specFile}`);
|
|
33
|
+
}
|
|
34
|
+
archive.finalize();
|
|
35
|
+
});
|
|
36
|
+
}
|
|
37
|
+
function collectTestFiles(specFile, repoRoot, tsconfigPaths) {
|
|
38
|
+
const visited = new Set();
|
|
39
|
+
const queue = [path_1.default.resolve(specFile)];
|
|
40
|
+
while (queue.length) {
|
|
41
|
+
const current = queue.shift();
|
|
42
|
+
if (visited.has(current))
|
|
43
|
+
continue;
|
|
44
|
+
if (!isInsideRepo(current, repoRoot))
|
|
45
|
+
continue;
|
|
46
|
+
if (!fs_1.default.existsSync(current))
|
|
47
|
+
continue;
|
|
48
|
+
visited.add(current);
|
|
49
|
+
let source;
|
|
50
|
+
try {
|
|
51
|
+
source = fs_1.default.readFileSync(current, 'utf8');
|
|
52
|
+
}
|
|
53
|
+
catch {
|
|
54
|
+
continue;
|
|
55
|
+
}
|
|
56
|
+
for (const specifier of extractImportSpecifiers(source)) {
|
|
57
|
+
const resolved = resolveSpecifier(specifier, current, repoRoot, tsconfigPaths);
|
|
58
|
+
if (resolved && !visited.has(resolved)) {
|
|
59
|
+
queue.push(resolved);
|
|
60
|
+
}
|
|
61
|
+
}
|
|
62
|
+
}
|
|
63
|
+
return Array.from(visited);
|
|
64
|
+
}
|
|
65
|
+
function extractImportSpecifiers(source) {
|
|
66
|
+
const specifiers = [];
|
|
67
|
+
const patterns = [
|
|
68
|
+
/(?:^|\s)import\s+(?:[^'"`;]+?\s+from\s+)?['"]([^'"]+)['"]/g,
|
|
69
|
+
/(?:^|[^.\w])import\s*\(\s*['"]([^'"]+)['"]\s*\)/g,
|
|
70
|
+
/(?:^|[^.\w])require\s*\(\s*['"]([^'"]+)['"]\s*\)/g,
|
|
71
|
+
];
|
|
72
|
+
for (const re of patterns) {
|
|
73
|
+
let m;
|
|
74
|
+
while ((m = re.exec(source)) !== null) {
|
|
75
|
+
specifiers.push(m[1]);
|
|
76
|
+
}
|
|
77
|
+
}
|
|
78
|
+
return specifiers;
|
|
79
|
+
}
|
|
80
|
+
function resolveSpecifier(specifier, fromFile, repoRoot, tsconfigPaths) {
|
|
81
|
+
if (specifier.startsWith('@playwright/') || specifier.startsWith('@muuktest/')) {
|
|
82
|
+
return null;
|
|
83
|
+
}
|
|
84
|
+
if (specifier.startsWith('./') || specifier.startsWith('../')) {
|
|
85
|
+
return resolveFile(path_1.default.resolve(path_1.default.dirname(fromFile), specifier), repoRoot);
|
|
86
|
+
}
|
|
87
|
+
if (tsconfigPaths) {
|
|
88
|
+
const aliased = resolveWithTsconfigPaths(specifier, tsconfigPaths, repoRoot);
|
|
89
|
+
if (aliased)
|
|
90
|
+
return aliased;
|
|
91
|
+
}
|
|
92
|
+
return null;
|
|
93
|
+
}
|
|
94
|
+
function resolveFile(candidatePath, repoRoot) {
|
|
95
|
+
if (!isInsideRepo(candidatePath, repoRoot))
|
|
96
|
+
return null;
|
|
97
|
+
if (fs_1.default.existsSync(candidatePath) && fs_1.default.statSync(candidatePath).isFile()) {
|
|
98
|
+
return candidatePath;
|
|
99
|
+
}
|
|
100
|
+
for (const ext of SOURCE_EXTENSIONS) {
|
|
101
|
+
const withExt = candidatePath + ext;
|
|
102
|
+
if (fs_1.default.existsSync(withExt) && fs_1.default.statSync(withExt).isFile())
|
|
103
|
+
return withExt;
|
|
104
|
+
}
|
|
105
|
+
if (fs_1.default.existsSync(candidatePath) && fs_1.default.statSync(candidatePath).isDirectory()) {
|
|
106
|
+
for (const ext of SOURCE_EXTENSIONS) {
|
|
107
|
+
const indexFile = path_1.default.join(candidatePath, 'index' + ext);
|
|
108
|
+
if (fs_1.default.existsSync(indexFile))
|
|
109
|
+
return indexFile;
|
|
110
|
+
}
|
|
111
|
+
}
|
|
112
|
+
return null;
|
|
113
|
+
}
|
|
114
|
+
function isInsideRepo(absPath, repoRoot) {
|
|
115
|
+
const normalized = path_1.default.resolve(absPath);
|
|
116
|
+
const root = path_1.default.resolve(repoRoot);
|
|
117
|
+
if (!normalized.startsWith(root + path_1.default.sep) && normalized !== root)
|
|
118
|
+
return false;
|
|
119
|
+
return !normalized.split(path_1.default.sep).includes('node_modules');
|
|
120
|
+
}
|
|
121
|
+
function resolveWithTsconfigPaths(specifier, tsconfig, repoRoot) {
|
|
122
|
+
for (const [pattern, targets] of Object.entries(tsconfig.paths)) {
|
|
123
|
+
const match = matchAliasPattern(pattern, specifier);
|
|
124
|
+
if (match === null)
|
|
125
|
+
continue;
|
|
126
|
+
for (const target of targets) {
|
|
127
|
+
const candidate = path_1.default.resolve(tsconfig.baseUrl, target.replace('*', match));
|
|
128
|
+
const resolved = resolveFile(candidate, repoRoot);
|
|
129
|
+
if (resolved)
|
|
130
|
+
return resolved;
|
|
131
|
+
}
|
|
132
|
+
}
|
|
133
|
+
return null;
|
|
134
|
+
}
|
|
135
|
+
function matchAliasPattern(pattern, specifier) {
|
|
136
|
+
if (pattern.endsWith('/*')) {
|
|
137
|
+
const prefix = pattern.slice(0, -1);
|
|
138
|
+
if (specifier.startsWith(prefix))
|
|
139
|
+
return specifier.slice(prefix.length);
|
|
140
|
+
return null;
|
|
141
|
+
}
|
|
142
|
+
return pattern === specifier ? '' : null;
|
|
143
|
+
}
|
|
144
|
+
function loadTsconfigPaths(repoRoot) {
|
|
145
|
+
const tsconfigPath = path_1.default.join(repoRoot, 'tsconfig.json');
|
|
146
|
+
if (!fs_1.default.existsSync(tsconfigPath))
|
|
147
|
+
return null;
|
|
148
|
+
try {
|
|
149
|
+
const raw = fs_1.default.readFileSync(tsconfigPath, 'utf8');
|
|
150
|
+
const stripped = raw.replace(/\/\*[\s\S]*?\*\//g, '').replace(/(^|[^:])\/\/.*$/gm, '$1');
|
|
151
|
+
const parsed = JSON.parse(stripped);
|
|
152
|
+
const baseUrl = parsed?.compilerOptions?.baseUrl;
|
|
153
|
+
const paths = parsed?.compilerOptions?.paths;
|
|
154
|
+
if (!paths)
|
|
155
|
+
return null;
|
|
156
|
+
return {
|
|
157
|
+
baseUrl: path_1.default.resolve(repoRoot, baseUrl || '.'),
|
|
158
|
+
paths,
|
|
159
|
+
};
|
|
160
|
+
}
|
|
161
|
+
catch {
|
|
162
|
+
return null;
|
|
163
|
+
}
|
|
164
|
+
}
|
|
165
|
+
//# sourceMappingURL=zipUtils.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"zipUtils.js","sourceRoot":"","sources":["../controlHub/zipUtils.ts"],"names":[],"mappings":";;;;;AAYA,0CAgCC;AA5CD,4CAAoB;AACpB,gDAAwB;AACxB,wDAAgC;AAGhC,MAAM,iBAAiB,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;AAOlF,KAAK,UAAU,eAAe,CACnC,OAAe,EACf,QAAgB,EAChB,SAA2B,EAC3B,QAAgB;IAEhB,OAAO,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QAC3C,MAAM,MAAM,GAAG,YAAE,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC;QAC7C,MAAM,OAAO,GAAG,IAAA,kBAAQ,EAAC,KAAK,EAAE,EAAE,IAAI,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;QAExD,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC;QACpC,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QAC5B,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAErB,KAAK,MAAM,GAAG,IAAI,SAAS,EAAE,CAAC;YAC5B,IAAI,CAAC,YAAE,CAAC,UAAU,CAAC,GAAG,CAAC,SAAS,CAAC;gBAAE,SAAS;YAC5C,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,SAAS,EAAE,EAAE,IAAI,EAAE,gBAAgB,GAAG,CAAC,cAAc,EAAE,EAAE,CAAC,CAAC;QAC9E,CAAC;QAED,IAAI,QAAQ,IAAI,YAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC;YACxC,MAAM,aAAa,GAAG,iBAAiB,CAAC,QAAQ,CAAC,CAAC;YAClD,MAAM,SAAS,GAAG,gBAAgB,CAAC,QAAQ,EAAE,QAAQ,EAAE,aAAa,CAAC,CAAC;YACtE,KAAK,MAAM,OAAO,IAAI,SAAS,EAAE,CAAC;gBAChC,MAAM,OAAO,GAAG,cAAI,CAAC,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC,KAAK,CAAC,cAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;gBAC3E,OAAO,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE,IAAI,EAAE,cAAc,OAAO,EAAE,EAAE,CAAC,CAAC;YAC3D,CAAC;QACH,CAAC;aAAM,IAAI,QAAQ,EAAE,CAAC;YACpB,OAAO,CAAC,IAAI,CAAC,gDAAgD,QAAQ,EAAE,CAAC,CAAC;QAC3E,CAAC;QAED,OAAO,CAAC,QAAQ,EAAE,CAAC;IACrB,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAS,gBAAgB,CACvB,QAAgB,EAChB,QAAgB,EAChB,aAAmC;IAEnC,MAAM,OAAO,GAAG,IAAI,GAAG,EAAU,CAAC;IAClC,MAAM,KAAK,GAAa,CAAC,cAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC;IAEjD,OAAO,KAAK,CAAC,MAAM,EAAE,CAAC;QACpB,MAAM,OAAO,GAAG,KAAK,CAAC,KAAK,EAAG,CAAC;QAC/B,IAAI,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC;YAAE,SAAS;QACnC,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,QAAQ,CAAC;YAAE,SAAS;QAC/C,IAAI,CAAC,YAAE,CAAC,UAAU,CAAC,OAAO,CAAC;YAAE,SAAS;QACtC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QAErB,IAAI,MAAc,CAAC;QACnB,IAAI,CAAC;YACH,MAAM,GAAG,YAAE,CAAC,YAAY,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QAC5C,CAAC;QAAC,MAAM,CAAC;YACP,SAAS;QACX,CAAC;QAED,KAAK,MAAM,SAAS,IAAI,uBAAuB,CAAC,MAAM,CAAC,EAAE,CAAC;YACxD,MAAM,QAAQ,GAAG,gBAAgB,CAAC,SAAS,EAAE,OAAO,EAAE,QAAQ,EAAE,aAAa,CAAC,CAAC;YAC/E,IAAI,QAAQ,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC;gBACvC,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YACvB,CAAC;QACH,CAAC;IACH,CAAC;IAED,OAAO,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;AAC7B,CAAC;AAED,SAAS,uBAAuB,CAAC,MAAc;IAC7C,MAAM,UAAU,GAAa,EAAE,CAAC;IAChC,MAAM,QAAQ,GAAG;QACf,4DAA4D;QAC5D,kDAAkD;QAClD,mDAAmD;KACpD,CAAC;IACF,KAAK,MAAM,EAAE,IAAI,QAAQ,EAAE,CAAC;QAC1B,IAAI,CAAyB,CAAC;QAC9B,OAAO,CAAC,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC;YACtC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QACxB,CAAC;IACH,CAAC;IACD,OAAO,UAAU,CAAC;AACpB,CAAC;AAED,SAAS,gBAAgB,CACvB,SAAiB,EACjB,QAAgB,EAChB,QAAgB,EAChB,aAAmC;IAEnC,IAAI,SAAS,CAAC,UAAU,CAAC,cAAc,CAAC,IAAI,SAAS,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE,CAAC;QAC/E,OAAO,IAAI,CAAC;IACd,CAAC;IAED,IAAI,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,SAAS,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE,CAAC;QAC9D,OAAO,WAAW,CAAC,cAAI,CAAC,OAAO,CAAC,cAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,SAAS,CAAC,EAAE,QAAQ,CAAC,CAAC;IAChF,CAAC;IAED,IAAI,aAAa,EAAE,CAAC;QAClB,MAAM,OAAO,GAAG,wBAAwB,CAAC,SAAS,EAAE,aAAa,EAAE,QAAQ,CAAC,CAAC;QAC7E,IAAI,OAAO;YAAE,OAAO,OAAO,CAAC;IAC9B,CAAC;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AAED,SAAS,WAAW,CAAC,aAAqB,EAAE,QAAgB;IAC1D,IAAI,CAAC,YAAY,CAAC,aAAa,EAAE,QAAQ,CAAC;QAAE,OAAO,IAAI,CAAC;IAExD,IAAI,YAAE,CAAC,UAAU,CAAC,aAAa,CAAC,IAAI,YAAE,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC;QACxE,OAAO,aAAa,CAAC;IACvB,CAAC;IAED,KAAK,MAAM,GAAG,IAAI,iBAAiB,EAAE,CAAC;QACpC,MAAM,OAAO,GAAG,aAAa,GAAG,GAAG,CAAC;QACpC,IAAI,YAAE,CAAC,UAAU,CAAC,OAAO,CAAC,IAAI,YAAE,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE;YAAE,OAAO,OAAO,CAAC;IAC9E,CAAC;IAED,IAAI,YAAE,CAAC,UAAU,CAAC,aAAa,CAAC,IAAI,YAAE,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC;QAC7E,KAAK,MAAM,GAAG,IAAI,iBAAiB,EAAE,CAAC;YACpC,MAAM,SAAS,GAAG,cAAI,CAAC,IAAI,CAAC,aAAa,EAAE,OAAO,GAAG,GAAG,CAAC,CAAC;YAC1D,IAAI,YAAE,CAAC,UAAU,CAAC,SAAS,CAAC;gBAAE,OAAO,SAAS,CAAC;QACjD,CAAC;IACH,CAAC;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AAED,SAAS,YAAY,CAAC,OAAe,EAAE,QAAgB;IACrD,MAAM,UAAU,GAAG,cAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IACzC,MAAM,IAAI,GAAG,cAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IACpC,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,IAAI,GAAG,cAAI,CAAC,GAAG,CAAC,IAAI,UAAU,KAAK,IAAI;QAAE,OAAO,KAAK,CAAC;IACjF,OAAO,CAAC,UAAU,CAAC,KAAK,CAAC,cAAI,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC;AAC9D,CAAC;AAED,SAAS,wBAAwB,CAC/B,SAAiB,EACjB,QAAuB,EACvB,QAAgB;IAEhB,KAAK,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;QAChE,MAAM,KAAK,GAAG,iBAAiB,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;QACpD,IAAI,KAAK,KAAK,IAAI;YAAE,SAAS;QAC7B,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;YAC7B,MAAM,SAAS,GAAG,cAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC,CAAC;YAC7E,MAAM,QAAQ,GAAG,WAAW,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;YAClD,IAAI,QAAQ;gBAAE,OAAO,QAAQ,CAAC;QAChC,CAAC;IACH,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,SAAS,iBAAiB,CAAC,OAAe,EAAE,SAAiB;IAC3D,IAAI,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;QAC3B,MAAM,MAAM,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;QACpC,IAAI,SAAS,CAAC,UAAU,CAAC,MAAM,CAAC;YAAE,OAAO,SAAS,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QACxE,OAAO,IAAI,CAAC;IACd,CAAC;IACD,OAAO,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;AAC3C,CAAC;AAED,SAAS,iBAAiB,CAAC,QAAgB;IACzC,MAAM,YAAY,GAAG,cAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,eAAe,CAAC,CAAC;IAC1D,IAAI,CAAC,YAAE,CAAC,UAAU,CAAC,YAAY,CAAC;QAAE,OAAO,IAAI,CAAC;IAE9C,IAAI,CAAC;QACH,MAAM,GAAG,GAAG,YAAE,CAAC,YAAY,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC;QAClD,MAAM,QAAQ,GAAG,GAAG,CAAC,OAAO,CAAC,mBAAmB,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,mBAAmB,EAAE,IAAI,CAAC,CAAC;QACzF,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;QACpC,MAAM,OAAO,GAAG,MAAM,EAAE,eAAe,EAAE,OAAO,CAAC;QACjD,MAAM,KAAK,GAAG,MAAM,EAAE,eAAe,EAAE,KAAK,CAAC;QAC7C,IAAI,CAAC,KAAK;YAAE,OAAO,IAAI,CAAC;QACxB,OAAO;YACL,OAAO,EAAE,cAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,OAAO,IAAI,GAAG,CAAC;YAC/C,KAAK;SACN,CAAC;IACJ,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC"}
|
package/install.js
CHANGED
|
@@ -8,6 +8,7 @@ const packageRoot = __dirname;
|
|
|
8
8
|
|
|
9
9
|
const REPORTER_MODULE = '@muuktest/amikoo-reporter';
|
|
10
10
|
const REPORTER_ENTRY = `['${REPORTER_MODULE}']`;
|
|
11
|
+
const AMIKOO_PLAYWRIGHT_PACKAGE = '@muuktest/amikoo-playwright/reporter';
|
|
11
12
|
|
|
12
13
|
// ---------------------------------------------------------------------------
|
|
13
14
|
// Helpers
|
|
@@ -32,6 +33,15 @@ function isCommented(content, pos) {
|
|
|
32
33
|
return isLineComment(content, pos) || isInsideBlockComment(content, pos);
|
|
33
34
|
}
|
|
34
35
|
|
|
36
|
+
function hasActiveOccurrence(content, needle) {
|
|
37
|
+
let idx = 0;
|
|
38
|
+
while ((idx = content.indexOf(needle, idx)) !== -1) {
|
|
39
|
+
if (!isCommented(content, idx)) return true;
|
|
40
|
+
idx += needle.length;
|
|
41
|
+
}
|
|
42
|
+
return false;
|
|
43
|
+
}
|
|
44
|
+
|
|
35
45
|
/**
|
|
36
46
|
* Find the first uncommented `reporter` property (e.g. `reporter:` or `reporter :`)
|
|
37
47
|
*/
|
|
@@ -245,6 +255,86 @@ function tryNoReporter(content) {
|
|
|
245
255
|
return addReporterProperty(content);
|
|
246
256
|
}
|
|
247
257
|
|
|
258
|
+
// ---------------------------------------------------------------------------
|
|
259
|
+
// Reporter order enforcement – ensure Amikoo reporter precedes ControlHub
|
|
260
|
+
// ---------------------------------------------------------------------------
|
|
261
|
+
|
|
262
|
+
function parseTopLevelEntries(content, from, to) {
|
|
263
|
+
const entries = [];
|
|
264
|
+
let entryStart = -1;
|
|
265
|
+
let depth = 0;
|
|
266
|
+
let inString = false;
|
|
267
|
+
let stringChar = '';
|
|
268
|
+
for (let i = from; i < to; i++) {
|
|
269
|
+
const ch = content[i];
|
|
270
|
+
if (inString) {
|
|
271
|
+
if (ch === '\\') { i++; continue; }
|
|
272
|
+
if (ch === stringChar) inString = false;
|
|
273
|
+
continue;
|
|
274
|
+
}
|
|
275
|
+
if (ch === "'" || ch === '"' || ch === '`') {
|
|
276
|
+
if (entryStart === -1 && depth === 0) entryStart = i;
|
|
277
|
+
inString = true;
|
|
278
|
+
stringChar = ch;
|
|
279
|
+
continue;
|
|
280
|
+
}
|
|
281
|
+
if (ch === '[' || ch === '{' || ch === '(') {
|
|
282
|
+
if (entryStart === -1 && depth === 0) entryStart = i;
|
|
283
|
+
depth++;
|
|
284
|
+
} else if (ch === ']' || ch === '}' || ch === ')') {
|
|
285
|
+
depth--;
|
|
286
|
+
} else if (ch === ',' && depth === 0) {
|
|
287
|
+
if (entryStart !== -1) {
|
|
288
|
+
entries.push({ start: entryStart, end: i });
|
|
289
|
+
entryStart = -1;
|
|
290
|
+
}
|
|
291
|
+
} else if (!/\s/.test(ch) && entryStart === -1 && depth === 0) {
|
|
292
|
+
entryStart = i;
|
|
293
|
+
}
|
|
294
|
+
}
|
|
295
|
+
if (entryStart !== -1) {
|
|
296
|
+
let endPos = to;
|
|
297
|
+
while (endPos > entryStart && /\s/.test(content[endPos - 1])) endPos--;
|
|
298
|
+
entries.push({ start: entryStart, end: endPos });
|
|
299
|
+
}
|
|
300
|
+
return entries;
|
|
301
|
+
}
|
|
302
|
+
|
|
303
|
+
function ensureReporterOrder(content) {
|
|
304
|
+
if (!hasActiveOccurrence(content, REPORTER_MODULE)) return content;
|
|
305
|
+
if (!hasActiveOccurrence(content, AMIKOO_PLAYWRIGHT_PACKAGE)) return content;
|
|
306
|
+
|
|
307
|
+
const regex = /reporter\s*:\s*\[/g;
|
|
308
|
+
let m;
|
|
309
|
+
let arrayOpen = -1;
|
|
310
|
+
while ((m = regex.exec(content)) !== null) {
|
|
311
|
+
if (!isCommented(content, m.index)) {
|
|
312
|
+
arrayOpen = m.index + m[0].length - 1;
|
|
313
|
+
break;
|
|
314
|
+
}
|
|
315
|
+
}
|
|
316
|
+
if (arrayOpen === -1) return content;
|
|
317
|
+
|
|
318
|
+
const arrayClose = findMatchingBracket(content, arrayOpen);
|
|
319
|
+
if (arrayClose === -1) return content;
|
|
320
|
+
|
|
321
|
+
const entries = parseTopLevelEntries(content, arrayOpen + 1, arrayClose);
|
|
322
|
+
const amikooIdx = entries.findIndex(e => content.slice(e.start, e.end).includes(AMIKOO_PLAYWRIGHT_PACKAGE));
|
|
323
|
+
const controlhubIdx = entries.findIndex(e => content.slice(e.start, e.end).includes(REPORTER_MODULE));
|
|
324
|
+
if (amikooIdx === -1 || controlhubIdx === -1) return content;
|
|
325
|
+
if (amikooIdx < controlhubIdx) return content;
|
|
326
|
+
|
|
327
|
+
const amikoo = entries[amikooIdx];
|
|
328
|
+
const controlhub = entries[controlhubIdx];
|
|
329
|
+
return (
|
|
330
|
+
content.slice(0, controlhub.start) +
|
|
331
|
+
content.slice(amikoo.start, amikoo.end) +
|
|
332
|
+
content.slice(controlhub.end, amikoo.start) +
|
|
333
|
+
content.slice(controlhub.start, controlhub.end) +
|
|
334
|
+
content.slice(amikoo.end)
|
|
335
|
+
);
|
|
336
|
+
}
|
|
337
|
+
|
|
248
338
|
// ---------------------------------------------------------------------------
|
|
249
339
|
// Fallback – insert before the last closing of the config object
|
|
250
340
|
// ---------------------------------------------------------------------------
|
|
@@ -384,33 +474,39 @@ function configurePlaywright() {
|
|
|
384
474
|
const ext = path.extname(configPath);
|
|
385
475
|
console.log(` Found playwright.config${ext}`);
|
|
386
476
|
|
|
387
|
-
|
|
477
|
+
const original = fs.readFileSync(configPath, 'utf8');
|
|
388
478
|
|
|
389
|
-
// Already configured?
|
|
390
|
-
|
|
391
|
-
|
|
392
|
-
|
|
393
|
-
|
|
394
|
-
|
|
395
|
-
|
|
396
|
-
|
|
397
|
-
|
|
398
|
-
|
|
479
|
+
// Already configured (uncommented)?
|
|
480
|
+
const alreadyConfigured = hasActiveOccurrence(original, REPORTER_MODULE);
|
|
481
|
+
|
|
482
|
+
let modified;
|
|
483
|
+
if (alreadyConfigured) {
|
|
484
|
+
modified = original;
|
|
485
|
+
} else {
|
|
486
|
+
modified =
|
|
487
|
+
tryArrayAppend(original) ||
|
|
488
|
+
tryStringToArray(original) ||
|
|
489
|
+
tryCommentedReporter(original) ||
|
|
490
|
+
tryNoReporter(original) ||
|
|
491
|
+
tryFallback(original);
|
|
399
492
|
}
|
|
400
493
|
|
|
401
|
-
//
|
|
402
|
-
const
|
|
403
|
-
tryArrayAppend(content) ||
|
|
404
|
-
tryStringToArray(content) ||
|
|
405
|
-
tryCommentedReporter(content) ||
|
|
406
|
-
tryNoReporter(content) ||
|
|
407
|
-
tryFallback(content);
|
|
494
|
+
// Enforce Amikoo-before-ControlHub order when both are present.
|
|
495
|
+
const reordered = ensureReporterOrder(modified);
|
|
408
496
|
|
|
409
|
-
// Ensure video: 'on' in use block
|
|
410
|
-
const withVideo = ensureVideoOn(
|
|
497
|
+
// Ensure video: 'on' in use block.
|
|
498
|
+
const withVideo = ensureVideoOn(reordered);
|
|
411
499
|
|
|
412
|
-
|
|
413
|
-
|
|
500
|
+
if (withVideo !== original) {
|
|
501
|
+
fs.writeFileSync(configPath, withVideo, 'utf8');
|
|
502
|
+
if (alreadyConfigured) {
|
|
503
|
+
console.log(' amikoo-reporter already configured. Adjusted config where needed.\n');
|
|
504
|
+
} else {
|
|
505
|
+
console.log(' amikoo-reporter added to playwright config.\n');
|
|
506
|
+
}
|
|
507
|
+
} else {
|
|
508
|
+
console.log(' amikoo-reporter already configured. No changes needed.\n');
|
|
509
|
+
}
|
|
414
510
|
}
|
|
415
511
|
|
|
416
512
|
// ---------------------------------------------------------------------------
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@muuktest/amikoo-reporter",
|
|
3
|
-
"version": "1.0
|
|
3
|
+
"version": "1.1.0",
|
|
4
4
|
"description": "Playwright reporter for Amikoo - automatically installs and configures test reporting to Amikoo AI",
|
|
5
5
|
"main": "dist/controlHubReporter.js",
|
|
6
6
|
"types": "dist/controlHubReporter.d.ts",
|
|
@@ -43,10 +43,12 @@
|
|
|
43
43
|
"@playwright/test": "^1.0.0"
|
|
44
44
|
},
|
|
45
45
|
"devDependencies": {
|
|
46
|
+
"@types/archiver": "^6.0.3",
|
|
46
47
|
"@types/node": "^25.3.5",
|
|
47
48
|
"typescript": "^6.0.2"
|
|
48
49
|
},
|
|
49
50
|
"dependencies": {
|
|
51
|
+
"archiver": "^7.0.1",
|
|
50
52
|
"dotenv": "^17.3.1"
|
|
51
53
|
}
|
|
52
54
|
}
|