From 16ee27f22603e8a51cf836906b26aacb4486b673 Mon Sep 17 00:00:00 2001 From: Egor Kolesnikov Date: Fri, 20 Nov 2026 18:20:42 +0200 Subject: [PATCH 1/2] Rescue: keep reconnecting until the reset goes out A wedged Watch 3 Pro is reachable only now and then: a stuck watch in the field stayed connectable for seconds, the emulator's boot loop for a fraction of one. The rescue page now picks the watch once and keeps reconnecting to it (no picker) until the factory reset is sent or the user presses Stop; a closed picker still ends it. It also warns when the browser holds no auth key, since pairing needs a tap the stuck watch can't take. Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01CQSU8M5ytC26gZ1F3vdZ7B --- src/lib/modules/device/i18n.ts | 20 +++++++ src/lib/modules/device/lib/ble.ts | 10 ++-- src/lib/modules/device/model/rescue.model.ts | 50 ++++++++++++++--- src/lib/modules/device/pages/rescue.svelte | 15 ++++-- tests/rescue-retry.browser.test.ts | 56 ++++++++++++++++++++ 5 files changed, 137 insertions(+), 14 deletions(-) create mode 100644 tests/rescue-retry.browser.test.ts diff --git a/src/lib/modules/device/i18n.ts b/src/lib/modules/device/i18n.ts index 519ff18..919e6ae 100644 --- a/src/lib/modules/device/i18n.ts +++ b/src/lib/modules/device/i18n.ts @@ -74,6 +74,10 @@ export const t = dict( forgot: (n: number) => `forgot ${n} device(s) — connect to pick again`, nothingToForget: "nothing to forget", filePickerDesc: "App package or firmware image", + rescueRetrying: (n: number) => `waiting for the watch — attempt ${n}…`, + stopRescue: "Stop", + rescueNoKey: + "This browser has no saved key for a watch. Without one, connecting means pairing, which needs a tap on the watch — open this page in the browser you installed the face from.", sendingReset: "sending factory reset…", // rescue page rescueTitle: "Rescue — FMC", @@ -160,6 +164,10 @@ export const t = dict( `забыто ${n} ${plural("ru", n, { one: "устройство", few: "устройства", many: "устройств" })} — подключитесь, чтобы выбрать снова`, nothingToForget: "забывать нечего", filePickerDesc: "Пакет приложения или образ прошивки", + rescueRetrying: (n: number) => `ожидание часов — попытка ${n}…`, + stopRescue: "Стоп", + rescueNoKey: + "В этом браузере нет сохранённого ключа часов. Без него подключение — это сопряжение, а его нужно подтвердить на часах. Откройте эту страницу в браузере, из которого ставили циферблат.", sendingReset: "отправка сброса до заводских настроек…", rescueTitle: "Восстановление — FMC", rescue: "Восстановление", @@ -244,6 +252,10 @@ export const t = dict( `забуто ${n} ${plural("uk", n, { one: "пристрій", few: "пристрої", many: "пристроїв" })} — підключіться, щоб вибрати знову`, nothingToForget: "нічого забувати", filePickerDesc: "Пакет застосунку або образ прошивки", + rescueRetrying: (n: number) => `очікування годинника — спроба ${n}…`, + stopRescue: "Стоп", + rescueNoKey: + "У цьому браузері немає збереженого ключа годинника. Без нього під'єднання — це сполучення, а його треба підтвердити на годиннику. Відкрийте цю сторінку в браузері, з якого встановлювали циферблат.", sendingReset: "надсилання скидання до заводських налаштувань…", rescueTitle: "Відновлення — FMC", rescue: "Відновлення", @@ -329,6 +341,10 @@ export const t = dict( `${n} ${plural("es", n, { one: "dispositivo olvidado", other: "dispositivos olvidados" })} — conecta para elegir de nuevo`, nothingToForget: "no hay nada que olvidar", filePickerDesc: "Paquete de app o imagen de firmware", + rescueRetrying: (n: number) => `esperando al reloj — intento ${n}…`, + stopRescue: "Detener", + rescueNoKey: + "Este navegador no tiene guardada una clave del reloj. Sin ella, conectar significa emparejar, y eso hay que confirmarlo en el reloj. Abre esta página en el navegador desde el que instalaste la esfera.", sendingReset: "enviando restablecimiento de fábrica…", rescueTitle: "Rescate — FMC", rescue: "Rescate", @@ -410,6 +426,10 @@ export const t = dict( forgot: (n: number) => `${n} डिवाइस भुला दिए गए — फिर से चुनने के लिए कनेक्ट करें`, nothingToForget: "भूलने के लिए कुछ नहीं है", filePickerDesc: "ऐप पैकेज या फ़र्मवेयर इमेज", + rescueRetrying: (n: number) => `घड़ी का इंतज़ार — प्रयास ${n}…`, + stopRescue: "रोकें", + rescueNoKey: + "इस ब्राउज़र में घड़ी की कोई सेव की हुई key नहीं है। इसके बिना कनेक्ट करने का मतलब पेयरिंग है, जिसे घड़ी पर पुष्टि करना पड़ता है। यह पेज उसी ब्राउज़र में खोलें जिससे आपने फ़ेस इंस्टॉल किया था।", sendingReset: "फ़ैक्टरी रीसेट भेजा जा रहा है…", rescueTitle: "रेस्क्यू — FMC", rescue: "रेस्क्यू", diff --git a/src/lib/modules/device/lib/ble.ts b/src/lib/modules/device/lib/ble.ts index eaab78e..74c1e79 100644 --- a/src/lib/modules/device/lib/ble.ts +++ b/src/lib/modules/device/lib/ble.ts @@ -82,6 +82,9 @@ const loadKey = (): Uint8Array | null => { return h && h.length === 32 ? fromHex(h) : null; }; const saveKey = (k: Uint8Array) => localStorage.setItem(KEY_STORE, toHex(k)); +/** Whether this browser holds an auth key: without one, connecting means pairing, which needs a + * tap on the watch — what the rescue page can't count on. */ +export const hasSavedKey = () => loadKey() !== null; // dev hygiene: resets Chrome's device permissions and the local auth key. // ponytail: doesn't fix the lock on the watch side (the bond is held by the firmware, not the browser) — @@ -150,8 +153,9 @@ export class Watch { } // rescue: stop right after auth — a watch wedged on a bad face may never answer fwGet/a055, - // and the only thing the caller wants to send is factoryReset - async connect({ rescue = false } = {}): Promise { + // and the only thing the caller wants to send is factoryReset. again: reconnect to the watch + // picked on an earlier call, with no picker — the rescue page retries every time it shows up + async connect({ rescue = false, again = false } = {}): Promise { if (!navigator.bluetooth) throw new Error( "Web Bluetooth isn't available here — open this page in Chrome or Edge, or in Bluefy on an iPhone", @@ -194,7 +198,7 @@ export class Watch { }); return d; }; - let device = await pick(); + let device = again && this.device ? this.device : await pick(); this.device = device; this.name = device.name ?? null; diff --git a/src/lib/modules/device/model/rescue.model.ts b/src/lib/modules/device/model/rescue.model.ts index 1b73612..309b5f8 100644 --- a/src/lib/modules/device/model/rescue.model.ts +++ b/src/lib/modules/device/model/rescue.model.ts @@ -1,13 +1,19 @@ // The /rescue page: a watch that is alive on Bluetooth but stuck on a black screen after a bad // face gets one command — factory reset — the moment auth completes. Nothing else is asked of // it, because a wedged firmware may never answer the usual info/dial-list exchange. -import { attach, createEvent, createStore, sample } from "effector"; +// +// A wedged watch may be reachable only now and then (between restarts, while an alarm shows), so +// after the one pick the page keeps reconnecting to the same watch until the reset goes out or +// the user stops it. ponytail: a fixed short pause between attempts — Web Bluetooth can't +// watch for the advertisement without a flag, so gatt.connect() itself is the probe. +import { attach, createEffect, createEvent, createStore, sample } from "effector"; import { Watch } from "../lib/ble"; import { dbgListeners } from "../lib/ble-protocol"; import { t } from "../i18n"; import { bleText, bt } from "../messages"; export const resetRequested = createEvent(); +export const stopRequested = createEvent(); export const $status = createStore(""); export const $error = createStore(null); export const $done = createStore(false); @@ -15,19 +21,45 @@ export const $done = createStore(false); export const $log = createStore([]); const statusChanged = createEvent(); +const RETRY_MS = 300; +// read inside the running effect, which a store can't be awaited from +let stopping = false; +// the picker closed without a choice, or no permission: nothing to retry +const pickerClosed = (e: unknown) => e instanceof Error && /NotFound|Security|Abort/.test(e.name); const logged = createEvent(); +const stopFx = createEffect(() => { + stopping = true; +}); const resetFx = attach({ source: t, - effect: async (t) => { + effect: async (t): Promise => { const w = new Watch((s: string) => statusChanged(s)); + stopping = false; dbgListeners.add(logged); try { - await w.connect({ rescue: true }); - statusChanged(t.sendingReset); - await w.factoryReset(); + for (let attempt = 1; !stopping; attempt++) { + try { + await w.connect({ rescue: true, again: attempt > 1 }); + if (stopping) break; + statusChanged(t.sendingReset); + await w.factoryReset(); + return true; + } catch (e) { + if (pickerClosed(e) || stopping) throw e; + logged(`attempt ${attempt} failed: ${(e as Error).message}`); + statusChanged(t.rescueRetrying(attempt + 1)); + await new Promise((r) => setTimeout(r, RETRY_MS)); + } + } + return false; } finally { dbgListeners.delete(logged); + try { + w.device?.gatt?.disconnect(); + } catch { + /* already gone */ + } } }, }); @@ -38,6 +70,10 @@ sample({ clock: resetRequested, target: resetFx, }); +sample({ + clock: stopRequested, + target: stopFx, +}); sample({ clock: statusChanged, source: bt, @@ -48,10 +84,10 @@ $error.on(resetRequested, () => null); sample({ clock: resetFx.failData, source: bt, - fn: (w, e) => bleText(w, e.message), + fn: (w, e) => (stopping ? null : bleText(w, e.message)), target: $error, }); -$done.on(resetRequested, () => false).on(resetFx.done, () => true); +$done.on(resetRequested, () => false).on(resetFx.doneData, (_, sent) => sent); $log .on(resetRequested, () => []) .on(logged, (log, line) => [...log, line]) diff --git a/src/lib/modules/device/pages/rescue.svelte b/src/lib/modules/device/pages/rescue.svelte index a9ea232..800a083 100644 --- a/src/lib/modules/device/pages/rescue.svelte +++ b/src/lib/modules/device/pages/rescue.svelte @@ -1,20 +1,24 @@ @@ -29,9 +33,12 @@

{@html $t.rescueIntro}

{$t.rescueBrowser}

- + {#if !keyed}

{$t.rescueNoKey}

{/if} + {#if $busy} + + {:else} + + {/if} {#if $status}

{$status}

{/if} {#if $error}

{$error}

{/if} {#if $done} diff --git a/tests/rescue-retry.browser.test.ts b/tests/rescue-retry.browser.test.ts new file mode 100644 index 0000000..8335933 --- /dev/null +++ b/tests/rescue-retry.browser.test.ts @@ -0,0 +1,56 @@ +// The rescue page keeps reconnecting to the picked watch until the factory reset goes out: a +// wedged watch is reachable only now and then. Drives the real rescue.model against a stub watch. +import { beforeEach, expect, test, vi } from "vitest"; +import { rescueModel } from "$lib/modules/device/model"; + +const watch = vi.hoisted(() => ({ fails: 0, connects: [] as boolean[], resets: 0, picker: false })); + +vi.mock("$lib/modules/device/lib/ble", async (importOriginal) => { + class Watch { + device = null; + async connect({ again = false } = {}) { + watch.connects.push(again); + if (watch.picker) throw Object.assign(new Error("User cancelled"), { name: "NotFoundError" }); + if (watch.fails-- > 0) throw new Error("connection timed out"); + return { name: "CMF Watch 3 Pro-0000", battery: null, firmware: null, serial: null }; + } + async factoryReset() { + watch.resets++; + } + } + + return { ...(await importOriginal()), Watch }; +}); + +beforeEach(() => Object.assign(watch, { fails: 0, connects: [], resets: 0, picker: false })); + +test("a watch that drops twice gets the reset on the third try, picked only once", async () => { + watch.fails = 2; + rescueModel.resetRequested(); + await vi.waitFor(() => expect(rescueModel.$done.getState()).toBe(true), { timeout: 5000 }); + + expect(watch.connects).toEqual([false, true, true]); + expect(watch.resets).toBe(1); + expect(rescueModel.$error.getState()).toBeNull(); +}); + +test("stop ends the retries without an error or a reset", async () => { + watch.fails = 1000; + rescueModel.resetRequested(); + await vi.waitFor(() => expect(watch.connects.length).toBeGreaterThan(1), { timeout: 5000 }); + rescueModel.stopRequested(); + await vi.waitFor(() => expect(rescueModel.$busy.getState()).toBe(false), { timeout: 5000 }); + + expect(watch.resets).toBe(0); + expect(rescueModel.$done.getState()).toBe(false); + expect(rescueModel.$error.getState()).toBeNull(); +}); + +test("closing the picker is not retried", async () => { + watch.picker = true; + rescueModel.resetRequested(); + await vi.waitFor(() => expect(rescueModel.$busy.getState()).toBe(false), { timeout: 5000 }); + + expect(watch.connects).toEqual([false]); + expect(rescueModel.$error.getState()).not.toBeNull(); +}); From 1345b8036c8722c60d868191be37048d506af40b Mon Sep 17 00:00:00 2001 From: Egor Kolesnikov Date: Fri, 20 Nov 2026 18:25:53 +0200 Subject: [PATCH 2/2] Rescue: delete the faces this browser installed, as a gentler option than a reset The rescue page can now delete every face this browser flashed (the upload handshake with new_wf_id 0, a minimal face as filler) instead of wiping the watch; it retries like the reset does. Unconfirmed on a stuck watch, so the factory reset stays next to it. Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01CQSU8M5ytC26gZ1F3vdZ7B --- src/lib/modules/device/i18n.ts | 44 ++++++++ src/lib/modules/device/lib/ble.ts | 68 ++++++++++++ src/lib/modules/device/lib/catalog-names.ts | 4 + src/lib/modules/device/messages.ts | 6 + src/lib/modules/device/model/rescue.model.ts | 109 +++++++++++++------ src/lib/modules/device/pages/rescue.svelte | 15 ++- tests/rescue-retry.browser.test.ts | 51 ++++++++- 7 files changed, 254 insertions(+), 43 deletions(-) diff --git a/src/lib/modules/device/i18n.ts b/src/lib/modules/device/i18n.ts index 919e6ae..2bd490b 100644 --- a/src/lib/modules/device/i18n.ts +++ b/src/lib/modules/device/i18n.ts @@ -74,6 +74,15 @@ export const t = dict( forgot: (n: number) => `forgot ${n} device(s) — connect to pick again`, nothingToForget: "nothing to forget", filePickerDesc: "App package or firmware image", + deleteFaces: (n: number) => + `Delete the ${n} ${n === 1 ? "face" : "faces"} installed from this browser`, + deletingFaces: "deleting the faces installed from this browser…", + facesDeleted: (n: number) => + n + ? `Deleted ${n} ${n === 1 ? "face" : "faces"}. Restart the watch: hold the button for 15 seconds. If it still goes black, use the factory reset.` + : "The watch had none of the faces installed from this browser. Use the factory reset.", + deleteFacesHint: + "Gentler than a reset: only the faces this browser installed go, everything else stays. Not yet confirmed on a stuck watch — if it doesn't help, use the factory reset.", rescueRetrying: (n: number) => `waiting for the watch — attempt ${n}…`, stopRescue: "Stop", rescueNoKey: @@ -164,6 +173,15 @@ export const t = dict( `забыто ${n} ${plural("ru", n, { one: "устройство", few: "устройства", many: "устройств" })} — подключитесь, чтобы выбрать снова`, nothingToForget: "забывать нечего", filePickerDesc: "Пакет приложения или образ прошивки", + deleteFaces: (n: number) => + `Удалить ${n} ${plural("ru", n, { one: "циферблат", few: "циферблата", many: "циферблатов" })}, установленных из этого браузера`, + deletingFaces: "удаление циферблатов, установленных из этого браузера…", + facesDeleted: (n: number) => + n + ? `Удалено: ${n}. Перезапустите часы — удерживайте кнопку 15 секунд. Если экран всё равно гаснет, сделайте сброс до заводских.` + : "На часах нет циферблатов, установленных из этого браузера. Сделайте сброс до заводских.", + deleteFacesHint: + "Бережнее сброса: уходят только циферблаты, установленные из этого браузера, всё остальное остаётся. На зависших часах ещё не проверено — если не поможет, сделайте сброс до заводских.", rescueRetrying: (n: number) => `ожидание часов — попытка ${n}…`, stopRescue: "Стоп", rescueNoKey: @@ -252,6 +270,15 @@ export const t = dict( `забуто ${n} ${plural("uk", n, { one: "пристрій", few: "пристрої", many: "пристроїв" })} — підключіться, щоб вибрати знову`, nothingToForget: "нічого забувати", filePickerDesc: "Пакет застосунку або образ прошивки", + deleteFaces: (n: number) => + `Видалити ${n} ${plural("uk", n, { one: "циферблат", few: "циферблати", many: "циферблатів" })}, встановлених із цього браузера`, + deletingFaces: "видалення циферблатів, встановлених із цього браузера…", + facesDeleted: (n: number) => + n + ? `Видалено: ${n}. Перезапустіть годинник — утримуйте кнопку 15 секунд. Якщо екран усе одно гасне, скиньте до заводських налаштувань.` + : "На годиннику немає циферблатів, встановлених із цього браузера. Скиньте до заводських налаштувань.", + deleteFacesHint: + "Дбайливіше за скидання: зникають лише циферблати, встановлені з цього браузера, усе інше лишається. На завислому годиннику ще не перевірено — якщо не допоможе, скиньте до заводських налаштувань.", rescueRetrying: (n: number) => `очікування годинника — спроба ${n}…`, stopRescue: "Стоп", rescueNoKey: @@ -341,6 +368,15 @@ export const t = dict( `${n} ${plural("es", n, { one: "dispositivo olvidado", other: "dispositivos olvidados" })} — conecta para elegir de nuevo`, nothingToForget: "no hay nada que olvidar", filePickerDesc: "Paquete de app o imagen de firmware", + deleteFaces: (n: number) => + `Borrar ${n} ${plural("es", n, { one: "esfera instalada", other: "esferas instaladas" })} desde este navegador`, + deletingFaces: "borrando las esferas instaladas desde este navegador…", + facesDeleted: (n: number) => + n + ? `Borradas: ${n}. Reinicia el reloj: mantén pulsado el botón 15 segundos. Si sigue quedándose en negro, restablece los datos de fábrica.` + : "El reloj no tenía ninguna esfera instalada desde este navegador. Restablece los datos de fábrica.", + deleteFacesHint: + "Más suave que un restablecimiento: solo se van las esferas que instaló este navegador y todo lo demás se queda. Aún sin confirmar en un reloj bloqueado; si no ayuda, restablece los datos de fábrica.", rescueRetrying: (n: number) => `esperando al reloj — intento ${n}…`, stopRescue: "Detener", rescueNoKey: @@ -426,6 +462,14 @@ export const t = dict( forgot: (n: number) => `${n} डिवाइस भुला दिए गए — फिर से चुनने के लिए कनेक्ट करें`, nothingToForget: "भूलने के लिए कुछ नहीं है", filePickerDesc: "ऐप पैकेज या फ़र्मवेयर इमेज", + deleteFaces: (n: number) => `इस ब्राउज़र से इंस्टॉल किए गए ${n} फ़ेस हटाएं`, + deletingFaces: "इस ब्राउज़र से इंस्टॉल किए गए फ़ेस हटाए जा रहे हैं…", + facesDeleted: (n: number) => + n + ? `${n} फ़ेस हटाए गए। घड़ी रीस्टार्ट करें: बटन 15 सेकंड दबाए रखें। अगर स्क्रीन फिर भी काली हो जाए, तो फ़ैक्टरी रीसेट करें।` + : "घड़ी पर इस ब्राउज़र से इंस्टॉल किया कोई फ़ेस नहीं था। फ़ैक्टरी रीसेट करें।", + deleteFacesHint: + "रीसेट से हल्का: सिर्फ़ इस ब्राउज़र से इंस्टॉल किए गए फ़ेस हटते हैं, बाकी सब रहता है। अटकी घड़ी पर अभी पुष्टि नहीं हुई — अगर मदद न मिले, तो फ़ैक्टरी रीसेट करें।", rescueRetrying: (n: number) => `घड़ी का इंतज़ार — प्रयास ${n}…`, stopRescue: "रोकें", rescueNoKey: diff --git a/src/lib/modules/device/lib/ble.ts b/src/lib/modules/device/lib/ble.ts index 74c1e79..e3b570d 100644 --- a/src/lib/modules/device/lib/ble.ts +++ b/src/lib/modules/device/lib/ble.ts @@ -950,6 +950,74 @@ export class Watch { await this.send(CMD.factoryReset, new Uint8Array([MARKER])); } + /** + * Deletes an installed dial: the upload handshake with old_wf_id = the dial and new_wf_id = 0 + * (cmf-watch-utils `wf-delete`). The watch still pulls a file, so `filler` (any valid face) + * goes over and is thrown away. False when the watch says that dial isn't there (0x0a). + * ponytail: the upload's chunk loop, without its slot bookkeeping — fold the two together if + * this outgrows the rescue page. Verified on a Watch Pro 2 by the CLI only, not from here. + */ + async deleteDial(id: number, filler: Uint8Array): Promise { + await this.sendData(CMD.wfInit1Req, new Uint8Array([MARKER])); + const r1 = await this.waitFor(CMD.wfInit1Rep); + + if (!r1.length || r1[0] !== 1) + throw new Error(`watch rejected the upload (init1: ${toHex(r1)})`); + const init2 = new Uint8Array(13), + dv2 = new DataView(init2.buffer); + + init2[0] = 3; + dv2.setUint32(1, id, true); + dv2.setUint32(5, 0, true); + dv2.setUint32(9, filler.length, true); + await this.sendData(CMD.wfInit2Req, init2); + const r2 = await this.waitFor(CMD.wfInit2Rep); + + if (r2[0] === 0x0a) return false; + if (!r2.length || r2[0] !== 1) + throw new Error(`watch rejected the upload (init2: ${toHex(r2)})`); + try { + return await new Promise((resolve, reject) => { + let watchdog: ReturnType; + const kick = () => { + clearTimeout(watchdog); + watchdog = setTimeout(() => reject(new Error("upload stalled")), 30000); + }; + + kick(); + this.handlers.set(CMD.wfChunkReq, async (p) => { + if (p.length < 9) return reject(new Error(`short chunk request: ${toHex(p)}`)); + kick(); + const dv = new DataView(p.buffer, p.byteOffset); + const off = dv.getUint32(0), + len = dv.getUint32(4); + + if (off + len > filler.length) + return reject(new Error(`chunk request out of bounds: ${off}+${len}`)); + try { + await this.sendData(CMD.wfChunkWrite, filler.slice(off, off + len)); + } catch (e) { + reject(e as Error); + } + }); + this.handlers.set(CMD.wfFinishAck1, async (p) => { + clearTimeout(watchdog); + try { + await this.sendData(CMD.wfFinishAck2, new Uint8Array([MARKER])); + } catch { + /* ack is best-effort */ + } + if (p[0] === 1) resolve(true); + else if (p[0] === 0x0a) resolve(false); + else reject(new Error(`dial delete failed (finish: ${toHex(p)})`)); + }); + }); + } finally { + this.handlers.delete(CMD.wfChunkReq); + this.handlers.delete(CMD.wfFinishAck1); + } + } + async fetchInfo() { const now = Math.floor(Date.now() / 1000), tz = -new Date().getTimezoneOffset() * 60; diff --git a/src/lib/modules/device/lib/catalog-names.ts b/src/lib/modules/device/lib/catalog-names.ts index 17fd9ab..7ad0541 100644 --- a/src/lib/modules/device/lib/catalog-names.ts +++ b/src/lib/modules/device/lib/catalog-names.ts @@ -70,6 +70,10 @@ export const unclaimDial = (id: number) => { if (e?.serial) write({ ...flashed(), [id]: { ...e, serial: undefined } }); }; +// every dial this browser has flashed, to any watch — what the rescue page can delete without +// reading the watch's own list (a wedged watch may not answer for it) +export const flashedHere = () => Object.keys(flashed()).map(Number); + // ids this browser put on that particular watch — what a055 leaves out of the installed list export const flashedOn = (serial: string) => Object.entries(flashed()) diff --git a/src/lib/modules/device/messages.ts b/src/lib/modules/device/messages.ts index b00321c..4c87475 100644 --- a/src/lib/modules/device/messages.ts +++ b/src/lib/modules/device/messages.ts @@ -51,6 +51,7 @@ const en = { dialNotInstalled: (id: string, d: string) => `dial ${id} not installed (${d})`, notAccepted: (why: string, kb: string) => `watch did not accept the file (${why}; ${kb} KB)`, storedNotActivated: "stored but not activated", + deleteFailed: (d: string) => `dial delete failed (${d})`, refusedReplace: (name: string) => `the watch refused to replace “${name}” — flash again and pick a different dial to replace`, aodNoPreview: @@ -147,6 +148,7 @@ export const bt = dict(en, { uploadStalled: "загрузка зависла", dialNotInstalled: (id, d) => `циферблат ${id} не установлен (${d})`, notAccepted: (why, kb) => `часы не приняли файл (${why}; ${kb} КБ)`, + deleteFailed: (d) => `не удалось удалить циферблат (${d})`, storedNotActivated: "сохранён, но не активирован", refusedReplace: (name) => `часы отказались заменить «${name}» — загрузите ещё раз и выберите другой циферблат для замены`, @@ -239,6 +241,7 @@ export const bt = dict(en, { uploadStalled: "завантаження зависло", dialNotInstalled: (id, d) => `циферблат ${id} не встановлено (${d})`, notAccepted: (why, kb) => `годинник не прийняв файл (${why}; ${kb} КБ)`, + deleteFailed: (d) => `не вдалося видалити циферблат (${d})`, storedNotActivated: "збережено, але не активовано", refusedReplace: (name) => `годинник відмовився замінити «${name}» — завантажте ще раз і виберіть інший циферблат для заміни`, @@ -331,6 +334,7 @@ export const bt = dict(en, { uploadStalled: "el envío se detuvo", dialNotInstalled: (id, d) => `la esfera ${id} no está instalada (${d})`, notAccepted: (why, kb) => `el reloj no aceptó el archivo (${why}; ${kb} KB)`, + deleteFailed: (d) => `no se pudo borrar la esfera (${d})`, storedNotActivated: "guardado pero no activado", refusedReplace: (name) => `el reloj se negó a reemplazar «${name}» — vuelve a enviarla y elige otra esfera para reemplazar`, @@ -425,6 +429,7 @@ export const bt = dict(en, { uploadStalled: "अपलोड रुक गया", dialNotInstalled: (id, d) => `फ़ेस ${id} इंस्टॉल नहीं है (${d})`, notAccepted: (why, kb) => `घड़ी ने फ़ाइल स्वीकार नहीं की (${why}; ${kb} KB)`, + deleteFailed: (d) => `फ़ेस हटाना विफल रहा (${d})`, storedNotActivated: "सेव हुई पर चालू नहीं हुई", refusedReplace: (name) => `घड़ी ने “${name}” को बदलने से मना किया — फिर से भेजें और बदलने के लिए दूसरा फ़ेस चुनें`, @@ -528,6 +533,7 @@ const RULES: Rule[] = [ (w, m) => w.notAccepted(m[1] === en.storedNotActivated ? w.storedNotActivated : m[1], m[2]), ], [/^the watch refused to replace “(.+)” — /, (w, m) => w.refusedReplace(m[1])], + [/^dial delete failed \((.+)\)$/, (w, m) => w.deleteFailed(m[1])], lit("aodNoPreview"), [ /^an image is (\d+)×(\d+) px, over the (\d+) px limit/, diff --git a/src/lib/modules/device/model/rescue.model.ts b/src/lib/modules/device/model/rescue.model.ts index 309b5f8..c067524 100644 --- a/src/lib/modules/device/model/rescue.model.ts +++ b/src/lib/modules/device/model/rescue.model.ts @@ -6,17 +6,24 @@ // after the one pick the page keeps reconnecting to the same watch until the reset goes out or // the user stops it. ponytail: a fixed short pause between attempts — Web Bluetooth can't // watch for the advertisement without a flag, so gatt.connect() itself is the probe. -import { attach, createEffect, createEvent, createStore, sample } from "effector"; +import { attach, createEffect, createEvent, createStore, sample, type StoreValue } from "effector"; import { Watch } from "../lib/ble"; +import { flashedHere } from "../lib/catalog-names"; +import { buildBin, TAG } from "$lib/modules/editor/core/format"; import { dbgListeners } from "../lib/ble-protocol"; import { t } from "../i18n"; import { bleText, bt } from "../messages"; export const resetRequested = createEvent(); +/** The gentler action: delete the faces this browser installed, the bad one among them. */ +export const facesRequested = createEvent(); export const stopRequested = createEvent(); +export type RescueResult = { action: "reset" } | { action: "faces"; deleted: number }; +type Words = StoreValue; + export const $status = createStore(""); export const $error = createStore(null); -export const $done = createStore(false); +export const $done = createStore(null); // everything ble.ts logged during the attempt, for the user to paste into an issue export const $log = createStore([]); @@ -27,48 +34,78 @@ let stopping = false; // the picker closed without a choice, or no permission: nothing to retry const pickerClosed = (e: unknown) => e instanceof Error && /NotFound|Security|Abort/.test(e.name); const logged = createEvent(); +// what the watch pulls during a delete and throws away: the smallest file that parses as a face +const FILLER = buildBin({ + name: "FMC rescue", + screens: [{ tag: TAG.main, subs: [{ tag: TAG.name, text: "FMC rescue" }] }], + resources: [], +}); const stopFx = createEffect(() => { stopping = true; }); -const resetFx = attach({ +const rescueFx = attach({ source: t, - effect: async (t): Promise => { - const w = new Watch((s: string) => statusChanged(s)); + mapParams: (action: RescueResult["action"], t) => ({ action, t }), + effect: createEffect( + async ({ + action, + t, + }: { + action: RescueResult["action"]; + t: Words; + }): Promise => { + const w = new Watch((s: string) => statusChanged(s)); - stopping = false; - dbgListeners.add(logged); - try { - for (let attempt = 1; !stopping; attempt++) { + stopping = false; + dbgListeners.add(logged); + try { + for (let attempt = 1; !stopping; attempt++) { + try { + await w.connect({ rescue: true, again: attempt > 1 }); + if (stopping) break; + if (action === "reset") { + statusChanged(t.sendingReset); + await w.factoryReset(); + return { action }; + } + statusChanged(t.deletingFaces); + let deleted = 0; + + // a delete the watch answers "not there" for is fine: an older face, or one the + // last attempt already took before the link dropped + for (const id of flashedHere()) if (await w.deleteDial(id, FILLER)) deleted++; + return { action, deleted }; + } catch (e) { + if (pickerClosed(e) || stopping) throw e; + logged(`attempt ${attempt} failed: ${(e as Error).message}`); + statusChanged(t.rescueRetrying(attempt + 1)); + await new Promise((r) => setTimeout(r, RETRY_MS)); + } + } + return null; + } finally { + dbgListeners.delete(logged); try { - await w.connect({ rescue: true, again: attempt > 1 }); - if (stopping) break; - statusChanged(t.sendingReset); - await w.factoryReset(); - return true; - } catch (e) { - if (pickerClosed(e) || stopping) throw e; - logged(`attempt ${attempt} failed: ${(e as Error).message}`); - statusChanged(t.rescueRetrying(attempt + 1)); - await new Promise((r) => setTimeout(r, RETRY_MS)); + w.device?.gatt?.disconnect(); + } catch { + /* already gone */ } } - return false; - } finally { - dbgListeners.delete(logged); - try { - w.device?.gatt?.disconnect(); - } catch { - /* already gone */ - } - } - }, + }, + ), }); -export const $busy = resetFx.pending; +export const $busy = rescueFx.pending; sample({ clock: resetRequested, - target: resetFx, + fn: () => "reset" as const, + target: rescueFx, +}); +sample({ + clock: facesRequested, + fn: () => "faces" as const, + target: rescueFx, }); sample({ clock: stopRequested, @@ -80,15 +117,15 @@ sample({ fn: bleText, target: $status, }); -$error.on(resetRequested, () => null); +$error.on(rescueFx, () => null); sample({ - clock: resetFx.failData, + clock: rescueFx.failData, source: bt, fn: (w, e) => (stopping ? null : bleText(w, e.message)), target: $error, }); -$done.on(resetRequested, () => false).on(resetFx.doneData, (_, sent) => sent); +$done.on(rescueFx, () => null).on(rescueFx.doneData, (_, result) => result); $log - .on(resetRequested, () => []) + .on(rescueFx, () => []) .on(logged, (log, line) => [...log, line]) - .on(resetFx.failData, (log, e) => [...log, `error: ${e.message}`]); + .on(rescueFx.failData, (log, e) => [...log, `error: ${e.message}`]); diff --git a/src/lib/modules/device/pages/rescue.svelte b/src/lib/modules/device/pages/rescue.svelte index 800a083..e424922 100644 --- a/src/lib/modules/device/pages/rescue.svelte +++ b/src/lib/modules/device/pages/rescue.svelte @@ -1,16 +1,18 @@ @@ -37,12 +40,18 @@ {#if $busy} {:else} + {#if faces} +

{$t.deleteFacesHint}

+ + {/if} {/if} {#if $status}

{$status}

{/if} {#if $error}

{$error}

{/if} - {#if $done} + {#if $done?.action === "reset"}

{@html $t.rescueSent(ISSUES)}

+ {:else if $done?.action === "faces"} +

{$t.facesDeleted($done.deleted)}

{/if} {#if $log.length}

{$t.sendLog}

diff --git a/tests/rescue-retry.browser.test.ts b/tests/rescue-retry.browser.test.ts index 8335933..092f1d1 100644 --- a/tests/rescue-retry.browser.test.ts +++ b/tests/rescue-retry.browser.test.ts @@ -3,7 +3,14 @@ import { beforeEach, expect, test, vi } from "vitest"; import { rescueModel } from "$lib/modules/device/model"; -const watch = vi.hoisted(() => ({ fails: 0, connects: [] as boolean[], resets: 0, picker: false })); +const watch = vi.hoisted(() => ({ + fails: 0, + connects: [] as boolean[], + resets: 0, + picker: false, + deleted: [] as number[], + installed: [] as number[], +})); vi.mock("$lib/modules/device/lib/ble", async (importOriginal) => { class Watch { @@ -17,17 +24,33 @@ vi.mock("$lib/modules/device/lib/ble", async (importOriginal) => { async factoryReset() { watch.resets++; } + async deleteDial(id: number, filler: Uint8Array) { + expect(filler.length).toBeGreaterThan(36); + watch.deleted.push(id); + return watch.installed.includes(id); + } } return { ...(await importOriginal()), Watch }; }); -beforeEach(() => Object.assign(watch, { fails: 0, connects: [], resets: 0, picker: false })); +beforeEach(() => + Object.assign(watch, { + fails: 0, + connects: [], + resets: 0, + picker: false, + deleted: [], + installed: [], + }), +); test("a watch that drops twice gets the reset on the third try, picked only once", async () => { watch.fails = 2; rescueModel.resetRequested(); - await vi.waitFor(() => expect(rescueModel.$done.getState()).toBe(true), { timeout: 5000 }); + await vi.waitFor(() => expect(rescueModel.$done.getState()).toEqual({ action: "reset" }), { + timeout: 5000, + }); expect(watch.connects).toEqual([false, true, true]); expect(watch.resets).toBe(1); @@ -42,7 +65,7 @@ test("stop ends the retries without an error or a reset", async () => { await vi.waitFor(() => expect(rescueModel.$busy.getState()).toBe(false), { timeout: 5000 }); expect(watch.resets).toBe(0); - expect(rescueModel.$done.getState()).toBe(false); + expect(rescueModel.$done.getState()).toBeNull(); expect(rescueModel.$error.getState()).toBeNull(); }); @@ -54,3 +77,23 @@ test("closing the picker is not retried", async () => { expect(watch.connects).toEqual([false]); expect(rescueModel.$error.getState()).not.toBeNull(); }); + +test("delete asks the watch for every face this browser installed, and counts the ones it had", async () => { + localStorage.setItem( + "fmc_dial_names", + JSON.stringify({ 101: { name: "A" }, 202: { name: "BZ Rotator" }, 303: { name: "C" } }), + ); + watch.installed = [202, 303]; + watch.fails = 1; + rescueModel.facesRequested(); + await vi.waitFor( + () => expect(rescueModel.$done.getState()).toEqual({ action: "faces", deleted: 2 }), + { + timeout: 5000, + }, + ); + + expect(watch.deleted).toEqual([101, 202, 303]); + expect(watch.resets).toBe(0); + localStorage.removeItem("fmc_dial_names"); +});