taro-bluetooth-print 2.15.2 → 2.15.3

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

@@ -41,6 +41,12 @@ export declare class BluetoothPrinter extends EventEmitter<PrinterEvents> {
      * Resolve the first constructor argument to an IConnectionManager. An adapter
      * (anything implementing `connect`/`disconnect`/`write`) gets auto-wrapped for
      * backward compatibility; missing/undefined falls back to a default manager.
+     *
+     * Disambiguation: `IConnectionManager` exposes `getState()` (manager-only
+     * method on the interface). Adapters only have `connect`/`disconnect`/`write`.
+     * Using `getState` as the discriminator correctly identifies a pre-built
+     * manager vs. a raw adapter — using `connect` (which both have) silently
+     * re-wrapped managers and broke isConnected() (v2.15.3 fix).
      */
     private resolveConnectionManager;
     /**
@@ -76,6 +82,37 @@ export declare class BluetoothPrinter extends EventEmitter<PrinterEvents> {
         showText?: boolean;
     }): this;
     setOptions(options: IAdapterOptions): this;
+    /**
+     * Write a pre-built byte buffer directly to the connected printer,
+     * bypassing the CommandBuilder entirely. Use this when a driver (such as
+     * TsplDriver, ZplDriver, StarPrinter, CPCL or any custom protocol) emits
+     * its own byte stream and you want the same connection / chunking /
+     * progress / pause pipeline as the standard print() path.
+     *
+     * Unlike print() — which calls commandBuilder.getBuffer() then clears it —
+     * writeRaw() does NOT touch the command queue. It is safe to call between
+     * text() / qr() / cut() calls; those calls continue to accumulate in the
+     * command buffer for the next print() invocation.
+     *
+     * @param buffer  Bytes to send (e.g. `tsplDriver.getBuffer()`)
+     * @param options Optional adapter overrides (chunkSize, delay, retries).
+     *                Forwarded to PrintJobManager.setOptions() before start.
+     * @throws BluetoothPrintError(CONNECTION_FAILED) if not connected
+     * @throws BluetoothPrintError(PRINT_JOB_FAILED) on adapter write failure
+     *
+     * @example
+     * ```ts
+     * // TSPL label printing — full end-to-end flow now works.
+     * const tspl = new TsplDriver()
+     *   .size(60, 40)
+     *   .gap(3)
+     *   .clear()
+     *   .text('Hello', { x: 20, y: 20, font: 3 })
+     *   .print(1, 1);
+     * await printer.writeRaw(tspl.getBuffer());
+     * ```
+     */
+    writeRaw(buffer: Uint8Array, options?: IAdapterOptions): Promise<void>;
     /**
      * Pauses the current print job.
      */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "taro-bluetooth-print",
-  "version": "2.15.2",
+  "version": "2.15.3",
   "description": "Taro 蓝牙打印库 v2.6 - 轻量级、高性能、跨平台支持微信、支付宝、百度、字节跳动小程序及H5 Web Bluetooth",
   "type": "module",
   "main": "dist/index.cjs.js",
@@ -10,8 +10,7 @@
     ".": {
       "types": "./dist/types/index.d.ts",
       "import": "./dist/index.es.js",
-      "require": "./dist/index.cjs.js",
-      "default": "./dist/index.umd.js"
+      "require": "./dist/index.cjs.js"
     },
     "./core": {
       "types": "./dist/types/core/index.d.ts",
@@ -25,6 +24,10 @@
       "types": "./dist/types/adapters/index.d.ts",
       "import": "./dist/adapters/index.es.js"
     },
+    "./encoding": {
+      "types": "./dist/types/encoding/index.d.ts",
+      "import": "./dist/encoding/index.es.js"
+    },
     "./package.json": "./package.json"
   },
   "files": [
@@ -36,6 +39,7 @@
   "scripts": {
     "clean": "rimraf dist docs/.vitepress/dist",
     "build": "vite build",
+    "build:umd": "vite build --config vite.umd.config.ts",
     "dev": "vite build --watch",
     "docs:dev": "vitepress dev docs",
     "docs:build": "vitepress build docs",

package/src/core/BluetoothPrinter.ts

@@ -71,6 +71,12 @@ export class BluetoothPrinter extends EventEmitter<PrinterEvents> {
    * Resolve the first constructor argument to an IConnectionManager. An adapter
    * (anything implementing `connect`/`disconnect`/`write`) gets auto-wrapped for
    * backward compatibility; missing/undefined falls back to a default manager.
+   *
+   * Disambiguation: `IConnectionManager` exposes `getState()` (manager-only
+   * method on the interface). Adapters only have `connect`/`disconnect`/`write`.
+   * Using `getState` as the discriminator correctly identifies a pre-built
+   * manager vs. a raw adapter — using `connect` (which both have) silently
+   * re-wrapped managers and broke isConnected() (v2.15.3 fix).
    */
   private resolveConnectionManager(
     arg: IConnectionManager | IPrinterAdapter | undefined
@@ -78,11 +84,11 @@ export class BluetoothPrinter extends EventEmitter<PrinterEvents> {
     if (!arg) {
       return new ConnectionManager();
     }
-    // Adapters expose `connect`; managers expose `getState`. Disambiguate by method presence.
-    if (typeof (arg as IPrinterAdapter).connect === 'function') {
-      return new ConnectionManager(arg as IPrinterAdapter);
+    // Managers expose `getState`; adapters do not. Disambiguate by method presence.
+    if (typeof (arg as IConnectionManager).getState === 'function') {
+      return arg as IConnectionManager;
     }
-    return arg as IConnectionManager;
+    return new ConnectionManager(arg as IPrinterAdapter);
   }
 
   /**
@@ -224,6 +230,62 @@ export class BluetoothPrinter extends EventEmitter<PrinterEvents> {
     return this;
   }
 
+  /**
+   * Write a pre-built byte buffer directly to the connected printer,
+   * bypassing the CommandBuilder entirely. Use this when a driver (such as
+   * TsplDriver, ZplDriver, StarPrinter, CPCL or any custom protocol) emits
+   * its own byte stream and you want the same connection / chunking /
+   * progress / pause pipeline as the standard print() path.
+   *
+   * Unlike print() — which calls commandBuilder.getBuffer() then clears it —
+   * writeRaw() does NOT touch the command queue. It is safe to call between
+   * text() / qr() / cut() calls; those calls continue to accumulate in the
+   * command buffer for the next print() invocation.
+   *
+   * @param buffer  Bytes to send (e.g. `tsplDriver.getBuffer()`)
+   * @param options Optional adapter overrides (chunkSize, delay, retries).
+   *                Forwarded to PrintJobManager.setOptions() before start.
+   * @throws BluetoothPrintError(CONNECTION_FAILED) if not connected
+   * @throws BluetoothPrintError(PRINT_JOB_FAILED) on adapter write failure
+   *
+   * @example
+   * ```ts
+   * // TSPL label printing — full end-to-end flow now works.
+   * const tspl = new TsplDriver()
+   *   .size(60, 40)
+   *   .gap(3)
+   *   .clear()
+   *   .text('Hello', { x: 20, y: 20, font: 3 })
+   *   .print(1, 1);
+   * await printer.writeRaw(tspl.getBuffer());
+   * ```
+   */
+  async writeRaw(buffer: Uint8Array, options?: IAdapterOptions): Promise<void> {
+    if (!this.connectionManager.isConnected()) {
+      throw new BluetoothPrintError(
+        ErrorCode.CONNECTION_FAILED,
+        'Printer not connected. Call connect() first.'
+      );
+    }
+
+    this.printerLogger.info(`writeRaw: ${buffer.length} bytes`);
+    if (options) this.printJobManager.setOptions(options);
+
+    this.updateState();
+    this.printJobManager.setProgressCallback((sent, total) => {
+      this.emit('progress', { sent, total });
+    });
+
+    try {
+      await this.printJobManager.start(buffer);
+      if (!this.printJobManager.isPaused()) this.emit('print-complete');
+    } catch (error) {
+      throw this.handleError(error, ErrorCode.PRINT_JOB_FAILED, 'writeRaw failed');
+    } finally {
+      this.updateState();
+    }
+  }
+
   /**
    * Pauses the current print job.
    */

package/dist/hero-illustration.svg

@@ -1,44 +0,0 @@
-<svg width="400" height="300" viewBox="0 0 400 300" fill="none" xmlns="http://www.w3.org/2000/svg">
-  <!-- 背景圆 -->
-  <circle cx="200" cy="150" r="120" fill="#ecfeff" opacity="0.5"/>
-  <circle cx="200" cy="150" r="80" fill="#cffafe" opacity="0.5"/>
-  
-  <!-- 手机轮廓 -->
-  <rect x="140" y="60" width="120" height="180" rx="16" fill="#fff" stroke="#0891b2" stroke-width="3"/>
-  <rect x="150" y="80" width="100" height="140" rx="4" fill="#f0fdfa"/>
-  
-  <!-- 屏幕上的打印图标 -->
-  <rect x="165" y="95" width="70" height="50" rx="4" fill="#0891b2" opacity="0.1"/>
-  <text x="200" y="125" font-family="Arial" font-size="24" fill="#0891b2" text-anchor="middle">🖨️</text>
-  
-  <!-- 小票 -->
-  <rect x="170" y="155" width="60" height="45" rx="2" fill="#fff" stroke="#06b6d4" stroke-width="2"/>
-  <line x1="178" y1="165" x2="222" y2="165" stroke="#94a3b8" stroke-width="2"/>
-  <line x1="178" y1="175" x2="215" y2="175" stroke="#94a3b8" stroke-width="2"/>
-  <line x1="178" y1="185" x2="220" y2="185" stroke="#94a3b8" stroke-width="2"/>
-  
-  <!-- 蓝牙符号 -->
-  <path d="M220 120 L235 105 L235 135 L220 150 L235 165 L235 195 L220 180" stroke="#0891b2" stroke-width="3" stroke-linecap="round" stroke-linejoin="round" fill="none"/>
-  
-  <!-- 打印机轮廓 -->
-  <rect x="260" y="170" width="80" height="60" rx="6" fill="#fff" stroke="#06b6d4" stroke-width="3"/>
-  <rect x="270" y="180" width="60" height="20" rx="2" fill="#cffafe"/>
-  <rect x="275" y="205" width="50" height="15" rx="2" fill="#0891b2" opacity="0.2"/>
-  
-  <!-- 出纸 -->
-  <rect x="275" y="235" width="50" height="25" rx="2" fill="#fff" stroke="#06b6d4" stroke-width="2"/>
-  <line x1="283" y1="243" x2="317" y2="243" stroke="#94a3b8" stroke-width="1.5"/>
-  <line x1="283" y1="250" x2="310" y2="250" stroke="#94a3b8" stroke-width="1.5"/>
-  
-  <!-- 连接线 -->
-  <path d="M250 200 Q280 200 280 200" stroke="#0891b2" stroke-width="2" stroke-dasharray="4 4" fill="none"/>
-  
-  <!-- 装饰 - 代码符号 -->
-  <text x="80" y="100" font-family="monospace" font-size="14" fill="#0891b2" opacity="0.6">&lt;/&gt;</text>
-  <text x="320" y="90" font-family="monospace" font-size="14" fill="#06b6d4" opacity="0.6">{ }</text>
-  <text x="100" y="220" font-family="monospace" font-size="12" fill="#0891b2" opacity="0.4">print()</text>
-  
-  <!-- 底部装饰 -->
-  <circle cx="60" cy="260" r="20" fill="#cffafe" opacity="0.4"/>
-  <circle cx="340" cy="270" r="25" fill="#ecfeff" opacity="0.4"/>
-</svg>