@rpcbase/cli 0.64.0 → 0.66.0

package/bin.js

@@ -26,11 +26,6 @@ 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,
@@ -46,7 +41,7 @@ yargs(hideBin(process.argv))
     start_command(argv)
   })
   .command(["agent"], "Run the agent", (yargs) => {
-    yargs
+    // yargs
       // .option("option1", {
       //   alias: "o",
       //   type: "boolean",
@@ -65,9 +60,14 @@ yargs(hideBin(process.argv))
         default: false,
         description: "Print output without writing any files"
       })
+      .option("all", {
+        type: "boolean",
+        default: false,
+        description: "Doesn't filter @rpcbase/ dependencies, updates everything"
+      })
   }, async(argv) => {
     if (argv.version) return print_versions()
-    await update()
+    await update(argv)
   })
   // Increment pkg
   .command(["increment-pkg <files...>"], "Bump a package version if necessary by checking its source on github", (yargs) => {

package/package.json

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

package/src/start_command.js

@@ -10,15 +10,23 @@ const {hideBin} = require("yargs/helpers")
 
 const docker_runtime_check = require("./helpers/docker_runtime_check")
 const exit_with_message = require("./helpers/exit_with_message")
-const get_run_configs = require("./helpers/get_run_configs")
 const tailscale_tunnel = require("./helpers/tailscale_tunnel")
 const verify_project = require("./verify_project")
 
-// TODO: nuke this
-// 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(args)
+  const cwd = process.cwd()
+
+  const run_configs = [
+    {
+      type: "client",
+      working_dir: path.join(cwd, "./client")
+    },
+    {
+      type: "server",
+      working_dir: path.join(cwd, "./server/server")
+    },
+  ]
 
   const run_commands = []
 
@@ -61,18 +69,11 @@ const start_command = async(args) => {
     })
   })
 
-  const has_server = run_configs.findIndex((c) => c.type === "server") > -1
+  // check if docker is installed and running
+  docker_runtime_check()
 
-  // check if docker is running
-  if (args.docker) {
-    docker_runtime_check()
-  }
-
-  // check if we should run the tunnel
-  // uses tailscale
-  if (has_server) {
-    tailscale_tunnel.start(run_configs)
-  }
+  // start the tailscale tunnel
+  tailscale_tunnel.start(run_configs)
 
   let project_errors
 
@@ -110,14 +111,12 @@ const start_command = async(args) => {
     })
   }
 
-
   // server cmd to stop tailscale serve
   const server_command = commands.find((c) => c.name === "server")
-  if (server_command) {
-    server_command.process.on("close", () => {
-      tailscale_tunnel.stop(run_configs)
-    })
-  }
+
+  server_command.process.on("close", () => {
+    tailscale_tunnel.stop(run_configs)
+  })
 
 }
 

package/src/update/index.js

@@ -18,7 +18,8 @@ const get_package_files = () => {
   return files
 }
 
-const get_outdated = async(dir) => {
+
+const get_outdated = async({dir, all}) => {
 
   const output = execSync("npm outdated --json || true", {cwd: dir})
   const outdated = JSON.parse(output.toString())
@@ -27,7 +28,7 @@ const get_outdated = async(dir) => {
 
   Object.keys(outdated)
     // get our rpcbase packages only
-    .filter((name) => name.startsWith("@rpcbase"))
+    .filter((name) => all ? true : name.startsWith("@rpcbase"))
     // skip if package is linked but already at latest version
     .filter((name) => {
       const version_data = outdated[name]
@@ -45,7 +46,7 @@ const get_outdated = async(dir) => {
 }
 
 
-const update = async() => {
+const update = async(args) => {
   const working_dir = process.cwd()
 
   const package_files = get_package_files()
@@ -56,7 +57,7 @@ const update = async() => {
 
     console.log("updating", path.relative(working_dir, dir) || ".")
 
-    const outdated = await get_outdated(dir)
+    const outdated = await get_outdated({dir, all: args.all})
 
     const package_json = JSON.parse(fs.readFileSync(package_file, "utf8"))
 

package/src/errors.js

@@ -1,8 +0,0 @@
-/* @flow */
-const colors = require("picocolors")
-
-const ERRORS = {
-  INVALID_CWD: `expected to run in ${colors.cyan("client/")} or ${colors.cyan("server/server/")} or project root directory`
-}
-
-module.exports = ERRORS

package/src/helpers/get_run_configs.js

@@ -1,76 +0,0 @@
-/* @flow */
-const path = require("path")
-const fs = require("fs")
-
-const ERRORS = require("../errors")
-const exit_with_message = require("./exit_with_message")
-
-// run type is client | server | both
-const get_run_configs = (args) => {
-  const cwd = process.cwd()
-
-  // check if running parent of rb project
-  const dir_contents = fs.readdirSync(cwd)
-  const is_parent_dir = dir_contents.includes("client") && dir_contents.includes("server")
-
-  // check if rb is running in client or server
-  const dir = path.basename(cwd)
-  const is_rb_dir = ["client", "server"].includes(dir)
-
-  if (!is_parent_dir && !is_rb_dir) {
-    exit_with_message(ERRORS.INVALID_CWD)
-    return
-  }
-
-  let run_configs
-
-  if (is_parent_dir) {
-    run_configs = [
-      {
-        type: "client",
-        working_dir: path.join(cwd, "./client")
-      },
-      {
-        type: "server",
-        working_dir: path.join(cwd, "./server/server")
-      },
-    ]
-  } else {
-    // client
-    if (dir === "client") {
-      run_configs = [{
-        type: "client",
-        working_dir: cwd
-      }]
-    // check if parent dir is also server, because we are in server/server
-    } else if (dir === "server" && path.basename(path.dirname(cwd)) === "server") {
-      run_configs = [
-        {
-          type: "server",
-          working_dir: cwd
-        },
-      ]
-    } else {
-      console.log("TODO: server get_run_configs:handle edge case here")
-      console.log("process.cwd:", process.cwd())
-    }
-  }
-
-  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 && !args.docker) {
-      run_configs.push({
-        type: "agent",
-        working_dir: cwd,
-      })
-    }
-    return run_configs
-  }
-
-  // fails when no match found
-  exit_with_message(ERRORS.INVALID_CWD)
-}
-
-module.exports = get_run_configs