@kubohiroya/turbowarp-webrtc-qrcode-pairing 0.2.0 → 0.2.1

package/README.ja.md

@@ -15,7 +15,7 @@ QRコードを使ってWebRTCの接続情報を交換するTurboWarp拡張です
 - Answerがどの Offer への応答かを追跡し、2台のカメラ側端末の接続情報が入れ替わらないようにします。
 - 搬送の進捗と接続状態を別々の状態として報告します。エラー、取消、再試行、期限にも対応します。
 
-`0.2.0`では、メッセージを連結QRコードで運び、1枚のQRを既定でOfferはversion 15、Answerはversion 20までに抑え、読んだペアリング用のQRをすべて報告します。`turbowarp-jsqr` 0.4.0以降が必要です。npmに公開済みなのは`0.1.0`です。
+`0.2.0`では、メッセージを連結QRコードで運び、1枚のQRを既定でOfferはversion 15、Answerはversion 20までに抑え、読んだペアリング用のQRをすべて報告します。`turbowarp-jsqr` 0.4.0以降が必要です。`0.2.1`では、QRがカメラに写り続けている間の読取りがページの処理を止めてしまう不具合を直しました。
 
 > [!NOTE]
 > ペアリング用ブロックは起動時固定のフィーチャーフラグの内側にあり、既定は無効です。

package/README.md

@@ -15,7 +15,7 @@ A TurboWarp extension for exchanging WebRTC connection information through QR co
 - Tracks which offer an answer replies to, so two camera machines never receive each other's connection.
 - Reports transport progress and connection state as separate states, plus errors, cancellation, retry and deadlines.
 
-Version 0.2.0 carries messages as Structured Append sequences, caps Offer codes at QR version 15 and Answer codes at 20, and reports every pairing code read. It needs `turbowarp-jsqr` 0.4.0 or later. 0.1.0 is the version published on npm.
+Version 0.2.0 carries messages as Structured Append sequences, caps Offer codes at QR version 15 and Answer codes at 20, and reports every pairing code read. It needs `turbowarp-jsqr` 0.4.0 or later. 0.2.1 fixes a camera scan that starved the page while a code stayed in view.
 
 > [!NOTE]
 > The pairing blocks are behind a startup feature flag that is off by default. See
@@ -116,7 +116,7 @@ pnpm run dev
 
 Build output: `dist/webrtc-qrcode-pairing.js` and `dist/extension-manifest.json`. Load the JavaScript file as a custom TurboWarp extension. The manifest always records every declared block, including blocks the feature flag hides at runtime: it is the build-time contract, not the runtime state.
 
-Package name and version: `@kubohiroya/turbowarp-webrtc-qrcode-pairing@0.2.0` (0.1.0 is the latest published on npm).
+Package name and version: `@kubohiroya/turbowarp-webrtc-qrcode-pairing@0.2.1`.
 
 ## Block reference
 

package/dist/webrtc-qrcode-pairing.js

@@ -3207,6 +3207,7 @@
   		this.runtime = runtime;
   		this.owner = owner;
   		this.leasedCameraId = "";
+  		this.nextReadAt = 0;
   	}
   	async scanOnce(options) {
   		if (options.signal.aborted) throw cancelled();
@@ -3244,6 +3245,7 @@
   				}
   				if (settled) return;
   				if (read !== null) {
+  					this.nextReadAt = Date.now() + interval;
   					cleanup();
   					resolve(read);
   					return;
@@ -3251,7 +3253,7 @@
   				timer = setTimeout(() => void tick(), interval);
   			};
   			options.signal.addEventListener("abort", onAbort, { once: true });
-  			tick();
+  			timer = setTimeout(() => void tick(), Math.max(0, this.nextReadAt - Date.now()));
   		});
   	}
   	async release() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kubohiroya/turbowarp-webrtc-qrcode-pairing",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "description": "TurboWarp extension that pairs WebRTC peers by carrying offers and answers as QR codes.",
   "author": "Hiroya Kubo <hiroya@cuc.ac.jp>",
   "license": "MPL-2.0",

package/src/ports/qr-scan.ts

@@ -66,6 +66,15 @@ export interface QrScanPort {
 export class CameraQrScanner implements QrScanPort {
   private lease: CameraLease | undefined;
   private leasedCameraId = '';
+  /**
+   * Wall-clock time before which the next frame is not read.
+   *
+   * A code left in front of the camera reads on every frame, and a sequence is read code after
+   * code, so the caller asks again at once. Without a pause between reads the loop would run on
+   * promise callbacks alone and never give the page its turn: no redraw, no Scratch thread, no
+   * timer. Every read therefore waits for the poll interval after the one before it.
+   */
+  private nextReadAt = 0;
 
   public constructor(
     private readonly runtime: TurboWarpRuntime,
@@ -118,6 +127,7 @@ export class CameraQrScanner implements QrScanPort {
         // Aborted while the frame was decoding: the abort handler already rejected.
         if (settled) return;
         if (read !== null) {
+          this.nextReadAt = Date.now() + interval;
           cleanup();
           resolve(read);
           return;
@@ -125,7 +135,9 @@ export class CameraQrScanner implements QrScanPort {
         timer = setTimeout(() => void tick(), interval);
       };
       options.signal.addEventListener('abort', onAbort, {once: true});
-      void tick();
+      // Always through a timer, even when no wait is due, so a read never follows the previous
+      // one within the same turn of the event loop.
+      timer = setTimeout(() => void tick(), Math.max(0, this.nextReadAt - Date.now()));
     });
   }