From 5e35930acb843340a3410b995fe4d65cc27ebea1 Mon Sep 17 00:00:00 2001
From: Jonah Bedouch <jonahbedouch@gmail.com>
Date: Sat, 5 Aug 2023 22:27:06 -0700
Subject: [PATCH] Check to see if a Viewer is running and skip the build check
 (#74)

* Add a check to see if a Viser viewer is already running on your machine. If so, skip building on start.

* Swap build dir check and process check

If no dir exists at all, the program will crash since it still tries to host one
---
 pyproject.toml              |  1 +
 viser/_client_autobuild.py  | 25 ++++++++++++++++++++++---
 viser/client/vite.config.ts |  2 ++
 3 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index f524e1a10..ddb587f60 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -32,6 +32,7 @@ dependencies = [
     "rich>=13.3.3",
     "trimesh>=3.21.7",
     "nodeenv>=1.8.0",
+    "psutil>=5.9.5",
 ]
 
 [project.optional-dependencies]
diff --git a/viser/_client_autobuild.py b/viser/_client_autobuild.py
index 7e0f82d55..27c02feae 100644
--- a/viser/_client_autobuild.py
+++ b/viser/_client_autobuild.py
@@ -1,11 +1,23 @@
 import subprocess
 import sys
+import psutil
+import rich
 from pathlib import Path
 
 client_dir = Path(__file__).absolute().parent / "client"
 build_dir = client_dir / "build"
 
 
+def _check_process(process_name: str) -> bool:
+    """
+    Check if a process is running
+    """
+    for process in psutil.process_iter():
+        if process_name == process.name():
+            return True
+    return False
+
+
 def ensure_client_is_built() -> None:
     """Ensure that the client is built."""
 
@@ -19,12 +31,19 @@ def ensure_client_is_built() -> None:
     # Do we need to re-trigger a build?
     build = False
     if not (build_dir / "index.html").exists():
-        print("[viser] No client build found. Building now...")
+        rich.print("[bold](viser)[/bold] No client build found. Building now...")
         build = True
+    elif _check_process("Viser Viewer"):
+        rich.print(
+            "[bold](viser)[/bold] A Viser viewer is already running. Skipping build check..."
+        )
+        build = False
     elif _modified_time_recursive(client_dir / "src") > _modified_time_recursive(
         build_dir
     ):
-        print("[viser] Client build looks out of date. Building now...")
+        rich.print(
+            "[bold](viser)[/bold] Client build looks out of date. Building now..."
+        )
         build = True
 
     # Install nodejs and build if necessary. We assume bash is installed.
@@ -49,7 +68,7 @@ def _install_sandboxed_node() -> Path:
     environment root."""
     env_dir = client_dir / ".nodeenv"
     if (env_dir / "bin" / "npx").exists():
-        print("[viser] nodejs is set up!")
+        rich.print("[bold](viser)[/bold] nodejs is set up!")
         return env_dir
 
     subprocess.run([sys.executable, "-m", "nodeenv", "--node=20.4.0", env_dir])
diff --git a/viser/client/vite.config.ts b/viser/client/vite.config.ts
index b2b8bc732..b42f37f61 100644
--- a/viser/client/vite.config.ts
+++ b/viser/client/vite.config.ts
@@ -5,6 +5,8 @@ import svgrPlugin from "vite-plugin-svgr";
 import eslint from "vite-plugin-eslint";
 import browserslistToEsbuild from "browserslist-to-esbuild";
 
+process.title = "Viser Viewer"
+
 // https://vitejs.dev/config/
 export default defineConfig({
   plugins: [react(), eslint(), viteTsconfigPaths(), svgrPlugin()],