fix: cache race

Author: izadoesdev

packages/rpc/src/routers/flags.ts

@@ -1,7 +1,6 @@
 import { websitesApi } from "@databuddy/auth";
 import {
 	and,
-	db,
 	desc,
 	eq,
 	flags,
@@ -10,19 +9,17 @@ import {
 	isNull,
 	targetGroups,
 } from "@databuddy/db";
-import {
-	createDrizzleCache,
-	invalidateCacheableWithArgs,
-	redis,
-} from "@databuddy/redis";
+import { createDrizzleCache, redis } from "@databuddy/redis";
 import {
 	flagFormSchema,
 	userRuleSchema,
 	variantSchema,
 } from "@databuddy/shared/flags";
 import {
+	getScope,
 	getScopeCondition,
 	handleFlagUpdateDependencyCascading,
+	invalidateFlagCache,
 } from "@databuddy/shared/flags/utils";
 import { ORPCError } from "@orpc/server";
 import { randomUUIDv7 } from "bun";
@@ -35,9 +32,6 @@ import { getCacheAuthContext } from "../utils/cache-keys";
 const flagsCache = createDrizzleCache({ redis, namespace: "flags" });
 const CACHE_DURATION = 60;
 
-const getScope = (websiteId?: string, organizationId?: string) =>
-	websiteId ? `website:${websiteId}` : `org:${organizationId}`;
-
 const authorizeScope = async (
 	context: Context,
 	websiteId?: string,
@@ -64,41 +58,6 @@ const authorizeScope = async (
 	}
 };
 
-const invalidateFlagCache = async (
-	id: string,
-	websiteId?: string | null,
-	organizationId?: string | null
-) => {
-	const scope = getScope(websiteId ?? undefined, organizationId ?? undefined);
-
-	// Get the flag details to invalidate public API cache
-	const flag = await db
-		.select({ key: flags.key })
-		.from(flags)
-		.where(eq(flags.id, id))
-		.limit(1);
-
-	const invalidations: Promise<unknown>[] = [
-		flagsCache.invalidateByTables(["flags"]),
-		flagsCache.invalidateByKey(`byId:${id}:${scope}`),
-	];
-
-	if (flag[0]?.key) {
-		const clientId = websiteId || organizationId;
-		if (clientId) {
-			invalidations.push(
-				invalidateCacheableWithArgs("flag", [flag[0].key, clientId])
-			);
-
-			invalidations.push(
-				invalidateCacheableWithArgs("flags-client", [clientId])
-			);
-		}
-	}
-
-	await Promise.all(invalidations);
-};
-
 const listFlagsSchema = z
 	.object({
 		websiteId: z.string().optional(),
@@ -264,7 +223,7 @@ function sanitizeFlagForDemo<T extends FlagWithTargetGroups>(flag: T): T {
 		...flag,
 		rules: Array.isArray(flag.rules) && flag.rules.length > 0 ? [] : flag.rules,
 		targetGroups: flag.targetGroups?.map(
-			(group: { rules?: unknown; [key: string]: unknown }) => ({
+			(group: { rules?: unknown;[key: string]: unknown }) => ({
 				...group,
 				rules:
 					Array.isArray(group.rules) && group.rules.length > 0

packages/shared/src/flags/utils.ts

@@ -7,24 +7,56 @@ import {
 	inArray,
 	isNull,
 } from "@databuddy/db";
-import { createDrizzleCache, redis } from "@databuddy/redis";
+import {
+	createDrizzleCache,
+	invalidateCacheableWithArgs,
+	redis,
+} from "@databuddy/redis";
 import { logger } from "@/utils/logger";
 
 const flagsCache = createDrizzleCache({ redis, namespace: "flags" });
 
-const getScope = (websiteId?: string | null, organizationId?: string | null) =>
-	websiteId ? `website:${websiteId}` : `org:${organizationId}`;
+export const getScope = (
+	websiteId?: string | null,
+	organizationId?: string | null
+) => (websiteId ? `website:${websiteId}` : `org:${organizationId}`);
 
 export const invalidateFlagCache = async (
 	id: string,
 	websiteId?: string | null,
-	organizationId?: string | null
+	organizationId?: string | null,
+	flagKey?: string
 ) => {
+	const clientId = websiteId || organizationId;
+
+	let key = flagKey;
+	if (!key && clientId) {
+		const result = await db
+			.select({ key: flags.key })
+			.from(flags)
+			.where(eq(flags.id, id))
+			.limit(1);
+		key = result[0]?.key;
+	}
+
 	const scope = getScope(websiteId, organizationId);
-	await Promise.allSettled([
+	const invalidations: Promise<unknown>[] = [
 		flagsCache.invalidateByTables(["flags"]),
 		flagsCache.invalidateByKey(`byId:${id}:${scope}`),
-	]);
+	];
+
+	if (clientId) {
+		if (key) {
+			invalidations.push(
+				invalidateCacheableWithArgs("flag", [key, clientId])
+			);
+		}
+		invalidations.push(
+			invalidateCacheableWithArgs("flags-client", [clientId])
+		);
+	}
+
+	await Promise.allSettled(invalidations);
 };
 
 export const getScopeCondition = (
@@ -159,7 +191,8 @@ export async function handleFlagUpdateDependencyCascading(
 							return invalidateFlagCache(
 								flagUpdate.id,
 								affectedFlag?.websiteId,
-								affectedFlag?.organizationId
+								affectedFlag?.organizationId,
+								flagUpdate.key
 							);
 						})
 					);