@rpcbase/cli 0.5.0 → 0.8.0

package/bin.js

@@ -1,13 +1,12 @@
 #!/usr/bin/env node
 /* @flow */
+process.title = "rb"
 const path = require("path")
 require("dotenv").config({path: path.join(__dirname, "./.env")})
 const yargs = require("yargs/yargs")
 const {hideBin} = require("yargs/helpers")
 
 const default_command = require("./src/default_command")
-const run_client = require("./src/run_client")
-const run_server = require("./src/run_server")
 const update = require("./src/update")
 
 let is_command = false
@@ -21,6 +20,12 @@ const args = yargs(hideBin(process.argv))
     is_command = true
     console.log("PING")
   })
+  .option("coverage", {
+    alias: "c",
+    type: "boolean",
+    default: false,
+    description: "Adds coverage instrumentation (always disabled in production)"
+  })
   // .option("version", {
   //   alias: "v",
   //   type: "boolean",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rpcbase/cli",
-  "version": "0.5.0",
+  "version": "0.8.0",
   "license": "SSPL-1.0",
   "bin": {
     "rb": "./bin.js"
@@ -11,10 +11,11 @@
   "dependencies": {
     "bluebird": "3.7.2",
     "chalk": "4.1.2",
-    "concurrently": "7.0.0",
-    "dotenv": "16.0.0",
-    "semver": "7.3.5",
+    "concurrently": "7.2.1",
+    "debug": "4.3.4",
+    "dotenv": "16.0.1",
+    "semver": "7.3.7",
     "validator": "13.7.0",
-    "yargs": "17.4.0"
+    "yargs": "17.5.1"
   }
 }

package/src/default_command.js

@@ -1,42 +1,59 @@
 /* @flow */
+const debug = require("debug")("rb-cli")
 const path = require("path")
 const fs = require("fs")
 const chalk = require("chalk")
 const concurrently = require("concurrently")
 
+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 docker_runtime_check = require("./helpers/docker_runtime_check")
 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 default_command = async(args) => {
   const run_configs = get_run_configs()
 
-  const run_commands = run_configs.map((cfg) => {
+  const run_commands = []
+  run_configs.forEach((cfg) => {
     let name
     let command
     let prefixColor
+    // client
     if (cfg.type === "client") {
       name = "client"
       // command = "yarn dev"
       command = "./node_modules/.bin/rb-webpack-browser dev"
       prefixColor = "#C678DD"
+    // server
     } else if (cfg.type === "server") {
       name = "server"
       command = "./node_modules/.bin/rb-server start"
       prefixColor = "#61AFEF"
+    // agent
+    } else if (cfg.type === "agent") {
+      name = "agent"
+      command = "../server/node_modules/.bin/rb-server agent"
+      prefixColor = "#4DB33D"
+    }
+
+    // pass through coverage arg to client and server
+    if (["client", "server"].includes(cfg.type) && args.coverage) {
+      command = `${command} --coverage`
     }
 
-    // command, name, prefixColor, env, cwd
-    return {
+    // add command
+    run_commands.push({
       name,
       command,
       prefixColor,
       cwd: cfg.working_dir
-    }
+    })
   })
 
+  // check if docker is running
   if (run_configs.filter((c) => c.type === "server").length > 0) {
     docker_runtime_check()
   }
@@ -62,8 +79,13 @@ const default_command = async(args) => {
       }
     })
 
+  debug("run_configs", run_configs)
+
   // asynchronously verify project config and kill process if any error
-  project_errors = await verify_project(run_configs)
+  const configs = run_configs
+    .filter(({type}) => ["client", "server"].includes(type))
+
+  project_errors = await verify_project(configs)
 
   if (project_errors.length > 0) {
     commands.forEach((c) => {

package/src/helpers/get_run_configs.js

@@ -5,11 +5,11 @@ 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 = () => {
   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")
@@ -33,6 +33,10 @@ const get_run_configs = () => {
         type: "server",
         working_dir: path.join(cwd, "./server/server")
       },
+      {
+        type: "agent",
+        working_dir: path.join(cwd, "./server/infrastructure")
+      },
     ]
   } else {
     // client
@@ -43,10 +47,18 @@ const get_run_configs = () => {
       }]
     // check if parent dir is also server, because we are in server/server
     } else if (dir === "server" && path.basename(path.dirname(cwd)) === "server") {
-      return [{
-        type: "server",
-        working_dir: cwd
-      }]
+      return [
+        {
+          type: "server",
+          working_dir: cwd
+        },
+        {
+          type: "agent",
+          working_dir: path.join(cwd, "../infrastructure")
+        },
+      ]
+    } else {
+      console.log("TODO: server get_run_configs:handle edge case here")
     }
   }
 

package/src/update/index.js

@@ -62,10 +62,6 @@ const update = async() => {
       execSync("yarn", {cwd: dir, stdio: "inherit"})
     }
   }
-
-
-
-
 }
 
 module.exports = update

package/src/auto/run_before.js

@@ -1,3 +0,0 @@
-/* @flow */
-
-// check project folder layout

package/src/run_client.js

@@ -1,5 +0,0 @@
-/* @flow */
-const path = require("path")
-const fs = require("fs")
-
-// console.log("runclient")

package/src/watch/client/index.js

@@ -1 +0,0 @@
-/* @flow */