@rpcbase/server 0.5.0 → 0.9.0

package/bin.js

@@ -2,10 +2,11 @@
 /* @flow */
 const path = require("path")
 require("dotenv").config({path: path.join(__dirname, "./.env")})
+
 const yargs = require("yargs/yargs")
 const {hideBin} = require("yargs/helpers")
 
-const start_server = require("./start_server")
+const start_server = require("./cli/start_server")
 
 let is_command = false
 

package/cli/start_server.js

@@ -1,11 +1,37 @@
 /* @flow */
 const {execSync} = require("child_process")
+const path = require("path")
+const fs = require("fs")
+
+const is_production = "yes" === process.env.INFRASTRUCTURE_IS_PRODUCTION
+
+// TODO: auto create network if necessary
+// docker network create local-network
 
 const start_server = async() => {
+  if (is_production) {
+    console.log("server will run in production")
+  }
+
+  const infrastructure_dir = path.join(process.cwd(), "../infrastructure")
+
+  // env
+  const env_path = path.relative(infrastructure_dir, path.join(process.cwd(), "./.env"))
+
+  // prefix
+  const proj_parent_dir = path.join(infrastructure_dir, "../../")
+  const proj_prefix = path.basename(proj_parent_dir)
+
+  // compose files
+  const compose_files = ["-f common.yml"]
+  if (is_production) compose_files.push("-f prod.yml")
+  else compose_files.push("-f dev.yml")
+
+  const cmd = `docker-compose --env-file ${env_path} -p ${proj_prefix} ${compose_files.join(" ")} up --build --remove-orphans`
 
-  execSync("docker-compose --help", {stdio: "inherit"})
+  console.log("RUN", cmd)
+  execSync(cmd, {stdio: "inherit", cwd: infrastructure_dir})
 
-  console.log("Done.")
 }
 
 module.exports = start_server

package/client/client_router.js

@@ -6,12 +6,10 @@ const glob = require("glob")
 const src_path = path.join(process.cwd(), "./src/")
 const build_dir = path.join(process.cwd(), "build/")
 const client_build_dir = path.join(build_dir, "./client")
-const index_file_buffer = fs.readFileSync(path.join(client_build_dir, "./index.html"))
 
 
 // TODO: add build time static assets compression
 
-
 const async_wrapper = fn => (req, res, next) => {
   Promise.resolve(fn(req, res, next))
     .catch(next)
@@ -32,6 +30,14 @@ const get_client_routes = () => {
 const client_router = (app) => {
   const client_routes = get_client_routes()
 
+  const index_file_path = path.join(client_build_dir, "./index.html")
+  if (!fs.existsSync(index_file_path)) {
+    console.log("index file not found, skipping server:client_router")
+    return
+  }
+
+  const index_file_buffer = fs.readFileSync(index_file_path)
+
   app.get("*", async_wrapper(async(req, res, next) => {
     const full_path = req.baseUrl + req.path
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rpcbase/server",
-  "version": "0.5.0",
+  "version": "0.9.0",
   "license": "SSPL-1.0",
   "main": "./index.js",
   "bin": {
@@ -11,6 +11,7 @@
   },
   "dependencies": {
     "connect-redis": "6.0.0",
+    "dotenv": "10.0.0",
     "glob": "7.2.0",
     "redis": "3.1.2",
     "yargs": "17.3.0"