@opendisplay/opendisplay 1.1.0 → 1.1.2

package/dist/index.cjs

@@ -306,6 +306,8 @@ var CommandCode = /* @__PURE__ */ ((CommandCode3) => {
   CommandCode3[CommandCode3["DIRECT_WRITE_START"] = 112] = "DIRECT_WRITE_START";
   CommandCode3[CommandCode3["DIRECT_WRITE_DATA"] = 113] = "DIRECT_WRITE_DATA";
   CommandCode3[CommandCode3["DIRECT_WRITE_END"] = 114] = "DIRECT_WRITE_END";
+  CommandCode3[CommandCode3["REFRESH_COMPLETE"] = 115] = "REFRESH_COMPLETE";
+  CommandCode3[CommandCode3["REFRESH_TIMEOUT"] = 116] = "REFRESH_TIMEOUT";
   return CommandCode3;
 })(CommandCode || {});
 
@@ -1396,6 +1398,16 @@ var BLEConnection = class {
     }
     return this.notificationQueue.dequeue(timeoutMs);
   }
+  /**
+   * Clear the notification queue.
+   *
+   * Useful for clearing any stale responses before starting a new operation.
+   * This drains any buffered notifications and cancels pending read requests.
+   */
+  clearQueue() {
+    console.debug(`Clearing notification queue (${this.notificationQueue.size} buffered)`);
+    this.notificationQueue.clear("Queue cleared by request");
+  }
   /**
    * Handle incoming BLE notifications.
    *
@@ -1731,6 +1743,7 @@ var OpenDisplayDevice = class _OpenDisplayDevice {
     const compress = options.compress ?? true;
     const onProgress = options.onProgress;
     const onStatusChange = options.onStatusChange;
+    const onUploadComplete = options.onUploadComplete;
     console.log(
       `Uploading image (${this.width}x${this.height}, ${import_epaper_dithering4.ColorScheme[this.colorScheme]})`
     );
@@ -1756,7 +1769,8 @@ var OpenDisplayDevice = class _OpenDisplayDevice {
           compressedData,
           uncompressedSize: encodedData.length,
           onProgress,
-          onStatusChange
+          onStatusChange,
+          onUploadComplete
         });
       } else {
         console.log(
@@ -1767,7 +1781,8 @@ var OpenDisplayDevice = class _OpenDisplayDevice {
           imageData: encodedData,
           refreshMode,
           onProgress,
-          onStatusChange
+          onStatusChange,
+          onUploadComplete
         });
       }
     } else {
@@ -1777,7 +1792,8 @@ var OpenDisplayDevice = class _OpenDisplayDevice {
         imageData: encodedData,
         refreshMode,
         onProgress,
-        onStatusChange
+        onStatusChange,
+        onUploadComplete
       });
     }
     console.log("Image upload complete");
@@ -1794,8 +1810,11 @@ var OpenDisplayDevice = class _OpenDisplayDevice {
       compressedData,
       uncompressedSize,
       onProgress,
-      onStatusChange
+      onStatusChange,
+      onUploadComplete
     } = params;
+    this.connection.clearQueue();
+    const uploadStartTime = Date.now();
     let startCmd;
     let remainingCompressed = null;
     if (useCompression && compressedData && uncompressedSize) {
@@ -1818,13 +1837,38 @@ var OpenDisplayDevice = class _OpenDisplayDevice {
       autoCompleted = await this.sendDataChunks(imageData, onProgress, onStatusChange);
     }
     if (!autoCompleted) {
-      onStatusChange?.("Refreshing display...");
       const endCmd = buildDirectWriteEndCommand(refreshMode);
       await this.connection.writeCommand(endCmd);
       response = await this.connection.readResponse(
-        _OpenDisplayDevice.TIMEOUT_REFRESH
+        _OpenDisplayDevice.TIMEOUT_ACK
       );
       validateAckResponse(response, 114 /* DIRECT_WRITE_END */);
+      const uploadTime = (Date.now() - uploadStartTime) / 1e3;
+      onUploadComplete?.(uploadTime);
+      onStatusChange?.(
+        `Upload complete (${uploadTime.toFixed(1)}s), refreshing display...`
+      );
+      const refreshStartTime = Date.now();
+      const refreshResponse = await this.connection.readResponse(
+        _OpenDisplayDevice.TIMEOUT_REFRESH
+      );
+      const [responseCode] = checkResponseType(refreshResponse);
+      if (responseCode === 115 /* REFRESH_COMPLETE */) {
+        const refreshTime = (Date.now() - refreshStartTime) / 1e3;
+        const totalTime = (Date.now() - uploadStartTime) / 1e3;
+        console.log(
+          `Refresh complete (${refreshTime.toFixed(1)}s), total time: ${totalTime.toFixed(1)}s`
+        );
+        onStatusChange?.(
+          `Refresh complete (${refreshTime.toFixed(1)}s)`
+        );
+      } else if (responseCode === 116 /* REFRESH_TIMEOUT */) {
+        throw new ProtocolError("Display refresh timed out");
+      } else {
+        throw new ProtocolError(
+          `Unexpected refresh response: 0x${responseCode.toString(16).padStart(4, "0")}`
+        );
+      }
     }
   }
   /**