@rpcbase/server 0.71.0 → 0.74.0

package/bin.js

@@ -6,12 +6,14 @@ require("dotenv").config({path: path.join(__dirname, "./.env")})
 const yargs = require("yargs/yargs")
 const {hideBin} = require("yargs/helpers")
 
+const pack = require("./package.json")
 const start_server_infrastructure = require("./cli/start_server_infrastructure")
 const build_server = require("./cli/build_server")
 const run_agent = require("./cli/run_agent")
 
 let is_command = false
 
+console.log("PACKVER", pack.version)
 
 const args = yargs(hideBin(process.argv))
   .command("start", "runs server/infrastructure", () => {}, (args) => {
@@ -22,7 +24,7 @@ const args = yargs(hideBin(process.argv))
     is_command = true
     run_agent()
   })
-  .command("build", "build server", () => {}, (args) => {
+  .command("build", "Build the server package", () => {}, (args) => {
     is_command = true
     build_server()
   })

package/cli/run_native.js

@@ -11,6 +11,10 @@ const mkdirp = require("mkdirp")
 // TODO: verify mongod and redis-sever and elasticsearch executables are present
 // and have the right version
 
+const NO_PRINT_LIST = [
+  // "database",
+]
+
 // load env
 const get_env = () => {
   const env_path = path.join(process.cwd(), "./.env")
@@ -19,17 +23,22 @@ const get_env = () => {
   return env
 }
 
-const init_processes = () => {
+const init_processes = (args) => {
   const env = get_env()
 
   const infrastructure_conf_dir = path.join(__dirname, "../infrastructure")
 
-  // create data dirs
+  // db storage
   const db_path = path.join(process.cwd(), "../infrastructure/data/database/db/")
-  const db_logs_path = path.join(process.cwd(), "../infrastructure/data/database/log/")
 
+  // db log file
+  const db_logs_path = path.join(process.cwd(), "../infrastructure/data/database/log/logs.txt")
+
+  // session-store + worker-queue
   const session_store_dir = path.join(process.cwd(), "../infrastructure/data/session-store/data")
+  const session_store_logs_path = path.join(process.cwd(), "../infrastructure/data/session-store/log/logs.txt")
   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")
 
   // TODO: add a redis cache
   const processes = [
@@ -46,14 +55,16 @@ const init_processes = () => {
     {
       name: "database",
       dirs: [
-        db_path, db_logs_path
+        db_path,
+        path.dirname(db_logs_path),
       ],
       cmd: ["mongod", [
         "--quiet",
         "--dbpath", db_path,
         "--port", env.DATABASE_PORT,
         // "--bind_ip_all",
-        // "--logpath", "/var/log/logs.txt",
+        // if in verbose mode, print to stdout, else write to file
+        ...(args.verbose ? [] : ["--logpath", db_logs_path]),
         "--replSet", "rs0"
       ]]
     },
@@ -62,11 +73,13 @@ const init_processes = () => {
       name: "session-store",
       dirs: [
         session_store_dir,
+        path.dirname(session_store_logs_path),
       ],
       cmd: ["redis-server", [
         path.join(infrastructure_conf_dir, "./redis/redis.conf"),
         "--dir", session_store_dir,
         "--port", env.SESSION_STORE_PORT,
+        ...(args.verbose ? [] : ["--logfile", session_store_logs_path]),
       ]]
     },
     // worker-queue
@@ -74,11 +87,13 @@ const init_processes = () => {
       name: "worker-queue",
       dirs: [
         worker_queue_dir,
+        path.dirname(worker_queue_logs_path),
       ],
       cmd: ["redis-server", [
         path.join(infrastructure_conf_dir, "./redis/redis.conf"),
         "--dir", worker_queue_dir,
         "--port", env.WORKER_QUEUE_PORT,
+        ...(args.verbose ? [] : ["--logfile", worker_queue_logs_path]),
       ]]
     },
   ]
@@ -118,22 +133,32 @@ const init_processes = () => {
 
 // TODO: run each native process from list
 // TODO: handle process close
-const run_native = (infrastructure_dir, proj_prefix) => {
-  console.log("running in NATIVE mode")
+const run_native = (infrastructure_dir, proj_prefix, args) => {
+  console.log(`running in ${colors.bold(colors.magenta("NATIVE"))} mode`)
 
-  const processes = init_processes()
+  const processes = init_processes(args)
 
   const run_process = (item) => {
-    // console.log("start process", item)
+    // console.log("run_native:run_process:item", item)
     const ps = spawn(item.cmd[0], item.cmd[1], {env: {...process.env, CONTAINER_MODE: "native"}})
 
-    ps.stdout.on("data", (data) => {
-      process.stdout.write(`${colors.green(item.name)}: ${data.toString()}`)
-    })
+    // TODO: add flag to force print
+    if (!NO_PRINT_LIST.includes(item.name)) {
 
-    ps.stderr.on("data", (data) => {
-      process.stderr.write(`${item.name}: ${data.toString()}`)
-    })
+      let prefix = ""
+      // avoid printing [server] server:
+      if (!args.verbose && item.name !== "server") {
+        prefix = `${colors.green(item.name)}: `
+      }
+
+      ps.stdout.on("data", (data) => {
+        process.stdout.write(`${prefix}${data.toString()}`)
+      })
+
+      ps.stderr.on("data", (data) => {
+        process.stderr.write(`${prefix}${data.toString()}`)
+      })
+    }
   }
 
   const spawned = processes.map(run_process)

package/cli/start_server_infrastructure.js

@@ -19,9 +19,9 @@ const start_server = async(args) => {
   const proj_prefix = path.basename(proj_parent_dir)
 
   if (runtime === "docker") {
-    run_docker(infrastructure_dir, proj_prefix)
+    run_docker(infrastructure_dir, proj_prefix, args)
   } else if (runtime === "native") {
-    run_native(infrastructure_dir, proj_prefix)
+    run_native(infrastructure_dir, proj_prefix, args)
   } else {
     throw new Error("unknown runtime")
   }

package/crypto/index.js

@@ -4,10 +4,12 @@ const crypto = require("crypto")
 const ALGORITHM = "aes-256-cbc"
 const {CRYPTO_SECRET} = process.env
 
-if (!CRYPTO_SECRET || CRYPTO_SECRET === "") {
+if (!CRYPTO_SECRET || CRYPTO_SECRET.trim() === "") {
   throw new Error("CRYPTO_SECRET not found in env")
 }
 
+// TODO: move to rb:std
+
 const key = crypto.createHash("sha256")
   .update(String(CRYPTO_SECRET))
   .digest()

package/database.js

@@ -24,6 +24,7 @@ module.exports = async() => {
   })
 
   mongoose.connection.on("disconnected", (arg) => {
+    // TODO: add tracing
     console.log("Mongoose disconnected", arg)
   })
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rpcbase/server",
-  "version": "0.71.0",
+  "version": "0.74.0",
   "license": "SSPL-1.0",
   "main": "./index.js",
   "bin": {
@@ -10,7 +10,8 @@
     "test": "echo \"Error: no test specified\" && exit 0"
   },
   "dependencies": {
-    "@rpcbase/agent": "0.7.0",
+    "@rpcbase/agent": "0.9.0",
+    "@rpcbase/std": "0.2.0",
     "body-parser": "1.20.0",
     "connect-redis": "6.1.3",
     "cors": "2.8.5",
@@ -19,7 +20,7 @@
     "express": "4.18.1",
     "express-session": "1.17.3",
     "glob": "8.0.3",
-    "mongoose": "6.3.6",
+    "mongoose": "6.4.0",
     "picocolors": "1.0.0",
     "postmark": "3.0.11",
     "redis": "4.1.0",

package/src/auth/sign_in.js

@@ -0,0 +1,44 @@
+/* @flow */
+const {compare_hash} = require("@rpcbase/std/crypto/hash")
+
+const mongoose = require("../../mongoose")
+
+const fail = () => ({
+  errors: {form: "Invalid email or password"}
+})
+
+const sign_in = async({email, password}, ctx) => {
+  const User = mongoose.model("User")
+
+  const {req} = ctx
+
+  // find the matching user
+  // TODO: document ctx param
+  // const user = await User.findOne({email}, null, {ctx})
+  const user = await User.findOne({email}, null)
+
+  // console.log("ICII2222", email, password, user)
+
+  if (!user) {
+    return fail()
+  }
+
+  const hashed_pass = user.password_hash
+
+  // TODO: fix broken bcrypt bins in docker
+  // const is_match = await bcrypt.compare(password, hashed_pass)
+  console.warn("warning: skipping bcrypt hash check")
+  const is_match = await compare_hash(password, hashed_pass)
+
+  if (is_match) {
+    req.session.user_id = user._id.toString()
+    await req.session.save()
+    return {
+      status: "ok"
+    }
+  } else {
+    return fail()
+  }
+}
+
+module.exports = sign_in

package/src/auth/sign_up.js

@@ -0,0 +1,57 @@
+/* @flow */
+const {hash_password} = require("@rpcbase/std/crypto/hash")
+
+const mongoose = require("../../mongoose")
+
+const sign_up = async({email, password}, ctx) => {
+  const User = mongoose.model("User")
+  const Invite = mongoose.model("Invite")
+
+  const {req} = ctx
+
+  // check if the user already exists
+  const existing_user = await User.findOne({email}, null, {ctx})
+
+  if (existing_user) {
+    return {
+      status: "error",
+      message: "User already exists"
+    }
+  }
+
+  // check if we have an invite for this user
+  const invite = await Invite.findOne({email}, null, {ctx})
+  if (invite && !invite.is_ready) {
+    console.log("found an invite, but not ready", email)
+    return {
+      status: "error",
+      message: "Your invite is still pending approval. Expect an email in the next weeks to activate your account."
+    }
+  } else if (!invite) {
+    console.log("no invite for signup email:", email)
+    return {
+      status: "error",
+      message: "No valid invite was found for this email"
+    }
+  }
+
+  const hash = await hash_password(password)
+
+  const user = new User({
+    email,
+    password_hash: hash
+  })
+
+  // sign the user in
+  req.session.user_id = user._id.toString()
+
+  await req.session.save()
+  await user.save({ctx})
+
+  return {
+    status: "ok",
+    user_id: user._id
+  }
+}
+
+module.exports = sign_up

package/{client → src/client}/client_router.js

@@ -3,6 +3,8 @@ const fs = require("fs")
 const path = require("path")
 const glob = require("glob")
 
+const async_wrapper = require("../helpers/async_wrapper")
+
 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")
@@ -10,11 +12,6 @@ const client_build_dir = path.join(build_dir, "./client")
 
 // TODO: add build time static assets compression
 
-const async_wrapper = fn => (req, res, next) => {
-  Promise.resolve(fn(req, res, next))
-    .catch(next)
-}
-
 const get_client_routes = () => {
   const client_files = glob.sync(path.join(client_build_dir, "./**/*"))
   const routes = client_files

package/{rpc → src/rpc}/rpc_router.js

@@ -4,16 +4,12 @@ const path = require("path")
 const glob = require("glob")
 const debug = require("debug")
 
+const async_wrapper = require("../helpers/async_wrapper")
+
 const src_path = path.join(process.cwd(), "./src/")
 const build_dir = path.join(process.cwd(), "build/")
 
 
-const async_wrapper = fn => (req, res, next) => {
-  Promise.resolve(fn(req, res, next))
-    .catch(next)
-}
-
-
 const rpc_router = (app) => {
   const rpc_routes = glob.sync(path.join(build_dir, "./rpc/*"))