@rpcbase/cli 0.69.0-uiimport.0 → 0.70.0-fixdockerserver.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rpcbase/cli",
-  "version": "0.69.0-uiimport.0",
+  "version": "0.70.0-fixdockerserver.0",
   "license": "SSPL-1.0",
   "bin": {
     "rb": "./bin.js"

package/src/helpers/docker_runtime_check.js

@@ -1,16 +1,42 @@
 /* @flow */
+const assert = require("assert")
 const {execSync} = require("child_process")
 const os = require("os")
 const colors = require("picocolors")
 
 
+const get_networks = () => {
+  const out = execSync("docker network ls --format=json")
+  const nets = out.toString().trim().split("\n")
+    .filter(l => !!l)
+    .map((l) => JSON.parse(l))
+
+  return nets
+}
+
 const docker_runtime_check = () => {
+  // check docker is running
   try {
-    execSync("docker version -f json")
+    execSync("docker version --format=json")
   } catch (err) {
     console.log(colors.cyan("docker"), "exited with error")
     process.exit(1)
   }
+
+  // check network exists and create it if not
+  const {RB_APP_NAME} = process.env
+  assert(RB_APP_NAME, "missing RB_APP_NAME in env")
+
+  const net_name = `${RB_APP_NAME}-network`
+
+  const nets = get_networks()
+
+  const target_net = nets.find((n) => n.Name === net_name)
+
+  if (!target_net) {
+    execSync(`docker network create ${net_name}`)
+    console.log("created docker network:", net_name)
+  }
 }
 
 module.exports = docker_runtime_check

package/src/start_command.js

@@ -1,10 +1,8 @@
 /* @flow */
-const debug = require("debug")("rb-cli")
+// const debug = require("debug")("rb-cli")
 const path = require("path")
-const fs = require("fs")
 const colors = require("picocolors")
-const concurrently = require("concurrently")
-const {exec} = require("child_process")
+const {spawn} = require("child_process")
 
 const {hideBin} = require("yargs/helpers")
 
@@ -15,109 +13,49 @@ const verify_project = require("./verify_project")
 
 
 const start_command = async(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 = []
-
-  run_configs.forEach((cfg) => {
-    let name
-    let command
-    let prefixColor
-    // client
-    if (cfg.type === "client") {
-      name = "client"
-      // command = "yarn dev"
-      command = "./node_modules/.bin/bundler-client dev"
-      prefixColor = "#C678DD"
-    // server
-    } else if (cfg.type === "server") {
-      name = "server"
-      command = "./node_modules/.bin/bundler-server dev"
-      prefixColor = "#61AFEF"
-    // agent
-    } else if (cfg.type === "agent") {
-      name = "agent"
-      command = "./node_modules/.bin/rb agent"
-      prefixColor = "#4DB33D"
-    } else {
-      throw new Error("unknown cfg.type")
-    }
-
-    // pass through listed args to client and server
-    if (["client", "server"].includes(cfg.type)) {
-      command = `${command} ${hideBin(process.argv).join(" ")}`
-    }
-
-    // add command
-    run_commands.push({
-      name,
-      command,
-      prefixColor,
-      cwd: cfg.working_dir,
-      env: process.env,
-    })
-  })
-
-  // check if docker is installed and running
+  // check if docker is installed and running, and there is the proper network
   docker_runtime_check()
 
   // start the tailscale tunnel
-  tailscale_tunnel.start(run_configs)
+  console.log("Warning: tmp disabled tailscale tunnels")
+  // tailscale_tunnel.start(run_configs)
 
-  let project_errors
-
-  const {result, commands} = concurrently(run_commands, {
-    killOthers: ["success", "failure"],
-    // prefix: "none",
-    handleInput: true,
-    defaultInputTarget: "server",
-  })
-
-  result
-    .then(() => {
-      console.log("Done.")
-    })
-    .catch((err) => {
-      if (project_errors?.length >  0) {
-        console.log(`\n${colors.bold("exited due to configuration errors:")}`)
-        project_errors.forEach((err) => {
-          console.log(err)
-        })
-      }
-    })
+  const cwd = process.cwd()
 
-  debug("run_configs", run_configs)
+  const working_dir = path.join(cwd, "./server/server")
+  const command = "./node_modules/.bin/bundler-server"
 
-  // asynchronously verify project config and kill process if any error
-  const configs = run_configs
-    .filter(({type}) => ["client", "server"].includes(type))
+  const ps = spawn(command, ["dev", ...hideBin(process.argv)], {cwd: working_dir, stdio: "inherit", shell: true})
 
-  project_errors = await verify_project(configs)
+  ps.on("close", (code) => {
+    // tailscale_tunnel.stop(run_configs)
+    console.log("Done.")
+  })
 
-  if (project_errors.length > 0) {
-    commands.forEach((c) => {
-      c.kill()
-    })
-  }
+  // let project_errors
+  // result
+  //   .then(() => {
+  //     console.log("Done.")
+  //   })
+  //   .catch((err) => {
+  //     if (project_errors?.length >  0) {
+  //       console.log(`\n${colors.bold("exited due to configuration errors:")}`)
+  //       project_errors.forEach((err) => {
+  //         console.log(err)
+  //       })
+  //     }
+  //   })
+
+  // project_errors = await verify_project(configs)
+
+  // if (project_errors.length > 0) {
+  //   commands.forEach((c) => {
+  //     c.kill()
+  //   })
+  // }
 
   // server cmd to stop tailscale serve
-  const server_command = commands.find((c) => c.name === "server")
-
-  server_command.process.on("close", () => {
-    tailscale_tunnel.stop(run_configs)
-  })
-
+  // const server_command = commands.find((c) => c.name === "server")
 }
 
 module.exports = start_command