@rpcbase/server 0.80.0 → 0.83.0

package/cli/run_native.js

@@ -40,7 +40,7 @@ const init_processes = (args) => {
   const worker_queue_dir = path.join(process.cwd(), "../infrastructure/data/worker-queue/data")
   const worker_queue_logs_path = path.join(process.cwd(), "../infrastructure/data/worker-queue/log/logs.txt")
 
-  console.log("WORKER QUEUE ON PORT", env.WORKER_QUEUE_PORT)
+  // console.log("WORKER QUEUE ON PORT", env.WORKER_QUEUE_PORT)
 
   // TODO: add a redis cache
   const processes = [

package/database.js

@@ -4,6 +4,9 @@ const isPort = require("validator/lib/isPort")
 
 const {DATABASE_NAME, DATABASE_PORT, CONTAINER_MODE} = process.env
 
+
+// database can be set by env variable or passed as paramaters to
+
 if (typeof DATABASE_PORT !== "string" || !isPort(DATABASE_PORT)) {
   throw new Error("expected DATABASE_PORT to be a valid port number")
 }
@@ -17,7 +20,8 @@ const hostname = CONTAINER_MODE === "native" ? "localhost" : "database"
 const mongo_url = `mongodb://${hostname}:${DATABASE_PORT}/${DATABASE_NAME}?directConnection=true&replicaSet=rs0`
 
 
-module.exports = async() => {
+// TODO: handle multiple databases, remove DATABASE_NAME env ??
+module.exports = async(...database_names) => {
   // set listeners before attempting to connect
   mongoose.connection.on("connected", () => {
     console.log("mongoose connected")

package/express/dev_stop_timeout.js

@@ -0,0 +1,27 @@
+/* @flow */
+
+const DEFAULT_EMPTY_TIMEOUT = 1000 * 60 * 60 // 1h
+const is_production = process.env.NODE_ENV === "production"
+
+let _req_count = 0
+
+
+module.exports = (app) => {
+
+  if (!is_production) {
+    app.use((req, res, next) => {
+      _req_count++
+      next()
+    })
+
+    setInterval(() => {
+      // no requests -> shutdown
+      if (_req_count === 0) {
+        console.log("dev::incoming requests 0, exiting due to timeout")
+        process.exit(0)
+      } else {
+        _req_count = 0
+      }
+    }, DEFAULT_EMPTY_TIMEOUT)
+  }
+}

package/express/index.js

@@ -2,11 +2,13 @@
 const cors = require("cors")
 const express = require("express")
 const body_parser = require("body-parser")
+const request_ip = require("request-ip")
 
 // functionality middlewares
 const auth = require("../src/auth")
 
 const dev_save_coverage = require("./dev_save_coverage")
+const dev_stop_timeout = require("./dev_stop_timeout")
 const session_middleware = require("./session_middleware")
 
 
@@ -16,6 +18,9 @@ const {APP_DOMAIN, CLIENT_PORT} = process.env
 
 module.exports = () => {
   const app = express()
+
+  app.use(request_ip.mw())
+
   app.use(body_parser.json({limit: "2mb"}))
 
   app.set("trust proxy", 1)
@@ -63,7 +68,9 @@ module.exports = () => {
   app.post("/api/ping", (req, res) => res.json({message: "pong"}))
 
   auth(app)
+
   dev_save_coverage(app)
+  dev_stop_timeout(app)
 
   return app
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rpcbase/server",
-  "version": "0.80.0",
+  "version": "0.83.0",
   "license": "SSPL-1.0",
   "main": "./index.js",
   "bin": {
@@ -26,6 +26,7 @@
     "picocolors": "1.0.0",
     "postmark": "3.0.12",
     "redis": "4.2.0",
+    "request-ip": "3.3.0",
     "validator": "13.7.0",
     "yargs": "17.5.1"
   }