taro-bluetooth-print 2.9.2 → 2.9.4

package/dist/types/adapters/BaseAdapter.d.ts

@@ -147,6 +147,11 @@ export declare abstract class BaseAdapter implements IPrinterAdapter {
      * @param deviceId - Device ID
      */
     protected cleanupDevice(deviceId: string): void;
+    /**
+     * Cleanup resources and destroy the adapter instance
+     * Removes all event listeners and releases resources
+     */
+    destroy(): void;
 }
 /**
  * Base adapter for mini-program platforms (Taro/WeChat, Alipay, Baidu, ByteDance).

package/dist/types/adapters/WebBluetoothAdapter.d.ts

@@ -173,4 +173,9 @@ export declare class WebBluetoothAdapter extends BaseAdapter {
      * Uses device name + first seen timestamp as identifier
      */
     private generateFallbackDeviceId;
+    /**
+     * Cleanup resources and destroy the adapter instance
+     * Removes all event listeners and releases resources
+     */
+    destroy(): void;
 }

package/dist/types/core/BluetoothPrinter.d.ts

@@ -338,4 +338,14 @@ export declare class BluetoothPrinter extends EventEmitter<PrinterEvents> {
      * @returns Command builder instance
      */
     getCommandBuilder(): ICommandBuilder;
+    /**
+     * Cleanup resources and destroy the printer instance
+     * Removes all event listeners and releases resources
+     *
+     * @example
+     * ```typescript
+     * printer.destroy();
+     * ```
+     */
+    destroy(): void;
 }

package/dist/types/services/interfaces/IConnectionManager.d.ts

@@ -46,4 +46,9 @@ export interface IConnectionManager {
      * @returns IPrinterAdapter - Printer adapter
      */
     getAdapter(): IPrinterAdapter;
+    /**
+     * Cleanup resources and destroy the connection manager
+     * Stops heartbeat, clears timers, and removes event listeners
+     */
+    destroy(): void;
 }

package/dist/types/types.d.ts

@@ -67,6 +67,11 @@ export interface IPrinterAdapter {
      * @param callback - Function to call when the state changes
      */
     onStateChange?(callback: (state: PrinterState) => void): void;
+    /**
+     * Cleanup resources and destroy the adapter instance
+     * Removes all event listeners and releases resources
+     */
+    destroy?(): void;
 }
 /**
  * Interface for printer drivers

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "taro-bluetooth-print",
-  "version": "2.9.2",
+  "version": "2.9.4",
   "description": "Taro 蓝牙打印库 v2.6 - 轻量级、高性能、跨平台支持微信、支付宝、百度、字节跳动小程序及H5 Web Bluetooth",
   "type": "module",
   "main": "dist/index.cjs.js",

package/src/adapters/BaseAdapter.ts

@@ -185,6 +185,16 @@ export abstract class BaseAdapter implements IPrinterAdapter {
   protected cleanupDevice(deviceId: string): void {
     this.serviceCache.delete(deviceId);
   }
+
+  /**
+   * Cleanup resources and destroy the adapter instance
+   * Removes all event listeners and releases resources
+   */
+  destroy(): void {
+    this.logger.debug('Destroying BaseAdapter');
+    this.serviceCache.clear();
+    this.stateCallback = undefined;
+  }
 }
 
 /**

package/src/adapters/WebBluetoothAdapter.ts

@@ -10,6 +10,14 @@ import { IAdapterOptions, PrinterState } from '@/types';
 import { BaseAdapter } from './BaseAdapter';
 import { BluetoothPrintError, ErrorCode } from '@/errors/BluetoothError';
 
+/**
+ * Extended Bluetooth device interface with RSSI support
+ * This is a vendor-specific extension not part of the standard Web Bluetooth API
+ */
+interface BluetoothDeviceWithRssi extends BluetoothDevice {
+  readRemoteRssi(): Promise<number>;
+}
+
 /**
  * Web Bluetooth device information
  */
@@ -210,10 +218,9 @@ export class WebBluetoothAdapter extends BaseAdapter {
       // Get RSSI if available (may not be available on all devices)
       let rssi: number | undefined;
       try {
-        if ('readRemoteRssi' in characteristic.service.device) {
-          /* eslint-disable @typescript-eslint/no-explicit-any, @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-assignment */
-          rssi = await (characteristic.service.device as any).readRemoteRssi();
-          /* eslint-enable @typescript-eslint/no-explicit-any, @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-assignment */
+        const deviceWithRssi = characteristic.service.device as BluetoothDeviceWithRssi;
+        if ('readRemoteRssi' in deviceWithRssi && typeof deviceWithRssi.readRemoteRssi === 'function') {
+          rssi = await deviceWithRssi.readRemoteRssi();
         }
       } catch {
         this.logger.debug('RSSI reading not supported on this device');
@@ -681,4 +688,38 @@ export class WebBluetoothAdapter extends BaseAdapter {
     const timestamp = Date.now().toString(36);
     return `fallback_${name}_${timestamp}`;
   }
+
+  /**
+   * Cleanup resources and destroy the adapter instance
+   * Removes all event listeners and releases resources
+   */
+  destroy(): void {
+    this.logger.debug('Destroying WebBluetoothAdapter');
+
+    // Clear any pending connection cleanup timeout
+    if (this.connectionCleanupTimeout) {
+      clearTimeout(this.connectionCleanupTimeout);
+      this.connectionCleanupTimeout = null;
+    }
+
+    // Disconnect all devices
+    for (const [deviceId, deviceInfo] of this.devices) {
+      try {
+        if (deviceInfo.server.connected) {
+          deviceInfo.server.disconnect();
+        }
+      } catch (error) {
+        this.logger.warn(`Error disconnecting device ${deviceId}:`, error);
+      }
+    }
+
+    // Clear all device caches
+    this.devices.clear();
+    this.discoveredDevices.clear();
+
+    // Call parent destroy
+    super.destroy();
+
+    this.logger.info('WebBluetoothAdapter destroyed');
+  }
 }

package/src/core/BluetoothPrinter.ts

@@ -131,19 +131,12 @@ export class BluetoothPrinter extends EventEmitter<PrinterEvents> {
    * Updates the current state based on the connection manager and print job manager states
    */
   private updateState(): void {
-    // Safe fallbacks for mock objects in tests
-    const connectionState =
-      typeof this.connectionManager.getState === 'function'
-        ? this.connectionManager.getState()
-        : PrinterState.CONNECTED;
+    // All interface methods are guaranteed to exist
+    const connectionState = this.connectionManager.getState();
 
-    const isPrinting =
-      typeof this.printJobManager.isInProgress === 'function'
-        ? this.printJobManager.isInProgress()
-        : false;
+    const isPrinting = this.printJobManager.isInProgress();
 
-    const isPaused =
-      typeof this.printJobManager.isPaused === 'function' ? this.printJobManager.isPaused() : false;
+    const isPaused = this.printJobManager.isPaused();
 
     // Determine the final state
     if (isPaused) {
@@ -425,10 +418,7 @@ export class BluetoothPrinter extends EventEmitter<PrinterEvents> {
    * ```
    */
   async print(): Promise<void> {
-    const isConnected =
-      typeof this.connectionManager.isConnected === 'function'
-        ? this.connectionManager.isConnected()
-        : true; // Default to true for mock objects
+    const isConnected = this.connectionManager.isConnected();
 
     if (!isConnected) {
       throw new BluetoothPrintError(
@@ -453,10 +443,7 @@ export class BluetoothPrinter extends EventEmitter<PrinterEvents> {
     try {
       await this.printJobManager.start(buffer);
 
-      const isPaused =
-        typeof this.printJobManager.isPaused === 'function'
-          ? this.printJobManager.isPaused()
-          : false;
+      const isPaused = this.printJobManager.isPaused();
 
       if (isPaused) {
         // Print job was paused
@@ -607,4 +594,38 @@ export class BluetoothPrinter extends EventEmitter<PrinterEvents> {
   getCommandBuilder(): ICommandBuilder {
     return this.commandBuilder;
   }
+
+  /**
+   * Cleanup resources and destroy the printer instance
+   * Removes all event listeners and releases resources
+   *
+   * @example
+   * ```typescript
+   * printer.destroy();
+   * ```
+   */
+  destroy(): void {
+    this.printerLogger.info('Destroying BluetoothPrinter instance');
+
+    // Cancel any pending print job
+    this.printJobManager.cancel();
+
+    // Clear command buffer
+    this.commandBuilder.clear();
+
+    // Disconnect if connected
+    if (this.connectionManager.isConnected()) {
+      this.connectionManager.disconnect().catch(error => {
+        this.printerLogger.warn('Error during disconnect in destroy:', error);
+      });
+    }
+
+    // Cleanup connection manager resources (IConnectionManager now has destroy())
+    this.connectionManager.destroy();
+
+    // Remove all event listeners
+    this.removeAllListeners();
+
+    this.printerLogger.info('BluetoothPrinter instance destroyed');
+  }
 }

package/src/core/di/Container.ts

@@ -311,7 +311,7 @@ export const rootContainer = new Container();
 export function injectable<T extends Constructor<object>>(constructor: T): T {
   // 标记类为可注入
   // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-  (constructor as Constructor & { __injectable: boolean }).__injectable = true;
+  (constructor as unknown as { __injectable: boolean }).__injectable = true;
   return constructor;
 }
 

package/src/services/ConnectionManager.ts

@@ -310,7 +310,7 @@ export class ConnectionManager
   /**
    * Attempt to reconnect
    */
-  private attemptReconnect(): void {
+  private async attemptReconnect(): Promise<void> {
     if (!this.deviceId) {
       this.isReconnecting = false;
       return;
@@ -345,27 +345,25 @@ export class ConnectionManager
     this.state = PrinterState.CONNECTING;
     this.emit('state-change', PrinterState.CONNECTING);
 
-    this.adapter
-      .connect(deviceId)
-      .then(() => {
-        this.connLogger.info('Reconnected successfully');
-        this.isReconnecting = false;
-        this.reconnectAttempts = 0;
-        this.state = PrinterState.CONNECTED;
-        this.emit('state-change', PrinterState.CONNECTED);
-        this.emit('reconnected', deviceId);
+    try {
+      await this.adapter.connect(deviceId);
+      this.connLogger.info('Reconnected successfully');
+      this.isReconnecting = false;
+      this.reconnectAttempts = 0;
+      this.state = PrinterState.CONNECTED;
+      this.emit('state-change', PrinterState.CONNECTED);
+      this.emit('reconnected', deviceId);
 
-        if (this.config.heartbeatEnabled) {
-          this.startHeartbeat();
-        }
-      })
-      .catch(error => {
-        this.connLogger.warn(`Reconnect attempt ${this.reconnectAttempts} failed:`, error);
+      if (this.config.heartbeatEnabled) {
+        this.startHeartbeat();
+      }
+    } catch (error) {
+      this.connLogger.warn(`Reconnect attempt ${this.reconnectAttempts} failed:`, error);
 
-        this.reconnectTimer = setTimeout(() => {
-          this.attemptReconnect();
-        }, this.config.reconnectInterval);
-      });
+      this.reconnectTimer = setTimeout(() => {
+        this.attemptReconnect();
+      }, this.config.reconnectInterval);
+    }
   }
 
   /**

package/src/services/interfaces/IConnectionManager.ts

@@ -55,4 +55,10 @@ export interface IConnectionManager {
    * @returns IPrinterAdapter - Printer adapter
    */
   getAdapter(): IPrinterAdapter;
+
+  /**
+   * Cleanup resources and destroy the connection manager
+   * Stops heartbeat, clears timers, and removes event listeners
+   */
+  destroy(): void;
 }

package/src/types.ts

@@ -75,6 +75,12 @@ export interface IPrinterAdapter {
    * @param callback - Function to call when the state changes
    */
   onStateChange?(callback: (state: PrinterState) => void): void;
+
+  /**
+   * Cleanup resources and destroy the adapter instance
+   * Removes all event listeners and releases resources
+   */
+  destroy?(): void;
 }
 
 /**