@arela/uploader 0.2.8 → 0.2.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arela/uploader",
-  "version": "0.2.8",
+  "version": "0.2.9",
   "description": "CLI to upload files/directories to Arela",
   "bin": {
     "arela": "./src/index.js"

package/src/config/config.js

@@ -28,10 +28,10 @@ class Config {
       const __dirname = path.dirname(__filename);
       const packageJsonPath = path.resolve(__dirname, '../../package.json');
       const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, 'utf-8'));
-      return packageJson.version || '0.2.8';
+      return packageJson.version || '0.2.9';
     } catch (error) {
       console.warn('⚠️ Could not read package.json version, using fallback');
-      return '0.2.8';
+      return '0.2.9';
     }
   }
 

package/src/services/DatabaseService.js

@@ -615,32 +615,66 @@ export class DatabaseService {
             : existingPath + '/';
 
         // Find all files with the same base path that don't have arela_path yet
-        const { data: relatedFiles, error: relatedError } = await supabase
-          .from('uploader')
-          .select('id, filename, original_path')
-          .like('original_path', `${basePath}%`)
-          .is('arela_path', null)
-          .neq('id', pedimento.id); // Exclude the pedimento itself
+        // Use pagination to handle cases with more than 1000 related files
+        let allRelatedFiles = [];
+        let from = 0;
+        const pageSize = 1000;
+        let hasMoreData = true;
+        let paginationError = null;
 
-        if (relatedError) {
-          logger.error(
-            `Error finding related files for ${pedimento.filename}: ${relatedError.message}`,
-          );
-          totalErrors++;
+        logger.info(`Searching for related files in base path: ${basePath}`);
+
+        while (hasMoreData) {
+          const { data: relatedFilesPage, error: relatedError } = await supabase
+            .from('uploader')
+            .select('id, filename, original_path')
+            .like('original_path', `${basePath}%`)
+            .is('arela_path', null)
+            .neq('id', pedimento.id) // Exclude the pedimento itself
+            .range(from, from + pageSize - 1);
+
+          if (relatedError) {
+            logger.error(
+              `Error finding related files for ${pedimento.filename}: ${relatedError.message}`,
+            );
+            paginationError = relatedError;
+            totalErrors++;
+            break;
+          }
+
+          if (relatedFilesPage && relatedFilesPage.length > 0) {
+            allRelatedFiles = allRelatedFiles.concat(relatedFilesPage);
+
+            // Check if we got a full page, indicating there might be more data
+            if (relatedFilesPage.length < pageSize) {
+              hasMoreData = false;
+            } else {
+              from += pageSize;
+              logger.info(
+                `Fetched ${relatedFilesPage.length} files, continuing pagination (total so far: ${allRelatedFiles.length})`,
+              );
+            }
+          } else {
+            hasMoreData = false;
+          }
+        }
+
+        // Continue with error handling if pagination failed
+        if (paginationError) {
           continue;
         }
 
-        if (!relatedFiles || relatedFiles.length === 0) {
+        if (!allRelatedFiles || allRelatedFiles.length === 0) {
           logger.info(`No related files found for ${pedimento.filename}`);
           continue;
         }
 
         logger.info(
-          `Found ${relatedFiles.length} related files to update for ${pedimento.filename}`,
+          `Found ${allRelatedFiles.length} related files to update for ${pedimento.filename}`,
         );
 
         // Process files in batches
-        const fileIds = relatedFiles.map((f) => f.id);
+        const fileIds = allRelatedFiles.map((f) => f.id);
 
         for (let i = 0; i < fileIds.length; i += BATCH_SIZE) {
           const batchIds = fileIds.slice(i, i + BATCH_SIZE);
@@ -1041,22 +1075,44 @@ export class DatabaseService {
     for (let i = 0; i < uniqueArelaPaths.length; i += chunkSize) {
       const pathChunk = uniqueArelaPaths.slice(i, i + chunkSize);
 
-      const { data: chunkFiles, error: chunkError } = await supabase
-        .from('uploader')
-        .select(
-          'id, original_path, arela_path, filename, rfc, document_type, status',
-        )
-        .in('arela_path', pathChunk)
-        .neq('status', 'file-uploaded')
-        .not('original_path', 'is', null);
+      // Query with pagination to get all results (Supabase default limit is 1000)
+      let chunkFiles = [];
+      let from = 0;
+      const pageSize = 1000;
+      let hasMoreData = true;
 
-      if (chunkError) {
-        throw new Error(
-          `Error querying files for arela_paths chunk: ${chunkError.message}`,
-        );
+      while (hasMoreData) {
+        const { data: pageData, error: chunkError } = await supabase
+          .from('uploader')
+          .select(
+            'id, original_path, arela_path, filename, rfc, document_type, status',
+          )
+          .in('arela_path', pathChunk)
+          .neq('status', 'file-uploaded')
+          .not('original_path', 'is', null)
+          .range(from, from + pageSize - 1);
+
+        if (chunkError) {
+          throw new Error(
+            `Error querying files for arela_paths chunk: ${chunkError.message}`,
+          );
+        }
+
+        if (pageData && pageData.length > 0) {
+          chunkFiles = chunkFiles.concat(pageData);
+
+          // Check if we got a full page, indicating there might be more data
+          if (pageData.length < pageSize) {
+            hasMoreData = false;
+          } else {
+            from += pageSize;
+          }
+        } else {
+          hasMoreData = false;
+        }
       }
 
-      if (chunkFiles && chunkFiles.length > 0) {
+      if (chunkFiles.length > 0) {
         allReadyFiles = allReadyFiles.concat(chunkFiles);
       }
     }
@@ -1242,17 +1298,36 @@ export class DatabaseService {
         { uploadPath: uploadPath },
       );
 
-      // Update database status
-      await supabase
-        .from('uploader')
-        .update({
-          status: 'file-uploaded',
-          message: 'Successfully uploaded to Supabase',
-        })
-        .eq('id', file.id);
+      // Check upload result before updating database status
+      if (uploadResult.success) {
+        await supabase
+          .from('uploader')
+          .update({
+            status: 'file-uploaded',
+            message: 'Successfully uploaded to Supabase',
+          })
+          .eq('id', file.id);
+
+        logger.info(`✅ Uploaded: ${file.filename}`);
+        return { success: true, filename: file.filename };
+      } else {
+        await supabase
+          .from('uploader')
+          .update({
+            status: 'upload-error',
+            message: `Upload failed: ${uploadResult.error}`,
+          })
+          .eq('id', file.id);
 
-      logger.info(`✅ Uploaded: ${file.filename}`);
-      return { success: true, filename: file.filename };
+        logger.error(
+          `❌ Upload failed: ${file.filename} - ${uploadResult.error}`,
+        );
+        return {
+          success: false,
+          error: uploadResult.error,
+          filename: file.filename,
+        };
+      }
     } catch (error) {
       logger.error(
         `❌ Error processing file ${file.filename}: ${error.message}`,
@@ -1335,23 +1410,188 @@ export class DatabaseService {
           { folderStructure: fullFolderStructure },
         );
 
-        if (uploadResult.success) {
-          // Update all files as uploaded
-          const fileIds = validFiles.map((f) => f.dbRecord.id);
-          await supabase
-            .from('uploader')
-            .update({
-              status: 'file-uploaded',
-              message: 'Successfully uploaded to Arela API (batch)',
-            })
-            .in('id', fileIds);
+        if (uploadResult.success && uploadResult.data) {
+          const apiResult = uploadResult.data;
 
-          uploaded += validFiles.length;
           logger.info(
-            `✅ Batch uploaded: ${validFiles.length} files to ${fullFolderStructure}`,
+            `📋 Processing API response: ${apiResult.uploaded?.length || 0} uploaded, ${apiResult.errors?.length || 0} errors`,
+          );
+
+          // Debug logging to understand API response structure
+          logger.debug(
+            `🔍 API Response structure: ${JSON.stringify(apiResult, null, 2)}`,
           );
+          if (apiResult.uploaded && apiResult.uploaded.length > 0) {
+            logger.debug(
+              `🔍 First uploaded file structure: ${JSON.stringify(apiResult.uploaded[0], null, 2)}`,
+            );
+          }
+
+          // Create filename to file mapping for quick lookup
+          const fileNameToRecord = new Map();
+          validFiles.forEach((f) => {
+            fileNameToRecord.set(f.fileData.name, f.dbRecord);
+          });
+
+          // Debug: Log expected filenames
+          logger.debug(
+            `🔍 Expected filenames: ${Array.from(fileNameToRecord.keys()).join(', ')}`,
+          );
+
+          // Handle successfully uploaded files
+          if (apiResult.uploaded && apiResult.uploaded.length > 0) {
+            const successfulFileIds = [];
+            const matchedFilenames = [];
+
+            apiResult.uploaded.forEach((uploadedFile) => {
+              // Try multiple possible property names for filename
+              const possibleFilename =
+                uploadedFile.fileName ||
+                uploadedFile.filename ||
+                uploadedFile.name ||
+                uploadedFile.file_name ||
+                uploadedFile.originalName ||
+                uploadedFile.original_name;
+
+              logger.debug(
+                `🔍 Trying to match uploaded file: ${JSON.stringify(uploadedFile)}`,
+              );
+
+              const dbRecord = fileNameToRecord.get(possibleFilename);
+              if (dbRecord) {
+                successfulFileIds.push(dbRecord.id);
+                matchedFilenames.push(possibleFilename);
+                logger.debug(`✅ Matched file: ${possibleFilename}`);
+              } else {
+                logger.warn(
+                  `⚠️ Could not match uploaded file with any known filename: ${JSON.stringify(uploadedFile)}`,
+                );
+              }
+            });
+
+            // If no individual files matched but API indicates success, use fallback
+            if (
+              successfulFileIds.length === 0 &&
+              apiResult.uploaded.length > 0
+            ) {
+              logger.warn(
+                `🔄 Fallback: No individual file matches found, but API indicates ${apiResult.uploaded.length} uploads. Marking all ${validFiles.length} batch files as uploaded.`,
+              );
+              validFiles.forEach((f) => successfulFileIds.push(f.dbRecord.id));
+            }
+
+            if (successfulFileIds.length > 0) {
+              await supabase
+                .from('uploader')
+                .update({
+                  status: 'file-uploaded',
+                  message: 'Successfully uploaded to Arela API (batch)',
+                })
+                .in('id', successfulFileIds);
+
+              uploaded += successfulFileIds.length;
+              logger.info(
+                `✅ Batch upload successful: ${successfulFileIds.length} files uploaded`,
+              );
+            }
+          }
+
+          // Handle failed files
+          if (apiResult.errors && apiResult.errors.length > 0) {
+            const failedFileIds = [];
+
+            apiResult.errors.forEach((errorInfo) => {
+              // Try multiple possible property names for filename in errors
+              const possibleFilename =
+                errorInfo.fileName ||
+                errorInfo.filename ||
+                errorInfo.name ||
+                errorInfo.file_name ||
+                errorInfo.originalName ||
+                errorInfo.original_name;
+
+              const dbRecord = fileNameToRecord.get(possibleFilename);
+              if (dbRecord) {
+                failedFileIds.push(dbRecord.id);
+              } else {
+                logger.warn(
+                  `⚠️ Could not match error file: ${JSON.stringify(errorInfo)}`,
+                );
+              }
+            });
+
+            if (failedFileIds.length > 0) {
+              await supabase
+                .from('uploader')
+                .update({
+                  status: 'upload-error',
+                  message: `Upload failed: ${apiResult.errors[0].error}`,
+                })
+                .in('id', failedFileIds);
+
+              errors += failedFileIds.length;
+              logger.error(
+                `❌ Batch upload errors: ${failedFileIds.length} files failed`,
+              );
+            }
+          }
+
+          // Handle any remaining files that weren't in uploaded or errors arrays
+          // Use robust filename extraction for both uploaded and error files
+          const extractFilename = (fileObj) => {
+            return (
+              fileObj.fileName ||
+              fileObj.filename ||
+              fileObj.name ||
+              fileObj.file_name ||
+              fileObj.originalName ||
+              fileObj.original_name
+            );
+          };
+
+          const processedFileNames = new Set([
+            ...(apiResult.uploaded || []).map(extractFilename).filter(Boolean),
+            ...(apiResult.errors || []).map(extractFilename).filter(Boolean),
+          ]);
+
+          const unprocessedFiles = validFiles.filter(
+            (f) => !processedFileNames.has(f.fileData.name),
+          );
+          if (unprocessedFiles.length > 0) {
+            // Only mark as unprocessed if we haven't already handled all files through fallback logic
+            // If we used fallback (all files marked as uploaded), don't mark any as unprocessed
+            const alreadyHandledCount = uploaded + errors;
+            const shouldMarkUnprocessed =
+              alreadyHandledCount < validFiles.length;
+
+            if (shouldMarkUnprocessed) {
+              const unprocessedIds = unprocessedFiles.map((f) => f.dbRecord.id);
+              await supabase
+                .from('uploader')
+                .update({
+                  status: 'upload-error',
+                  message: 'File not found in API response',
+                })
+                .in('id', unprocessedIds);
+
+              errors += unprocessedIds.length;
+              logger.warn(
+                `⚠️ Unprocessed files: ${unprocessedIds.length} files not found in API response`,
+              );
+              logger.debug(
+                `🔍 API response uploaded array: ${JSON.stringify(apiResult.uploaded)}`,
+              );
+              logger.debug(
+                `🔍 Expected filenames: ${validFiles.map((f) => f.fileData.name).join(', ')}`,
+              );
+            } else {
+              logger.debug(
+                `✅ All files already handled (uploaded: ${uploaded}, errors: ${errors}), skipping unprocessed marking`,
+              );
+            }
+          }
         } else {
-          // Update all files as failed
+          // Complete batch failure - mark all files as failed
           const fileIds = validFiles.map((f) => f.dbRecord.id);
           await supabase
             .from('uploader')
@@ -1363,7 +1603,7 @@ export class DatabaseService {
 
           errors += validFiles.length;
           logger.error(
-            `❌ Batch upload failed: ${validFiles.length} files - ${uploadResult.error}`,
+            `❌ Complete batch failure: ${validFiles.length} files - ${uploadResult.error}`,
           );
         }
       }

package/src/services/upload/ApiUploadService.js

@@ -134,8 +134,16 @@ export class ApiUploadService extends BaseUploadService {
 
       const result = await response.json();
 
+      // Determine if the operation was successful
+      // Success means at least one file was uploaded successfully, even if some failed
+      const hasUploads = result.uploaded && result.uploaded.length > 0;
+      const hasErrors = result.errors && result.errors.length > 0;
+      // Consider it a success if there are uploads, or if there are no errors at all
+      const success =
+        hasUploads || (!hasErrors && result.stats?.totalFiles > 0);
+
       // Normalize response format to match DatabaseService expectations
-      return { success: true, data: result };
+      return { success, data: result };
     } catch (fetchError) {
       // Return normalized error format
       return { success: false, error: fetchError.message };

package/src/services/upload/SupabaseUploadService.js

@@ -88,10 +88,10 @@ export class SupabaseUploadService extends BaseUploadService {
       });
 
     if (error) {
-      throw new Error(error.message);
+      return { success: false, error: error.message };
     }
 
-    return data;
+    return { success: true, data };
   }
 
   /**