nx 22.3.3 → 22.4.0-beta.0

package/src/daemon/client/daemon-socket-messenger.js

@@ -1,14 +1,27 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DaemonSocketMessenger = void 0;
+exports.DaemonSocketMessenger = exports.VersionMismatchError = void 0;
 const perf_hooks_1 = require("perf_hooks");
 const consume_messages_from_socket_1 = require("../../utils/consume-messages-from-socket");
 const socket_utils_1 = require("../socket-utils");
+const logger_1 = require("../logger");
+class VersionMismatchError extends Error {
+    constructor() {
+        super('Version mismatch with daemon server');
+        this.name = 'VersionMismatchError';
+        Object.setPrototypeOf(this, VersionMismatchError.prototype);
+    }
+}
+exports.VersionMismatchError = VersionMismatchError;
 class DaemonSocketMessenger {
     constructor(socket) {
         this.socket = socket;
     }
-    async sendMessage(messageToDaemon, force) {
+    sendMessage(messageToDaemon, force) {
+        if (!this.socket) {
+            throw new Error('Socket not initialized.');
+        }
+        logger_1.clientLogger.log('[Messenger] Sending message type:', messageToDaemon.type);
         perf_hooks_1.performance.mark('daemon-message-serialization-start-' + messageToDaemon.type);
         const serialized = (0, socket_utils_1.serialize)(messageToDaemon, force);
         perf_hooks_1.performance.mark('daemon-message-serialization-end-' + messageToDaemon.type);
@@ -16,17 +29,26 @@ class DaemonSocketMessenger {
         this.socket.write(serialized);
         // send EOT to indicate that the message has been fully written
         this.socket.write(consume_messages_from_socket_1.MESSAGE_END_SEQ);
+        logger_1.clientLogger.log('[Messenger] Message sent');
     }
-    listen(onData, onClose = () => { }, onError = (err) => { }) {
+    listen(onData, onClose = () => { }, onError = () => { }) {
+        logger_1.clientLogger.log('[Messenger] Setting up socket listeners');
+        this.socket.on('close', onClose);
+        this.socket.on('error', (err) => {
+            logger_1.clientLogger.log('[Messenger] Socket error:', err.message);
+            onError(err);
+        });
         this.socket.on('data', (0, consume_messages_from_socket_1.consumeMessagesFromSocket)(async (message) => {
+            logger_1.clientLogger.log('[Messenger] Received message, length:', message.length);
             onData(message);
         }));
-        this.socket.on('close', onClose);
-        this.socket.on('error', onError);
+        logger_1.clientLogger.log('[Messenger] listen() complete');
         return this;
     }
     close() {
-        this.socket.destroy();
+        if (this.socket) {
+            this.socket.destroy();
+        }
     }
 }
 exports.DaemonSocketMessenger = DaemonSocketMessenger;

package/src/daemon/logger.d.ts

@@ -0,0 +1,26 @@
+/**
+ * Unified logger for daemon server and client.
+ *
+ * To improve the overall readability 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 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.
+ */
+type LogSource = 'Server' | 'Client';
+declare class DaemonLogger {
+    private source;
+    constructor(source: LogSource);
+    log(...s: unknown[]): void;
+    requestLog(...s: unknown[]): void;
+    watcherLog(...s: unknown[]): void;
+    private writeToFile;
+    private formatLogMessage;
+    private getNow;
+}
+export declare const serverLogger: DaemonLogger;
+export declare const clientLogger: DaemonLogger;
+export {};
+//# sourceMappingURL=logger.d.ts.map

package/src/daemon/logger.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../../../../../packages/nx/src/daemon/logger.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AASH,KAAK,SAAS,GAAG,QAAQ,GAAG,QAAQ,CAAC;AAErC,cAAM,YAAY;IACJ,OAAO,CAAC,MAAM;gBAAN,MAAM,EAAE,SAAS;IAErC,GAAG,CAAC,GAAG,CAAC,EAAE,OAAO,EAAE;IAqBnB,UAAU,CAAC,GAAG,CAAC,EAAE,OAAO,EAAE;IAI1B,UAAU,CAAC,GAAG,CAAC,EAAE,OAAO,EAAE;IAI1B,OAAO,CAAC,WAAW;IAWnB,OAAO,CAAC,gBAAgB;IAMxB,OAAO,CAAC,MAAM;CAGf;AAED,eAAO,MAAM,YAAY,cAA6B,CAAC;AACvD,eAAO,MAAM,YAAY,cAA6B,CAAC"}

package/src/daemon/logger.js

@@ -0,0 +1,65 @@
+"use strict";
+/**
+ * Unified logger for daemon server and client.
+ *
+ * To improve the overall readability 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 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.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.clientLogger = exports.serverLogger = void 0;
+const fs_1 = require("fs");
+const tmp_dir_1 = require("./tmp-dir");
+const versions_1 = require("../utils/versions");
+class DaemonLogger {
+    constructor(source) {
+        this.source = source;
+    }
+    log(...s) {
+        const message = this.formatLogMessage(s
+            .map((val) => {
+            if (typeof val === 'string') {
+                return val;
+            }
+            return JSON.stringify(val);
+        })
+            .join(' '));
+        if (this.source === 'Server') {
+            // Server's stdout is redirected to daemon.log
+            console.log(message);
+        }
+        else {
+            // Client writes directly to the log file
+            this.writeToFile(message);
+        }
+    }
+    requestLog(...s) {
+        this.log(`[REQUEST]: ${s.join(' ')}`);
+    }
+    watcherLog(...s) {
+        this.log(`[WATCHER]: ${s.join(' ')}`);
+    }
+    writeToFile(message) {
+        try {
+            if (!(0, fs_1.existsSync)(tmp_dir_1.DAEMON_DIR_FOR_CURRENT_WORKSPACE)) {
+                (0, fs_1.mkdirSync)(tmp_dir_1.DAEMON_DIR_FOR_CURRENT_WORKSPACE, { recursive: true });
+            }
+            (0, fs_1.appendFileSync)(tmp_dir_1.DAEMON_OUTPUT_LOG_FILE, message + '\n');
+        }
+        catch {
+            // Ignore write errors
+        }
+    }
+    formatLogMessage(message) {
+        return `[NX v${versions_1.nxVersion} Daemon ${this.source}] - ${this.getNow()} - ${message}`;
+    }
+    getNow() {
+        return new Date(Date.now()).toISOString();
+    }
+}
+exports.serverLogger = new DaemonLogger('Server');
+exports.clientLogger = new DaemonLogger('Client');

package/src/daemon/server/file-watching/file-change-events.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.registerFileChangeListener = registerFileChangeListener;
 exports.notifyFileChangeListeners = notifyFileChangeListeners;
-const logger_1 = require("../logger");
+const logger_1 = require("../../logger");
 const fileChangeListeners = new Set();
 function registerFileChangeListener(listener) {
     fileChangeListeners.add(listener);

package/src/daemon/server/handle-process-in-background.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.handleProcessInBackground = handleProcessInBackground;
-const logger_1 = require("./logger");
+const logger_1 = require("../logger");
 const installation_directory_1 = require("../../utils/installation-directory");
 async function handleProcessInBackground(payload) {
     let fn;

package/src/daemon/server/handle-request-project-graph.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.handleRequestProjectGraph = handleRequestProjectGraph;
 const perf_hooks_1 = require("perf_hooks");
 const socket_utils_1 = require("../socket-utils");
-const logger_1 = require("./logger");
+const logger_1 = require("../logger");
 const project_graph_incremental_recomputation_1 = require("./project-graph-incremental-recomputation");
 async function handleRequestProjectGraph() {
     try {

package/src/daemon/server/nx-console-operations.js

@@ -8,7 +8,7 @@ exports.handleNxConsolePreferenceAndInstallImpl = handleNxConsolePreferenceAndIn
 const devkit_internals_1 = require("../../devkit-internals");
 const os_1 = require("os");
 const native_1 = require("../../native");
-const logger_1 = require("./logger");
+const logger_1 = require("../logger");
 // Module-level state - persists across invocations within daemon lifecycle
 let latestNxTmpPath = null;
 let cleanupFn = null;

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

@@ -22,6 +22,6 @@ export declare let currentProjectFileMapCache: FileMapCache | undefined;
 export declare let currentProjectGraph: ProjectGraph | undefined;
 export declare function getCachedSerializedProjectGraphPromise(): Promise<SerializedProjectGraph>;
 export declare function addUpdatedAndDeletedFiles(createdFiles: string[], updatedFiles: string[], deletedFiles: string[]): void;
-export declare function registerProjectGraphRecomputationListener(listener: (projectGraph: ProjectGraph, sourceMaps: ConfigurationSourceMaps) => void): void;
+export declare function registerProjectGraphRecomputationListener(listener: (projectGraph: ProjectGraph, sourceMaps: ConfigurationSourceMaps, error: Error | null) => void): void;
 export {};
 //# sourceMappingURL=project-graph-incremental-recomputation.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"project-graph-incremental-recomputation.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/daemon/server/project-graph-incremental-recomputation.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,QAAQ,EACR,OAAO,EACP,YAAY,EAEb,MAAM,4BAA4B,CAAC;AAKpC,OAAO,EACL,YAAY,EAIb,MAAM,mCAAmC,CAAC;AAe3C,OAAO,EAAE,yBAAyB,EAAE,MAAM,cAAc,CAAC;AACzD,OAAO,EAEL,uBAAuB,EACxB,MAAM,uDAAuD,CAAC;AAS/D,UAAU,sBAAsB;IAC9B,KAAK,EAAE,KAAK,GAAG,IAAI,CAAC;IACpB,YAAY,EAAE,YAAY,GAAG,IAAI,CAAC;IAClC,mBAAmB,EAAE,YAAY,GAAG,IAAI,CAAC;IACzC,OAAO,EAAE,OAAO,GAAG,IAAI,CAAC;IACxB,iBAAiB,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC;IACrC,sBAAsB,EAAE,MAAM,GAAG,IAAI,CAAC;IACtC,oBAAoB,EAAE,MAAM,GAAG,IAAI,CAAC;IACpC,UAAU,EAAE,uBAAuB,GAAG,IAAI,CAAC;IAC3C,cAAc,EAAE,yBAAyB,GAAG,IAAI,CAAC;CAClD;AAGD,eAAO,IAAI,gBAAgB,EACvB;IACE,OAAO,EAAE,OAAO,CAAC;IACjB,iBAAiB,EAAE,QAAQ,EAAE,CAAC;IAC9B,cAAc,EAAE,yBAAyB,CAAC;CAC3C,GACD,SAAS,CAAC;AACd,eAAO,IAAI,0BAA0B,EAAE,YAAY,GAAG,SAAS,CAAC;AAChE,eAAO,IAAI,mBAAmB,EAAE,YAAY,GAAG,SAAS,CAAC;AAYzD,wBAAsB,sCAAsC,IAAI,OAAO,CAAC,sBAAsB,CAAC,CA+E9F;AAED,wBAAgB,yBAAyB,CACvC,YAAY,EAAE,MAAM,EAAE,EACtB,YAAY,EAAE,MAAM,EAAE,EACtB,YAAY,EAAE,MAAM,EAAE,QAgDvB;AAED,wBAAgB,yCAAyC,CACvD,QAAQ,EAAE,CACR,YAAY,EAAE,YAAY,EAC1B,UAAU,EAAE,uBAAuB,KAChC,IAAI,QAGV"}
+{"version":3,"file":"project-graph-incremental-recomputation.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/daemon/server/project-graph-incremental-recomputation.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,QAAQ,EACR,OAAO,EACP,YAAY,EAEb,MAAM,4BAA4B,CAAC;AAKpC,OAAO,EACL,YAAY,EAIb,MAAM,mCAAmC,CAAC;AAe3C,OAAO,EAAE,yBAAyB,EAAE,MAAM,cAAc,CAAC;AACzD,OAAO,EAEL,uBAAuB,EACxB,MAAM,uDAAuD,CAAC;AAS/D,UAAU,sBAAsB;IAC9B,KAAK,EAAE,KAAK,GAAG,IAAI,CAAC;IACpB,YAAY,EAAE,YAAY,GAAG,IAAI,CAAC;IAClC,mBAAmB,EAAE,YAAY,GAAG,IAAI,CAAC;IACzC,OAAO,EAAE,OAAO,GAAG,IAAI,CAAC;IACxB,iBAAiB,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC;IACrC,sBAAsB,EAAE,MAAM,GAAG,IAAI,CAAC;IACtC,oBAAoB,EAAE,MAAM,GAAG,IAAI,CAAC;IACpC,UAAU,EAAE,uBAAuB,GAAG,IAAI,CAAC;IAC3C,cAAc,EAAE,yBAAyB,GAAG,IAAI,CAAC;CAClD;AAGD,eAAO,IAAI,gBAAgB,EACvB;IACE,OAAO,EAAE,OAAO,CAAC;IACjB,iBAAiB,EAAE,QAAQ,EAAE,CAAC;IAC9B,cAAc,EAAE,yBAAyB,CAAC;CAC3C,GACD,SAAS,CAAC;AACd,eAAO,IAAI,0BAA0B,EAAE,YAAY,GAAG,SAAS,CAAC;AAChE,eAAO,IAAI,mBAAmB,EAAE,YAAY,GAAG,SAAS,CAAC;AAgBzD,wBAAsB,sCAAsC,IAAI,OAAO,CAAC,sBAAsB,CAAC,CAgF9F;AAED,wBAAgB,yBAAyB,CACvC,YAAY,EAAE,MAAM,EAAE,EACtB,YAAY,EAAE,MAAM,EAAE,EACtB,YAAY,EAAE,MAAM,EAAE,QAgDvB;AAED,wBAAgB,yCAAyC,CACvD,QAAQ,EAAE,CACR,YAAY,EAAE,YAAY,EAC1B,UAAU,EAAE,uBAAuB,EACnC,KAAK,EAAE,KAAK,GAAG,IAAI,KAChB,IAAI,QAGV"}

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

@@ -17,7 +17,7 @@ const workspace_root_1 = require("../../utils/workspace-root");
 const file_watcher_sockets_1 = require("./file-watching/file-watcher-sockets");
 const file_change_events_1 = require("./file-watching/file-change-events");
 const project_graph_listener_sockets_1 = require("./project-graph-listener-sockets");
-const logger_1 = require("./logger");
+const logger_1 = require("../logger");
 const error_types_1 = require("../../project-graph/error-types");
 const get_plugins_1 = require("../../project-graph/plugins/get-plugins");
 let cachedSerializedProjectGraphPromise;
@@ -58,7 +58,7 @@ async function getCachedSerializedProjectGraphPromise() {
         }
         const result = await cachedSerializedProjectGraphPromise;
         if (wasScheduled) {
-            notifyProjectGraphRecomputationListeners(result.projectGraph, result.sourceMaps);
+            notifyProjectGraphRecomputationListeners(result.projectGraph, result.sourceMaps, result.error);
         }
         const errors = result.error
             ? result.error instanceof error_types_1.DaemonProjectGraphError
@@ -119,11 +119,11 @@ function addUpdatedAndDeletedFiles(createdFiles, updatedFiles, deletedFiles) {
             }
             cachedSerializedProjectGraphPromise =
                 processFilesAndCreateAndSerializeProjectGraph(await (0, get_plugins_1.getPlugins)());
-            const { projectGraph, sourceMaps } = await cachedSerializedProjectGraphPromise;
+            const { projectGraph, sourceMaps, error } = await cachedSerializedProjectGraphPromise;
             if (createdFiles.length > 0) {
                 (0, file_watcher_sockets_1.notifyFileWatcherSockets)(createdFiles, null, null);
             }
-            notifyProjectGraphRecomputationListeners(projectGraph, sourceMaps);
+            notifyProjectGraphRecomputationListeners(projectGraph, sourceMaps, error);
         }, waitPeriod);
     }
 }
@@ -325,9 +325,9 @@ async function resetInternalStateIfNxDepsMissing() {
         await resetInternalState();
     }
 }
-function notifyProjectGraphRecomputationListeners(projectGraph, sourceMaps) {
+function notifyProjectGraphRecomputationListeners(projectGraph, sourceMaps, error) {
     for (const listener of projectGraphRecomputationListeners) {
-        listener(projectGraph, sourceMaps);
+        listener(projectGraph, sourceMaps, error);
     }
-    (0, project_graph_listener_sockets_1.notifyProjectGraphListenerSockets)(projectGraph, sourceMaps);
+    (0, project_graph_listener_sockets_1.notifyProjectGraphListenerSockets)(projectGraph, sourceMaps, error);
 }

package/src/daemon/server/project-graph-listener-sockets.d.ts

@@ -4,5 +4,5 @@ import { ConfigurationSourceMaps } from '../../project-graph/utils/project-confi
 export declare let registeredProjectGraphListenerSockets: Socket[];
 export declare function removeRegisteredProjectGraphListenerSocket(socket: Socket): void;
 export declare function hasRegisteredProjectGraphListenerSockets(): boolean;
-export declare function notifyProjectGraphListenerSockets(projectGraph: ProjectGraph, sourceMaps: ConfigurationSourceMaps): Promise<void>;
+export declare function notifyProjectGraphListenerSockets(projectGraph: ProjectGraph, sourceMaps: ConfigurationSourceMaps, error: Error | null): Promise<void>;
 //# sourceMappingURL=project-graph-listener-sockets.d.ts.map

package/src/daemon/server/project-graph-listener-sockets.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"project-graph-listener-sockets.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/daemon/server/project-graph-listener-sockets.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,KAAK,CAAC;AAC7B,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC1D,OAAO,EAAE,uBAAuB,EAAE,MAAM,uDAAuD,CAAC;AAIhG,eAAO,IAAI,qCAAqC,EAAE,MAAM,EAAO,CAAC;AAEhE,wBAAgB,0CAA0C,CAAC,MAAM,EAAE,MAAM,QAGxE;AAED,wBAAgB,wCAAwC,YAEvD;AAED,wBAAsB,iCAAiC,CACrD,YAAY,EAAE,YAAY,EAC1B,UAAU,EAAE,uBAAuB,iBAoBpC"}
+{"version":3,"file":"project-graph-listener-sockets.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/daemon/server/project-graph-listener-sockets.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,KAAK,CAAC;AAC7B,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC1D,OAAO,EAAE,uBAAuB,EAAE,MAAM,uDAAuD,CAAC;AAIhG,eAAO,IAAI,qCAAqC,EAAE,MAAM,EAAO,CAAC;AAEhE,wBAAgB,0CAA0C,CAAC,MAAM,EAAE,MAAM,QAGxE;AAED,wBAAgB,wCAAwC,YAEvD;AAED,wBAAsB,iCAAiC,CACrD,YAAY,EAAE,YAAY,EAC1B,UAAU,EAAE,uBAAuB,EACnC,KAAK,EAAE,KAAK,GAAG,IAAI,iBAoBpB"}

package/src/daemon/server/project-graph-listener-sockets.js

@@ -14,12 +14,12 @@ function removeRegisteredProjectGraphListenerSocket(socket) {
 function hasRegisteredProjectGraphListenerSockets() {
     return exports.registeredProjectGraphListenerSockets.length > 0;
 }
-async function notifyProjectGraphListenerSockets(projectGraph, sourceMaps) {
+async function notifyProjectGraphListenerSockets(projectGraph, sourceMaps, error) {
     if (!hasRegisteredProjectGraphListenerSockets()) {
         return;
     }
     await Promise.all(exports.registeredProjectGraphListenerSockets.map((socket) => (0, server_1.handleResult)(socket, 'PROJECT_GRAPH_UPDATED', () => Promise.resolve({
         description: 'Project graph updated',
-        response: { projectGraph, sourceMaps },
+        response: { projectGraph, sourceMaps, error },
     }), (0, is_v8_serializer_enabled_1.isV8SerializerEnabled)() ? 'v8' : 'json')));
 }

package/src/daemon/server/server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/daemon/server/server.ts"],"names":[],"mappings":"AACA,OAAO,EAAgB,MAAM,EAAE,MAAM,EAAE,MAAM,KAAK,CAAC;AAmKnD,MAAM,MAAM,aAAa,GAAG;IAC1B,WAAW,EAAE,MAAM,CAAC;IACpB,KAAK,CAAC,EAAE,GAAG,CAAC;IACZ,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC;CACtC,CAAC;AAGF,eAAO,MAAM,WAAW,EAAE,GAAG,CAAC,MAAM,CAAa,CAAC;AA8RlD,wBAAsB,YAAY,CAChC,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,OAAO,CAAC,aAAa,CAAC,EAClC,IAAI,EAAE,MAAM,GAAG,IAAI,iBA6BpB;AAoLD,wBAAsB,WAAW,IAAI,OAAO,CAAC,MAAM,CAAC,CA2EnD"}
+{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/daemon/server/server.ts"],"names":[],"mappings":"AACA,OAAO,EAAgB,MAAM,EAAE,MAAM,EAAE,MAAM,KAAK,CAAC;AAwKnD,MAAM,MAAM,aAAa,GAAG;IAC1B,WAAW,EAAE,MAAM,CAAC;IACpB,KAAK,CAAC,EAAE,GAAG,CAAC;IACZ,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC;CACtC,CAAC;AAGF,eAAO,MAAM,WAAW,EAAE,GAAG,CAAC,MAAM,CAAa,CAAC;AAsRlD,wBAAsB,YAAY,CAChC,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,OAAO,CAAC,aAAa,CAAC,EAClC,IAAI,EAAE,MAAM,GAAG,IAAI,iBA6BpB;AA+KD,wBAAsB,WAAW,IAAI,OAAO,CAAC,MAAM,CAAC,CA2GnD"}

package/src/daemon/server/server.js

@@ -23,7 +23,7 @@ const handle_outputs_tracking_1 = require("./handle-outputs-tracking");
 const handle_process_in_background_1 = require("./handle-process-in-background");
 const handle_request_project_graph_1 = require("./handle-request-project-graph");
 const handle_request_shutdown_1 = require("./handle-request-shutdown");
-const logger_1 = require("./logger");
+const logger_1 = require("../logger");
 const outputs_tracking_1 = require("./outputs-tracking");
 const project_graph_incremental_recomputation_1 = require("./project-graph-incremental-recomputation");
 const shutdown_utils_1 = require("./shutdown-utils");
@@ -96,10 +96,6 @@ async function handleMessage(socket, data) {
     if (workspaceWatcherError) {
         await (0, shutdown_utils_1.respondWithErrorAndExit)(socket, `File watcher error in the workspace '${workspace_root_1.workspaceRoot}'.`, workspaceWatcherError);
     }
-    const outdated = daemonIsOutdated();
-    if (outdated) {
-        await (0, shutdown_utils_1.respondWithErrorAndExit)(socket, `Daemon outdated`, new Error(outdated));
-    }
     (0, shutdown_utils_1.resetInactivityTimeout)(handleInactivityTimeout);
     const unparsedPayload = data;
     let payload;
@@ -275,17 +271,18 @@ function daemonIsOutdated() {
     return null;
 }
 function lockFileHashChanged() {
-    const lockHashes = [
+    const lockFiles = [
         (0, path_1.join)(workspace_root_1.workspaceRoot, 'package-lock.json'),
         (0, path_1.join)(workspace_root_1.workspaceRoot, 'yarn.lock'),
         (0, path_1.join)(workspace_root_1.workspaceRoot, 'pnpm-lock.yaml'),
         (0, path_1.join)(workspace_root_1.workspaceRoot, 'bun.lockb'),
         (0, path_1.join)(workspace_root_1.workspaceRoot, 'bun.lock'),
-    ]
-        .filter((file) => (0, fs_1.existsSync)(file))
-        .map((file) => (0, native_1.hashFile)(file));
+    ];
+    const existingFiles = lockFiles.filter((file) => (0, fs_1.existsSync)(file));
+    const lockHashes = existingFiles.map((file) => (0, native_1.hashFile)(file));
     const newHash = (0, file_hasher_1.hashArray)(lockHashes);
     if (existingLockHash && newHash != existingLockHash) {
+        logger_1.serverLogger.log(`[Server] lock file hash changed! old=${existingLockHash}, new=${newHash}`);
         existingLockHash = newHash;
         return true;
     }
@@ -306,15 +303,6 @@ const handleWorkspaceChanges = async (err, changeEvents) => {
     }
     try {
         (0, shutdown_utils_1.resetInactivityTimeout)(handleInactivityTimeout);
-        const outdatedReason = daemonIsOutdated();
-        if (outdatedReason) {
-            await (0, shutdown_utils_1.handleServerProcessTermination)({
-                server,
-                reason: outdatedReason,
-                sockets: exports.openSockets,
-            });
-            return;
-        }
         if (err) {
             let error = typeof err === 'string' ? new Error(err) : err;
             logger_1.serverLogger.watcherLog('Unexpected workspace watcher error', error.message);
@@ -381,6 +369,11 @@ const handleOutputsChanges = async (err, changeEvents) => {
 async function startServer() {
     (0, workspace_context_1.setupWorkspaceContext)(workspace_root_1.workspaceRoot);
     const socketPath = (0, socket_utils_1.getFullOsSocketPath)();
+    // Log daemon startup information for debugging
+    logger_1.serverLogger.log(`New daemon starting from: ${__filename}`);
+    logger_1.serverLogger.log(`New daemon __dirname: ${__dirname}`);
+    logger_1.serverLogger.log(`New daemon nxVersion: ${versions_1.nxVersion}`);
+    logger_1.serverLogger.log(`New daemon getInstalledNxVersion(): ${(0, is_nx_version_mismatch_1.getInstalledNxVersion)()}`);
     // Persist metadata about the background process so that it can be cleaned up later if needed
     await (0, cache_1.writeDaemonJsonProcessCache)({
         processId: process.pid,
@@ -391,6 +384,7 @@ async function startServer() {
     if (!socket_utils_1.isWindows) {
         (0, socket_utils_1.killSocketOrPath)();
     }
+    logger_1.serverLogger.log(`[Server] Starting outdated check interval (20ms)`);
     setInterval(() => {
         if ((0, cache_1.getDaemonProcessIdSync)() !== process.pid) {
             return (0, shutdown_utils_1.handleServerProcessTermination)({
@@ -399,6 +393,28 @@ async function startServer() {
                 sockets: exports.openSockets,
             });
         }
+        const outdated = daemonIsOutdated();
+        if (outdated) {
+            logger_1.serverLogger.log(`[Server] Daemon outdated: ${outdated}`);
+            if (outdated === 'LOCK_FILES_CHANGED') {
+                // Lock file changes - restart daemon, clients will reconnect
+                logger_1.serverLogger.log('[Server] Restarting daemon...');
+                (0, shutdown_utils_1.handleServerProcessTerminationWithRestart)({
+                    server,
+                    reason: outdated,
+                    sockets: exports.openSockets,
+                });
+            }
+            else {
+                // Version changes or other reasons - just shut down, don't restart
+                logger_1.serverLogger.log('[Server] Shutting down daemon (no restart)...');
+                (0, shutdown_utils_1.handleServerProcessTermination)({
+                    server,
+                    reason: outdated,
+                    sockets: exports.openSockets,
+                });
+            }
+        }
     }, 20).unref();
     return new Promise(async (resolve, reject) => {
         try {

package/src/daemon/server/shutdown-utils.d.ts

@@ -11,6 +11,7 @@ interface HandleServerProcessTerminationParams {
     sockets: Iterable<Socket>;
 }
 export declare function handleServerProcessTermination({ server, reason, sockets, }: HandleServerProcessTerminationParams): Promise<void>;
+export declare function handleServerProcessTerminationWithRestart({ server, reason, sockets, }: HandleServerProcessTerminationParams): Promise<void>;
 export declare function resetInactivityTimeout(cb: () => void): void;
 export declare function respondToClient(socket: Socket, response: string, description: string): Promise<unknown>;
 export declare function respondWithErrorAndExit(socket: Socket, description: string, error: Error): Promise<void>;

package/src/daemon/server/shutdown-utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"shutdown-utils.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/daemon/server/shutdown-utils.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,KAAK,CAAC;AAI1C,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAU5C,eAAO,MAAM,4BAA4B,EAAG,QAAiB,CAAC;AAI9D,wBAAgB,oBAAoB,CAAC,QAAQ,EAAE,OAAO,QAErD;AAED,wBAAgB,kBAAkB,YAEjC;AAID,wBAAgB,0BAA0B,CAAC,QAAQ,EAAE,OAAO,QAE3D;AAED,wBAAgB,wBAAwB,YAEvC;AAED,UAAU,oCAAoC;IAC5C,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC;CAC3B;AAED,wBAAsB,8BAA8B,CAAC,EACnD,MAAM,EACN,MAAM,EACN,OAAO,GACR,EAAE,oCAAoC,iBAsCtC;AAID,wBAAgB,sBAAsB,CAAC,EAAE,EAAE,MAAM,IAAI,GAAG,IAAI,CAK3D;AAED,wBAAgB,eAAe,CAC7B,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,EAChB,WAAW,EAAE,MAAM,oBAcpB;AAED,wBAAsB,uBAAuB,CAC3C,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,MAAM,EACnB,KAAK,EAAE,KAAK,iBAsBb"}
+{"version":3,"file":"shutdown-utils.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/daemon/server/shutdown-utils.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,KAAK,CAAC;AAI1C,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAkB5C,eAAO,MAAM,4BAA4B,EAAG,QAAiB,CAAC;AA6C9D,wBAAgB,oBAAoB,CAAC,QAAQ,EAAE,OAAO,QAErD;AAED,wBAAgB,kBAAkB,YAEjC;AAID,wBAAgB,0BAA0B,CAAC,QAAQ,EAAE,OAAO,QAE3D;AAED,wBAAgB,wBAAwB,YAEvC;AAED,UAAU,oCAAoC;IAC5C,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC;CAC3B;AAED,wBAAsB,8BAA8B,CAAC,EACnD,MAAM,EACN,MAAM,EACN,OAAO,GACR,EAAE,oCAAoC,iBAEtC;AAED,wBAAsB,yCAAyC,CAAC,EAC9D,MAAM,EACN,MAAM,EACN,OAAO,GACR,EAAE,oCAAoC,iBAMtC;AAgDD,wBAAgB,sBAAsB,CAAC,EAAE,EAAE,MAAM,IAAI,GAAG,IAAI,CAK3D;AAED,wBAAgB,eAAe,CAC7B,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,EAChB,WAAW,EAAE,MAAM,oBAcpB;AAED,wBAAsB,uBAAuB,CAC3C,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,MAAM,EACnB,KAAK,EAAE,KAAK,iBAsBb"}

package/src/daemon/server/shutdown-utils.js

@@ -6,11 +6,12 @@ exports.getWatcherInstance = getWatcherInstance;
 exports.storeOutputWatcherInstance = storeOutputWatcherInstance;
 exports.getOutputWatcherInstance = getOutputWatcherInstance;
 exports.handleServerProcessTermination = handleServerProcessTermination;
+exports.handleServerProcessTerminationWithRestart = handleServerProcessTerminationWithRestart;
 exports.resetInactivityTimeout = resetInactivityTimeout;
 exports.respondToClient = respondToClient;
 exports.respondWithErrorAndExit = respondWithErrorAndExit;
 const workspace_root_1 = require("../../utils/workspace-root");
-const logger_1 = require("./logger");
+const logger_1 = require("../logger");
 const socket_utils_1 = require("../socket-utils");
 const cache_1 = require("../cache");
 const error_types_1 = require("../../project-graph/error-types");
@@ -18,7 +19,47 @@ const db_connection_1 = require("../../utils/db-connection");
 const get_plugins_1 = require("../../project-graph/plugins/get-plugins");
 const consume_messages_from_socket_1 = require("../../utils/consume-messages-from-socket");
 const nx_console_operations_1 = require("./nx-console-operations");
+const child_process_1 = require("child_process");
+const path_1 = require("path");
+const node_fs_1 = require("node:fs");
+const promises_1 = require("fs/promises");
+const tmp_dir_1 = require("../tmp-dir");
 exports.SERVER_INACTIVITY_TIMEOUT_MS = 10800000; // 10800000 ms = 3 hours
+async function startNewDaemonInBackground() {
+    (0, node_fs_1.mkdirSync)(tmp_dir_1.DAEMON_DIR_FOR_CURRENT_WORKSPACE, { recursive: true });
+    if (!(0, node_fs_1.existsSync)(tmp_dir_1.DAEMON_OUTPUT_LOG_FILE)) {
+        (0, node_fs_1.writeFileSync)(tmp_dir_1.DAEMON_OUTPUT_LOG_FILE, '');
+    }
+    const out = await (0, promises_1.open)(tmp_dir_1.DAEMON_OUTPUT_LOG_FILE, 'a');
+    const err = await (0, promises_1.open)(tmp_dir_1.DAEMON_OUTPUT_LOG_FILE, 'a');
+    // Use require.resolve to find the currently installed version's start.js
+    // instead of using __dirname which points to the old running daemon's path
+    // Resolve from workspace root to pick up the correct symlink target
+    let startScriptPath;
+    try {
+        startScriptPath = require.resolve('nx/src/daemon/server/start.js', {
+            paths: [workspace_root_1.workspaceRoot],
+        });
+    }
+    catch (e) {
+        // Fall back to using __dirname if resolution fails
+        logger_1.serverLogger.log(`Failed to resolve nx package, falling back to __dirname: ${e.message}`);
+        startScriptPath = (0, path_1.join)(__dirname, '../server/start.js');
+    }
+    logger_1.serverLogger.log(`Restarting daemon with script: ${startScriptPath}`);
+    logger_1.serverLogger.log(`Old daemon __dirname: ${__dirname}`);
+    logger_1.serverLogger.log(`Current process.execPath: ${process.execPath}`);
+    const backgroundProcess = (0, child_process_1.spawn)(process.execPath, [startScriptPath], {
+        cwd: workspace_root_1.workspaceRoot,
+        stdio: ['ignore', out.fd, err.fd],
+        detached: true,
+        windowsHide: false,
+        shell: false,
+        env: process.env,
+    });
+    backgroundProcess.unref();
+    logger_1.serverLogger.log('Started new daemon process in background');
+}
 let watcherInstance;
 function storeWatcherInstance(instance) {
     watcherInstance = instance;
@@ -34,6 +75,16 @@ function getOutputWatcherInstance() {
     return outputWatcherInstance;
 }
 async function handleServerProcessTermination({ server, reason, sockets, }) {
+    await performShutdown(server, reason, sockets);
+}
+async function handleServerProcessTerminationWithRestart({ server, reason, sockets, }) {
+    // Clean up old daemon cache before starting new instance
+    (0, cache_1.deleteDaemonJsonProcessCache)();
+    // Start new daemon before shutting down
+    await startNewDaemonInBackground();
+    await performShutdown(server, reason, sockets);
+}
+async function performShutdown(server, reason, sockets) {
     try {
         await new Promise((res) => {
             server.close(() => {

package/src/daemon/server/sync-generators.js

@@ -12,7 +12,7 @@ const file_hasher_1 = require("../../hasher/file-hasher");
 const project_graph_1 = require("../../project-graph/project-graph");
 const sync_generators_1 = require("../../utils/sync-generators");
 const workspace_root_1 = require("../../utils/workspace-root");
-const logger_1 = require("./logger");
+const logger_1 = require("../logger");
 const project_graph_incremental_recomputation_1 = require("./project-graph-incremental-recomputation");
 const syncGeneratorsCacheResultPromises = new Map();
 let registeredTaskSyncGenerators = new Set();

package/src/project-graph/nx-deps-cache.js

@@ -17,7 +17,7 @@ const fileutils_1 = require("../utils/fileutils");
 const versions_1 = require("../utils/versions");
 const error_types_1 = require("./error-types");
 const is_on_daemon_1 = require("../daemon/is-on-daemon");
-const logger_1 = require("../daemon/server/logger");
+const logger_1 = require("../daemon/logger");
 exports.nxProjectGraph = (0, path_1.join)(cache_directory_1.workspaceDataDirectory, 'project-graph.json');
 exports.nxFileMap = (0, path_1.join)(cache_directory_1.workspaceDataDirectory, 'file-map.json');
 exports.nxSourceMaps = (0, path_1.join)(cache_directory_1.workspaceDataDirectory, 'source-maps.json');

package/src/daemon/server/logger.d.ts

@@ -1,19 +0,0 @@
-/**
- * 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.
- */
-declare class ServerLogger {
-    log(...s: unknown[]): void;
-    requestLog(...s: unknown[]): void;
-    watcherLog(...s: unknown[]): void;
-    private formatLogMessage;
-    private getNow;
-}
-export declare const serverLogger: ServerLogger;
-export {};
-//# sourceMappingURL=logger.d.ts.map

package/src/daemon/server/logger.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/daemon/server/logger.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAIH,cAAM,YAAY;IAChB,GAAG,CAAC,GAAG,CAAC,EAAE,OAAO,EAAE;IAenB,UAAU,CAAC,GAAG,CAAC,EAAE,OAAO,EAAE;IAI1B,UAAU,CAAC,GAAG,CAAC,EAAE,OAAO,EAAE;IAI1B,OAAO,CAAC,gBAAgB;IAIxB,OAAO,CAAC,MAAM;CAGf;AAED,eAAO,MAAM,YAAY,cAAqB,CAAC"}

package/src/daemon/server/logger.js

@@ -1,38 +0,0 @@
-"use strict";
-/**
- * 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.
- */
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.serverLogger = void 0;
-const versions_1 = require("../../utils/versions");
-class ServerLogger {
-    log(...s) {
-        console.log(this.formatLogMessage(`${s
-            .map((val) => {
-            if (typeof val === 'string') {
-                return val;
-            }
-            return JSON.stringify(val);
-        })
-            .join(' ')}`));
-    }
-    requestLog(...s) {
-        this.log(`[REQUEST]: ${s.join(' ')}`);
-    }
-    watcherLog(...s) {
-        this.log(`[WATCHER]: ${s.join(' ')}`);
-    }
-    formatLogMessage(message) {
-        return `[NX v${versions_1.nxVersion} Daemon Server] - ${this.getNow()} - ${message}`;
-    }
-    getNow() {
-        return new Date(Date.now()).toISOString();
-    }
-}
-exports.serverLogger = new ServerLogger();