@rpcbase/server 0.62.0 → 0.63.0

package/cli/get_runtime.js

@@ -3,7 +3,6 @@ const os = require("os")
 
 const get_runtime = () => {
   if (os.platform() === "darwin") {
-    console.warn("warning22222: native mode is tmp disabled")
     return "native"
   } else {
     return "docker"

package/cli/run_docker.js

@@ -1,7 +1,9 @@
 /* @flow */
-const {exec} = require("child_process")
+const {spawn} = require("child_process")
 const path = require("path")
 
+const chalk = require("chalk")
+
 const is_production = "yes" === process.env.INFRASTRUCTURE_IS_PRODUCTION
 
 const run_docker = async(infrastructure_dir, proj_prefix, is_native) => {
@@ -9,28 +11,45 @@ const run_docker = async(infrastructure_dir, proj_prefix, is_native) => {
   const env_path = path.relative(infrastructure_dir, path.join(process.cwd(), "./.env"))
 
   // compose files
-  const compose_files = ["-f common.yml"]
+  const compose_files = ["-f", "common.yml"]
   if (!is_native) {
-    compose_files.push("-f native.yml")
+    compose_files.push("-f", "native.yml")
   }
   if (is_production) {
-    compose_files.push("-f prod.yml")
+    compose_files.push("-f", "prod.yml")
   }
-  else compose_files.push("-f dev.yml")
+  else compose_files.push("-f", "dev.yml")
 
   const opts = ["--build", "--remove-orphans"]
   if (!is_production) opts.push("--abort-on-container-exit")
 
-  const cmd = `docker-compose --env-file ${env_path} -p ${proj_prefix} ${compose_files.join(" ")} up ${opts.join(" ")}`
-
-  console.log(cmd)
+  const cmd = "docker-compose"
+  // const cmd_args = `--env-file ${env_path} -p ${proj_prefix} ${compose_files.join(" ")} up ${opts.join(" ")}`
+  const cmd_args = ["--env-file", env_path, "-p", proj_prefix, ...compose_files, "up", ...opts]
+
+  console.log(cmd_args.join(" "))
+
+  const ps = spawn(cmd, cmd_args, {cwd: infrastructure_dir})
+  ps.stdout.on("data", (data) => {
+    const lines = data.toString().split("\n")
+    lines.forEach((line) => {
+      if (line.trim() === "") {
+        return
+      }
+      process.stdout.write(`${chalk.cyan("docker")}: ${line}`)
+    })
+  })
 
-  exec(cmd, {stdio: "inherit", cwd: infrastructure_dir}, (err) => {
-    if (err) {
-      console.log("GOT ERRR", err)
-    }
-    console.log("docker process exited")
+  ps.stderr.on("data", (data) => {
+    const lines = data.toString().split("\n")
+    lines.forEach((line) => {
+      if (line.trim() === "") {
+        return
+      }
+      process.stdout.write(`${chalk.cyan("docker")}: ${chalk.yellow(line)}\n`)
+    })
   })
+
   // try {
   //
   // } catch (err) {

package/express/index.js

@@ -56,7 +56,7 @@ module.exports = () => {
 
   app.get("/api/ping", (req, res) => res.json({message: "pong"}))
   app.post("/api/ping", (req, res) => res.json({message: "pong"}))
-  console.log("WITH COVERAGE WOW")
+
   dev_save_coverage(app)
 
   return app

package/index.js

@@ -5,6 +5,7 @@ const express = require("./express")
 const rpc_router = require("./rpc/rpc_router")
 
 
+
 module.exports = {
   client_router,
   database,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rpcbase/server",
-  "version": "0.62.0",
+  "version": "0.63.0",
   "license": "SSPL-1.0",
   "main": "./index.js",
   "bin": {