@reboot-dev/reboot 0.22.0 → 0.23.0

package/package.json

@@ -3,7 +3,7 @@
     "@bufbuild/protobuf": "1.3.2",
     "@bufbuild/protoplugin": "1.3.2",
     "@bufbuild/protoc-gen-es": "1.3.2",
-    "@reboot-dev/reboot-api": "0.22.0",
+    "@reboot-dev/reboot-api": "0.23.0",
     "chalk": "^4.1.2",
     "node-addon-api": "^7.0.0",
     "node-gyp": ">=10.2.0",
@@ -14,7 +14,7 @@
   },
   "type": "module",
   "name": "@reboot-dev/reboot",
-  "version": "0.22.0",
+  "version": "0.23.0",
   "description": "npm package for Reboot",
   "scripts": {
     "postinstall": "rbt || exit 0",
@@ -64,6 +64,7 @@
   "exports": {
     "./package.json": "./package.json",
     ".": "./index.js",
+    "./secrets": "./secrets/index.js",
     "./utils": "./utils/index.js"
   }
 }

package/rbt.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { spawnSync } from "child_process";
+import { spawn } from "child_process";
 import * as path from "path";
 import whichPMRuns from "which-pm-runs";
 import { ensureYarnNodeLinker } from "./utils/index.js";
@@ -43,14 +43,25 @@ async function main() {
     process.env.RBT_FROM_NODEJS = "true";
     // Add extensionless loader.
     addExtensionlessToNodeOptions();
-    const rbt = spawnSync(`${path.join(VENV_EXEC_PATH, "rbt")} ${process.argv.slice(2).join(" ")}`, {
+    // Using 'spawn' instead of 'spawnSync' to avoid blocking the event loop for
+    // signal handling.
+    const rbt = spawn(`${path.join(VENV_EXEC_PATH, "rbt")} ${process.argv.slice(2).join(" ")}`, {
         stdio: [process.stdin, process.stdout, process.stderr],
         shell: true,
     });
-    if (rbt.error) {
-        throw new Error(`Unable to execute 'rbt', please report this bug to the maintainers!\n${rbt.error}`);
-    }
-    process.exit(rbt.status);
+    process.on("SIGINT", () => {
+        // Make sure to kill the child process before exiting.
+        rbt.once("exit", (code) => {
+            process.exit(code);
+        });
+    });
+    rbt.on("exit", (code) => {
+        // If the child process exits with a non-zero code, exit with the same code.
+        process.exit(code ?? 1);
+    });
+    rbt.on("error", (error) => {
+        throw new Error(`Unable to execute 'rbt', please report this bug to the maintainers!\n${error}`);
+    });
 }
 main().catch((error) => {
     console.error(error instanceof Error ? error.message : error);

package/reboot_native.cc

@@ -32,6 +32,40 @@ struct PythonNodeAdaptor {
   // static instance of `PythonNodeAdaptor`.
   void Initialize(Napi::Env& env, const Napi::Function& js_callback);
 
+  static void HandleException(const std::exception& e) {
+    // First determine if the exception was thrown from Python or C++.
+    if (const py::error_already_set* e_py =
+            dynamic_cast<const py::error_already_set*>(&e)) {
+      // This is a Python exception. Is it an `InputError`?
+      if (e_py->matches(py::module::import(
+                            "reboot.controller.exceptions")
+                            .attr("InputError"))) {
+        // This is an InputError, which means it reports a mistake in the input
+        // provided by the developer. We want to print _only_ the user-friendly
+        // error message in the exception, without intimidating stack traces.
+        //
+        // Calling `e_py->what()` would produce a stack trace, so we get only
+        // the user-friendly message by stringifying in Python-land instead.
+        std::string what = py::str(e_py->value());
+        std::cerr << what << std::endl;
+      } else {
+        // This is an internal error from the Python library. Request that the
+        // developer reports the issue, and give them the full stack trace to
+        // help diagnose the problem.
+        std::cerr << "Unexpected library exception: " << e_py->what()
+                  << std::endl
+                  << "Please report this bug to the maintainers!"
+                  << std::endl;
+      }
+    } else {
+      // This is a C++ exception; something went wrong in the C++ code. Request
+      // that the developer reports the issue.
+      std::cerr
+          << "Unexpected adapter exception: " << e.what() << std::endl
+          << "Please report this bug to the maintainers!" << std::endl;
+    }
+  }
+
   template <typename F>
   void ScheduleCallbackOnPythonEventLoop(F&& f) {
     auto function = [f = std::forward<F>(f)]() mutable {
@@ -54,11 +88,7 @@ struct PythonNodeAdaptor {
           try {
             f(env);
           } catch (const std::exception& e) {
-            std::cerr
-                << "Unexpected exception: " << e.what()
-                << "\n"
-                << "Please report this bug to the maintainers!"
-                << std::endl;
+            PythonNodeAdaptor::HandleException(e);
           }
         });
 
@@ -208,12 +238,8 @@ void PythonNodeAdaptor::Initialize(
                   py::cpp_function([function = std::move(function)]() {
                     try {
                       function();
-                    } catch (std::exception& e) {
-                      std::cerr
-                          << "Unexpected exception: " << e.what()
-                          << "\n"
-                          << "Please report this bug to the maintainers!"
-                          << std::endl;
+                    } catch (const std::exception& e) {
+                      PythonNodeAdaptor::HandleException(e);
                     }
                   }));
             }
@@ -1522,7 +1548,9 @@ Napi::Value Service_constructor(const Napi::CallbackInfo& info) {
                 .attr("_Schedule");
         promise.set_value(
             new py::object(py_module.attr(node_adaptor.c_str())(
-                id,
+                // The call will stay within the same application.
+                "application_id"_a = py::none(),
+                "state_id"_a = id,
                 "schedule_type"_a = py_schedule_type)));
       });
 

package/venv.js

@@ -45,6 +45,11 @@ function pipInstallReboot() {
     }
 }
 export function ensurePythonVenv() {
+    // If the virtual environment is already activated, do not attempt to
+    // re-create it.
+    if (process.env.VIRTUAL_ENV === VENV_PATH) {
+        return;
+    }
     // Ensure that the Docker base Reboot image version and the Reboot
     // version are in sync.
     if (process.env.REBOOT_BASE_IMAGE_VERSION) {

package/version.d.ts

@@ -1 +1 @@
-export declare const REBOOT_VERSION = "0.22.0";
+export declare const REBOOT_VERSION = "0.23.0";

package/version.js

@@ -1 +1 @@
-export const REBOOT_VERSION = "0.22.0";
+export const REBOOT_VERSION = "0.23.0";