@rpcbase/server 0.264.0 → 0.266.0

package/bin.js

@@ -31,7 +31,14 @@ const args = yargs(hideBin(process.argv))
   .option("session", {
     hidden: true,
   })
-  .command("start", "runs server/infrastructure", () => {}, (args) => {
+  .command("start", "runs server/infrastructure", (yargs) => {
+    yargs
+      .option("docker", {
+        type: "boolean",
+        default: false,
+        description: "Run in docker"
+      })
+  }, (args) => {
     is_command = true
     check_args(args)
     start_server_infrastructure(args)

package/cli/start_server_infrastructure.js

@@ -4,15 +4,14 @@ const fs = require("fs")
 
 const run_docker = require("./run_docker")
 const run_native = require("./run_native")
-const get_runtime = require("./get_runtime")
 
 // TODO: auto create network if necessary
-// docker network create local-network
+// docker network create ${RB_INSTANCE_NAME}-network
 
 const start_server = async(args) => {
   const infrastructure_dir = path.join(process.cwd(), "../infrastructure")
 
-  const runtime = get_runtime()
+  const runtime = args.docker ? "docker" : "native"
 
   // prefix
   const proj_parent_dir = path.join(infrastructure_dir, "../../")
@@ -22,8 +21,6 @@ const start_server = async(args) => {
     run_docker(infrastructure_dir, proj_prefix, args)
   } else if (runtime === "native") {
     run_native(infrastructure_dir, proj_prefix, args)
-  } else {
-    throw new Error("unknown runtime")
   }
 }
 

package/database.js

@@ -26,6 +26,8 @@ if (typeof DATABASE_NAME !== "string") {
   throw new Error("expected DATABASE_NAME to be a string")
 }
 
+console.log("IS DOCKERRRRR", is_docker())
+
 const hostname = is_docker() ? "database" : "127.0.0.1"
 
 const mongo_url = `mongodb://${hostname}:${DATABASE_PORT}/${DATABASE_NAME}?directConnection=true&replicaSet=rs0`

package/package.json

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

package/src/sessions/session_store_middleware.js

@@ -6,6 +6,8 @@ const validator = require("validator")
 const {createClient} = require("redis")
 const RedisStore = require("connect-redis").default
 
+const is_docker = require("@rpcbase/std/is_docker")
+
 
 const {SESSION_STORE_PORT, APP_DOMAIN} = process.env
 assert(SESSION_STORE_PORT, "SESSION_STORE_PORT is undefined")

package/cli/get_runtime.js

@@ -1,9 +0,0 @@
-/* @flow */
-const is_docker = require("@rpcbase/std/is_docker")
-
-
-const get_runtime = () => {
-  return is_docker() ? "docker" : "native"
-}
-
-module.exports = get_runtime