@arela/uploader 1.0.2 → 1.0.4

package/src/config/config.js

@@ -3,6 +3,8 @@ import fs from 'fs';
 import path from 'path';
 import { fileURLToPath } from 'url';
 
+import PathNormalizer from '../utils/PathNormalizer.js';
+
 config();
 
 /**
@@ -15,6 +17,8 @@ class Config {
     this.supabase = this.#loadSupabaseConfig();
     this.api = this.#loadApiConfig();
     this.upload = this.#loadUploadConfig();
+    this.scan = this.#loadScanConfig();
+    this.push = this.#loadPushConfig();
     this.performance = this.#loadPerformanceConfig();
     this.logging = this.#loadLoggingConfig();
     this.watch = this.#loadWatchConfig();
@@ -30,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.2';
+      return packageJson.version || '1.0.4';
     } catch (error) {
       console.warn('⚠️ Could not read package.json version, using fallback');
-      return '1.0.2';
+      return '1.0.4';
     }
   }
 
@@ -239,6 +243,151 @@ class Config {
     };
   }
 
+  /**
+   * Load scan configuration
+   * @private
+   */
+  #loadScanConfig() {
+    const companySlug = process.env.ARELA_COMPANY_SLUG;
+    const serverId = process.env.ARELA_SERVER_ID;
+    let basePathLabel = process.env.ARELA_BASE_PATH_LABEL;
+
+    // Auto-derive basePathLabel from UPLOAD_BASE_PATH if not set
+    // IMPORTANT: Always resolve to absolute path for uniqueness
+    if (!basePathLabel && process.env.UPLOAD_BASE_PATH) {
+      const basePath = process.env.UPLOAD_BASE_PATH;
+      // Resolve to absolute path (handles ../sample vs ./sample correctly)
+      basePathLabel = PathNormalizer.toAbsolutePath(basePath);
+    }
+
+    // If basePathLabel is provided, ensure it's absolute
+    if (basePathLabel && !path.isAbsolute(basePathLabel)) {
+      basePathLabel = PathNormalizer.toAbsolutePath(basePathLabel);
+    }
+
+    // Parse exclude patterns
+    const defaultExcludePatterns =
+      '.DS_Store,Thumbs.db,desktop.ini,__pycache__,.pyc,.tmp,.swp,$RECYCLE.BIN,System Volume Information,~$*';
+    const excludePatterns = (
+      process.env.SCAN_EXCLUDE_PATTERNS || defaultExcludePatterns
+    )
+      .split(',')
+      .map((p) => p.trim())
+      .filter(Boolean);
+
+    // Generate table name if all components are available
+    // Note: This is just for reference; actual table names are generated dynamically
+    // in ScanCommand based on discovered directories and levels
+    let tableName = null;
+    if (companySlug && serverId && basePathLabel) {
+      tableName = PathNormalizer.generateTableName({
+        companySlug,
+        serverId,
+        basePathLabel,
+      });
+    }
+
+    return {
+      companySlug,
+      serverId,
+      basePathFull: basePathLabel, // Renamed for consistency
+      tableName,
+      excludePatterns,
+      batchSize: parseInt(process.env.SCAN_BATCH_SIZE) || 2000,
+      directoryLevel: parseInt(process.env.SCAN_DIRECTORY_LEVEL) || 0,
+    };
+  }
+
+  /**
+   * Load push configuration
+   * @private
+   */
+  #loadPushConfig() {
+    const pushRfcs = process.env.PUSH_RFCS?.split('|')
+      .map((s) => s.trim().toUpperCase())
+      .filter(Boolean);
+
+    const pushYears = process.env.PUSH_YEARS?.split('|')
+      .map((s) => parseInt(s.trim(), 10))
+      .filter((y) => !isNaN(y));
+
+    return {
+      rfcs: pushRfcs,
+      years: pushYears,
+      batchSize: parseInt(process.env.PUSH_BATCH_SIZE) || 50,
+      uploadBatchSize: parseInt(process.env.PUSH_UPLOAD_BATCH_SIZE) || 10,
+      bucket:
+        process.env.PUSH_BUCKET || process.env.SUPABASE_BUCKET || 'archivos',
+    };
+  }
+
+  /**
+   * Validate scan configuration
+   * @throws {Error} If required scan configuration is missing
+   */
+  validateScanConfig() {
+    const errors = [];
+
+    if (!this.scan.companySlug) {
+      errors.push(
+        'ARELA_COMPANY_SLUG is required (e.g., "acme_corp", "cliente_123")',
+      );
+    } else if (!/^[a-zA-Z0-9_-]+$/.test(this.scan.companySlug)) {
+      errors.push(
+        'ARELA_COMPANY_SLUG must contain only alphanumeric characters, dashes, and underscores',
+      );
+    }
+
+    if (!this.scan.serverId) {
+      errors.push(
+        'ARELA_SERVER_ID is required (e.g., "nas01", "server-mx", "storage-01")',
+      );
+    } else if (!/^[a-zA-Z0-9_-]+$/.test(this.scan.serverId)) {
+      errors.push(
+        'ARELA_SERVER_ID must contain only alphanumeric characters, dashes, and underscores',
+      );
+    }
+
+    if (!this.upload.basePath) {
+      errors.push(
+        'UPLOAD_BASE_PATH is required to determine the scan base path',
+      );
+    }
+
+    if (!this.scan.basePathFull) {
+      errors.push(
+        'Could not determine base path. Set ARELA_BASE_PATH_LABEL or UPLOAD_BASE_PATH',
+      );
+    }
+
+    if (errors.length > 0) {
+      throw new Error(
+        '⚠️ Scan configuration errors:\n   - ' + errors.join('\n   - '),
+      );
+    }
+  }
+
+  /**
+   * Get scan configuration
+   * @returns {Object} Scan configuration
+   */
+  getScanConfig() {
+    // Return scan config with basePathFull already resolved to absolute path
+    return this.scan;
+  }
+
+  /**
+   * Get push configuration
+   * @returns {Object} Push configuration
+   */
+  getPushConfig() {
+    return {
+      ...this.push,
+      rfcs: this.push.rfcs || [],
+      years: this.push.years || [],
+    };
+  }
+
   /**
    * Load performance configuration
    * @private
@@ -365,20 +514,18 @@ class Config {
 
   /**
    * Get upload sources with validation
-   * @returns {string[]} Array of upload sources
-   * @throws {Error} If sources are not configured
+   * @returns {string[]} Array of upload sources (defaults to ['.'] if not configured)
    */
   getUploadSources() {
     if (!this.upload.sources || this.upload.sources.length === 0) {
-      throw new Error(
-        '⚠️ No upload sources configured. Please set UPLOAD_SOURCES environment variable.',
-      );
+      return ['.'];
     }
     return this.upload.sources;
   }
 
   /**
    * Get base path with validation
+   * Returns the path as configured (may be relative for legacy compatibility)
    * @returns {string} Base path for uploads
    * @throws {Error} If base path is not configured
    */

package/src/file-detection.js

@@ -1,11 +1,9 @@
 import fs from 'fs';
-import { getTextExtractor } from 'office-text-extractor';
 import path from 'path';
+import { PDFParse } from 'pdf-parse';
 
 import { extractDocumentFields } from './document-type-shared.js';
 
-const extractor = getTextExtractor();
-
 /**
  * Compose arela_path from extracted pedimento fields
  * Format: RFC/Year/Patente/Aduana/Pedimento/
@@ -151,18 +149,19 @@ export class FileDetectionService {
   }
 
   /**
-   * Extract text from PDF file
+   * Extract text from PDF file using pdf-parse
+   * More reliable for concurrent operations than office-text-extractor
    * @param {string} filePath - Path to PDF file
    * @returns {Promise<string>} - Extracted text
    */
   async extractTextFromPDF(filePath) {
     try {
-      const buffer = fs.readFileSync(filePath);
-      const text = await extractor.extractText({
-        input: buffer,
-        type: 'file',
-      });
-      return text;
+      const dataBuffer = fs.readFileSync(filePath);
+      // Convert Buffer to Uint8Array as required by pdf-parse
+      const uint8Array = new Uint8Array(dataBuffer);
+      const pdfParse = new PDFParse(uint8Array);
+      const result = await pdfParse.getText();
+      return result.text;
     } catch (error) {
       console.error(
         `Error extracting text from PDF ${filePath}:`,

package/src/index.js

@@ -1,6 +1,10 @@
 #!/usr/bin/env node
 import { Command } from 'commander';
 
+import identifyCommand from './commands/IdentifyCommand.js';
+import PropagateCommand from './commands/PropagateCommand.js';
+import PushCommand from './commands/PushCommand.js';
+import scanCommand from './commands/ScanCommand.js';
 import UploadCommand from './commands/UploadCommand.js';
 import watchCommand from './commands/WatchCommand.js';
 import appConfig from './config/config.js';
@@ -15,6 +19,8 @@ class ArelaUploaderCLI {
   constructor() {
     this.program = new Command();
     this.errorHandler = new ErrorHandler(logger);
+    this.identifyCommand = identifyCommand;
+    this.scanCommand = scanCommand;
     this.uploadCommand = new UploadCommand();
     this.watchCommand = watchCommand;
 
@@ -164,6 +170,33 @@ class ArelaUploaderCLI {
         }
       });
 
+    // Scan command (optimized stats collection with streaming)
+    this.program
+      .command('scan')
+      .description(
+        'Scan filesystem and collect file statistics (optimized with streaming)',
+      )
+      .option(
+        '--api <target>',
+        'API target: agencia|cliente|default',
+        'default',
+      )
+      .option(
+        '--count-first',
+        'Count files first for percentage-based progress (slower start)',
+      )
+      .action(async (options) => {
+        try {
+          // Set API target if specified
+          if (options.api && options.api !== 'default') {
+            appConfig.setApiTarget(options.api);
+          }
+          await this.scanCommand.execute(options);
+        } catch (error) {
+          this.errorHandler.handleFatalError(error, { command: 'scan' });
+        }
+      });
+
     // Detection command
     this.program
       .command('detect')
@@ -277,6 +310,123 @@ class ArelaUploaderCLI {
         }
       });
 
+    // ============================================================================
+    // NEW SIMPLIFIED COMMANDS (Optimized versions with better naming)
+    // ============================================================================
+
+    // Identify command - simplified version of "detect --detect-pdfs"
+    this.program
+      .command('identify')
+      .description('🔍 Identify document types using matchers (optimized)')
+      .option(
+        '--api <target>',
+        'API target: agencia|cliente|default',
+        'default',
+      )
+      .option(
+        '-b, --batch-size <size>',
+        'Number of files to process in each batch',
+        '100',
+      )
+      .option('--show-stats', 'Show performance statistics')
+      .action(async (options) => {
+        try {
+          await this.identifyCommand.execute(options);
+        } catch (error) {
+          this.errorHandler.handleFatalError(error, { command: 'identify' });
+        }
+      });
+
+    // Propagate command - simplified version of "detect --propagate-arela-path"
+    this.program
+      .command('propagate')
+      .description(
+        '🔄 Propagate arela_path from pedimentos to related files (optimized)',
+      )
+      .option(
+        '--api <target>',
+        'API target: agencia|cliente|default',
+        'default',
+      )
+      .option(
+        '-b, --batch-size <size>',
+        'Number of pedimentos to process per batch',
+        '50',
+      )
+      .option('--show-stats', 'Show performance statistics')
+      .action(async (options) => {
+        try {
+          const propagateCommand = new PropagateCommand(options);
+          await propagateCommand.execute();
+        } catch (error) {
+          this.errorHandler.handleFatalError(error, { command: 'propagate' });
+        }
+      });
+
+    // Push command - simplified version of "upload --upload-by-rfc"
+    this.program
+      .command('push')
+      .description('📤 Upload files by RFC to Arela API (optimized)')
+      .option(
+        '--api <target>',
+        'API target for scan operations: default|agencia|cliente',
+        'default',
+      )
+      .option(
+        '--scan-api <target>',
+        'API for reading scan table: default|agencia|cliente',
+        'default',
+      )
+      .option(
+        '--push-api <target>',
+        'API for uploading files: default|agencia|cliente',
+      )
+      .option(
+        '-b, --batch-size <size>',
+        'Number of files to fetch per batch',
+        '100',
+      )
+      .option(
+        '--upload-batch-size <size>',
+        'Number of files to upload concurrently',
+        '10',
+      )
+      .option(
+        '--rfcs <rfcs>',
+        'Comma-separated RFCs to filter (overrides PUSH_RFCS env var)',
+      )
+      .option(
+        '--years <years>',
+        'Comma-separated years to filter (overrides PUSH_YEARS env var)',
+      )
+      .option('--show-stats', 'Show performance statistics')
+      .action(async (options) => {
+        try {
+          // Parse comma-separated values
+          if (options.rfcs) {
+            options.rfcs = options.rfcs
+              .split(',')
+              .map((r) => r.trim().toUpperCase())
+              .filter(Boolean);
+          }
+          if (options.years) {
+            options.years = options.years
+              .split(',')
+              .map((y) => parseInt(y.trim(), 10))
+              .filter((y) => !isNaN(y));
+          }
+
+          const pushCommand = new PushCommand();
+          await pushCommand.execute(options);
+        } catch (error) {
+          this.errorHandler.handleFatalError(error, { command: 'push' });
+        }
+      });
+
+    // ============================================================================
+    // END OF NEW SIMPLIFIED COMMANDS
+    // ============================================================================
+
     // Watch command
     this.program
       .command('watch')