nx 14.6.0-beta.3 → 14.6.0-beta.6
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 +1 -1
- package/package.json +4 -4
- package/src/adapter/compat.js +2 -0
- package/src/adapter/compat.js.map +1 -1
- package/src/command-line/format.js +1 -1
- package/src/command-line/format.js.map +1 -1
- package/src/command-line/generate.d.ts +1 -1
- package/src/command-line/generate.js +39 -18
- package/src/command-line/generate.js.map +1 -1
- package/src/command-line/list.js +5 -0
- package/src/command-line/list.js.map +1 -1
- package/src/command-line/report.d.ts +1 -1
- package/src/command-line/report.js +38 -20
- package/src/command-line/report.js.map +1 -1
- package/src/config/configuration.js +1 -0
- package/src/config/configuration.js.map +1 -1
- package/src/config/nx-json.d.ts +2 -0
- package/src/config/workspace-json-project-json.d.ts +3 -0
- package/src/core/dep-graph/styles.css +1 -1
- package/src/daemon/client/client.d.ts +8 -11
- package/src/daemon/client/client.js +80 -35
- package/src/daemon/client/client.js.map +1 -1
- package/src/daemon/server/handle-process-in-background.d.ts +6 -0
- package/src/daemon/server/handle-process-in-background.js +37 -0
- package/src/daemon/server/handle-process-in-background.js.map +1 -0
- package/src/daemon/server/handle-request-project-graph.d.ts +2 -0
- package/src/daemon/server/handle-request-project-graph.js +41 -0
- package/src/daemon/server/handle-request-project-graph.js.map +1 -0
- package/src/daemon/server/server.d.ts +5 -0
- package/src/daemon/server/server.js +43 -46
- package/src/daemon/server/server.js.map +1 -1
- package/src/daemon/server/shutdown-utils.d.ts +3 -1
- package/src/daemon/server/shutdown-utils.js +27 -1
- package/src/daemon/server/shutdown-utils.js.map +1 -1
- package/src/project-graph/file-utils.d.ts +1 -0
- package/src/project-graph/file-utils.js +6 -1
- package/src/project-graph/file-utils.js.map +1 -1
- package/src/project-graph/project-graph.js +4 -40
- package/src/project-graph/project-graph.js.map +1 -1
- package/src/tasks-runner/cache.d.ts +1 -3
- package/src/tasks-runner/cache.js +12 -55
- package/src/tasks-runner/cache.js.map +1 -1
- package/src/tasks-runner/run-command.js +2 -0
- package/src/tasks-runner/run-command.js.map +1 -1
- package/src/tasks-runner/tasks-runner.d.ts +2 -0
- package/src/utils/app-root.d.ts +8 -0
- package/src/utils/app-root.js +13 -0
- package/src/utils/app-root.js.map +1 -0
- package/src/utils/nx-plugin.js +1 -1
- package/src/utils/nx-plugin.js.map +1 -1
- package/src/utils/package-json.d.ts +18 -0
- package/src/utils/package-json.js +28 -5
- package/src/utils/package-json.js.map +1 -1
- package/src/utils/plugins/local-plugins.d.ts +4 -0
- package/src/utils/plugins/local-plugins.js +59 -0
- package/src/utils/plugins/local-plugins.js.map +1 -0
- package/src/utils/plugins/plugin-capabilities.js +2 -2
- package/src/utils/plugins/plugin-capabilities.js.map +1 -1
- package/src/utils/workspace-root.d.ts +0 -6
- package/src/utils/workspace-root.js +1 -7
- package/src/utils/workspace-root.js.map +1 -1
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.isServerAvailable = exports.stop = exports.startInCurrentProcess = exports.startInBackground = exports.DaemonClient = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const workspace_root_1 = require("../../utils/workspace-root");
|
|
6
6
|
const child_process_1 = require("child_process");
|
|
@@ -13,7 +13,66 @@ const output_1 = require("../../utils/output");
|
|
|
13
13
|
const cache_1 = require("../cache");
|
|
14
14
|
const socket_utils_1 = require("../socket-utils");
|
|
15
15
|
const tmp_dir_1 = require("../tmp-dir");
|
|
16
|
+
const is_ci_1 = require("../../utils/is-ci");
|
|
16
17
|
const DAEMON_ENV_SETTINGS = Object.assign(Object.assign({}, process.env), { NX_PROJECT_GLOB_CACHE: 'false', NX_CACHE_WORKSPACE_CONFIG: 'false' });
|
|
18
|
+
class DaemonClient {
|
|
19
|
+
constructor(nxJson) {
|
|
20
|
+
this.nxJson = nxJson;
|
|
21
|
+
}
|
|
22
|
+
enabled() {
|
|
23
|
+
var _a, _b, _c;
|
|
24
|
+
const useDaemonProcessOption = (_c = (_b = (_a = this.nxJson.tasksRunnerOptions) === null || _a === void 0 ? void 0 : _a['default']) === null || _b === void 0 ? void 0 : _b.options) === null || _c === void 0 ? void 0 : _c.useDaemonProcess;
|
|
25
|
+
const env = process.env.NX_DAEMON;
|
|
26
|
+
// env takes precedence
|
|
27
|
+
// option=true,env=false => no daemon
|
|
28
|
+
// option=false,env=undefined => no daemon
|
|
29
|
+
// option=false,env=false => no daemon
|
|
30
|
+
// option=undefined,env=undefined => daemon
|
|
31
|
+
// option=true,env=true => daemon
|
|
32
|
+
// option=false,env=true => daemon
|
|
33
|
+
if ((0, is_ci_1.isCI)() ||
|
|
34
|
+
isDocker() ||
|
|
35
|
+
(0, tmp_dir_1.isDaemonDisabled)() ||
|
|
36
|
+
(useDaemonProcessOption === undefined && env === 'false') ||
|
|
37
|
+
(useDaemonProcessOption === true && env === 'false') ||
|
|
38
|
+
(useDaemonProcessOption === false && env === undefined) ||
|
|
39
|
+
(useDaemonProcessOption === false && env === 'false')) {
|
|
40
|
+
return false;
|
|
41
|
+
}
|
|
42
|
+
return true;
|
|
43
|
+
}
|
|
44
|
+
getProjectGraph() {
|
|
45
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
46
|
+
if (!(yield isServerAvailable())) {
|
|
47
|
+
yield startInBackground();
|
|
48
|
+
}
|
|
49
|
+
const r = yield sendMessageToDaemon({ type: 'REQUEST_PROJECT_GRAPH' });
|
|
50
|
+
return r.projectGraph;
|
|
51
|
+
});
|
|
52
|
+
}
|
|
53
|
+
processInBackground(requirePath, data) {
|
|
54
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
55
|
+
if (!(yield isServerAvailable())) {
|
|
56
|
+
yield startInBackground();
|
|
57
|
+
}
|
|
58
|
+
return sendMessageToDaemon({
|
|
59
|
+
type: 'PROCESS_IN_BACKGROUND',
|
|
60
|
+
requirePath,
|
|
61
|
+
data,
|
|
62
|
+
});
|
|
63
|
+
});
|
|
64
|
+
}
|
|
65
|
+
}
|
|
66
|
+
exports.DaemonClient = DaemonClient;
|
|
67
|
+
function isDocker() {
|
|
68
|
+
try {
|
|
69
|
+
(0, fs_1.statSync)('/.dockerenv');
|
|
70
|
+
return true;
|
|
71
|
+
}
|
|
72
|
+
catch (_a) {
|
|
73
|
+
return false;
|
|
74
|
+
}
|
|
75
|
+
}
|
|
17
76
|
function startInBackground() {
|
|
18
77
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
19
78
|
yield (0, cache_1.safelyCleanUpExistingProcess)();
|
|
@@ -121,27 +180,17 @@ function isServerAvailable() {
|
|
|
121
180
|
});
|
|
122
181
|
}
|
|
123
182
|
exports.isServerAvailable = isServerAvailable;
|
|
124
|
-
|
|
125
|
-
* Establishes a client connection to the daemon server for use in project graph
|
|
126
|
-
* creation utilities.
|
|
127
|
-
*
|
|
128
|
-
* All logs are performed by the devkit logger because this logic does not
|
|
129
|
-
* run "on the server" per se and therefore does not write to its log output.
|
|
130
|
-
*
|
|
131
|
-
* TODO: Gracefully handle a server shutdown (for whatever reason) while a client
|
|
132
|
-
* is connecting and querying it.
|
|
133
|
-
*/
|
|
134
|
-
function getProjectGraphFromServer() {
|
|
183
|
+
function sendMessageToDaemon(message) {
|
|
135
184
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
136
185
|
return new Promise((resolve, reject) => {
|
|
137
|
-
perf_hooks_1.performance.mark('
|
|
186
|
+
perf_hooks_1.performance.mark('sendMessageToDaemon-start');
|
|
138
187
|
const socket = (0, net_1.connect)(socket_utils_1.FULL_OS_SOCKET_PATH);
|
|
139
188
|
socket.on('error', (err) => {
|
|
140
189
|
if (!err.message) {
|
|
141
190
|
return reject(err);
|
|
142
191
|
}
|
|
143
192
|
if (err.message.startsWith('LOCK-FILES-CHANGED')) {
|
|
144
|
-
return
|
|
193
|
+
return sendMessageToDaemon(message).then(resolve, reject);
|
|
145
194
|
}
|
|
146
195
|
let error;
|
|
147
196
|
if (err.message.startsWith('connect ENOENT')) {
|
|
@@ -156,41 +205,38 @@ function getProjectGraphFromServer() {
|
|
|
156
205
|
}
|
|
157
206
|
return reject(error || err);
|
|
158
207
|
});
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
socket.on('connect', () => {
|
|
165
|
-
socket.write('REQUEST_PROJECT_GRAPH_PAYLOAD');
|
|
166
|
-
let serializedProjectGraphResult = '';
|
|
208
|
+
socket.on('ready', () => {
|
|
209
|
+
socket.write(JSON.stringify(message));
|
|
210
|
+
// send EOT to indicate that the message has been fully written
|
|
211
|
+
socket.write(String.fromCodePoint(4));
|
|
212
|
+
let serializedResult = '';
|
|
167
213
|
socket.on('data', (data) => {
|
|
168
|
-
|
|
214
|
+
serializedResult += data.toString();
|
|
169
215
|
});
|
|
170
216
|
socket.on('end', () => {
|
|
171
217
|
try {
|
|
172
218
|
perf_hooks_1.performance.mark('json-parse-start');
|
|
173
|
-
const
|
|
219
|
+
const parsedResult = JSON.parse(serializedResult);
|
|
174
220
|
perf_hooks_1.performance.mark('json-parse-end');
|
|
175
|
-
perf_hooks_1.performance.measure('deserialize
|
|
176
|
-
if (
|
|
177
|
-
reject(
|
|
221
|
+
perf_hooks_1.performance.measure('deserialize daemon response', 'json-parse-start', 'json-parse-end');
|
|
222
|
+
if (parsedResult.error) {
|
|
223
|
+
reject(parsedResult.error);
|
|
178
224
|
}
|
|
179
225
|
else {
|
|
180
|
-
perf_hooks_1.performance.measure('total for
|
|
181
|
-
return resolve(
|
|
226
|
+
perf_hooks_1.performance.measure('total for sendMessageToDaemon()', 'sendMessageToDaemon-start', 'json-parse-end');
|
|
227
|
+
return resolve(parsedResult);
|
|
182
228
|
}
|
|
183
229
|
}
|
|
184
230
|
catch (e) {
|
|
185
|
-
const
|
|
186
|
-
?
|
|
187
|
-
:
|
|
231
|
+
const endOfResponse = serializedResult.length > 300
|
|
232
|
+
? serializedResult.substring(serializedResult.length - 300)
|
|
233
|
+
: serializedResult;
|
|
188
234
|
reject(daemonProcessException([
|
|
189
|
-
'Could not deserialize
|
|
235
|
+
'Could not deserialize response from Nx deamon.',
|
|
190
236
|
`Message: ${e.message}`,
|
|
191
237
|
'\n',
|
|
192
238
|
`Received:`,
|
|
193
|
-
|
|
239
|
+
endOfResponse,
|
|
194
240
|
'\n',
|
|
195
241
|
].join('\n')));
|
|
196
242
|
}
|
|
@@ -199,5 +245,4 @@ function getProjectGraphFromServer() {
|
|
|
199
245
|
});
|
|
200
246
|
});
|
|
201
247
|
}
|
|
202
|
-
exports.getProjectGraphFromServer = getProjectGraphFromServer;
|
|
203
248
|
//# sourceMappingURL=client.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../../../../../packages/nx/src/daemon/client/client.ts"],"names":[],"mappings":";;;;AAAA,+DAA2D;AAC3D,iDAA+D;AAC/D,
|
|
1
|
+
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../../../../../packages/nx/src/daemon/client/client.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,37 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.handleProcessInBackground = void 0;
|
|
4
|
+
const tslib_1 = require("tslib");
|
|
5
|
+
const workspace_root_1 = require("../../utils/workspace-root");
|
|
6
|
+
const logger_1 = require("./logger");
|
|
7
|
+
function handleProcessInBackground(payload) {
|
|
8
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
9
|
+
let fn;
|
|
10
|
+
try {
|
|
11
|
+
fn = require(require.resolve(payload.requirePath, {
|
|
12
|
+
paths: [workspace_root_1.workspaceRoot],
|
|
13
|
+
})).default;
|
|
14
|
+
}
|
|
15
|
+
catch (e) {
|
|
16
|
+
return {
|
|
17
|
+
description: `Unable to require ${payload.requirePath}`,
|
|
18
|
+
error: new Error(`Unable to require ${payload.requirePath}`),
|
|
19
|
+
};
|
|
20
|
+
}
|
|
21
|
+
try {
|
|
22
|
+
const response = yield fn(payload.data, logger_1.serverLogger);
|
|
23
|
+
return {
|
|
24
|
+
response,
|
|
25
|
+
description: payload.type,
|
|
26
|
+
};
|
|
27
|
+
}
|
|
28
|
+
catch (e) {
|
|
29
|
+
return {
|
|
30
|
+
description: `Error when processing ${payload.type}.`,
|
|
31
|
+
error: e,
|
|
32
|
+
};
|
|
33
|
+
}
|
|
34
|
+
});
|
|
35
|
+
}
|
|
36
|
+
exports.handleProcessInBackground = handleProcessInBackground;
|
|
37
|
+
//# sourceMappingURL=handle-process-in-background.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"handle-process-in-background.js","sourceRoot":"","sources":["../../../../../../packages/nx/src/daemon/server/handle-process-in-background.ts"],"names":[],"mappings":";;;;AACA,+DAA2D;AAC3D,qCAAwC;AAExC,SAAsB,yBAAyB,CAAC,OAI/C;;QACC,IAAI,EAAE,CAAC;QACP,IAAI;YACF,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,WAAW,EAAE;gBAChD,KAAK,EAAE,CAAC,8BAAa,CAAC;aACvB,CAAC,CAAC,CAAC,OAAO,CAAC;SACb;QAAC,OAAO,CAAC,EAAE;YACV,OAAO;gBACL,WAAW,EAAE,qBAAqB,OAAO,CAAC,WAAW,EAAE;gBACvD,KAAK,EAAE,IAAI,KAAK,CAAC,qBAAqB,OAAO,CAAC,WAAW,EAAE,CAAC;aAC7D,CAAC;SACH;QAED,IAAI;YACF,MAAM,QAAQ,GAAG,MAAM,EAAE,CAAC,OAAO,CAAC,IAAI,EAAE,qBAAY,CAAC,CAAC;YACtD,OAAO;gBACL,QAAQ;gBACR,WAAW,EAAE,OAAO,CAAC,IAAI;aAC1B,CAAC;SACH;QAAC,OAAO,CAAC,EAAE;YACV,OAAO;gBACL,WAAW,EAAE,yBAAyB,OAAO,CAAC,IAAI,GAAG;gBACrD,KAAK,EAAE,CAAC;aACT,CAAC;SACH;IACH,CAAC;CAAA;AA7BD,8DA6BC"}
|
|
@@ -0,0 +1,41 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.handleRequestProjectGraph = void 0;
|
|
4
|
+
const tslib_1 = require("tslib");
|
|
5
|
+
const perf_hooks_1 = require("perf_hooks");
|
|
6
|
+
const socket_utils_1 = require("../socket-utils");
|
|
7
|
+
const logger_1 = require("./logger");
|
|
8
|
+
const project_graph_incremental_recomputation_1 = require("./project-graph-incremental-recomputation");
|
|
9
|
+
function handleRequestProjectGraph() {
|
|
10
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
11
|
+
try {
|
|
12
|
+
perf_hooks_1.performance.mark('server-connection');
|
|
13
|
+
logger_1.serverLogger.requestLog('Client Request for Project Graph Received');
|
|
14
|
+
const result = yield (0, project_graph_incremental_recomputation_1.getCachedSerializedProjectGraphPromise)();
|
|
15
|
+
if (result.error) {
|
|
16
|
+
return {
|
|
17
|
+
description: `Error when preparing serialized project graph.`,
|
|
18
|
+
error: result.error,
|
|
19
|
+
};
|
|
20
|
+
}
|
|
21
|
+
const serializedResult = (0, socket_utils_1.serializeResult)(result.error, result.serializedProjectGraph);
|
|
22
|
+
if (!serializedResult) {
|
|
23
|
+
return {
|
|
24
|
+
description: `Error when serializing project graph result.`,
|
|
25
|
+
error: new Error('Critical error when serializing server result, check server logs'),
|
|
26
|
+
};
|
|
27
|
+
}
|
|
28
|
+
perf_hooks_1.performance.mark('serialized-project-graph-ready');
|
|
29
|
+
perf_hooks_1.performance.measure('total for creating and serializing project graph', 'server-connection', 'serialized-project-graph-ready');
|
|
30
|
+
return { response: serializedResult, description: 'project-graph' };
|
|
31
|
+
}
|
|
32
|
+
catch (e) {
|
|
33
|
+
return {
|
|
34
|
+
description: `Unexpected error when creating Project Graph.`,
|
|
35
|
+
error: e,
|
|
36
|
+
};
|
|
37
|
+
}
|
|
38
|
+
});
|
|
39
|
+
}
|
|
40
|
+
exports.handleRequestProjectGraph = handleRequestProjectGraph;
|
|
41
|
+
//# sourceMappingURL=handle-request-project-graph.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"handle-request-project-graph.js","sourceRoot":"","sources":["../../../../../../packages/nx/src/daemon/server/handle-request-project-graph.ts"],"names":[],"mappings":";;;;AAAA,2CAAyC;AACzC,kDAAkD;AAClD,qCAAwC;AACxC,uGAAmG;AAGnG,SAAsB,yBAAyB;;QAC7C,IAAI;YACF,wBAAW,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;YACtC,qBAAY,CAAC,UAAU,CAAC,2CAA2C,CAAC,CAAC;YAErE,MAAM,MAAM,GAAG,MAAM,IAAA,gFAAsC,GAAE,CAAC;YAC9D,IAAI,MAAM,CAAC,KAAK,EAAE;gBAChB,OAAO;oBACL,WAAW,EAAE,gDAAgD;oBAC7D,KAAK,EAAE,MAAM,CAAC,KAAK;iBACpB,CAAC;aACH;YAED,MAAM,gBAAgB,GAAG,IAAA,8BAAe,EACtC,MAAM,CAAC,KAAK,EACZ,MAAM,CAAC,sBAAsB,CAC9B,CAAC;YACF,IAAI,CAAC,gBAAgB,EAAE;gBACrB,OAAO;oBACL,WAAW,EAAE,8CAA8C;oBAC3D,KAAK,EAAE,IAAI,KAAK,CACd,kEAAkE,CACnE;iBACF,CAAC;aACH;YAED,wBAAW,CAAC,IAAI,CAAC,gCAAgC,CAAC,CAAC;YACnD,wBAAW,CAAC,OAAO,CACjB,kDAAkD,EAClD,mBAAmB,EACnB,gCAAgC,CACjC,CAAC;YAEF,OAAO,EAAE,QAAQ,EAAE,gBAAgB,EAAE,WAAW,EAAE,eAAe,EAAE,CAAC;SACrE;QAAC,OAAO,CAAC,EAAE;YACV,OAAO;gBACL,WAAW,EAAE,+CAA+C;gBAC5D,KAAK,EAAE,CAAC;aACT,CAAC;SACH;IACH,CAAC;CAAA;AAxCD,8DAwCC"}
|
|
@@ -1,4 +1,9 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
2
|
import { Server } from 'net';
|
|
3
|
+
export declare type HandlerResult = {
|
|
4
|
+
description: string;
|
|
5
|
+
error?: any;
|
|
6
|
+
response?: string;
|
|
7
|
+
};
|
|
3
8
|
export declare function startServer(): Promise<Server>;
|
|
4
9
|
export declare function stopServer(): Promise<void>;
|
|
@@ -14,29 +14,11 @@ const project_graph_incremental_recomputation_1 = require("./project-graph-incre
|
|
|
14
14
|
const fs_1 = require("fs");
|
|
15
15
|
const hashing_impl_1 = require("../../hasher/hashing-impl");
|
|
16
16
|
const file_hasher_1 = require("../../hasher/file-hasher");
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
socket.write(message, () => {
|
|
20
|
-
// Close the connection once all data has been written so that the client knows when to read it.
|
|
21
|
-
socket.end();
|
|
22
|
-
logger_1.serverLogger.log(`Closed Connection to Client`);
|
|
23
|
-
res(null);
|
|
24
|
-
});
|
|
25
|
-
});
|
|
26
|
-
}
|
|
17
|
+
const handle_request_project_graph_1 = require("./handle-request-project-graph");
|
|
18
|
+
const handle_process_in_background_1 = require("./handle-process-in-background");
|
|
27
19
|
let watcherSubscription;
|
|
28
20
|
let performanceObserver;
|
|
29
21
|
let watcherError;
|
|
30
|
-
function respondWithErrorAndExit(socket, description, error) {
|
|
31
|
-
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
32
|
-
// print some extra stuff in the error message
|
|
33
|
-
logger_1.serverLogger.requestLog(`Responding to the client with an error.`, description, error.message);
|
|
34
|
-
console.error(error);
|
|
35
|
-
error.message = `${error.message}\n\nBecause of the error the Nx daemon process has exited. The next Nx command is going to restart the daemon process.\nIf the error persists, please run "nx reset".`;
|
|
36
|
-
yield respondToClient(socket, (0, socket_utils_1.serializeResult)(error, null));
|
|
37
|
-
process.exit(1);
|
|
38
|
-
});
|
|
39
|
-
}
|
|
40
22
|
const server = (0, net_1.createServer)((socket) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
|
|
41
23
|
(0, shutdown_utils_1.resetInactivityTimeout)(handleInactivityTimeout);
|
|
42
24
|
if (!performanceObserver) {
|
|
@@ -46,44 +28,59 @@ const server = (0, net_1.createServer)((socket) => tslib_1.__awaiter(void 0, voi
|
|
|
46
28
|
});
|
|
47
29
|
performanceObserver.observe({ entryTypes: ['measure'] });
|
|
48
30
|
}
|
|
31
|
+
let message = '';
|
|
49
32
|
socket.on('data', (data) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
|
|
33
|
+
const chunk = data.toString();
|
|
34
|
+
if (chunk.length === 0 || chunk.codePointAt(chunk.length - 1) != 4) {
|
|
35
|
+
message += chunk;
|
|
36
|
+
}
|
|
37
|
+
else {
|
|
38
|
+
message += chunk.substring(0, chunk.length - 1);
|
|
39
|
+
yield handleMessage(socket, message);
|
|
40
|
+
}
|
|
41
|
+
}));
|
|
42
|
+
}));
|
|
43
|
+
function handleMessage(socket, data) {
|
|
44
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
50
45
|
if (watcherError) {
|
|
51
|
-
yield respondWithErrorAndExit(socket, `File watcher error in the workspace '${workspace_root_1.workspaceRoot}'.`, watcherError);
|
|
46
|
+
yield (0, shutdown_utils_1.respondWithErrorAndExit)(socket, `File watcher error in the workspace '${workspace_root_1.workspaceRoot}'.`, watcherError);
|
|
52
47
|
}
|
|
53
48
|
if (lockFileChanged()) {
|
|
54
|
-
yield respondWithErrorAndExit(socket, `Lock files changed`, {
|
|
49
|
+
yield (0, shutdown_utils_1.respondWithErrorAndExit)(socket, `Lock files changed`, {
|
|
55
50
|
name: '',
|
|
56
51
|
message: 'LOCK-FILES-CHANGED',
|
|
57
52
|
});
|
|
58
53
|
}
|
|
59
54
|
(0, shutdown_utils_1.resetInactivityTimeout)(handleInactivityTimeout);
|
|
60
|
-
const
|
|
61
|
-
|
|
62
|
-
|
|
55
|
+
const unparsedPayload = data.toString();
|
|
56
|
+
let payload;
|
|
57
|
+
try {
|
|
58
|
+
payload = JSON.parse(unparsedPayload);
|
|
63
59
|
}
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
const result = yield (0, project_graph_incremental_recomputation_1.getCachedSerializedProjectGraphPromise)();
|
|
67
|
-
if (result.error) {
|
|
68
|
-
yield respondWithErrorAndExit(socket, `Error when preparing serialized project graph.`, result.error);
|
|
60
|
+
catch (e) {
|
|
61
|
+
yield (0, shutdown_utils_1.respondWithErrorAndExit)(socket, `Invalid payload from the client`, new Error(`Unsupported payload sent to daemon server: ${unparsedPayload}`));
|
|
69
62
|
}
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
yield respondWithErrorAndExit(socket, `Error when serializing project graph result.`, new Error('Critical error when serializing server result, check server logs'));
|
|
63
|
+
if (payload.type === 'REQUEST_PROJECT_GRAPH') {
|
|
64
|
+
yield handleResult(socket, yield (0, handle_request_project_graph_1.handleRequestProjectGraph)());
|
|
73
65
|
}
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
}
|
|
66
|
+
else if (payload.type === 'PROCESS_IN_BACKGROUND') {
|
|
67
|
+
yield handleResult(socket, yield (0, handle_process_in_background_1.handleProcessInBackground)(payload));
|
|
68
|
+
}
|
|
69
|
+
else {
|
|
70
|
+
yield (0, shutdown_utils_1.respondWithErrorAndExit)(socket, `Invalid payload from the client`, new Error(`Unsupported payload sent to daemon server: ${unparsedPayload}`));
|
|
71
|
+
}
|
|
72
|
+
});
|
|
73
|
+
}
|
|
74
|
+
function handleResult(socket, hr) {
|
|
75
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
76
|
+
if (hr.error) {
|
|
77
|
+
yield (0, shutdown_utils_1.respondWithErrorAndExit)(socket, hr.description, hr.error);
|
|
78
|
+
}
|
|
79
|
+
else {
|
|
80
|
+
yield (0, shutdown_utils_1.respondToClient)(socket, hr.response, hr.description);
|
|
81
|
+
}
|
|
82
|
+
});
|
|
83
|
+
}
|
|
87
84
|
function handleInactivityTimeout() {
|
|
88
85
|
(0, shutdown_utils_1.handleServerProcessTermination)({
|
|
89
86
|
server,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.js","sourceRoot":"","sources":["../../../../../../packages/nx/src/daemon/server/server.ts"],"names":[],"mappings":";;;;AAAA,+DAA2D;AAC3D,6BAAmD;AACnD,+BAA4B;AAC5B,
|
|
1
|
+
{"version":3,"file":"server.js","sourceRoot":"","sources":["../../../../../../packages/nx/src/daemon/server/server.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
|
-
import type { Server } from 'net';
|
|
2
|
+
import type { Server, Socket } from 'net';
|
|
3
3
|
import type { WatcherSubscription } from './watcher';
|
|
4
4
|
export declare const SERVER_INACTIVITY_TIMEOUT_MS: 10800000;
|
|
5
5
|
interface HandleServerProcessTerminationParams {
|
|
@@ -9,4 +9,6 @@ interface HandleServerProcessTerminationParams {
|
|
|
9
9
|
}
|
|
10
10
|
export declare function handleServerProcessTermination({ server, reason, watcherSubscription, }: HandleServerProcessTerminationParams): Promise<void>;
|
|
11
11
|
export declare function resetInactivityTimeout(cb: () => void): void;
|
|
12
|
+
export declare function respondToClient(socket: Socket, response: string, description: string): Promise<unknown>;
|
|
13
|
+
export declare function respondWithErrorAndExit(socket: Socket, description: string, error: Error): Promise<void>;
|
|
12
14
|
export {};
|
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.resetInactivityTimeout = exports.handleServerProcessTermination = exports.SERVER_INACTIVITY_TIMEOUT_MS = void 0;
|
|
3
|
+
exports.respondWithErrorAndExit = exports.respondToClient = exports.resetInactivityTimeout = exports.handleServerProcessTermination = exports.SERVER_INACTIVITY_TIMEOUT_MS = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const workspace_root_1 = require("../../utils/workspace-root");
|
|
6
6
|
const logger_1 = require("./logger");
|
|
7
|
+
const socket_utils_1 = require("nx/src/daemon/socket-utils");
|
|
7
8
|
exports.SERVER_INACTIVITY_TIMEOUT_MS = 10800000; // 10800000 ms = 3 hours
|
|
8
9
|
function handleServerProcessTermination({ server, reason, watcherSubscription, }) {
|
|
9
10
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
@@ -29,4 +30,29 @@ function resetInactivityTimeout(cb) {
|
|
|
29
30
|
serverInactivityTimerId = setTimeout(cb, exports.SERVER_INACTIVITY_TIMEOUT_MS);
|
|
30
31
|
}
|
|
31
32
|
exports.resetInactivityTimeout = resetInactivityTimeout;
|
|
33
|
+
function respondToClient(socket, response, description) {
|
|
34
|
+
return new Promise((res) => {
|
|
35
|
+
socket.write(response, () => {
|
|
36
|
+
if (description) {
|
|
37
|
+
logger_1.serverLogger.requestLog(`Responding to the client.`, description);
|
|
38
|
+
}
|
|
39
|
+
// Close the connection once all data has been written so that the client knows when to read it.
|
|
40
|
+
socket.end();
|
|
41
|
+
logger_1.serverLogger.log(`Closed Connection to Client`);
|
|
42
|
+
res(null);
|
|
43
|
+
});
|
|
44
|
+
});
|
|
45
|
+
}
|
|
46
|
+
exports.respondToClient = respondToClient;
|
|
47
|
+
function respondWithErrorAndExit(socket, description, error) {
|
|
48
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
49
|
+
// print some extra stuff in the error message
|
|
50
|
+
logger_1.serverLogger.requestLog(`Responding to the client with an error.`, description, error.message);
|
|
51
|
+
console.error(error);
|
|
52
|
+
error.message = `${error.message}\n\nBecause of the error the Nx daemon process has exited. The next Nx command is going to restart the daemon process.\nIf the error persists, please run "nx reset".`;
|
|
53
|
+
yield respondToClient(socket, (0, socket_utils_1.serializeResult)(error, null), null);
|
|
54
|
+
process.exit(1);
|
|
55
|
+
});
|
|
56
|
+
}
|
|
57
|
+
exports.respondWithErrorAndExit = respondWithErrorAndExit;
|
|
32
58
|
//# sourceMappingURL=shutdown-utils.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shutdown-utils.js","sourceRoot":"","sources":["../../../../../../packages/nx/src/daemon/server/shutdown-utils.ts"],"names":[],"mappings":";;;;AAAA,+DAA2D;AAE3D,qCAAwC;
|
|
1
|
+
{"version":3,"file":"shutdown-utils.js","sourceRoot":"","sources":["../../../../../../packages/nx/src/daemon/server/shutdown-utils.ts"],"names":[],"mappings":";;;;AAAA,+DAA2D;AAE3D,qCAAwC;AAExC,6DAA6D;AAEhD,QAAA,4BAA4B,GAAG,QAAiB,CAAC,CAAC,wBAAwB;AAQvF,SAAsB,8BAA8B,CAAC,EACnD,MAAM,EACN,MAAM,EACN,mBAAmB,GACkB;;QACrC,IAAI;YACF,MAAM,CAAC,KAAK,EAAE,CAAC;YACf,IAAI,mBAAmB,EAAE;gBACvB,MAAM,mBAAmB,CAAC,WAAW,EAAE,CAAC;gBACxC,qBAAY,CAAC,UAAU,CACrB,qCAAqC,8BAAa,EAAE,CACrD,CAAC;aACH;YACD,qBAAY,CAAC,GAAG,CAAC,4BAA4B,MAAM,GAAG,CAAC,CAAC;SACzD;gBAAS;YACR,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;SACjB;IACH,CAAC;CAAA;AAjBD,wEAiBC;AAED,IAAI,uBAAmD,CAAC;AAExD,SAAgB,sBAAsB,CAAC,EAAc;IACnD,IAAI,uBAAuB,EAAE;QAC3B,YAAY,CAAC,uBAAuB,CAAC,CAAC;KACvC;IACD,uBAAuB,GAAG,UAAU,CAAC,EAAE,EAAE,oCAA4B,CAAC,CAAC;AACzE,CAAC;AALD,wDAKC;AAED,SAAgB,eAAe,CAC7B,MAAc,EACd,QAAgB,EAChB,WAAmB;IAEnB,OAAO,IAAI,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;QACzB,MAAM,CAAC,KAAK,CAAC,QAAQ,EAAE,GAAG,EAAE;YAC1B,IAAI,WAAW,EAAE;gBACf,qBAAY,CAAC,UAAU,CAAC,2BAA2B,EAAE,WAAW,CAAC,CAAC;aACnE;YACD,gGAAgG;YAChG,MAAM,CAAC,GAAG,EAAE,CAAC;YACb,qBAAY,CAAC,GAAG,CAAC,6BAA6B,CAAC,CAAC;YAChD,GAAG,CAAC,IAAI,CAAC,CAAC;QACZ,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC;AAhBD,0CAgBC;AAED,SAAsB,uBAAuB,CAC3C,MAAc,EACd,WAAmB,EACnB,KAAY;;QAEZ,8CAA8C;QAC9C,qBAAY,CAAC,UAAU,CACrB,yCAAyC,EACzC,WAAW,EACX,KAAK,CAAC,OAAO,CACd,CAAC;QACF,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QAErB,KAAK,CAAC,OAAO,GAAG,GAAG,KAAK,CAAC,OAAO,uKAAuK,CAAC;QAExM,MAAM,eAAe,CAAC,MAAM,EAAE,IAAA,8BAAe,EAAC,KAAK,EAAE,IAAI,CAAC,EAAE,IAAI,CAAC,CAAC;QAClE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;CAAA;AAjBD,0DAiBC"}
|
|
@@ -23,3 +23,4 @@ export declare function workspaceFileName(): "angular.json" | "workspace.json";
|
|
|
23
23
|
export declare function defaultFileRead(filePath: string): string | null;
|
|
24
24
|
export declare function readPackageJson(): any;
|
|
25
25
|
export { FileData };
|
|
26
|
+
export { readNxJson, readAllWorkspaceConfiguration, workspaceLayout, } from '../config/configuration';
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.readPackageJson = exports.defaultFileRead = exports.workspaceFileName = exports.readWorkspaceConfig = exports.TEN_MEGABYTES = exports.calculateFileChanges = exports.readFileIfExisting = exports.isWholeFileChange = exports.WholeFileChange = void 0;
|
|
3
|
+
exports.workspaceLayout = exports.readAllWorkspaceConfiguration = exports.readNxJson = exports.readPackageJson = exports.defaultFileRead = exports.workspaceFileName = exports.readWorkspaceConfig = exports.TEN_MEGABYTES = exports.calculateFileChanges = exports.readFileIfExisting = exports.isWholeFileChange = exports.WholeFileChange = void 0;
|
|
4
4
|
const workspaces_1 = require("../config/workspaces");
|
|
5
5
|
const child_process_1 = require("child_process");
|
|
6
6
|
const fs_1 = require("fs");
|
|
@@ -125,4 +125,9 @@ function readPackageJson() {
|
|
|
125
125
|
return (0, fileutils_2.readJsonFile)(`${workspace_root_1.workspaceRoot}/package.json`);
|
|
126
126
|
}
|
|
127
127
|
exports.readPackageJson = readPackageJson;
|
|
128
|
+
// TODO(v16): Remove these exports
|
|
129
|
+
var configuration_2 = require("../config/configuration");
|
|
130
|
+
Object.defineProperty(exports, "readNxJson", { enumerable: true, get: function () { return configuration_2.readNxJson; } });
|
|
131
|
+
Object.defineProperty(exports, "readAllWorkspaceConfiguration", { enumerable: true, get: function () { return configuration_2.readAllWorkspaceConfiguration; } });
|
|
132
|
+
Object.defineProperty(exports, "workspaceLayout", { enumerable: true, get: function () { return configuration_2.workspaceLayout; } });
|
|
128
133
|
//# sourceMappingURL=file-utils.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"file-utils.js","sourceRoot":"","sources":["../../../../../packages/nx/src/project-graph/file-utils.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"file-utils.js","sourceRoot":"","sources":["../../../../../packages/nx/src/project-graph/file-utils.ts"],"names":[],"mappings":"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"}
|