@rpcbase/cli 0.38.0 → 0.39.0

package/bin.js

@@ -23,6 +23,11 @@ yargs(hideBin(process.argv))
         default: false,
         description: "Adds coverage instrumentation (always disabled in production)"
       })
+      .option("docker", {
+        type: "boolean",
+        default: false,
+        description: "Run in docker"
+      })
       .option("verbose", {
         type: "boolean",
         default: false,
@@ -34,7 +39,6 @@ yargs(hideBin(process.argv))
         description: "Run with debug logging"
       })
   }, (argv) => {
-    console.log("IS start")
     if (argv.version) return print_versions()
     start_command(argv)
   })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rpcbase/cli",
-  "version": "0.38.0",
+  "version": "0.39.0",
   "license": "SSPL-1.0",
   "bin": {
     "rb": "./bin.js"

package/src/helpers/docker_runtime_check.js

@@ -3,14 +3,8 @@ const {execSync} = require("child_process")
 const os = require("os")
 const colors = require("picocolors")
 
-const {CONTAINER_MODE} = process.env
 
 const docker_runtime_check = () => {
-  // skip check on osx except when forcing docker
-  if (os.platform() === "darwin" && CONTAINER_MODE !== "docker") {
-    return
-  }
-
   try {
     execSync("docker version -f json")
   } catch (err) {

package/src/helpers/get_run_configs.js

@@ -5,13 +5,8 @@ const fs = require("fs")
 const ERRORS = require("../errors")
 const exit_with_message = require("./exit_with_message")
 
-const {CONTAINER_MODE} = process.env
-
 // run type is client | server | both
-const get_run_configs = () => {
-  if (!["docker", "native"].includes(CONTAINER_MODE.trim()))
-    throw new Error("expected CONTAINER_MODE to be native|docker")
-
+const get_run_configs = (args) => {
   const cwd = process.cwd()
 
   // check if running parent of rb project
@@ -62,8 +57,9 @@ const get_run_configs = () => {
 
   if (run_configs) {
     // check if there is server we add agent but in native mode only
+    // in docker mode, the agent is a container
     const server = run_configs.find((rc) => rc.type === "server")
-    if (server && CONTAINER_MODE === "native") {
+    if (server && !args.docker) {
       run_configs.push({
         type: "agent",
         working_dir: server.working_dir,

package/src/helpers/tailscale_tunnel.js

@@ -35,7 +35,7 @@ const start = (run_configs) => {
     execSync(`${TAILSCALE_PATH} serve https:443 / http://127.0.0.1:${server_port}`, {stdio: "inherit"})
     execSync(`${TAILSCALE_PATH} funnel 443 on`, {stdio: "inherit"})
   } catch (err) {
-    console.log("TAILSCALE ERR", err)
+    console.log("error starting tailscale, is the tailscale app running ?")
   }
 }
 
@@ -49,7 +49,8 @@ const stop = (run_configs) => {
     execSync(`${TAILSCALE_PATH} serve https:443 / http://127.0.0.1:${server_port} off`, {stdio: "inherit"})
     execSync(`${TAILSCALE_PATH} funnel 443 off`, {stdio: "inherit"})
   } catch (err) {
-    console.log("TAILSCALE ERR", err)
+    // console.log("TAILSCALE ERR", err)
+    console.log("error stopping tailscale, it probably wasn't initally running. you can probably ignore it")
   }
 }
 

package/src/start_command.js

@@ -18,7 +18,7 @@ const verify_project = require("./verify_project")
 // server native + docker + docker-native is way too complex
 // either everything is native, or everything is in docker
 const start_command = async(args) => {
-  const run_configs = get_run_configs()
+  const run_configs = get_run_configs(args)
 
   const run_commands = []
 
@@ -49,7 +49,6 @@ const start_command = async(args) => {
       command = `${command} ${hideBin(process.argv).join(" ")}`
     }
 
-
     // add command
     run_commands.push({
       name,
@@ -62,9 +61,8 @@ const start_command = async(args) => {
 
   const has_server = run_configs.findIndex((c) => c.type === "server") > -1
 
-  // TODO: we shouldnt check in native mode
   // check if docker is running
-  if (has_server) {
+  if (args.docker) {
     docker_runtime_check()
   }