Skip to content

🐸 Rybbit - open-source and privacy-friendly alternative to Google Analytics that is 10x more intuitive.

feat(cache): implement caching for site access retrieval in auth-utils

Bill Yang4d36454f4050
diff --git a/server/package-lock.json b/server/package-lock.json
index 4d0f4eee1..48a9bae37 100644
--- a/server/package-lock.json
+++ b/server/package-lock.json
@@ -21,6 +21,7 @@
"fastify-better-auth": "1.0.4",
"isbot": "^5.1.28",
"luxon": "3.6.1",
+ "node-cache": "^5.1.2",
"node-cron": "4.0.6",
"pg": "8.16.0",
"postgres": "3.4.5",
@@ -1734,6 +1735,14 @@
"fsevents": "~2.3.2"
}
},
+ "node_modules/clone": {
+ "version": "2.1.2",
+ "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz",
+ "integrity": "sha512-3Pe/CF1Nn94hyhIYpjtiLhdCoEoz0DqQ+988E9gmeEdQZlojxnOb74wctFyuwWQHzqyf9X7C7MG8juUpqBJT8w==",
+ "engines": {
+ "node": ">=0.8"
+ }
+ },
"node_modules/color-convert": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
@@ -3108,6 +3117,17 @@
"node": "^18.0.0 || >=20.0.0"
}
},
+ "node_modules/node-cache": {
+ "version": "5.1.2",
+ "resolved": "https://registry.npmjs.org/node-cache/-/node-cache-5.1.2.tgz",
+ "integrity": "sha512-t1QzWwnk4sjLWaQAS8CHgOJ+RAfmHpxFWmc36IWTiWHQfs0w5JDMBS1b1ZxQteo0vVVuWJvIUKHDkkeK7vIGCg==",
+ "dependencies": {
+ "clone": "2.x"
+ },
+ "engines": {
+ "node": ">= 8.0.0"
+ }
+ },
"node_modules/node-cron": {
"version": "4.0.6",
"resolved": "https://registry.npmjs.org/node-cron/-/node-cron-4.0.6.tgz",
diff --git a/server/package.json b/server/package.json
index 423d25431..b56f71224 100644
--- a/server/package.json
+++ b/server/package.json
@@ -29,6 +29,7 @@
"fastify-better-auth": "1.0.4",
"isbot": "^5.1.28",
"luxon": "3.6.1",
+ "node-cache": "^5.1.2",
"node-cron": "4.0.6",
"pg": "8.16.0",
"postgres": "3.4.5",
diff --git a/server/src/api/analytics/getSingleCol.ts b/server/src/api/analytics/getSingleCol.ts
index fe5d1adea..5ad9461c9 100644
--- a/server/src/api/analytics/getSingleCol.ts
+++ b/server/src/api/analytics/getSingleCol.ts
@@ -374,25 +374,28 @@ export async function getSingleCol(
const isPaginatedRequest = page !== undefined;
const dataQuery = getQuery(req, false);
+ const countQuery = getQuery(req, true);
try {
- const dataResult = await clickhouse.query({
- query: dataQuery,
- format: "JSONEachRow",
- query_params: {
- siteId: Number(site),
- },
- });
- const items = await processResults<SingleColItem>(dataResult);
+ // Run both queries in parallel
+ const [dataResult, countResult] = await Promise.all([
+ clickhouse.query({
+ query: dataQuery,
+ format: "JSONEachRow",
+ query_params: {
+ siteId: Number(site),
+ },
+ }),
+ clickhouse.query({
+ query: countQuery,
+ format: "JSONEachRow",
+ query_params: {
+ siteId: Number(site),
+ },
+ }),
+ ]);
- const countQuery = getQuery(req, true);
- const countResult = await clickhouse.query({
- query: countQuery,
- format: "JSONEachRow",
- query_params: {
- siteId: Number(site),
- },
- });
+ const items = await processResults<SingleColItem>(dataResult);
const countData = await processResults<{ totalCount: number }>(countResult);
const totalCount = countData.length > 0 ? countData[0].totalCount : 0;
@@ -401,7 +404,6 @@ export async function getSingleCol(
console.error(`Error fetching ${parameter}:`, error);
console.error("Failed dataQuery:", dataQuery);
if (isPaginatedRequest) {
- const countQuery = getQuery(req, true);
console.error("Failed countQuery:", countQuery);
}
return res.status(500).send({ error: `Failed to fetch ${parameter}` });
diff --git a/server/src/db/postgres/postgres.ts b/server/src/db/postgres/postgres.ts
index 1fd283c39..e51ad9a5a 100644
--- a/server/src/db/postgres/postgres.ts
+++ b/server/src/db/postgres/postgres.ts
@@ -13,6 +13,7 @@ const client = postgres({
username: process.env.POSTGRES_USER,
password: process.env.POSTGRES_PASSWORD,
onnotice: () => {},
+ max: 50,
});
// Create drizzle ORM instance
diff --git a/server/src/lib/auth-utils.ts b/server/src/lib/auth-utils.ts
index d4ebf384d..9bae22c14 100644
--- a/server/src/lib/auth-utils.ts
+++ b/server/src/lib/auth-utils.ts
@@ -4,6 +4,7 @@ import { sites, member, user } from "../db/postgres/schema.js";
import { inArray, eq } from "drizzle-orm";
import { db } from "../db/postgres/postgres.js";
import { isSitePublic } from "../utils.js";
+import NodeCache from "node-cache";
export function mapHeaders(headers: any) {
const entries = Object.entries(headers);
@@ -38,6 +39,12 @@ export async function getUserGodMode(req: FastifyRequest) {
return userRecord.length > 0 && userRecord[0].godMode;
}
+const sitesAccessCache = new NodeCache({
+ stdTTL: 15,
+ checkperiod: 30,
+ useClones: false, // Don't clone objects for better performance with promises
+});
+
export async function getSitesUserHasAccessTo(
req: FastifyRequest,
adminOnly = false
@@ -50,48 +57,73 @@ export async function getSitesUserHasAccessTo(
return [];
}
- try {
- // Fetch user godMode status and member records in parallel
- const [userRecord, memberRecords] = await Promise.all([
- db
- .select({ godMode: user.godMode })
- .from(user)
- .where(eq(user.id, userId))
- .limit(1),
- db
- .select({ organizationId: member.organizationId, role: member.role })
- .from(member)
- .where(eq(member.userId, userId)),
- ]);
-
- const hasGodMode = userRecord.length > 0 && userRecord[0].godMode;
-
- // If user has godMode, return all sites
- if (hasGodMode) {
- const allSites = await db.select().from(sites);
- return allSites;
- }
+ // Create cache key
+ const cacheKey = `${userId}:${adminOnly}`;
+
+ // Check if we have a cached promise
+ const cached = sitesAccessCache.get<Promise<any[]>>(cacheKey);
+ if (cached) {
+ // console.log(
+ // `[Cache HIT] getSitesUserHasAccessTo for userId: ${userId}, adminOnly: ${adminOnly}`
+ // );
+ return cached;
+ }
- if (!memberRecords || memberRecords.length === 0) {
+ // console.log(
+ // `[Cache MISS] getSitesUserHasAccessTo for userId: ${userId}, adminOnly: ${adminOnly}`
+ // );
+
+ // Create new promise and cache it
+ const promise = (async () => {
+ try {
+ // Fetch user godMode status and member records in parallel
+ const [userRecord, memberRecords] = await Promise.all([
+ db
+ .select({ godMode: user.godMode })
+ .from(user)
+ .where(eq(user.id, userId))
+ .limit(1),
+ db
+ .select({ organizationId: member.organizationId, role: member.role })
+ .from(member)
+ .where(eq(member.userId, userId)),
+ ]);
+ const hasGodMode = userRecord.length > 0 && userRecord[0].godMode;
+
+ // If user has godMode, return all sites
+ if (hasGodMode) {
+ const allSites = await db.select().from(sites);
+ return allSites;
+ }
+
+ if (!memberRecords || memberRecords.length === 0) {
+ return [];
+ }
+
+ // Extract organization IDs
+ const organizationIds = memberRecords
+ .filter((record) => !adminOnly || record.role !== "member")
+ .map((record) => record.organizationId);
+
+ // Get sites for these organizations
+ const siteRecords = await db
+ .select()
+ .from(sites)
+ .where(inArray(sites.organizationId, organizationIds));
+
+ return siteRecords;
+ } catch (error) {
+ console.error("Error getting sites user has access to:", error);
+ // Remove from cache on error so it can be retried
+ sitesAccessCache.del(cacheKey);
return [];
}
+ })();
- // Extract organization IDs
- const organizationIds = memberRecords
- .filter((record) => !adminOnly || record.role !== "member")
- .map((record) => record.organizationId);
+ // Cache the promise
+ sitesAccessCache.set(cacheKey, promise);
- // Get sites for these organizations
- const siteRecords = await db
- .select()
- .from(sites)
- .where(inArray(sites.organizationId, organizationIds));
-
- return siteRecords;
- } catch (error) {
- console.error("Error getting sites user has access to:", error);
- return [];
- }
+ return promise;
}
// for routes that are potentially public