@reboot-dev/reboot 0.19.2 → 0.21.0

package/{reboot.d.ts → index.d.ts}

@@ -18,8 +18,10 @@ export declare class Reboot {
     stop(): Promise<void>;
     up(servicers: any, options?: {
         tokenVerifier?: TokenVerifier;
+        localEnvoy?: boolean;
     }): Promise<ApplicationConfig>;
     down(): Promise<void>;
+    url(): string;
 }
 export declare class ExternalContext {
     #private;
@@ -88,10 +90,10 @@ export type ServicerFactory = {
  */
 export declare class Auth {
     userId?: string;
-    properties: unknown;
+    properties: protobuf_es.JsonValue;
     constructor(options?: {
         userId?: string;
-        properties?: unknown;
+        properties?: protobuf_es.JsonValue;
     });
     toProtoBytes(): Uint8Array;
     static fromProtoBytes(bytes: Uint8Array): Auth;

package/{reboot.js → index.js}

@@ -81,11 +81,14 @@ export class Reboot {
     async up(servicers, 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"), servicers, options?.tokenVerifier);
+        return await reboot_native.Reboot_up(__classPrivateFieldGet(this, _Reboot_external, "f"), servicers, options?.tokenVerifier, options?.localEnvoy);
     }
     async down() {
         await reboot_native.Reboot_down(__classPrivateFieldGet(this, _Reboot_external, "f"));
     }
+    url() {
+        return reboot_native.Reboot_url(__classPrivateFieldGet(this, _Reboot_external, "f"));
+    }
 }
 _Reboot_external = new WeakMap();
 export class ExternalContext {
@@ -95,7 +98,7 @@ export class ExternalContext {
             __classPrivateFieldSet(this, _ExternalContext_external, args.external, "f");
         }
         else {
-            if (!args.url.startsWith("http")) {
+            if (!args.url || !args.url.startsWith("http")) {
                 throw new Error("`ExternalContext` must be constructed with a `url` " +
                     "including an explicit 'http' or 'https' protocol");
             }
@@ -277,7 +280,7 @@ export class Auth {
     toProtoBytes() {
         const auth = new auth_pb.Auth({
             userId: this.userId,
-            properties: this.properties,
+            properties: protobuf_es.Struct.fromJson(this.properties),
         });
         return auth.toBinary();
     }

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.19.2",
+    "@reboot-dev/reboot-api": "0.21.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.19.2",
+  "version": "0.21.0",
   "description": "npm package for Reboot",
   "scripts": {
     "postinstall": "rbt || exit 0",
@@ -49,8 +49,8 @@
     "rbt-esbuild.d.ts",
     "rbt-esbuild.js",
     "rbt.js",
-    "reboot.d.ts",
-    "reboot.js",
+    "index.d.ts",
+    "index.js",
     "reboot_native.cc",
     "reboot_native.cjs",
     "reboot_native.d.ts",
@@ -63,7 +63,7 @@
   ],
   "exports": {
     "./package.json": "./package.json",
-    ".": "./reboot.js",
+    ".": "./index.js",
     "./utils": "./utils/index.js"
   }
 }

package/reboot_native.cc

@@ -1264,6 +1264,11 @@ Napi::Value Reboot_up(const Napi::CallbackInfo& info) {
     js_token_verifier = NapiSafeReference(info[2].As<Napi::Object>());
   }
 
+  bool local_envoy = false;
+  if (!info[3].IsUndefined()) {
+    local_envoy = info[3].As<Napi::Boolean>();
+  }
+
   auto env = info.Env();
   auto servicer_details = make_servicer_details(env, js_servicers);
 
@@ -1275,6 +1280,7 @@ Napi::Value Reboot_up(const Napi::CallbackInfo& info) {
       [js_external_reboot, // Ensures `py_reboot` remains valid.
        py_reboot,
        js_token_verifier,
+       local_envoy,
        servicer_details = std::move(servicer_details),
        deferred = std::move(deferred)]() {
         py::list py_servicers = make_py_servicers(servicer_details);
@@ -1294,7 +1300,7 @@ 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 = false),
+                    "local_envoy"_a = local_envoy),
                 "name"_a = "Reboot.up(...) in nodejs");
 
         py_task.attr("add_done_callback")(py::cpp_function(
@@ -1475,6 +1481,29 @@ Napi::Value Reboot_stop(const Napi::CallbackInfo& info) {
   return promise;
 }
 
+// NOTE: We block on a promise here, so this method should not be called outside
+// of tests.
+Napi::Value Reboot_url(const Napi::CallbackInfo& info) {
+  // NOTE: we immediately get a safe reference to the `Napi::External`
+  // so that Node will not garbage collect it and the `py::object*` we
+  // get out of it will remain valid.
+  auto js_external_reboot = NapiSafeReference(
+      info[0].As<Napi::External<py::object>>());
+
+  // CHECK(...CheckTypeTag(...));
+
+  py::object* py_reboot = js_external_reboot.Value(info.Env()).Data();
+
+  std::promise<std::string> promise;
+
+  adaptor->ScheduleCallbackOnPythonEventLoop(
+      [py_reboot, &promise]() {
+        py::str url = py_reboot->attr("url")();
+        promise.set_value(std::string(url));
+      });
+
+  return Napi::String::New(info.Env(), promise.get_future().get());
+}
 
 Napi::Value Service_constructor(const Napi::CallbackInfo& info) {
   Napi::Object js_args = info[0].As<Napi::Object>();
@@ -1786,14 +1815,6 @@ Napi::Value ExternalContext_constructor(const Napi::CallbackInfo& info) {
             return py::none();
           }
         };
-        auto convert_bool =
-            [](const std::optional<bool>& optional) -> py::object {
-          if (optional.has_value()) {
-            return py::bool_(*optional);
-          } else {
-            return py::none();
-          }
-        };
 
         promise.set_value(
             new py::object(py_external.attr("ExternalContext")(
@@ -2806,6 +2827,10 @@ Napi::Object Init(Napi::Env env, Napi::Object exports) {
       Napi::String::New(env, "Reboot_down"),
       Napi::Function::New<Reboot_down>(env));
 
+  exports.Set(
+      Napi::String::New(env, "Reboot_url"),
+      Napi::Function::New<Reboot_url>(env));
+
   exports.Set(
       Napi::String::New(env, "Service_constructor"),
       Napi::Function::New<Service_constructor>(env));

package/reboot_native.cjs

@@ -19,12 +19,21 @@ const reboot_native = { exports: {} };
 // If we are in a Next.js context, check that serverExternalPackages is
 // correctly set. If not correctly set, Reboot backend TS code will not work
 // with React Server Components inside Next.
-
 if (__dirname.includes(".next")) {
   throw new Error(
-    "For Next.js to work correctly with Reboot native code, you " +
-      "must include option 'serverExternalPackages: ['@reboot-dev/reboot']' " +
-      "in your next.config.ts"
+    `For Next.js to work correctly with Reboot native code, an external
+    package must be added to 'next.config.ts':
+
+    In Next.js 14:
+      experimental: {
+        serverComponentsExternalPackages: ["@reboot-dev/reboot"],
+      },
+      ...
+
+    In Next.js 15
+      'serverExternalPackages: ['@reboot-dev/reboot']',
+      ...
+    `
   );
 }
 
@@ -55,6 +64,7 @@ exports.Reboot_start = reboot_native.exports.Reboot_start;
 exports.Reboot_stop = reboot_native.exports.Reboot_stop;
 exports.Reboot_up = reboot_native.exports.Reboot_up;
 exports.Reboot_down = reboot_native.exports.Reboot_down;
+exports.Reboot_url = reboot_native.exports.Reboot_url;
 exports.Context_auth = reboot_native.exports.Context_auth;
 exports.Context_stateId = reboot_native.exports.Context_stateId;
 exports.Context_iteration = reboot_native.exports.Context_iteration;

package/reboot_native.d.ts

@@ -4,11 +4,10 @@ import {
   Context,
   ExternalContext,
   Servicer,
+  TokenVerifier,
   TransactionContext,
   WorkflowContext,
-  WriterContext,
-  TokenVerifier,
-} from "./reboot.js";
+} from "./index.js";
 
 // The Nodejs addon API does not expose TypeScript types so we alias
 // our C++ `Napi::External` type to `NapiExternal` to make it more

package/version.d.ts

@@ -1 +1 @@
-export declare const REBOOT_VERSION = "0.19.2";
+export declare const REBOOT_VERSION = "0.21.0";

package/version.js

@@ -1 +1 @@
-export const REBOOT_VERSION = "0.19.2";
+export const REBOOT_VERSION = "0.21.0";