@rpcbase/server 0.222.0 → 0.224.0

package/express/index.js

@@ -3,6 +3,7 @@ const debug = require("debug")
 const express = require("express")
 const body_parser = require("body-parser")
 const request_ip = require("request-ip")
+const Sentry = require("@sentry/node")
 
 // functionality middlewares
 const auth = require("../src/auth")
@@ -14,7 +15,10 @@ const custom_cors = require("./custom_cors")
 const log = debug("rb:server")
 
 const is_production = process.env.IS_PRODUCTION === "yes"
-const {APP_DOMAIN, CLIENT_PORT} = process.env
+const is_development = process.env.NODE_ENV === "development"
+const {APP_DOMAIN, SENTRY_DSN, CLIENT_PORT} = process.env
+
+const has_sentry = !!SENTRY_DSN
 
 // TODO: document this
 // we could have a larger size, but it's good practice to keep it small to prevent body upload ddos attacks
@@ -24,8 +28,34 @@ const BODY_MAX_SIZE_MB = 80
 log("server is production:", JSON.stringify(is_production))
 
 module.exports = () => {
+
   const app = express()
 
+  if (has_sentry && !is_development) {
+    Sentry.init({
+    dsn: SENTRY_DSN,
+    integrations: [
+      // enable HTTP calls tracing
+      new Sentry.Integrations.Http({
+        tracing: true
+      }),
+      // enable Express.js middleware tracing
+      new Sentry.Integrations.Express({
+        app
+      }),
+    ],
+    // Performance Monitoring
+    tracesSampleRate: 1.0, // Capture 100% of the transactions, reduce in production!,
+  });
+
+    // Trace incoming requests
+    app.use(Sentry.Handlers.requestHandler());
+    app.use(Sentry.Handlers.tracingHandler());
+
+  }
+
+
+
   app.use(request_ip.mw())
 
   app.use(body_parser.json({limit: `${BODY_MAX_SIZE_MB}mb`}))

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rpcbase/server",
-  "version": "0.222.0",
+  "version": "0.224.0",
   "license": "SSPL-1.0",
   "main": "./index.js",
   "bin": {
@@ -10,9 +10,10 @@
     "test": "echo \"Error: no test specified\" && exit 0"
   },
   "dependencies": {
-    "@rpcbase/access-control": "0.26.0",
+    "@rpcbase/access-control": "0.27.0",
     "@rpcbase/agent": "0.30.0",
     "@rpcbase/std": "0.9.0",
+    "@sentry/node": "7.64.0",
     "bluebird": "3.7.2",
     "body-parser": "1.20.2",
     "bull": "4.11.2",

package/src/client/client_router.js

@@ -2,6 +2,7 @@
 const fs = require("fs")
 const path = require("path")
 const glob = require("glob")
+const Sentry = require("@sentry/node")
 
 const async_wrapper = require("../helpers/async_wrapper")
 
@@ -13,6 +14,9 @@ const COMPRESSED_EXTENSIONS_MAP = {
   ".svg": "image/svg+xml",
 }
 
+const {SENTRY_DSN, NODE_ENV} = process.env
+const has_sentry = !!SENTRY_DSN
+
 const is_development = process.env.NODE_ENV === "development"
 // do not serve compression in dev, the assets are only compressed in the github action
 const COMPRESSED_EXTENSIONS = is_development ? [] : Object.keys(COMPRESSED_EXTENSIONS_MAP)
@@ -77,33 +81,45 @@ const client_router = (app) => {
   const client_routes = get_client_routes()
 
   const index_file_path = path.join(client_build_dir, "./index.html")
-  if (!fs.existsSync(index_file_path)) {
-    console.log("index file not found, skipping server:client_router")
-    return
+  if (fs.existsSync(index_file_path)) {
+    const index_file_buffer = fs.readFileSync(index_file_path)
+
+    app.get("*", async_wrapper(async(req, res, next) => {
+      const full_path = req.baseUrl + req.path
+
+      // TODO: this shouldn't be here,
+      // it should be handled by the api and rpc routers being declared before this router
+      if (full_path.startsWith("/api/") || full_path.startsWith("/rpc/")) {
+        return next()
+      }
+
+      if (client_routes.indexOf(full_path) > -1) {
+        serve_file(req, res, full_path)
+        return
+      } else {
+        // TODO: should handle 404 here
+        res.writeHead(200, {
+          "Content-Type": "text/html"
+        })
+        res.end(index_file_buffer)
+      }
+    }))
   }
+  // register final error handlers
 
-  const index_file_buffer = fs.readFileSync(index_file_path)
-
-  app.get("*", async_wrapper(async(req, res, next) => {
-    const full_path = req.baseUrl + req.path
+  if (has_sentry && !is_development) {
+    // The error handler must be registered before any other error middleware and after all controllers
+    app.use(Sentry.Handlers.errorHandler())
+  }
 
-    // TODO: this shouldn't be here,
-    // it should be handled by the api and rpc routers being declared before this router
-    if (full_path.startsWith("/api/") || full_path.startsWith("/rpc/")) {
-      return next()
-    }
 
-    if (client_routes.indexOf(full_path) > -1) {
-      serve_file(req, res, full_path)
-      return
-    } else {
-      // TODO: should handle 404 here
-      res.writeHead(200, {
-        "Content-Type": "text/html"
-      })
-      res.end(index_file_buffer)
-    }
-  }))
+  app.use((err, req, res, next) => {
+    console.error("server got err", err)
+    res.status(500).json({
+      status: "error",
+      message: "something went wrong",
+    })
+  })
 }
 
 module.exports = client_router

package/src/models/User.js

@@ -6,6 +6,11 @@ const UserSchema = new mongoose.Schema({
     type: String,
     index: true,
   },
+  is_email_verified: {
+    type: Boolean,
+    default: false,
+  },
+  password_hash: String,
   first_name: {
     type: String,
     default: "",
@@ -18,17 +23,11 @@ const UserSchema = new mongoose.Schema({
     type: String,
     default: "",
   },
-  avatar_image: {
-    type: String,
-  },
   avatar_color: {
     type: String,
   },
-  is_email_verified: {
-    type: Boolean,
-    default: false,
-  },
-  password_hash: String,
+  profile_picture: Buffer,
+  profile_picture_updated_at_ms: Number,
   devices: {
     type: Array,
     default: [],