@arela/uploader 1.0.13 → 1.0.15

package/package.json

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

package/src/commands/IdentifyCommand.js

@@ -83,6 +83,7 @@ export class IdentifyCommand {
       let totalStats = {
         processed: 0,
         detected: 0,
+        proformas: 0,
         errors: 0,
         pending: 0,
       };
@@ -99,6 +100,7 @@ export class IdentifyCommand {
 
         totalStats.processed += stats.processed;
         totalStats.detected += stats.detected;
+        totalStats.proformas += stats.proformas;
         totalStats.errors += stats.errors;
       }
 
@@ -110,7 +112,8 @@ export class IdentifyCommand {
       logger.info(`\n📊 Total Results:`);
       logger.info(`   Tables Processed: ${tables.length}`);
       logger.info(`   Files Processed: ${totalStats.processed}`);
-      logger.info(`   Pedimentos Detected: ${totalStats.detected}`);
+      logger.info(`   Pedimentos Detected (paid): ${totalStats.detected}`);
+      logger.info(`   Proformas Detected (unpaid): ${totalStats.proformas}`);
       logger.info(`   Errors: ${totalStats.errors}`);
       logger.info(`   Duration: ${duration}s`);
       logger.info(`   Speed: ${avgSpeed} files/sec`);
@@ -188,6 +191,7 @@ export class IdentifyCommand {
 
     let processedCount = 0;
     let detectedCount = 0;
+    let proformaCount = 0;
     let errorCount = 0;
     let hasMore = true;
     let batchNumber = 0;
@@ -223,6 +227,9 @@ export class IdentifyCommand {
       detectedCount += detectionResults.filter(
         (r) => r.detectedType === 'pedimento_simplificado',
       ).length;
+      proformaCount += detectionResults.filter(
+        (r) => r.detectedType === 'proforma',
+      ).length;
       errorCount += detectionResults.filter((r) => r.detectionError).length;
 
       // Update progress bar
@@ -239,6 +246,7 @@ export class IdentifyCommand {
     return {
       processed: processedCount,
       detected: detectedCount,
+      proformas: proformaCount,
       errors: errorCount,
     };
   }
@@ -293,7 +301,7 @@ export class IdentifyCommand {
           // Detect using existing FileDetectionService
           const result = await this.detectionService.detectFile(absolutePath);
 
-          // If detection succeeded and found a pedimento
+          // If detection succeeded and found a pedimento_simplificado (paid)
           if (result.detectedType === 'pedimento_simplificado') {
             return {
               id: file.id,
@@ -303,7 +311,21 @@ export class IdentifyCommand {
               rfc: result.rfc,
               arelaPath: result.arelaPath,
               detectionError: result.error,
-              isPedimento: true, // Confirmed pedimento
+              isPedimento: true, // Confirmed paid pedimento
+            };
+          }
+
+          // If detection succeeded and found a proforma (unpaid pedimento)
+          if (result.detectedType === 'proforma') {
+            return {
+              id: file.id,
+              detectedType: result.detectedType,
+              detectedPedimento: result.detectedPedimento,
+              detectedPedimentoYear: result.detectedPedimentoYear,
+              rfc: result.rfc,
+              arelaPath: null, // Proformas don't get arela_path (not paid yet)
+              detectionError: result.error,
+              isPedimento: false, // Not a paid pedimento — proforma only
             };
           }
 
@@ -377,18 +399,23 @@ export class IdentifyCommand {
   }
 
   /**
-   * Determine if a file is definitely not a pedimento
+   * Determine if a file is definitely not a pedimento/proforma document
    * @private
    * @param {Object} result - Detection result
    * @param {Object} file - File metadata
-   * @returns {boolean} True if definitely not a pedimento
+   * @returns {boolean} True if definitely not a pedimento/proforma
    */
   #isDefinitelyNotPedimento(result, file) {
-    // If we got any pedimento-related fields, it might be a pedimento
+    // If we got any pedimento-related fields, it might be a pedimento or proforma
     if (result.detectedPedimento || result.rfc || result.arelaPath) {
       return false;
     }
 
+    // If it was detected as a proforma, it's related to a pedimento structure
+    if (result.detectedType === 'proforma') {
+      return false;
+    }
+
     // Check if the text contains the required pedimento marker
     // This must match the criteria in pedimento-simplificado.js match function
     const text = result.text || '';

package/src/commands/PushCommand.js

@@ -283,6 +283,11 @@ export class PushCommand {
     // After each batch upload, those files are no longer "pending", so the next query
     // at offset=0 will naturally return the next batch of unprocessed files
 
+    // Track seen file IDs to detect infinite loops (scan table update failures)
+    const seenFileIds = new Set();
+    let consecutiveRepeats = 0;
+    const MAX_CONSECUTIVE_REPEATS = 3;
+
     // Start progress bar with known total
     progressBar.start(totalToProcess, 0, {
       speed: 0,
@@ -303,6 +308,23 @@ export class PushCommand {
         break;
       }
 
+      // Infinite loop protection: if the same files keep coming back,
+      // the scan table update is failing and they stay "pending" forever.
+      const allSeen = files.every((f) => seenFileIds.has(f.id));
+      if (allSeen) {
+        consecutiveRepeats++;
+        if (consecutiveRepeats >= MAX_CONSECUTIVE_REPEATS) {
+          const msg = `Aborting: same ${files.length} files returned ${MAX_CONSECUTIVE_REPEATS} times — scan table updates are likely failing.`;
+          logger.error(msg);
+          console.error(`\n⚠  ${msg}`);
+          hasMore = false;
+          break;
+        }
+      } else {
+        consecutiveRepeats = 0;
+      }
+      files.forEach((f) => seenFileIds.add(f.id));
+
       // Upload files in smaller batches using new CLI upload endpoint
       for (let i = 0; i < files.length; i += uploadBatchSize) {
         const uploadBatch = files.slice(i, i + uploadBatchSize);
@@ -328,9 +350,9 @@ export class PushCommand {
         try {
           await this.scanApiService.batchUpdateUpload(tableName, batchResults);
         } catch (updateError) {
-          logger.error(
-            `Failed to update scan table for batch: ${updateError.message}`,
-          );
+          const msg = `Failed to update scan table for batch: ${updateError.message}`;
+          logger.error(msg);
+          console.error(`\n⚠  ${msg}`);
           // Don't fail the entire process, just log the error
         }
 
@@ -482,7 +504,13 @@ export class PushCommand {
       if (apiResult.uploaded && apiResult.uploaded.length > 0) {
         const uploadedFile = apiResult.uploaded[0];
         result.uploaded = true;
-        result.uploadedToStorageId = uploadedFile.storageId;
+        // Only assign storageId if it is a valid UUID; ignore placeholder values
+        const UUID_RE =
+          /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
+        result.uploadedToStorageId =
+          uploadedFile.storageId && UUID_RE.test(uploadedFile.storageId)
+            ? uploadedFile.storageId
+            : null;
         logger.info(`✓ Uploaded: ${file.file_name} → ${uploadPath}`);
       } else if (apiResult.errors && apiResult.errors.length > 0) {
         const error = apiResult.errors[0];

package/src/config/config.js

@@ -34,10 +34,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 || '1.0.13';
+      return packageJson.version || '1.0.15';
     } catch (error) {
       console.warn('⚠️ Could not read package.json version, using fallback');
-      return '1.0.13';
+      return '1.0.15';
     }
   }
 

package/src/document-type-shared.js

@@ -1,5 +1,6 @@
 // Import all document type definitions
 import { pedimentoSimplificadoDefinition } from './document-types/pedimento-simplificado.js';
+import { proformaDefinition } from './document-types/proforma.js';
 import { supportDocumentDefinition } from './document-types/support-document.js';
 
 // Document type definitions and extraction utilities
@@ -32,6 +33,9 @@ export class DocumentTypeDefinition {
 }
 
 // Registry of all document types
+// pedimentoSimplificadoDefinition is the primary matcher for "FORMA SIMPLIFICADA" documents.
+// After field extraction, resolveType() differentiates between pedimento_simplificado (paid) and proforma (unpaid).
+// proformaDefinition is kept as reference but not used directly in the registry since resolution is handled post-extraction.
 const documentTypes = [
   pedimentoSimplificadoDefinition,
   supportDocumentDefinition,
@@ -79,6 +83,13 @@ export function extractDocumentFields(source, fileExtension, filePath) {
         }
       }
 
+      // Resolve final type if the definition supports it (e.g., pedimento_simplificado vs proforma)
+      const resolvedType = docType.resolveType
+        ? docType.resolveType(fields)
+        : docType.type;
+
+      console.log(`   → Resolved type: ${resolvedType}`);
+
       // Extract pedimento number and year
       const pedimento = docType.extractNumPedimento
         ? docType.extractNumPedimento(source, fields)
@@ -87,7 +98,7 @@ export function extractDocumentFields(source, fileExtension, filePath) {
         ? docType.extractPedimentoYear(source, fields)
         : null;
 
-      return [docType.type, fields, pedimento, year];
+      return [resolvedType, fields, pedimento, year];
     }
   }
 

package/src/document-types/pedimento-simplificado.js

@@ -4,15 +4,37 @@ export const pedimentoSimplificadoDefinition = {
   type: 'pedimento_simplificado',
   extensions: ['pdf'],
   match: (source) => {
-    const clues = [/FORMA SIMPLIFICADA DE PEDIMENTO/i];
+    return /FORMA SIMPLIFICADA DE PEDIMENTO/i.test(source);
+  },
 
-    const found = clues.filter((clue) => clue.test(source));
+  /**
+   * Resolve the final document type after fields have been extracted.
+   * A document is a "pedimento_simplificado" only if it has been paid:
+   *   - For clavePedimento = 'R1': must have fechaPagoRectificacion
+   *   - Otherwise: must have paymentDate
+   * If no payment evidence is found, it's a "proforma".
+   *
+   * @param {FieldResult[]} fields - Extracted fields
+   * @returns {string} - 'pedimento_simplificado' or 'proforma'
+   */
+  resolveType: (fields) => {
+    const clavePedimento =
+      fields?.find((f) => f.name === 'clavePedimento')?.value ?? null;
+    const paymentDate =
+      fields?.find((f) => f.name === 'paymentDate' && f.found)?.value ?? null;
+    const fechaPagoRectificacion =
+      fields?.find((f) => f.name === 'fechaPagoRectificacion' && f.found)
+        ?.value ?? null;
 
-    if (found.length > clues.length / 2) {
-      return true;
+    if (clavePedimento === 'R1') {
+      // Rectification pedimentos require fechaPagoRectificacion
+      return fechaPagoRectificacion ? 'pedimento_simplificado' : 'proforma';
     }
-    return false;
+
+    // Regular pedimentos require paymentDate
+    return paymentDate ? 'pedimento_simplificado' : 'proforma';
   },
+
   extractNumPedimento: (source, fields) => {
     return fields?.find((f) => f.name === 'numPedimento')?.value ?? null;
   },
@@ -121,37 +143,37 @@ export const pedimentoSimplificadoDefinition = {
     },
 
     // 7) Num. E-Document: exactamente 13 caracteres tras la etiqueta (puede haber múltiples líneas)
-    {
-      field: 'numEDocumento',
-      extract: (source) => {
-        // Split into lines and find all lines containing NUM. E-DOCUMENT
-        const lines = source.split(/\r?\n/);
-        const edocLines = lines.filter((line) =>
-          /NUM\.?\s*E-DOCUMENT/i.test(line),
-        );
+    // {
+    //   field: 'numEDocumento',
+    //   extract: (source) => {
+    //     // Split into lines and find all lines containing NUM. E-DOCUMENT
+    //     const lines = source.split(/\r?\n/);
+    //     const edocLines = lines.filter((line) =>
+    //       /NUM\.?\s*E-DOCUMENT/i.test(line),
+    //     );
 
-        if (edocLines.length === 0) {
-          return new FieldResult('numEDocumento', false, null);
-        }
+    //     if (edocLines.length === 0) {
+    //       return new FieldResult('numEDocumento', false, null);
+    //     }
 
-        // Extract all 13-character alphanumeric codes from all NUM. E-DOCUMENT lines
-        const extractedCodes = [];
-        edocLines.forEach((line) => {
-          const afterEdoc = line.replace(/.*NUM\.?\s*E-DOCUMENT\s*/i, '');
-          const codes = afterEdoc.match(/[A-Z0-9]{13}/g) || [];
-          extractedCodes.push(...codes);
-        });
+    //     // Extract all 13-character alphanumeric codes from all NUM. E-DOCUMENT lines
+    //     const extractedCodes = [];
+    //     edocLines.forEach((line) => {
+    //       const afterEdoc = line.replace(/.*NUM\.?\s*E-DOCUMENT\s*/i, '');
+    //       const codes = afterEdoc.match(/[A-Z0-9]{13}/g) || [];
+    //       extractedCodes.push(...codes);
+    //     });
 
-        if (extractedCodes.length === 0) {
-          return new FieldResult('numEDocumento', false, null);
-        }
+    //     if (extractedCodes.length === 0) {
+    //       return new FieldResult('numEDocumento', false, null);
+    //     }
 
-        // Remove duplicates using Set
-        const uniqueCodes = [...new Set(extractedCodes)];
-        const formattedValue = `[${uniqueCodes.join(',')}]`;
-        return new FieldResult('numEDocumento', true, formattedValue);
-      },
-    },
+    //     // Remove duplicates using Set
+    //     const uniqueCodes = [...new Set(extractedCodes)];
+    //     const formattedValue = `[${uniqueCodes.join(',')}]`;
+    //     return new FieldResult('numEDocumento', true, formattedValue);
+    //   },
+    // },
 
     // 8) Fecha de Pago: Look for various payment date patterns
     {
@@ -170,49 +192,49 @@ export const pedimentoSimplificadoDefinition = {
     },
 
     // 9) COVE: NUMERO DE ACUSE DE VALOR (puede haber múltiples líneas)
-    {
-      field: 'cove',
-      extract: (source) => {
-        // Split into lines and find all lines containing NUMERO DE ACUSE DE VALOR or COVE
-        const lines = source.split(/\r?\n/);
-        const coveLines = lines.filter(
-          (line) =>
-            /COVE/i.test(line) || /NUMERO DE ACUSE DE VALOR/i.test(line),
-        );
+    // {
+    //   field: 'cove',
+    //   extract: (source) => {
+    //     // Split into lines and find all lines containing NUMERO DE ACUSE DE VALOR or COVE
+    //     const lines = source.split(/\r?\n/);
+    //     const coveLines = lines.filter(
+    //       (line) =>
+    //         /COVE/i.test(line) || /NUMERO DE ACUSE DE VALOR/i.test(line),
+    //     );
 
-        if (coveLines.length === 0) {
-          return new FieldResult('cove', false, null);
-        }
+    //     if (coveLines.length === 0) {
+    //       return new FieldResult('cove', false, null);
+    //     }
 
-        // Extract all COVE values from all matching lines
-        const coveValues = [];
-        coveLines.forEach((line) => {
-          const coveMatches = line.match(/COVE([A-Z0-9]+)/gi) || [];
-          // Extract just the alphanumeric parts (remove the "COVE" prefix)
-          const codes = coveMatches.map((match) => match);
-          coveValues.push(...codes);
-        });
-
-        if (coveValues.length === 0) {
-          return new FieldResult('cove', false, null);
-        }
+    //     // Extract all COVE values from all matching lines
+    //     const coveValues = [];
+    //     coveLines.forEach((line) => {
+    //       const coveMatches = line.match(/COVE([A-Z0-9]+)/gi) || [];
+    //       // Extract just the alphanumeric parts (remove the "COVE" prefix)
+    //       const codes = coveMatches.map((match) => match);
+    //       coveValues.push(...codes);
+    //     });
 
-        // Remove duplicates using Set
-        const uniqueCoveValues = [...new Set(coveValues)];
-        const formattedValue = `[${uniqueCoveValues.join(',')}]`;
-        return new FieldResult('cove', true, formattedValue);
-      },
-    },
+    //     if (coveValues.length === 0) {
+    //       return new FieldResult('cove', false, null);
+    //     }
+
+    //     // Remove duplicates using Set
+    //     const uniqueCoveValues = [...new Set(coveValues)];
+    //     const formattedValue = `[${uniqueCoveValues.join(',')}]`;
+    //     return new FieldResult('cove', true, formattedValue);
+    //   },
+    // },
 
     // 10) Peso Bruto: Extract weight value
-    {
-      field: 'pesoBruto',
-      extract: (source) => {
-        // Look for the peso bruto value with decimal format
-        const match = source.match(/(\d+\.\d+)\d{3}/);
-        return new FieldResult('pesoBruto', !!match, match ? match[1] : null);
-      },
-    },
+    // {
+    //   field: 'pesoBruto',
+    //   extract: (source) => {
+    //     // Look for the peso bruto value with decimal format
+    //     const match = source.match(/(\d+\.\d+)\d{3}/);
+    //     return new FieldResult('pesoBruto', !!match, match ? match[1] : null);
+    //   },
+    // },
 
     // 11) Patente: Extract patent number
     {
@@ -241,30 +263,60 @@ export const pedimentoSimplificadoDefinition = {
     },
 
     // 12) Numero de Operacion Bancaria
-    {
-      field: 'numeroOperacionBancaria',
-      extract: (source) => {
-        const match = source.match(
-          /NUMERO DE OPERACION BANCARIA:\s*([A-Z0-9]+)/i,
-        );
-        return new FieldResult(
-          'numeroOperacionBancaria',
-          !!match,
-          match ? match[1] : null,
-        );
-      },
-    },
+    // {
+    //   field: 'numeroOperacionBancaria',
+    //   extract: (source) => {
+    //     const match = source.match(
+    //       /NUMERO DE OPERACION BANCARIA:\s*([A-Z0-9]+)/i,
+    //     );
+    //     return new FieldResult(
+    //       'numeroOperacionBancaria',
+    //       !!match,
+    //       match ? match[1] : null,
+    //     );
+    //   },
+    // },
 
     // 13) Numero de Transaccion SAT
+    // {
+    //   field: 'numeroTransaccionSAT',
+    //   extract: (source) => {
+    //     const match = source.match(/NUMERO DE TRANSACCION SAT:\s*([A-Z0-9]+)/i);
+    //     return new FieldResult(
+    //       'numeroTransaccionSAT',
+    //       !!match,
+    //       match ? match[1] : null,
+    //     );
+    //   },
+    // },
+
+    // 14) Fecha de Pago Rectificación
     {
-      field: 'numeroTransaccionSAT',
+      field: 'fechaPagoRectificacion',
       extract: (source) => {
-        const match = source.match(/NUMERO DE TRANSACCION SAT:\s*([A-Z0-9]+)/i);
-        return new FieldResult(
-          'numeroTransaccionSAT',
-          !!match,
-          match ? match[1] : null,
+        // Look for the RECTIFICACION section header
+        const rectSectionMatch = source.match(
+          /RECTIFICACION[\s\S]{0,500}?(\d{2}\/\d{2}\/\d{4})/i,
         );
+
+        if (rectSectionMatch) {
+          return new FieldResult(
+            'fechaPagoRectificacion',
+            true,
+            rectSectionMatch[1],
+          );
+        }
+
+        // Fallback: look for any date after FECHA PAGO RECT
+        const fechaMatch = source.match(
+          /FECHA PAGO RECT[\s\S]{0,500}?(\d{2}\/\d{2}\/\d{4})/i,
+        );
+
+        if (fechaMatch) {
+          return new FieldResult('fechaPagoRectificacion', true, fechaMatch[1]);
+        }
+
+        return new FieldResult('fechaPagoRectificacion', false, null);
       },
     },
   ],

package/src/document-types/proforma.js

@@ -0,0 +1,29 @@
+import { FieldResult } from '../document-type-shared.js';
+import { pedimentoSimplificadoDefinition } from './pedimento-simplificado.js';
+
+/**
+ * Proforma Document Type Definition
+ *
+ * A proforma is essentially the same document as a pedimento simplificado,
+ * but it has NOT been paid yet. It shares the same extractors and structure.
+ *
+ * Classification logic:
+ * - If clavePedimento = 'R1': needs fechaPagoRectificacion to be pedimento_simplificado
+ * - Otherwise: needs paymentDate to be pedimento_simplificado
+ * - If neither payment field is found → it's a proforma
+ */
+export const proformaDefinition = {
+  type: 'proforma',
+  extensions: ['pdf'],
+
+  // Same content marker as pedimento simplificado
+  match: (source) => {
+    return /FORMA SIMPLIFICADA DE PEDIMENTO/i.test(source);
+  },
+
+  extractNumPedimento: pedimentoSimplificadoDefinition.extractNumPedimento,
+  extractPedimentoYear: pedimentoSimplificadoDefinition.extractPedimentoYear,
+
+  // Reuse all extractors from pedimento simplificado
+  extractors: pedimentoSimplificadoDefinition.extractors,
+};