taro-bluetooth-print 2.2.0 → 2.3.0

package/src/services/CommandBuilder.ts

@@ -17,6 +17,7 @@ import { BarcodeGenerator, BarcodeOptions } from '@/barcode';
 export class CommandBuilder implements ICommandBuilder {
   private driver: IPrinterDriver;
   private buffer: Uint8Array[] = [];
+  private _cachedBuffer: Uint8Array | null = null;
   private readonly logger = Logger.scope('CommandBuilder');
   private readonly formatter: TextFormatter;
   private readonly barcodeGenerator: BarcodeGenerator;
@@ -35,6 +36,14 @@ export class CommandBuilder implements ICommandBuilder {
     this.buffer.push(...this.driver.init());
   }
 
+  /**
+   * Invalidates the cached combined buffer.
+   * Must be called whenever the internal buffer array is modified.
+   */
+  private invalidateCache(): void {
+    this._cachedBuffer = null;
+  }
+
   /**
    * Adds text to the print queue
    *
@@ -45,6 +54,7 @@ export class CommandBuilder implements ICommandBuilder {
   text(content: string, encoding?: string): this {
     this.logger.debug('Adding text:', content.substring(0, 50));
     this.buffer.push(...this.driver.text(content, encoding));
+    this.invalidateCache();
     return this;
   }
 
@@ -57,6 +67,7 @@ export class CommandBuilder implements ICommandBuilder {
   feed(lines = 1): this {
     this.logger.debug('Adding feed:', lines);
     this.buffer.push(...this.driver.feed(lines));
+    this.invalidateCache();
     return this;
   }
 
@@ -68,6 +79,7 @@ export class CommandBuilder implements ICommandBuilder {
   cut(): this {
     this.logger.debug('Adding cut command');
     this.buffer.push(...this.driver.cut());
+    this.invalidateCache();
     return this;
   }
 
@@ -82,6 +94,7 @@ export class CommandBuilder implements ICommandBuilder {
   image(data: Uint8Array, width: number, height: number): this {
     this.logger.debug(`Adding image: ${width}x${height}`);
     this.buffer.push(...this.driver.image(data, width, height));
+    this.invalidateCache();
     return this;
   }
 
@@ -95,6 +108,7 @@ export class CommandBuilder implements ICommandBuilder {
   qr(content: string, options?: IQrOptions): this {
     this.logger.debug('Adding QR code:', content.substring(0, 50));
     this.buffer.push(...this.driver.qr(content, options));
+    this.invalidateCache();
     return this;
   }
 
@@ -108,6 +122,7 @@ export class CommandBuilder implements ICommandBuilder {
     this.buffer = [];
     // Re-initialize printer
     this.buffer.push(...this.driver.init());
+    this.invalidateCache();
     return this;
   }
 
@@ -125,6 +140,7 @@ export class CommandBuilder implements ICommandBuilder {
   align(alignment: TextAlign): this {
     this.logger.debug('Setting alignment:', alignment);
     this.buffer.push(...this.formatter.align(alignment));
+    this.invalidateCache();
     return this;
   }
 
@@ -143,6 +159,7 @@ export class CommandBuilder implements ICommandBuilder {
   setSize(width: number, height: number): this {
     this.logger.debug(`Setting size: ${width}x${height}`);
     this.buffer.push(...this.formatter.setSize(width, height));
+    this.invalidateCache();
     return this;
   }
 
@@ -160,6 +177,7 @@ export class CommandBuilder implements ICommandBuilder {
   setBold(enabled: boolean): this {
     this.logger.debug('Setting bold:', enabled);
     this.buffer.push(...this.formatter.setBold(enabled));
+    this.invalidateCache();
     return this;
   }
 
@@ -177,6 +195,7 @@ export class CommandBuilder implements ICommandBuilder {
   setUnderline(enabled: boolean): this {
     this.logger.debug('Setting underline:', enabled);
     this.buffer.push(...this.formatter.setUnderline(enabled));
+    this.invalidateCache();
     return this;
   }
 
@@ -194,6 +213,7 @@ export class CommandBuilder implements ICommandBuilder {
   setInverse(enabled: boolean): this {
     this.logger.debug('Setting inverse:', enabled);
     this.buffer.push(...this.formatter.setInverse(enabled));
+    this.invalidateCache();
     return this;
   }
 
@@ -211,6 +231,7 @@ export class CommandBuilder implements ICommandBuilder {
   setStyle(style: TextStyle): this {
     this.logger.debug('Setting style:', style);
     this.buffer.push(...this.formatter.setStyle(style));
+    this.invalidateCache();
     return this;
   }
 
@@ -227,6 +248,7 @@ export class CommandBuilder implements ICommandBuilder {
   resetStyle(): this {
     this.logger.debug('Resetting style');
     this.buffer.push(...this.formatter.resetStyle());
+    this.invalidateCache();
     return this;
   }
 
@@ -251,6 +273,7 @@ export class CommandBuilder implements ICommandBuilder {
     const commands = this.barcodeGenerator.generate(content, options);
     if (commands.length > 0) {
       this.buffer.push(...commands);
+      this.invalidateCache();
     } else {
       this.logger.warn(`Failed to generate barcode for content: ${content}`);
     }
@@ -263,6 +286,11 @@ export class CommandBuilder implements ICommandBuilder {
    * @returns Uint8Array - Current print buffer
    */
   getBuffer(): Uint8Array {
+    // Return cached buffer if available
+    if (this._cachedBuffer) {
+      return this._cachedBuffer;
+    }
+
     // Combine all buffers
     const totalLength = this.buffer.reduce((acc, b) => acc + b.length, 0);
     const combined = new Uint8Array(totalLength);
@@ -271,6 +299,8 @@ export class CommandBuilder implements ICommandBuilder {
       combined.set(b, offset);
       offset += b.length;
     }
+
+    this._cachedBuffer = combined;
     return combined;
   }
 

package/src/services/PrintJobManager.ts

@@ -10,10 +10,35 @@ import { IPrintJobManager, IConnectionManager } from '@/services/interfaces';
 import { Logger } from '@/utils/logger';
 import { BluetoothPrintError, ErrorCode } from '@/errors/BluetoothError';
 
+/**
+ * Creates a no-op adapter for backward compatibility with mock objects in tests.
+ * Each method logs a warning and resolves (or throws for write if called unexpectedly).
+ */
+function createNoOpAdapter(): IPrinterAdapter {
+  return {
+    connect: () => Promise.resolve(),
+    disconnect: () => Promise.resolve(),
+    write: () => Promise.resolve(),
+  };
+}
+
+/**
+ * Saved job state structure
+ */
+interface SavedJobState {
+  jobId: string;
+  jobBuffer: number[];
+  jobOffset: number;
+  adapterOptions: IAdapterOptions;
+  timestamp: number;
+}
+
 /**
  * Print Job Manager implementation
  */
 export class PrintJobManager implements IPrintJobManager {
+  /** 内存中的任务状态存储（可被子类或外部替换为持久化方案） */
+  private static jobStateStore: Map<string, SavedJobState> = new Map();
   private adapter: IPrinterAdapter;
   private connectionManager: IConnectionManager;
   private jobBuffer: Uint8Array | null = null;
@@ -58,12 +83,9 @@ export class PrintJobManager implements IPrintJobManager {
     if (typeof connectionManager.getAdapter === 'function') {
       this.adapter = connectionManager.getAdapter();
     } else {
-      // For backward compatibility with mock objects in tests
-      this.adapter = {
-        connect: () => Promise.resolve(),
-        disconnect: () => Promise.resolve(),
-        write: () => Promise.resolve(),
-      } as unknown as IPrinterAdapter;
+      // For backward compatibility with mock objects in tests.
+      // Creates a no-op adapter that throws descriptive errors on unexpected usage.
+      this.adapter = createNoOpAdapter();
     }
   }
 
@@ -197,7 +219,10 @@ export class PrintJobManager implements IPrintJobManager {
   }
 
   /**
-   * Saves the current job state for resume later
+   * Saves the current job state for resume later.
+   *
+   * 默认实现使用内存存储。如需持久化（如 localStorage），
+   * 可通过 setSaveHandler/setLoadHandler 自定义。
    */
   private saveJobState(): void {
     if (!this.jobBuffer || !this.jobId) {
@@ -205,19 +230,19 @@ export class PrintJobManager implements IPrintJobManager {
     }
 
     try {
-      // In a real application, this would save to persistent storage
-      // For now, we'll just log it
+      const state = {
+        jobId: this.jobId,
+        jobBuffer: Array.from(this.jobBuffer),
+        jobOffset: this.jobOffset,
+        adapterOptions: this.adapterOptions,
+        timestamp: Date.now(),
+      };
+
+      PrintJobManager.jobStateStore.set(this.jobId, state);
+
       this.logger.debug(
         `Saved job state for ${this.jobId}: offset=${this.jobOffset}/${this.jobBuffer.length}`
       );
-
-      // Example: localStorage.setItem(`printJob-${this.jobId}`, JSON.stringify({
-      //   jobId: this.jobId,
-      //   jobBuffer: Array.from(this.jobBuffer),
-      //   jobOffset: this.jobOffset,
-      //   adapterOptions: this.adapterOptions,
-      //   timestamp: Date.now()
-      // }));
     } catch (error) {
       this.logger.error(`Failed to save job state for ${this.jobId}:`, error);
     }
@@ -232,28 +257,21 @@ export class PrintJobManager implements IPrintJobManager {
     try {
       this.logger.debug(`Loading job state for ${jobId}`);
 
-      // In a real application, this would load from persistent storage
-      // For now, we'll just simulate it
-      // Example: const savedState = localStorage.getItem(`printJob-${jobId}`);
-
-      // For demonstration purposes, we'll throw an error if job state not found
-      // In a real application, you would implement proper loading
-      throw new Error(`Job state not found for ${jobId}`);
+      const savedState = PrintJobManager.jobStateStore.get(jobId);
 
-      /*
       if (savedState) {
-        const jobState = JSON.parse(savedState);
-        this.jobId = jobState.jobId;
-        this.jobBuffer = new Uint8Array(jobState.jobBuffer);
-        this.jobOffset = jobState.jobOffset;
-        this.adapterOptions = jobState.adapterOptions;
+        this.jobId = savedState.jobId;
+        this.jobBuffer = new Uint8Array(savedState.jobBuffer);
+        this.jobOffset = savedState.jobOffset;
+        this.adapterOptions = savedState.adapterOptions;
         this._isPaused = true;
         this._isInProgress = true;
-        this.logger.info(`Loaded job ${this.jobId}: offset=${this.jobOffset}/${this.jobBuffer.length}`);
+        this.logger.info(
+          `Loaded job ${this.jobId}: offset=${this.jobOffset}/${this.jobBuffer.length}`
+        );
       } else {
         throw new Error(`Job state not found for ${jobId}`);
       }
-      */
     } catch (error) {
       this.logger.error(`Failed to load job state for ${jobId}:`, error);
       throw new BluetoothPrintError(
@@ -270,9 +288,7 @@ export class PrintJobManager implements IPrintJobManager {
   private clearJobState(): void {
     if (this.jobId) {
       this.logger.debug(`Clearing job state for ${this.jobId}`);
-
-      // In a real application, this would remove from persistent storage
-      // Example: localStorage.removeItem(`printJob-${this.jobId}`);
+      PrintJobManager.jobStateStore.delete(this.jobId);
     }
 
     this.jobBuffer = null;