@rpcbase/server 0.262.0 → 0.264.0

package/cli/get_runtime.js

@@ -1,18 +1,9 @@
 /* @flow */
-const os = require("os")
+const is_docker = require("@rpcbase/std/is_docker")
 
-const {CONTAINER_MODE} = process.env
 
 const get_runtime = () => {
-  if (CONTAINER_MODE === "docker") {
-    return "docker"
-  }
-
-  if (os.platform() === "darwin") {
-    return "native"
-  } else {
-    return "docker"
-  }
+  return is_docker() ? "docker" : "native"
 }
 
 module.exports = get_runtime

package/cli/run_native.js

@@ -168,8 +168,7 @@ const run_native = (infrastructure_dir, proj_prefix, args) => {
 
   const run_process = (item) => {
     const ps_env = {
-      ...process.env,
-      CONTAINER_MODE: "native",
+      ...process.env
     }
 
     if (args.sessions) {

package/cli/start_server_infrastructure.js

@@ -12,7 +12,6 @@ const get_runtime = require("./get_runtime")
 const start_server = async(args) => {
   const infrastructure_dir = path.join(process.cwd(), "../infrastructure")
 
-  // TODO: remove and rely on container_mode only
   const runtime = get_runtime()
 
   // prefix

package/database.js

@@ -1,6 +1,8 @@
 /* @flow */
 const isPort = require("validator/lib/isPort")
 
+const is_docker = require("@rpcbase/std/is_docker")
+
 const mongoose = require("./mongoose")
 
 const pack = require("./package.json")
@@ -11,7 +13,7 @@ require("./src/models/Invite")
 require("./src/models/ResetPasswordToken")
 
 
-const {DATABASE_NAME, DATABASE_PORT, CONTAINER_MODE} = process.env
+const {DATABASE_NAME, DATABASE_PORT} = process.env
 
 
 // database can be set by env variable or passed as paramaters to
@@ -24,7 +26,7 @@ if (typeof DATABASE_NAME !== "string") {
   throw new Error("expected DATABASE_NAME to be a string")
 }
 
-const hostname = CONTAINER_MODE === "native" ? "127.0.0.1" : "database"
+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.262.0",
+  "version": "0.264.0",
   "license": "SSPL-1.0",
   "main": "./index.js",
   "bin": {
@@ -11,19 +11,19 @@
   },
   "dependencies": {
     "@rpcbase/access-control": "0.27.0",
-    "@rpcbase/agent": "0.32.0",
-    "@rpcbase/std": "0.11.0",
-    "@sentry/node": "7.71.0",
+    "@rpcbase/agent": "0.33.0",
+    "@rpcbase/std": "0.12.0",
+    "@sentry/node": "7.72.0",
     "bluebird": "3.7.2",
     "body-parser": "1.20.2",
     "bull": "4.11.3",
-    "connect-redis": "6.1.3",
+    "connect-redis": "7.1.0",
     "cors": "2.8.5",
     "debug": "4.3.4",
     "dotenv": "16.3.1",
     "express": "4.18.2",
     "express-session": "1.17.3",
-    "firebase-admin": "11.10.1",
+    "firebase-admin": "11.11.0",
     "glob": "9.3.5",
     "lodash": "4.17.21",
     "mkdirp": "2.1.3",

package/queue/index.js

@@ -1,13 +1,16 @@
 /* @flow */
 const Queue = require("bull")
 
-const {WORKER_QUEUE_PORT, CONTAINER_MODE} = process.env
-const hostname = CONTAINER_MODE === "native" ? "127.0.0.1" : "worker-queue"
+const is_docker = require("@rpcbase/std/is_docker")
+
+const {WORKER_QUEUE_PORT} = process.env
+
+const hostname = is_docker() ? "worker-queue" : "127.0.0.1"
+
 const worker_queue_url = `redis://${hostname}:${WORKER_QUEUE_PORT}`
 
 const QUEUE_NAME = "worker-queue"
 
-
 const tasks_list = Object.create(null)
 
 let worker_queue

package/src/sessions/session_store_middleware.js

@@ -4,10 +4,10 @@ const debug = require("debug")
 const session = require("express-session")
 const validator = require("validator")
 const {createClient} = require("redis")
-const redis_store = require("connect-redis")(session)
+const RedisStore = require("connect-redis").default
 
 
-const {SESSION_STORE_PORT, CONTAINER_MODE, APP_DOMAIN} = process.env
+const {SESSION_STORE_PORT, APP_DOMAIN} = process.env
 assert(SESSION_STORE_PORT, "SESSION_STORE_PORT is undefined")
 
 
@@ -22,9 +22,8 @@ if (typeof SESSION_STORE_PORT === "string" && !validator.isPort(SESSION_STORE_PO
   throw new Error("expected SESSION_STORE_PORT to be a valid port number")
 }
 
-const hostname = CONTAINER_MODE === "native" ? "127.0.0.1" : "session-store"
+const hostname = is_docker() ? "session-store" : "127.0.0.1"
 
-console.log("COTNAINER")
 console.log("session-store hostname", hostname, "port", SESSION_STORE_PORT)
 
 let session_middleware = null
@@ -60,7 +59,7 @@ setTimeout(async() => {
   const res = await redis_client.connect()
 
   const session_config = {
-    store: new redis_store({client: redis_client}),
+    store: new RedisStore({client: redis_client}),
     proxy: true,
     saveUninitialized: false,
     // WARNING DO NOT USE IN PROD
@@ -77,7 +76,7 @@ setTimeout(async() => {
   // WARNING: apparently doesn't work on localhost or .local domains
   // https://stackoverflow.com/questions/1134290/cookies-on-localhost-with-explicit-domain
   // TODO: WTF IS THIS
-  // if (CONTAINER_MODE !== "native" && typeof APP_DOMAIN === "string" && APP_DOMAIN.trim() !== "") {
+  // if (is_docker() && typeof APP_DOMAIN === "string" && APP_DOMAIN.trim() !== "") {
   //   log("\n\n")
   //   log("SETTING COOKIE DOMAIN TO", APP_DOMAIN)
   //   log("SETTING secure", APP_DOMAIN)
@@ -90,8 +89,6 @@ setTimeout(async() => {
 
 
   session_middleware = session(session_config)
-
-// TODO: is this still necessary
 }, 200)