improved node availability check

Author: DerThorsten

pyjs_code_runner/backend/backend.py

@@ -25,12 +25,11 @@ def ensure_playwright_imports():
         import playwright
     except ModuleNotFoundError as e:
         msg = """\n
-            pyks-code-runner error: 
+            pyjs-code-runner error: 
 
                 * Cannot import playwright!
 
-            to use the browser-{worker/main} backends
-            playwright needs to be installed.
+            To use the browser-{worker/main} backends `playwright` needs to be installed.
 
             Install playwight with:
 

pyjs_code_runner/backend/node/node.py

@@ -3,58 +3,80 @@
 import os
 import shutil
 import sys
-
+import shutil
 from ..backend_base import BackendBase
 from subprocess import Popen, PIPE, STDOUT
+import textwrap
 
 THIS_DIR = os.path.dirname(os.path.realpath(__file__))
 
 
 class NodeBackend(BackendBase):
-    def __init__(self, host_work_dir, work_dir, script, async_main, node_exe):
+    def __init__(self, host_work_dir, work_dir, script, async_main, node_binary):
         super().__init__(
             host_work_dir=host_work_dir,
             work_dir=work_dir,
             script=script,
             async_main=async_main,
         )
+        if node_binary is None:
+            shutil_node_binary = shutil.which("node")
+            if shutil_node_binary is None:
+                raise RuntimeError(
+                    textwrap.dedent(
+                        """\n
+                    pyjs-code-runner error: 
+
+                        * Cannot find node
+
+
+                    to use the node backend `node`/`nodejs` needs to be installed.
+
+                    Install playwight with:
+
+                        * conda:
 
-        self.node_exe = node_exe
+                            conda install -c conda-forge nodejs
+
+                        * mamba:
+
+                            mamba install -c conda-forge nodejs
+
+                        * micromamba:
+
+                            micromamb install -c conda-forge nodejs
+
+                """
+                    )
+                )
+            else:
+                node_binary = shutil_node_binary
+        self.node_binary = node_binary
 
     def run(self):
         main_name = "node_main.js"
         main = Path(THIS_DIR) / main_name
         shutil.copyfile(main, self.host_work_dir / main_name)
 
         cmd = [
-            "node",
+            self.node_binary,
             "--no-experimental-fetch",
             main_name,
             self.work_dir,
             self.script,
             str(int(self.async_main)),
         ]
 
-        if False:
-            ret = subprocess.run(cmd, cwd=os.getcwd(), stdout=PIPE)
-            returncode = ret.returncode
-            output = ret.stdout.decode()
-            print(output)
-            if returncode != 0:
-                sys.exit(returncode)
-
-        else:
-            print("START")
-            process = subprocess.Popen(cmd, stdout=subprocess.PIPE)
-
-            # Poll process.stdout to show stdout live
-            while True:
-                output = process.stdout.readline()
-                if process.poll() is not None:
-                    break
-                if output:
-                    print(output.decode().strip())
-            rc = process.poll()
-            # print("RC", rc)
-            if process.returncode != 0:
-                sys.exit(process.returncode)
+        process = subprocess.Popen(cmd, stdout=subprocess.PIPE)
+
+        # Poll process.stdout to show stdout live
+        while True:
+            output = process.stdout.readline()
+            if process.poll() is not None:
+                break
+            if output:
+                print(output.decode().strip())
+        rc = process.poll()
+        # print("RC", rc)
+        if process.returncode != 0:
+            sys.exit(process.returncode)

pyjs_code_runner/cli/run.py

@@ -173,9 +173,9 @@ def browser_worker(
     )
 
 
-node_exe_option = typer.Option(
+node_binary_option = typer.Option(
     None,
-    *make_names("env-cache-dir"),
+    "--node-binary",
     help="""node exectutable""",
 )
 
@@ -191,7 +191,7 @@ def node(
     pyjs_dir: Optional[Path] = pyjs_dir_option,
     host_work_dir: Optional[Path] = host_work_dir_option,
     cache_dir: Optional[Path] = cache_dir_option,
-    node_exe: Optional[Path] = node_exe_option,
+    node_binary: Optional[Path] = node_binary_option,
 ):
     run_script(
         backend_type=BackendType.node,
@@ -204,7 +204,7 @@ def node(
         pyjs_dir=pyjs_dir,
         cache_dir=cache_dir,
         host_work_dir=host_work_dir,
-        backend_kwargs=dict(node_exe=node_exe),
+        backend_kwargs=dict(node_binary=node_binary),
     )