@nrwl/nx-cloud 13.0.0-beta.1 → 13.0.0-beta.5
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/lib/core/runners/cloud-enabled/cloud-enabled-life-cycle.d.ts +2 -4
- package/lib/core/runners/cloud-enabled/cloud-enabled-life-cycle.js +2 -4
- package/lib/core/runners/cloud-enabled/cloud-enabled-life-cycle.js.map +1 -1
- package/lib/core/runners/cloud-enabled/cloud-enabled.runner.js +17 -12
- package/lib/core/runners/cloud-enabled/cloud-enabled.runner.js.map +1 -1
- package/lib/core/terminal-output/end-of-run-message.d.ts +2 -5
- package/lib/core/terminal-output/end-of-run-message.js +3 -39
- package/lib/core/terminal-output/end-of-run-message.js.map +1 -1
- package/package.json +1 -1
|
@@ -2,19 +2,17 @@ import { Task } from '@nrwl/workspace/src/tasks-runner/tasks-runner';
|
|
|
2
2
|
import { RunContext } from '../../models/run-context.model';
|
|
3
3
|
import { TaskExecution } from '../../models/task-execution.model';
|
|
4
4
|
import { OutputObfuscator } from '../../terminal-output/output-obfuscator';
|
|
5
|
-
import { EndOfRunMessage } from '../../terminal-output/end-of-run-message';
|
|
6
5
|
export declare class CloudEnabledLifeCycle {
|
|
7
6
|
private readonly runContext;
|
|
8
7
|
private readonly cacheDirectory;
|
|
9
8
|
private readonly collectTerminalOutput;
|
|
10
9
|
private readonly cacheableOperations;
|
|
11
10
|
private readonly outputObfuscator;
|
|
12
|
-
private readonly
|
|
11
|
+
private readonly tasks;
|
|
13
12
|
private static MAX_CHARACTERS_FAILED_TASK;
|
|
14
13
|
private static MAX_CHARACTERS_SUCCESSFUL_TASK;
|
|
15
14
|
private static MAX_CHARACTERS_CACHED_TASK;
|
|
16
|
-
|
|
17
|
-
constructor(runContext: RunContext, cacheDirectory: string | undefined, collectTerminalOutput: boolean, cacheableOperations: string[], outputObfuscator: OutputObfuscator, endOfRunMessage: EndOfRunMessage);
|
|
15
|
+
constructor(runContext: RunContext, cacheDirectory: string | undefined, collectTerminalOutput: boolean, cacheableOperations: string[], outputObfuscator: OutputObfuscator, tasks: TaskExecution[]);
|
|
18
16
|
scheduleTask(task: Task): void;
|
|
19
17
|
startTask(task: Task): void;
|
|
20
18
|
endTask(task: Task, code: number): void;
|
|
@@ -7,14 +7,13 @@ const app_root_1 = require("@nrwl/workspace/src/utils/app-root");
|
|
|
7
7
|
const fs_1 = require("fs");
|
|
8
8
|
const path = require("path");
|
|
9
9
|
class CloudEnabledLifeCycle {
|
|
10
|
-
constructor(runContext, cacheDirectory, collectTerminalOutput, cacheableOperations, outputObfuscator,
|
|
10
|
+
constructor(runContext, cacheDirectory, collectTerminalOutput, cacheableOperations, outputObfuscator, tasks) {
|
|
11
11
|
this.runContext = runContext;
|
|
12
12
|
this.cacheDirectory = cacheDirectory;
|
|
13
13
|
this.collectTerminalOutput = collectTerminalOutput;
|
|
14
14
|
this.cacheableOperations = cacheableOperations;
|
|
15
15
|
this.outputObfuscator = outputObfuscator;
|
|
16
|
-
this.
|
|
17
|
-
this.tasks = [];
|
|
16
|
+
this.tasks = tasks;
|
|
18
17
|
}
|
|
19
18
|
scheduleTask(task) {
|
|
20
19
|
this.runContext.scheduledTasks.push(task);
|
|
@@ -58,7 +57,6 @@ class CloudEnabledLifeCycle {
|
|
|
58
57
|
}
|
|
59
58
|
}
|
|
60
59
|
endCommand() {
|
|
61
|
-
this.endOfRunMessage.printCacheHitsMessage();
|
|
62
60
|
}
|
|
63
61
|
getTerminalOutput(hash, cacheStatus, code) {
|
|
64
62
|
let dir;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cloud-enabled-life-cycle.js","sourceRoot":"","sources":["../../../../../../../../libs/nx-packages/nx-cloud/src/lib/core/runners/cloud-enabled/cloud-enabled-life-cycle.ts"],"names":[],"mappings":";;;AACA,kEAAiE;AACjE,+BAA4B;AAC5B,iEAAiE;AACjE,2BAAkC;AAClC,6BAA6B;AAM7B,MAAa,qBAAqB;
|
|
1
|
+
{"version":3,"file":"cloud-enabled-life-cycle.js","sourceRoot":"","sources":["../../../../../../../../libs/nx-packages/nx-cloud/src/lib/core/runners/cloud-enabled/cloud-enabled-life-cycle.ts"],"names":[],"mappings":"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"}
|
|
@@ -41,11 +41,11 @@ function storeTaskHashes(taskExecutions, directory) {
|
|
|
41
41
|
}
|
|
42
42
|
(0, fs_1.writeFileSync)(path.join(directory, 'tasks-hashes'), hashes);
|
|
43
43
|
}
|
|
44
|
-
function onComplete(lifeCycle, options, remoteCache, api, outputObfuscator, runStartTime, messages, endOfRunMessage) {
|
|
44
|
+
function onComplete(lifeCycle, options, remoteCache, api, outputObfuscator, runStartTime, messages, endOfRunMessage, taskExecutions) {
|
|
45
45
|
return __awaiter(this, void 0, void 0, function* () {
|
|
46
46
|
const runEndTime = new Date().toISOString();
|
|
47
47
|
if (environment_1.VERBOSE_LOGGING) {
|
|
48
|
-
const tasks =
|
|
48
|
+
const tasks = taskExecutions.map((tt) => {
|
|
49
49
|
return Object.assign(Object.assign({}, tt), { terminalOutput: tt.terminalOutput
|
|
50
50
|
? `${tt.terminalOutput.slice(0, 20)}...`
|
|
51
51
|
: undefined });
|
|
@@ -56,7 +56,7 @@ function onComplete(lifeCycle, options, remoteCache, api, outputObfuscator, runS
|
|
|
56
56
|
});
|
|
57
57
|
}
|
|
58
58
|
if (environment_1.AGENT_RUNNING_IN_DISTRIBUTED_EXECUTION) {
|
|
59
|
-
storeTaskHashes(
|
|
59
|
+
storeTaskHashes(taskExecutions, options.cacheDirectory || './node_modules/.cache/nx');
|
|
60
60
|
}
|
|
61
61
|
const branch = (0, environment_1.getBranch)();
|
|
62
62
|
const endRequest = yield Promise.all([
|
|
@@ -72,10 +72,14 @@ function onComplete(lifeCycle, options, remoteCache, api, outputObfuscator, runS
|
|
|
72
72
|
// only set sha if branch is set cause we invoke a separate process,
|
|
73
73
|
// which adds a few millis
|
|
74
74
|
sha: branch ? (0, environment_1.extractGitSha)() : undefined,
|
|
75
|
-
},
|
|
75
|
+
}, taskExecutions),
|
|
76
76
|
]);
|
|
77
77
|
messages.printMessages();
|
|
78
|
-
|
|
78
|
+
if (!messages.anyErrors) {
|
|
79
|
+
setTimeout(() => {
|
|
80
|
+
endOfRunMessage.printCacheHitsMessage();
|
|
81
|
+
}, 0);
|
|
82
|
+
}
|
|
79
83
|
if (environment_1.AGENT_RUNNING_IN_DISTRIBUTED_EXECUTION) {
|
|
80
84
|
if (!endRequest[0]) {
|
|
81
85
|
output_1.output.error({
|
|
@@ -96,8 +100,8 @@ function onComplete(lifeCycle, options, remoteCache, api, outputObfuscator, runS
|
|
|
96
100
|
catch (e) { }
|
|
97
101
|
});
|
|
98
102
|
}
|
|
99
|
-
function createLifeCycle(runContext, options, outputObfuscator,
|
|
100
|
-
const cloudEnabledLifeCycle = new cloud_enabled_life_cycle_1.CloudEnabledLifeCycle(runContext, options.cacheDirectory, options.scan === undefined ? true : options.scan, options.cacheableOperations || [], outputObfuscator,
|
|
103
|
+
function createLifeCycle(runContext, options, outputObfuscator, tasks) {
|
|
104
|
+
const cloudEnabledLifeCycle = new cloud_enabled_life_cycle_1.CloudEnabledLifeCycle(runContext, options.cacheDirectory, options.scan === undefined ? true : options.scan, options.cacheableOperations || [], outputObfuscator, tasks);
|
|
101
105
|
try {
|
|
102
106
|
const { CompositeLifeCycle, } = require('@nrwl/workspace/src/tasks-runner/life-cycle');
|
|
103
107
|
if (!CompositeLifeCycle)
|
|
@@ -115,9 +119,10 @@ function cloudEnabledTasksRunner(tasks, options, context) {
|
|
|
115
119
|
requests: {},
|
|
116
120
|
allTasks: tasks,
|
|
117
121
|
};
|
|
122
|
+
const taskExecutions = [];
|
|
118
123
|
const messages = new message_reporter_1.MessageReporter(options);
|
|
119
124
|
const api = createApi(messages, options, runContext);
|
|
120
|
-
const endOfRunMessage = new end_of_run_message_1.EndOfRunMessage(
|
|
125
|
+
const endOfRunMessage = new end_of_run_message_1.EndOfRunMessage(runContext, taskExecutions);
|
|
121
126
|
const outputObfuscator = new output_obfuscator_1.OutputObfuscator();
|
|
122
127
|
const hashes = tasks.map((t) => t.hash).filter((h) => !!h);
|
|
123
128
|
const startRunRequest = api.startRun(environment_1.NX_CLOUD_DISTRIBUTED_EXECUTION_ID, hashes);
|
|
@@ -125,7 +130,7 @@ function cloudEnabledTasksRunner(tasks, options, context) {
|
|
|
125
130
|
runContext.requests[hash] = startRunRequest;
|
|
126
131
|
});
|
|
127
132
|
const runStartTime = new Date().toISOString();
|
|
128
|
-
const lifeCycle = createLifeCycle(runContext, options, outputObfuscator,
|
|
133
|
+
const lifeCycle = createLifeCycle(runContext, options, outputObfuscator, taskExecutions);
|
|
129
134
|
const encryption = new e2e_encryption_1.E2EEncryption(environment_1.ENCRYPTION_KEY || options.encryptionKey);
|
|
130
135
|
const fileStorage = new file_storage_1.FileStorage(encryption, environment_1.NUMBER_OF_TRIES);
|
|
131
136
|
const remoteCache = new cloud_remote_cache_1.CloudRemoteCache(messages, api, runContext, fileStorage);
|
|
@@ -139,7 +144,7 @@ function cloudEnabledTasksRunner(tasks, options, context) {
|
|
|
139
144
|
next: (value) => wrappedRes.next(value),
|
|
140
145
|
error: (err) => wrappedRes.error(err),
|
|
141
146
|
complete: () => __awaiter(this, void 0, void 0, function* () {
|
|
142
|
-
yield onComplete(lifeCycle, options, remoteCache, api, outputObfuscator, runStartTime, messages, endOfRunMessage);
|
|
147
|
+
yield onComplete(lifeCycle, options, remoteCache, api, outputObfuscator, runStartTime, messages, endOfRunMessage, taskExecutions);
|
|
143
148
|
wrappedRes.complete();
|
|
144
149
|
}),
|
|
145
150
|
});
|
|
@@ -149,11 +154,11 @@ function cloudEnabledTasksRunner(tasks, options, context) {
|
|
|
149
154
|
else {
|
|
150
155
|
return res
|
|
151
156
|
.then((r) => __awaiter(this, void 0, void 0, function* () {
|
|
152
|
-
yield onComplete(lifeCycle, options, remoteCache, api, outputObfuscator, runStartTime, messages, endOfRunMessage);
|
|
157
|
+
yield onComplete(lifeCycle, options, remoteCache, api, outputObfuscator, runStartTime, messages, endOfRunMessage, taskExecutions);
|
|
153
158
|
return r;
|
|
154
159
|
}))
|
|
155
160
|
.catch((e) => __awaiter(this, void 0, void 0, function* () {
|
|
156
|
-
yield onComplete(lifeCycle, options, remoteCache, api, outputObfuscator, runStartTime, messages, endOfRunMessage);
|
|
161
|
+
yield onComplete(lifeCycle, options, remoteCache, api, outputObfuscator, runStartTime, messages, endOfRunMessage, taskExecutions);
|
|
157
162
|
throw e;
|
|
158
163
|
}));
|
|
159
164
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cloud-enabled.runner.js","sourceRoot":"","sources":["../../../../../../../../libs/nx-packages/nx-cloud/src/lib/core/runners/cloud-enabled/cloud-enabled.runner.ts"],"names":[],"mappings":";;;;;;;;;;;;AAMA,mDAAgD;AAEhD,6EAAyE;AACzE,iFAA2E;AAC3E,+EAA2E;AAC3E,yEAAmE;AACnE,kEAA8D;AAC9D,sEAAkE;AAClE,gEAYwC;AACxC,6DAAwD;AACxD,sFAAiF;AACjF,iEAA8D;AAC9D,mDAA8C;AAE9C,2BAAmC;AACnC,6BAA6B;AAC7B,oEAAoE;
|
|
1
|
+
{"version":3,"file":"cloud-enabled.runner.js","sourceRoot":"","sources":["../../../../../../../../libs/nx-packages/nx-cloud/src/lib/core/runners/cloud-enabled/cloud-enabled.runner.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,11 +1,8 @@
|
|
|
1
|
-
import { MessageReporter } from './message-reporter';
|
|
2
1
|
import { RunContext } from '../models/run-context.model';
|
|
3
2
|
import { TaskExecution } from '../models/task-execution.model';
|
|
4
3
|
export declare class EndOfRunMessage {
|
|
5
|
-
private readonly messages;
|
|
6
4
|
private readonly runContext;
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
private patchReporters;
|
|
5
|
+
private readonly taskExecutions;
|
|
6
|
+
constructor(runContext: RunContext, taskExecutions: TaskExecution[]);
|
|
10
7
|
printCacheHitsMessage(): void;
|
|
11
8
|
}
|
|
@@ -4,50 +4,14 @@ exports.EndOfRunMessage = void 0;
|
|
|
4
4
|
const environment_1 = require("../../utilities/environment");
|
|
5
5
|
const print_message_1 = require("../../utilities/print-message");
|
|
6
6
|
class EndOfRunMessage {
|
|
7
|
-
constructor(
|
|
8
|
-
this.messages = messages;
|
|
7
|
+
constructor(runContext, taskExecutions) {
|
|
9
8
|
this.runContext = runContext;
|
|
10
|
-
this.
|
|
11
|
-
this.patchReporters();
|
|
12
|
-
}
|
|
13
|
-
patchReporters() {
|
|
14
|
-
try {
|
|
15
|
-
const reporter = require('@nrwl/workspace/src/tasks-runner/default-reporter');
|
|
16
|
-
const old = reporter.DefaultReporter.prototype.printResults;
|
|
17
|
-
const that = this;
|
|
18
|
-
reporter.DefaultReporter.prototype.printResults = function () {
|
|
19
|
-
old.apply(this, arguments);
|
|
20
|
-
that.printCacheHitsMessage();
|
|
21
|
-
};
|
|
22
|
-
}
|
|
23
|
-
catch (e) { }
|
|
24
|
-
try {
|
|
25
|
-
const reporter = require('@nrwl/workspace/src/tasks-runner/run-one-reporter');
|
|
26
|
-
const old = reporter.RunOneReporter.prototype.printResults;
|
|
27
|
-
const that = this;
|
|
28
|
-
reporter.RunOneReporter.prototype.printResults = function () {
|
|
29
|
-
old.apply(this, arguments);
|
|
30
|
-
that.printCacheHitsMessage();
|
|
31
|
-
};
|
|
32
|
-
}
|
|
33
|
-
catch (e) { }
|
|
34
|
-
try {
|
|
35
|
-
const reporter = require('@nrwl/workspace/src/tasks-runner/empty-reporter');
|
|
36
|
-
const old = reporter.EmptyReporter.prototype.printResults;
|
|
37
|
-
const that = this;
|
|
38
|
-
reporter.EmptyReporter.prototype.printResults = function () {
|
|
39
|
-
old.apply(this, arguments);
|
|
40
|
-
that.printCacheHitsMessage();
|
|
41
|
-
};
|
|
42
|
-
}
|
|
43
|
-
catch (e) { }
|
|
9
|
+
this.taskExecutions = taskExecutions;
|
|
44
10
|
}
|
|
45
11
|
printCacheHitsMessage() {
|
|
46
|
-
if (this.messages.anyErrors)
|
|
47
|
-
return;
|
|
48
12
|
if (environment_1.AGENT_RUNNING_IN_DISTRIBUTED_EXECUTION)
|
|
49
13
|
return;
|
|
50
|
-
const hits = this.
|
|
14
|
+
const hits = this.taskExecutions
|
|
51
15
|
.filter((t) => this.runContext.statuses[t.hash] === 'remote-cache-hit')
|
|
52
16
|
.map((t) => t.projectName);
|
|
53
17
|
if (hits.length === 0 && !this.runContext.runUrl) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"end-of-run-message.js","sourceRoot":"","sources":["../../../../../../../libs/nx-packages/nx-cloud/src/lib/core/terminal-output/end-of-run-message.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"end-of-run-message.js","sourceRoot":"","sources":["../../../../../../../libs/nx-packages/nx-cloud/src/lib/core/terminal-output/end-of-run-message.ts"],"names":[],"mappings":";;;AAEA,6DAAqF;AACrF,iEAA6D;AAE7D,MAAa,eAAe;IAC1B,YACmB,UAAsB,EACtB,cAA+B;QAD/B,eAAU,GAAV,UAAU,CAAY;QACtB,mBAAc,GAAd,cAAc,CAAiB;IAC/C,CAAC;IAEJ,qBAAqB;QACnB,IAAI,oDAAsC;YAAE,OAAO;QAEnD,MAAM,IAAI,GAAG,IAAI,CAAC,cAAc;aAC7B,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,kBAAkB,CAAC;aACtE,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC;QAE7B,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE;YAChD,OAAO;SACR;QAED,MAAM,QAAQ,GAAG,IAAI,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,MAAM,WAAW,CAAC;QACzE,MAAM,OAAO,GAAG,EAAW,CAAC;QAC5B,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE;YACnB,OAAO,CAAC,IAAI,CAAC,eAAe,QAAQ,gCAAgC,CAAC,CAAC;SACvE;QACD,IAAI,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE;YAC1B,OAAO,CAAC,IAAI,CAAC,sBAAsB,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC,CAAC;SAC9D;QACD,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE;YACtB,IAAA,4BAAY,EAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;SACjC;IACH,CAAC;CACF;AA7BD,0CA6BC"}
|