@rpcbase/server 0.442.0 → 0.444.0

package/dist/index.js

@@ -1,5 +1,6 @@
 import session from "express-session";
 import { RedisStore } from "connect-redis";
+import MongoStore from "connect-mongo";
 import { createClient } from "redis";
 import env from "@rpcbase/env";
 import { initApiClient, SsrErrorFallback, SSR_ERROR_STATE_GLOBAL_KEY, serializeSsrErrorState } from "@rpcbase/client";
@@ -218,26 +219,32 @@ process.env = {
   ...process.env
 };
 const isProduction$1 = process.env.NODE_ENV === "production";
-const initServer = async (app, serverEnv) => {
-  await initApiClient({ app });
-  app.disable("x-powered-by");
-  app.set("trust proxy", true);
-  app.use(requestIp.mw());
-  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);
-  if (!serverEnv.REDIS_URL) {
-    console.log("WARNING", "missing REDIS_URL, will skip session storage middleware");
-    return;
-  } else {
-    console.log("REDIS_URL:", serverEnv.REDIS_URL);
+const SESSION_MAX_AGE_S = 3600 * 24 * 60;
+const getMongoUrl = (serverEnv) => {
+  const explicitUrl = serverEnv.MONGODB_URL || serverEnv.MONGO_URL || serverEnv.MONGODB_URI || serverEnv.DB_URL;
+  if (explicitUrl) {
+    return explicitUrl;
   }
-  const sessionSecret = getDerivedKey(serverEnv.MASTER_KEY, "express_session_key");
+  if (serverEnv.DB_PORT) {
+    const host = serverEnv.DB_HOST ?? "localhost";
+    const dbName = serverEnv.APP_NAME ?? "rb";
+    return `mongodb://${host}:${serverEnv.DB_PORT}/${dbName}-sessions`;
+  }
+  return void 0;
+};
+const createMongoSessionStore = (serverEnv) => {
+  const mongoUrl = getMongoUrl(serverEnv);
+  if (!mongoUrl) {
+    throw new Error("Missing REDIS_URL and Mongo connection details (MONGODB_URL/MONGO_URL/MONGODB_URI/DB_PORT)");
+  }
+  console.log("Using MongoDB session store");
+  return MongoStore.create({
+    mongoUrl,
+    collectionName: "sessions",
+    ttl: SESSION_MAX_AGE_S
+  });
+};
+const createRedisSessionStore = async (redisUrl) => {
   const reconnectStrategy = (retries) => {
     console.log("redis_client::rb/server reconnectStrategy::retrying with arg", retries);
     if (retries < 5) {
@@ -248,7 +255,7 @@ const initServer = async (app, serverEnv) => {
     }
   };
   const redisClient = createClient({
-    url: serverEnv.REDIS_URL,
+    url: redisUrl,
     socket: {
       reconnectStrategy,
       connectTimeout: 1e4,
@@ -261,17 +268,41 @@ const initServer = async (app, serverEnv) => {
   redisClient.on("error", (error) => {
     console.log("session-storage::redis_client ERROR", error);
   });
-  redisClient.connect();
+  console.log("Using Redis session store");
+  await redisClient.connect();
+  return new RedisStore({
+    client: redisClient,
+    ttl: SESSION_MAX_AGE_S
+  });
+};
+const initServer = async (app, serverEnv) => {
+  await initApiClient({ app });
+  app.disable("x-powered-by");
+  app.set("trust proxy", true);
+  app.use(requestIp.mw());
+  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);
+  if (!serverEnv.MASTER_KEY) {
+    throw new Error("MASTER_KEY must be defined to derive the session secret");
+  }
+  const sessionSecret = getDerivedKey(serverEnv.MASTER_KEY, "express_session_key");
+  const redisUrl = serverEnv.REDIS_URL?.trim();
+  const store = redisUrl ? await createRedisSessionStore(redisUrl) : createMongoSessionStore(serverEnv);
   const sessionConfig = {
     name: "session",
-    store: new RedisStore({ client: redisClient }),
+    store,
     proxy: true,
     resave: false,
     saveUninitialized: false,
     secret: sessionSecret,
     cookie: {
-      maxAge: 1e3 * 3600 * 24 * 60
-      // 60 days
+      maxAge: SESSION_MAX_AGE_S * 1e3
     }
   };
   if (isProduction$1) {
@@ -421,7 +452,14 @@ async function renderSSR(req, dataRoutes) {
     throw err;
   }
   if (routerContext.errors) {
-    console.log("SERVER ERRORS", routerContext.errors);
+    if (routerContext.statusCode === 404) {
+      console.warn(`SSR 404 ${req.method} ${req.originalUrl}`, { errors: routerContext.errors });
+    } else {
+      console.error(`SSR ${routerContext.statusCode || 500} ${req.method} ${req.originalUrl}`, routerContext.errors);
+      const error = new Error("SSR loader error");
+      error.details = routerContext.errors;
+      throw error;
+    }
   }
   const router = createStaticRouter(dataRoutes, routerContext);
   const element = /* @__PURE__ */ jsx(StrictMode, { children: /* @__PURE__ */ jsx(

package/dist/initServer.d.ts

@@ -1,5 +1,7 @@
 import { Application } from 'express';
-export declare const initServer: (app: Application, serverEnv: {
+type ServerEnv = {
     [key: string]: string | undefined;
-}) => Promise<void>;
+};
+export declare const initServer: (app: Application, serverEnv: ServerEnv) => Promise<void>;
+export {};
 //# sourceMappingURL=initServer.d.ts.map

package/dist/initServer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"initServer.d.ts","sourceRoot":"","sources":["../src/initServer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,SAAS,CAAA;AAsBrC,eAAO,MAAM,UAAU,GAAU,KAAK,WAAW,EAAE,WAAW;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAAA;CAAE,kBA6ElG,CAAA"}
+{"version":3,"file":"initServer.d.ts","sourceRoot":"","sources":["../src/initServer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,SAAS,CAAA;AAsBrC,KAAK,SAAS,GAAG;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAAA;CAAE,CAAA;AA8EtD,eAAO,MAAM,UAAU,GAAU,KAAK,WAAW,EAAE,WAAW,SAAS,kBAmDtE,CAAA"}

package/dist/renderSSR.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"renderSSR.d.ts","sourceRoot":"","sources":["../src/renderSSR.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,OAAO,MAAM,SAAS,CAAA;AAClC,OAAO,EAAE,SAAS,EAAc,MAAM,OAAO,CAAA;AAC7C,OAAO,EAGL,aAAa,EACd,MAAM,iBAAiB,CAAA;AAOxB,wBAAsB,SAAS,CAC7B,GAAG,EAAE,OAAO,CAAC,OAAO,EACpB,UAAU,EAAE,aAAa,CAAC,YAAY,CAAC,GACtC,OAAO,CAAC;IAAC,OAAO,EAAE,SAAS,CAAC;IAAC,SAAS,EAAE,OAAO,CAAA;CAAC,CAAC,CA+BnD"}
+{"version":3,"file":"renderSSR.d.ts","sourceRoot":"","sources":["../src/renderSSR.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,OAAO,MAAM,SAAS,CAAA;AAClC,OAAO,EAAE,SAAS,EAAc,MAAM,OAAO,CAAA;AAC7C,OAAO,EAGL,aAAa,EACd,MAAM,iBAAiB,CAAA;AAOxB,wBAAsB,SAAS,CAC7B,GAAG,EAAE,OAAO,CAAC,OAAO,EACpB,UAAU,EAAE,aAAa,CAAC,YAAY,CAAC,GACtC,OAAO,CAAC;IAAC,OAAO,EAAE,SAAS,CAAC;IAAC,SAAS,EAAE,OAAO,CAAA;CAAC,CAAC,CAuCnD"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rpcbase/server",
-  "version": "0.442.0",
+  "version": "0.444.0",
   "type": "module",
   "files": [
     "dist"
@@ -44,6 +44,7 @@
     }
   },
   "dependencies": {
+    "connect-mongo": "6.0.0",
     "connect-redis": "9.0.0",
     "express-session": "1.18.2",
     "http-proxy-middleware": "3.0.5",