taro-bluetooth-print 2.5.0 → 2.6.0

package/src/barcode/BarcodeGenerator.ts

@@ -1,8 +1,8 @@
 /**
  * Barcode Generator
  *
- * Generates ESC/POS commands for printing 1D barcodes.
- * Supports Code128, Code39, EAN-13, EAN-8, UPC-A, ITF, and CODABAR formats.
+ * Generates ESC/POS commands for printing 1D barcodes and 2D codes.
+ * Supports Code128, Code39, EAN-13, EAN-8, UPC-A, ITF, CODABAR, QR_CODE, and PDF417 formats.
  *
  * @example
  * ```typescript
@@ -33,6 +33,10 @@ export enum BarcodeFormat {
   ITF = 'ITF',
   /** CODABAR - Numeric with special start/stop chars */
   CODABAR = 'CODABAR',
+  /** QR Code - 2D matrix code */
+  QR_CODE = 'QR_CODE',
+  /** PDF417 - 2D stacked barcode */
+  PDF417 = 'PDF417',
 }
 
 /**
@@ -49,6 +53,16 @@ export interface BarcodeOptions {
   showText?: boolean;
   /** Text position */
   textPosition?: 'above' | 'below' | 'both' | 'none';
+  /** QR code error correction level (L/M/Q/H, default: M) */
+  errorCorrection?: 'L' | 'M' | 'Q' | 'H';
+  /** QR code model (1 or 2, default: 2) */
+  qrModel?: 1 | 2;
+  /** PDF417 compression mode (0-3, default: 2) */
+  pdf417Compression?: 0 | 1 | 2 | 3;
+  /** PDF417 security level (0-8, default: 2) */
+  pdf417Security?: 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8;
+  /** PDF417 columns (1-30, default: 2) */
+  pdf417Columns?: number;
 }
 
 /**
@@ -81,9 +95,10 @@ export interface IBarcodeGenerator {
  * ESC/POS command constants
  */
 const GS = 0x1d;
+const ESC = 0x1b;
 
 /**
- * ESC/POS barcode type codes
+ * ESC/POS barcode type codes (GS k m)
  */
 const BARCODE_TYPES: Record<BarcodeFormat, number> = {
   [BarcodeFormat.UPCA]: 65, // GS k 65
@@ -93,6 +108,26 @@ const BARCODE_TYPES: Record<BarcodeFormat, number> = {
   [BarcodeFormat.ITF]: 70, // GS k 70
   [BarcodeFormat.CODABAR]: 71, // GS k 71
   [BarcodeFormat.CODE128]: 73, // GS k 73
+  [BarcodeFormat.QR_CODE]: 80, // GS k 80 (PDF moved to 81)
+  [BarcodeFormat.PDF417]: 81, // GS k 81
+};
+
+/**
+ * QR code error correction levels
+ */
+const QR_ERROR_CORRECTION_CODES: Record<string, number> = {
+  L: 48, // 0x30
+  M: 49, // 0x31
+  Q: 50, // 0x32
+  H: 51, // 0x33
+};
+
+/**
+ * QR code models
+ */
+const QR_MODEL_CODES: Record<number, number> = {
+  1: 49, // 0x31
+  2: 50, // 0x32
 };
 
 /**
@@ -105,9 +140,19 @@ const TEXT_POSITION_CODES: Record<string, number> = {
   both: 3,
 };
 
+/**
+ * PDF417 compression modes
+ */
+const PDF417_COMPRESSION_CODES: Record<number, number> = {
+  0: 48, // 0x30 - linear
+  1: 49, // 0x31 - compressed
+  2: 50, // 0x32 - enhanced
+  3: 51, // 0x33 - auto
+};
+
 /**
  * Barcode Generator class
- * Generates ESC/POS commands for 1D barcodes
+ * Generates ESC/POS commands for 1D barcodes and 2D codes
  */
 export class BarcodeGenerator implements IBarcodeGenerator {
   /**
@@ -124,6 +169,23 @@ export class BarcodeGenerator implements IBarcodeGenerator {
       return [];
     }
 
+    // Handle 2D codes separately
+    if (options.format === BarcodeFormat.QR_CODE) {
+      return this.generateQRCode(content, options);
+    }
+
+    if (options.format === BarcodeFormat.PDF417) {
+      return this.generatePDF417(content, options);
+    }
+
+    // 1D barcode generation
+    return this.generate1DBarcode(content, options);
+  }
+
+  /**
+   * Generate 1D barcode commands
+   */
+  private generate1DBarcode(content: string, options: BarcodeOptions): Uint8Array[] {
     const commands: Uint8Array[] = [];
 
     // 1. Set barcode height: GS h n (n = 1-255)
@@ -148,6 +210,106 @@ export class BarcodeGenerator implements IBarcodeGenerator {
     return commands;
   }
 
+  /**
+   * Generate QR code commands using ESC/POS GS k 80-83
+   *
+   * @param content - QR code content
+   * @param options - QR code options
+   * @returns Array of ESC/POS command buffers
+   */
+  private generateQRCode(content: string, options: BarcodeOptions): Uint8Array[] {
+    const commands: Uint8Array[] = [];
+    const model = options.qrModel ?? 2;
+    const size = this.clampQRSize(options.height ?? 6);
+    const errorLevel = options.errorCorrection ?? 'M';
+
+    // 1. Set QR code model: GS ( k 04 00 31 41 50 n
+    // pH=0, pL=4, cn=31 (1), fn=65 (A), 50=0, n=model(1 or 2)
+    const qrModelCode = QR_MODEL_CODES[model] ?? 50;
+    commands.push(new Uint8Array([GS, 0x28, 0x6b, 0x04, 0x00, 0x31, 0x41, 0x50, qrModelCode]));
+
+    // 2. Set QR code size (module size): GS ( k 03 00 31 43 n
+    commands.push(new Uint8Array([GS, 0x28, 0x6b, 0x03, 0x00, 0x31, 0x43, size]));
+
+    // 3. Set error correction level: GS ( k 03 00 31 45 n
+    const qrErrorCode = QR_ERROR_CORRECTION_CODES[errorLevel] ?? 49;
+    commands.push(new Uint8Array([GS, 0x28, 0x6b, 0x03, 0x00, 0x31, 0x45, qrErrorCode]));
+
+    // 4. Store data: GS ( k pL pH 31 50 30 d1...dk
+    const dataBytes = this.encodeUTF8(content);
+    const storeLen = dataBytes.length + 3;
+    commands.push(
+      new Uint8Array([
+        GS,
+        0x28,
+        0x6b,
+        storeLen & 0xff,
+        (storeLen >> 8) & 0xff,
+        0x31,
+        0x50,
+        0x30,
+        ...dataBytes,
+      ])
+    );
+
+    // 5. Print QR code: GS ( k 03 00 31 51 30
+    commands.push(new Uint8Array([GS, 0x28, 0x6b, 0x03, 0x00, 0x31, 0x51, 0x30]));
+
+    return commands;
+  }
+
+  /**
+   * Generate PDF417 commands using ESC/POS GS k 81
+   *
+   * PDF417 is a 2D stacked barcode format supported by many thermal printers.
+   * The printer will handle the actual encoding and generation of the PDF417 symbol.
+   *
+   * @param content - PDF417 content (text data)
+   * @param options - PDF417 options
+   * @returns Array of ESC/POS command buffers
+   */
+  private generatePDF417(content: string, options: BarcodeOptions): Uint8Array[] {
+    const commands: Uint8Array[] = [];
+    const compression = options.pdf417Compression ?? 2;
+    const security = options.pdf417Security ?? 2;
+    const columns = this.clampPDF417Columns(options.pdf417Columns ?? 2);
+
+    // 1. Set PDF417 parameters: GS ( k 07 00 31 30 n1 n2 n3 n4
+    // n1 = columns (1-30), n2 = security level (0-8), n3 = truncation (0=none), n4 = reserved
+    commands.push(
+      new Uint8Array([
+        GS,
+        0x28,
+        0x6b,
+        0x07,
+        0x00,
+        0x31,
+        0x30, // Function 30 (PDF417 set)
+        columns,
+        security,
+        0, // truncation off
+        0, // reserved
+      ])
+    );
+
+    // 2. Set data compression mode: ESC ] 04 n
+    const pdfCompressionCode = PDF417_COMPRESSION_CODES[compression] ?? 50;
+    commands.push(new Uint8Array([ESC, 0x5d, 0x04, pdfCompressionCode]));
+
+    // 3. Store PDF417 data: GS k 81 pL pH d1...dk
+    const dataBytes = this.encodeUTF8(content);
+    const storeLen = dataBytes.length + 3;
+    commands.push(
+      new Uint8Array([GS, 0x6b, 81, storeLen & 0xff, (storeLen >> 8) & 0xff, ...dataBytes])
+    );
+
+    // 4. Print PDF417: GS k 81 00 (alternative form if needed)
+    // Actually for PDF417 print: GS ( k 03 00 31 51 31
+    commands.push(new Uint8Array([GS, 0x28, 0x6b, 0x03, 0x00, 0x31, 0x51, 0x31]));
+
+    return commands;
+  }
+
   /**
    * Validate barcode content for the specified format
    *
@@ -158,7 +320,8 @@ export class BarcodeGenerator implements IBarcodeGenerator {
   validate(content: string, format: BarcodeFormat): ValidationResult {
     const errors: ValidationResult['errors'] = [];
 
-    if (!content || typeof content !== 'string') {
+    // Common validation for all formats
+    if (content === null || content === undefined) {
       errors.push({
         field: 'content',
         message: 'Barcode content is required',
@@ -167,6 +330,41 @@ export class BarcodeGenerator implements IBarcodeGenerator {
       return { valid: false, errors };
     }
 
+    if (typeof content !== 'string') {
+      errors.push({
+        field: 'content',
+        message: 'Barcode content must be a string',
+        code: 'INVALID_TYPE',
+      });
+      return { valid: false, errors };
+    }
+
+    if (content.length === 0) {
+      errors.push({
+        field: 'content',
+        message: 'Barcode content cannot be empty',
+        code: 'REQUIRED',
+      });
+      return { valid: false, errors };
+    }
+
+    // Validate minimum content length for 2D codes
+    if (format === BarcodeFormat.QR_CODE && content.length > 7089) {
+      errors.push({
+        field: 'content',
+        message: 'QR code content exceeds maximum length (7089 bytes for binary mode)',
+        code: 'CONTENT_TOO_LONG',
+      });
+    }
+
+    if (format === BarcodeFormat.PDF417 && content.length > 1850) {
+      errors.push({
+        field: 'content',
+        message: 'PDF417 content exceeds maximum length (~1850 bytes)',
+        code: 'CONTENT_TOO_LONG',
+      });
+    }
+
     switch (format) {
       case BarcodeFormat.EAN13:
         this.validateEAN13(content, errors);
@@ -189,8 +387,13 @@ export class BarcodeGenerator implements IBarcodeGenerator {
       case BarcodeFormat.CODABAR:
         this.validateCodabar(content, errors);
         break;
+      case BarcodeFormat.QR_CODE:
+        this.validateQRCode(content, errors);
+        break;
+      case BarcodeFormat.PDF417:
+        this.validatePDF417(content, errors);
+        break;
       default: {
-        // This should never happen if all enum cases are handled
         errors.push({
           field: 'format',
           message: `Unsupported barcode format: ${String(format)}`,
@@ -202,6 +405,69 @@ export class BarcodeGenerator implements IBarcodeGenerator {
     return { valid: errors.length === 0, errors };
   }
 
+  /**
+   * Validate QR code content
+   */
+  private validateQRCode(content: string, errors: ValidationResult['errors']): void {
+    if (content.length === 0) {
+      errors.push({
+        field: 'content',
+        message: 'QR code content cannot be empty',
+        code: 'REQUIRED',
+      });
+    }
+
+    // Check for invalid characters in numeric/alphanumeric mode (if we were using those)
+    // For byte mode, all characters 0-255 are valid
+    if (content.length > 7089) {
+      errors.push({
+        field: 'content',
+        message: 'QR code content exceeds maximum binary mode length',
+        code: 'CONTENT_TOO_LONG',
+      });
+    }
+  }
+
+  /**
+   * Validate PDF417 content
+   */
+  private validatePDF417(content: string, errors: ValidationResult['errors']): void {
+    if (content.length === 0) {
+      errors.push({
+        field: 'content',
+        message: 'PDF417 content cannot be empty',
+        code: 'REQUIRED',
+      });
+    }
+
+    if (content.length > 1850) {
+      errors.push({
+        field: 'content',
+        message: 'PDF417 content exceeds maximum length',
+        code: 'CONTENT_TOO_LONG',
+      });
+    }
+
+    // PDF417 supports ASCII 0-127 in text mode
+    let hasHighChars = false;
+    for (let i = 0; i < content.length; i++) {
+      const code = content.charCodeAt(i);
+      if (code > 127) {
+        hasHighChars = true;
+        break;
+      }
+    }
+
+    if (hasHighChars) {
+      errors.push({
+        field: 'content',
+        message:
+          'PDF417 standard mode only supports ASCII characters. Consider using compression mode.',
+        code: 'INVALID_CHARACTERS',
+      });
+    }
+  }
+
   /**
    * Get list of supported barcode formats
    *
@@ -450,6 +716,32 @@ export class BarcodeGenerator implements IBarcodeGenerator {
     return content.split('').map(c => c.charCodeAt(0));
   }
 
+  /**
+   * Encode string to UTF-8 bytes
+   */
+  private encodeUTF8(str: string): number[] {
+    const result: number[] = [];
+    for (let i = 0; i < str.length; i++) {
+      const charCode = str.charCodeAt(i);
+      if (charCode < 0x80) {
+        result.push(charCode);
+      } else if (charCode < 0x800) {
+        result.push(0xc0 | (charCode >> 6));
+        result.push(0x80 | (charCode & 0x3f));
+      } else if (charCode < 0x10000) {
+        result.push(0xe0 | (charCode >> 12));
+        result.push(0x80 | ((charCode >> 6) & 0x3f));
+        result.push(0x80 | (charCode & 0x3f));
+      } else {
+        result.push(0xf0 | (charCode >> 18));
+        result.push(0x80 | ((charCode >> 12) & 0x3f));
+        result.push(0x80 | ((charCode >> 6) & 0x3f));
+        result.push(0x80 | (charCode & 0x3f));
+      }
+    }
+    return result;
+  }
+
   /**
    * Get text position code
    */
@@ -475,6 +767,20 @@ export class BarcodeGenerator implements IBarcodeGenerator {
   private clampWidth(width: number): number {
     return Math.max(2, Math.min(6, Math.floor(width)));
   }
+
+  /**
+   * Clamp QR code size to valid range (1-16)
+   */
+  private clampQRSize(size: number): number {
+    return Math.max(1, Math.min(16, Math.floor(size)));
+  }
+
+  /**
+   * Clamp PDF417 columns to valid range (1-30)
+   */
+  private clampPDF417Columns(columns: number): number {
+    return Math.max(1, Math.min(30, Math.floor(columns)));
+  }
 }
 
 // Export singleton instance for convenience

package/src/barcode/index.ts

@@ -1,6 +1,6 @@
 /**
  * Barcode Generator Module
- * 条码生成模块 - 负责一维条码生成
+ * 条码生成模块 - 负责一维条码和二维条码生成
  */
 
 export { BarcodeGenerator, barcodeGenerator, BarcodeFormat } from './BarcodeGenerator';

package/src/drivers/StarPrinter.ts

@@ -275,14 +275,14 @@ export class StarPrinter implements IPrinterDriver {
       return [];
     }
 
-    const model = (options?.model ?? 2) as 1 | 2;
+    const model = options?.model ?? 2;
     // STAR uses cellSize instead of 'size' - extract safely
     let cellSize = 4;
     if (options) {
       if ('cellSize' in options) {
-        cellSize = (options as StarQrOptions).cellSize ?? 4;
+        cellSize = options.cellSize ?? 4;
       } else if ('size' in options) {
-        cellSize = (options as IQrOptions).size ?? 4;
+        cellSize = options.size ?? 4;
       }
     }
     const ecLevel = options?.errorCorrection ?? 'M';
@@ -310,9 +310,10 @@ export class StarPrinter implements IPrinterDriver {
 
     // Step 4: QR Data - Calculate length and send
     // Get encoded data
-    const encoded = this.useEncodingService && this.encodingService.isSupported('UTF-8')
-      ? this.encodingService.encode(content, 'UTF-8')
-      : new TextEncoder().encode(content);
+    const encoded =
+      this.useEncodingService && this.encodingService.isSupported('UTF-8')
+        ? this.encodingService.encode(content, 'UTF-8')
+        : new TextEncoder().encode(content);
 
     // Send QR data: Length prefix (2 bytes big-endian) + data
     const len = encoded.length;
@@ -360,10 +361,10 @@ export class StarPrinter implements IPrinterDriver {
 
     // HRI position mapping
     const hriMap: Record<string, number> = {
-      'none': 0,
-      'above': 1,
-      'below': 2,
-      'both': 3,
+      none: 0,
+      above: 1,
+      below: 2,
+      both: 3,
     };
     const hriValue = hriMap[hri] ?? 2;
 
@@ -544,9 +545,9 @@ export class StarPrinter implements IPrinterDriver {
     // ESC a n - Select justification
     // n=0: Left, n=1: Center, n=2: Right
     const alignMap: Record<Alignment, number> = {
-      'left': 0x00,
-      'center': 0x01,
-      'right': 0x02,
+      left: 0x00,
+      center: 0x01,
+      right: 0x02,
     };
 
     const alignValue = alignMap[align] ?? 0x00;

package/src/encoding/EncodingService.ts

@@ -279,10 +279,19 @@ export class EncodingService {
 
     const normalized = this.normalizeEncoding(encoding);
     return [
-      'GBK', 'GB2312', 'BIG5', 'UTF8', 'UTF-8',
-      'EUCKR', 'EUC-KR',
-      'SHIFTJIS', 'SHIFT-JIS', 'SJIS',
-      'ISO2022JP', 'ISO-2022-JP', 'JIS',
+      'GBK',
+      'GB2312',
+      'BIG5',
+      'UTF8',
+      'UTF-8',
+      'EUCKR',
+      'EUC-KR',
+      'SHIFTJIS',
+      'SHIFT-JIS',
+      'SJIS',
+      'ISO2022JP',
+      'ISO-2022-JP',
+      'JIS',
     ].includes(normalized);
   }
 
@@ -487,8 +496,6 @@ export class EncodingService {
     // Try native TextEncoder first (full coverage)
     try {
       const native = new TextEncoder();
-      // @ts-ignore - TextEncoder supports EUC-KR in some environments
-      const encoded = native.encodeInto ? null : null;
       // Use native EUC-KR encoding if available
       const test = native.encode('가');
       if (test.length > 0) {