@nest-omni/core 4.1.3-12 → 4.1.3-13

package/{file-upload → dist/file-upload}/entities/file.entity.js

@@ -223,36 +223,6 @@ let FileEntity = FileEntity_1 = class FileEntity {
         }
         this.validationData = Object.assign(Object.assign({}, this.validationData), data);
     }
-    /**
-     * 添加处理步骤
-     */
-    addProcessingStep(processor) {
-        if (!this.processingData) {
-            this.processingData = { processors: [] };
-        }
-        this.processingData.processors.push({
-            name: processor,
-            startTime: new Date(),
-            status: 'pending',
-        });
-    }
-    /**
-     * 更新处理步骤
-     */
-    updateProcessingStep(processor, status, result, error) {
-        var _a;
-        if (!((_a = this.processingData) === null || _a === void 0 ? void 0 : _a.processors))
-            return;
-        const step = this.processingData.processors.find((p) => p.name === processor);
-        if (step) {
-            step.status = status;
-            step.endTime = new Date();
-            if (result !== undefined)
-                step.result = result;
-            if (error)
-                step.error = error;
-        }
-    }
 };
 exports.FileEntity = FileEntity;
 __decorate([
@@ -356,10 +326,6 @@ __decorate([
     (0, typeorm_1.Column)({ type: 'json', nullable: true }),
     __metadata("design:type", Object)
 ], FileEntity.prototype, "validationData", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: 'json', nullable: true }),
-    __metadata("design:type", Object)
-], FileEntity.prototype, "processingData", void 0);
 __decorate([
     (0, typeorm_1.CreateDateColumn)(),
     __metadata("design:type", Date)

package/{file-upload → dist/file-upload}/file-upload.module.d.ts

@@ -1,5 +1,5 @@
 import { DynamicModule } from '@nestjs/common';
-import { IFileProcessor } from './interfaces/file-upload-options.interface';
+import { IFileProcessor } from './interfaces/file-processor.interface';
 import { LocalStorageOptions, S3StorageOptions } from './interfaces/storage-provider.interface';
 import { CustomFileTypes } from './interfaces/custom-file-type.interface';
 import { MaliciousDetectorOptions } from './services/malicious-file-detector.service';

package/{file-upload → dist/file-upload}/file-upload.module.js

@@ -28,6 +28,9 @@ const file_service_1 = require("./services/file.service");
 const file_entity_1 = require("./entities/file.entity");
 const file_metadata_entity_1 = require("./entities/file-metadata.entity");
 const file_access_controller_1 = require("./controllers/file-access.controller");
+const csv_processor_1 = require("./processors/csv.processor");
+const excel_processor_1 = require("./processors/excel.processor");
+const image_processor_1 = require("./processors/image.processor");
 /**
  * 文件上传模块（增强版）
  */
@@ -71,18 +74,32 @@ let FileUploadModule = FileUploadModule_1 = class FileUploadModule {
                 inject: [mime_registry_service_1.MimeRegistryService],
             });
         }
-        // 注册处理器
+        // 注册处理器（内置处理器 + 自定义处理器）
+        const processorMap = new Map();
+        // 自动注册内置处理器
+        try {
+            const csvProcessor = new csv_processor_1.CsvProcessor();
+            const excelProcessor = new excel_processor_1.ExcelProcessor();
+            const imageProcessor = new image_processor_1.ImageProcessor();
+            processorMap.set(csvProcessor.name, csvProcessor);
+            processorMap.set(excelProcessor.name, excelProcessor);
+            processorMap.set(imageProcessor.name, imageProcessor);
+        }
+        catch (error) {
+            // 内置处理器加载失败，忽略（可能是依赖未安装）
+        }
+        // 添加用户自定义处理器
         if (options.processors && options.processors.length > 0) {
-            const processorMap = new Map();
             for (const ProcessorClass of options.processors) {
                 const processor = new ProcessorClass();
                 processorMap.set(processor.name, processor);
             }
-            providers.push({
-                provide: 'FILE_PROCESSORS',
-                useValue: processorMap,
-            });
         }
+        // 始终提供 FILE_PROCESSORS（即使为空Map）
+        providers.push({
+            provide: 'FILE_PROCESSORS',
+            useValue: processorMap,
+        });
         // 注册存储提供者
         if (options.storage) {
             const storageProviders = this.createStorageProviders(options.storage);
@@ -106,9 +123,8 @@ let FileUploadModule = FileUploadModule_1 = class FileUploadModule {
         if (databaseEnabled) {
             exports.push(file_service_1.FileService);
         }
-        if (options.processors && options.processors.length > 0) {
-            exports.push('FILE_PROCESSORS');
-        }
+        // 始终导出 FILE_PROCESSORS
+        exports.push('FILE_PROCESSORS');
         if (((_b = options.storage) === null || _b === void 0 ? void 0 : _b.local) ||
             !((_c = options.storage) === null || _c === void 0 ? void 0 : _c.default) ||
             ((_d = options.storage) === null || _d === void 0 ? void 0 : _d.default) === 'local') {
@@ -157,18 +173,30 @@ let FileUploadModule = FileUploadModule_1 = class FileUploadModule {
                 useFactory: asyncOptions.useFactory,
                 inject: asyncOptions.inject || [],
             },
-            // 异步处理器注册
+            // 异步处理器注册（内置 + 自定义）
             {
                 provide: 'FILE_PROCESSORS',
                 useFactory: (...args) => __awaiter(this, void 0, void 0, function* () {
                     const options = yield asyncOptions.useFactory(...args);
-                    if (!options.processors || options.processors.length === 0) {
-                        return new Map();
-                    }
                     const processorMap = new Map();
-                    for (const ProcessorClass of options.processors) {
-                        const processor = new ProcessorClass();
-                        processorMap.set(processor.name, processor);
+                    // 自动注册内置处理器
+                    try {
+                        const csvProcessor = new csv_processor_1.CsvProcessor();
+                        const excelProcessor = new excel_processor_1.ExcelProcessor();
+                        const imageProcessor = new image_processor_1.ImageProcessor();
+                        processorMap.set(csvProcessor.name, csvProcessor);
+                        processorMap.set(excelProcessor.name, excelProcessor);
+                        processorMap.set(imageProcessor.name, imageProcessor);
+                    }
+                    catch (error) {
+                        // 内置处理器加载失败，忽略
+                    }
+                    // 添加用户自定义处理器
+                    if (options.processors && options.processors.length > 0) {
+                        for (const ProcessorClass of options.processors) {
+                            const processor = new ProcessorClass();
+                            processorMap.set(processor.name, processor);
+                        }
                     }
                     return processorMap;
                 }),

package/{file-upload → dist/file-upload}/index.d.ts

@@ -6,9 +6,17 @@ export * from './interfaces/file-buffer.interface';
 export * from './interfaces/file-metadata.interface';
 export * from './interfaces/upload-options.interface';
 export * from './interfaces/custom-file-type.interface';
+export * from './interfaces/file-processor.interface';
+import { ProcessResult as _ProcessResult } from './interfaces/processor-options.interface';
+import { ValidationResult as _ValidationResult } from './decorators/validate-data.decorator';
+export { _ProcessResult as ProcessResult };
 export * from './decorators/file-upload.decorator';
-export * from './decorators/excel-data.decorator';
-export * from './decorators/csv-data.decorator';
+export { ExcelColumn, getExcelColumnMapping, parseAndValidateExcelData } from './decorators/excel-data.decorator';
+export { CsvColumn, getCsvColumnMapping, parseAndValidateCsvData } from './decorators/csv-data.decorator';
+export * from './decorators/csv-import.decorator';
+export { BaseRowData, ValidationResult as ValidationResultType } from './decorators/validate-data.decorator';
+export { _ValidationResult as ValidationResult };
+export * from './decorators/validate-data.decorator';
 export * from './decorators/process.decorator';
 export * from './interceptors/file-upload.interceptor';
 export * from './controllers/file-access.controller';
@@ -17,6 +25,9 @@ export * from './services/mime-registry.service';
 export * from './services/file-signature-validator.service';
 export * from './services/malicious-file-detector.service';
 export * from './services/file.service';
+export * from './processors/excel.processor';
+export * from './processors/csv.processor';
+export * from './processors/image.processor';
 export * from './entities/file.entity';
 export * from './entities/file-metadata.entity';
 export * from './dto/create-file.dto';

package/{file-upload → dist/file-upload}/index.js

@@ -14,6 +14,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.BaseRowData = exports.parseAndValidateCsvData = exports.getCsvColumnMapping = exports.CsvColumn = exports.parseAndValidateExcelData = exports.getExcelColumnMapping = exports.ExcelColumn = void 0;
 // Module
 __exportStar(require("./file-upload.module"), exports);
 // Enums
@@ -25,11 +26,24 @@ __exportStar(require("./interfaces/file-buffer.interface"), exports);
 __exportStar(require("./interfaces/file-metadata.interface"), exports);
 __exportStar(require("./interfaces/upload-options.interface"), exports);
 __exportStar(require("./interfaces/custom-file-type.interface"), exports);
+__exportStar(require("./interfaces/file-processor.interface"), exports);
 // Note: FileEntity interface is not exported to avoid conflict with TypeORM entity
-// Decorators
+// Decorators - 避免冲突，选择性导出
 __exportStar(require("./decorators/file-upload.decorator"), exports);
-__exportStar(require("./decorators/excel-data.decorator"), exports);
-__exportStar(require("./decorators/csv-data.decorator"), exports);
+// Excel/CSV 列映射装饰器（字段级别）
+var excel_data_decorator_1 = require("./decorators/excel-data.decorator");
+Object.defineProperty(exports, "ExcelColumn", { enumerable: true, get: function () { return excel_data_decorator_1.ExcelColumn; } });
+Object.defineProperty(exports, "getExcelColumnMapping", { enumerable: true, get: function () { return excel_data_decorator_1.getExcelColumnMapping; } });
+Object.defineProperty(exports, "parseAndValidateExcelData", { enumerable: true, get: function () { return excel_data_decorator_1.parseAndValidateExcelData; } });
+var csv_data_decorator_1 = require("./decorators/csv-data.decorator");
+Object.defineProperty(exports, "CsvColumn", { enumerable: true, get: function () { return csv_data_decorator_1.CsvColumn; } });
+Object.defineProperty(exports, "getCsvColumnMapping", { enumerable: true, get: function () { return csv_data_decorator_1.getCsvColumnMapping; } });
+Object.defineProperty(exports, "parseAndValidateCsvData", { enumerable: true, get: function () { return csv_data_decorator_1.parseAndValidateCsvData; } });
+__exportStar(require("./decorators/csv-import.decorator"), exports);
+// Validation decorators
+var validate_data_decorator_1 = require("./decorators/validate-data.decorator");
+Object.defineProperty(exports, "BaseRowData", { enumerable: true, get: function () { return validate_data_decorator_1.BaseRowData; } });
+__exportStar(require("./decorators/validate-data.decorator"), exports);
 __exportStar(require("./decorators/process.decorator"), exports);
 // Interceptors
 __exportStar(require("./interceptors/file-upload.interceptor"), exports);
@@ -44,6 +58,10 @@ __exportStar(require("./services/mime-registry.service"), exports);
 __exportStar(require("./services/file-signature-validator.service"), exports);
 __exportStar(require("./services/malicious-file-detector.service"), exports);
 __exportStar(require("./services/file.service"), exports);
+// Processors
+__exportStar(require("./processors/excel.processor"), exports);
+__exportStar(require("./processors/csv.processor"), exports);
+__exportStar(require("./processors/image.processor"), exports);
 // Entities
 __exportStar(require("./entities/file.entity"), exports);
 __exportStar(require("./entities/file-metadata.entity"), exports);

package/dist/file-upload/interceptors/file-upload.interceptor.d.ts

@@ -0,0 +1,101 @@
+import { CallHandler, ExecutionContext, NestInterceptor } from '@nestjs/common';
+import { Reflector } from '@nestjs/core';
+import { Observable } from 'rxjs';
+import { IFileProcessor } from '../interfaces/file-processor.interface';
+import { FileService } from '../services/file.service';
+import { FileSignatureValidator } from '../services/file-signature-validator.service';
+import { MaliciousFileDetector } from '../services/malicious-file-detector.service';
+import { MimeRegistryService } from '../services/mime-registry.service';
+/**
+ * 文件上传拦截器（优化版）
+ * 负责创建文件记录、执行钩子、处理器等后置逻辑
+ */
+export declare class FileUploadInterceptor implements NestInterceptor {
+    private readonly reflector;
+    private readonly mimeRegistry;
+    private readonly processors?;
+    private readonly fileService?;
+    private readonly signatureValidator?;
+    private readonly maliciousDetector?;
+    private readonly moduleOptions?;
+    private readonly logger;
+    constructor(reflector: Reflector, mimeRegistry: MimeRegistryService, processors?: Map<string, IFileProcessor>, fileService?: FileService, signatureValidator?: FileSignatureValidator, maliciousDetector?: MaliciousFileDetector, moduleOptions?: any);
+    intercept(context: ExecutionContext, next: CallHandler): Promise<Observable<any>>;
+    /**
+     * 判断是否应该跳过验证
+     */
+    private shouldSkipValidation;
+    /**
+     * 验证文件
+     */
+    private validateFile;
+    /**
+     * 批量验证文件类型和扩展名
+     */
+    private validateFileTypeAndExtension;
+    /**
+     * 判断是否需要执行文件签名验证
+     */
+    private shouldPerformSignatureValidation;
+    /**
+     * 验证文件签名
+     */
+    private validateFileSignature;
+    /**
+     * 判断是否需要执行恶意文件检测
+     */
+    private shouldPerformMaliciousCheck;
+    /**
+     * 检测恶意文件
+     */
+    private checkMaliciousFile;
+    /**
+     * 处理文件
+     */
+    private processFile;
+    /**
+     * 创建文件实体
+     */
+    private createFileEntity;
+    /**
+     * 执行处理器
+     */
+    private executeProcessors;
+    /**
+     * 转换为 FileEntity
+     */
+    private convertToFileEntity;
+    /**
+     * 更新成功状态
+     */
+    private updateFileEntityOnSuccess;
+    /**
+     * 清理失败的文件
+     */
+    private cleanupOnFailure;
+    /**
+     * 创建上传上下文
+     */
+    private createUploadContext;
+    /**
+     * 获取处理器
+     */
+    private getProcessor;
+    /**
+     * 生成uploadId
+     */
+    private generateUploadId;
+    /**
+     * 判断是否应该在处理后删除原文件
+     */
+    private shouldDeleteAfterProcess;
+    /**
+     * 将处理器结果保存到 file_metadata 表
+     * 处理器可以通过返回结果中的 metadata 字段来指定要保存的内容
+     */
+    private saveProcessorResultToMetadata;
+    /**
+     * 删除原文件
+     */
+    private deleteOriginalFile;
+}