taro-bluetooth-print 2.9.4 → 2.9.6

package/dist/types/drivers/CpclDriver.d.ts

@@ -264,12 +264,17 @@ export declare class CpclDriver {
      */
     logo(x: number, y: number, logoName: string): this;
     /**
-     * Download logo to printer (store in memory)
-     * Note: This is a placeholder for future implementation
+     * Download logo to printer memory (macro/form storage).
+     * Encodes bitmap using CPCL CG (Compressed Graphic) command.
+     * The bitmap should be 1-bit monochrome data.
      * @param logoName - Name to store logo as
-     * @param _bitmap - Logo bitmap data (placeholder)
+     * @param bitmap - 1-bit monochrome bitmap data (MSB first, row-major)
+     * @param options - Optional width and height (will be inferred from bitmap size if omitted)
      */
-    downloadLogo(logoName: string, _bitmap: Uint8Array): this;
+    downloadLogo(logoName: string, bitmap: Uint8Array, options?: {
+        width?: number;
+        height?: number;
+    }): this;
     /**
      * Print stored logo
      * @param logoName - Logo name

package/dist/types/drivers/ZplDriver.d.ts

@@ -267,15 +267,15 @@ export declare class ZplDriver {
      */
     ellipse(x: number, y: number, width: number, height: number, borderThickness?: number): this;
     /**
-     * Add image from raw bitmap
-     * Note: For best results, use pre-processed images. This is a placeholder for future implementation.
-     * @param _x - X position (placeholder)
-     * @param _y - Y position (placeholder)
-     * @param _width - Image width (placeholder)
-     * @param _height - Image height (placeholder)
-     * @param _bitmap - Binary bitmap data (placeholder)
-     */
-    image(_x: number, _y: number, _width: number, _height: number, _bitmap: Uint8Array): this;
+     * Add image from raw bitmap using ZPL ^GFA (Graphic Field) command.
+     * The bitmap should be 1-bit (monochrome) data where each bit represents a pixel.
+     * @param x - X position in dots
+     * @param y - Y position in dots
+     * @param width - Image width in pixels
+     * @param height - Image height in pixels
+     * @param bitmap - 1-bit monochrome bitmap data (MSB first, row-major)
+     */
+    image(x: number, y: number, width: number, height: number, bitmap: Uint8Array): this;
     /**
      * Set darkness/print density
      * @param value - Darkness value (0-30, default: 15)

package/dist/types/queue/PrintQueue.d.ts

@@ -127,6 +127,7 @@ export declare class PrintQueue implements IPrintQueue {
     private activeJobs;
     private jobCounter;
     private executor;
+    private retryTimerId;
     /**
      * Creates a new PrintQueue instance
      */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "taro-bluetooth-print",
-  "version": "2.9.4",
+  "version": "2.9.6",
   "description": "Taro 蓝牙打印库 v2.6 - 轻量级、高性能、跨平台支持微信、支付宝、百度、字节跳动小程序及H5 Web Bluetooth",
   "type": "module",
   "main": "dist/index.cjs.js",
@@ -88,5 +88,15 @@
     "vitepress": "^1.6.4",
     "vitest": "^4.0.18"
   },
-  "sideEffects": false
+  "sideEffects": false,
+  "pnpm": {
+    "overrides": {
+      "esbuild@<=0.24.2": ">=0.25.0",
+      "lodash-es@>=4.0.0 <=4.17.22": ">=4.17.23",
+      "lodash-es@>=4.0.0 <=4.17.23": ">=4.18.0",
+      "lodash-es@<=4.17.23": ">=4.18.0",
+      "vite@<=6.4.1": ">=6.4.2",
+      "postcss@<8.5.10": ">=8.5.10"
+    }
+  }
 }

package/src/adapters/WebBluetoothAdapter.ts

@@ -218,8 +218,11 @@ export class WebBluetoothAdapter extends BaseAdapter {
       // Get RSSI if available (may not be available on all devices)
       let rssi: number | undefined;
       try {
-        const deviceWithRssi = characteristic.service.device as BluetoothDeviceWithRssi;
-        if ('readRemoteRssi' in deviceWithRssi && typeof deviceWithRssi.readRemoteRssi === 'function') {
+        const deviceWithRssi = characteristic.service.device as unknown as BluetoothDeviceWithRssi;
+        if (
+          'readRemoteRssi' in deviceWithRssi &&
+          typeof deviceWithRssi.readRemoteRssi === 'function'
+        ) {
           rssi = await deviceWithRssi.readRemoteRssi();
         }
       } catch {

package/src/drivers/CpclDriver.ts

@@ -478,16 +478,43 @@ export class CpclDriver {
   }
 
   /**
-   * Download logo to printer (store in memory)
-   * Note: This is a placeholder for future implementation
+   * Download logo to printer memory (macro/form storage).
+   * Encodes bitmap using CPCL CG (Compressed Graphic) command.
+   * The bitmap should be 1-bit monochrome data.
    * @param logoName - Name to store logo as
-   * @param _bitmap - Logo bitmap data (placeholder)
-   */
-  downloadLogo(logoName: string, _bitmap: Uint8Array): this {
+   * @param bitmap - 1-bit monochrome bitmap data (MSB first, row-major)
+   * @param options - Optional width and height (will be inferred from bitmap size if omitted)
+   */
+  downloadLogo(
+    logoName: string,
+    bitmap: Uint8Array,
+    options?: { width?: number; height?: number }
+  ): this {
+    const width = options?.width ?? 100;
+    const bytesPerRow = Math.ceil(width / 8);
+    const height = options?.height ?? Math.max(1, Math.floor(bitmap.length / bytesPerRow));
+    const totalBytes = bytesPerRow * height;
+
+    // Validate bitmap size
+    if (bitmap.length < totalBytes) {
+      this.logger.warn(
+        `CPCL logo bitmap size mismatch: expected ${totalBytes}, got ${bitmap.length}`
+      );
+    }
+
+    // Convert bitmap bytes to hex string (uppercase)
+    const hexData: string[] = [];
+    const limit = Math.min(bitmap.length, totalBytes);
+    for (let i = 0; i < limit; i++) {
+      const byte = bitmap[i]!;
+      hexData.push(byte.toString(16).padStart(2, '0').toUpperCase());
+    }
+
+    // CPCL macro definition with graphic data
     this.commands.push(`! DF ${logoName}`);
-    // TODO: Encode bitmap to CPCL format
-    this.logger.debug('CPCL logo download not fully implemented');
+    this.commands.push(`CG ${totalBytes} ${bytesPerRow} ${height} ${hexData.join('')}`);
     this.commands.push(`! DF`);
+    this.logger.debug(`CPCL logo downloaded: ${logoName} (${width}x${height})`);
     return this;
   }
 

package/src/drivers/ZplDriver.ts

@@ -428,18 +428,37 @@ export class ZplDriver {
   }
 
   /**
-   * Add image from raw bitmap
-   * Note: For best results, use pre-processed images. This is a placeholder for future implementation.
-   * @param _x - X position (placeholder)
-   * @param _y - Y position (placeholder)
-   * @param _width - Image width (placeholder)
-   * @param _height - Image height (placeholder)
-   * @param _bitmap - Binary bitmap data (placeholder)
-   */
-  image(_x: number, _y: number, _width: number, _height: number, _bitmap: Uint8Array): this {
-    // TODO: Implement proper ZPL image encoding using ^GFA or ^XG commands
-    // For now, this is a placeholder
-    this.logger.debug('ZPL image encoding not fully implemented');
+   * Add image from raw bitmap using ZPL ^GFA (Graphic Field) command.
+   * The bitmap should be 1-bit (monochrome) data where each bit represents a pixel.
+   * @param x - X position in dots
+   * @param y - Y position in dots
+   * @param width - Image width in pixels
+   * @param height - Image height in pixels
+   * @param bitmap - 1-bit monochrome bitmap data (MSB first, row-major)
+   */
+  image(x: number, y: number, width: number, height: number, bitmap: Uint8Array): this {
+    const bytesPerRow = Math.ceil(width / 8);
+    const totalBytes = bytesPerRow * height;
+
+    // Validate bitmap size
+    if (bitmap.length < totalBytes) {
+      this.logger.warn(
+        `ZPL image bitmap size mismatch: expected ${totalBytes}, got ${bitmap.length}`
+      );
+    }
+
+    // Convert bitmap bytes to hex string (uppercase)
+    const hexData: string[] = [];
+    const limit = Math.min(bitmap.length, totalBytes);
+    for (let i = 0; i < limit; i++) {
+      const byte = bitmap[i]!;
+      hexData.push(byte.toString(16).padStart(2, '0').toUpperCase());
+    }
+
+    this.commands.push(`^FO${x},${y}`);
+    this.commands.push(`^GFA,${totalBytes},${totalBytes},${bytesPerRow},${hexData.join('')}`);
+    this.commands.push('^FS');
+    this.logger.debug(`ZPL image encoded: ${width}x${height} at (${x},${y})`);
     return this;
   }
 

package/src/queue/PrintQueue.ts

@@ -149,6 +149,7 @@ export class PrintQueue implements IPrintQueue {
   private activeJobs = 0;
   private jobCounter = 0;
   private executor: JobExecutor | null = null;
+  private retryTimerId: ReturnType<typeof setTimeout> | null = null;
 
   /**
    * Creates a new PrintQueue instance
@@ -257,6 +258,12 @@ export class PrintQueue implements IPrintQueue {
    * Clear all pending jobs
    */
   clear(): void {
+    // Cancel pending retry timer if one is active
+    if (this.retryTimerId !== null) {
+      clearTimeout(this.retryTimerId);
+      this.retryTimerId = null;
+    }
+
     const pendingJobs = [...this.pendingQueue];
     for (const jobId of pendingJobs) {
       const job = this.jobs.get(jobId);
@@ -430,13 +437,14 @@ export class PrintQueue implements IPrintQueue {
         job.status = PrintJobStatus.PENDING;
 
         // Re-add to queue after delay
-        setTimeout(() => {
+        this.retryTimerId = setTimeout(() => {
           if (job.status === PrintJobStatus.PENDING) {
             this.insertByPriority(job.id, job.priority);
             if (this.config.autoProcess && !this.isPaused) {
               this.processQueue();
             }
           }
+          this.retryTimerId = null;
         }, this.config.retryDelay);
       } else {
         job.status = PrintJobStatus.FAILED;

package/src/services/ConnectionManager.ts

@@ -144,8 +144,9 @@ export class ConnectionManager
         this.emit('state-change', PrinterState.CONNECTING);
 
         const connectPromise = this.adapter.connect(deviceId);
+        let timeoutId: ReturnType<typeof setTimeout> | null = null;
         const timeoutPromise = new Promise<void>((_, reject) => {
-          setTimeout(() => {
+          timeoutId = setTimeout(() => {
             reject(
               new BluetoothPrintError(
                 ErrorCode.CONNECTION_TIMEOUT,
@@ -156,6 +157,9 @@ export class ConnectionManager
         });
 
         await Promise.race([connectPromise, timeoutPromise]);
+        if (timeoutId !== null) {
+          clearTimeout(timeoutId);
+        }
         this.state = PrinterState.CONNECTED;
         this.emit('state-change', PrinterState.CONNECTED);
         this.emit('connected', deviceId);
@@ -304,7 +308,7 @@ export class ConnectionManager
 
     this.isReconnecting = true;
     this.reconnectAttempts = 0;
-    this.attemptReconnect();
+    void this.attemptReconnect();
   }
 
   /**
@@ -361,7 +365,7 @@ export class ConnectionManager
       this.connLogger.warn(`Reconnect attempt ${this.reconnectAttempts} failed:`, error);
 
       this.reconnectTimer = setTimeout(() => {
-        this.attemptReconnect();
+        void this.attemptReconnect();
       }, this.config.reconnectInterval);
     }
   }

package/src/services/PrinterStatus.ts

@@ -107,14 +107,18 @@ export class PrinterStatus {
       await writeFunc(queryCmd.buffer);
 
       // Set up timeout promise
+      let timeoutId: ReturnType<typeof setTimeout> | null = null;
       const timeoutPromise = new Promise<ArrayBuffer>((_, reject) => {
-        setTimeout(() => {
+        timeoutId = setTimeout(() => {
           reject(new BluetoothPrintError(ErrorCode.CONNECTION_TIMEOUT, 'Status query timed out'));
         }, timeout);
       });
 
       // Read response with timeout
       const response = await Promise.race([readFunc(), timeoutPromise]);
+      if (timeoutId !== null) {
+        clearTimeout(timeoutId);
+      }
 
       return this.parseStatus(new Uint8Array(response), includeRaw);
     } catch (error) {