@nrwl/nx-cloud 14.1.3 → 14.2.1-beta.1
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/api/error-reporter.api.js +36 -1
- package/lib/core/api/run-group.api.js +65 -1
- package/lib/core/commands/record-output.js +18 -12
- package/lib/core/commands/record-output.js.map +1 -1
- package/lib/core/file-storage/file-storage.d.ts +1 -0
- package/lib/core/file-storage/file-storage.js +51 -6
- package/lib/core/file-storage/file-storage.js.map +1 -1
- package/lib/core/runners/cloud-enabled/cloud-enabled-life-cycle.js +138 -1
- package/lib/core/runners/cloud-enabled/cloud-enabled.runner.js +169 -1
- package/lib/core/runners/cloud-enabled/cloud-remote-cache.js +113 -1
- package/lib/core/runners/cloud-enabled/cloud-run.api.js +166 -1
- package/lib/core/runners/distributed-agent/distributed-agent.api.js +79 -1
- package/lib/core/runners/distributed-agent/distributed-agent.impl.js +243 -1
- package/lib/core/runners/distributed-agent/distributed-agent.impl.js.map +1 -1
- package/lib/core/runners/distributed-execution/distributed-execution.api.js +131 -1
- package/lib/core/runners/distributed-execution/distributed-execution.runner.js +206 -1
- package/lib/core/runners/distributed-execution/split-task-graph-into-stages.js +37 -1
- package/lib/core/runners/distributed-execution/task-graph-creator.js +77 -1
- package/lib/utilities/create-no-new-messages-timeout.js +1 -1
- package/lib/utilities/create-no-new-messages-timeout.js.map +1 -1
- package/lib/utilities/environment.d.ts +1 -1
- package/lib/utilities/environment.js +5 -3
- package/lib/utilities/environment.js.map +1 -1
- package/package.json +1 -1
- package/project.json +36 -0
|
@@ -1 +1,36 @@
|
|
|
1
|
-
|
|
1
|
+
"use strict";
|
|
2
|
+
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
+
});
|
|
10
|
+
};
|
|
11
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
+
exports.ErrorReporterApi = void 0;
|
|
13
|
+
const axios_1 = require("../../utilities/axios");
|
|
14
|
+
const { output } = require('../../utilities/nx-imports');
|
|
15
|
+
class ErrorReporterApi {
|
|
16
|
+
constructor(options) {
|
|
17
|
+
this.apiAxiosInstance = (0, axios_1.createApiAxiosInstance)(options);
|
|
18
|
+
}
|
|
19
|
+
reportError(message) {
|
|
20
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
21
|
+
try {
|
|
22
|
+
yield (0, axios_1.axiosMultipleTries)(() => this.apiAxiosInstance.post('/nx-cloud/report-client-error', {
|
|
23
|
+
message,
|
|
24
|
+
}));
|
|
25
|
+
}
|
|
26
|
+
catch (e) {
|
|
27
|
+
output.warn({
|
|
28
|
+
title: `Unable to record the following error: '${message}'`,
|
|
29
|
+
bodyLines: [e.message],
|
|
30
|
+
});
|
|
31
|
+
}
|
|
32
|
+
});
|
|
33
|
+
}
|
|
34
|
+
}
|
|
35
|
+
exports.ErrorReporterApi = ErrorReporterApi;
|
|
36
|
+
//# sourceMappingURL=error-reporter.api.js.map
|
|
@@ -1 +1,65 @@
|
|
|
1
|
-
|
|
1
|
+
"use strict";
|
|
2
|
+
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
+
});
|
|
10
|
+
};
|
|
11
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
+
exports.RunGroupApi = void 0;
|
|
13
|
+
const axios_1 = require("../../utilities/axios");
|
|
14
|
+
const metric_logger_1 = require("../../utilities/metric-logger");
|
|
15
|
+
const { output } = require('../../utilities/nx-imports');
|
|
16
|
+
class RunGroupApi {
|
|
17
|
+
constructor(options) {
|
|
18
|
+
this.apiAxiosInstance = (0, axios_1.createApiAxiosInstance)(options);
|
|
19
|
+
}
|
|
20
|
+
createRunGroup(branch, runGroup) {
|
|
21
|
+
var _a;
|
|
22
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
23
|
+
const recorder = (0, metric_logger_1.createMetricRecorder)('createRunGroup');
|
|
24
|
+
try {
|
|
25
|
+
const resp = yield (0, axios_1.axiosMultipleTries)(() => this.apiAxiosInstance.post('/nx-cloud/executions/create-run-group', {
|
|
26
|
+
branch: branch,
|
|
27
|
+
runGroup: runGroup,
|
|
28
|
+
}));
|
|
29
|
+
recorder.recordMetric((0, metric_logger_1.mapRespToPerfEntry)(resp));
|
|
30
|
+
}
|
|
31
|
+
catch (e) {
|
|
32
|
+
recorder.recordMetric(((_a = e === null || e === void 0 ? void 0 : e.axiosException) === null || _a === void 0 ? void 0 : _a.response)
|
|
33
|
+
? (0, metric_logger_1.mapRespToPerfEntry)(e.axiosException.response)
|
|
34
|
+
: metric_logger_1.RUNNER_FAILURE_PERF_ENTRY);
|
|
35
|
+
output.error({
|
|
36
|
+
title: e.message,
|
|
37
|
+
});
|
|
38
|
+
process.exit(1);
|
|
39
|
+
}
|
|
40
|
+
});
|
|
41
|
+
}
|
|
42
|
+
completeRunGroup(runGroup) {
|
|
43
|
+
var _a;
|
|
44
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
45
|
+
const recorder = (0, metric_logger_1.createMetricRecorder)('createRunGroup');
|
|
46
|
+
try {
|
|
47
|
+
const resp = yield (0, axios_1.axiosMultipleTries)(() => this.apiAxiosInstance.post('/nx-cloud/executions/complete-run-group', {
|
|
48
|
+
runGroup: runGroup,
|
|
49
|
+
}));
|
|
50
|
+
recorder.recordMetric((0, metric_logger_1.mapRespToPerfEntry)(resp));
|
|
51
|
+
}
|
|
52
|
+
catch (e) {
|
|
53
|
+
recorder.recordMetric(((_a = e === null || e === void 0 ? void 0 : e.axiosException) === null || _a === void 0 ? void 0 : _a.response)
|
|
54
|
+
? (0, metric_logger_1.mapRespToPerfEntry)(e.axiosException.response)
|
|
55
|
+
: metric_logger_1.RUNNER_FAILURE_PERF_ENTRY);
|
|
56
|
+
output.error({
|
|
57
|
+
title: e.message,
|
|
58
|
+
});
|
|
59
|
+
process.exit(1);
|
|
60
|
+
}
|
|
61
|
+
});
|
|
62
|
+
}
|
|
63
|
+
}
|
|
64
|
+
exports.RunGroupApi = RunGroupApi;
|
|
65
|
+
//# sourceMappingURL=run-group.api.js.map
|
|
@@ -26,17 +26,7 @@ function runCommandAndStoreInCloud() {
|
|
|
26
26
|
const outputObfuscator = new output_obfuscator_1.OutputObfuscator(taskRunnerOptions.maskedProperties);
|
|
27
27
|
const branch = (0, environment_1.getBranch)();
|
|
28
28
|
const runGroup = (0, environment_1.getRunGroup)();
|
|
29
|
-
|
|
30
|
-
const commandStartIndex = process.argv.findIndex((arg) => arg === 'record') + 1;
|
|
31
|
-
if (commandStartIndex < process.argv.length) {
|
|
32
|
-
// Different package managers may remove not the "--" from the command automatically, so account for that
|
|
33
|
-
const sliceOffset = process.argv[commandStartIndex] === '--' ? 1 : 0;
|
|
34
|
-
userCommandAndArgs = process.argv.slice(commandStartIndex + sliceOffset);
|
|
35
|
-
}
|
|
36
|
-
else {
|
|
37
|
-
console.log('Invalid command. Use `nx-cloud record [my command] [my arg1] [my arg...]`');
|
|
38
|
-
process.exit(1);
|
|
39
|
-
}
|
|
29
|
+
const userCommandAndArgs = parseCommandAndFlags(process.argv);
|
|
40
30
|
const [userCommand, ...userArgs] = userCommandAndArgs;
|
|
41
31
|
const startTime = new Date().toISOString();
|
|
42
32
|
const { statusCode, terminalOutput } = yield spawnUserCommandAndCaptureOutput(userCommand, userArgs);
|
|
@@ -65,6 +55,20 @@ function getTaskRunnerOptions() {
|
|
|
65
55
|
throw new Error('Unable to locate task runner options.');
|
|
66
56
|
}
|
|
67
57
|
}
|
|
58
|
+
function parseCommandAndFlags(args) {
|
|
59
|
+
let commandStartIndex = args.findIndex((arg) => arg === 'record') + 1;
|
|
60
|
+
let userCommandAndArgs;
|
|
61
|
+
if (commandStartIndex < process.argv.length) {
|
|
62
|
+
// Different package managers may remove not the "--" from the command automatically, so account for that
|
|
63
|
+
const sliceOffset = process.argv[commandStartIndex] === '--' ? 1 : 0;
|
|
64
|
+
userCommandAndArgs = process.argv.slice(commandStartIndex + sliceOffset);
|
|
65
|
+
}
|
|
66
|
+
else {
|
|
67
|
+
console.log('Invalid command. Use `nx-cloud record [my command] [my arg1] [my arg...]`');
|
|
68
|
+
process.exit(1);
|
|
69
|
+
}
|
|
70
|
+
return userCommandAndArgs;
|
|
71
|
+
}
|
|
68
72
|
function spawnUserCommandAndCaptureOutput(command, args) {
|
|
69
73
|
return new Promise((res, rej) => {
|
|
70
74
|
try {
|
|
@@ -139,7 +143,9 @@ function endRecordOutputRun(axios, obfuscator, taskRunnerOptions, params) {
|
|
|
139
143
|
const endRunResp = yield (0, axios_1.axiosMultipleTries)(() => axios.post('/nx-cloud/runs/end', compressedBuffer, {
|
|
140
144
|
headers: Object.assign(Object.assign({}, axios.defaults.headers), { 'Content-Encoding': 'gzip', 'Content-Type': 'application/octet-stream' }),
|
|
141
145
|
}));
|
|
142
|
-
|
|
146
|
+
if (process.env.NX_CLOUD_SILENT_RECORD !== 'true') {
|
|
147
|
+
printRecordOutputRunEndMessage(endRunResp.data.runUrl);
|
|
148
|
+
}
|
|
143
149
|
});
|
|
144
150
|
}
|
|
145
151
|
function printRecordOutputRunEndMessage(runUrl) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"record-output.js","sourceRoot":"","sources":["../../../../../../../libs/nx-packages/nx-cloud/lib/core/commands/record-output.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,oCAAoC;AACpC,6DAKqC;AAErC,iDAG+B;AAC/B,+BAAiC;AACjC,+BAA4B;AAE5B,4EAAwE;AACxE,iEAA6D;AAE7D,MAAM,EAAE,MAAM,EAAE,aAAa,EAAE,GAAG,OAAO,CAAC,4BAA4B,CAAC,CAAC;AAYxE,MAAM,6BAA6B,GAAG,MAAO,CAAC;AAE9C,SAAsB,yBAAyB;;QAC7C,MAAM,iBAAiB,GAAG,oBAAoB,EAAE,CAAC;QACjD,MAAM,KAAK,GAAG,IAAA,8BAAsB,EAAC,iBAAiB,CAAC,CAAC;QACxD,MAAM,gBAAgB,GAAG,IAAI,oCAAgB,CAC3C,iBAAiB,CAAC,gBAAgB,CACnC,CAAC;QACF,MAAM,MAAM,GAAG,IAAA,uBAAS,GAAE,CAAC;QAC3B,MAAM,QAAQ,GAAG,IAAA,yBAAW,GAAE,CAAC;QAE/B,
|
|
1
|
+
{"version":3,"file":"record-output.js","sourceRoot":"","sources":["../../../../../../../libs/nx-packages/nx-cloud/lib/core/commands/record-output.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,oCAAoC;AACpC,6DAKqC;AAErC,iDAG+B;AAC/B,+BAAiC;AACjC,+BAA4B;AAE5B,4EAAwE;AACxE,iEAA6D;AAE7D,MAAM,EAAE,MAAM,EAAE,aAAa,EAAE,GAAG,OAAO,CAAC,4BAA4B,CAAC,CAAC;AAYxE,MAAM,6BAA6B,GAAG,MAAO,CAAC;AAE9C,SAAsB,yBAAyB;;QAC7C,MAAM,iBAAiB,GAAG,oBAAoB,EAAE,CAAC;QACjD,MAAM,KAAK,GAAG,IAAA,8BAAsB,EAAC,iBAAiB,CAAC,CAAC;QACxD,MAAM,gBAAgB,GAAG,IAAI,oCAAgB,CAC3C,iBAAiB,CAAC,gBAAgB,CACnC,CAAC;QACF,MAAM,MAAM,GAAG,IAAA,uBAAS,GAAE,CAAC;QAC3B,MAAM,QAAQ,GAAG,IAAA,yBAAW,GAAE,CAAC;QAE/B,MAAM,kBAAkB,GAAG,oBAAoB,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAC9D,MAAM,CAAC,WAAW,EAAE,GAAG,QAAQ,CAAC,GAAG,kBAAkB,CAAC;QAEtD,MAAM,SAAS,GAAG,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;QAC3C,MAAM,EAAE,UAAU,EAAE,cAAc,EAAE,GAAG,MAAM,gCAAgC,CAC3E,WAAW,EACX,QAAQ,CACT,CAAC;QACF,MAAM,OAAO,GAAG,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;QAEzC,MAAM,wBAAwB,GAA6B;YACzD,UAAU;YACV,cAAc;YACd,wBAAwB,EAAE,kBAAkB,CAAC,IAAI,CAAC,GAAG,CAAC;YACtD,SAAS;YACT,OAAO;YACP,MAAM;YACN,QAAQ;SACT,CAAC;QACF,MAAM,kBAAkB,CACtB,KAAK,EACL,gBAAgB,EAChB,iBAAiB,EACjB,wBAAwB,CACzB,CAAC;QAEF,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IAC3B,CAAC;CAAA;AApCD,8DAoCC;AAED,SAAS,oBAAoB;;IAC3B,IAAI;QACF,MAAM,iBAAiB,GAAG,MAAA,MAAA,MAAA,OAAO,CAAC,GAAG,aAAa,UAAU,CAAC,0CACzD,kBAAkB,0CAAE,OAAO,0CAAE,OAAO,CAAC;QACzC,OAAO,iBAAiB,CAAC;KAC1B;IAAC,OAAO,CAAC,EAAE;QACV,MAAM,IAAI,KAAK,CAAC,uCAAuC,CAAC,CAAC;KAC1D;AACH,CAAC;AAED,SAAS,oBAAoB,CAAC,IAAc;IAC1C,IAAI,iBAAiB,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,KAAK,QAAQ,CAAC,GAAG,CAAC,CAAC;IACtE,IAAI,kBAAkB,CAAC;IAEvB,IAAI,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC,MAAM,EAAE;QAC3C,yGAAyG;QACzG,MAAM,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,iBAAiB,CAAC,KAAK,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QACrE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,iBAAiB,GAAG,WAAW,CAAC,CAAC;KAC1E;SAAM;QACL,OAAO,CAAC,GAAG,CACT,2EAA2E,CAC5E,CAAC;QACF,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;KACjB;IAED,OAAO,kBAAkB,CAAC;AAC5B,CAAC;AAED,SAAS,gCAAgC,CACvC,OAAe,EACf,IAAc;IAEd,OAAO,IAAI,OAAO,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;QAC9B,IAAI;YACF,MAAM,kBAAkB,GAAG,EAAE,CAAC,KAAK,CAAC,OAAO,EAAE,IAAI,EAAE;gBACjD,KAAK,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,CAAC;aAC1C,CAAC,CAAC;YACH,MAAM,QAAQ,GAAa,EAAE,CAAC;YAE9B,kBAAkB,CAAC,MAAO,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,KAAK,EAAE,EAAE;gBAC9C,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;gBAC5B,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC;YAClC,CAAC,CAAC,CAAC;YAEH,kBAAkB,CAAC,MAAO,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,KAAK,EAAE,EAAE;gBAC9C,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;gBAC5B,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC;YAClC,CAAC,CAAC,CAAC;YAEH,kBAAkB,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE,UAAU,EAAE,EAAE;gBACrD,MAAM,UAAU,GAAG,QAAQ,aAAR,QAAQ,cAAR,QAAQ,GAAI,YAAY,CAAC,UAAU,IAAI,EAAE,CAAC,CAAC;gBAE9D,MAAM,YAAY,GAAG,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;gBACvC,GAAG,CAAC;oBACF,UAAU;oBACV,cAAc,EAAE,YAAY;iBAC7B,CAAC,CAAC;YACL,CAAC,CAAC,CAAC;SACJ;QAAC,OAAO,CAAC,EAAE;YACV,GAAG,CAAC,CAAC,CAAC,CAAC;SACR;IACH,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAS,mCAAmC,CAC1C,gBAAkC,EAClC,MAAgC;IAEhC,MAAM,eAAe,GAAG,gBAAgB,CAAC,SAAS,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC;IAC1E,MAAM,eAAe,GACnB,eAAe,CAAC,MAAM,GAAG,6BAA6B;QACpD,CAAC,CAAC,gBAAgB,eAAe,CAAC,KAAK,CACnC,eAAe,CAAC,MAAM,GAAG,6BAA6B,CACvD,EAAE;QACL,CAAC,CAAC,eAAe,CAAC;IAEtB,OAAO;QACL,MAAM,EAAE,sCAAsC;QAC9C,MAAM,EAAE,gBAAgB;QACxB,WAAW,EAAE,uBAAuB;QACpC,IAAI,EAAE,EAAE;QACR,SAAS,EAAE,MAAM,CAAC,SAAS;QAC3B,OAAO,EAAE,MAAM,CAAC,OAAO;QACvB,WAAW,EAAE,EAAE;QACf,MAAM,EAAE,MAAM,CAAC,wBAAwB;QACvC,WAAW,EAAE,KAAK;QAClB,MAAM,EAAE,MAAM,CAAC,UAAU;QACzB,cAAc,EAAE,eAAe;KAChC,CAAC;AACJ,CAAC;AAED,SAAe,kBAAkB,CAC/B,KAAoB,EACpB,UAA4B,EAC5B,iBAAyC,EACzC,MAAgC;;QAEhC,MAAM,iBAAiB,GAAG,sBAAsB,MAAM,CAAC,wBAAwB,EAAE,CAAC;QAElF,MAAM,SAAS,GAAG;YAChB,IAAI,EAAE;gBACJ,cAAc,EAAE,OAAO;aACxB;YACD,KAAK,EAAE,CAAC,mCAAmC,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;YAChE,GAAG,EAAE;gBACH,OAAO,EAAE,iBAAiB;gBAC1B,SAAS,EAAE,MAAM,CAAC,SAAS;gBAC3B,OAAO,EAAE,MAAM,CAAC,OAAO;gBACvB,MAAM,EAAE,MAAM,CAAC,MAAM;gBACrB,IAAI,EAAE,IAAI;gBACV,QAAQ,EAAE,MAAM,CAAC,QAAQ;gBACzB,sEAAsE;gBACtE,0BAA0B;gBAC1B,GAAG,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,IAAA,2BAAa,GAAE,CAAC,CAAC,CAAC,SAAS;aACjD;YACD,WAAW,EAAE,IAAA,4BAAc,EAAC,iBAAiB,CAAC;SAC/C,CAAC;QAEF,MAAM,kBAAkB,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,CAAC;QAClE,MAAM,gBAAgB,GAAG,MAAM,IAAA,gBAAS,EAAC,WAAI,CAAC,CAAC,kBAAkB,CAAC,CAAC;QAEnE,MAAM,UAAU,GAAG,MAAM,IAAA,0BAAkB,EAAC,GAAG,EAAE,CAC/C,KAAK,CAAC,IAAI,CAAC,oBAAoB,EAAE,gBAAgB,EAAE;YACjD,OAAO,kCACF,KAAK,CAAC,QAAQ,CAAC,OAAO,KACzB,kBAAkB,EAAE,MAAM,EAC1B,cAAc,EAAE,0BAA0B,GAC3C;SACF,CAAC,CACH,CAAC;QACF,IAAI,OAAO,CAAC,GAAG,CAAC,sBAAsB,KAAK,MAAM,EAAE;YACjD,8BAA8B,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;SACxD;IACH,CAAC;CAAA;AAED,SAAS,8BAA8B,CAAC,MAAc;IACpD,MAAM,CAAC,oBAAoB,EAAE,CAAC;IAC9B,MAAM,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,gDAAgD,EAAE,CAAC,CAAC;IACzE,IAAA,4BAAY,EAAC,iDAAiD,MAAM,EAAE,CAAC,CAAC;AAC1E,CAAC;AAED,0DAA0D;AAC1D,kDAAkD;AAClD;;;;GAIG;AACH,SAAS,YAAY,CAAC,MAAc;IAClC,IAAI,MAAM,KAAK,QAAQ;QAAE,OAAO,GAAG,GAAG,CAAC,CAAC;IACxC,IAAI,MAAM,KAAK,QAAQ;QAAE,OAAO,GAAG,GAAG,CAAC,CAAC;IACxC,IAAI,MAAM,KAAK,SAAS;QAAE,OAAO,GAAG,GAAG,EAAE,CAAC;IAC1C,OAAO,GAAG,CAAC;AACb,CAAC"}
|
|
@@ -67,7 +67,44 @@ class FileStorage {
|
|
|
67
67
|
bodyLines: [`STORAGE URL: ${url}`],
|
|
68
68
|
});
|
|
69
69
|
}
|
|
70
|
-
|
|
70
|
+
let tgz;
|
|
71
|
+
if (process.env.NRWL_INTERNAL_TAR_DEBUG) {
|
|
72
|
+
const maxAttempts = 3;
|
|
73
|
+
let currAttempt = 1;
|
|
74
|
+
let tarSuccess = false;
|
|
75
|
+
let tarResults = [];
|
|
76
|
+
while (currAttempt <= maxAttempts && !tarSuccess) {
|
|
77
|
+
tgz = yield this.createFile(hash, cacheDirectory);
|
|
78
|
+
// extract to /tmp/ unique per attempt
|
|
79
|
+
let tmpPath = `/tmp/${hash}/attempt${currAttempt}`;
|
|
80
|
+
(0, fs_1.mkdirSync)(tmpPath, { recursive: true });
|
|
81
|
+
try {
|
|
82
|
+
const q = (0, fs_1.createReadStream)(tgz).pipe(tar.x({
|
|
83
|
+
cwd: tmpPath,
|
|
84
|
+
}));
|
|
85
|
+
yield this.convertStreamIntoPromise(q);
|
|
86
|
+
tarSuccess = true;
|
|
87
|
+
}
|
|
88
|
+
catch (e) {
|
|
89
|
+
console.error(e);
|
|
90
|
+
yield (0, waiter_1.wait)(5000);
|
|
91
|
+
}
|
|
92
|
+
tarResults.push({ attempt: currAttempt, success: tarSuccess });
|
|
93
|
+
currAttempt++;
|
|
94
|
+
}
|
|
95
|
+
if (tarResults.some((r) => !r.success)) {
|
|
96
|
+
console.error(JSON.stringify(tarResults, null, 2));
|
|
97
|
+
const failedAttemptsString = tarResults
|
|
98
|
+
.filter((r) => !r.success)
|
|
99
|
+
.map((r) => r.attempt)
|
|
100
|
+
.join(', ');
|
|
101
|
+
throw new Error(`Untar failed for hash ${hash} in attempts ${failedAttemptsString} out of ${tarResults.length}`);
|
|
102
|
+
}
|
|
103
|
+
}
|
|
104
|
+
else {
|
|
105
|
+
// Create tar normally
|
|
106
|
+
tgz = yield this.createFile(hash, cacheDirectory);
|
|
107
|
+
}
|
|
71
108
|
yield this.uploadFile(url, tgz);
|
|
72
109
|
if (environment_1.VERBOSE_LOGGING) {
|
|
73
110
|
output.note({ title: `Nx Cloud: Stored ${hash}` });
|
|
@@ -175,15 +212,12 @@ class FileStorage {
|
|
|
175
212
|
const recorder = (0, metric_logger_1.createMetricRecorder)('storeFile');
|
|
176
213
|
const tarData = (0, fs_1.readFileSync)(tgz);
|
|
177
214
|
const tarHash = this.generateMD5(tarData);
|
|
215
|
+
const headers = this.getFileUploadHeaders(url, tarHash);
|
|
178
216
|
try {
|
|
179
217
|
const resp = yield (0, axios_1.axiosMultipleTries)(() => axios(url, {
|
|
180
218
|
method: 'PUT',
|
|
181
219
|
data: tarData,
|
|
182
|
-
headers:
|
|
183
|
-
'Content-Type': 'application/octet-stream',
|
|
184
|
-
// 'Content-MD5': tarHash,
|
|
185
|
-
'x-ms-blob-type': 'BlockBlob',
|
|
186
|
-
},
|
|
220
|
+
headers: headers,
|
|
187
221
|
maxContentLength: environment_1.NX_CLOUD_NO_TIMEOUTS
|
|
188
222
|
? environment_1.UNLIMITED_FILE_SIZE
|
|
189
223
|
: environment_1.DEFAULT_FILE_SIZE_LIMIT,
|
|
@@ -207,6 +241,17 @@ class FileStorage {
|
|
|
207
241
|
hasher.update(data);
|
|
208
242
|
return hasher.digest('base64');
|
|
209
243
|
}
|
|
244
|
+
getFileUploadHeaders(url, tarHash) {
|
|
245
|
+
const privateCloudFileServer = url.includes('/file/');
|
|
246
|
+
const headers = {
|
|
247
|
+
'Content-Type': 'application/octet-stream',
|
|
248
|
+
'x-ms-blob-type': 'BlockBlob',
|
|
249
|
+
};
|
|
250
|
+
if (privateCloudFileServer) {
|
|
251
|
+
headers['Content-MD5'] = tarHash;
|
|
252
|
+
}
|
|
253
|
+
return headers;
|
|
254
|
+
}
|
|
210
255
|
}
|
|
211
256
|
exports.FileStorage = FileStorage;
|
|
212
257
|
//# sourceMappingURL=file-storage.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"file-storage.js","sourceRoot":"","sources":["../../../../../../../libs/nx-packages/nx-cloud/lib/core/file-storage/file-storage.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6BAA6B;AAC7B,6DAMqC;AACrC,iDAA2D;AAE3D,
|
|
1
|
+
{"version":3,"file":"file-storage.js","sourceRoot":"","sources":["../../../../../../../libs/nx-packages/nx-cloud/lib/core/file-storage/file-storage.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1,138 @@
|
|
|
1
|
-
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.CloudEnabledLifeCycle = void 0;
|
|
4
|
+
const path = require("path");
|
|
5
|
+
const path_1 = require("path");
|
|
6
|
+
const fs_1 = require("fs");
|
|
7
|
+
const environment_1 = require("../../../utilities/environment");
|
|
8
|
+
const serializer_overrides_1 = require("../../../utilities/serializer-overrides");
|
|
9
|
+
const { workspaceRoot } = require('../../../utilities/nx-imports');
|
|
10
|
+
class CloudEnabledLifeCycle {
|
|
11
|
+
constructor(runContext, cacheDirectory, skipNxCache, collectTerminalOutput, cacheableOperations, outputObfuscator, tasks) {
|
|
12
|
+
this.runContext = runContext;
|
|
13
|
+
this.cacheDirectory = cacheDirectory;
|
|
14
|
+
this.skipNxCache = skipNxCache;
|
|
15
|
+
this.collectTerminalOutput = collectTerminalOutput;
|
|
16
|
+
this.cacheableOperations = cacheableOperations;
|
|
17
|
+
this.outputObfuscator = outputObfuscator;
|
|
18
|
+
this.tasks = tasks;
|
|
19
|
+
}
|
|
20
|
+
scheduleTask(task) {
|
|
21
|
+
this.runContext.scheduledTasks.push(task);
|
|
22
|
+
}
|
|
23
|
+
startTask(task) {
|
|
24
|
+
this.tasks.push({
|
|
25
|
+
taskId: task.id,
|
|
26
|
+
startTime: new Date().toISOString(),
|
|
27
|
+
target: task.target.target,
|
|
28
|
+
projectName: task.target.project,
|
|
29
|
+
hash: task.hash,
|
|
30
|
+
hashDetails: this.cleanUpHashDetails(task.hashDetails),
|
|
31
|
+
params: (0, serializer_overrides_1.serializeOverrides)(task),
|
|
32
|
+
});
|
|
33
|
+
}
|
|
34
|
+
// Used for older version for Nx. Remove in Dec 2022
|
|
35
|
+
endTask(task, code) {
|
|
36
|
+
let cacheStatus;
|
|
37
|
+
if (this.runContext.statuses[task.hash]) {
|
|
38
|
+
cacheStatus = this.runContext.statuses[task.hash];
|
|
39
|
+
}
|
|
40
|
+
else {
|
|
41
|
+
if (this.cacheableOperations.indexOf(task.target.target) > -1 &&
|
|
42
|
+
!this.skipNxCache) {
|
|
43
|
+
cacheStatus = 'local-cache-hit';
|
|
44
|
+
}
|
|
45
|
+
else {
|
|
46
|
+
cacheStatus = 'cache-miss';
|
|
47
|
+
}
|
|
48
|
+
}
|
|
49
|
+
this.updateStartedTask(task, code, cacheStatus);
|
|
50
|
+
}
|
|
51
|
+
endTasks(tasks) {
|
|
52
|
+
for (let t of tasks) {
|
|
53
|
+
const status = t.status === 'remote-cache'
|
|
54
|
+
? 'remote-cache-hit'
|
|
55
|
+
: t.status === 'local-cache' ||
|
|
56
|
+
t.status === 'local-cache-kept-existing'
|
|
57
|
+
? 'local-cache-hit'
|
|
58
|
+
: 'cache-miss';
|
|
59
|
+
this.updateStartedTask(t.task, t.code, status);
|
|
60
|
+
}
|
|
61
|
+
}
|
|
62
|
+
endCommand() { }
|
|
63
|
+
updateStartedTask(task, code, cacheStatus) {
|
|
64
|
+
const startedTask = this.tasks.find((t) => t.taskId === task.id);
|
|
65
|
+
if (!startedTask) {
|
|
66
|
+
throw new Error(`Cannot find task ${task.id}`);
|
|
67
|
+
}
|
|
68
|
+
startedTask.endTime = new Date().toISOString();
|
|
69
|
+
startedTask.status = code;
|
|
70
|
+
startedTask.params = this.outputObfuscator.obfuscate(startedTask.params);
|
|
71
|
+
startedTask.cacheStatus = cacheStatus;
|
|
72
|
+
if (this.collectTerminalOutput) {
|
|
73
|
+
startedTask.terminalOutput = this.getTerminalOutput(task.hash, startedTask.cacheStatus, code);
|
|
74
|
+
}
|
|
75
|
+
}
|
|
76
|
+
getTerminalOutput(hash, cacheStatus, code) {
|
|
77
|
+
let dir;
|
|
78
|
+
if (this.cacheDirectory) {
|
|
79
|
+
if (this.cacheDirectory.startsWith('./')) {
|
|
80
|
+
dir = (0, path_1.join)(workspaceRoot, this.cacheDirectory);
|
|
81
|
+
}
|
|
82
|
+
else {
|
|
83
|
+
dir = this.cacheDirectory;
|
|
84
|
+
}
|
|
85
|
+
}
|
|
86
|
+
else {
|
|
87
|
+
dir = (0, path_1.join)(workspaceRoot, 'node_modules', '.cache', 'nx');
|
|
88
|
+
}
|
|
89
|
+
try {
|
|
90
|
+
const taskOutput = this.readTerminalOutputFile(dir, hash);
|
|
91
|
+
const taskOutputSanitized = this.outputObfuscator.obfuscate(taskOutput);
|
|
92
|
+
if (environment_1.NX_CLOUD_UNLIMITED_OUTPUT)
|
|
93
|
+
return taskOutputSanitized;
|
|
94
|
+
const maxCharacters = cacheStatus === 'cache-miss'
|
|
95
|
+
? code === 0
|
|
96
|
+
? CloudEnabledLifeCycle.MAX_CHARACTERS_SUCCESSFUL_TASK
|
|
97
|
+
: CloudEnabledLifeCycle.MAX_CHARACTERS_FAILED_TASK
|
|
98
|
+
: CloudEnabledLifeCycle.MAX_CHARACTERS_CACHED_TASK;
|
|
99
|
+
return taskOutputSanitized.length > maxCharacters
|
|
100
|
+
? `TRUNCATED\n\n${taskOutputSanitized.slice(taskOutputSanitized.length - maxCharacters)}`
|
|
101
|
+
: taskOutputSanitized;
|
|
102
|
+
}
|
|
103
|
+
catch (e) {
|
|
104
|
+
return '';
|
|
105
|
+
}
|
|
106
|
+
}
|
|
107
|
+
cleanUpHashDetails(hashDetails) {
|
|
108
|
+
const nodes = {};
|
|
109
|
+
Object.keys(hashDetails.nodes)
|
|
110
|
+
.filter((k) => !k.startsWith('npm:'))
|
|
111
|
+
.forEach((k) => {
|
|
112
|
+
nodes[k] = hashDetails.nodes[k];
|
|
113
|
+
});
|
|
114
|
+
return {
|
|
115
|
+
nodes,
|
|
116
|
+
runtime: hashDetails.runtime,
|
|
117
|
+
implicitDeps: hashDetails.implicitDeps,
|
|
118
|
+
};
|
|
119
|
+
}
|
|
120
|
+
readTerminalOutputFile(dir, hash) {
|
|
121
|
+
try {
|
|
122
|
+
return (0, fs_1.readFileSync)(path.join(dir, 'terminalOutputs', hash)).toString();
|
|
123
|
+
}
|
|
124
|
+
catch (_a) {
|
|
125
|
+
try {
|
|
126
|
+
return (0, fs_1.readFileSync)(path.join(dir, hash, 'terminalOutput')).toString();
|
|
127
|
+
}
|
|
128
|
+
catch (_b) {
|
|
129
|
+
return '';
|
|
130
|
+
}
|
|
131
|
+
}
|
|
132
|
+
}
|
|
133
|
+
}
|
|
134
|
+
exports.CloudEnabledLifeCycle = CloudEnabledLifeCycle;
|
|
135
|
+
CloudEnabledLifeCycle.MAX_CHARACTERS_FAILED_TASK = 200000;
|
|
136
|
+
CloudEnabledLifeCycle.MAX_CHARACTERS_SUCCESSFUL_TASK = 20000;
|
|
137
|
+
CloudEnabledLifeCycle.MAX_CHARACTERS_CACHED_TASK = 20000;
|
|
138
|
+
//# sourceMappingURL=cloud-enabled-life-cycle.js.map
|