@rpcbase/server 0.21.0 → 0.25.0

package/database.js

@@ -2,15 +2,20 @@
 const mongoose = require("mongoose")
 const validator = require("validator")
 
-const {DATABASE_PORT} = process.env
+const {DATABASE_PORT, 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")
 }
 
-const mongo_url = `mongodb://database:${DATABASE_PORT}/commit-queue`
+if (typeof DATABASE_NAME !== "string") {
+  throw new Error("expected DATABASE_NAME to be a string")
+}
+
+const mongo_url = `mongodb://database:${DATABASE_PORT}/${DATABASE_NAME}`
 
 module.exports = async() => {
   const ret = await mongoose.connect(mongo_url)
   // TODO: handle connection ret
+  // console.log(ret)
 }

package/express/index.js

@@ -1,9 +1,13 @@
 /* @flow */
+const cors = require("cors")
 const express = require("express")
 const body_parser = require("body-parser")
 
 const session = require("./session")
 
+const is_production = process.env.IS_PRODUCTION === "yes"
+const {APP_DOMAIN, CLIENT_PORT} = process.env
+
 
 module.exports = () => {
   const app = express()
@@ -12,6 +16,9 @@ module.exports = () => {
   app.set("trust proxy", 1)
 
   app.disable("x-powered-by")
+
+
+  // tmp disable aggressive caching
   app.set("etag", false)
 
   app.use((req, res, next) => {
@@ -19,6 +26,17 @@ module.exports = () => {
     next()
   })
 
+  // CORS
+  const cors_origins = is_production ?
+    [`*.${APP_DOMAIN}`, APP_DOMAIN] :
+    [`http://localhost:${CLIENT_PORT}`, "localhost"]
+  console.log("SETUP CORS", cors_origins)
+  app.use(cors({
+    origin: cors_origins,
+    methods: ["GET", "POST"],
+    credentials: true // enable set-cookie
+  }))
+
   session(app)
 
   app.get("/api/ping", (req, res) => res.json({status: "ok"}))

package/mongoose/rts_delete_plugin.js

@@ -6,7 +6,7 @@
 module.exports = (schema, options) => {
   console.log("MONGOOSE DELETE PLUGIN")
 
-  schema.post(["deleteOne"], (arg, arg2) => {
+  schema.post("remove", (arg, arg2) => {
     console.log("DELETE WOWO", arg, arg2)
   })
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rpcbase/server",
-  "version": "0.21.0",
+  "version": "0.25.0",
   "license": "SSPL-1.0",
   "main": "./index.js",
   "bin": {
@@ -12,6 +12,7 @@
   "dependencies": {
     "body-parser": "1.19.1",
     "connect-redis": "6.0.0",
+    "cors": "2.8.5",
     "dotenv": "10.0.0",
     "express": "4.17.2",
     "express-session": "1.17.2",