phone-lens 1.1.1 → 1.1.2

package/lib/client.js

@@ -277,6 +277,11 @@ window.__ModuleLoader__.load({
 			const wsRef = useRef(null);
 			const framesRef = useRef(0);
 			const rotRef = useRef(0);
+			// last devices-broadcast length — the onmessage closure never re-runs
+			// (the WS effect depends only on wsUrl), so comparing against the
+			// `devices` STATE there read a stale first-render value and fired the
+			// QR-rotation flash on EVERY broadcast instead of only on growth
+			const lastDeviceCount = useRef(0);
 
 			const baseUrl = `http://127.0.0.1:${port}`;
 			const wsUrl = `ws://127.0.0.1:${port}/ws/view`;
@@ -368,8 +373,10 @@ window.__ModuleLoader__.load({
 								.catch((e) => setFlashErr("自动放入失败: " + String(e && e.message || e).slice(0, 90)));
 						} else if (m.type === "devices") {
 							// side effects OUT of the updater (updaters must stay pure —
-							// StrictMode double-invokes them); compare here, setState below
-							const grew = (m.devices || []).length > (devices ? devices.length : 0);
+							// StrictMode double-invokes them); compare against the ref,
+							// NOT the `devices` state (stale-closure trap), then setState
+							const grew = (m.devices || []).length > lastDeviceCount.current;
+							lastDeviceCount.current = (m.devices || []).length;
 							setDevices(m.devices || []);
 							// a NEW device came online → the one-time pairing code was
 							// consumed; rotate the QR so the next scan sees a fresh code
@@ -385,6 +392,12 @@ window.__ModuleLoader__.load({
 								if (prev === "disconnected") return "connecting";
 								return prev;
 							});
+						} else if (m.type === "paired") {
+							// a phone completed /pair — the one-time pairing code burned
+							// with it. Rotate the QR right now; the devices-list growth
+							// path also rotates, but only once the uplink actually lands.
+							setFlashOk(`设备已配对${m.name ? ": " + m.name : ""},二维码已更换`);
+							void refreshQr(true);
 						} else if (m.type === "error") {
 							setFlashErr(`${m.code}${m.message ? ":" + m.message : ""}`);
 						}
@@ -928,9 +941,11 @@ window.__ModuleLoader__.load({
 										{ className: "lm-setsec-rows" },
 										// tool names in the open (user-requested): what the
 										// model will actually see in its tool list
-										infoRow("拍摄照片(phone_take_photo)", "手机立即拍照,照片直接进入模型视野——不放入输入框、不保存到电脑文件夹,与拍照注入模式设置无关。", "w1"),
-										infoRow("关闭手机摄像头(phone_camera_pause)", "让手机相机提前进入空闲省电状态。", "w2"),
-										infoRow("恢复手机摄像头(phone_camera_resume)", "立即打开相机并恢复预览拍摄。", "w3"),
+									infoRow("拍摄照片(phone_take_photo)", "手机立即拍照,照片直接进入模型视野——不放入输入框、不保存到电脑文件夹,与拍照注入模式设置无关。", "w1"),
+									infoRow("关闭手机摄像头(phone_camera_pause)", "让手机相机提前进入空闲省电状态。", "w2"),
+									infoRow("恢复手机摄像头(phone_camera_resume)", "立即打开相机并恢复预览拍摄。", "w3"),
+									infoRow("调整变焦(phone_camera_zoom)", "按指定倍数(或步进)拉近/拉远手机镜头,取景画面与照片同步生效,超出设备范围自动收拢。", "w4"),
+									infoRow("查询变焦(phone_camera_zoom_info)", "读取手机当前变焦倍数与设备支持的变焦范围。", "w5"),
 									),
 								),
 								flash ? h("div", { className: "lm-setsec-note", key: "f" }, flash) : null,

package/lib/dev.js

@@ -2,7 +2,7 @@ import { basename, join, resolve, sep } from "node:path";
 import { existsSync, mkdirSync, readFileSync, renameSync, writeFileSync } from "node:fs";
 import { createHash, randomBytes, randomInt, randomUUID, timingSafeEqual } from "node:crypto";
 import { createServer } from "node:http";
-import { readFile, readdir, stat, unlink } from "node:fs/promises";
+import { readFile, readdir, rm, stat, unlink } from "node:fs/promises";
 import { WebSocketServer } from "ws";
 import QRCode from "qrcode";
 import { fileURLToPath } from "node:url";
@@ -760,6 +760,9 @@ function drawFrame(buf) {
     if (now - fpsTimer >= 1000) { $('fps').textContent = (frames * 1000 / (now - fpsTimer)).toFixed(1) + ' fps'; frames = 0; fpsTimer = now; }
     lastFrameAt = now;
   };
+  // truncated/corrupt JPEG: onload never fires and the blob URL leaks —
+  // revoke on error too (same fix the main client already has)
+  img.onerror = () => URL.revokeObjectURL(url);
   img.src = url;
 }
 
@@ -792,6 +795,12 @@ function connect() {
         $('hint').style.display = m.online ? 'none' : '';
         $('hint').textContent = '等待手机连接…';
         break;
+      case 'paired':
+        // pairing consumed the one-time code: rotate the QR now, don't wait
+        // for the uplink (this page keys off nothing else to trigger it)
+        log('设备已配对' + (m.name ? ': ' + m.name : '') + ',二维码已更换', 'ok');
+        void refreshQr();
+        break;
       case 'capture_pending':
         pendingShot = m.captureId;
         log('快门已触发' + (m.note ? '(' + m.note + ')' : '') + '…');
@@ -804,6 +813,29 @@ function connect() {
       case 'upload':
         log('图片已入库 ' + (m.name || ''), 'ok');
         break;
+      // modern-protocol branches (this page previously only knew the retired
+      // messages, so photos succeeded silently and preview-off was invisible)
+      case 'pending_image':
+        if (pendingShot) { pendingShot = null; log('照片已入库,已放入输入框' + (m.name ? ': ' + m.name : ''), 'ok'); }
+        else log('照片已入库,已放入输入框' + (m.name ? ': ' + m.name : ''), 'ok');
+        break;
+      case 'upload_saved':
+        if (pendingShot) pendingShot = null;
+        log('已保存至 ' + (m.dir || '指定文件夹') + (m.name ? ' · ' + m.name : ''), 'ok');
+        break;
+      case 'preview_state':
+        if (!m.on && m.reason === 'offline') { $('dev').textContent = '连接已断开'; $('hint').textContent = '等待手机连接…'; $('hint').style.display = ''; }
+        else if (!m.on) { $('dev').textContent = '预览已关闭'; $('hint').textContent = '手机端已停止预览'; $('hint').style.display = ''; }
+        break;
+      case 'devices': {
+        const active = (m.devices || []).find((d) => d.active);
+        $('dot').className = active ? 'on' : '';
+        $('dev').textContent = active ? (active.name || '已连接') : '未连接';
+        $('shoot').disabled = !active;
+        $('hint').style.display = active ? 'none' : '';
+        $('hint').textContent = '等待手机连接…';
+        break;
+      }
       case 'error':
         log('错误 ' + m.code + (m.message ? ': ' + m.message : ''), 'err');
         break;
@@ -998,15 +1030,22 @@ async function startLensServer(deps) {
 		done(404, "Not Found");
 	});
 	const heartbeat = setInterval(() => hub$1.pingAll(), 2e4);
-	await new Promise((resolve$1, reject) => {
-		const onError = reject;
-		server.once("error", onError);
-		server.listen(config$1.server.port, config$1.server.host, () => {
-			server.removeListener("error", onError);
-			server.on("error", (e) => log$1("warn", `http server error: ${String(e)}`));
-			resolve$1();
+	try {
+		await new Promise((resolve$1, reject) => {
+			const onError = reject;
+			server.once("error", onError);
+			server.listen(config$1.server.port, config$1.server.host, () => {
+				server.removeListener("error", onError);
+				server.on("error", (e) => log$1("warn", `http server error: ${String(e)}`));
+				resolve$1();
+			});
 		});
-	});
+	} catch (error) {
+		clearInterval(heartbeat);
+		for (const client of wss.clients) client.terminate();
+		await new Promise((resolve$1) => wss.close(() => resolve$1()));
+		throw error;
+	}
 	log$1("info", `phone-lens listening on ${config$1.server.host}:${config$1.server.port} (paired devices: ${devices$1.count()})`);
 	resolveLatestGiteeApk().then((url) => {
 		if (url) log$1("info", `APK download link resolved from Gitee API: ${url}`);
@@ -1022,6 +1061,43 @@ async function startLensServer(deps) {
 		}
 	};
 }
+/** Composer-staged photos older than this get swept (best effort). */
+const PENDING_TTL_MS = 24 * 60 * 6e4;
+/**
+
+* Cache an idempotent 200 receipt for a phone retry. The 400 cap must be a
+
+* HARD cap: within the 10min TTL a retry storm can keep the map full of
+
+* fresh entries, so once expired ones are gone we still evict oldest-first
+
+* (Map iteration order = insertion order).
+
+*/
+function rememberReplay(ctx, uploadId, body) {
+	if (!uploadId) return;
+	if (ctx.uploadReplays.size > 400) {
+		for (const [k, v] of ctx.uploadReplays) if (v.expires <= Date.now()) ctx.uploadReplays.delete(k);
+		while (ctx.uploadReplays.size >= 400) {
+			const oldest = ctx.uploadReplays.keys().next().value;
+			if (oldest === void 0) break;
+			ctx.uploadReplays.delete(oldest);
+		}
+	}
+	ctx.uploadReplays.set(uploadId, {
+		expires: Date.now() + 10 * 6e4,
+		body
+	});
+}
+/** Best-effort TTL sweep for composer-staged photos (see the staging site). */
+async function prunePending(dir, ttlMs) {
+	const cutoff = Date.now() - ttlMs;
+	for (const entry of await readdir(dir).catch(() => [])) {
+		const p = join(dir, entry);
+		const st = await stat(p).catch(() => null);
+		if (st?.isFile() && st.mtimeMs < cutoff) await rm(p, { force: true }).catch(() => {});
+	}
+}
 async function handle$1(deps, req, res, ctx) {
 	const { config: config$1, pairing: pairing$1, devices: devices$1, hub: hub$1, targets: targets$1, sink: sink$1, log: log$1 } = deps;
 	const url = new URL(req.url ?? "/", "http://phone-lens.local");
@@ -1116,6 +1192,10 @@ async function handle$1(deps, req, res, ctx) {
 			tokenHash: hashToken(token)
 		});
 		log$1("info", `paired device "${name}" (${deviceId.slice(0, 8)})`);
+		hub$1.broadcastToViews({
+			type: "paired",
+			name
+		});
 		return sendJson(res, 200, {
 			token,
 			serverInfo: {
@@ -1146,7 +1226,8 @@ async function handle$1(deps, req, res, ctx) {
 		if (truncated) return sendError(res, 413, ERROR_CODES.TOO_LARGE, `> ${config$1.limits.maxUploadBytes} bytes`);
 		if (!magicMatches(mediaType, buf)) return sendError(res, 415, ERROR_CODES.BAD_MAGIC, "bytes do not match the declared type");
 		const captureId = q.get("captureId");
-		const pending = captureId ? hub$1.consumeCapture(captureId) : null;
+		const pending = captureId ? hub$1.peekCapture(captureId) : null;
+		const abandoned = captureId ? hub$1.isAbandonedDirect(captureId) : false;
 		const note = q.get("note") ?? pending?.note;
 		const rawName = (q.get("name") ?? `shot_${new Date().toISOString().replace(/[:.]/g, "-")}.${mediaType === "image/png" ? "png" : "jpg"}`).slice(0, 120);
 		const name = sanitizeFileName(rawName);
@@ -1162,6 +1243,22 @@ async function handle$1(deps, req, res, ctx) {
 			return sendError(res, 500, ERROR_CODES.STORE_FAILED, String(error));
 		}
 		log$1("info", `stored ${name} (${buf.byteLength}B) → ${admitted.storage}:${admitted.ref.attachmentId}`);
+		if (pending) hub$1.consumeCapture(captureId);
+		if (abandoned) {
+			log$1("warn", `dropping late direct-capture photo: ${name} (${admitted.ref.attachmentId})`);
+			const droppedBody = {
+				ok: true,
+				attachmentId: admitted.ref.attachmentId,
+				width: admitted.ref.width,
+				height: admitted.ref.height,
+				bytes: admitted.ref.bytes,
+				storage: admitted.storage,
+				delivered: null,
+				deliverReason: "dropped-late-direct"
+			};
+			rememberReplay(ctx, uploadId, droppedBody);
+			return sendJson(res, 200, droppedBody);
+		}
 		if (admitted.storage === "file") await pruneUploads(deps.fallbackDir, config$1.limits.maxStoredUploads).catch((error) => log$1("warn", `upload pruning failed: ${String(error)}`));
 		if (pending?.direct && pending.onImage) {
 			pending.onImage(admitted);
@@ -1176,15 +1273,7 @@ async function handle$1(deps, req, res, ctx) {
 				delivered: null,
 				deliverReason: "delivered-to-model"
 			};
-			if (uploadId) {
-				if (ctx.uploadReplays.size > 400) {
-					for (const [k, v] of ctx.uploadReplays) if (v.expires <= Date.now()) ctx.uploadReplays.delete(k);
-				}
-				ctx.uploadReplays.set(uploadId, {
-					expires: Date.now() + 10 * 6e4,
-					body: directBody
-				});
-			}
+			rememberReplay(ctx, uploadId, directBody);
 			return sendJson(res, 200, directBody);
 		}
 		const st = deps.appSettings.get();
@@ -1215,6 +1304,7 @@ async function handle$1(deps, req, res, ctx) {
 			} catch (error) {
 				log$1("warn", `staging failed: ${String(error)}`);
 			}
+			prunePending(deps.pendingDir, PENDING_TTL_MS).catch(() => {});
 			hub$1.broadcastToViews({
 				type: "pending_image",
 				attachmentId: admitted.ref.attachmentId,
@@ -1225,7 +1315,7 @@ async function handle$1(deps, req, res, ctx) {
 			name,
 			dir: savedDir
 		});
-		if (uploadId) {
+		{
 			const replayBody = {
 				ok: true,
 				attachmentId: admitted.ref.attachmentId,
@@ -1236,24 +1326,18 @@ async function handle$1(deps, req, res, ctx) {
 				delivered: null,
 				deliverReason: savedDir ? wantComposer ? "saved-and-staged" : "saved-to-folder" : "staged-in-composer"
 			};
-			if (ctx.uploadReplays.size > 400) {
-				for (const [k, v] of ctx.uploadReplays) if (v.expires <= Date.now()) ctx.uploadReplays.delete(k);
-			}
-			ctx.uploadReplays.set(uploadId, {
-				expires: Date.now() + 10 * 6e4,
-				body: replayBody
+			rememberReplay(ctx, uploadId, replayBody);
+			return sendJson(res, 200, {
+				ok: true,
+				attachmentId: admitted.ref.attachmentId,
+				width: admitted.ref.width,
+				height: admitted.ref.height,
+				bytes: admitted.ref.bytes,
+				storage: admitted.storage,
+				delivered: null,
+				deliverReason: savedDir ? wantComposer ? "saved-and-staged" : "saved-to-folder" : "staged-in-composer"
 			});
 		}
-		return sendJson(res, 200, {
-			ok: true,
-			attachmentId: admitted.ref.attachmentId,
-			width: admitted.ref.width,
-			height: admitted.ref.height,
-			bytes: admitted.ref.bytes,
-			storage: admitted.storage,
-			delivered: null,
-			deliverReason: savedDir ? wantComposer ? "saved-and-staged" : "saved-to-folder" : "staged-in-composer"
-		});
 	}
 	if (method === "GET" && path.startsWith("/pending/") && loop) {
 		const id = path.slice(9).split("/")[0] ?? "";
@@ -1455,6 +1539,36 @@ async function pruneUploads(dir, max) {
 
 */
 const CAM_SILENCE_MS = 6e4;
+/** Oldest phone App that understands the camera_zoom control (zoom tools).
+
+* MUST track the release the zoom tools actually ship in — the app version
+
+* itself is 1.1.2 (zoom rides a patch release), not 1.2.0. */
+const ZOOM_MIN_APP = "1.1.2";
+/** How long a timed-out direct capture stays "abandoned" (late-photo guard). */
+const ABANDON_DIRECT_TTL_MS = 5 * 6e4;
+/**
+
+* Compare "1.2.0"-style dotted versions. Malformed/missing segments parse as
+
+* 0, so "1.2" >= "1.2.0" and garbage never accidentally passes a floor.
+
+*/
+function versionAtLeast(v, need) {
+	if (!v) return false;
+	const seg = (s) => {
+		const m = /^(\d+)/.exec(s.trim());
+		return m ? Number(m[1]) : 0;
+	};
+	const a = v.split(".");
+	const b = need.split(".");
+	for (let i = 0; i < 3; i++) {
+		const x = seg(a[i] ?? "");
+		const y = seg(b[i] ?? "");
+		if (x !== y) return x > y;
+	}
+	return true;
+}
 /**
 
 * How long the ACTIVE device's stream may go silent before the hub starts
@@ -1537,6 +1651,8 @@ var ViewHub = class {
 	captureTimeoutMs = 6e4;
 	/** reqId → settle callback for in-flight camera_idle/camera_resume requests. */
 	cameraStateWaiters = new Map();
+	/** reqId → settle callback for in-flight camera_zoom requests (set/step/query). */
+	zoomWaiters = new Map();
 	/**
 	
 	* Derived stream state of the ACTIVE device, read off the traffic mix:
@@ -1574,6 +1690,13 @@ var ViewHub = class {
 			});
 			this.cameraStateWaiters.delete(id);
 		}
+		for (const [id, waiter] of this.zoomWaiters) {
+			waiter.settle({
+				ok: false,
+				reason: "接收端服务已停止"
+			});
+			this.zoomWaiters.delete(id);
+		}
 		for (const [id, p] of this.pendingCaptures) {
 			p.onFail?.("接收端服务已停止");
 			this.pendingCaptures.delete(id);
@@ -1611,6 +1734,9 @@ var ViewHub = class {
 			this.log("warn", `camera ws closed: code=${code} reason=${reason.toString("utf8") || "-"} (${name} ${deviceId.slice(0, 8)})`);
 			if (this.cameras.get(deviceId)?.ws === ws) this.detachCamera(deviceId);
 		});
+		ws.on("error", (err) => {
+			this.log("warn", `camera ws error: ${String(err)} (${name} ${deviceId.slice(0, 8)})`);
+		});
 		ws.on("pong", () => {
 			const c = this.cameras.get(deviceId);
 			if (c?.ws !== ws) return;
@@ -1639,6 +1765,13 @@ var ViewHub = class {
 			});
 			this.cameraStateWaiters.delete(id);
 		}
+		for (const [id, waiter] of this.zoomWaiters) if (waiter.deviceId === deviceId) {
+			waiter.settle({
+				ok: false,
+				reason: "手机已断开连接"
+			});
+			this.zoomWaiters.delete(id);
+		}
 		if (this.activeDeviceId === deviceId) {
 			const next = [...this.cameras.keys()].at(-1) ?? null;
 			this.activeDeviceId = next;
@@ -1724,12 +1857,30 @@ var ViewHub = class {
 					const waiter = this.cameraStateWaiters.get(msg.reqId);
 					if (waiter) {
 						this.cameraStateWaiters.delete(msg.reqId);
-						waiter.settle(msg.state === "failed" ? {
+						waiter.settle(msg.state === "idle" || msg.state === "live" ? {
+							ok: true,
+							state: msg.state
+						} : {
 							ok: false,
 							reason: "手机报告执行失败(相机不可用或权限被拒)"
-						} : {
+						});
+					}
+				}
+				break;
+			}
+			case "zoom_result": {
+				if (msg.reqId) {
+					const waiter = this.zoomWaiters.get(msg.reqId);
+					if (waiter) {
+						this.zoomWaiters.delete(msg.reqId);
+						waiter.settle(msg.ok && typeof msg.factor === "number" && Number.isFinite(msg.factor) ? {
 							ok: true,
-							state: msg.state
+							factor: msg.factor,
+							...typeof msg.min === "number" ? { min: msg.min } : {},
+							...typeof msg.max === "number" ? { max: msg.max } : {}
+						} : {
+							ok: false,
+							reason: msg.reason ?? "手机报告变焦执行失败"
 						});
 					}
 				}
@@ -1847,6 +1998,8 @@ var ViewHub = class {
 	
 	*/
 	checkPreviewStall() {
+		this.gcCaptures();
+		this.gcAbandonedDirect();
 		const active = this.activeCam();
 		if (!active || active.ws.readyState !== active.ws.OPEN) return;
 		const now = Date.now();
@@ -1860,6 +2013,9 @@ var ViewHub = class {
 			this.log("warn", `view ws closed: code=${code} reason=${reason.toString("utf8") || "-"} (views left: ${this.views.size - 1})`);
 			this.views.delete(ws);
 		});
+		ws.on("error", (err) => {
+			this.log("warn", `view ws error: ${String(err)}`);
+		});
 		ws.on("message", (data, isBinary) => {
 			if (isBinary) return;
 			const msg = parseViewClient(data.toString());
@@ -1984,6 +2140,14 @@ var ViewHub = class {
 		this.pendingCaptures.delete(captureId);
 		return pending;
 	}
+	/** Read a pending capture WITHOUT consuming it (admit-first flow: the
+	
+	* record must survive an admitImage failure so the phone's retry can still
+	
+	* route the photo to the waiting model tool). */
+	peekCapture(captureId) {
+		return this.pendingCaptures.get(captureId) ?? null;
+	}
 	noteFor(captureId) {
 		return this.pendingCaptures.get(captureId)?.note;
 	}
@@ -1992,8 +2156,31 @@ var ViewHub = class {
 		for (const [id, p] of this.pendingCaptures) if (p.requestedAt < cutoff) {
 			p.onFail?.("拍摄请求已超时");
 			this.pendingCaptures.delete(id);
+			if (!p.direct) this.broadcastToViews({
+				type: "error",
+				code: "CAPTURE_TIMEOUT",
+				message: "拍摄请求已超时(手机未上传)"
+			});
 		}
 	}
+	/** captureId → abandon time: direct captures that timed out but whose photo
+	
+	* may STILL arrive. The upload handler drops those instead of injecting a
+	
+	* surprise photo into the user's composer/folder after the tool already
+	
+	* reported failure. */
+	abandonedDirect = new Map();
+	gcAbandonedDirect() {
+		const cutoff = Date.now() - ABANDON_DIRECT_TTL_MS;
+		for (const [id, at] of this.abandonedDirect) if (at < cutoff) this.abandonedDirect.delete(id);
+	}
+	/** True when this captureId belongs to a model-direct capture that already
+	
+	* timed out (its late photo must not fall into the capture mode). */
+	isAbandonedDirect(captureId) {
+		return this.abandonedDirect.has(captureId);
+	}
 	/**
 	
 	* Model tool: ask the ACTIVE phone to shoot and settle with the uploaded
@@ -2015,10 +2202,13 @@ var ViewHub = class {
 			}
 			const captureId = randomUUID();
 			let settled = false;
-			const timer = setTimeout(() => finish({
-				ok: false,
-				reason: `拍照超时(手机未在 ${Math.round(timeoutMs / 1e3)} 秒内上传照片)`
-			}), timeoutMs);
+			const timer = setTimeout(() => {
+				this.abandonedDirect.set(captureId, Date.now());
+				finish({
+					ok: false,
+					reason: `拍照超时(手机未在 ${Math.round(timeoutMs / 1e3)} 秒内上传照片)`
+				});
+			}, timeoutMs);
 			const finish = (r) => {
 				if (settled) return;
 				settled = true;
@@ -2098,6 +2288,62 @@ var ViewHub = class {
 			});
 		});
 	}
+	/**
+	
+	* Model tool: set / step / query the ACTIVE phone's zoom ratio. Settles with
+	
+	* the phone's zoom_result receipt (or a timeout). App builds before 1.2.0
+	
+	* have no camera_zoom branch at all — they would silently swallow the
+	
+	* command and burn the whole timeout, so fail fast with an upgrade hint
+	
+	* instead (undefined appVersion = pre-1.0.4 build, same bucket).
+	
+	*/
+	requestZoom(params, timeoutMs) {
+		return new Promise((resolve$1) => {
+			const active = this.activeCam();
+			if (!active || active.ws.readyState !== active.ws.OPEN || this.activeDeviceId === null) {
+				resolve$1({
+					ok: false,
+					reason: "没有已连接的手机"
+				});
+				return;
+			}
+			if (!versionAtLeast(active.meta.appVersion, ZOOM_MIN_APP)) {
+				resolve$1({
+					ok: false,
+					reason: `手机 App 版本过旧(变焦需 ≥ ${ZOOM_MIN_APP}),请先更新手机端`
+				});
+				return;
+			}
+			const reqId = randomUUID();
+			const deviceId = this.activeDeviceId;
+			let settled = false;
+			const timer = setTimeout(() => finish({
+				ok: false,
+				reason: "手机未在时限内回执(可能不在前台或已断连)"
+			}), timeoutMs);
+			const finish = (r) => {
+				if (settled) return;
+				settled = true;
+				clearTimeout(timer);
+				this.zoomWaiters.delete(reqId);
+				resolve$1(r);
+			};
+			this.zoomWaiters.set(reqId, {
+				deviceId,
+				settle: finish
+			});
+			this.sendControl(deviceId, {
+				type: "camera_zoom",
+				...params.factor !== void 0 ? { factor: params.factor } : {},
+				...params.step !== void 0 ? { step: params.step } : {},
+				reqId
+			});
+		});
+	}
 	broadcastToViews(msg) {
 		const text = JSON.stringify(msg);
 		for (const view of this.views) if (view.readyState === view.OPEN) view.send(text);