🐸 Rybbit - open-source and privacy-friendly alternative to Google Analytics that is 10x more intuitive.
Fix race condition
Edward Cui71e9c225b3c7
diff --git a/server/src/api/sites/batchImportEvents.ts b/server/src/api/sites/batchImportEvents.tsindex df410a61d..9659a112e 100644--- a/server/src/api/sites/batchImportEvents.ts+++ b/server/src/api/sites/batchImportEvents.ts@@ -121,7 +121,7 @@ export async function batchImportEvents(request: FastifyRequest<BatchImportReque// If this is the last batch, mark import as completedif (isLastBatch) {await completeImport(importId);- importQuotaManager.completeImport(siteRecord.organizationId, importId);+ importQuotaManager.completeImport(siteRecord.organizationId);}// Return counts to clientdiff --git a/server/src/api/sites/createSiteImport.ts b/server/src/api/sites/createSiteImport.tsindex e14c1d8e9..da386709e 100644--- a/server/src/api/sites/createSiteImport.ts+++ b/server/src/api/sites/createSiteImport.ts@@ -50,8 +50,8 @@ export async function createSiteImport(request: FastifyRequest<CreateSiteImportRconst organizationId = siteRecord.organizationId;- // Check concurrent import limit using singleton- if (!importQuotaManager.canStartImport(organizationId)) {+ // Atomically check and register import (prevents race condition)+ if (!importQuotaManager.startImport(organizationId)) {return reply.status(429).send({ error: "Only 1 concurrent import allowed per organization" });}@@ -64,7 +64,7 @@ export async function createSiteImport(request: FastifyRequest<CreateSiteImportRconst earliestAllowedDate = oldestAllowedDate.toFormat("yyyy-MM-dd");const latestAllowedDate = DateTime.utc().toFormat("yyyy-MM-dd");- // Create import record+ // Create import record (DB generates importId)const [importRecord] = await db.insert(importStatus).values({@@ -73,9 +73,6 @@ export async function createSiteImport(request: FastifyRequest<CreateSiteImportR}).returning({ importId: importStatus.importId });- // Register import with quota manager- importQuotaManager.registerImport(organizationId, importRecord.importId);-return reply.send({data: {importId: importRecord.importId,diff --git a/server/src/api/sites/deleteSiteImport.ts b/server/src/api/sites/deleteSiteImport.tsindex cecd30943..5f4d78139 100644--- a/server/src/api/sites/deleteSiteImport.ts+++ b/server/src/api/sites/deleteSiteImport.ts@@ -88,7 +88,7 @@ export async function deleteSiteImport(request: FastifyRequest<DeleteImportReque// Notify quota manager that import is no longer activeif (siteRecord) {- importQuotaManager.completeImport(siteRecord.organizationId, importId);+ importQuotaManager.completeImport(siteRecord.organizationId);}return reply.send({diff --git a/server/src/services/import/importQuotaManager.ts b/server/src/services/import/importQuotaManager.tsindex ea56bcd9b..cb51dcdb2 100644--- a/server/src/services/import/importQuotaManager.ts+++ b/server/src/services/import/importQuotaManager.ts@@ -7,7 +7,6 @@ interface CachedTracker {}interface ActiveImport {- importId: string;startedAt: number;}@@ -52,60 +51,50 @@ class ImportQuotaManager {}/**- * Check if an organization can start a new import- * Based on concurrent import limit+ * Atomically check and register a new import+ * Returns true if import was registered, false if limit reached*/- canStartImport(organizationId: string): boolean {+ startImport(organizationId: string): boolean {if (!IS_CLOUD) {return true; // No limits for self-hosted}- const activeSet = this.activeImports.get(organizationId);- if (!activeSet) {- return true; // No active imports- }-- // Clean up abandoned imports before checking+ // Clean up abandoned imports firstthis.cleanupAbandonedImports(organizationId);- return activeSet.size < this.CONCURRENT_IMPORT_LIMIT;- }-- /**- * Register a new import as active- */- registerImport(organizationId: string, importId: string): void {- if (!IS_CLOUD) {- return; // No tracking for self-hosted- }-let activeSet = this.activeImports.get(organizationId);if (!activeSet) {activeSet = new Set();this.activeImports.set(organizationId, activeSet);}+ // Check limit+ if (activeSet.size >= this.CONCURRENT_IMPORT_LIMIT) {+ return false; // At capacity+ }++ // Register the import (we only track count and timestamps)activeSet.add({- importId,startedAt: Date.now(),});++ return true;}/*** Mark an import as completed (remove from active tracking)+ * Since we only allow 1 concurrent import, we can just clear the set*/- completeImport(organizationId: string, importId: string): void {+ completeImport(organizationId: string): void {const activeSet = this.activeImports.get(organizationId);if (!activeSet) {return;}- // Find and remove the import- for (const activeImport of activeSet) {- if (activeImport.importId === importId) {- activeSet.delete(activeImport);- break;- }+ // Remove the first (and only, since limit=1) import+ const firstImport = activeSet.values().next().value;+ if (firstImport) {+ activeSet.delete(firstImport);}// Clean up empty sets