@reboot-dev/reboot 0.25.6 → 0.26.0

package/include/pybind11/detail/init.h

@@ -67,7 +67,7 @@ constexpr bool is_alias(void *) {
 }
 
 // Constructs and returns a new object; if the given arguments don't map to a constructor, we fall
-// back to brace aggregate initiailization so that for aggregate initialization can be used with
+// back to brace aggregate initialization so that for aggregate initialization can be used with
 // py::init, e.g.  `py::init<int, int>` to initialize a `struct T { int a; int b; }`.  For
 // non-aggregate types, we need to use an ordinary T(...) constructor (invoking as `T{...}` usually
 // works, but will not do the expected thing when `T` has an `initializer_list<T>` constructor).

package/index.d.ts

@@ -19,6 +19,7 @@ export declare class Reboot {
     stop(): Promise<void>;
     up(application: Application, options?: {
         localEnvoy?: boolean;
+        localEnvoyPort?: number;
     }): Promise<ApplicationRevision>;
     down(): Promise<void>;
     url(): string;

package/index.js

@@ -91,7 +91,7 @@ export class Reboot {
     async up(application, options) {
         // TODO(benh): determine module and file name so that we can
         // namespace if we have more than one implementation of servicers.
-        return await reboot_native.Reboot_up(__classPrivateFieldGet(this, _Reboot_external, "f"), application.__external, options?.localEnvoy);
+        return await reboot_native.Reboot_up(__classPrivateFieldGet(this, _Reboot_external, "f"), application.__external, options?.localEnvoy, options?.localEnvoyPort);
     }
     async down() {
         await reboot_native.Reboot_down(__classPrivateFieldGet(this, _Reboot_external, "f"));
@@ -511,7 +511,7 @@ export class Application {
                     // so that developers see a stack trace of what is going
                     // on.
                     const error = ensureError(e);
-                    // Write an empy message which includes a newline to make
+                    // Write an empty message which includes a newline to make
                     // it easier to identify the stack trace.
                     console.error("");
                     console.error(error);
@@ -568,7 +568,7 @@ _Application_servicers = new WeakMap(), _Application_tokenVerifier = new WeakMap
             methods[method](path, ...handlers.map((handler) => {
                 // Express allows for three different kinds of handlers, a
                 // "normal" handler that takes two args, `req` and `res`, a
-                // "middlware" handler that takes three args, `req, `res`,
+                // "middleware" handler that takes three args, `req`, `res`,
                 // and `next`, and an "error" handler that takes four args
                 // `err`, `req`, `res`, and `next`. To the best of our
                 // understanding they determine what arguments to pass to

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.25.6",
+    "@reboot-dev/reboot-api": "0.26.0",
     "chalk": "^4.1.2",
     "node-addon-api": "^7.0.0",
     "node-gyp": ">=10.2.0",
@@ -16,7 +16,7 @@
   },
   "type": "module",
   "name": "@reboot-dev/reboot",
-  "version": "0.25.6",
+  "version": "0.26.0",
   "description": "npm package for Reboot",
   "scripts": {
     "postinstall": "rbt || exit 0",

package/rbt.js

@@ -22,18 +22,25 @@ function addExtensionlessToNodeOptions() {
     process.env.NODE_OPTIONS =
         (process.env.NODE_OPTIONS && process.env.NODE_OPTIONS + " ") || "";
     // The `module.register()` function was added to Node.js in 20.6.0
-    // for the main release line and 18.19.0 for the LTS release line.
+    // for the main release line.
     //
     // If we have one of those two versions then we can pre import
     // `extensionless/register` to use the `module.register()` function,
     // otherwise we need to fall back to `--experimental-loader`.
-    if (major >= 21 || (major == 20 && minor >= 6)) {
+    //
+    // We've seen some issues related to the 'unknown file extension'
+    // error on Node.js <= 20.9, so now we require at least 20.10
+    // to use the `extensionless` loader.
+    // https://github.com/reboot-dev/mono/issues/4068#issuecomment-2929571313
+    // TODO: Revisit this, probably we would be able to drop that option
+    // at all.
+    if (major > 20 || (major === 20 && minor >= 10)) {
         process.env.NODE_OPTIONS += "--import=extensionless/register";
     }
     else {
         throw new Error(`The current version of Node.js is not supported.
        Supported versions are:
-        * greater than or equal to 20.6`);
+        * greater than or equal to 20.10`);
     }
 }
 async function main() {

package/reboot_native.cc

@@ -292,7 +292,7 @@ void PythonNodeAdaptor::Initialize(
         //
         // Don't try and manipulate signals when running within Node!
         setenv("REBOOT_SIGNALS_AVAILABLE", "false", 1);
-        // Specify that we are runing from within `node`.
+        // Specify that we are running from within `node`.
         setenv("REBOOT_NODEJS", "true", 1);
 
         py::initialize_interpreter();
@@ -1666,6 +1666,11 @@ Napi::Value Reboot_up(const Napi::CallbackInfo& info) {
     local_envoy = info[2].As<Napi::Boolean>();
   }
 
+  int local_envoy_port = 0;
+  if (!info[3].IsUndefined()) {
+    local_envoy_port = info[3].As<Napi::Number>().Int32Value();
+  }
+
   return NodePromiseFromPythonTask(
       info.Env(),
       "Reboot.up(...) in nodejs",
@@ -1674,7 +1679,8 @@ Napi::Value Reboot_up(const Napi::CallbackInfo& info) {
        py_reboot,
        js_external_application, // Ensures `py_application` remains valid.
        py_application,
-       local_envoy]() {
+       local_envoy,
+       local_envoy_port]() {
         return py_reboot->attr("up")(
             py_application,
             // NOTE: while we support subprocess consensuses
@@ -1683,7 +1689,8 @@ Napi::Value Reboot_up(const Napi::CallbackInfo& info) {
             // clone a process like we do with multiprocessing
             // in Python.
             "in_process"_a = true,
-            "local_envoy"_a = local_envoy);
+            "local_envoy"_a = local_envoy,
+            "local_envoy_port"_a = local_envoy_port);
       },
       [](py::object py_revision) {
         py::str py_application_id =
@@ -2148,7 +2155,7 @@ Napi::Value Application_constructor(const Napi::CallbackInfo& info) {
                                   [
                                       // Need a copy, because we will
                                       // create the 'ExternalContext' more
-                                      // than once, which means we wiil
+                                      // than once, which means we will
                                       // call this function more than once
                                       // as well.
                                       js_from_native_external](

package/reboot_native.cjs

@@ -14,10 +14,10 @@ if (os.platform() === "win32") {
 
 const [major, minor, patch] = process.versions.node.split(".").map(Number);
 
-if (major < 20) {
+if (major < 20 || (major == 20 && minor < 10)) {
   console.error(
     chalk.stderr.bold.red(
-      `Reboot requires nodejs version >=20 (found ${major}.${minor}.${patch})`
+      `Reboot requires nodejs version >=20.10 (found ${major}.${minor}.${patch})`
     )
   );
   process.exit(-1);

package/version.d.ts

@@ -1 +1 @@
-export declare const REBOOT_VERSION = "0.25.6";
+export declare const REBOOT_VERSION = "0.26.0";

package/version.js

@@ -1 +1 @@
-export const REBOOT_VERSION = "0.25.6";
+export const REBOOT_VERSION = "0.26.0";