@rpcbase/server 0.31.0 → 0.34.0

package/database.js

@@ -2,7 +2,7 @@
 const mongoose = require("mongoose")
 const validator = require("validator")
 
-const {DATABASE_PORT, DATABASE_NAME} = process.env
+const {DATABASE_NAME} = process.env
 
 if (typeof DATABASE_PORT === "string" && !validator.isPort(DATABASE_PORT)) {
   throw new Error("expected DATABASE_PORT to be a valid port number")
@@ -12,11 +12,17 @@ if (typeof DATABASE_NAME !== "string") {
   throw new Error("expected DATABASE_NAME to be a string")
 }
 
-const mongo_url = `mongodb://database:${DATABASE_PORT}/${DATABASE_NAME}`
+const replicaset_str = [0, 1, 2].map((i) => `database${i}:${process.env["DATABASE_PORT_" + i]}`)
+  .join(",")
+
+console.log("db connection str:", replicaset_str)
+
+const mongo_url = `mongodb://${replicaset_str}/${DATABASE_NAME}?`
+  + `replicaSet=rs0&readPreference=secondary`
 
 module.exports = async() => {
-  console.log("ICIIIII", mongo_url)
+  console.log("mongo_url", mongo_url)
   const ret = await mongoose.connect(mongo_url)
-  // TODO: handle connection ret
-  // console.log(ret)
+  console.log("waiting after return", ret)
+  // TODO: handle connection retry and pools
 }

package/express/index.js

@@ -3,7 +3,7 @@ const cors = require("cors")
 const express = require("express")
 const body_parser = require("body-parser")
 
-const session = require("./session")
+const session_middleware = require("./session_middleware")
 
 const is_production = process.env.IS_PRODUCTION === "yes"
 const {APP_DOMAIN, CLIENT_PORT} = process.env
@@ -17,7 +17,6 @@ module.exports = () => {
 
   app.disable("x-powered-by")
 
-
   // tmp disable aggressive caching
   app.set("etag", false)
 
@@ -42,14 +41,16 @@ module.exports = () => {
       "http://localhost:8090",
       "localhost",
     ]
-  console.log("SETUP CORS", cors_origins)
+  // console.log("SETUP CORS", cors_origins)
+
   app.use(cors({
     origin: cors_origins,
     methods: ["GET", "POST"],
     credentials: true // enable set-cookie
   }))
 
-  session(app)
+  console.log("use session middleware")
+  app.use(session_middleware)
 
   app.get("/api/ping", (req, res) => res.json({status: "ok"}))
 

package/express/{session.js → session_middleware.js}

@@ -4,6 +4,7 @@ const redis = require("redis")
 const validator = require("validator")
 const redis_store = require("connect-redis")(session)
 
+
 const {SESSION_STORE_PORT} = process.env
 
 if (typeof SESSION_STORE_PORT === "string" && !validator.isPort(SESSION_STORE_PORT)) {
@@ -12,20 +13,17 @@ if (typeof SESSION_STORE_PORT === "string" && !validator.isPort(SESSION_STORE_PO
 
 const session_store_url = `redis://session-store:${SESSION_STORE_PORT}`
 
+const redis_client = redis.createClient({
+  url: session_store_url
+})
 
-module.exports = (app) => {
-  const redis_client = redis.createClient({
-    url: session_store_url
-  })
+const session_middleware = session({
+  store: new redis_store({client: redis_client}),
+  proxy: true,
+  saveUninitialized: false,
+  // TODO: fix session secret
+  secret: "session secret wowow",
+  resave: false,
+})
 
-  app.use(
-    session({
-      store: new redis_store({client: redis_client}),
-      proxy: true,
-      saveUninitialized: false,
-      // TODO: fix session secret
-      secret: "session secret wowow",
-      resave: false,
-    })
-  )
-}
+module.exports = session_middleware

package/mongoose/index.js

@@ -1,10 +1,5 @@
 /* @flow */
 const mongoose = require("mongoose")
 
-// browsers do not have mongoose plugins
-if (typeof mongoose.plugin === "function") {
-  const rts_delete_plugin = require("./rts_delete_plugin")
-  mongoose.plugin(rts_delete_plugin)
-}
 
 module.exports = mongoose

package/package.json

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

package/mongoose/rts_delete_plugin.js

@@ -1,12 +0,0 @@
-/* @flow */
-
-// fixes the mongodb issue with missing fullDocument in change streams
-// that is required for dispatching to proper sockets in real time state
-
-module.exports = (schema, options) => {
-  console.log("MONGOOSE DELETE PLUGIN")
-
-  schema.post("remove", (arg, arg2) => {
-    console.log("DELETE WOWO", arg, arg2)
-  })
-}