creevey 0.10.0-beta.43 → 0.10.0-beta.44
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/CHANGELOG.md +282 -0
- package/dist/client/addon/controller.js +1 -1
- package/dist/client/addon/controller.js.map +1 -1
- package/dist/client/addon/withCreevey.js +1 -18
- package/dist/client/addon/withCreevey.js.map +1 -1
- package/dist/client/shared/components/PageHeader/PageHeader.js +13 -4
- package/dist/client/shared/components/PageHeader/PageHeader.js.map +1 -1
- package/dist/client/shared/creeveyClientApi.js +10 -0
- package/dist/client/shared/creeveyClientApi.js.map +1 -1
- package/dist/client/web/CreeveyApp.d.ts +1 -0
- package/dist/client/web/CreeveyApp.js +1 -0
- package/dist/client/web/CreeveyApp.js.map +1 -1
- package/dist/client/web/CreeveyContext.d.ts +1 -0
- package/dist/client/web/CreeveyContext.js +1 -0
- package/dist/client/web/CreeveyContext.js.map +1 -1
- package/dist/client/web/CreeveyView/SideBar/SideBarFooter.js +9 -8
- package/dist/client/web/CreeveyView/SideBar/SideBarFooter.js.map +1 -1
- package/dist/client/web/CreeveyView/SideBar/SideBarHeader.js +13 -3
- package/dist/client/web/CreeveyView/SideBar/SideBarHeader.js.map +1 -1
- package/dist/client/web/CreeveyView/SideBar/SuiteLink.js +2 -3
- package/dist/client/web/CreeveyView/SideBar/SuiteLink.js.map +1 -1
- package/dist/client/web/CreeveyView/SideBar/TestLink.js +2 -3
- package/dist/client/web/CreeveyView/SideBar/TestLink.js.map +1 -1
- package/dist/client/web/CreeveyView/SideBar/TestsStatus.js +1 -0
- package/dist/client/web/CreeveyView/SideBar/TestsStatus.js.map +1 -1
- package/dist/client/web/assets/{index-C47njyZV.js → index-BU4jjKVC.js} +68 -68
- package/dist/client/web/index.html +1 -1
- package/dist/client/web/index.js +8 -3
- package/dist/client/web/index.js.map +1 -1
- package/dist/creevey.d.ts +1 -1
- package/dist/creevey.js +1 -22
- package/dist/creevey.js.map +1 -1
- package/dist/playwright-reporter.d.ts +2 -0
- package/dist/playwright-reporter.js +5 -0
- package/dist/playwright-reporter.js.map +1 -0
- package/dist/playwright.d.ts +1 -1
- package/dist/server/config.js +8 -1
- package/dist/server/config.js.map +1 -1
- package/dist/server/index.js +10 -3
- package/dist/server/index.js.map +1 -1
- package/dist/server/master/api.d.ts +15 -5
- package/dist/server/master/api.js +89 -27
- package/dist/server/master/api.js.map +1 -1
- package/dist/server/master/handlers/capture-handler.d.ts +2 -0
- package/dist/server/master/handlers/capture-handler.js +35 -0
- package/dist/server/master/handlers/capture-handler.js.map +1 -0
- package/dist/server/master/handlers/index.d.ts +4 -0
- package/dist/server/master/handlers/index.js +21 -0
- package/dist/server/master/handlers/index.js.map +1 -0
- package/dist/server/master/handlers/ping-handler.d.ts +2 -0
- package/dist/server/master/handlers/ping-handler.js +7 -0
- package/dist/server/master/handlers/ping-handler.js.map +1 -0
- package/dist/server/master/handlers/static-handler.d.ts +2 -0
- package/dist/server/master/handlers/static-handler.js +32 -0
- package/dist/server/master/handlers/static-handler.js.map +1 -0
- package/dist/server/master/handlers/stories-handler.d.ts +2 -0
- package/dist/server/master/handlers/stories-handler.js +38 -0
- package/dist/server/master/handlers/stories-handler.js.map +1 -0
- package/dist/server/master/master.js +7 -24
- package/dist/server/master/master.js.map +1 -1
- package/dist/server/master/runner.d.ts +4 -6
- package/dist/server/master/runner.js +30 -127
- package/dist/server/master/runner.js.map +1 -1
- package/dist/server/master/server.js +77 -87
- package/dist/server/master/server.js.map +1 -1
- package/dist/server/master/start.d.ts +1 -2
- package/dist/server/master/start.js +11 -29
- package/dist/server/master/start.js.map +1 -1
- package/dist/server/master/testsManager.d.ts +81 -0
- package/dist/server/master/testsManager.js +281 -0
- package/dist/server/master/testsManager.js.map +1 -0
- package/dist/server/playwright/reporter.d.ts +87 -0
- package/dist/server/playwright/reporter.js +351 -0
- package/dist/server/playwright/reporter.js.map +1 -0
- package/dist/server/selenium/internal.js +20 -2
- package/dist/server/selenium/internal.js.map +1 -1
- package/dist/server/selenium/selenoid.js +4 -0
- package/dist/server/selenium/selenoid.js.map +1 -1
- package/dist/server/shutdown.d.ts +1 -0
- package/dist/server/shutdown.js +23 -0
- package/dist/server/shutdown.js.map +1 -0
- package/dist/server/stories.d.ts +0 -1
- package/dist/server/stories.js +0 -12
- package/dist/server/stories.js.map +1 -1
- package/dist/server/ui-update.d.ts +10 -0
- package/dist/server/ui-update.js +39 -0
- package/dist/server/ui-update.js.map +1 -0
- package/dist/server/utils.d.ts +6 -0
- package/dist/server/utils.js +39 -8
- package/dist/server/utils.js.map +1 -1
- package/dist/server/worker/start.js +1 -1
- package/dist/server/worker/start.js.map +1 -1
- package/dist/types.d.ts +14 -8
- package/dist/types.js.map +1 -1
- package/docs/examples/playwright-reporter-example.ts +202 -0
- package/docs/migration-0.9-to-0.10.md +144 -0
- package/docs/playwright-reporter.md +357 -0
- package/package.json +9 -13
- package/src/client/addon/controller.ts +1 -1
- package/src/client/addon/withCreevey.ts +2 -16
- package/src/client/shared/components/PageHeader/PageHeader.tsx +18 -4
- package/src/client/shared/creeveyClientApi.ts +10 -0
- package/src/client/web/CreeveyApp.tsx +2 -0
- package/src/client/web/CreeveyContext.tsx +2 -0
- package/src/client/web/CreeveyView/SideBar/SideBarFooter.tsx +19 -17
- package/src/client/web/CreeveyView/SideBar/SideBarHeader.tsx +18 -3
- package/src/client/web/CreeveyView/SideBar/SuiteLink.tsx +9 -7
- package/src/client/web/CreeveyView/SideBar/TestLink.tsx +8 -6
- package/src/client/web/CreeveyView/SideBar/TestsStatus.tsx +1 -0
- package/src/client/web/index.tsx +8 -3
- package/src/creevey.ts +1 -24
- package/src/playwright-reporter.ts +3 -0
- package/src/server/config.ts +9 -1
- package/src/server/index.ts +11 -4
- package/src/server/master/api.ts +95 -26
- package/src/server/master/handlers/capture-handler.ts +39 -0
- package/src/server/master/handlers/index.ts +4 -0
- package/src/server/master/handlers/ping-handler.ts +5 -0
- package/src/server/master/handlers/static-handler.ts +29 -0
- package/src/server/master/handlers/stories-handler.ts +48 -0
- package/src/server/master/master.ts +10 -27
- package/src/server/master/runner.ts +38 -132
- package/src/server/master/server.ts +93 -97
- package/src/server/master/start.ts +17 -41
- package/src/server/master/testsManager.ts +315 -0
- package/src/server/playwright/reporter.ts +386 -0
- package/src/server/selenium/internal.ts +23 -3
- package/src/server/selenium/selenoid.ts +5 -0
- package/src/server/shutdown.ts +19 -0
- package/src/server/stories.ts +1 -12
- package/src/server/ui-update.ts +46 -0
- package/src/server/utils.ts +40 -9
- package/src/server/worker/start.ts +1 -1
- package/src/types.ts +14 -8
@@ -4,37 +4,20 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
4
4
|
};
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
6
6
|
exports.default = master;
|
7
|
-
const path_1 = __importDefault(require("path"));
|
8
|
-
const types_js_1 = require("../../types.js");
|
9
7
|
const stories_js_1 = require("../stories.js");
|
10
8
|
const runner_js_1 = __importDefault(require("./runner.js"));
|
11
|
-
const
|
12
|
-
function mergeTests(testsWithReports, testsFromStories) {
|
13
|
-
Object.values(testsFromStories)
|
14
|
-
.filter(types_js_1.isDefined)
|
15
|
-
.forEach((test) => {
|
16
|
-
const testWithReport = testsWithReports[test.id];
|
17
|
-
if (!testWithReport)
|
18
|
-
return;
|
19
|
-
test.retries = testWithReport.retries;
|
20
|
-
if (testWithReport.status == 'success' || testWithReport.status == 'failed')
|
21
|
-
test.status = testWithReport.status;
|
22
|
-
test.results = testWithReport.results;
|
23
|
-
test.approved = testWithReport.approved;
|
24
|
-
});
|
25
|
-
return testsFromStories;
|
26
|
-
}
|
9
|
+
const testsManager_js_1 = require("./testsManager.js");
|
27
10
|
async function master(config, gridUrl) {
|
28
|
-
|
29
|
-
const
|
30
|
-
|
11
|
+
// Create TestsManager instance
|
12
|
+
const testsManager = new testsManager_js_1.TestsManager(config.screenDir, config.reportDir);
|
13
|
+
// Create Runner with TestsManager
|
14
|
+
const runner = new runner_js_1.default(config, testsManager, gridUrl);
|
31
15
|
await runner.init();
|
16
|
+
// Load tests from stories and update TestsManager
|
32
17
|
const tests = await (0, stories_js_1.loadTestsFromStories)(Object.keys(config.browsers), (listener) => config.storiesProvider(config, listener), (testsDiff) => {
|
33
18
|
runner.updateTests(testsDiff);
|
34
|
-
(0, stories_js_1.saveTestsJson)(runner.tests, config.reportDir);
|
35
19
|
});
|
36
|
-
|
37
|
-
(0, stories_js_1.saveTestsJson)(runner.tests, config.reportDir);
|
20
|
+
testsManager.updateTests(testsManager.loadAndMergeTests(tests));
|
38
21
|
return runner;
|
39
22
|
}
|
40
23
|
//# sourceMappingURL=master.js.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"master.js","sourceRoot":"","sources":["../../../src/server/master/master.ts"],"names":[],"mappings":";;;;;
|
1
|
+
{"version":3,"file":"master.js","sourceRoot":"","sources":["../../../src/server/master/master.ts"],"names":[],"mappings":";;;;;AAKA,yBAqBC;AAzBD,8CAAqD;AACrD,4DAAiC;AACjC,uDAAiD;AAElC,KAAK,UAAU,MAAM,CAAC,MAAc,EAAE,OAAgB;IACnE,+BAA+B;IAC/B,MAAM,YAAY,GAAG,IAAI,8BAAY,CAAC,MAAM,CAAC,SAAS,EAAE,MAAM,CAAC,SAAS,CAAC,CAAC;IAE1E,kCAAkC;IAClC,MAAM,MAAM,GAAG,IAAI,mBAAM,CAAC,MAAM,EAAE,YAAY,EAAE,OAAO,CAAC,CAAC;IAEzD,MAAM,MAAM,CAAC,IAAI,EAAE,CAAC;IAEpB,kDAAkD;IAClD,MAAM,KAAK,GAAG,MAAM,IAAA,iCAAoB,EACtC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,EAC5B,CAAC,QAAQ,EAAE,EAAE,CAAC,MAAM,CAAC,eAAe,CAAC,MAAM,EAAE,QAAQ,CAAC,EACtD,CAAC,SAAS,EAAE,EAAE;QACZ,MAAM,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;IAChC,CAAC,CACF,CAAC;IAEF,YAAY,CAAC,WAAW,CAAC,YAAY,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC,CAAC;IAEhE,OAAO,MAAM,CAAC;AAChB,CAAC"}
|
@@ -1,17 +1,16 @@
|
|
1
1
|
import { EventEmitter } from 'events';
|
2
2
|
import { Config, CreeveyStatus, ApprovePayload, ServerTest } from '../../types.js';
|
3
|
+
import { TestsManager } from './testsManager.js';
|
3
4
|
export default class Runner extends EventEmitter {
|
4
5
|
private failFast;
|
5
|
-
private screenDir;
|
6
|
-
private reportDir;
|
7
6
|
private browsers;
|
8
7
|
private scheduler;
|
9
8
|
private pools;
|
10
9
|
private fakeRunner;
|
11
10
|
private config;
|
12
|
-
|
11
|
+
testsManager: TestsManager;
|
13
12
|
get isRunning(): boolean;
|
14
|
-
constructor(config: Config, gridUrl?: string);
|
13
|
+
constructor(config: Config, testsManager: TestsManager, gridUrl?: string);
|
15
14
|
private handlePoolMessage;
|
16
15
|
private handlePoolStop;
|
17
16
|
init(): Promise<void>;
|
@@ -19,8 +18,7 @@ export default class Runner extends EventEmitter {
|
|
19
18
|
start(ids: string[]): void;
|
20
19
|
stop(): void;
|
21
20
|
get status(): CreeveyStatus;
|
22
|
-
private copyImage;
|
23
21
|
approveAll(): Promise<void>;
|
24
|
-
approve(
|
22
|
+
approve(payload: ApprovePayload): Promise<void>;
|
25
23
|
private sendUpdate;
|
26
24
|
}
|
@@ -3,8 +3,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
4
4
|
};
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
6
|
-
const path_1 = __importDefault(require("path"));
|
7
|
-
const promises_1 = require("fs/promises");
|
8
6
|
const events_1 = require("events");
|
9
7
|
const types_js_1 = require("../../types.js");
|
10
8
|
const pool_js_1 = __importDefault(require("./pool.js"));
|
@@ -22,23 +20,20 @@ class FakeRunner extends events_1.EventEmitter {
|
|
22
20
|
}
|
23
21
|
class Runner extends events_1.EventEmitter {
|
24
22
|
failFast;
|
25
|
-
screenDir;
|
26
|
-
reportDir;
|
27
23
|
browsers;
|
28
24
|
scheduler;
|
29
25
|
pools = {};
|
30
26
|
fakeRunner;
|
31
27
|
config;
|
32
|
-
|
28
|
+
testsManager;
|
33
29
|
get isRunning() {
|
34
30
|
return Object.values(this.pools).some((pool) => pool.isRunning);
|
35
31
|
}
|
36
|
-
constructor(config, gridUrl) {
|
32
|
+
constructor(config, testsManager, gridUrl) {
|
37
33
|
super();
|
38
34
|
this.config = config;
|
39
35
|
this.failFast = config.failFast;
|
40
|
-
this.
|
41
|
-
this.reportDir = config.reportDir;
|
36
|
+
this.testsManager = testsManager;
|
42
37
|
this.scheduler = new queue_js_1.WorkerQueue(config.useWorkerQueue);
|
43
38
|
this.browsers = Object.keys(config.browsers);
|
44
39
|
const runner = new FakeRunner();
|
@@ -46,7 +41,7 @@ class Runner extends events_1.EventEmitter {
|
|
46
41
|
if (Reporter.name == 'MochaJUnitReporter') {
|
47
42
|
isJUnit = true;
|
48
43
|
}
|
49
|
-
new Reporter(runner, { reportDir:
|
44
|
+
new Reporter(runner, { reportDir: config.reportDir, reporterOptions: config.reporterOptions });
|
50
45
|
this.fakeRunner = runner;
|
51
46
|
this.browsers
|
52
47
|
.map((browser) => (this.pools[browser] = new pool_js_1.default(this.scheduler, config, browser, gridUrl)))
|
@@ -54,10 +49,10 @@ class Runner extends events_1.EventEmitter {
|
|
54
49
|
}
|
55
50
|
handlePoolMessage = (message) => {
|
56
51
|
const { id, status, result } = message;
|
57
|
-
const test = this.
|
52
|
+
const test = this.testsManager.getTest(id);
|
58
53
|
if (!test)
|
59
54
|
return;
|
60
|
-
const { browser, testName
|
55
|
+
const { browser, testName } = test;
|
61
56
|
const fakeSuite = {
|
62
57
|
title: test.storyPath.slice(0, -1).join('/'),
|
63
58
|
fullTitle: () => fakeSuite.title,
|
@@ -82,19 +77,14 @@ class Runner extends events_1.EventEmitter {
|
|
82
77
|
},
|
83
78
|
};
|
84
79
|
fakeSuite.tests.push(fakeTest);
|
85
|
-
|
86
|
-
|
80
|
+
const update = this.testsManager.updateTestStatus(id, status, result);
|
81
|
+
if (!update)
|
82
|
+
return;
|
87
83
|
if (!result) {
|
88
|
-
// NOTE: Running status
|
89
84
|
this.fakeRunner.emit(types_js_1.TEST_EVENTS.TEST_BEGIN, fakeTest);
|
90
|
-
this.sendUpdate(
|
85
|
+
this.sendUpdate(update);
|
91
86
|
return;
|
92
87
|
}
|
93
|
-
test.results ??= [];
|
94
|
-
test.results.push(result);
|
95
|
-
if (status == 'failed') {
|
96
|
-
test.approved = null;
|
97
|
-
}
|
98
88
|
const { duration, attachments } = result;
|
99
89
|
fakeTest.duration = duration;
|
100
90
|
fakeTest.attachments = attachments;
|
@@ -118,20 +108,7 @@ class Runner extends events_1.EventEmitter {
|
|
118
108
|
this.fakeRunner.emit(types_js_1.TEST_EVENTS.SUITE_END, fakeSuite);
|
119
109
|
}
|
120
110
|
this.fakeRunner.emit(types_js_1.TEST_EVENTS.TEST_END, fakeTest);
|
121
|
-
this.sendUpdate(
|
122
|
-
tests: {
|
123
|
-
[id]: {
|
124
|
-
id,
|
125
|
-
browser,
|
126
|
-
testName,
|
127
|
-
storyPath,
|
128
|
-
status: test.status,
|
129
|
-
approved: test.approved,
|
130
|
-
results: [result],
|
131
|
-
storyId,
|
132
|
-
},
|
133
|
-
},
|
134
|
-
});
|
111
|
+
this.sendUpdate(update);
|
135
112
|
if (this.failFast && status == 'failed')
|
136
113
|
this.stop();
|
137
114
|
};
|
@@ -146,54 +123,32 @@ class Runner extends events_1.EventEmitter {
|
|
146
123
|
await Promise.all(Object.values(this.pools).map((pool) => pool.init()));
|
147
124
|
}
|
148
125
|
updateTests(testsDiff) {
|
149
|
-
const
|
150
|
-
|
151
|
-
|
152
|
-
const oldTest = this.tests[id];
|
153
|
-
if (newTest) {
|
154
|
-
if (oldTest) {
|
155
|
-
this.tests[id] = {
|
156
|
-
...newTest,
|
157
|
-
retries: oldTest.retries,
|
158
|
-
results: oldTest.results,
|
159
|
-
approved: oldTest.approved,
|
160
|
-
};
|
161
|
-
}
|
162
|
-
else
|
163
|
-
this.tests[id] = newTest;
|
164
|
-
const { story: _, fn: __, ...restTest } = newTest;
|
165
|
-
tests[id] = { ...restTest, status: 'unknown' };
|
166
|
-
}
|
167
|
-
else if (oldTest) {
|
168
|
-
const { id, browser, testName, storyPath, storyId } = oldTest;
|
169
|
-
removedTests.push({ id, browser, testName, storyPath, storyId });
|
170
|
-
// TODO Use Map instead
|
171
|
-
// eslint-disable-next-line @typescript-eslint/no-dynamic-delete
|
172
|
-
delete this.tests[id];
|
173
|
-
}
|
174
|
-
});
|
175
|
-
this.sendUpdate({ tests, removedTests });
|
126
|
+
const update = this.testsManager.updateTests(testsDiff);
|
127
|
+
if (update)
|
128
|
+
this.sendUpdate(update);
|
176
129
|
}
|
177
130
|
start(ids) {
|
178
131
|
if (this.isRunning)
|
179
132
|
return;
|
180
133
|
const testsToStart = ids
|
181
|
-
.map((id) => this.
|
134
|
+
.map((id) => this.testsManager.getTest(id))
|
182
135
|
.filter(types_js_1.isDefined)
|
183
136
|
.filter((test) => !test.skip);
|
184
137
|
if (testsToStart.length == 0)
|
185
138
|
return;
|
139
|
+
const pendingTests = testsToStart.reduce((update, { id, storyId, browser, testName, storyPath }) => ({
|
140
|
+
...update,
|
141
|
+
[id]: { id, browser, testName, storyPath, status: 'pending', storyId },
|
142
|
+
}), {});
|
186
143
|
this.sendUpdate({
|
187
144
|
isRunning: true,
|
188
|
-
tests:
|
189
|
-
...update,
|
190
|
-
[id]: { id, browser, testName, storyPath, status: 'pending', storyId },
|
191
|
-
}), {}),
|
145
|
+
tests: pendingTests,
|
192
146
|
});
|
193
147
|
const testsByBrowser = testsToStart.reduce((tests, test) => {
|
194
148
|
const { id, browser, testName, storyPath } = test;
|
195
149
|
const restPath = [...storyPath, testName].filter(types_js_1.isDefined);
|
196
|
-
|
150
|
+
// Update status to pending in TestsManager
|
151
|
+
this.testsManager.updateTestStatus(id, 'pending');
|
197
152
|
return {
|
198
153
|
...tests,
|
199
154
|
[browser]: [...(tests[browser] ?? []), { id, path: restPath }],
|
@@ -216,73 +171,21 @@ class Runner extends events_1.EventEmitter {
|
|
216
171
|
});
|
217
172
|
}
|
218
173
|
get status() {
|
219
|
-
const tests = {};
|
220
|
-
Object.values(this.tests)
|
221
|
-
.filter(types_js_1.isDefined)
|
222
|
-
.forEach(({ story: _, fn: __, ...test }) => (tests[test.id] = test));
|
223
174
|
return {
|
224
175
|
isRunning: this.isRunning,
|
225
|
-
tests,
|
176
|
+
tests: this.testsManager.getTestsData(),
|
226
177
|
browsers: this.browsers,
|
178
|
+
isUpdateMode: false,
|
227
179
|
};
|
228
180
|
}
|
229
|
-
async copyImage(test, image, actual) {
|
230
|
-
const { browser, testName, storyPath } = test;
|
231
|
-
const restPath = [...storyPath, testName].filter(types_js_1.isDefined);
|
232
|
-
const testPath = path_1.default.join(...restPath, image == browser ? '' : browser);
|
233
|
-
const srcImagePath = path_1.default.join(this.reportDir, testPath, actual);
|
234
|
-
const dstImagePath = path_1.default.join(this.screenDir, testPath, `${image}.png`);
|
235
|
-
await (0, promises_1.mkdir)(path_1.default.join(this.screenDir, testPath), { recursive: true });
|
236
|
-
await (0, promises_1.copyFile)(srcImagePath, dstImagePath);
|
237
|
-
}
|
238
181
|
async approveAll() {
|
239
|
-
const
|
240
|
-
|
241
|
-
if (!test?.results)
|
242
|
-
continue;
|
243
|
-
const retry = test.results.length - 1;
|
244
|
-
const { images, status } = test.results.at(retry) ?? {};
|
245
|
-
if (!images || status != 'failed')
|
246
|
-
continue;
|
247
|
-
for (const [name, image] of Object.entries(images)) {
|
248
|
-
if (!image)
|
249
|
-
continue;
|
250
|
-
await this.copyImage(test, name, image.actual);
|
251
|
-
test.approved ??= {};
|
252
|
-
test.approved[name] = retry;
|
253
|
-
test.status = 'approved';
|
254
|
-
updatedTests[test.id] = {
|
255
|
-
id: test.id,
|
256
|
-
browser: test.browser,
|
257
|
-
storyPath: test.storyPath,
|
258
|
-
storyId: test.storyId,
|
259
|
-
status: test.status,
|
260
|
-
approved: { [name]: retry },
|
261
|
-
};
|
262
|
-
}
|
263
|
-
}
|
264
|
-
this.sendUpdate({ tests: updatedTests });
|
182
|
+
const update = await this.testsManager.approveAll();
|
183
|
+
this.sendUpdate(update);
|
265
184
|
}
|
266
|
-
async approve(
|
267
|
-
const
|
268
|
-
if (
|
269
|
-
|
270
|
-
const result = test.results[retry];
|
271
|
-
if (!result.images)
|
272
|
-
return;
|
273
|
-
const images = result.images[image];
|
274
|
-
if (!images)
|
275
|
-
return;
|
276
|
-
test.approved ??= {};
|
277
|
-
const { browser, testName, storyPath, storyId } = test;
|
278
|
-
await this.copyImage(test, image, images.actual);
|
279
|
-
test.approved[image] = retry;
|
280
|
-
if (Object.keys(result.images).every((name) => typeof test.approved?.[name] == 'number')) {
|
281
|
-
test.status = 'approved';
|
282
|
-
}
|
283
|
-
this.sendUpdate({
|
284
|
-
tests: { [id]: { id, browser, testName, storyPath, status: test.status, approved: { [image]: retry }, storyId } },
|
285
|
-
});
|
185
|
+
async approve(payload) {
|
186
|
+
const update = await this.testsManager.approve(payload);
|
187
|
+
if (update)
|
188
|
+
this.sendUpdate(update);
|
286
189
|
}
|
287
190
|
sendUpdate(data) {
|
288
191
|
this.emit('update', data);
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"runner.js","sourceRoot":"","sources":["../../../src/server/master/runner.ts"],"names":[],"mappings":"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"}
|
1
|
+
{"version":3,"file":"runner.js","sourceRoot":"","sources":["../../../src/server/master/runner.ts"],"names":[],"mappings":"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"}
|
@@ -5,111 +5,101 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
6
6
|
exports.start = start;
|
7
7
|
const path_1 = __importDefault(require("path"));
|
8
|
-
const
|
9
|
-
const cluster_1 = __importDefault(require("cluster"));
|
10
|
-
const koa_1 = __importDefault(require("koa"));
|
11
|
-
const cors_1 = __importDefault(require("@koa/cors"));
|
12
|
-
const koa_static_1 = __importDefault(require("koa-static"));
|
13
|
-
const koa_mount_1 = __importDefault(require("koa-mount"));
|
14
|
-
const koa_bodyparser_1 = __importDefault(require("koa-bodyparser"));
|
15
|
-
const ws_1 = __importDefault(require("ws"));
|
8
|
+
const hyper_express_1 = __importDefault(require("hyper-express"));
|
16
9
|
const url_1 = require("url");
|
17
10
|
const messages_js_1 = require("../messages.js");
|
18
11
|
const types_js_1 = require("../../types.js");
|
19
12
|
const logger_js_1 = require("../logger.js");
|
20
|
-
const index_js_1 = require("
|
13
|
+
const index_js_1 = require("./handlers/index.js");
|
21
14
|
const importMetaUrl = (0, url_1.pathToFileURL)(__filename).href;
|
22
15
|
function start(reportDir, port, ui) {
|
23
16
|
let resolveApi = types_js_1.noop;
|
24
|
-
let setStoriesCounter = 0;
|
25
17
|
const creeveyApi = new Promise((resolve) => (resolveApi = resolve));
|
26
|
-
|
27
|
-
|
28
|
-
|
29
|
-
const
|
30
|
-
|
31
|
-
|
32
|
-
|
33
|
-
|
34
|
-
|
35
|
-
|
18
|
+
// Create HyperExpress server instance
|
19
|
+
const server = new hyper_express_1.default.Server();
|
20
|
+
// Store active WebSocket connections
|
21
|
+
const activeConnections = new Set();
|
22
|
+
// Enable CORS for all routes
|
23
|
+
server.use((request, response, next) => {
|
24
|
+
response.header('Access-Control-Allow-Origin', '*');
|
25
|
+
response.header('Access-Control-Allow-Methods', 'GET, POST, PUT, DELETE, OPTIONS');
|
26
|
+
response.header('Access-Control-Allow-Headers', 'Origin, X-Requested-With, Content-Type, Accept');
|
27
|
+
if (request.method === 'OPTIONS') {
|
28
|
+
return response.status(200).send();
|
36
29
|
}
|
37
|
-
|
30
|
+
next();
|
38
31
|
});
|
32
|
+
// Health check endpoint
|
33
|
+
server.get('/ping', index_js_1.pingHandler);
|
34
|
+
// Stories endpoint
|
35
|
+
server.post('/stories', (0, index_js_1.createStoriesHandler)());
|
36
|
+
// Capture endpoint
|
37
|
+
server.post('/capture', index_js_1.captureHandler);
|
38
|
+
// Serve report files
|
39
|
+
server.get('/report/*', (0, index_js_1.createStaticFileHandler)(reportDir, '/report/'));
|
40
|
+
// Serve static files
|
41
|
+
const webDir = path_1.default.join(path_1.default.dirname((0, url_1.fileURLToPath)(importMetaUrl)), '../../client/web');
|
42
|
+
server.get('/*', (0, index_js_1.createStaticFileHandler)(webDir));
|
43
|
+
// If UI mode, wait for CreeveyApi to be resolved
|
39
44
|
if (ui) {
|
40
|
-
|
41
|
-
|
42
|
-
|
45
|
+
// Create a custom broadcast function that works with our connections
|
46
|
+
const broadcast = (message) => {
|
47
|
+
for (const connection of activeConnections) {
|
48
|
+
connection.send(message);
|
49
|
+
}
|
50
|
+
};
|
51
|
+
// Create a custom WebSocket server that simulates the standard behavior
|
52
|
+
const customWsServer = {
|
53
|
+
clients: activeConnections,
|
54
|
+
publish: broadcast,
|
55
|
+
};
|
56
|
+
let api = null;
|
57
|
+
server.use(async (request, _response, next) => {
|
58
|
+
if (!api && request.path === '/') {
|
59
|
+
api = await creeveyApi;
|
60
|
+
api.subscribe(customWsServer);
|
61
|
+
}
|
62
|
+
next();
|
43
63
|
});
|
44
|
-
|
45
|
-
|
46
|
-
|
47
|
-
|
48
|
-
|
49
|
-
|
50
|
-
|
51
|
-
file,
|
52
|
-
stories.map(index_js_1.deserializeStory),
|
53
|
-
]);
|
54
|
-
setStoriesCounter = counter;
|
55
|
-
(0, messages_js_1.emitStoriesMessage)({ type: 'update', payload: deserializedStories });
|
56
|
-
Object.values(cluster_1.default.workers ?? {})
|
57
|
-
.filter(types_js_1.isDefined)
|
58
|
-
.filter((worker) => worker.isConnected())
|
59
|
-
.forEach((worker) => {
|
60
|
-
(0, messages_js_1.sendStoriesMessage)(worker, { type: 'update', payload: deserializedStories });
|
64
|
+
// Create WebSocket listener
|
65
|
+
server.ws('/', (ws) => {
|
66
|
+
// Add connection to the set of active connections
|
67
|
+
activeConnections.add(ws);
|
68
|
+
// Handle message events
|
69
|
+
ws.on('message', (message) => {
|
70
|
+
api?.handleMessage(ws, message);
|
61
71
|
});
|
62
|
-
|
63
|
-
|
64
|
-
|
65
|
-
});
|
66
|
-
app.use(async (ctx, next) => {
|
67
|
-
if (ctx.method == 'POST' && ctx.path == '/capture') {
|
68
|
-
const { workerId, options } = ctx.request.body;
|
69
|
-
const worker = Object.values(cluster_1.default.workers ?? {})
|
70
|
-
.filter(types_js_1.isDefined)
|
71
|
-
.find((worker) => worker.process.pid == workerId);
|
72
|
-
// NOTE: Hypothetical case when someone send to us capture req and we don't have a worker with browser session for it
|
73
|
-
if (!worker)
|
74
|
-
return;
|
75
|
-
await new Promise((resolve) => {
|
76
|
-
const unsubscribe = (0, messages_js_1.subscribeOnWorker)(worker, 'stories', (message) => {
|
77
|
-
if (message.type != 'capture')
|
78
|
-
return;
|
79
|
-
unsubscribe();
|
80
|
-
resolve();
|
81
|
-
});
|
82
|
-
(0, messages_js_1.sendStoriesMessage)(worker, { type: 'capture', payload: options });
|
72
|
+
// Handle close events to clean up connections
|
73
|
+
ws.on('close', () => {
|
74
|
+
activeConnections.delete(ws);
|
83
75
|
});
|
84
|
-
|
85
|
-
|
86
|
-
|
87
|
-
}
|
88
|
-
await next();
|
89
|
-
});
|
90
|
-
app.use((0, koa_static_1.default)(path_1.default.join(path_1.default.dirname((0, url_1.fileURLToPath)(importMetaUrl)), '../../client/web')));
|
91
|
-
app.use((0, koa_mount_1.default)('/report', (0, koa_static_1.default)(reportDir)));
|
92
|
-
wss.on('error', (error) => {
|
93
|
-
(0, logger_js_1.logger)().error(error);
|
94
|
-
});
|
95
|
-
server.listen(port);
|
76
|
+
});
|
77
|
+
}
|
78
|
+
// Shutdown handling
|
96
79
|
(0, messages_js_1.subscribeOn)('shutdown', () => {
|
80
|
+
// Close all WebSocket connections
|
81
|
+
for (const connection of activeConnections) {
|
82
|
+
try {
|
83
|
+
connection.close();
|
84
|
+
}
|
85
|
+
catch (error) {
|
86
|
+
(0, logger_js_1.logger)().error('Error closing WebSocket connection', error);
|
87
|
+
}
|
88
|
+
}
|
89
|
+
// Close the server
|
97
90
|
server.close();
|
98
|
-
wss.close();
|
99
|
-
wss.clients.forEach((ws) => {
|
100
|
-
ws.close();
|
101
|
-
});
|
102
91
|
});
|
103
|
-
|
104
|
-
|
105
|
-
|
106
|
-
|
107
|
-
|
108
|
-
|
109
|
-
|
110
|
-
|
111
|
-
|
92
|
+
// Start server
|
93
|
+
server
|
94
|
+
.listen(port)
|
95
|
+
.then(() => {
|
96
|
+
(0, logger_js_1.logger)().info(`Server starting on port ${port}`);
|
97
|
+
})
|
98
|
+
.catch((error) => {
|
99
|
+
(0, logger_js_1.logger)().error('Failed to start server', error);
|
100
|
+
process.exit(1);
|
112
101
|
});
|
102
|
+
// Return the function to resolve the API
|
113
103
|
return resolveApi;
|
114
104
|
}
|
115
105
|
//# sourceMappingURL=server.js.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"server.js","sourceRoot":"","sources":["../../../src/server/master/server.ts"],"names":[],"mappings":";;;;;
|
1
|
+
{"version":3,"file":"server.js","sourceRoot":"","sources":["../../../src/server/master/server.ts"],"names":[],"mappings":"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"}
|
@@ -1,3 +1,2 @@
|
|
1
|
-
import { CreeveyApi } from './api.js';
|
2
1
|
import { Config, Options } from '../../types.js';
|
3
|
-
export declare function start(gridUrl: string | undefined, config: Config, options: Options
|
2
|
+
export declare function start(gridUrl: string | undefined, config: Config, options: Options): Promise<void>;
|