@nrwl/workspace 12.10.0 → 13.0.0-beta.4

package/src/core/project-graph/daemon/server/project-graph-incremental-recomputation.d.ts

@@ -0,0 +1,6 @@
+export declare function getCachedSerializedProjectGraphPromise(): Promise<{
+    error: Error;
+    serializedProjectGraph: string;
+}>;
+export declare function addUpdatedAndDeletedFiles(updatedFiles: string[], deletedFiles: string[]): void;
+export declare function resetAfterError(): void;

package/src/core/project-graph/daemon/server/project-graph-incremental-recomputation.js

@@ -0,0 +1,119 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.resetAfterError = exports.addUpdatedAndDeletedFiles = exports.getCachedSerializedProjectGraphPromise = void 0;
+const tslib_1 = require("tslib");
+const app_root_1 = require("@nrwl/tao/src/utils/app-root");
+const perf_hooks_1 = require("perf_hooks");
+const file_utils_1 = require("../../../file-utils");
+const file_hasher_1 = require("../../../hasher/file-hasher");
+const git_hasher_1 = require("../../../hasher/git-hasher");
+const logger_1 = require("./logger");
+const build_project_graph_1 = require("../../build-project-graph");
+const workspace_1 = require("@nrwl/tao/src/shared/workspace");
+const nx_deps_cache_1 = require("../../../nx-deps/nx-deps-cache");
+const configName = workspace_1.workspaceConfigName(app_root_1.appRootPath);
+let cachedSerializedProjectGraphPromise;
+let projectFileMapWithFiles;
+let currentProjectGraphCache;
+const collectedUpdatedFiles = new Set();
+const collectedDeletedFiles = new Set();
+let waitPeriod = 100;
+let scheduledTimeoutId;
+function getCachedSerializedProjectGraphPromise() {
+    // recomputing it now on demand. we can ignore the scheduled timeout
+    if (scheduledTimeoutId) {
+        clearTimeout(scheduledTimeoutId);
+    }
+    // reset the wait time
+    waitPeriod = 100;
+    if (collectedUpdatedFiles.size == 0 && collectedDeletedFiles.size == 0) {
+        if (!cachedSerializedProjectGraphPromise) {
+            cachedSerializedProjectGraphPromise = createAndSerializeProjectGraph();
+        }
+    }
+    else {
+        processCollectedUpdatedAndDeletedFiles();
+        cachedSerializedProjectGraphPromise = createAndSerializeProjectGraph();
+    }
+    return cachedSerializedProjectGraphPromise;
+}
+exports.getCachedSerializedProjectGraphPromise = getCachedSerializedProjectGraphPromise;
+function addUpdatedAndDeletedFiles(updatedFiles, deletedFiles) {
+    for (let f of updatedFiles) {
+        collectedDeletedFiles.delete(f);
+        collectedUpdatedFiles.add(f);
+    }
+    for (let f of deletedFiles) {
+        collectedUpdatedFiles.delete(f);
+        collectedDeletedFiles.add(f);
+    }
+    if (!scheduledTimeoutId) {
+        scheduledTimeoutId = setTimeout(() => {
+            scheduledTimeoutId = undefined;
+            if (waitPeriod < 4000) {
+                waitPeriod = waitPeriod * 2;
+            }
+            processCollectedUpdatedAndDeletedFiles();
+            cachedSerializedProjectGraphPromise = createAndSerializeProjectGraph();
+        }, waitPeriod);
+    }
+}
+exports.addUpdatedAndDeletedFiles = addUpdatedAndDeletedFiles;
+function processCollectedUpdatedAndDeletedFiles() {
+    perf_hooks_1.performance.mark('hash-watched-changes-start');
+    const updatedFiles = git_hasher_1.getGitHashForFiles([...collectedUpdatedFiles.values()], app_root_1.appRootPath);
+    const deletedFiles = [...collectedDeletedFiles.values()];
+    collectedUpdatedFiles.clear();
+    collectedDeletedFiles.clear();
+    perf_hooks_1.performance.mark('hash-watched-changes-end');
+    perf_hooks_1.performance.measure('hash changed files from watcher', 'hash-watched-changes-start', 'hash-watched-changes-end');
+    file_hasher_1.defaultFileHasher.incrementalUpdate(updatedFiles, deletedFiles);
+    const workspaceJson = file_utils_1.readWorkspaceJson();
+    logger_1.serverLogger.nestedLog(`Updated file-hasher based on watched changes, recomputing project graph...`);
+    // when workspace.json changes we cannot be sure about the correctness of the project file map
+    if (collectedUpdatedFiles.has(configName) ||
+        collectedDeletedFiles.has(configName)) {
+        projectFileMapWithFiles = file_utils_1.createProjectFileMap(workspaceJson);
+    }
+    else {
+        projectFileMapWithFiles = projectFileMapWithFiles
+            ? file_utils_1.updateProjectFileMap(workspaceJson, projectFileMapWithFiles.projectFileMap, projectFileMapWithFiles.allWorkspaceFiles, updatedFiles, deletedFiles)
+            : file_utils_1.createProjectFileMap(workspaceJson);
+    }
+}
+function createAndSerializeProjectGraph() {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        try {
+            perf_hooks_1.performance.mark('create-project-graph-start');
+            const workspaceJson = file_utils_1.readWorkspaceJson();
+            const { projectGraph, projectGraphCache } = yield build_project_graph_1.buildProjectGraphUsingProjectFileMap(workspaceJson, projectFileMapWithFiles.projectFileMap, projectFileMapWithFiles.allWorkspaceFiles, currentProjectGraphCache || nx_deps_cache_1.readCache(), true, '4.0');
+            currentProjectGraphCache = projectGraphCache;
+            perf_hooks_1.performance.mark('create-project-graph-end');
+            perf_hooks_1.performance.measure('total execution time for createProjectGraph()', 'create-project-graph-start', 'create-project-graph-end');
+            perf_hooks_1.performance.mark('json-stringify-start');
+            const serializedProjectGraph = JSON.stringify(projectGraph);
+            perf_hooks_1.performance.mark('json-stringify-end');
+            perf_hooks_1.performance.measure('serialize graph', 'json-stringify-start', 'json-stringify-end');
+            return {
+                error: null,
+                serializedProjectGraph,
+            };
+        }
+        catch (err) {
+            return {
+                error: err,
+                serializedProjectGraph: null,
+            };
+        }
+    });
+}
+function resetAfterError() {
+    cachedSerializedProjectGraphPromise = undefined;
+    projectFileMapWithFiles = undefined;
+    currentProjectGraphCache = undefined;
+    collectedUpdatedFiles.clear();
+    collectedDeletedFiles.clear();
+    waitPeriod = 100;
+}
+exports.resetAfterError = resetAfterError;
+//# sourceMappingURL=project-graph-incremental-recomputation.js.map

package/src/core/project-graph/daemon/server/project-graph-incremental-recomputation.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"project-graph-incremental-recomputation.js","sourceRoot":"","sources":["../../../../../../../../packages/workspace/src/core/project-graph/daemon/server/project-graph-incremental-recomputation.ts"],"names":[],"mappings":"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"}

package/src/core/project-graph/daemon/server/server.d.ts

@@ -1,8 +1,4 @@
 /// <reference types="node" />
 import { Server } from 'net';
-interface StartServerOptions {
-    serverLogOutputFile?: string;
-}
-export declare function startServer({ serverLogOutputFile, }: StartServerOptions): Promise<Server>;
+export declare function startServer(): Promise<Server>;
 export declare function stopServer(): Promise<void>;
-export {};

package/src/core/project-graph/daemon/server/server.js

@@ -4,212 +4,137 @@ exports.stopServer = exports.startServer = void 0;
 const tslib_1 = require("tslib");
 const devkit_1 = require("@nrwl/devkit");
 const app_root_1 = require("@nrwl/tao/src/utils/app-root");
-const fs_1 = require("fs");
 const net_1 = require("net");
+const path_1 = require("path");
 const perf_hooks_1 = require("perf_hooks");
-const file_hasher_1 = require("../../../hasher/file-hasher");
-const git_hasher_1 = require("../../../hasher/git-hasher");
-const project_graph_1 = require("../../project-graph");
 const socket_utils_1 = require("../socket-utils");
+const logger_1 = require("./logger");
+const shutdown_utils_1 = require("./shutdown-utils");
 const watcher_1 = require("./watcher");
-/**
- * We have two different use-cases for the "daemon" server:
- * 1) Running in a background process so that the daemon is purely an implementation detail.
- * 2) Running in the main process in order to aid with development/debugging (technically, of course, in this case
- * it isn't actually a daemon server at all, but for simplicity we stick with the same general name as its primary
- * reason for existence is to be run in a background process).
- *
- * For (1) we do not want to log things from the daemon server to stdout/stderr, so we instead write to a file.
- *
- * This file location will be set by the `./exec/index.ts` utilities when starting the server so that we can
- * provide feedback to the user as to its location via stdout on the parent process and still not cause the child
- * process to be "undetachable".
- *
- * For (2) we simply log to stdout.
- */
-let _serverLogOutputFile;
-function serverLog(...s) {
-    /**
-     * If _serverLogOutputFile has not be set when starting the server, it means we are
-     * running it in the current process and we should log to stdout.
-     */
-    if (!_serverLogOutputFile) {
-        console.log(formatLogMessage(`${s.join(' ')}`));
-        return;
-    }
-    fs_1.appendFileSync(_serverLogOutputFile, formatLogMessage(`${s.join(' ')}\n`));
-}
-function formatLogMessage(message) {
-    return `[NX Daemon Server] - ${new Date().toISOString()} - ${message}`;
-}
-/**
- * To improve the overall readibility of the logs, we categorize things by "trigger":
- *
- * - [REQUEST] meaning that the current set of actions were triggered by a client request to the server
- * - [WATCHER] meaning the the current set of actions were triggered by handling changes to the workspace files
- *
- * We keep those two "triggers" left aligned at the top level and then indent subsequent logs so that there is a
- * logical hierarchy/grouping.
- */
-function requestLog(...s) {
-    serverLog(`[REQUEST]: ${s.join(' ')}`);
-}
-function watcherLog(...s) {
-    serverLog(`[WATCHER]: ${s.join(' ')}`);
-}
-function nestedLog(...s) {
-    serverLog(`  ${s.join(' ')}`);
-}
-/**
- * We cache the latest known HEAD value so that we can potentially skip some initialization work.
- */
-let cachedGitHead;
-/**
- * We cache the latest copy of the serialized project graph itself in memory so that in the
- * best case scenario we can skip all graph construction and serialization work entirely.
- */
-let cachedSerializedProjectGraph;
-function createAndSerializeProjectGraph() {
-    perf_hooks_1.performance.mark('create-project-graph-start');
-    const projectGraph = project_graph_1.createProjectGraph(undefined, undefined, undefined, '4.0');
-    perf_hooks_1.performance.mark('create-project-graph-end');
-    perf_hooks_1.performance.measure('total execution time for createProjectGraph()', 'create-project-graph-start', 'create-project-graph-end');
-    perf_hooks_1.performance.mark('json-stringify-start');
-    const serializedProjectGraph = JSON.stringify(projectGraph);
-    perf_hooks_1.performance.mark('json-stringify-end');
-    perf_hooks_1.performance.measure('serialize graph', 'json-stringify-start', 'json-stringify-end');
-    return serializedProjectGraph;
+const project_graph_incremental_recomputation_1 = require("./project-graph-incremental-recomputation");
+function respondToClient(socket, message) {
+    socket.write(message, () => {
+        // Close the connection once all data has been written so that the client knows when to read it.
+        socket.end();
+        logger_1.serverLogger.nestedLog(`Closed Connection to Client`);
+    });
 }
-/**
- * File watcher subscription.
- */
 let watcherSubscription;
-/**
- * We need to make sure that we instantiate the PerformanceObserver only once, otherwise
- * we will end up with duplicate entries in the server logs.
- */
 let performanceObserver;
 const server = net_1.createServer((socket) => {
+    shutdown_utils_1.resetInactivityTimeout(handleInactivityTimeout);
     if (!performanceObserver) {
         performanceObserver = new perf_hooks_1.PerformanceObserver((list) => {
             const entry = list.getEntries()[0];
-            // Slight indentation to improve readability of the overall log file
-            nestedLog(`Time taken for '${entry.name}'`, `${entry.duration}ms`);
+            logger_1.serverLogger.nestedLog(`Time taken for '${entry.name}'`, `${entry.duration}ms`);
         });
         performanceObserver.observe({ entryTypes: ['measure'], buffered: false });
     }
-    socket.on('data', (data) => {
-        /**
-         * If anything other than the known project graph creation request payload is sent to
-         * the server, we throw an error.
-         */
+    socket.on('data', (data) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
+        shutdown_utils_1.resetInactivityTimeout(handleInactivityTimeout);
         const payload = data.toString();
         if (payload !== 'REQUEST_PROJECT_GRAPH_PAYLOAD') {
             throw new Error(`Unsupported payload sent to daemon server: ${payload}`);
         }
         perf_hooks_1.performance.mark('server-connection');
-        requestLog('Client Request for Project Graph Received');
-        const currentGitHead = git_hasher_1.gitRevParseHead(app_root_1.appRootPath);
-        let serializedProjectGraph;
-        /**
-         * Cached HEAD has changed, we must perform full file-hashing initialization work and
-         * recompute the project graph
-         */
-        if (currentGitHead !== cachedGitHead) {
-            cachedSerializedProjectGraph = undefined;
-            nestedLog(`Cached HEAD does not match current (${currentGitHead}), performing full file hash init and recomputing project graph...`);
-            file_hasher_1.defaultFileHasher.init();
-            cachedGitHead = currentGitHead;
-            serializedProjectGraph = createAndSerializeProjectGraph();
+        logger_1.serverLogger.requestLog('Client Request for Project Graph Received');
+        const result = yield project_graph_incremental_recomputation_1.getCachedSerializedProjectGraphPromise();
+        if (result.error) {
+            project_graph_incremental_recomputation_1.resetAfterError();
+            logger_1.serverLogger.nestedLog(`Error when preparing serialized project graph: ${result.error.message}`);
+            respondToClient(socket, socket_utils_1.serializeResult(result.error, result.serializedProjectGraph));
+            return;
         }
-        else {
-            /**
-             * We know at this point that the cached HEAD has not changed so now there are two possibilities:
-             *
-             * 1) We have not computed the project graph and cached it for the untracked and uncommitted changes
-             * and need to ask git for this information (slower)
-             *
-             * 2) We already have a cached serialized project graph (which we trust has been kept up to date
-             * by the file watching logic) so we can immediately resolve it to the client (faster)
-             */
-            if (cachedSerializedProjectGraph) {
-                nestedLog(`State unchanged since last request, resolving in-memory cached project graph...`);
-                serializedProjectGraph = cachedSerializedProjectGraph;
-            }
-            else {
-                // Update the file-hasher's knowledge of the untracked and uncommitted changes in order to recompute the project graph
-                file_hasher_1.defaultFileHasher.incrementalUpdate(git_hasher_1.getUntrackedAndUncommittedFileHashes(app_root_1.appRootPath));
-                nestedLog(`Unknown untracked/uncommitted file state, recomputing project graph...`);
-                serializedProjectGraph = createAndSerializeProjectGraph();
-            }
+        const serializedResult = socket_utils_1.serializeResult(result.error, result.serializedProjectGraph);
+        if (!serializedResult) {
+            project_graph_incremental_recomputation_1.resetAfterError();
+            logger_1.serverLogger.nestedLog(`Error when serializing project graph result`);
+            respondToClient(socket, socket_utils_1.serializeResult(new Error('Critical error when serializing server result, check server logs'), null));
+            return;
         }
-        /**
-         * Cache the latest version of the project graph in memory so that we can potentially skip a lot
-         * of expensive work on the next client request.
-         *
-         * For reference, on the very large test repo https://github.com/vsavkin/interstellar the project
-         * graph nxdeps.json file is about 32MB, so memory utilization should not be a huge concern.
-         */
-        cachedSerializedProjectGraph = serializedProjectGraph;
         perf_hooks_1.performance.mark('serialized-project-graph-ready');
         perf_hooks_1.performance.measure('total for creating and serializing project graph', 'server-connection', 'serialized-project-graph-ready');
-        socket.write(serializedProjectGraph, () => {
+        socket.write(serializedResult, () => {
             perf_hooks_1.performance.mark('serialized-project-graph-written-to-client');
             perf_hooks_1.performance.measure('write project graph to socket', 'serialized-project-graph-ready', 'serialized-project-graph-written-to-client');
-            /**
-             * Close the connection once all data has been written to the socket so that the client
-             * knows when to read it.
-             */
+            // Close the connection once all data has been written so that the client knows when to read it.
             socket.end();
             perf_hooks_1.performance.measure('total for server response', 'server-connection', 'serialized-project-graph-written-to-client');
-            const bytesWritten = Buffer.byteLength(serializedProjectGraph, 'utf-8');
-            nestedLog(`Closed Connection to Client (${bytesWritten} bytes transferred)`);
+            const bytesWritten = Buffer.byteLength(result.serializedProjectGraph, 'utf-8');
+            logger_1.serverLogger.nestedLog(`Closed Connection to Client (${bytesWritten} bytes transferred)`);
         });
-    });
+    }));
 });
-/**
- * Server process termination clean up and logging.
- */
-function handleServerProcessTermination() {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        server.close();
-        /**
-         * Tear down any file watchers that may be running.
-         */
-        if (watcherSubscription) {
-            yield watcherSubscription.unsubscribe();
-            watcherLog(`Unsubscribed from changes within: ${app_root_1.appRootPath}`);
-        }
-        serverLog('Server Stopped');
-        devkit_1.logger.info('NX Daemon Server - Stopped');
-        process.exit(0);
+function handleInactivityTimeout() {
+    shutdown_utils_1.handleServerProcessTermination({
+        server,
+        watcherSubscription,
+        reason: `${shutdown_utils_1.SERVER_INACTIVITY_TIMEOUT_MS}ms of inactivity`,
     });
 }
 process
-    .on('SIGINT', handleServerProcessTermination)
-    .on('SIGTERM', handleServerProcessTermination)
-    .on('SIGHUP', handleServerProcessTermination);
+    .on('SIGINT', () => shutdown_utils_1.handleServerProcessTermination({
+    server,
+    watcherSubscription,
+    reason: 'received process SIGINT',
+}))
+    .on('SIGTERM', () => shutdown_utils_1.handleServerProcessTermination({
+    server,
+    watcherSubscription,
+    reason: 'received process SIGTERM',
+}))
+    .on('SIGHUP', () => shutdown_utils_1.handleServerProcessTermination({
+    server,
+    watcherSubscription,
+    reason: 'received process SIGHUP',
+}));
+function requireUncached(module) {
+    delete require.cache[require.resolve(module)];
+    return require(module);
+}
+/**
+ * We need to ensure that the server shuts down if the Nx installation changes.
+ */
+let cachedNxVersion = resolveCurrentNxVersion();
+function resolveCurrentNxVersion() {
+    const nrwlWorkspacePackageJsonPath = devkit_1.normalizePath(path_1.join(app_root_1.appRootPath, 'node_modules/@nrwl/workspace/package.json'));
+    try {
+        const { version } = requireUncached(nrwlWorkspacePackageJsonPath);
+        return version;
+    }
+    catch (_a) {
+        logger_1.serverLogger.nestedLog(`Error: Could not determine the current Nx version by inspecting: ${nrwlWorkspacePackageJsonPath}`);
+        return null;
+    }
+}
+function isNxVersionSame(currentNxVersion) {
+    if (currentNxVersion === null) {
+        // Something has gone wrong with figuring out the Nx version, declare the version as having changed
+        return false;
+    }
+    return currentNxVersion === cachedNxVersion;
+}
 /**
  * When applicable files in the workspaces are changed (created, updated, deleted),
  * we need to recompute the cached serialized project graph so that it is readily
  * available for the next client request to the server.
  */
-const handleWorkspaceChanges = (err, changeEvents) => {
-    /**
-     * We know that something must have happened in the workspace so it makes sense
-     * to proactively destroy any previous knowledge of the project graph at this point.
-     */
-    cachedSerializedProjectGraph = undefined;
+const handleWorkspaceChanges = (err, changeEvents) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
+    shutdown_utils_1.resetInactivityTimeout(handleInactivityTimeout);
+    if (!isNxVersionSame(resolveCurrentNxVersion())) {
+        yield shutdown_utils_1.handleServerProcessTermination({
+            server,
+            watcherSubscription,
+            reason: '@nrwl/workspace installation changed',
+        });
+        return;
+    }
     if (err || !changeEvents || !changeEvents.length) {
-        watcherLog('Unexpected Error');
+        logger_1.serverLogger.watcherLog('Unexpected Error');
         console.error(err);
         return;
     }
-    watcherLog(watcher_1.convertChangeEventsToLogMessage(changeEvents));
-    /**
-     * Update the file-hasher's knowledge of the non-deleted changed files in order to
-     * recompute and cache the project graph in memory.
-     */
+    logger_1.serverLogger.watcherLog(watcher_1.convertChangeEventsToLogMessage(changeEvents));
     try {
         const filesToHash = [];
         const deletedFiles = [];
@@ -221,33 +146,25 @@ const handleWorkspaceChanges = (err, changeEvents) => {
                 filesToHash.push(event.path);
             }
         }
-        perf_hooks_1.performance.mark('hash-watched-changes-start');
-        const updatedHashes = git_hasher_1.getGitHashForFiles(filesToHash, app_root_1.appRootPath);
-        perf_hooks_1.performance.mark('hash-watched-changes-end');
-        perf_hooks_1.performance.measure('hash changed files from watcher', 'hash-watched-changes-start', 'hash-watched-changes-end');
-        file_hasher_1.defaultFileHasher.incrementalUpdate(updatedHashes);
-        file_hasher_1.defaultFileHasher.removeFiles(deletedFiles);
-        nestedLog(`Updated file-hasher based on watched changes, recomputing project graph...`);
-        cachedSerializedProjectGraph = createAndSerializeProjectGraph();
+        project_graph_incremental_recomputation_1.addUpdatedAndDeletedFiles(filesToHash, deletedFiles);
     }
     catch (err) {
-        serverLog(`Unexpected Error`);
+        logger_1.serverLogger.log(`Unexpected Error`);
         console.error(err);
     }
-};
-function startServer({ serverLogOutputFile, }) {
+});
+function startServer() {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        _serverLogOutputFile = serverLogOutputFile;
-        // See notes above on OS differences regarding clean up of existings connections.
+        // See notes in socket-utils.ts on OS differences regarding clean up of existings connections.
         if (!socket_utils_1.isWindows) {
             socket_utils_1.killSocketOrPath();
         }
         return new Promise((resolve) => {
             server.listen(socket_utils_1.FULL_OS_SOCKET_PATH, () => tslib_1.__awaiter(this, void 0, void 0, function* () {
-                serverLog(`Started listening on: ${socket_utils_1.FULL_OS_SOCKET_PATH}`);
+                logger_1.serverLogger.log(`Started listening on: ${socket_utils_1.FULL_OS_SOCKET_PATH}`);
                 if (!watcherSubscription) {
                     watcherSubscription = yield watcher_1.subscribeToWorkspaceChanges(handleWorkspaceChanges);
-                    watcherLog(`Subscribed to changes within: ${app_root_1.appRootPath}`);
+                    logger_1.serverLogger.watcherLog(`Subscribed to changes within: ${app_root_1.appRootPath}`);
                 }
                 return resolve(server);
             }));
@@ -270,10 +187,6 @@ function stopServer() {
                     }
                 }
                 socket_utils_1.killSocketOrPath();
-                /**
-                 * The distinction regarding background process or not is not relevant for stopping the server,
-                 * always pretty print the message to stdout.
-                 */
                 devkit_1.logger.info('NX Daemon Server - Stopped');
                 return resolve();
             });

package/src/core/project-graph/daemon/server/server.js.map

@@ -1 +1 @@
-{"version":3,"file":"server.js","sourceRoot":"","sources":["../../../../../../../../packages/workspace/src/core/project-graph/daemon/server/server.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"server.js","sourceRoot":"","sources":["../../../../../../../../packages/workspace/src/core/project-graph/daemon/server/server.ts"],"names":[],"mappings":"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"}

package/src/core/project-graph/daemon/server/shutdown-utils.d.ts

@@ -0,0 +1,13 @@
+/// <reference types="node" />
+import type { Server } from 'net';
+import type { WatcherSubscription } from './watcher';
+export declare const SERVER_INACTIVITY_TIMEOUT_MS: 10800000;
+declare type ServerTerminationReason = `received process ${NodeJS.Signals}` | '@nrwl/workspace installation changed' | `${typeof SERVER_INACTIVITY_TIMEOUT_MS}ms of inactivity`;
+interface HandleServerProcessTerminationParams {
+    server: Server;
+    reason: ServerTerminationReason;
+    watcherSubscription: WatcherSubscription | undefined;
+}
+export declare function handleServerProcessTermination({ server, reason, watcherSubscription, }: HandleServerProcessTerminationParams): Promise<void>;
+export declare function resetInactivityTimeout(cb: () => void): void;
+export {};

package/src/core/project-graph/daemon/server/shutdown-utils.js

@@ -0,0 +1,28 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.resetInactivityTimeout = exports.handleServerProcessTermination = exports.SERVER_INACTIVITY_TIMEOUT_MS = void 0;
+const tslib_1 = require("tslib");
+const app_root_1 = require("@nrwl/tao/src/utils/app-root");
+const logger_1 = require("./logger");
+exports.SERVER_INACTIVITY_TIMEOUT_MS = 10800000; // 10800000 ms = 3 hours
+function handleServerProcessTermination({ server, reason, watcherSubscription, }) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        server.close();
+        if (watcherSubscription) {
+            yield watcherSubscription.unsubscribe();
+            logger_1.serverLogger.watcherLog(`Unsubscribed from changes within: ${app_root_1.appRootPath}`);
+        }
+        logger_1.serverLogger.log(`Server stopped because: "${reason}"`);
+        process.exit(0);
+    });
+}
+exports.handleServerProcessTermination = handleServerProcessTermination;
+let serverInactivityTimerId;
+function resetInactivityTimeout(cb) {
+    if (serverInactivityTimerId) {
+        clearTimeout(serverInactivityTimerId);
+    }
+    serverInactivityTimerId = setTimeout(cb, exports.SERVER_INACTIVITY_TIMEOUT_MS);
+}
+exports.resetInactivityTimeout = resetInactivityTimeout;
+//# sourceMappingURL=shutdown-utils.js.map

package/src/core/project-graph/daemon/server/shutdown-utils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"shutdown-utils.js","sourceRoot":"","sources":["../../../../../../../../packages/workspace/src/core/project-graph/daemon/server/shutdown-utils.ts"],"names":[],"mappings":";;;;AAAA,2DAA2D;AAE3D,qCAAwC;AAG3B,QAAA,4BAA4B,GAAG,QAAiB,CAAC,CAAC,wBAAwB;AAavF,SAAsB,8BAA8B,CAAC,EACnD,MAAM,EACN,MAAM,EACN,mBAAmB,GACkB;;QACrC,MAAM,CAAC,KAAK,EAAE,CAAC;QACf,IAAI,mBAAmB,EAAE;YACvB,MAAM,mBAAmB,CAAC,WAAW,EAAE,CAAC;YACxC,qBAAY,CAAC,UAAU,CAAC,qCAAqC,sBAAW,EAAE,CAAC,CAAC;SAC7E;QACD,qBAAY,CAAC,GAAG,CAAC,4BAA4B,MAAM,GAAG,CAAC,CAAC;QACxD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;CAAA;AAZD,wEAYC;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"}

package/src/core/project-graph/daemon/server/start.js

@@ -1,18 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
-/**
- * NOTE: This file is intended to be executed as a script by utilities found in ./index.ts
- */
 const devkit_1 = require("@nrwl/devkit");
 const server_1 = require("./server");
-const serverLogOutputFile = process.argv[2];
 (() => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
     try {
-        if (!serverLogOutputFile) {
-            devkit_1.logger.info('NOTE: Running Daemon Server in current process, all logs are shown inline below:\n');
-        }
-        yield server_1.startServer({ serverLogOutputFile });
+        yield server_1.startServer();
     }
     catch (err) {
         devkit_1.logger.error(err);

package/src/core/project-graph/daemon/server/start.js.map

@@ -1 +1 @@
-{"version":3,"file":"start.js","sourceRoot":"","sources":["../../../../../../../../packages/workspace/src/core/project-graph/daemon/server/start.ts"],"names":[],"mappings":";;;AAAA;;GAEG;AACH,yCAAsC;AACtC,qCAAuC;AAEvC,MAAM,mBAAmB,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAE5C,CAAC,GAAS,EAAE;IACV,IAAI;QACF,IAAI,CAAC,mBAAmB,EAAE;YACxB,eAAM,CAAC,IAAI,CACT,oFAAoF,CACrF,CAAC;SACH;QACD,MAAM,oBAAW,CAAC,EAAE,mBAAmB,EAAE,CAAC,CAAC;KAC5C;IAAC,OAAO,GAAG,EAAE;QACZ,eAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;KACnB;AACH,CAAC,CAAA,CAAC,EAAE,CAAC"}
+{"version":3,"file":"start.js","sourceRoot":"","sources":["../../../../../../../../packages/workspace/src/core/project-graph/daemon/server/start.ts"],"names":[],"mappings":";;;AAAA,yCAAsC;AACtC,qCAAuC;AAEvC,CAAC,GAAS,EAAE;IACV,IAAI;QACF,MAAM,oBAAW,EAAE,CAAC;KACrB;IAAC,OAAO,GAAG,EAAE;QACZ,eAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;KACnB;AACH,CAAC,CAAA,CAAC,EAAE,CAAC"}

package/src/core/project-graph/daemon/server/stop.js

@@ -1,23 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
-/**
- * NOTE: This file is intended to be executed as a script by utilities found in ./index.ts
- */
 const devkit_1 = require("@nrwl/devkit");
 const cache_1 = require("../cache");
 const server_1 = require("./server");
 (() => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
     try {
         yield server_1.stopServer();
-        // Clean up any orphaned background process and clear cached metadata
-        const cachedDaemonJson = yield cache_1.readDaemonJsonCache();
-        if (cachedDaemonJson) {
-            if (cachedDaemonJson.backgroundProcessId) {
-                process.kill(cachedDaemonJson.backgroundProcessId);
-            }
-            cache_1.deleteDaemonJsonCache();
-        }
+        yield cache_1.safelyCleanUpExistingProcess();
     }
     catch (err) {
         devkit_1.logger.error(err);