Skip to content

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

Improve limiter

Edward Cuifc20afbdf30e
diff --git a/server/src/api/sites/importSiteData.ts b/server/src/api/sites/importSiteData.ts
index f9c51e999..430abaa7e 100644
--- a/server/src/api/sites/importSiteData.ts
+++ b/server/src/api/sites/importSiteData.ts
@@ -12,7 +12,6 @@ import { ImportLimiter } from "../../services/import/importLimiter.js";
const importDataRequestSchema = z.object({
params: z.object({
- organization: z.string(),
site: z.string().min(1),
}),
body: z.object({
@@ -42,7 +41,7 @@ export async function importSiteData(
});
}
- const { organization, site } = parsed.data.params;
+ const { site } = parsed.data.params;
const { source } = parsed.data.body;
const userHasAccess = await getUserHasAdminAccessToSite(request, site);
@@ -50,7 +49,7 @@ export async function importSiteData(
return reply.status(403).send({ error: "Forbidden" });
}
- const concurrentImportLimitResult = await ImportLimiter.checkConcurrentImportLimit(organization);
+ const concurrentImportLimitResult = await ImportLimiter.checkConcurrentImportLimit(Number(site));
if (!concurrentImportLimitResult.allowed) {
return reply.status(429).send({
error: "Organization limit exceeded",
@@ -73,7 +72,8 @@ export async function importSiteData(
});
}
- const importDir = "/tmp/imports"; // ./tmp/imports?
+ const organization = concurrentImportLimitResult.organizationId;
+ const importDir = "/tmp/imports"; // TODO: ./tmp/imports?
const importId = crypto.randomUUID();
const savedFileName = `${importId}.csv`;
const tempFilePath = path.join(importDir, savedFileName);
diff --git a/server/src/index.ts b/server/src/index.ts
index 2c2873ee7..d6a0c2d6f 100644
--- a/server/src/index.ts
+++ b/server/src/index.ts
@@ -291,7 +291,7 @@ server.get("/api/session-replay/list/:site", getSessionReplays);
server.get("/api/session-replay/:sessionId/:site", getSessionReplayEvents);
// Imports
-server.post("/api/import-site-data/:organization/:site", importSiteData);
+server.post("/api/import-site-data/:site", importSiteData);
server.get("/api/list-site-imports/:site", listSiteImports);
// Administrative
diff --git a/server/src/services/import/importLimiter.ts b/server/src/services/import/importLimiter.ts
index 6a987a1be..812a04847 100644
--- a/server/src/services/import/importLimiter.ts
+++ b/server/src/services/import/importLimiter.ts
@@ -1,38 +1,51 @@
import { IS_CLOUD } from "../../lib/const.js";
import { db } from "../../db/postgres/postgres.js";
-import { and, count, eq, inArray, isNotNull, sum } from "drizzle-orm";
-import { importStatus } from "../../db/postgres/schema.js";
+import { and, count, eq, inArray, sum } from "drizzle-orm";
+import { importStatus, sites } from "../../db/postgres/schema.js";
export class ImportLimiter {
private static readonly IMPORTED_EVENTS_LIMIT = 1_000_000;
- private static readonly CONCURRENT_LIMIT = 1;
-
- static async checkConcurrentImportLimit(organizationId: string): Promise<{
- allowed: boolean;
- reason?: string;
+ private static readonly CONCURRENT_IMPORT_LIMIT = 1;
+
+ static async checkConcurrentImportLimit(siteId: number): Promise<{
+ allowed: false;
+ reason: string;
+ } | {
+ allowed: true;
+ organizationId: string
}> {
+ const [siteResult] = await db
+ .select({ organizationId: sites.organizationId })
+ .from(sites)
+ .where(eq(sites.siteId, siteId))
+ .limit(1);
+
+ if (!siteResult) {
+ return { allowed: false, reason: "Site not found." };
+ }
+
if (!IS_CLOUD) {
- return { allowed: true };
+ return { allowed: true, organizationId: siteResult.organizationId };
}
- const [concurrentCountResult] = await db
+ const [concurrentImportResult] = await db
.select({ count: count() })
.from(importStatus)
.where(
and(
- eq(importStatus.organizationId, organizationId),
+ eq(importStatus.organizationId, siteResult.organizationId),
inArray(importStatus.status, ["pending", "processing"])
)
);
- if (concurrentCountResult.count >= this.CONCURRENT_LIMIT) {
+ if (concurrentImportResult.count >= this.CONCURRENT_IMPORT_LIMIT) {
return {
allowed: false,
- reason: `Only ${this.CONCURRENT_LIMIT} concurrent import allowed per organization.`,
+ reason: `Only ${this.CONCURRENT_IMPORT_LIMIT} concurrent import allowed per organization.`,
};
}
- return { allowed: true };
+ return { allowed: true, organizationId: siteResult.organizationId };
}
static async countImportableEvents(organizationId: string): Promise<number> {
@@ -43,12 +56,7 @@ export class ImportLimiter {
const [importedEvents] = await db
.select({ total: sum(importStatus.importedEvents) })
.from(importStatus)
- .where(
- and(
- eq(importStatus.organizationId, organizationId),
- isNotNull(importStatus.importedEvents)
- )
- );
+ .where(eq(importStatus.organizationId, organizationId));
return this.IMPORTED_EVENTS_LIMIT - Number(importedEvents.total ?? 0);
}