@rpcbase/server 0.284.0 → 0.285.0

package/cli/run_native.js

@@ -42,8 +42,6 @@ const get_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)
-
   // TODO: add a redis cache
   const processes = [
     // web server

package/package.json

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

package/queue/index.js

@@ -9,26 +9,26 @@ const hostname = is_docker() ? "worker-queue" : "127.0.0.1"
 
 const worker_queue_url = `redis://${hostname}:${WORKER_QUEUE_PORT}`
 
-const QUEUE_NAME = "worker-queue"
+// TODO: implement latency queues
+const QUEUE_DEFAULT_NAME = "rb-queue-default"
+// const QUEUE_10S_NAME
 
 const tasks_list = Object.create(null)
 
 let worker_queue
 
 const get_instance = () => {
-  if (!worker_queue) worker_queue = new Queue(QUEUE_NAME, worker_queue_url)
+  if (!worker_queue) worker_queue = new Queue(QUEUE_DEFAULT_NAME, worker_queue_url)
   return worker_queue
 }
 
 
 const worker_add = async(task_name, payload, options) => {
   if (!worker_queue) {
-    worker_queue = new Queue(QUEUE_NAME, worker_queue_url)
+    worker_queue = new Queue(QUEUE_DEFAULT_NAME, worker_queue_url)
   }
   const res = await worker_queue.add({task_name, payload}, options)
   console.log("worker_add:created task:", task_name, res.id)
-  // console.log(payload)
-  // console.log("\n")
   return res
 }
 
@@ -52,7 +52,7 @@ const get_tasks = () => tasks_list
 const start_worker = async() => {
   console.log("start worker queue", worker_queue_url)
 
-  worker_queue = new Queue(QUEUE_NAME, worker_queue_url)
+  worker_queue = new Queue(QUEUE_DEFAULT_NAME, worker_queue_url)
 
   // error handler
   worker_queue.on("error", (err) => {

package/src/auth/get_account.js

@@ -0,0 +1,36 @@
+/* @flow */
+const assert = require("assert")
+
+const mongoose = require("../../mongoose")
+
+
+const get_account = async(payload, ctx) => {
+  const {user_id} = payload
+  assert(user_id, "missing user_id")
+
+  const User = mongoose.model("User")
+
+  // verify we are only requesting our own account's info
+  const session_user_id = ctx.req.session.user_id
+  assert(user_id === session_user_id, "user ids don't match")
+
+  const user = await User.findOne(
+    {_id: user_id},
+    {
+      email: 1,
+      first_name: 1,
+      last_name: 1,
+      initials: 1,
+      avatar_color: 1,
+    },
+    {ctx},
+  )
+
+  return {
+    status: "ok",
+    // when user has been deleted return null, this case shouldn't really happen though
+    user: user?.toObject() || null,
+  }
+}
+
+module.exports = get_account

package/src/auth/get_accounts.js

@@ -0,0 +1,42 @@
+/* @flow */
+const Promise = require("bluebird")
+
+const get_account = require("./get_account")
+
+
+const is_dev = process.env.NODE_ENV === "development"
+
+// TODO: RM this method when live reload works in dev mode behind the reverse proxy
+const MAX_CONCURRENCY = 256
+
+const get_accounts = async(payload, ctx) => {
+  if (!is_dev)
+    throw new Error(
+      "cannot call the get_accounts api when NODE_ENV isn't development, this api must be called through the reverse proxy",
+    )
+
+  const user_ids = [ctx.req.session.user_id, ctx.req.session.user_id, ctx.req.session.user_id]
+
+  const accounts = await Promise.map(
+    user_ids,
+    async(user_id) => {
+      if (!user_id) return null
+      const res = await get_account({user_id}, ctx)
+
+      return {
+        user: res.user,
+        tenant: {
+          name: "MOCK",
+        },
+      }
+    },
+    {concurrency: MAX_CONCURRENCY},
+  )
+
+  return {
+    status: "ok",
+    accounts: accounts.filter((account) => !!account),
+  }
+}
+
+module.exports = get_accounts

package/src/auth/index.js

@@ -1,5 +1,6 @@
 /* @flow */
 const async_wrapper = require("../helpers/async_wrapper")
+const handler_wrapper = require("../helpers/handler_wrapper")
 
 const sign_up = require("./sign_up")
 const sign_in = require("./sign_in")
@@ -8,38 +9,19 @@ const reset_password = require("./reset_password")
 const set_new_password = require("./set_new_password")
 const check_session = require("./check_session")
 
+const get_accounts = require("./get_accounts")
+const get_account = require("./get_account")
 
-const sign_in_handler = async(req, res) => {
-  const result = await sign_in(req.body, {req, res})
-  res.json(result)
-}
-
-const sign_out_handler = async(req, res) => {
-  const result = await sign_out(req.body, {req, res})
-  res.json(result)
-}
-
-const reset_password_handler = async(req, res) => {
-  const result = await reset_password(req.body, {req, res})
-  res.json(result)
-}
-
-const set_new_password_handler = async(req, res) => {
-  const result = await set_new_password(req.body, {req, res})
-  res.json(result)
-}
-
-const check_session_handler = async(req, res) => {
-  const result = await check_session(req.body, {req, res})
-  res.json(result)
-}
 
 module.exports = (app) => {
-  app.post("/api/v1/auth/sign_in", async_wrapper(sign_in_handler))
-  app.post("/api/v1/auth/sign_out", async_wrapper(sign_out_handler))
+  app.post("/api/v1/auth/sign_in", handler_wrapper(sign_in))
+  app.post("/api/v1/auth/sign_out", handler_wrapper(sign_out))
+
+  app.post("/api/v1/auth/reset_password", handler_wrapper(reset_password))
+  app.post("/api/v1/auth/set_new_password", handler_wrapper(set_new_password))
 
-  app.post("/api/v1/auth/reset_password", async_wrapper(reset_password_handler))
-  app.post("/api/v1/auth/set_new_password", async_wrapper(set_new_password_handler))
+  app.post("/api/v1/auth/check_session", handler_wrapper(check_session))
 
-  app.post("/api/v1/auth/check_session", async_wrapper(check_session_handler))
+  app.post("/api/v1/auth/get_account", handler_wrapper(get_account))
+  app.post("/api/v1/auth/get_accounts", handler_wrapper(get_accounts))
 }

package/src/helpers/handler_wrapper.js

@@ -0,0 +1,11 @@
+/* @flow */
+const async_wrapper = require("./async_wrapper")
+
+
+const handler_wrapper = (fn) =>
+  async_wrapper(async(req, res) => {
+    const result = await fn(req.body, {req, res})
+    res.json(result)
+  })
+
+module.exports = handler_wrapper