@rpcbase/server 0.2.0 → 0.6.0

package/bin.js

@@ -0,0 +1,33 @@
+#!/usr/bin/env node
+/* @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("./cli/start_server")
+
+let is_command = false
+
+const args = yargs(hideBin(process.argv))
+  .command("start", "run server/infrastructure", () => {}, (argv) => {
+    is_command = true
+    console.log("run start server/infrastructure")
+    start_server()
+  })
+  .command("ping", "ping", () => {}, (argv) => {
+    is_command = true
+    console.log("OING")
+  })
+  .option("verbose", {
+    alias: "v",
+    type: "boolean",
+    default: false,
+    description: "Run with verbose logging"
+  })
+  .parse()
+
+if (!is_command) {
+  console.log("default command")
+}

package/cli/start_server.js

@@ -0,0 +1,34 @@
+/* @flow */
+const {execSync} = require("child_process")
+const path = require("path")
+const fs = require("fs")
+
+const is_production = "yes" === process.env.INFRASTRUCTURE_IS_PRODUCTION
+
+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`
+
+  console.log("RUN", cmd)
+  execSync(cmd, {stdio: "inherit", cwd: infrastructure_dir})
+
+}
+
+module.exports = start_server

package/client/client_router.js

@@ -5,6 +5,11 @@ 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) => {
@@ -12,36 +17,38 @@ const async_wrapper = fn => (req, res, next) => {
     .catch(next)
 }
 
+const get_client_routes = () => {
+  const client_files = glob.sync(path.join(client_build_dir, "./**/*"))
+  const routes = client_files
+    .filter((f) => {
+      const stat = fs.statSync(f)
+      return !stat.isDirectory()
+    })
+    .map((f) => `/${path.relative(client_build_dir, f)}`)
+  return routes
+}
+
 
 const client_router = (app) => {
+  const client_routes = get_client_routes()
 
   app.get("*", async_wrapper(async(req, res, next) => {
-    console.log("client router wow", req)
-    next()
+    const full_path = req.baseUrl + req.path
+
+    if (full_path.startsWith("/api/") || full_path.startsWith("/rpc/")) {
+      return next()
+    }
+
+    if (client_routes.indexOf(full_path) > -1) {
+      const file_path = path.join(client_build_dir, full_path)
+      return res.sendFile(file_path)
+    } else {
+      res.writeHead(200, {
+        "Content-Type": "text/html"
+      })
+      res.end(index_file_buffer)
+    }
   }))
-
-  // const rpc_routes = glob.sync(path.join(build_dir, "./rpc/*"))
-  //
-  // rpc_routes.forEach((file_path) => {
-  //   const basename = path.basename(file_path)
-  //   const route_path = basename.replace(/__slash__/g, "/")
-  //   const module_path = path.join(src_path, `${route_path}.js`)
-  //
-  //   // if module not found, remove created route file
-  //   if (!fs.existsSync(module_path)) {
-  //     fs.unlinkSync(file_path)
-  //     console.log("removed inexistant rpc route", basename, "with module path", module_path)
-  //   }
-  //
-  //   const rpc_fn = require(module_path)
-  //   app.post(`/rpc/${route_path}`, async_wrapper(async(req, res) => {
-  //     // console.log("GOT REQ", req.body)
-  //     const result = await rpc_fn(req.body, req)
-  //     // console.log("rpc", route_path, result)
-  //     res.json(result)
-  //   }))
-  // })
-
 }
 
 module.exports = client_router

package/package.json

@@ -1,12 +1,19 @@
 {
   "name": "@rpcbase/server",
-  "version": "0.2.0",
+  "version": "0.6.0",
   "license": "SSPL-1.0",
   "main": "./index.js",
+  "bin": {
+    "rb-server": "./bin.js"
+  },
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 0"
   },
   "dependencies": {
-    "glob": "7.2.0"
+    "connect-redis": "6.0.0",
+    "dotenv": "10.0.0",
+    "glob": "7.2.0",
+    "redis": "3.1.2",
+    "yargs": "17.3.0"
   }
 }