phone-lens 1.1.0 → 1.1.2

package/lib/client.js

@@ -268,6 +268,7 @@ window.__ModuleLoader__.load({
 				const [rename, setRename] = useState(null); // {id, name} — self-drawn rename dialog
 				const [appQr, setAppQr] = useState(null); // app-download QR dialog payload (or {loading}/{fallback:true})
 				const [previewOff, setPreviewOff] = useState(false); // host says the phone's stream stopped (preview off on the phone)
+				const [previewOffline, setPreviewOffline] = useState(false); // host flagged the LINK itself dead (wifi drop, no frames AND no keepalive) — not a preview toggle
 				const [settingsOpen, setSettingsOpen] = useState(false); // collapsible settings section under the main card
 				const [appSt, setAppSt] = useState(null); // {saveMode, saveDir, effectiveSaveDir} | null (null = host too old)
 				const [dirDraft, setDirDraft] = useState("");
@@ -276,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`;
@@ -341,9 +347,13 @@ window.__ModuleLoader__.load({
 						} else if (m.type === "frame_meta") {
 							if (m.rotation !== undefined) rotRef.current = m.rotation;
 						} else if (m.type === "preview_state") {
-							// host-derived: the ACTIVE phone's stream stopped (user turned
-							// preview off in the app) or started again
+							// host-derived: the ACTIVE phone's stream stopped — either the
+							// user turned preview off in the app (keepalive still alive) or
+							// the link itself died (no frames AND no keepalive for 25s →
+							// reason:"offline"). Old hosts never send `reason` → legacy
+							// behavior is kept bit-for-bit.
 							setPreviewOff(!m.on);
+							setPreviewOffline(!m.on && m.reason === "offline");
 						} else if (m.type === "upload_saved") {
 							// folder-only mode: the photo bypassed the composer; local hint
 							setFlashOk(`已保存至 ${m.dir || "指定文件夹"}`);
@@ -363,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
@@ -380,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 : ""}`);
 						}
@@ -387,6 +405,7 @@ window.__ModuleLoader__.load({
 						ws.onclose = () => {
 							setCamOn(false);
 							setPreviewOff(false);
+							setPreviewOffline(false);
 							if (!stopped) timer = setTimeout(connect, 2000);
 						};
 				};
@@ -577,11 +596,13 @@ window.__ModuleLoader__.load({
 								{ className: "lm-body" },
 								// only show the viewfinder canvas while a camera is actually
 								// streaming; when the phone turned preview off, clear the last
-								// frame and say so instead of freezing on a stale picture
+								// frame and say so instead of freezing on a stale picture.
+								// previewOffline = the host proved the LINK died (no frames AND
+								// no keepalive 25s): say "connection lost", never "preview off"
 								camOn && !previewOff
 									? h("canvas", { ref: canvasRef, className: "lm-canvas", width: 360, height: 640 })
 									: camOn && previewOff
-										? h("div", { className: "lm-preview-off" }, "您在手机端已关闭预览功能")
+										? h("div", { className: "lm-preview-off" }, previewOffline ? "与手机的连接已中断(设备离线)" : "您在手机端已关闭预览功能")
 										: null,
 								h(
 									"div",
@@ -589,12 +610,14 @@ window.__ModuleLoader__.load({
 									h("span", null, camOn && !previewOff && fps > 0 ? `${fps} fps` : "—"),
 									h(
 										"span",
-										{ className: !camOn ? "warn-big" : previewOff ? "warn" : "" },
+										{ className: !camOn || previewOffline ? "warn-big" : previewOff ? "warn" : "" },
 										!camOn
 											? "手机未连接！相同局域网下扫码添加配对设备；若已配对过的手机，请在设置内点击本电脑端，激活为活动设备"
-											: previewOff
-												? "预览已关闭,在手机端重新开启后恢复"
-												: "预览中",
+											: previewOffline
+												? "连接已断开(手机离线),请检查手机网络;网络恢复后将自动重连"
+												: previewOff
+													? "预览已关闭,在手机端重新开启后恢复"
+													: "预览中",
 									),
 								),
 								// ── version hints (plain colored lines, never dialogs) ──
@@ -918,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,