id-scanner-lib 1.2.2 → 1.3.2

package/src/ocr-module.ts

@@ -6,134 +6,182 @@
  * @license MIT
  */
 
-import { Camera, CameraOptions } from './utils/camera';
-import { ImageProcessor } from './utils/image-processing';
-import { IDCardInfo, DetectionResult } from './utils/types';
-import { IDCardDetector, IDCardDetectorOptions } from './id-recognition/id-detector';
-import { OCRProcessor } from './id-recognition/ocr-processor';
-import { DataExtractor } from './id-recognition/data-extractor';
+import { Camera, CameraOptions } from "./utils/camera"
+import { ImageProcessor } from "./utils/image-processing"
+import { IDCardInfo, DetectionResult } from "./utils/types"
+import {
+  IDCardDetector,
+  IDCardDetectorOptions,
+} from "./id-recognition/id-detector"
+import { OCRProcessor } from "./id-recognition/ocr-processor"
+import { DataExtractor } from "./id-recognition/data-extractor"
 
 /**
  * OCR模块配置选项
  */
 export interface OCRModuleOptions {
-  cameraOptions?: CameraOptions;
-  onIDCardScanned?: (info: IDCardInfo) => void;
-  onError?: (error: Error) => void;
+  cameraOptions?: CameraOptions
+  onIDCardScanned?: (info: IDCardInfo) => void
+  onError?: (error: Error) => void
 }
 
 /**
  * OCR模块类
- * 
+ *
  * 提供身份证检测和OCR文字识别功能
  */
 export class OCRModule {
-  private idDetector: IDCardDetector;
-  private ocrProcessor: OCRProcessor;
-  private dataExtractor: DataExtractor;
-  private camera: Camera;
-  private isRunning: boolean = false;
-  private videoElement: HTMLVideoElement | null = null;
-  
+  private idDetector: IDCardDetector
+  private ocrProcessor: OCRProcessor
+  private dataExtractor: DataExtractor
+  private camera: Camera
+  private isRunning: boolean = false
+  private videoElement: HTMLVideoElement | null = null
+
   /**
    * 构造函数
    * @param options 配置选项
    */
   constructor(private options: OCRModuleOptions = {}) {
-    this.camera = new Camera(options.cameraOptions);
+    this.camera = new Camera(options.cameraOptions)
     this.idDetector = new IDCardDetector({
       onDetection: this.handleIDDetection.bind(this),
-      onError: this.handleError.bind(this)
-    } as IDCardDetectorOptions);
-    this.ocrProcessor = new OCRProcessor();
-    this.dataExtractor = new DataExtractor();
+      onError: this.handleError.bind(this),
+    } as IDCardDetectorOptions)
+    this.ocrProcessor = new OCRProcessor()
+    this.dataExtractor = new DataExtractor()
   }
-  
+
   /**
    * 初始化OCR引擎
-   * 
+   *
    * @returns Promise<void>
    */
   async initialize(): Promise<void> {
     try {
-      await this.ocrProcessor.initialize();
-      console.log('OCR engine initialized');
+      await this.ocrProcessor.initialize()
+      console.log("OCR engine initialized")
     } catch (error) {
-      this.handleError(error as Error);
-      throw error;
+      this.handleError(error as Error)
+      throw error
     }
   }
-  
+
   /**
    * 启动身份证扫描
    * @param videoElement HTML视频元素
    */
   async startIDCardScanner(videoElement: HTMLVideoElement): Promise<void> {
     if (!this.ocrProcessor) {
-      throw new Error('OCR engine not initialized. Call initialize() first.');
+      throw new Error("OCR engine not initialized. Call initialize() first.")
     }
-    
-    this.videoElement = videoElement;
-    this.isRunning = true;
-    await this.camera.start(videoElement);
-    this.idDetector.start(videoElement);
+
+    this.videoElement = videoElement
+    this.isRunning = true
+    await this.camera.start(videoElement)
+    this.idDetector.start(videoElement)
   }
-  
+
   /**
    * 停止扫描
    */
   stop(): void {
-    this.isRunning = false;
-    this.idDetector.stop();
-    this.camera.stop();
+    this.isRunning = false
+    this.idDetector.stop()
+    this.camera.stop()
   }
-  
+
   /**
    * 处理身份证检测结果
    */
   private async handleIDDetection(result: DetectionResult): Promise<void> {
-    if (!this.isRunning) return;
-    
+    if (!this.isRunning) return
+
     try {
       // 检查 imageData 是否存在
       if (!result.imageData) {
-        this.handleError(new Error('无效的图像数据'));
-        return;
+        this.handleError(new Error("无效的图像数据"))
+        return
       }
-      
-      const idCardInfo = await this.ocrProcessor.processIDCard(result.imageData);
-      const extractedInfo = this.dataExtractor.extractAndValidate(idCardInfo);
-      
+
+      const idCardInfo = await this.ocrProcessor.processIDCard(result.imageData)
+      const extractedInfo = this.dataExtractor.extractAndValidate(idCardInfo)
+
       if (this.options.onIDCardScanned) {
-        this.options.onIDCardScanned(extractedInfo);
+        this.options.onIDCardScanned(extractedInfo)
       }
     } catch (error) {
-      this.handleError(error as Error);
+      this.handleError(error as Error)
     }
   }
-  
+
   /**
    * 处理错误
    */
   private handleError(error: Error): void {
     if (this.options.onError) {
-      this.options.onError(error);
+      this.options.onError(error)
     } else {
-      console.error('OCRModule error:', error);
+      console.error("OCRModule error:", error)
     }
   }
-  
+
   /**
    * 释放资源
    */
   async terminate(): Promise<void> {
-    this.stop();
-    await this.ocrProcessor.terminate();
+    this.stop()
+    await this.ocrProcessor.terminate()
+  }
+
+  /**
+   * 直接处理图像数据中的身份证
+   * @param imageData 要处理的图像数据
+   * @returns 返回Promise，解析为身份证信息
+   */
+  async processIDCard(imageData: ImageData): Promise<IDCardInfo> {
+    try {
+      if (!this.ocrProcessor) {
+        throw new Error("OCR engine not initialized. Call initialize() first.")
+      }
+
+      // 检查图像数据有效性
+      if (
+        !imageData ||
+        !imageData.data ||
+        imageData.width <= 0 ||
+        imageData.height <= 0
+      ) {
+        throw new Error("无效的图像数据")
+      }
+
+      // 进行图像预处理，提高识别率
+      const processedImage = ImageProcessor.adjustBrightnessContrast(
+        imageData,
+        5, // 轻微提高亮度
+        10 // 适度提高对比度
+      )
+
+      // 调用OCR处理器进行文字识别
+      const idCardInfo = await this.ocrProcessor.processIDCard(processedImage)
+      // 提取和验证身份证信息
+      const extractedInfo = this.dataExtractor.extractAndValidate(idCardInfo)
+
+      // 如果有回调，触发回调
+      if (this.options.onIDCardScanned) {
+        this.options.onIDCardScanned(extractedInfo)
+      }
+
+      return extractedInfo
+    } catch (error) {
+      this.handleError(error as Error)
+      throw error
+    }
   }
 }
 
 // 导出相关类型和工具
-export { IDCardDetector } from './id-recognition/id-detector';
-export { OCRProcessor } from './id-recognition/ocr-processor';
-export { DataExtractor } from './id-recognition/data-extractor';
-export { IDCardInfo } from './utils/types'; 
+export { IDCardDetector } from "./id-recognition/id-detector"
+export { OCRProcessor } from "./id-recognition/ocr-processor"
+export { DataExtractor } from "./id-recognition/data-extractor"
+export { IDCardInfo } from "./utils/types"

package/src/qr-module.ts

@@ -6,124 +6,174 @@
  * @license MIT
  */
 
-import { QRScanner, QRScannerOptions } from './scanner/qr-scanner';
-import { BarcodeScanner, BarcodeScannerOptions } from './scanner/barcode-scanner';
-import { Camera, CameraOptions } from './utils/camera';
+import { QRScanner, QRScannerOptions } from "./scanner/qr-scanner"
+import {
+  BarcodeScanner,
+  BarcodeScannerOptions,
+} from "./scanner/barcode-scanner"
+import { Camera, CameraOptions } from "./utils/camera"
 
 /**
  * 扫描模块配置选项
  */
 export interface ScannerModuleOptions {
-  cameraOptions?: CameraOptions;
-  qrScannerOptions?: QRScannerOptions;
-  barcodeScannerOptions?: BarcodeScannerOptions;
-  onQRCodeScanned?: (result: string) => void;
-  onBarcodeScanned?: (result: string) => void;
-  onError?: (error: Error) => void;
+  cameraOptions?: CameraOptions
+  qrScannerOptions?: QRScannerOptions
+  barcodeScannerOptions?: BarcodeScannerOptions
+  onQRCodeScanned?: (result: string) => void
+  onBarcodeScanned?: (result: string) => void
+  onError?: (error: Error) => void
 }
 
 /**
  * 扫描模块类
- * 
+ *
  * 提供独立的二维码和条形码扫描功能
  */
 export class ScannerModule {
-  private qrScanner: QRScanner;
-  private barcodeScanner: BarcodeScanner;
-  private camera: Camera;
-  private scanMode: 'qr' | 'barcode' | null = null;
-  private videoElement: HTMLVideoElement | null = null;
-  
+  private qrScanner: QRScanner
+  private barcodeScanner: BarcodeScanner
+  private camera: Camera
+  private scanMode: "qr" | "barcode" | null = null
+  private videoElement: HTMLVideoElement | null = null
+
   /**
    * 构造函数
    * @param options 配置选项
    */
   constructor(private options: ScannerModuleOptions = {}) {
-    this.camera = new Camera(options.cameraOptions);
+    this.camera = new Camera(options.cameraOptions)
     this.qrScanner = new QRScanner({
       ...options.qrScannerOptions,
-      onScan: this.handleQRScan.bind(this)
-    });
+      onScan: this.handleQRScan.bind(this),
+    })
     this.barcodeScanner = new BarcodeScanner({
       ...options.barcodeScannerOptions,
-      onScan: this.handleBarcodeScan.bind(this)
-    });
+      onScan: this.handleBarcodeScan.bind(this),
+    })
   }
-  
+
   /**
    * 启动二维码扫描
    * @param videoElement HTML视频元素
    */
   async startQRScanner(videoElement: HTMLVideoElement): Promise<void> {
-    this.stop(); // 确保先停止可能正在运行的扫描
-    
-    this.videoElement = videoElement;
-    this.scanMode = 'qr';
-    await this.camera.start(videoElement);
-    this.qrScanner.start(videoElement);
+    this.stop() // 确保先停止可能正在运行的扫描
+
+    this.videoElement = videoElement
+    this.scanMode = "qr"
+    await this.camera.start(videoElement)
+    this.qrScanner.start(videoElement)
   }
-  
+
   /**
    * 启动条形码扫描
    * @param videoElement HTML视频元素
    */
   async startBarcodeScanner(videoElement: HTMLVideoElement): Promise<void> {
-    this.stop(); // 确保先停止可能正在运行的扫描
-    
-    this.videoElement = videoElement;
-    this.scanMode = 'barcode';
-    await this.camera.start(videoElement);
-    this.barcodeScanner.start(videoElement);
+    this.stop() // 确保先停止可能正在运行的扫描
+
+    this.videoElement = videoElement
+    this.scanMode = "barcode"
+    await this.camera.start(videoElement)
+    this.barcodeScanner.start(videoElement)
   }
-  
+
   /**
    * 停止扫描
    */
   stop(): void {
-    if (this.scanMode === 'qr') {
-      this.qrScanner.stop();
-    } else if (this.scanMode === 'barcode') {
-      this.barcodeScanner.stop();
+    if (this.scanMode === "qr") {
+      this.qrScanner.stop()
+    } else if (this.scanMode === "barcode") {
+      this.barcodeScanner.stop()
     }
-    
+
     if (this.videoElement) {
-      this.camera.stop();
+      this.camera.stop()
     }
-    
-    this.scanMode = null;
+
+    this.scanMode = null
   }
-  
+
   /**
    * 处理二维码扫描结果
    */
   private handleQRScan(result: string): void {
     if (this.options.onQRCodeScanned) {
-      this.options.onQRCodeScanned(result);
+      this.options.onQRCodeScanned(result)
     }
   }
-  
+
   /**
    * 处理条形码扫描结果
    */
   private handleBarcodeScan(result: string): void {
     if (this.options.onBarcodeScanned) {
-      this.options.onBarcodeScanned(result);
+      this.options.onBarcodeScanned(result)
     }
   }
-  
+
   /**
    * 处理错误
    */
   private handleError(error: Error): void {
     if (this.options.onError) {
-      this.options.onError(error);
+      this.options.onError(error)
     } else {
-      console.error('ScannerModule error:', error);
+      console.error("ScannerModule error:", error)
+    }
+  }
+
+  /**
+   * 处理图像数据中的二维码
+   * @param imageData 要处理的图像数据
+   * @returns 返回Promise，解析为扫描结果
+   */
+  async processQRCodeImage(imageData: ImageData): Promise<string> {
+    try {
+      const result = this.qrScanner.processImageData(imageData)
+      if (result) {
+        // 如果需要，触发回调
+        if (this.options.onQRCodeScanned) {
+          this.options.onQRCodeScanned(result)
+        }
+        return result
+      }
+      throw new Error("未检测到二维码")
+    } catch (error) {
+      this.handleError(error as Error)
+      throw error
+    }
+  }
+
+  /**
+   * 处理图像数据中的条形码
+   * @param imageData 要处理的图像数据
+   * @returns 返回Promise，解析为扫描结果
+   */
+  async processBarcodeImage(imageData: ImageData): Promise<string> {
+    try {
+      const result = this.barcodeScanner.processImageData(imageData)
+      if (result) {
+        // 如果需要，触发回调
+        if (this.options.onBarcodeScanned) {
+          this.options.onBarcodeScanned(result)
+        }
+        return result
+      }
+      throw new Error("未检测到条形码")
+    } catch (error) {
+      this.handleError(error as Error)
+      throw error
     }
   }
 }
 
 // 导出相关类型和工具
-export { QRScanner, QRScannerOptions } from './scanner/qr-scanner';
-export { BarcodeScanner, BarcodeScannerOptions } from './scanner/barcode-scanner';
-export { Camera, CameraOptions } from './utils/camera'; 
+export { QRScanner, QRScannerOptions } from "./scanner/qr-scanner"
+export {
+  BarcodeScanner,
+  BarcodeScannerOptions,
+} from "./scanner/barcode-scanner"
+export { Camera, CameraOptions } from "./utils/camera"