@rpcbase/server 0.98.0 → 0.100.0

package/cli/run_native.js

@@ -11,6 +11,8 @@ const mkdirp = require("mkdirp")
 // TODO: verify mongod and redis-sever and elasticsearch executables are present
 // and have the right version
 
+const is_production = process.env.NODE_ENV === "production"
+
 const NO_PRINT_LIST = [
   // "database",
 ]
@@ -119,6 +121,10 @@ const init_processes = (args) => {
         "-s",
         "-E", `path.logs=${logs_dir}`,
         "-E", `http.port=${env.SEARCH_INDEX_PORT}`,
+        ...(is_production ? [] : [
+          "-E", `http.cors.enabled=true`,
+          "-E", `http.cors.allow-origin=http://localhost:8080`,
+        ]),
         "-E", `path.data=${data_dir}`,
         "-E", "discovery.type=single-node",
         "-E", "ingest.geoip.downloader.enabled=false",
@@ -155,7 +161,7 @@ const run_native = (infrastructure_dir, proj_prefix, args) => {
       let prefix = ""
       // avoid printing [server] server:
       if (!args.verbose && item.name !== "server") {
-        prefix = `${colors.green(item.name)}: `
+        prefix = `${colors.green(item.name)}:`
       }
 
       ps.stdout.on("data", (data) => {

package/express/session_middleware.js

@@ -5,14 +5,16 @@ const validator = require("validator")
 const {createClient} = require("redis")
 const redis_store = require("connect-redis")(session)
 
+
+const {SESSION_STORE_PORT, CONTAINER_MODE} = process.env
+
 const log = debug("rb:session")
+// log.useColors = true
 
 // WARNING:
 // https://stackoverflow.com/questions/70867229/error-connection-timeout-when-connecting-to-redis-docker-instance
 // https://github.com/redis/node-redis/issues/1656/
 
-const {SESSION_STORE_PORT, CONTAINER_MODE} = process.env
-
 if (typeof SESSION_STORE_PORT === "string" && !validator.isPort(SESSION_STORE_PORT)) {
   throw new Error("expected SESSION_STORE_PORT to be a valid port number")
 }

package/mongoose/index.js

@@ -1,8 +1,5 @@
 /* @flow */
 const mongoose = require("mongoose")
 
-// override register model method to keep track of all registered models
-// console.log("MONGOOSE", mongoose)
-
 
 module.exports = mongoose

package/package.json

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

package/queue/index.js

@@ -69,6 +69,10 @@ const get_instance = () => {
   return worker_queue
 }
 
+// TMP used to create additional queues, should be implemented with a better API in the future
+const get_url = () => {
+  return worker_queue_url
+}
 
 module.exports = {
   start: start_worker,
@@ -76,4 +80,5 @@ module.exports = {
   get_tasks,
   add: worker_add,
   instance: get_instance,
+  get_url,
 }

package/src/auth/check_session.js

@@ -1,8 +1,10 @@
 /* @flow */
 const debug = require("debug")
 
+const User = require("../models/User")
 
 const log = debug("rb:auth:check_session")
+log.useColors = true
 
 
 const check_session = async(payload, ctx) => {
@@ -10,14 +12,23 @@ const check_session = async(payload, ctx) => {
 
   log("session:", req.session)
 
-  const is_signed_in = !!req.session.user_id
+  let is_signed_in = !!req.session.user_id
 
   log("is_signed_in:", is_signed_in)
 
+  // check if user exists
+  const user = await User.findOne({_id: req.session.user_id}, {_id: 1})
+  if (!user) {
+    is_signed_in = false
+    req.session.destroy(/* TODO: this should take callback */)
+  }
+
+  // TODO: check if user is disabled or blocked
+
   return {
     status: "ok",
     is_signed_in,
-    user_id: req.session.user_id,
+    user_id: req.session?.user_id,
   }
 }
 

package/src/models/User.js

@@ -6,6 +6,9 @@ const User = mongoose.model("User", {
     type: String,
     default: "",
   },
+  avatar_url: {
+    type: String,
+  },
   email: String,
   is_email_verified: {
     type: Boolean,