@nrwl/workspace 12.10.0-beta.3 → 12.10.0

package/src/core/hasher/file-hasher.d.ts

@@ -17,16 +17,20 @@ export declare class FileHasher {
     init(): Map<string, string>;
     /**
      * This method is used in cases where we do not want to fully tear down the
-     * known state of file hashes, and instead only want to hash the currently
-     * uncommitted (both staged and unstaged) non-deleted files.
+     * known state of file hashes, and instead only want to hash an updated Map
+     * of files which are provided to the method.
      *
-     * For example, the daemon server can cache the last known commit SHA in
-     * memory and avoid calling init() by using this method instead when that
-     * SHA is unchanged.
-     *
-     * @returns The Map of filenames to hashes returned by getUntrackedAndUncommittedFileHashes()
+     * For example, the daemon server performs file-watching and knows at a granular
+     * level what needs to be rehashed in order to accurately update the overall state.
+     */
+    incrementalUpdate(updatedHashes: Map<string, string>): void;
+    /**
+     * In the case of the daemon server, because it performs file-watching, it
+     * knows when one or more files have been deleted from the workspace and can
+     * therefore precisely update the source of truth for file hashes and workspace
+     * files.
      */
-    incrementalUpdate(): Map<string, string>;
+    removeFiles(deletedFiles: string[]): void;
     hashFile(path: string): string;
     ensureInitialized(): void;
     private applyFileHashes;

package/src/core/hasher/file-hasher.js

@@ -36,19 +36,15 @@ class FileHasher {
     }
     /**
      * This method is used in cases where we do not want to fully tear down the
-     * known state of file hashes, and instead only want to hash the currently
-     * uncommitted (both staged and unstaged) non-deleted files.
+     * known state of file hashes, and instead only want to hash an updated Map
+     * of files which are provided to the method.
      *
-     * For example, the daemon server can cache the last known commit SHA in
-     * memory and avoid calling init() by using this method instead when that
-     * SHA is unchanged.
-     *
-     * @returns The Map of filenames to hashes returned by getUntrackedAndUncommittedFileHashes()
+     * For example, the daemon server performs file-watching and knows at a granular
+     * level what needs to be rehashed in order to accurately update the overall state.
      */
-    incrementalUpdate() {
+    incrementalUpdate(updatedHashes) {
         perf_hooks_1.performance.mark('incremental hashing:start');
-        const untrackedAndUncommittedFileHashes = git_hasher_1.getUntrackedAndUncommittedFileHashes(app_root_1.appRootPath);
-        untrackedAndUncommittedFileHashes.forEach((hash, filename) => {
+        updatedHashes.forEach((hash, filename) => {
             this.fileHashes[filename] = hash;
             /**
              * we have to store it separately because fileHashes can be modified
@@ -58,7 +54,18 @@ class FileHasher {
         });
         perf_hooks_1.performance.mark('incremental hashing:end');
         perf_hooks_1.performance.measure('incremental hashing', 'incremental hashing:start', 'incremental hashing:end');
-        return untrackedAndUncommittedFileHashes;
+    }
+    /**
+     * In the case of the daemon server, because it performs file-watching, it
+     * knows when one or more files have been deleted from the workspace and can
+     * therefore precisely update the source of truth for file hashes and workspace
+     * files.
+     */
+    removeFiles(deletedFiles) {
+        for (const deletedFile of deletedFiles) {
+            delete this.fileHashes[deletedFile];
+            this.workspaceFiles.delete(deletedFile);
+        }
     }
     hashFile(path) {
         this.ensureInitialized();

package/src/core/hasher/file-hasher.js.map

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

package/src/core/hasher/git-hasher.d.ts

@@ -1,3 +1,4 @@
+export declare function getGitHashForFiles(filesToHash: string[], path: string): Map<string, string>;
 export declare function gitRevParseHead(path: string): string;
 /**
  * getFileHashes() figures out both committed changes to the git tree as well as untracked

package/src/core/hasher/git-hasher.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getUntrackedAndUncommittedFileHashes = exports.getFileHashes = exports.gitRevParseHead = void 0;
+exports.getUntrackedAndUncommittedFileHashes = exports.getFileHashes = exports.gitRevParseHead = exports.getGitHashForFiles = void 0;
 const fs_1 = require("fs");
 const path_1 = require("path");
 const spawn_process_1 = require("./spawn-process");
@@ -67,6 +67,7 @@ function getGitHashForFiles(filesToHash, path) {
     }
     return changes;
 }
+exports.getGitHashForFiles = getGitHashForFiles;
 function gitLsTree(path) {
     return parseGitLsTree(spawn_process_1.spawnProcess('git', ['ls-tree', 'HEAD', '-r', '-z'], path));
 }

package/src/core/hasher/git-hasher.js.map

@@ -1 +1 @@
-{"version":3,"file":"git-hasher.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/core/hasher/git-hasher.ts"],"names":[],"mappings":";;;AAAA,2BAA8B;AAC9B,+BAA4B;AAC5B,mDAA+C;AAE/C,SAAS,cAAc,CAAC,MAAc;IACpC,MAAM,OAAO,GAAwB,IAAI,GAAG,EAAkB,CAAC;IAC/D,IAAI,MAAM,EAAE;QACV,MAAM,QAAQ,GAAW,kDAAkD,CAAC;QAC5E,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;YAClC,IAAI,IAAI,EAAE;gBACR,MAAM,OAAO,GAA4B,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;gBAC9D,IAAI,OAAO,IAAI,OAAO,CAAC,CAAC,CAAC,IAAI,OAAO,CAAC,CAAC,CAAC,EAAE;oBACvC,MAAM,IAAI,GAAW,OAAO,CAAC,CAAC,CAAC,CAAC;oBAChC,MAAM,QAAQ,GAAW,OAAO,CAAC,CAAC,CAAC,CAAC;oBACpC,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;iBAC7B;qBAAM;oBACL,MAAM,IAAI,KAAK,CAAC,oCAAoC,IAAI,GAAG,CAAC,CAAC;iBAC9D;aACF;QACH,CAAC,CAAC,CAAC;KACJ;IACD,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,SAAS,cAAc,CAAC,IAAY;IAClC,MAAM,MAAM,GAAG,4BAAY,CAAC,KAAK,EAAE,CAAC,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,CAAC,EAAE,IAAI,CAAC,CAAC;IAC5E,MAAM,OAAO,GAAwB,IAAI,GAAG,EAAkB,CAAC;IAC/D,IAAI,CAAC,MAAM,EAAE;QACX,OAAO,OAAO,CAAC;KAChB;IAED,iEAAiE;IACjE,8DAA8D;IAC9D,MAAM,MAAM,GAAG,4BAAY,CAAC,KAAK,EAAE,CAAC,WAAW,EAAE,eAAe,CAAC,EAAE,IAAI,CAAC,CAAC;IAEzE,MAAM,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAClC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QACtC,MAAM,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;QACxB,IAAI,KAAK,CAAC,MAAM,EAAE;YAChB,wCAAwC;YACxC,yDAAyD;YACzD,MAAM,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;YAC1B,MAAM,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;YAC1B,MAAM,QAAQ,GAAG,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,MAAM,CAAC,IAAI,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;YAC1E,IAAI,CAAC,KAAK,GAAG,EAAE;gBACb,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;aAC/B;YACD,0DAA0D;YAC1D,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC;SAC/B;KACF;IACD,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,SAAS,kBAAkB,CACzB,WAAqB,EACrB,IAAY;IAEZ,MAAM,OAAO,GAAwB,IAAI,GAAG,EAAkB,CAAC;IAC/D,IAAI,WAAW,CAAC,MAAM,EAAE;QACtB,MAAM,UAAU,GAAG,4BAAY,CAC7B,KAAK,EACL,CAAC,aAAa,EAAE,GAAG,WAAW,CAAC,EAC/B,IAAI,CACL,CAAC;QACF,MAAM,MAAM,GAAa,UAAU,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAChD,IAAI,MAAM,CAAC,MAAM,KAAK,WAAW,CAAC,MAAM,EAAE;YACxC,MAAM,IAAI,KAAK,CACb,UAAU,WAAW,CAAC,MAAM,4CAA4C,MAAM,CAAC,MAAM,UAAU,CAChG,CAAC;SACH;QACD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YACtC,MAAM,IAAI,GAAW,MAAM,CAAC,CAAC,CAAC,CAAC;YAC/B,MAAM,QAAQ,GAAW,WAAW,CAAC,CAAC,CAAC,CAAC;YACxC,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;SAC7B;KACF;IACD,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,SAAS,SAAS,CAAC,IAAY;IAC7B,OAAO,cAAc,CACnB,4BAAY,CAAC,KAAK,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,CAAC,EAAE,IAAI,CAAC,CAC3D,CAAC;AACJ,CAAC;AAED,SAAgB,eAAe,CAAC,IAAY;IAC1C,OAAO,4BAAY,CAAC,KAAK,EAAE,CAAC,WAAW,EAAE,MAAM,CAAC,EAAE,IAAI,CAAC,CAAC;AAC1D,CAAC;AAFD,0CAEC;AAED,SAAS,SAAS,CAAC,IAAY;IAI7B,MAAM,YAAY,GAAa,EAAE,CAAC;IAClC,MAAM,WAAW,GAAa,EAAE,CAAC;IACjC,cAAc,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,UAAkB,EAAE,QAAgB,EAAE,EAAE;QACpE,IAAI,UAAU,KAAK,GAAG,EAAE;YACtB,WAAW,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;SAC5B;aAAM;YACL,YAAY,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;SAC7B;IACH,CAAC,CAAC,CAAC;IAEH,MAAM,OAAO,GAAG,oBAAoB,CAAC,IAAI,EAAE,WAAW,EAAE,YAAY,CAAC,CAAC;IACtE,MAAM,MAAM,GAAG,kBAAkB,CAAC,OAAO,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;IAC7D,OAAO,EAAE,YAAY,EAAE,OAAO,CAAC,YAAY,EAAE,MAAM,EAAE,CAAC;AACxD,CAAC;AAED;;;;;;GAMG;AACH,SAAS,oBAAoB,CAC3B,IAAY,EACZ,KAAe,EACf,YAAsB;IAEtB,IAAI,WAAW,GAAG,EAAE,CAAC;IAErB,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;QAClB,IAAI;YACF,aAAQ,CAAC,WAAI,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;YACjC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;SACrB;QAAC,WAAM;YACN,MAAM,IAAI,KAAK,CACb,8CAA8C,CAAC,wFAAwF,CACxI,CAAC;SACH;IACH,CAAC,CAAC,CAAC;IAEH,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,CAAC;AACvC,CAAC;AAED;;;;;;;;;;GAUG;AACH,SAAgB,aAAa,CAAC,IAAY;IAIxC,MAAM,QAAQ,GAAG,IAAI,GAAG,EAAkB,CAAC;IAE3C,IAAI;QACF,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC;QACjD,MAAM,EAAE,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC;QAC3B,EAAE,CAAC,OAAO,CAAC,CAAC,IAAY,EAAE,QAAgB,EAAE,EAAE;YAC5C,IAAI,YAAY,CAAC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE;gBACzC,QAAQ,CAAC,GAAG,CAAC,GAAG,IAAI,IAAI,QAAQ,EAAE,EAAE,IAAI,CAAC,CAAC;aAC3C;QACH,CAAC,CAAC,CAAC;QACH,MAAM,CAAC,OAAO,CAAC,CAAC,IAAY,EAAE,QAAgB,EAAE,EAAE;YAChD,QAAQ,CAAC,GAAG,CAAC,GAAG,IAAI,IAAI,QAAQ,EAAE,EAAE,IAAI,CAAC,CAAC;QAC5C,CAAC,CAAC,CAAC;QACH,OAAO;YACL,QAAQ;YACR,yBAAyB,EAAE,MAAM;SAClC,CAAC;KACH;IAAC,OAAO,CAAC,EAAE;QACV,qDAAqD;QACrD,0BAA0B;QAC1B,IAAI,OAAO,CAAC,GAAG,CAAC,qBAAqB,EAAE;YACrC,OAAO,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC;YACjC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;SAClB;QACD,OAAO;YACL,QAAQ,EAAE,IAAI,GAAG,EAAkB;YACnC,yBAAyB,EAAE,IAAI,GAAG,EAAkB;SACrD,CAAC;KACH;AACH,CAAC;AAjCD,sCAiCC;AAED;;;;;;GAMG;AACH,SAAgB,oCAAoC,CAClD,IAAY;IAEZ,MAAM,EAAE,MAAM,EAAE,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC;IACnC,OAAO,MAAM,CAAC;AAChB,CAAC;AALD,oFAKC"}
+{"version":3,"file":"git-hasher.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/core/hasher/git-hasher.ts"],"names":[],"mappings":"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"}

package/src/core/project-graph/daemon/{server.d.ts → client/client.d.ts}

@@ -1,12 +1,7 @@
-/// <reference types="node" />
 import { ProjectGraph } from '@nrwl/devkit';
-import { Server } from 'net';
-interface StartServerOptions {
-    serverLogOutputFile?: string;
-}
-export declare function startServer({ serverLogOutputFile, }: StartServerOptions): Promise<Server>;
-export declare function stopServer(): Promise<void>;
-export declare function killSocketOrPath(): void;
+export declare function startInBackground(): Promise<void>;
+export declare function startInCurrentProcess(): void;
+export declare function stop(): void;
 /**
  * As noted in the comments above the createServer() call, in order to reliably (meaning it works
  * cross-platform) check whether or not the server is availabe to request a project graph from we
@@ -22,6 +17,8 @@ export declare function isServerAvailable(): Promise<boolean>;
  *
  * All logs are performed by the devkit logger because this logic does not
  * run "on the server" per se and therefore does not write to its log output.
+ *
+ * TODO: Gracefully handle a server shutdown (for whatever reason) while a client
+ * is connecting and querying it.
  */
 export declare function getProjectGraphFromServer(): Promise<ProjectGraph>;
-export {};

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

@@ -0,0 +1,181 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getProjectGraphFromServer = exports.isServerAvailable = exports.stop = exports.startInCurrentProcess = exports.startInBackground = 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 child_process_1 = require("child_process");
+const fs_extra_1 = require("fs-extra");
+const path_1 = require("path");
+const tmp_1 = require("tmp");
+const cache_1 = require("../cache");
+const net_1 = require("net");
+const socket_utils_1 = require("../socket-utils");
+const perf_hooks_1 = require("perf_hooks");
+const fs_1 = require("fs");
+function startInBackground() {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        /**
+         * For now, while the daemon is an opt-in feature, we will log to stdout when
+         * starting the server, as well as providing a reference to where any subsequent
+         * log files can be found.
+         */
+        const tmpDirPrefix = `nx-daemon--${devkit_1.normalizePath(app_root_1.appRootPath).replace(
+        // Replace the occurrences of / in the unix-style normalized path with a -
+        new RegExp(escapeRegExp('/'), 'g'), '-')}`;
+        const serverLogOutputDir = tmp_1.dirSync({
+            prefix: tmpDirPrefix,
+        }).name;
+        const serverLogOutputFile = path_1.join(serverLogOutputDir, 'nx-daemon.log');
+        fs_extra_1.ensureFileSync(serverLogOutputFile);
+        // Clean up any existing orphaned background process before creating a new one
+        const cachedDaemonJson = yield cache_1.readDaemonJsonCache();
+        if (cachedDaemonJson) {
+            if (cachedDaemonJson.backgroundProcessId) {
+                process.kill(cachedDaemonJson.backgroundProcessId);
+            }
+        }
+        devkit_1.logger.info(`NX Daemon Server - Starting in a background process...`);
+        devkit_1.logger.log(`  Logs from the Daemon process can be found here: ${serverLogOutputFile}\n`);
+        try {
+            const backgroundProcess = child_process_1.spawn(process.execPath, ['../server/start.js', serverLogOutputFile], {
+                cwd: __dirname,
+                stdio: 'ignore',
+                detached: true,
+            });
+            backgroundProcess.unref();
+            // Persist metadata about the background process so that it can be cleaned up later if needed
+            const daemonJson = {
+                backgroundProcessId: backgroundProcess.pid,
+                serverLogOutputFile: serverLogOutputFile,
+            };
+            yield cache_1.writeDaemonJsonCache(daemonJson);
+            /**
+             * Ensure the server is actually available to connect to via IPC before resolving
+             */
+            return new Promise((resolve) => {
+                const id = setInterval(() => tslib_1.__awaiter(this, void 0, void 0, function* () {
+                    if (yield isServerAvailable()) {
+                        clearInterval(id);
+                        resolve();
+                    }
+                }), 500);
+            });
+        }
+        catch (err) {
+            devkit_1.logger.error(err);
+            process.exit(1);
+        }
+    });
+}
+exports.startInBackground = startInBackground;
+function startInCurrentProcess() {
+    devkit_1.logger.info(`NX Daemon Server - Starting in the current process...`);
+    child_process_1.spawnSync(process.execPath, ['./start.js'], {
+        cwd: __dirname,
+        stdio: 'inherit',
+    });
+}
+exports.startInCurrentProcess = startInCurrentProcess;
+function stop() {
+    devkit_1.logger.info(`NX Daemon Server - Stopping...`);
+    child_process_1.spawnSync(process.execPath, ['../server/stop.js'], {
+        cwd: __dirname,
+        stdio: 'inherit',
+    });
+}
+exports.stop = stop;
+// https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Regular_Expressions#escaping
+function escapeRegExp(string) {
+    return string.replace(/[.*+?^${}()|[\]\\]/g, '\\$&'); // $& means the whole matched string
+}
+/**
+ * As noted in the comments above the createServer() call, in order to reliably (meaning it works
+ * cross-platform) check whether or not the server is availabe to request a project graph from we
+ * need to actually attempt connecting to it.
+ *
+ * Because of the behavior of named pipes on Windows, we cannot simply treat them as a file and
+ * check for their existence on disk (unlike with Unix Sockets).
+ */
+function isServerAvailable() {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        try {
+            const socket = net_1.connect(socket_utils_1.FULL_OS_SOCKET_PATH);
+            return new Promise((resolve) => {
+                socket.on('connect', () => {
+                    socket.destroy();
+                    resolve(true);
+                });
+                socket.on('error', () => {
+                    resolve(false);
+                });
+            });
+        }
+        catch (_a) {
+            return Promise.resolve(false);
+        }
+    });
+}
+exports.isServerAvailable = isServerAvailable;
+/**
+ * Establishes a client connection to the daemon server for use in project graph
+ * creation utilities.
+ *
+ * All logs are performed by the devkit logger because this logic does not
+ * run "on the server" per se and therefore does not write to its log output.
+ *
+ * TODO: Gracefully handle a server shutdown (for whatever reason) while a client
+ * is connecting and querying it.
+ */
+function getProjectGraphFromServer() {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        return new Promise((resolve, reject) => {
+            perf_hooks_1.performance.mark('getProjectGraphFromServer-start');
+            const socket = net_1.connect(socket_utils_1.FULL_OS_SOCKET_PATH);
+            socket.on('error', (err) => {
+                let errorMessage;
+                if (err.message.startsWith('connect ENOENT')) {
+                    errorMessage = 'Error: The Daemon Server is not running';
+                }
+                if (err.message.startsWith('connect ECONNREFUSED')) {
+                    // If somehow the file descriptor had not been released during a previous shut down.
+                    if (fs_1.existsSync(socket_utils_1.FULL_OS_SOCKET_PATH)) {
+                        errorMessage = `Error: A server instance had not been fully shut down. Please try running the command again.`;
+                        socket_utils_1.killSocketOrPath();
+                    }
+                }
+                devkit_1.logger.error(`NX Daemon Client - ${errorMessage || err}`);
+                return reject(new Error(errorMessage) || err);
+            });
+            /**
+             * Immediately after connecting to the server we send it the known project graph creation
+             * request payload. See the notes above createServer() for more context as to why we explicitly
+             * request the graph from the client like this.
+             */
+            socket.on('connect', () => {
+                socket.write('REQUEST_PROJECT_GRAPH_PAYLOAD');
+                let serializedProjectGraph = '';
+                socket.on('data', (data) => {
+                    serializedProjectGraph += data.toString();
+                });
+                socket.on('end', () => {
+                    try {
+                        perf_hooks_1.performance.mark('json-parse-start');
+                        const projectGraph = JSON.parse(serializedProjectGraph);
+                        perf_hooks_1.performance.mark('json-parse-end');
+                        perf_hooks_1.performance.measure('deserialize graph on the client', 'json-parse-start', 'json-parse-end');
+                        devkit_1.logger.info('NX Daemon Client - Resolved ProjectGraph');
+                        perf_hooks_1.performance.measure('total for getProjectGraphFromServer()', 'getProjectGraphFromServer-start', 'json-parse-end');
+                        return resolve(projectGraph);
+                    }
+                    catch (_a) {
+                        devkit_1.logger.error('NX Daemon Client - Error: Could not deserialize the ProjectGraph');
+                        return reject(new Error('Could not deserialize the ProjectGraph'));
+                    }
+                });
+            });
+        });
+    });
+}
+exports.getProjectGraphFromServer = getProjectGraphFromServer;
+//# sourceMappingURL=client.js.map

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

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

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

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

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

@@ -0,0 +1,284 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+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 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 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;
+}
+/**
+ * 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) => {
+    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`);
+        });
+        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.
+         */
+        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();
+        }
+        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();
+            }
+        }
+        /**
+         * 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, () => {
+            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.
+             */
+            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)`);
+        });
+    });
+});
+/**
+ * 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);
+    });
+}
+process
+    .on('SIGINT', handleServerProcessTermination)
+    .on('SIGTERM', handleServerProcessTermination)
+    .on('SIGHUP', handleServerProcessTermination);
+/**
+ * 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;
+    if (err || !changeEvents || !changeEvents.length) {
+        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.
+     */
+    try {
+        const filesToHash = [];
+        const deletedFiles = [];
+        for (const event of changeEvents) {
+            if (event.type === 'delete') {
+                deletedFiles.push(event.path);
+            }
+            else {
+                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();
+    }
+    catch (err) {
+        serverLog(`Unexpected Error`);
+        console.error(err);
+    }
+};
+function startServer({ serverLogOutputFile, }) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        _serverLogOutputFile = serverLogOutputFile;
+        // See notes above 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}`);
+                if (!watcherSubscription) {
+                    watcherSubscription = yield watcher_1.subscribeToWorkspaceChanges(handleWorkspaceChanges);
+                    watcherLog(`Subscribed to changes within: ${app_root_1.appRootPath}`);
+                }
+                return resolve(server);
+            }));
+        });
+    });
+}
+exports.startServer = startServer;
+function stopServer() {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        return new Promise((resolve, reject) => {
+            server.close((err) => {
+                if (err) {
+                    /**
+                     * If the server is running in a detached background process then server.close()
+                     * will throw this error even if server is actually alive. We therefore only reject
+                     * in case of any other unexpected errors.
+                     */
+                    if (!err.message.startsWith('Server is not running')) {
+                        return reject(err);
+                    }
+                }
+                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();
+            });
+        });
+    });
+}
+exports.stopServer = stopServer;
+//# sourceMappingURL=server.js.map