@rpcbase/cli 0.3.0 → 0.6.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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rpcbase/cli",
-  "version": "0.3.0",
+  "version": "0.6.0",
   "license": "SSPL-1.0",
   "bin": {
     "rb": "./bin.js"
@@ -12,6 +12,7 @@
     "bluebird": "3.7.2",
     "chalk": "4.1.2",
     "concurrently": "7.0.0",
+    "debug": "4.3.4",
     "dotenv": "16.0.0",
     "semver": "7.3.5",
     "validator": "13.7.0",

package/src/default_command.js

@@ -1,4 +1,5 @@
 /* @flow */
+const debug = require("debug")("rb-cli")
 const path = require("path")
 const fs = require("fs")
 const chalk = require("chalk")
@@ -17,15 +18,22 @@ const default_command = async(args) => {
     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"
     }
 
     // command, name, prefixColor, env, cwd
@@ -62,8 +70,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

@@ -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,16 @@ 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")
+        },
+      ]
     }
   }
 

package/src/update/index.js

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

package/src/verify_project/verify_env.js

@@ -26,9 +26,9 @@ const SERVICES = [
     },
   },
   {
-    name: "database0",
+    name: "database",
     required_env: {
-      "DATABASE_PORT_0": validate_port,
+      "DATABASE_PORT": validate_port,
       "DATABASE_NAME": (val) => {
         if (!/^[$A-Z_][0-9A-Z_$-]*$/i.test(val)) {
           return `expected ${chalk.bold(`'${val}'`)} to be a valid database name`
@@ -36,18 +36,18 @@ const SERVICES = [
       }
     },
   },
-  {
-    name: "database1",
-    required_env: {
-      "DATABASE_PORT_1": validate_port
-    },
-  },
-  {
-    name: "database2",
-    required_env: {
-      "DATABASE_PORT_2": validate_port
-    },
-  },
+  // {
+  //   name: "worker-queue",
+  //   required_env: {
+  //     "WORKER_QUEUE_PORT": validate_port
+  //   },
+  // },
+  // {
+  //   name: "session-store",
+  //   required_env: {
+  //     "SESSION_STORE_PORT": validate_port
+  //   },
+  // },
 ]
 
 

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 */