@rpcbase/cli 0.18.0 → 0.20.0

package/bin.js

@@ -4,7 +4,7 @@ process.title = "rb"
 // load .env
 const path = require("path")
 require("dotenv").config({path: path.join(process.cwd(), "./.env")})
-// 
+//
 const yargs = require("yargs/yargs")
 const {hideBin} = require("yargs/helpers")
 

package/package.json

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

package/src/helpers/get_run_configs.js

@@ -5,11 +5,13 @@ 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 = () => {
   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")
@@ -23,8 +25,10 @@ const get_run_configs = () => {
     return
   }
 
+  let run_configs
+
   if (is_parent_dir) {
-    return [
+    run_configs = [
       {
         type: "client",
         working_dir: path.join(cwd, "./client")
@@ -33,35 +37,39 @@ const get_run_configs = () => {
         type: "server",
         working_dir: path.join(cwd, "./server/server")
       },
-      {
-        type: "agent",
-        working_dir: path.join(cwd, "./server/infrastructure")
-      },
     ]
   } else {
     // client
     if (dir === "client") {
-      return [{
+      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") {
-      return [
+      run_configs = [
         {
           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")
     }
   }
 
+  if (run_configs) {
+    // check if there is server we add agent but in native mode only
+    const server = run_configs.find((rc) => rc.type === "server")
+    if (server && CONTAINER_MODE === "native") {
+      run_configs.push({
+        type: "agent",
+        working_dir: server.working_dir,
+      })
+    }
+    return run_configs
+  }
+
   // fails when no match found
   exit_with_message(ERRORS.INVALID_CWD)
 }

package/src/start_command.js

@@ -69,6 +69,8 @@ const start_command = async(args) => {
 
   let project_errors
 
+  // console.log("RUN COMMANDS", run_commands)
+
   const {result, commands} = concurrently(run_commands, {
     killOthers: ["success", "failure"],
     handleInput: true,

package/src/verify_project/index.js

@@ -26,6 +26,10 @@ const get_root_dir = (run_configs) => {
 const verify_project = async(run_configs) => {
   let result_errors = []
 
+  console.log("WARNING VERIFY_PROJECT IS BROKEN, SKIPPING FOR NOW")
+  return result_errors
+
+
   const project_root_dir = get_root_dir(run_configs)
 
   // check if all installed packages match semver in package json file

package/src/verify_project/verify_packages_installed.js

@@ -10,8 +10,17 @@ const exec = util.promisify(require("child_process").exec)
 const LIST_CMD = "npm ls --depth=0 --json || true"
 
 const get_installed_pkgs = async(wd) => {
-  const {stdout: npm_out} = await exec(LIST_CMD, {cwd: wd})
-  const npm_json = JSON.parse(npm_out)
+  const {stdout: npm_out, stderr} = await exec(LIST_CMD, {cwd: wd})
+
+  let npm_json
+  try {
+    npm_json = JSON.parse(npm_out)
+  } catch (err) {
+    console.log("failed to parse npm_json:")
+    console.log(npm_json)
+    console.log("STDERR:", stderr)
+    throw err
+  }
   const deps = npm_json.dependencies || {}
 
   const result = {}