@rpcbase/server 0.429.0 → 0.431.0

package/dist/getDerivedKey.d.ts

@@ -0,0 +1,3 @@
+export declare const getDerivedKey: (masterKey: string, info: string, length?: number, // Default to 256-bit keys
+salt?: string) => string;
+//# sourceMappingURL=getDerivedKey.d.ts.map

package/dist/getDerivedKey.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"getDerivedKey.d.ts","sourceRoot":"","sources":["../../../../pkg/server/src/getDerivedKey.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,aAAa,GACxB,WAAW,MAAM,EACjB,MAAM,MAAM,EACZ,SAAQ,MAAW,EAAE,0BAA0B;AAC/C,OAAM,MAAW,KAChB,MAUF,CAAA"}

package/dist/getDerivedKey.js

@@ -0,0 +1,7 @@
+import assert from "assert";
+import { hkdfSync } from "crypto";
+export const getDerivedKey = (masterKey, info, length = 32, // Default to 256-bit keys
+salt = "") => {
+    assert(masterKey?.length >= 32, "MASTER_KEY must be 32 chars or longer.");
+    return Buffer.from(hkdfSync("sha256", masterKey, Buffer.from(salt), Buffer.from(info), length)).toString("hex");
+};

package/dist/hashPassword.d.ts

@@ -0,0 +1,2 @@
+export declare function hashPassword(password: string, salt: string): Promise<Buffer>;
+//# sourceMappingURL=hashPassword.d.ts.map

package/dist/hashPassword.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"hashPassword.d.ts","sourceRoot":"","sources":["../../../../pkg/server/src/hashPassword.ts"],"names":[],"mappings":"AAGA,wBAAsB,YAAY,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAoBlF"}

package/dist/hashPassword.js

@@ -0,0 +1,21 @@
+import { scrypt } from "crypto";
+export async function hashPassword(password, salt) {
+    const keyLength = 64; // Length of the derived key
+    const options = {
+        N: 8192, // CPU/memory cost parameter
+        r: 8, // Block size
+        p: 1 // Parallelization factor
+    };
+    // Return a Promise-wrapped scrypt call
+    const derivedKey = await new Promise((resolve, reject) => {
+        scrypt(password, salt, keyLength, options, (err, derivedKey) => {
+            if (err) {
+                reject(err);
+            }
+            else {
+                resolve(derivedKey);
+            }
+        });
+    });
+    return derivedKey;
+}

package/dist/index.d.ts

@@ -0,0 +1,4 @@
+export * from "./initServer";
+export * from "./getDerivedKey";
+export * from "./hashPassword";
+//# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../pkg/server/src/index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAA;AAC5B,cAAc,iBAAiB,CAAA;AAC/B,cAAc,gBAAgB,CAAA"}

package/dist/index.js

@@ -0,0 +1,3 @@
+export * from "./initServer";
+export * from "./getDerivedKey";
+export * from "./hashPassword";

package/dist/initServer.d.ts

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

package/dist/initServer.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"initServer.d.ts","sourceRoot":"","sources":["../../../../pkg/server/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"}

package/dist/initServer.js

@@ -0,0 +1,79 @@
+import session from "express-session";
+import { RedisStore } from "connect-redis";
+import { createClient } from "redis";
+import requestIp from "request-ip";
+import env from "@rpcbase/env";
+import { initApiClient } from "@rpcbase/client";
+// dotenv setup, merge process env with vite process.env file
+process.env = {
+    ...__vite_env__,
+    ...process.env,
+    ...env.config().parsed
+};
+import { getDerivedKey } from "./getDerivedKey";
+import { metricsIngestProxyMiddleware } from "./metricsIngestProxyMiddleware";
+const isProduction = process.env.NODE_ENV === "production";
+export const initServer = async (app, serverEnv) => {
+    await initApiClient({ app });
+    app.disable("x-powered-by");
+    app.set("trust proxy", true);
+    app.use(requestIp.mw());
+    // 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);
+    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 sessionSecret = getDerivedKey(serverEnv.MASTER_KEY, "express_session_key");
+    const reconnectStrategy = (retries) => {
+        console.log("redis_client::rb/server reconnectStrategy::retrying with arg", retries);
+        if (retries < 5) {
+            console.log("retry count:", retries, "retrying in 1s");
+            return 4000;
+        }
+        else {
+            return new Error("max retries expired");
+        }
+    };
+    const redisClient = createClient({
+        url: serverEnv.REDIS_URL,
+        socket: {
+            reconnectStrategy,
+            connectTimeout: 10000,
+            keepAlive: false,
+        },
+    });
+    redisClient.on("ready", () => {
+        console.log("session-storage::redis_client connected");
+    });
+    redisClient.on("error", (error) => {
+        console.log("session-storage::redis_client ERROR", error);
+    });
+    redisClient.connect();
+    const sessionConfig = {
+        name: "session",
+        store: new RedisStore({ client: redisClient }),
+        proxy: true,
+        resave: false,
+        saveUninitialized: false,
+        secret: sessionSecret,
+        cookie: {
+            maxAge: 1000 * 3600 * 24 * 60 // 60 days
+        },
+    };
+    if (isProduction) {
+        sessionConfig.cookie.secure = true;
+        // sessionConfig.cookie.domain = ""
+    }
+    app.use(session(sessionConfig));
+};

package/dist/metricsIngestProxyMiddleware.d.ts

@@ -0,0 +1,3 @@
+import { Application } from "express";
+export declare const metricsIngestProxyMiddleware: (app: Application) => void;
+//# sourceMappingURL=metricsIngestProxyMiddleware.d.ts.map

package/dist/metricsIngestProxyMiddleware.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"metricsIngestProxyMiddleware.d.ts","sourceRoot":"","sources":["../../../../pkg/server/src/metricsIngestProxyMiddleware.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,WAAW,EAAC,MAAM,SAAS,CAAA;AAUnC,eAAO,MAAM,4BAA4B,GAAI,KAAK,WAAW,SAY5D,CAAA"}

package/dist/metricsIngestProxyMiddleware.js

@@ -0,0 +1,14 @@
+import { createProxyMiddleware } from "http-proxy-middleware";
+const handleProxyError = (err) => {
+    console.error(`Proxy error: ${err.message}`);
+};
+export const metricsIngestProxyMiddleware = (app) => {
+    app.use("/ingest", createProxyMiddleware({
+        target: "https://eu.i.posthog.com",
+        changeOrigin: true,
+        pathRewrite: { "^/ingest": "" }, // Remove '/ingest' from the proxied request
+        on: {
+            error: handleProxyError
+        }
+    }));
+};

package/dist/types/index.d.ts

@@ -0,0 +1,6 @@
+export type SessionUser = {
+    id: string;
+    current_tenant_id: string;
+    signed_in_tenants: string[];
+};
+//# sourceMappingURL=index.d.ts.map

package/dist/types/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../pkg/server/src/types/index.ts"],"names":[],"mappings":"AAEA,MAAM,MAAM,WAAW,GAAG;IACxB,EAAE,EAAE,MAAM,CAAC;IACX,iBAAiB,EAAE,MAAM,CAAC;IAC1B,iBAAiB,EAAE,MAAM,EAAE,CAAC;CAC7B,CAAA"}

package/dist/types/index.js

@@ -0,0 +1 @@
+export {};

package/package.json

@@ -1,16 +1,34 @@
 {
   "name": "@rpcbase/server",
-  "version": "0.429.0",
+  "version": "0.431.0",
   "type": "module",
-  "main": "./src/index.ts",
+  "files": [
+    "dist"
+  ],
+  "main": "./dist/index.js",
+  "types": "./dist/index.d.ts",
   "scripts": {
-    "build": "tsc --watch",
+    "build": "wireit",
     "release": "wireit"
   },
   "wireit": {
+    "build": {
+      "command": "node ../../scripts/build-package.js server",
+      "files": [
+        "src/**/*",
+        "../../tsconfig.json",
+        "../../tsconfig.base.json",
+        "../../scripts/build-package.js"
+      ],
+      "output": [
+        "dist/"
+      ]
+    },
     "release": {
       "command": "../../scripts/publish.js",
-      "dependencies": [],
+      "dependencies": [
+        "build"
+      ],
       "files": [
         "package.json",
         "src/**/*"

package/src/getDerivedKey.ts

@@ -1,20 +0,0 @@
-import assert from "assert"
-import { hkdfSync } from "crypto"
-
-
-export const getDerivedKey = (
-  masterKey: string,
-  info: string,
-  length: number = 32, // Default to 256-bit keys
-  salt: string = "",
-): string => {
-  assert(masterKey?.length >= 32, "MASTER_KEY must be 32 chars or longer.")
-
-  return Buffer.from(hkdfSync(
-    "sha256",
-    masterKey,
-    Buffer.from(salt),
-    Buffer.from(info),
-    length,
-  )).toString("hex")
-}

package/src/hashPassword.ts

@@ -1,24 +0,0 @@
-import { scrypt } from "crypto"
-
-
-export async function hashPassword(password: string, salt: string): Promise<Buffer> {
-  const keyLength = 64 // Length of the derived key
-  const options = {
-    N: 8192, // CPU/memory cost parameter
-    r: 8,    // Block size
-    p: 1     // Parallelization factor
-  }
-
-  // Return a Promise-wrapped scrypt call
-  const derivedKey = await new Promise<Buffer>((resolve, reject) => {
-    scrypt(password, salt, keyLength, options, (err, derivedKey) => {
-      if (err) {
-        reject(err)
-      } else {
-        resolve(derivedKey)
-      }
-    })
-  })
-
-  return derivedKey
-}

package/src/index.ts

@@ -1,3 +0,0 @@
-export * from "./initServer"
-export * from "./getDerivedKey"
-export * from "./hashPassword"

package/src/initServer.ts

@@ -1,100 +0,0 @@
-import { Application } from "express"
-import session, { SessionOptions } from "express-session"
-import {RedisStore} from "connect-redis"
-import {createClient} from "redis"
-import requestIp from "request-ip"
-import env from "@rpcbase/env"
-import { initApiClient } from "@rpcbase/client"
-
-// dotenv setup, merge process env with vite process.env file
-process.env = {
-  ...__vite_env__,
-  ...process.env,
-  ...env.config().parsed
-}
-
-import { getDerivedKey } from "./getDerivedKey"
-import { metricsIngestProxyMiddleware } from "./metricsIngestProxyMiddleware"
-
-
-const isProduction = process.env.NODE_ENV === "production"
-
-
-export const initServer = async (app: Application, serverEnv: { [key: string]: string | undefined }) => {
-  await initApiClient({app})
-
-  app.disable("x-powered-by")
-
-  app.set("trust proxy", true)
-
-  app.use(requestIp.mw())
-
-  // 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)
-
-  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 sessionSecret = getDerivedKey(serverEnv.MASTER_KEY!, "express_session_key")
-
-  const reconnectStrategy = (retries: number) => {
-    console.log("redis_client::rb/server reconnectStrategy::retrying with arg", retries)
-    if (retries < 5) {
-      console.log("retry count:", retries, "retrying in 1s")
-      return 4000
-    } else {
-      return new Error("max retries expired")
-    }
-  }
-
-  const redisClient = createClient({
-    url: serverEnv.REDIS_URL,
-    socket: {
-      reconnectStrategy,
-      connectTimeout: 10000,
-      keepAlive: 0,
-    },
-  })
-
-  redisClient.on("ready", () => {
-    console.log("session-storage::redis_client connected")
-  })
-
-  redisClient.on("error", (error) => {
-    console.log("session-storage::redis_client ERROR", error)
-  })
-
-  redisClient.connect()
-
-  const sessionConfig: SessionOptions = {
-    name: "session",
-    store: new RedisStore({client: redisClient}),
-    proxy: true,
-    resave: false,
-    saveUninitialized: false,
-    secret: sessionSecret,
-    cookie: {
-      maxAge: 1000 * 3600 * 24 * 60 // 60 days
-    },
-  }
-
-  if (isProduction) {
-    sessionConfig.cookie!.secure = true
-    // sessionConfig.cookie.domain = ""
-  }
-
-  app.use(session(sessionConfig))
-
-}

package/src/metricsIngestProxyMiddleware.ts

@@ -1,17 +0,0 @@
-import {Application} from "express"
-import { createProxyMiddleware } from "http-proxy-middleware"
-
-
-export const metricsIngestProxyMiddleware = (app: Application) => {
-  app.use(
-    "/ingest",
-    createProxyMiddleware({
-      target: "https://eu.i.posthog.com",
-      changeOrigin: true,
-      pathRewrite: { "^/ingest": "" }, // Remove '/ingest' from the proxied request
-      onError: (err, _req, _res) => {
-        console.error(`Proxy error: ${err.message}`)
-      }
-    })
-  )
-}

package/src/types/index.ts

@@ -1,7 +0,0 @@
-
-
-export type SessionUser = {
-  id: string;
-  current_tenant_id: string;
-  signed_in_tenants: string[];
-}

package/src/types/session.d.ts

@@ -1,11 +0,0 @@
-// types/session.d.ts
-import "express-session"
-
-import { SessionUser } from "./index"
-
-
-declare module "express-session" {
-  interface SessionData {
-    user?: SessionUser;
-  }
-}