@fachkraftfreund/n8n-nodes-supabase 1.3.3 → 1.3.4

package/dist/nodes/Supabase/operations/database/index.js

@@ -55,6 +55,19 @@ exports.executeDatabaseOperation = executeDatabaseOperation;
 const BULK_BATCH_SIZE = 500;
 const MAX_RETRIES = 3;
 const RETRY_BASE_DELAY_MS = 1000;
+const DUPLICATE_ROW_ERROR = 'cannot affect row a second time';
+function deduplicateByConflictKeys(rows, conflictColumns) {
+    const keys = conflictColumns.split(',').map((k) => k.trim()).filter(Boolean);
+    if (keys.length === 0)
+        return rows;
+    const seen = new Map();
+    for (let i = 0; i < rows.length; i++) {
+        const row = rows[i];
+        const compositeKey = keys.map((k) => { var _a; return String((_a = row[k]) !== null && _a !== void 0 ? _a : ''); }).join('\0');
+        seen.set(compositeKey, i);
+    }
+    return Array.from(seen.values()).sort((a, b) => a - b).map((i) => rows[i]);
+}
 function isRetryableError(msg) {
     const lower = msg.toLowerCase();
     return (lower.includes('lock timeout') ||
@@ -198,16 +211,28 @@ async function handleBulkUpsert(supabase, itemCount) {
         options.onConflict = onConflict;
     const returnData = [];
     for (let offset = 0; offset < rows.length; offset += BULK_BATCH_SIZE) {
-        const batch = rows.slice(offset, offset + BULK_BATCH_SIZE);
+        let batch = rows.slice(offset, offset + BULK_BATCH_SIZE);
+        const batchLabel = `UPSERT ${table} batch ${Math.floor(offset / BULK_BATCH_SIZE) + 1}`;
         const data = await withRetry(async () => {
             const { data, error } = await supabase
                 .from(table)
                 .upsert(batch, options)
                 .select();
-            if (error)
-                throw new Error((0, supabaseClient_1.formatSupabaseError)(error));
+            if (error) {
+                const msg = (0, supabaseClient_1.formatSupabaseError)(error);
+                if (msg.toLowerCase().includes(DUPLICATE_ROW_ERROR) && onConflict) {
+                    const before = batch.length;
+                    batch = deduplicateByConflictKeys(batch, onConflict);
+                    console.log(`[Supabase ${batchLabel}] removed ${before - batch.length} duplicate(s) by conflict key "${onConflict}", retrying ${batch.length} rows`);
+                    const retry = await supabase.from(table).upsert(batch, options).select();
+                    if (retry.error)
+                        throw new Error((0, supabaseClient_1.formatSupabaseError)(retry.error));
+                    return retry.data;
+                }
+                throw new Error(msg);
+            }
             return data;
-        }, `UPSERT ${table} batch ${Math.floor(offset / BULK_BATCH_SIZE) + 1}`);
+        }, batchLabel);
         if (Array.isArray(data)) {
             for (const row of data)
                 returnData.push({ json: row });
@@ -233,16 +258,28 @@ async function handleBulkUpdate(supabase, itemCount) {
     }
     const returnData = [];
     for (let offset = 0; offset < rows.length; offset += BULK_BATCH_SIZE) {
-        const batch = rows.slice(offset, offset + BULK_BATCH_SIZE);
+        let batch = rows.slice(offset, offset + BULK_BATCH_SIZE);
+        const batchLabel = `UPDATE ${table} batch ${Math.floor(offset / BULK_BATCH_SIZE) + 1}`;
         const data = await withRetry(async () => {
             const { data, error } = await supabase
                 .from(table)
                 .upsert(batch, { onConflict: matchColumn })
                 .select();
-            if (error)
-                throw new Error((0, supabaseClient_1.formatSupabaseError)(error));
+            if (error) {
+                const msg = (0, supabaseClient_1.formatSupabaseError)(error);
+                if (msg.toLowerCase().includes(DUPLICATE_ROW_ERROR)) {
+                    const before = batch.length;
+                    batch = deduplicateByConflictKeys(batch, matchColumn);
+                    console.log(`[Supabase ${batchLabel}] removed ${before - batch.length} duplicate(s) by match column "${matchColumn}", retrying ${batch.length} rows`);
+                    const retry = await supabase.from(table).upsert(batch, { onConflict: matchColumn }).select();
+                    if (retry.error)
+                        throw new Error((0, supabaseClient_1.formatSupabaseError)(retry.error));
+                    return retry.data;
+                }
+                throw new Error(msg);
+            }
             return data;
-        }, `UPDATE ${table} batch ${Math.floor(offset / BULK_BATCH_SIZE) + 1}`);
+        }, batchLabel);
         if (Array.isArray(data)) {
             for (const row of data)
                 returnData.push({ json: row });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fachkraftfreund/n8n-nodes-supabase",
-  "version": "1.3.3",
+  "version": "1.3.4",
   "description": "Comprehensive n8n community node for Supabase with database and storage operations",
   "keywords": [
     "n8n-community-node-package",