restart daemon watcher from button

Author: MaxKless

apps/nxls/src/requests.ts

@@ -19,6 +19,7 @@ import {
   NxProjectGraphOutputRequest,
   NxRecentCIPEDataRequest,
   NxSourceMapFilesToProjectsMapRequest,
+  NxStartDaemonRequest,
   NxStartupMessageRequest,
   NxStopDaemonRequest,
   NxTargetsForConfigFileRequest,
@@ -43,6 +44,7 @@ import {
   getTargetsForConfigFile,
   getTransformedGeneratorSchema,
   hasAffectedProjects,
+  nxStartDaemon,
   nxStopDaemon,
   parseTargetString,
 } from '@nx-console/language-server-workspace';
@@ -76,6 +78,18 @@ export function registerRequests(
     return await nxStopDaemon(WORKING_PATH, lspLogger);
   });
 
+  connection.onRequest(NxStartDaemonRequest, async () => {
+    const WORKING_PATH = getWorkingPath();
+    if (!WORKING_PATH) {
+      return new ResponseError(
+        1000,
+        'Unable to get Nx info: no workspace path',
+      );
+    }
+
+    return await nxStartDaemon(WORKING_PATH, lspLogger);
+  });
+
   connection.onRequest(NxWorkspaceSerializedRequest, async ({ reset }) => {
     const WORKING_PATH = getWorkingPath();
     if (!WORKING_PATH) {

apps/vscode/package.json

@@ -221,6 +221,11 @@
           "command": "nxConsole.showProblems",
           "when": "view == nxProjects && viewItem == projectGraphError",
           "group": "inline@1"
+        },
+        {
+          "command": "nxConsole.restartDaemonWatcher",
+          "when": "view == nxProjects && (viewItem == daemonDisabled || viewItem == daemonWatcherNotRunning)",
+          "group": "inline@1"
         }
       ],
       "editor/title": [
@@ -945,6 +950,12 @@
         "command": "nxConsole.showProblems",
         "icon": "$(eye)"
       },
+      {
+        "category": "Nx",
+        "title": "Restart Daemon Watcher",
+        "command": "nxConsole.restartDaemonWatcher",
+        "icon": "$(refresh)"
+      },
       {
         "category": "Nx Migrate",
         "title": "Refresh View",

libs/language-server/types/src/index.ts

@@ -41,6 +41,9 @@ export const NxWatcherOperationalNotification: NotificationType<{
 export const NxStopDaemonRequest: RequestType<undefined, undefined, unknown> =
   new RequestType('nx/stopDaemon');
 
+export const NxStartDaemonRequest: RequestType<undefined, undefined, unknown> =
+  new RequestType('nx/startDaemon');
+
 export const NxWorkspaceRequest: RequestType<
   { reset: boolean },
   NxWorkspace,

libs/language-server/workspace/src/index.ts

@@ -8,7 +8,7 @@ export * from './lib/get-project-folder-tree';
 export * from './lib/nx-console-plugins';
 export * from './lib/has-affected-projects';
 export * from './lib/get-source-map';
-export * from './lib/nx-stop-daemon';
+export * from './lib/nx-daemon';
 export * from './lib/get-nx-cloud-status';
 export * from './lib/get-cloud-onboarding-info';
 export * from './lib/get-pdv-data';

libs/language-server/workspace/src/lib/nx-daemon.ts

@@ -0,0 +1,30 @@
+import { Logger } from '@nx-console/shared-utils';
+import { getPackageManagerCommand } from '@nx-console/shared-npm';
+import { execSync } from 'node:child_process';
+
+export async function nxStopDaemon(workspacePath: string, logger: Logger) {
+  const packageManagerCommands = await getPackageManagerCommand(
+    workspacePath,
+    logger,
+  );
+  const command = `${packageManagerCommands.exec} nx daemon --stop`;
+  logger.log(`stopping daemon with ${command}`);
+  execSync(command, {
+    cwd: workspacePath,
+    windowsHide: true,
+  });
+}
+
+export async function nxStartDaemon(workspacePath: string, logger: Logger) {
+  const packageManagerCommands = await getPackageManagerCommand(
+    workspacePath,
+    logger,
+  );
+  const command = `${packageManagerCommands.exec} nx daemon --start`;
+  logger.log(`starting daemon with ${command}`);
+
+  execSync(command, {
+    cwd: workspacePath,
+    windowsHide: true,
+  });
+}

libs/language-server/workspace/src/lib/nx-stop-daemon.ts

@@ -19,6 +19,7 @@ export type TelemetryEvents =
   | 'misc.open-project-details-codelens'
   | 'misc.exception'
   | 'misc.nx-latest-no-provenance'
+  | 'misc.restart-daemon-watcher'
   // migrate
   | 'migrate.open'
   | 'migrate.start'

libs/shared/telemetry/src/lib/telemetry-types.ts

@@ -1,4 +1,8 @@
-import { showRefreshLoadingAtLocation } from '@nx-console/vscode-lsp-client';
+import {
+  getNxlsClient,
+  NxlsClient,
+  showRefreshLoadingAtLocation,
+} from '@nx-console/vscode-lsp-client';
 import { selectProject } from '@nx-console/vscode-nx-cli-quickpicks';
 import { revealNxProject } from '@nx-console/vscode-nx-config-decoration';
 import { getNxWorkspaceProjects } from '@nx-console/vscode-nx-workspace';
@@ -8,6 +12,14 @@ import { AtomizerDecorationProvider } from './atomizer-decorations';
 import { NxProjectTreeProvider } from './nx-project-tree-provider';
 import { NxTreeItem } from './nx-tree-item';
 import { ProjectGraphErrorDecorationProvider } from './project-graph-error-decorations';
+import {
+  NxStartDaemonRequest,
+  NxWorkspaceRefreshNotification,
+} from '@nx-console/language-server-types';
+import {
+  logAndShowError,
+  showErrorMessageWithOpenLogs,
+} from '@nx-console/vscode-output-channels';
 
 export function initNxProjectView(
   context: ExtensionContext,
@@ -19,10 +31,14 @@ export function initNxProjectView(
   });
 
   context.subscriptions.push(nxProjectTreeView);
-
-  commands.registerCommand(
-    'nxConsole.showProjectConfiguration',
-    showProjectConfiguration,
+  context.subscriptions.push(
+    commands.registerCommand(
+      'nxConsole.showProjectConfiguration',
+      showProjectConfiguration,
+    ),
+    commands.registerCommand('nxConsole.restartDaemonWatcher', async () => {
+      await tryRestartDaemonWatcher();
+    }),
   );
 
   AtomizerDecorationProvider.register(context);
@@ -66,3 +82,17 @@ export async function showProjectConfiguration(selection: NxTreeItem) {
   const target = viewItem.nxTarget;
   return revealNxProject(project, root, target);
 }
+
+async function tryRestartDaemonWatcher() {
+  getTelemetry().logUsage('misc.restart-daemon-watcher');
+
+  const nxlsClient = getNxlsClient();
+  try {
+    await nxlsClient.sendRequest(NxStartDaemonRequest, undefined);
+  } catch (e) {
+    showErrorMessageWithOpenLogs('Failed to start Nx daemon watcher');
+    return;
+  }
+
+  await nxlsClient.sendNotification(NxWorkspaceRefreshNotification);
+}

libs/vscode/nx-project-view/src/lib/init-nx-project-view.ts

@@ -60,7 +60,10 @@ export class NxTreeItem extends TreeItem {
       return;
     }
 
-    if (this.contextValue === 'daemonDisabled') {
+    if (
+      this.contextValue === 'daemonDisabled' ||
+      this.contextValue === 'daemonWatcherNotRunning'
+    ) {
       this.iconPath = new ThemeIcon('warning');
       return;
     }

libs/vscode/nx-project-view/src/lib/nx-tree-item.ts

@@ -259,7 +259,7 @@ export abstract class BaseView {
     return {
       id: 'daemonDisabled',
       contextValue: 'daemonDisabled',
-      label: `Nx Daemon is Disabled`,
+      label: `Nx Daemon is disabled`,
       collapsible: TreeItemCollapsibleState.None,
     };
   }
@@ -268,7 +268,7 @@ export abstract class BaseView {
     return {
       id: 'daemonWatcherNotRunning',
       contextValue: 'daemonWatcherNotRunning',
-      label: `Nx Daemon is Not Running`,
+      label: `Nx daemon watcher is not running`,
       collapsible: TreeItemCollapsibleState.None,
     };
   }