@arela/uploader 0.2.5 → 0.2.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arela/uploader",
-  "version": "0.2.5",
+  "version": "0.2.7",
   "description": "CLI to upload files/directories to Arela",
   "bin": {
     "arela": "./src/index.js"
@@ -43,4 +43,4 @@
     "@trivago/prettier-plugin-sort-imports": "5.2.2",
     "prettier": "3.5.3"
   }
-}
+}

package/src/commands/UploadCommand.js

@@ -3,12 +3,16 @@ import { globby } from 'globby';
 import mime from 'mime-types';
 import path from 'path';
 
-import appConfig from '../config/config.js';
-import ErrorHandler from '../errors/ErrorHandler.js';
-import { ConfigurationError, FileOperationError } from '../errors/ErrorTypes.js';
 import databaseService from '../services/DatabaseService.js';
 import logger from '../services/LoggingService.js';
 import uploadServiceFactory from '../services/upload/UploadServiceFactory.js';
+
+import appConfig from '../config/config.js';
+import ErrorHandler from '../errors/ErrorHandler.js';
+import {
+  ConfigurationError,
+  FileOperationError,
+} from '../errors/ErrorTypes.js';
 import FileOperations from '../utils/FileOperations.js';
 import fileSanitizer from '../utils/FileSanitizer.js';
 import pathDetector from '../utils/PathDetector.js';
@@ -30,15 +34,17 @@ export class UploadCommand {
     try {
       // Validate configuration
       this.#validateOptions(options);
-      
+
       // Initialize services
-      const uploadService = await uploadServiceFactory.getUploadService(options.forceSupabase);
+      const uploadService = await uploadServiceFactory.getUploadService(
+        options.forceSupabase,
+      );
       const sources = appConfig.getUploadSources();
       const basePath = appConfig.getBasePath();
 
       // Log command start
       logger.info(`Starting upload with ${uploadService.getServiceName()}`);
-      
+
       if (options.clearLog) {
         logger.clearLogFile();
         logger.info('Log file cleared');
@@ -67,7 +73,7 @@ export class UploadCommand {
             uploadService,
             basePath,
             source,
-            sourcePath
+            sourcePath,
           );
 
           this.#updateGlobalResults(globalResults, result);
@@ -79,12 +85,11 @@ export class UploadCommand {
       }
 
       this.#logFinalSummary(globalResults, options, uploadService);
-      
+
       // Handle additional phases if requested
       if (options.runAllPhases && options.statsOnly) {
         await this.#runAdditionalPhases(options);
       }
-
     } catch (error) {
       this.errorHandler.handleFatalError(error, { command: 'upload', options });
     }
@@ -102,7 +107,10 @@ export class UploadCommand {
       throw new ConfigurationError(error.message);
     }
 
-    if (options.batchSize && (options.batchSize < 1 || options.batchSize > 100)) {
+    if (
+      options.batchSize &&
+      (options.batchSize < 1 || options.batchSize > 100)
+    ) {
       throw new ConfigurationError('Batch size must be between 1 and 100');
     }
   }
@@ -116,18 +124,24 @@ export class UploadCommand {
   async #discoverFiles(sourcePath) {
     try {
       if (!FileOperations.fileExists(sourcePath)) {
-        throw new FileOperationError(`Source path does not exist: ${sourcePath}`);
+        throw new FileOperationError(
+          `Source path does not exist: ${sourcePath}`,
+        );
       }
 
       const stats = FileOperations.getFileStats(sourcePath);
-      
+
       if (stats?.isDirectory()) {
         return await globby([`${sourcePath}/**/*`], { onlyFiles: true });
       } else {
         return [sourcePath];
       }
     } catch (error) {
-      throw new FileOperationError(`Failed to discover files in ${sourcePath}`, sourcePath, { originalError: error.message });
+      throw new FileOperationError(
+        `Failed to discover files in ${sourcePath}`,
+        sourcePath,
+        { originalError: error.message },
+      );
     }
   }
 
@@ -142,7 +156,14 @@ export class UploadCommand {
    * @param {string} sourcePath - Source path
    * @returns {Promise<Object>} Processing results
    */
-  async #processFilesInBatches(files, options, uploadService, basePath, source, sourcePath) {
+  async #processFilesInBatches(
+    files,
+    options,
+    uploadService,
+    basePath,
+    source,
+    sourcePath,
+  ) {
     const batchSize = parseInt(options.batchSize) || 10;
     const results = {
       successCount: 0,
@@ -153,7 +174,9 @@ export class UploadCommand {
     };
 
     // Get processed paths if available
-    const processedPaths = options.skipProcessed ? databaseService.getProcessedPaths() : new Set();
+    const processedPaths = options.skipProcessed
+      ? databaseService.getProcessedPaths()
+      : new Set();
 
     // Create progress bar
     const progressBar = new cliProgress.SingleBar({
@@ -168,29 +191,34 @@ export class UploadCommand {
     // Process files in batches
     for (let i = 0; i < files.length; i += batchSize) {
       const batch = files.slice(i, i + batchSize);
-      
+
       try {
         const batchResult = await this.#processBatch(
-          batch, 
-          options, 
-          uploadService, 
-          basePath, 
-          processedPaths
+          batch,
+          options,
+          uploadService,
+          basePath,
+          processedPaths,
         );
-        
+
         this.#updateResults(results, batchResult);
-        
-        progressBar.update(Math.min(i + batchSize, files.length), { 
-          success: results.successCount, 
-          errors: results.failureCount 
+
+        progressBar.update(Math.min(i + batchSize, files.length), {
+          success: results.successCount,
+          errors: results.failureCount,
         });
 
         // Delay between batches if configured
         if (appConfig.performance.batchDelay > 0) {
-          await new Promise(resolve => setTimeout(resolve, appConfig.performance.batchDelay));
+          await new Promise((resolve) =>
+            setTimeout(resolve, appConfig.performance.batchDelay),
+          );
         }
       } catch (error) {
-        this.errorHandler.handleError(error, { batch: i / batchSize + 1, batchSize });
+        this.errorHandler.handleError(error, {
+          batch: i / batchSize + 1,
+          batchSize,
+        });
         results.failureCount += batch.length;
       }
     }
@@ -220,14 +248,17 @@ export class UploadCommand {
 
     if (options.statsOnly) {
       // Stats-only mode: just record file information
-      const fileObjects = batch.map(filePath => ({
+      const fileObjects = batch.map((filePath) => ({
         path: filePath,
         originalName: path.basename(filePath),
         stats: FileOperations.getFileStats(filePath),
       }));
 
       try {
-        const result = await databaseService.insertStatsOnlyToUploaderTable(fileObjects, options);
+        const result = await databaseService.insertStatsOnlyToUploaderTable(
+          fileObjects,
+          options,
+        );
         batchResults.successCount = result.totalInserted;
         batchResults.skippedCount = result.totalSkipped;
       } catch (error) {
@@ -237,7 +268,14 @@ export class UploadCommand {
       // Upload mode: process files for upload
       for (const filePath of batch) {
         try {
-          await this.#processFile(filePath, options, uploadService, basePath, processedPaths, batchResults);
+          await this.#processFile(
+            filePath,
+            options,
+            uploadService,
+            basePath,
+            processedPaths,
+            batchResults,
+          );
         } catch (error) {
           this.errorHandler.handleError(error, { filePath });
           batchResults.failureCount++;
@@ -252,7 +290,14 @@ export class UploadCommand {
    * Process a single file
    * @private
    */
-  async #processFile(filePath, options, uploadService, basePath, processedPaths, batchResults) {
+  async #processFile(
+    filePath,
+    options,
+    uploadService,
+    basePath,
+    processedPaths,
+    batchResults,
+  ) {
     // Skip if already processed
     if (processedPaths.has(filePath)) {
       batchResults.skippedCount++;
@@ -260,9 +305,14 @@ export class UploadCommand {
     }
 
     // Prepare file for upload
-    const sanitizedName = fileSanitizer.sanitizeFileName(path.basename(filePath));
-    const pathInfo = pathDetector.extractYearAndPedimentoFromPath(filePath, basePath);
-    
+    const sanitizedName = fileSanitizer.sanitizeFileName(
+      path.basename(filePath),
+    );
+    const pathInfo = pathDetector.extractYearAndPedimentoFromPath(
+      filePath,
+      basePath,
+    );
+
     let uploadPath = sanitizedName;
     if (pathInfo.detected && options.autoDetectStructure) {
       uploadPath = `${pathInfo.year}/${pathInfo.pedimento}/${sanitizedName}`;
@@ -280,10 +330,12 @@ export class UploadCommand {
         ...options,
         uploadPath,
       });
-      
+
       batchResults.successCount++;
-      if (result.detectedCount) batchResults.detectedCount += result.detectedCount;
-      if (result.organizedCount) batchResults.organizedCount += result.organizedCount;
+      if (result.detectedCount)
+        batchResults.detectedCount += result.detectedCount;
+      if (result.organizedCount)
+        batchResults.organizedCount += result.organizedCount;
     } else {
       // Supabase direct upload
       await uploadService.upload([fileObject], { uploadPath });
@@ -332,8 +384,10 @@ export class UploadCommand {
       console.log(`   ⏭️  Duplicates: ${result.skippedCount}`);
     } else {
       console.log(`   ✅ Uploaded: ${result.successCount}`);
-      if (result.detectedCount) console.log(`   🔍 Detected: ${result.detectedCount}`);
-      if (result.organizedCount) console.log(`   📁 Organized: ${result.organizedCount}`);
+      if (result.detectedCount)
+        console.log(`   🔍 Detected: ${result.detectedCount}`);
+      if (result.organizedCount)
+        console.log(`   📁 Organized: ${result.organizedCount}`);
       console.log(`   ⏭️  Skipped: ${result.skippedCount}`);
     }
     console.log(`   ❌ Errors: ${result.failureCount}`);
@@ -350,10 +404,14 @@ export class UploadCommand {
       console.log(`   📊 Total stats recorded: ${results.successCount}`);
       console.log(`   ⏭️  Total duplicates: ${results.skippedCount}`);
     } else {
-      console.log(`🎯 ${uploadService.getServiceName().toUpperCase()} UPLOAD COMPLETED`);
+      console.log(
+        `🎯 ${uploadService.getServiceName().toUpperCase()} UPLOAD COMPLETED`,
+      );
       console.log(`   ✅ Total uploaded: ${results.successCount}`);
-      if (results.detectedCount) console.log(`   🔍 Total detected: ${results.detectedCount}`);
-      if (results.organizedCount) console.log(`   📁 Total organized: ${results.organizedCount}`);
+      if (results.detectedCount)
+        console.log(`   🔍 Total detected: ${results.detectedCount}`);
+      if (results.organizedCount)
+        console.log(`   📁 Total organized: ${results.organizedCount}`);
       console.log(`   ⏭️  Total skipped: ${results.skippedCount}`);
     }
     console.log(`   ❌ Total errors: ${results.failureCount}`);
@@ -385,4 +443,4 @@ export class UploadCommand {
   }
 }
 
-export default UploadCommand;
+export default UploadCommand;

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 || '1.0.0';
+      return packageJson.version || '0.2.7';
     } catch (error) {
       console.warn('⚠️ Could not read package.json version, using fallback');
-      return '0.2.4';
+      return '0.2.7';
     }
   }
 
@@ -67,7 +67,7 @@ class Config {
     const sources = process.env.UPLOAD_SOURCES?.split('|')
       .map((s) => s.trim())
       .filter(Boolean);
-    
+
     const uploadRfcs = process.env.UPLOAD_RFCS?.split('|')
       .map((s) => s.trim())
       .filter(Boolean);
@@ -86,7 +86,8 @@ class Config {
   #loadPerformanceConfig() {
     return {
       batchDelay: parseInt(process.env.BATCH_DELAY) || 100,
-      progressUpdateInterval: parseInt(process.env.PROGRESS_UPDATE_INTERVAL) || 10,
+      progressUpdateInterval:
+        parseInt(process.env.PROGRESS_UPDATE_INTERVAL) || 10,
       logBufferSize: 100,
       logFlushInterval: 5000,
     };
@@ -128,7 +129,7 @@ class Config {
     if (forceSupabase) {
       if (!this.isSupabaseModeAvailable()) {
         throw new Error(
-          '⚠️ Missing Supabase credentials. Please set SUPABASE_URL, SUPABASE_KEY, and SUPABASE_BUCKET'
+          '⚠️ Missing Supabase credentials. Please set SUPABASE_URL, SUPABASE_KEY, and SUPABASE_BUCKET',
         );
       }
       return;
@@ -137,8 +138,8 @@ class Config {
     if (!this.isApiModeAvailable() && !this.isSupabaseModeAvailable()) {
       throw new Error(
         '⚠️ Missing credentials. Please set either:\n' +
-        '   - ARELA_API_URL and ARELA_API_TOKEN for API mode, or\n' +
-        '   - SUPABASE_URL, SUPABASE_KEY, and SUPABASE_BUCKET for direct mode'
+          '   - ARELA_API_URL and ARELA_API_TOKEN for API mode, or\n' +
+          '   - SUPABASE_URL, SUPABASE_KEY, and SUPABASE_BUCKET for direct mode',
       );
     }
   }
@@ -150,7 +151,9 @@ class Config {
    */
   getUploadSources() {
     if (!this.upload.sources || this.upload.sources.length === 0) {
-      throw new Error('⚠️ No upload sources configured. Please set UPLOAD_SOURCES environment variable.');
+      throw new Error(
+        '⚠️ No upload sources configured. Please set UPLOAD_SOURCES environment variable.',
+      );
     }
     return this.upload.sources;
   }
@@ -162,7 +165,9 @@ class Config {
    */
   getBasePath() {
     if (!this.upload.basePath) {
-      throw new Error('⚠️ No base path configured. Please set UPLOAD_BASE_PATH environment variable.');
+      throw new Error(
+        '⚠️ No base path configured. Please set UPLOAD_BASE_PATH environment variable.',
+      );
     }
     return this.upload.basePath;
   }
@@ -170,4 +175,4 @@ class Config {
 
 // Export singleton instance
 export const appConfig = new Config();
-export default appConfig;
+export default appConfig;

package/src/errors/ErrorHandler.js

@@ -27,10 +27,10 @@ export class ErrorHandler {
    */
   handleError(error, context = {}) {
     const errorInfo = this.#analyzeError(error, context);
-    
+
     // Log the error with appropriate level
     this.#logError(errorInfo);
-    
+
     return errorInfo;
   }
 
@@ -41,14 +41,14 @@ export class ErrorHandler {
    */
   handleFatalError(error, context = {}) {
     const errorInfo = this.handleError(error, context);
-    
+
     console.error('\n❌ Fatal Error - Application will exit');
     console.error(`   ${errorInfo.userMessage}`);
-    
+
     if (this.logger.isVerboseEnabled() && errorInfo.technicalDetails) {
       console.error(`   Technical Details: ${errorInfo.technicalDetails}`);
     }
-    
+
     this.logger.flush();
     process.exit(1);
   }
@@ -65,7 +65,7 @@ export class ErrorHandler {
       originalError: originalError.message,
       originalStack: originalError.stack,
     });
-    
+
     return error;
   }
 
@@ -103,45 +103,45 @@ export class ErrorHandler {
     if (error instanceof ConfigurationError) {
       return `Configuration issue: ${error.message}`;
     }
-    
+
     if (error instanceof FileOperationError) {
       const filePath = error.details?.filePath;
       return `File operation failed${filePath ? ` for ${filePath}` : ''}: ${error.message}`;
     }
-    
+
     if (error instanceof UploadServiceError) {
       const serviceName = error.details?.serviceName;
       return `Upload failed${serviceName ? ` (${serviceName})` : ''}: ${error.message}`;
     }
-    
+
     if (error instanceof ApiError) {
       const statusCode = error.details?.statusCode;
       return `API request failed${statusCode ? ` (HTTP ${statusCode})` : ''}: ${error.message}`;
     }
-    
+
     if (error instanceof DatabaseError) {
       const operation = error.details?.operation;
       return `Database operation failed${operation ? ` (${operation})` : ''}: ${error.message}`;
     }
-    
+
     if (error instanceof DetectionError) {
       const filePath = error.details?.filePath;
       return `File detection failed${filePath ? ` for ${filePath}` : ''}: ${error.message}`;
     }
-    
+
     if (error instanceof ValidationError) {
       const field = error.details?.field;
       return `Validation failed${field ? ` for ${field}` : ''}: ${error.message}`;
     }
-    
+
     if (error instanceof NetworkError) {
       return `Network error: ${error.message}`;
     }
-    
+
     if (error instanceof ArelaError) {
       return error.message;
     }
-    
+
     // Generic error handling
     return `An unexpected error occurred: ${error.message}`;
   }
@@ -156,23 +156,26 @@ export class ErrorHandler {
     if (error instanceof ConfigurationError) {
       return 'fatal';
     }
-    
+
     if (error instanceof NetworkError || error instanceof ApiError) {
       return 'high';
     }
-    
+
     if (error instanceof DatabaseError || error instanceof UploadServiceError) {
       return 'high';
     }
-    
-    if (error instanceof FileOperationError || error instanceof DetectionError) {
+
+    if (
+      error instanceof FileOperationError ||
+      error instanceof DetectionError
+    ) {
       return 'medium';
     }
-    
+
     if (error instanceof ValidationError) {
       return 'low';
     }
-    
+
     return 'medium';
   }
 
@@ -186,21 +189,21 @@ export class ErrorHandler {
     if (error instanceof ConfigurationError) {
       return false;
     }
-    
+
     if (error instanceof NetworkError || error instanceof ApiError) {
       // Network errors might be temporary
       return true;
     }
-    
+
     if (error instanceof FileOperationError) {
       // File errors might be recoverable depending on the specific error
       return true;
     }
-    
+
     if (error instanceof DetectionError || error instanceof ValidationError) {
       return true;
     }
-    
+
     return false;
   }
 
@@ -211,11 +214,15 @@ export class ErrorHandler {
    */
   #logError(errorInfo) {
     const logMessage = `${errorInfo.type}: ${errorInfo.message}`;
-    const contextInfo = errorInfo.context ? ` | Context: ${JSON.stringify(errorInfo.context)}` : '';
-    const detailsInfo = errorInfo.technicalDetails ? ` | Details: ${JSON.stringify(errorInfo.technicalDetails)}` : '';
-    
+    const contextInfo = errorInfo.context
+      ? ` | Context: ${JSON.stringify(errorInfo.context)}`
+      : '';
+    const detailsInfo = errorInfo.technicalDetails
+      ? ` | Details: ${JSON.stringify(errorInfo.technicalDetails)}`
+      : '';
+
     const fullLogMessage = `${logMessage}${contextInfo}${detailsInfo}`;
-    
+
     switch (errorInfo.severity) {
       case 'fatal':
         this.logger.error(`FATAL: ${fullLogMessage}`);
@@ -232,7 +239,7 @@ export class ErrorHandler {
       default:
         this.logger.error(fullLogMessage);
     }
-    
+
     // Log stack trace in verbose mode
     if (this.logger.isVerboseEnabled() && errorInfo.stack) {
       this.logger.debug(`Stack trace: ${errorInfo.stack}`);
@@ -268,4 +275,4 @@ export class ErrorHandler {
   }
 }
 
-export default ErrorHandler;
+export default ErrorHandler;

package/src/errors/ErrorTypes.js

@@ -12,7 +12,7 @@ export class ArelaError extends Error {
     this.code = code;
     this.details = details;
     this.timestamp = new Date().toISOString();
-    
+
     // Ensure proper stack trace
     if (Error.captureStackTrace) {
       Error.captureStackTrace(this, this.constructor);
@@ -101,4 +101,4 @@ export class NetworkError extends ArelaError {
   constructor(message, url = null, details = null) {
     super(message, 'NETWORK_ERROR', { url, ...details });
   }
-}
+}

package/src/index-old.js

@@ -158,8 +158,8 @@ const checkCredentials = async (forceSupabase = false) => {
     if (!supabaseUrl || !supabaseKey || !bucket) {
       console.error(
         '⚠️ Missing credentials. Please set either:\n' +
-        '   - ARELA_API_URL and ARELA_API_TOKEN for API mode, or\n' +
-        '   - SUPABASE_URL, SUPABASE_KEY, and SUPABASE_BUCKET for direct mode',
+          '   - ARELA_API_URL and ARELA_API_TOKEN for API mode, or\n' +
+          '   - SUPABASE_URL, SUPABASE_KEY, and SUPABASE_BUCKET for direct mode',
       );
       process.exit(1);
     }
@@ -709,20 +709,29 @@ const insertStatsOnlyToUploaderTable = async (files, options) => {
 
     try {
       // First, check which records already exist
-      const originalPaths = batch.map(r => r.original_path);
+      const originalPaths = batch.map((r) => r.original_path);
       const { data: existingRecords, error: checkError } = await supabase
         .from('uploader')
         .select('original_path')
         .in('original_path', originalPaths);
 
       if (checkError) {
-        console.error(`❌ Error checking existing records:`, checkError.message);
+        console.error(
+          `❌ Error checking existing records:`,
+          checkError.message,
+        );
         continue;
       }
 
-      const existingPaths = new Set(existingRecords?.map(r => r.original_path) || []);
-      const newRecords = batch.filter(r => !existingPaths.has(r.original_path));
-      const updateRecords = batch.filter(r => existingPaths.has(r.original_path));
+      const existingPaths = new Set(
+        existingRecords?.map((r) => r.original_path) || [],
+      );
+      const newRecords = batch.filter(
+        (r) => !existingPaths.has(r.original_path),
+      );
+      const updateRecords = batch.filter((r) =>
+        existingPaths.has(r.original_path),
+      );
 
       console.log(
         `📦 Batch ${Math.floor(i / batchSize) + 1}: ${newRecords.length} new, ${updateRecords.length} updates`,
@@ -763,7 +772,6 @@ const insertStatsOnlyToUploaderTable = async (files, options) => {
         totalUpdated += batchUpdated;
         console.log(`🔄 Updated ${batchUpdated} existing records`);
       }
-
     } catch (error) {
       console.error(
         `❌ Unexpected error in batch ${Math.floor(i / batchSize) + 1}:`,
@@ -1785,8 +1793,8 @@ const uploadFilesByRfc = async (options = {}) => {
           // Set folder structure for this group - concatenate custom prefix with arela_path
           const folderStructure = options.folderStructure
             ? `${options.folderStructure}/${arelaPath}`
-              .replace(/\/+/g, '/')
-              .replace(/\/$/, '')
+                .replace(/\/+/g, '/')
+                .replace(/\/$/, '')
             : arelaPath;
           pathFormData.append('folderStructure', folderStructure);
           pathFormData.append('autoDetect', 'true');
@@ -2300,13 +2308,13 @@ program
   .name('arela-uploader')
   .description(
     'CLI to upload folders to Arela API or Supabase Storage with automatic processing\n\n' +
-    'Status workflow:\n' +
-    '  fs-stats → detected → file-uploaded\n' +
-    '  ├─ Phase 1: --stats-only (collects filesystem stats, status: fs-stats)\n' +
-    '  ├─ Phase 2: --detect-pdfs (detects document types, status: detected)\n' +
-    '  ├─ Phase 3: --propagate-arela-path (organizes files by pedimento)\n' +
-    '  └─ Phase 4: --upload-by-rfc (uploads files, status: file-uploaded)\n\n' +
-    'Use --query-ready-files to see files ready for upload (status: detected with arela_path)',
+      'Status workflow:\n' +
+      '  fs-stats → detected → file-uploaded\n' +
+      '  ├─ Phase 1: --stats-only (collects filesystem stats, status: fs-stats)\n' +
+      '  ├─ Phase 2: --detect-pdfs (detects document types, status: detected)\n' +
+      '  ├─ Phase 3: --propagate-arela-path (organizes files by pedimento)\n' +
+      '  └─ Phase 4: --upload-by-rfc (uploads files, status: file-uploaded)\n\n' +
+      'Use --query-ready-files to see files ready for upload (status: detected with arela_path)',
   )
   .option('-v, --version', 'output the version number')
   .option('-p, --prefix <prefix>', 'Prefix path in bucket', '')