@rpcbase/server 0.393.0 → 0.395.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rpcbase/server",
-  "version": "0.393.0",
+  "version": "0.395.0",
   "type": "module",
   "main": "./src/index.ts",
   "scripts": {
@@ -24,12 +24,12 @@
     }
   },
   "dependencies": {
-    "@sentry/node": "9.5.0",
-    "@sentry/react": "9.5.0",
+    "@sentry/node": "9.12.0",
+    "@sentry/react": "9.12.0",
     "@sentry/tracing": "7.120.3",
-    "connect-redis": "8.0.1",
+    "connect-redis": "8.0.2",
     "express-session": "1.18.1",
-    "http-proxy-middleware": "3.0.3",
+    "http-proxy-middleware": "3.0.5",
     "redis": "4.7.0",
     "request-ip": "3.3.0"
   },

package/src/initServer.ts

@@ -4,6 +4,7 @@ import session, { SessionOptions } from "express-session"
 import {RedisStore} from "connect-redis"
 import {createClient} from "redis"
 import requestIp from "request-ip"
+import Sentry from "@sentry/node"
 
 // dotenv setup, merge process env with vite process.env file
 process.env = {
@@ -13,11 +14,23 @@ process.env = {
 }
 
 import { getDerivedKey } from "./getDerivedKey"
-import { ingestProxyMiddleware } from "./ingestProxyMiddleware"
+import { metricsIngestProxyMiddleware } from "./metricsIngestProxyMiddleware"
 
 const isProduction = process.env.NODE_ENV === "production"
 
 
+if (isProduction) {
+  const dsn = process.env.SENTRY_DSN || process.env.RB_PUBLIC_SENTRY_DSN
+  if (!dsn) {
+    console.log("WARNING", "missing SENTRY_DSN")
+  } else {
+    Sentry.init({
+      dsn,
+    })
+  }
+}
+
+
 export const initServer =  async (app: Application, serverEnv: { [key: string]: string | undefined }) => {
   app.disable("x-powered-by")
 
@@ -25,7 +38,16 @@ export const initServer =  async (app: Application, serverEnv: { [key: string]:
 
   app.use(requestIp.mw())
 
-  ingestProxyMiddleware(app)
+  // redirect www to non-www middleware
+  app.use((req, res, next) => {
+    if (req.headers.host?.startsWith("www.")) {
+      const newHost = req.headers.host.replace("www.", "");
+      return res.redirect(301, `${req.protocol}://${newHost}${req.originalUrl}`);
+    }
+    next();
+  });
+
+  metricsIngestProxyMiddleware(app)
 
   const sessionSecret = getDerivedKey(serverEnv.MASTER_KEY!, "express_session_key")
 

package/src/{ingestProxyMiddleware.ts → metricsIngestProxyMiddleware.ts}

@@ -2,7 +2,7 @@ import {Application} from "express"
 import { createProxyMiddleware } from "http-proxy-middleware"
 
 
-export const ingestProxyMiddleware = (app: Application) => {
+export const metricsIngestProxyMiddleware = (app: Application) => {
   app.use(
     "/ingest",
     createProxyMiddleware({