@fachkraftfreund/n8n-nodes-supabase 1.2.18 → 1.2.19

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

@@ -206,44 +206,64 @@ async function handleRead(supabase, itemIndex, hostUrl) {
     const filterChunks = (0, supabaseClient_1.expandChunkedFilters)(filters, maxInChars, maxItems);
     console.log(`[Supabase READ] item=${itemIndex} table=${table} returnAll=${returnAll} chunks=${filterChunks.length} maxItems=${maxItems} maxInChars=${maxInChars}`);
     const returnData = [];
-    async function executeChunk(chunkFilters, chunkIndex, totalChunks) {
-        const inFilter = chunkFilters.find(f => f.operator === 'in');
-        const chunkIds = inFilter && Array.isArray(inFilter.value) ? inFilter.value.length : '?';
-        console.log(`[Supabase READ] chunk ${chunkIndex + 1}/${totalChunks} (${chunkIds} IDs) - starting...`);
-        const chunkStart = Date.now();
-        const rows = [];
+    if (returnAll) {
         const batchSize = 1000;
-        let batchOffset = 0;
-        let hasMore = true;
-        while (hasMore) {
-            const batchQuery = buildReadQuery(supabase, table, returnFields, chunkFilters, sort);
-            const { data: batchData, error: batchError } = await batchQuery.range(batchOffset, batchOffset + batchSize - 1);
-            if (batchError) {
-                console.log(`[Supabase READ] chunk ${chunkIndex + 1} FAILED after ${Date.now() - chunkStart}ms: ${(0, supabaseClient_1.formatSupabaseError)(batchError)}`);
-                throw new Error((0, supabaseClient_1.formatSupabaseError)(batchError));
-            }
-            if (Array.isArray(batchData)) {
-                for (const row of batchData) {
-                    rows.push({ json: row });
+        for (let ci = 0; ci < filterChunks.length; ci++) {
+            const chunkFilters = filterChunks[ci];
+            const inFilter = chunkFilters.find(f => f.operator === 'in');
+            const chunkIds = inFilter && Array.isArray(inFilter.value) ? inFilter.value.length : '?';
+            console.log(`[Supabase READ] chunk ${ci + 1}/${filterChunks.length} (${chunkIds} IDs) - starting...`);
+            const chunkStart = Date.now();
+            let lastId = null;
+            let hasMore = true;
+            let batchCount = 0;
+            while (hasMore) {
+                let query = buildReadQuery(supabase, table, returnFields, chunkFilters, []);
+                if (lastId !== null) {
+                    query = query.gt('id', lastId);
+                }
+                query = query.order('id', { ascending: true }).limit(batchSize);
+                const { data, error } = await query;
+                if (error) {
+                    console.log(`[Supabase READ] chunk ${ci + 1} batch ${batchCount + 1} FAILED after ${Date.now() - chunkStart}ms: ${(0, supabaseClient_1.formatSupabaseError)(error)}`);
+                    throw new Error((0, supabaseClient_1.formatSupabaseError)(error));
+                }
+                if (Array.isArray(data) && data.length > 0) {
+                    for (const row of data) {
+                        returnData.push({ json: row });
+                    }
+                    lastId = data[data.length - 1].id;
+                    hasMore = data.length === batchSize;
+                }
+                else {
+                    hasMore = false;
+                }
+                batchCount++;
+                if (batchCount % 50 === 0) {
+                    console.log(`[Supabase READ] chunk ${ci + 1} progress: ${batchCount} batches, ${returnData.length} rows, ${Date.now() - chunkStart}ms`);
                 }
-                hasMore = batchData.length === batchSize;
-            }
-            else {
-                hasMore = false;
             }
-            batchOffset += batchSize;
+            console.log(`[Supabase READ] chunk ${ci + 1}/${filterChunks.length} done in ${Date.now() - chunkStart}ms — ${batchCount} batches, ${returnData.length} total rows`);
         }
-        console.log(`[Supabase READ] chunk ${chunkIndex + 1}/${totalChunks} done in ${Date.now() - chunkStart}ms, rows: ${rows.length}`);
-        return rows;
-    }
-    if (returnAll) {
-        const CONCURRENCY = 3;
-        for (let i = 0; i < filterChunks.length; i += CONCURRENCY) {
-            const batch = filterChunks.slice(i, i + CONCURRENCY);
-            const results = await Promise.all(batch.map((chunkFilters, j) => executeChunk(chunkFilters, i + j, filterChunks.length)));
-            for (const rows of results) {
-                returnData.push(...rows);
-            }
+        if (sort.length > 0) {
+            returnData.sort((a, b) => {
+                var _a, _b;
+                for (const s of sort) {
+                    const aVal = (_a = a.json[s.column]) !== null && _a !== void 0 ? _a : null;
+                    const bVal = (_b = b.json[s.column]) !== null && _b !== void 0 ? _b : null;
+                    if (aVal === bVal)
+                        continue;
+                    if (aVal === null)
+                        return 1;
+                    if (bVal === null)
+                        return -1;
+                    if (aVal < bVal)
+                        return s.ascending ? -1 : 1;
+                    if (aVal > bVal)
+                        return s.ascending ? 1 : -1;
+                }
+                return 0;
+            });
         }
     }
     else {

package/package.json

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