();
for (const change of changes.values()) {
@@ -76,7 +81,15 @@ export function pendingChangeBatches(): PendingChange[][] {
byGroup.set(change.group, batch);
batches.push(batch);
}
- return batches.sort((left, right) => (left[0]?.priority ?? 0) - (right[0]?.priority ?? 0));
+ return batches.map(batch => {
+ const first = batch[0];
+ if (first?.resolvePriority && !status) {
+ throw new Error("Confirmed device status is required to order these pending changes.");
+ }
+ const priority = first?.resolvePriority && status
+ ? first.resolvePriority(status) : first?.priority ?? 0;
+ return { batch, priority };
+ }).sort((left, right) => left.priority - right.priority).map(entry => entry.batch);
}
export function pendingChangeCount(): number {
From 3b64b527adb7d14e4757d91e4f19757a62f1793f Mon Sep 17 00:00:00 2001
From: Breakdown <169538186+RINZE1@users.noreply.github.com>
Date: Mon, 12 Oct 2026 17:03:21 +0800
Subject: [PATCH 08/14] docs(lunafury): simplify setup and release notes
---
README.md | 6 +-
docs/lunafury-development.md | 224 ++++-------------------------------
2 files changed, 23 insertions(+), 207 deletions(-)
diff --git a/README.md b/README.md
index a30c0957..6ea6f99b 100644
--- a/README.md
+++ b/README.md
@@ -9,10 +9,8 @@ This branch is deployed as the public development control panel.
## Development
-The LunaFury controls on this branch require the
-[paired protocol setup](docs/lunafury-development.md). The pinned npm release
-does not contain the new APIs. That guide also covers the release order and
-the remaining checks before the application PR can be merged.
+LunaFury controls require the [paired protocol setup](docs/lunafury-development.md)
+until the required APIs are published and the pinned npm dependency is updated.
```bash
npm install
diff --git a/docs/lunafury-development.md b/docs/lunafury-development.md
index 577d3d5e..c2f62b3a 100644
--- a/docs/lunafury-development.md
+++ b/docs/lunafury-development.md
@@ -1,15 +1,11 @@
-# LunaFury development and release
+# LunaFury setup and release
-The onboard controls, button remapping and receiver settings on this branch
-use new APIs from the matching `mouse-protocol` branch. The app still pins
-`@openmouse/protocol` at `0.27.0`, which does not contain those APIs. A plain
-`npm ci` restores that release and the application build fails. Use the
-paired setup below for local review; the application PR must remain a draft
-until a published protocol release provides the APIs.
+These controls require APIs from the paired protocol branch.
+The app's pinned `@openmouse/protocol` `0.27.0` lacks them.
## Local setup
-Use Node.js 24 and clone both branches into sibling directories:
+Use Node.js 24 with the two branches in sibling directories:
```bash
git clone --branch codex/lunafury-onboard-controls https://github.com/sekiranunn/mouse-protocol.git mouse-protocol
@@ -26,205 +22,27 @@ npm run size
npm run dev
```
-`0.1.0` is the protocol checkout's local package version, not the version of
-the published release. If it changes, use the filename printed by `npm pack`.
-This install leaves the app's manifest and lockfile unchanged. Repeat it
-after any app `npm ci`. After a protocol source change, rebuild and repack
-before reinstalling it in the app.
+`0.1.0` is the checkout's local package version. Use the filename printed by
+`npm pack` if it changes. Repeat the no-save install after an app `npm ci`;
+rebuild and repack after protocol changes. Manifest and lockfile remain unchanged.
## Release order
-1. Merge the protocol changes first. The protocol repository uses
- Conventional Commits and semantic-release; a `feat:` squash title allows
- its release workflow to publish the added APIs after `main` passes CI.
-2. Confirm that the published package contains the new LunaFury exports and
- driver methods. A newer version number alone does not establish that.
-3. Update the app's protocol dependency to that exact stable npm version and
- regenerate the lockfile. Do not commit the local tarball override or a
- Git/file dependency. The approved runtime-dependency policy is unchanged.
-4. Run a clean `npm ci`, `npm run check`, `npm run size` and the CI audit
- against the registry package, without reinstalling the local tarball.
- Remove the branch-only README warning and replace this setup note when
- the published dependency works. Then make the app PR ready for review.
+1. Sync both branches with upstream, resolve conflicts and complete protocol CI.
+2. Merge and publish the protocol, then confirm the package contains the required APIs.
+3. Pin that exact stable npm version in the app and update its lockfile.
+4. Run registry-only `npm ci`, `npm run check`, `npm run size` and audit.
+ Remove the temporary README warning and make the app PR ready for review.
-Both topic branches also need to incorporate the current upstream `main`
-before final validation. The checks below describe the existing paired
-branches, not a future upstream merge or published-package installation.
+Do not commit a local tarball override or Git/file dependency.
-## Hardware status
+## Validation scope
-The owner tested LUNA33 firmware `0.0.26.0` over cable and the 8K receiver.
-They confirmed the existing LunaFury controls, button polling, all three
-onboard profiles, button remapping, sleep and the revised DPI editor. All
-four receiver light modes worked over the 8K receiver, and cable connections
-did not show the lighting control. Reconnect readback was also confirmed.
-The new bottom-button power/DPI behavior still needs hardware testing;
-TYPE33 remains unverified. Games apply/restore has automated coverage but
-has not received a separate hardware result.
+The paired app passes its build, 420 tests and bundle checks with the local
+protocol package. The protocol passes its build and 151 focused tests.
+These results do not replace full protocol CI or registry-only app validation.
-The protocol repository contains the packet evidence and hardware checklist
-in [`docs/lunafury-testing.md`](https://github.com/sekiranunn/mouse-protocol/blob/codex/lunafury-onboard-controls/docs/lunafury-testing.md).
-This public branch uses generic artwork and excludes the private test-site
-files and vendor images.
-
-## Automated validation
-
-The paired application build and all 420 application tests pass, including
-95 controller/Bridge integration tests. Bundle checks pass at 205,473 / 210,000
-bytes for CSS and 2,121,349 / 2,150,000 bytes for JavaScript. These results
-use the local protocol tarball; they do not establish that a registry-only
-install builds.
-
-The protocol build and all 151 Lamzu driver/codec tests pass. The broader
-protocol regression run on 2026-10-10 passed 2,252 tests but excluded two
-registry exhaustive checks: `the probe matrix can trigger every driver` and
-`no device can be claimed by more than one driver`. A full protocol CI pass
-is still required before merge.
-
-### DPI and bank-operation regressions
-
-Games snapshots distinguish selecting a stage from editing its DPI. Older
-scalar snapshots address the selected target stage. When games switch,
-the lower-priority legacy scalars are resolved into tables before the new
-target is merged. New tables therefore override prior restore values;
-legacy targets still override restore tables in the opposite direction.
-
-DPI edits and count changes back up the complete five- or six-slot X/Y
-storage separately from the enabled count. When switching games, the app
-composes the final enabled count and X/Y slots from that backup and the new
-target, then stages one complete-table write followed by stage selection.
-It does not restore the old count first and queue individual slot edits
-against the previous game's status. A final table already on the mouse
-requires no table write. Exiting restores the original complete storage,
-so re-enabling a hidden slot reads its original value, including Y values
-stored while the axes are linked. The backup stays in memory and is excluded
-from saved Games snapshots and imports. The protocol rejects another bank
-and verifies every stored slot on readback.
-
-The controller tests use the real draft, staging, Apply and restore paths
-with synthetic HID devices. They cover both cross-format switch directions,
-expansion followed by restore and re-enabling on all four runtime PIDs,
-pending user edits, shrinking counts and combined axis-mode/DPI edits.
-The two cross-format cases and four expansion cases failed before the
-2026-10-10 fixes and pass with them. Those cases call the same merge
-functions and controller path used by the Bridge hook.
-
-Three further switch counterexamples are included in the controller suite:
-both games use the same edited DPI table but a different selection; both
-require four stages but different fourth-slot values; and the first uses
-the model's maximum count while the second needs four stages. The last is
-six-to-four on LUNA33 and five-to-four on TYPE33. All three run on each of
-the four PIDs, producing 12 cases that failed before final-table composition
-and pass with it. They check both axes, count, selection, dormant slots,
-TYPE33 trailing bytes and restoration of the accumulated originals. Three
-unit tests cover composition, unchanged final tables and legacy scalars.
-
-The protocol source did not change for these switch fixes or the failure
-handling below. Its build and 151 focused tests were rerun on 2026-10-11;
-the 2,252-test result above is the earlier broader run.
-
-### Games failure and retry regressions (2026-10-11)
-
-`flashPendingChanges` and `flashGameProfileSnapshot` return `failed` when a
-write is rejected or the final status read fails. A queued flash does not
-hide a failed batch by immediately retrying it. Games always restores the
-user's unrelated staged edits, including when snapshot staging throws.
-`written` means the attempt completed; `unchanged` and `busy` keep their
-existing meaning. Failure does not imply that every earlier write was undone.
-
-The Bridge hook records an applied signature only after `written` or
-`unchanged`. A failed application invalidates any previous signature and
-keeps the accumulated originals, including fields from a partially applied
-first game. A failed restore keeps that backup. The next Bridge status poll
-can retry the same game or the restore; success notifications and backup
-cleanup happen only after confirmation.
-
-Eighteen new integration cases cover ignored complete-table writes and
-restore retries on all four PIDs, a queued flash, final-status read failures,
-staging exceptions, partial application/restoration, old-signature
-invalidation and busy-to-ready retry. Fourteen fault cases failed against
-the previous implementation before the fix. The six Bridge cases execute
-the actual hook subscription callback with persistent synthetic refs and a
-synthetic status subscription, using the real controller and protocol
-driver. They do not mount a DOM/Preact renderer or start a native Bridge
-process. Failed cases assert no success notification and then verify the
-synthetic device's values after retry and restore; they do not treat an
-expected `written` on failure as a passing contract.
-
-The paired protocol branch refreshes the active DPI stage and both tables
-during LunaFury live reads. Its older bank-scoped setters and status reads
-now share the queue used by bank switches and the newer setters. Other
-brands retain their existing execution paths. These tests use simulated
-devices and do not add a hardware-verification result.
-
-### Unconfirmed status-cache regressions (2026-10-11)
-
-A failed final read now marks the displayed snapshot untrusted. Games must
-obtain a successful status read before planning writes, capturing newly
-touched originals or confirming `unchanged`. An empty manual Apply follows
-the same rule. Manual staging cannot discard an edit just because it matches
-that old snapshot. A successful background read restores trust even when
-its JSON is unchanged; a local-only layer preview does not.
-
-If the foreground refresh also fails, Games returns `failed` without
-attempting another write. Bridge keeps its original-settings backup and
-does not record an applied signature or notify success. Once reads recover,
-the next poll can apply or restore from the confirmed status. If the previous
-write already landed, the fresh read can confirm `unchanged` without sending
-a duplicate write. An in-flight recovery returns `busy` to another Games
-attempt rather than allowing it to plan against the stale cache.
-
-Seventeen integration cases were added. Both counterexamples run on all
-four runtime PIDs: apply lands but final read fails, followed by exit before
-background refresh; restore lands but final read fails, followed by reopening
-the same game. Two cases inject sustained foreground and background read
-failures, then check recovery and restoration of the retained originals.
-The remaining cases cover empty Apply, same-JSON recovery, newly touched
-fields, generic scalar-DPI control, manual deduplication, pending user edits
-and overlapping recovery. Sixteen cases failed against `b2fab92` before this
-fix; the same-JSON background recovery was an already-passing control case.
-
-At the end of that round, all 62 controller/Bridge cases and all 384
-application tests passed. The 17
-Bridge cases across both failure-handling rounds run the real subscription
-callback with synthetic refs and status events, not a DOM renderer or native
-Bridge process. Protocol source, packets and dependencies are unchanged;
-its build, 151 focused tests, package dry-run and runtime audit were rerun.
-No new hardware result is claimed.
-
-### Manual Apply recovery and ordering (2026-10-12)
-
-Nonempty manual Apply now recovers an untrusted snapshot before resolving
-its pending batches. It waits for an in-flight background read while holding
-the write guard. If recovery fails, it returns `failed`, sends no setting
-writes and retains the pending queue. It does not send a redundant final
-read or run a queued auto-retry after a failed preflight.
-
-DPI count ordering is resolved from the confirmed enabled count on every
-Apply, rather than stored as a priority when the user stages the edit.
-Expansion therefore precedes dependent slot edits; reduction follows them.
-This also applies when a background read has already restored trust, when
-Games has stashed and restored manual edits, and when a partially completed
-batch is retried. Existing grouped last-writer behavior and equal-priority
-staging order are preserved. Changing the requested count drops slot edits
-and selections outside that final count, but retains valid selections.
-Count restaging cannot remove pending edits while Apply is locked.
-
-Thirty-three integration cases and three pending-order unit tests were
-added. On each of the four runtime PIDs, they cover unconfirmed reduction
-followed by expansion and fourth-slot X/Y edits, with and without intervening
-background recovery; the reverse count direction; sustained read failures;
-partial-write retry; consecutive count edits; and manual staging carried
-through a Games switch. Other cases cover overlapping background/foreground
-failure, locked recovery, generic stage-DPI clients and client-only stand-ins.
-The 32 fault/order integration cases and all three unit cases failed against
-`1b75133` before the fix. The separate owner-supplied six-to-three-to-four
-reproduction now returns `written`, clears the queue and leaves four stages;
-a second Apply returns `unchanged`.
-
-The build and all 420 app tests pass, including 95 controller/Bridge cases.
-The existing 17 hook callback cases remain unchanged. Bundle checks and
-application audit pass. Protocol source, packets and dependencies did not
-change; its build, 151 focused tests, package dry-run and runtime audit were
-rerun. These are synthetic tests with the local protocol package, not new
-hardware, native-Bridge, full-protocol-CI or registry-only results.
+The owner verified LUNA33 firmware `0.0.26.0` over cable and 8K:
+button polling, profiles, DPI, mappings, sleep, receiver lighting and reconnect.
+TYPE33, bottom-button behavior and Games apply/restore have no separate hardware result.
+See the [protocol notes](https://github.com/sekiranunn/mouse-protocol/blob/codex/lunafury-onboard-controls/docs/lunafury-testing.md).
From fd9ab6681eedd92c7d7893e1f5f4e041e030b59f Mon Sep 17 00:00:00 2001
From: Breakdown <169538186+RINZE1@users.noreply.github.com>
Date: Mon, 12 Oct 2026 19:39:00 +0800
Subject: [PATCH 09/14] docs: update paired LunaFury protocol validation
---
docs/lunafury-development.md | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/docs/lunafury-development.md b/docs/lunafury-development.md
index 9e48bfd1..6d806be9 100644
--- a/docs/lunafury-development.md
+++ b/docs/lunafury-development.md
@@ -39,8 +39,8 @@ Do not commit a local tarball override or Git/file dependency.
## Validation scope
The paired app passes its build, 511 tests, bundle checks and audit with the local
-protocol package. The protocol passes its build, all 2,470 tests and package checks;
-158 Lamzu driver/codec tests also pass with real timers. Local checks do not
+protocol package. The protocol passes its build, all 2,474 tests and package checks;
+162 Lamzu driver/codec tests also pass with real timers. Local checks do not
replace upstream CI or registry-only app validation.
The owner verified LUNA33 firmware `0.0.26.0` over cable and 8K:
From 948618ee97cffc1453962e3615fae581721106d6 Mon Sep 17 00:00:00 2001
From: Breakdown <169538186+RINZE1@users.noreply.github.com>
Date: Mon, 12 Oct 2026 20:10:42 +0800
Subject: [PATCH 10/14] fix(lunafury): preserve axes and scope Games backups
per bank
---
build/lunafury-controller.test.ts | 136 +++++++++++++++++++++++++++-
docs/lunafury-development.md | 8 +-
src/app/cards/LunaFuryDpiEditor.tsx | 7 +-
src/app/useBridgeProfileApplier.ts | 51 +++++++----
src/device/controller.ts | 17 ++++
5 files changed, 195 insertions(+), 24 deletions(-)
diff --git a/build/lunafury-controller.test.ts b/build/lunafury-controller.test.ts
index 1e333f0d..98067953 100644
--- a/build/lunafury-controller.test.ts
+++ b/build/lunafury-controller.test.ts
@@ -7,6 +7,7 @@ import type { BridgeProfile } from "../src/bridge.ts";
let controller: any;
const controllerPath = fileURLToPath(new URL("../src/device/controller.ts", import.meta.url)).replaceAll("\\", "/");
const bridgeHookPath = fileURLToPath(new URL("../src/app/useBridgeProfileApplier.ts", import.meta.url)).replaceAll("\\", "/");
+const dpiEditorPath = fileURLToPath(new URL("../src/app/cards/LunaFuryDpiEditor.tsx", import.meta.url)).replaceAll("\\", "/");
before(async () => {
const storage = { getItem: () => null, setItem: () => {}, removeItem: () => {} };
@@ -22,6 +23,7 @@ before(async () => {
plugins: [{ name: "controller-test-state", enforce: "pre",
resolveId(id, importer) {
if (id === "test:bridge-hooks" || id === "react") return "\0test:bridge-hooks";
+ if (id === "../ui" && importer?.replaceAll("\\", "/") === dpiEditorPath) return "\0test:dpi-ui";
if (id === "test:bridge-status" || (id === "../bridge-status-store" && importer?.replaceAll("\\", "/") === bridgeHookPath)) {
return "\0test:bridge-status";
}
@@ -33,10 +35,13 @@ before(async () => {
let refs = [], cursor = 0, mounted = false, cleanup;
export function useRef(initial) { return refs[cursor++] ??= { current: initial }; }
export function useEffect(setup) { if (!mounted) { mounted = true; cleanup = setup(); } }
+ export function useState(initial) { return [typeof initial === "function" ? initial() : initial, () => {}]; }
export function beginRender() { cursor = 0; }
export function resetHook() { cleanup?.(); refs = []; cursor = 0; mounted = false; cleanup = null; }
export function hookWriting() { return refs.at(-1)?.current === true; }
`;
+ // Keep the editor's real event handlers; shared widgets need no DOM here.
+ if (id === "\0test:dpi-ui") return `export const OptionMenu = "OptionMenu", StepperSlider = "StepperSlider", SwitchRow = "SwitchRow";`;
if (id === "\0test:bridge-status") return `
const listeners = new Set();
export function subscribeBridgeStatus(listener) { listeners.add(listener); listener(null); return () => listeners.delete(listener); }
@@ -55,8 +60,9 @@ before(async () => {
import { beginRender, resetHook, hookWriting } from "test:bridge-hooks";
import { emitBridge } from "test:bridge-status";
export const testToastLog = [];
- export async function testConnect(device) {
- resetHook(); testToastLog.length = 0;
+ export async function testConnect(device, preserveSessions = false) {
+ if (!preserveSessions) resetHook();
+ testToastLog.length = 0;
clearPendingChanges(); gameProfileDraft = null;
active = new LamzuHidClient(device); activeDevice = device;
dpiOptions = active.getDpiOptions(); lastDiagnosticError = null;
@@ -138,6 +144,7 @@ before(async () => {
export { refreshStatus as testRefreshStatus };
export function testClientOnly() { activeDevice = null; }
export { hookWriting as testBridgeWriting };
+ export { LunaFuryDpiEditor as testDpiEditor } from "../app/cards/LunaFuryDpiEditor";
export { snapshotDiff as testSnapshotDiff, pickSnapshot as testPickSnapshot,
mergeSnapshots as testMergeSnapshots } from "./game-profile-snapshot.ts";
`;
@@ -221,6 +228,131 @@ function bridgeSuccessNotices() {
toast.title === "Applied game profile" || toast.title === "Restored your previous mouse settings");
}
+function dpiEditorNodes(status: unknown): any[] {
+ const root = controller.testDpiEditor({ snapshot: { status, preferences: { locale: "en" },
+ capabilities: { dpiStagesWritable: true, activeDpiStageWritable: true } } });
+ const nodes: any[] = [];
+ const visit = (node: any) => {
+ if (Array.isArray(node)) { node.forEach(visit); return; }
+ if (!node?.props) return;
+ nodes.push(node); visit(node.props.children);
+ };
+ visit(root);
+ return nodes;
+}
+
+for (const pid of [0x32, 0x33, 0x54, 0x84]) {
+ for (const input of ["slider", "number"]) {
+ test(`DPI editor ${input} on ${pid.toString(16)} preserves Y after an axis-mode read failure`, async () => {
+ const mouse = fixture(pid), receive = mouse.device.receiveFeatureReport;
+ mouse.device.receiveFeatureReport = async () => {
+ const request = mouse.sent.at(-1)!;
+ if (request[4] === 1 && request[5] === 0x8d) throw new Error("Injected axis-mode read failure.");
+ return receive();
+ };
+ const before = await controller.testConnect(mouse.device);
+ assert.equal(before.lunafury.separateDpiAxes, undefined);
+ const original = [...mouse.banks[0].table];
+ const nodes = dpiEditorNodes(before);
+ if (input === "slider") nodes.find(node => node.props.id === "lunafury-dpi-x").props.onCommit(1200);
+ else nodes.filter(node => node.type === "input")[1].props.onfocusout({ currentTarget: { value: "1200" } });
+ assert.equal(await controller.flashPendingChanges(), "written");
+ assert.deepEqual(mouse.banks[0].table, [...original.slice(0, 2), 1200, ...original.slice(3)]);
+ });
+ }
+
+ test(`Bridge on ${pid.toString(16)} applies and restores Games separately for each onboard bank`, async () => {
+ const mouse = fixture(pid);
+ mouse.banks[1].table[2] = 1000; mouse.banks[1].table[3] = 2000;
+ const original = structuredClone(mouse.banks);
+ const before = await controller.testConnect(mouse.device);
+ const profile = game("A", { dpi: 1200 }, before.name);
+ await bridgePoll(profile);
+ assert.equal(mouse.banks[0].table[2], 1200);
+ controller.applyProfileSelection(2);
+ assert.equal(await controller.flashPendingChanges(), "written");
+ await bridgePoll(profile);
+ assert.equal(mouse.banks[1].table[2], 1200, "the same game must also apply to the newly selected bank");
+ assert.equal(mouse.banks[1].table[3], 2000);
+ await bridgePoll(null);
+ assert.deepEqual(mouse.banks[1], original[1]);
+ assert.equal(mouse.banks[0].table[2], 1200, "do not switch the selected bank during restoration");
+ controller.applyProfileSelection(1);
+ assert.equal(await controller.flashPendingChanges(), "written");
+ await bridgePoll(null);
+ assert.deepEqual(mouse.banks, original, "the inactive bank's backup must survive until it is selected again");
+ assert.equal(controller.testState().error, null);
+ assert.equal(bridgeSuccessNotices().length, 4);
+ });
+}
+
+for (const separate of [false, true]) {
+ test(`DPI editor respects a confirmed ${separate ? "independent" : "linked"} axis mode`, async () => {
+ const mouse = fixture(); mouse.banks[0].axes = separate;
+ const before = await controller.testConnect(mouse.device);
+ dpiEditorNodes(before).find(node => node.props.id === "lunafury-dpi-x").props.onCommit(1200);
+ assert.equal(await controller.flashPendingChanges(), "written");
+ assert.deepEqual(mouse.banks[0].table.slice(2, 4), [1200, separate ? 1600 : 1200]);
+ });
+}
+
+test("Bridge keeps bank backups through a failed restore and a visit to another bank", async () => {
+ const mouse = fixture(), original = structuredClone(mouse.banks);
+ const before = await controller.testConnect(mouse.device);
+ const profile = game("A", { dpi: 1200 }, before.name);
+ await bridgePoll(profile);
+ const allowWrites = ignoreWrites(mouse);
+ await bridgePoll(null);
+ assert.equal(mouse.banks[0].table[2], 1200);
+ controller.applyProfileSelection(2);
+ assert.equal(await controller.flashPendingChanges(), "written");
+ await bridgePoll(profile);
+ assert.equal(mouse.banks[1].table[2], 1200);
+ await bridgePoll(null);
+ assert.deepEqual(mouse.banks[1], original[1]);
+ controller.applyProfileSelection(1);
+ assert.equal(await controller.flashPendingChanges(), "written");
+ allowWrites();
+ await bridgePoll(null);
+ assert.deepEqual(mouse.banks, original);
+});
+
+test("Bridge keeps separate backups for two mice with the same name and bank number", async () => {
+ const first = fixture(), second = fixture();
+ second.banks[0].table[2] = 1000; second.banks[0].table[3] = 2000;
+ const originals = [structuredClone(first.banks), structuredClone(second.banks)];
+ const before = await controller.testConnect(first.device);
+ const profile = game("A", { dpi: 1200 }, before.name);
+ await bridgePoll(profile);
+ await controller.testConnect(second.device, true);
+ await bridgePoll(null);
+ assert.deepEqual(second.banks, originals[1], "the first mouse's backup must not reach the second mouse");
+ await bridgePoll(profile);
+ assert.equal(second.banks[0].table[2], 1200);
+ await bridgePoll(null);
+ assert.deepEqual(second.banks, originals[1]);
+ await controller.testConnect(first.device, true);
+ await bridgePoll(null);
+ assert.deepEqual(first.banks, originals[0]);
+ assert.equal(controller.testState().error, null);
+});
+
+test("Games rejects a saved scope after the selected bank or device changes", async () => {
+ const mouse = fixture();
+ await controller.testConnect(mouse.device);
+ const scope = controller.currentGameProfileScope();
+ controller.applyProfileSelection(2);
+ assert.equal(await controller.flashPendingChanges(), "written");
+ const sent = mouse.sent.length;
+ assert.equal(await controller.flashGameProfileSnapshot({ dpi: 1200 }, scope), "busy");
+ assert.equal(mouse.sent.length, sent);
+ const other = fixture();
+ await controller.testConnect(other.device, true);
+ const otherSent = other.sent.length;
+ assert.equal(await controller.flashGameProfileSnapshot({ dpi: 1200 }, scope), "busy");
+ assert.equal(other.sent.length, otherSent);
+});
+
for (const pid of [0x32, 0x33, 0x54, 0x84]) {
test(`controller Games selection/restore on ${pid.toString(16)} never writes either DPI table`, async () => {
const { device, banks, sent } = fixture(pid);
diff --git a/docs/lunafury-development.md b/docs/lunafury-development.md
index 6d806be9..e5d54d83 100644
--- a/docs/lunafury-development.md
+++ b/docs/lunafury-development.md
@@ -38,7 +38,13 @@ Do not commit a local tarball override or Git/file dependency.
## Validation scope
-The paired app passes its build, 511 tests, bundle checks and audit with the local
+Games keeps originals separately for each device connection and onboard bank.
+Switching banks lets the same game apply to the newly selected bank without
+reusing another bank's backup. After the game exits, the selected bank is restored;
+inactive banks retain their in-memory backups until selected again. Restoration
+does not switch the active bank. Failed restores retain that bank's backup for retry.
+
+The paired app passes its build, 528 tests, bundle checks and audit with the local
protocol package. The protocol passes its build, all 2,474 tests and package checks;
162 Lamzu driver/codec tests also pass with real timers. Local checks do not
replace upstream CI or registry-only app validation.
diff --git a/src/app/cards/LunaFuryDpiEditor.tsx b/src/app/cards/LunaFuryDpiEditor.tsx
index 918ccf37..431be7d7 100644
--- a/src/app/cards/LunaFuryDpiEditor.tsx
+++ b/src/app/cards/LunaFuryDpiEditor.tsx
@@ -11,7 +11,7 @@ export function LunaFuryDpiEditor({ snapshot }: { snapshot: ControlSnapshot }):
const locale = snapshot.preferences.locale;
const xs = status.dpiStages ?? [];
const ys = status.dpiStagesY ?? xs;
- const separate = status.lunafury?.separateDpiAxes === true;
+ const separate = status.lunafury?.separateDpiAxes;
const limits = status.ui?.dpiStageEditor;
const max = limits?.maxDpi ?? 30000;
const active = Math.min(Math.max(status.activeDpiStage ?? 0, 0), Math.max(0, xs.length - 1));
@@ -33,7 +33,8 @@ export function LunaFuryDpiEditor({ snapshot }: { snapshot: ControlSnapshot }):
if (busy || !writable || !xs[stage]) return;
const value = lunaFuryDpiInput(raw, max);
const x = axis === "x" ? value : xs[stage];
- const y = !separate ? x : axis === "y" ? value : ys[stage] ?? x;
+ // An unread axis mode is not proof of axis lock; preserve stored Y.
+ const y = separate === false ? x : axis === "y" ? value : ys[stage] ?? x;
setRows((current) => current.map((row, i) => i === stage ? { x: String(x), y: String(y) } : row));
if (x !== xs[stage] || y !== ys[stage]) control.applyLunaFuryDpiStageAxes(stage, x, y);
};
@@ -41,7 +42,7 @@ export function LunaFuryDpiEditor({ snapshot }: { snapshot: ControlSnapshot }):
return (
{status.lunafury?.separateDpiAxes != null ? : null}
{xs.length ? (separate ? ["x", "y"] as const : ["x"] as const).map((axis) => (
(null);
- // What the mouse had, before any profile, for every field a profile has
- // changed since. Grows as profiles switch; written back when none is active.
- const priorSettings = useRef(null);
+ // Keep inactive banks' originals until that device/bank is selected again.
+ // Never restore them into whichever mouse happens to be active now.
+ const sessions = useRef(new WeakMap>());
const writing = useRef(false);
useEffect(() => subscribeBridgeStatus((bridge) => {
if (writing.current) return;
const status = deviceStatusRef.current;
const profile = bridge?.activeProfile ?? null;
+ const scope = control.currentGameProfileScope();
+ if (!status || !scope) return;
+ let session = sessions.current.get(scope.device)?.get(scope.profile);
- if (!status || (!profile && !priorSettings.current)) return;
+ if (!profile && !session?.prior) return;
writing.current = true;
let attemptedPrior: GameProfileSnapshot | null = null;
@@ -68,49 +75,57 @@ export function useBridgeProfileApplier(snapshot: ControlSnapshot): void {
// Refresh before both no-op detection and capturing newly touched fields.
const confirmed = await control.prepareGameProfileStatus();
if (typeof confirmed === "string") {
- if (confirmed === "failed") appliedSignature.current = null;
+ if (confirmed === "failed" && session) session.signature = null;
return;
}
+ const confirmedScope = control.currentGameProfileScope(confirmed);
+ if (!confirmedScope || confirmedScope.device !== scope.device) return;
+ let banks = sessions.current.get(confirmedScope.device);
+ if (!banks) sessions.current.set(confirmedScope.device, banks = new Map());
+ session = banks.get(confirmedScope.profile);
+ if (!session) banks.set(confirmedScope.profile, session = { signature: null, prior: null });
if (!profile || profile.device.name !== confirmed.name) {
// Nothing (recognized) is active for this mouse right now. Put back
// what was there before any successful or partial profile application.
- const prior = priorSettings.current;
+ const prior = session.prior;
// A failed first application can still have changed earlier batches,
// even though it never earned an applied signature.
if (!prior) return;
- const result = await control.flashGameProfileSnapshot(prior);
+ const result = await control.flashGameProfileSnapshot(prior, confirmedScope);
if (result === "busy") return;
- appliedSignature.current = null;
+ session.signature = null;
if (result === "failed") return;
- priorSettings.current = null;
+ session.prior = null;
if (result === "written") control.pushToast("info", t(localeRef.current, "bridge.profileRestored"));
return;
}
const sig = signature(profile);
- if (sig === appliedSignature.current) return;
+ if (sig === session.signature) return;
const target = profileTarget(profile);
// Capture only fields not already held: when one game's profile gives way
// to another's, the originals from before the first one still win.
- const prior = mergeSnapshots(pickSnapshot(confirmed, target), priorSettings.current ?? {}, confirmed);
+ const prior = mergeSnapshots(pickSnapshot(confirmed, target), session.prior ?? {}, confirmed);
// Fields the previous profile changed but this one doesn't go back to
// their originals, so the new game starts from the user's own settings.
- const toWrite = mergeSnapshots(priorSettings.current ?? {}, target, confirmed);
+ const toWrite = mergeSnapshots(session.prior ?? {}, target, confirmed);
attemptedPrior = prior;
- const result = await control.flashGameProfileSnapshot(toWrite);
+ const result = await control.flashGameProfileSnapshot(toWrite, confirmedScope);
if (result === "busy") return;
// Back up attempted fields too: an unsuccessful write is not atomic.
- priorSettings.current = prior;
- appliedSignature.current = result === "failed" ? null : sig;
+ session.prior = prior;
+ session.signature = result === "failed" ? null : sig;
if (result === "written") {
control.pushToast("info", t(localeRef.current, "bridge.profileAppliedHere"), profile.application.name);
}
})().catch(() => {
// Keep originals even if an unexpected rejection followed a partial write.
- if (attemptedPrior) priorSettings.current = attemptedPrior;
- appliedSignature.current = null;
+ if (session) {
+ if (attemptedPrior) session.prior = attemptedPrior;
+ session.signature = null;
+ }
}).finally(() => {
writing.current = false;
});
diff --git a/src/device/controller.ts b/src/device/controller.ts
index f3ea8cbb..c41fe4a6 100644
--- a/src/device/controller.ts
+++ b/src/device/controller.ts
@@ -1515,6 +1515,20 @@ export function isGameProfileDraftActive(): boolean {
export type FlashResult = "written" | "unchanged" | "busy" | "failed";
+export interface GameProfileScope {
+ device: object;
+ profile: number | null;
+}
+
+/** Backups belong to a physical connection and, for LunaFury, an onboard bank. */
+export function currentGameProfileScope(status = latestDeviceStatus): GameProfileScope | null {
+ const client = activeSettingsClient();
+ if (!client || !status) return null;
+ const profile = status.brand === "LunaFury" ? status.activeProfile ?? null : null;
+ if (status.brand === "LunaFury" && (profile === null || profile < 1 || profile > 3)) return null;
+ return { device: client.device ?? client, profile };
+}
+
/** Refresh an unconfirmed post-write cache before Games planning or deduplication. */
export async function prepareGameProfileStatus(): Promise {
if (gameProfileDraft || settingInProgress || activationInProgress || !latestDeviceStatus) return "busy";
@@ -1550,9 +1564,12 @@ export async function prepareGameProfileStatus(): Promise {
const status = await prepareGameProfileStatus();
if (typeof status === "string") return status;
+ const currentScope = currentGameProfileScope(status);
+ if (!scope || scope.device !== currentScope?.device || scope.profile !== currentScope.profile) return "busy";
// Another writer or a draft may start while the refresh yields.
if (gameProfileDraft || settingInProgress || !latestDeviceStatus) return "busy";
const stash = stashPendingChanges();
From 0408d6331c0756f9ba97e220f5a64859c9747eea Mon Sep 17 00:00:00 2001
From: sekiranunn <169538186+sekiranunn@users.noreply.github.com>
Date: Wed, 14 Oct 2026 03:13:06 +0800
Subject: [PATCH 11/14] fix(lunafury): use published protocol and remove dead
DPI paths
---
README.md | 3 ---
docs/lunafury-development.md | 38 ++++++++++-----------------------
package-lock.json | 8 +++----
package.json | 2 +-
src/app/cards/DpiCard.tsx | 34 +++--------------------------
src/device/lunafury-dpi.test.ts | 27 +----------------------
src/device/lunafury-dpi.ts | 13 -----------
7 files changed, 20 insertions(+), 105 deletions(-)
diff --git a/README.md b/README.md
index 8a1d7fef..b7412982 100644
--- a/README.md
+++ b/README.md
@@ -25,9 +25,6 @@ This branch is deployed as the public development control panel at
## Development
-LunaFury controls require the [paired protocol setup](docs/lunafury-development.md)
-until the required APIs are published and the pinned npm dependency is updated.
-
```bash
npm install
npm run dev
diff --git a/docs/lunafury-development.md b/docs/lunafury-development.md
index e5d54d83..ada5173b 100644
--- a/docs/lunafury-development.md
+++ b/docs/lunafury-development.md
@@ -1,40 +1,25 @@
# LunaFury setup and release
-These controls require APIs from the paired protocol branch.
-The app's pinned `@openmouse/protocol` `0.40.1` lacks them.
+These controls use `@openmouse/protocol` `0.41.0`, pinned in the app's manifest
+and lockfile. The published package includes the APIs from
+[protocol PR #205](https://github.com/OpenMouse-Project/mouse-protocol/pull/205).
## Local setup
-Use Node.js 24 with the two branches in sibling directories:
+Use Node.js 24 and install dependencies from the npm registry:
```bash
-git clone --branch codex/lunafury-onboard-controls https://github.com/sekiranunn/mouse-protocol.git mouse-protocol
git clone --branch codex/lunafury-onboard-controls https://github.com/sekiranunn/openmouse.git openmouse
-cd mouse-protocol
+cd openmouse
npm ci
-npm run build
-npm pack --ignore-scripts --pack-destination ..
-cd ../openmouse
-npm ci
-npm install --no-save --package-lock=false ../openmouse-protocol-0.1.0.tgz
npm run check
npm run size
+npm audit --audit-level=high
npm run dev
```
-`0.1.0` is the checkout's local package version. Use the filename printed by
-`npm pack` if it changes. Repeat the no-save install after an app `npm ci`;
-rebuild and repack after protocol changes. Manifest and lockfile remain unchanged.
-
-## Release order
-
-1. Complete protocol CI against the current upstream base.
-2. Merge and publish the protocol, then confirm the package contains the required APIs.
-3. Pin that exact stable npm version in the app and update its lockfile.
-4. Run registry-only `npm ci`, `npm run check`, `npm run size` and audit.
- Remove the temporary README warning and make the app PR ready for review.
-
-Do not commit a local tarball override or Git/file dependency.
+No local protocol checkout or tarball override is needed. Keep the protocol
+dependency pinned to an exact stable npm version.
## Validation scope
@@ -44,10 +29,9 @@ reusing another bank's backup. After the game exits, the selected bank is restor
inactive banks retain their in-memory backups until selected again. Restoration
does not switch the active bank. Failed restores retain that bank's backup for retry.
-The paired app passes its build, 528 tests, bundle checks and audit with the local
-protocol package. The protocol passes its build, all 2,474 tests and package checks;
-162 Lamzu driver/codec tests also pass with real timers. Local checks do not
-replace upstream CI or registry-only app validation.
+Run the build, tests, bundle checks and audit after a registry-only clean install.
+The integration suite uses synthetic HID and Bridge callbacks to exercise the
+published protocol through the controller and UI callbacks.
The owner verified LUNA33 firmware `0.0.26.0` over cable and 8K:
button polling, profiles, DPI, mappings, sleep, receiver lighting and reconnect.
diff --git a/package-lock.json b/package-lock.json
index 53197c4f..846b42be 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -10,7 +10,7 @@
"license": "AGPL-3.0-or-later",
"dependencies": {
"@openmouse/keyboard-protocol": "1.1.0",
- "@openmouse/protocol": "0.40.1",
+ "@openmouse/protocol": "0.41.0",
"lucide-react": "^1.43.0",
"preact": "^10.29.8"
},
@@ -539,9 +539,9 @@
}
},
"node_modules/@openmouse/protocol": {
- "version": "0.40.1",
- "resolved": "https://registry.npmjs.org/@openmouse/protocol/-/protocol-0.40.1.tgz",
- "integrity": "sha512-0DOR0W3fBDNDfhDR0zd85qfelG4JJb8YHzFK7VdiyAcy+pVD0sMzX+g+fwRjdUezT+pQBb126135F48tFT2ToA==",
+ "version": "0.41.0",
+ "resolved": "https://registry.npmjs.org/@openmouse/protocol/-/protocol-0.41.0.tgz",
+ "integrity": "sha512-qpNeKMje6uTvzG5LNPiOaQwKmlrUc87DPaoM/oh5rTqJqhOCC19rE/Gg8m7dKa3qnj3b7ITfIMy+9n0l0m+g5w==",
"license": "AGPL-3.0-or-later",
"engines": {
"node": ">=20"
diff --git a/package.json b/package.json
index aaa8f89a..e62bace7 100644
--- a/package.json
+++ b/package.json
@@ -14,7 +14,7 @@
},
"dependencies": {
"@openmouse/keyboard-protocol": "1.1.0",
- "@openmouse/protocol": "0.40.1",
+ "@openmouse/protocol": "0.41.0",
"lucide-react": "^1.43.0",
"preact": "^10.29.8"
},
diff --git a/src/app/cards/DpiCard.tsx b/src/app/cards/DpiCard.tsx
index 449efcb3..22dfe12a 100644
--- a/src/app/cards/DpiCard.tsx
+++ b/src/app/cards/DpiCard.tsx
@@ -11,12 +11,11 @@ import { closestDpiOption, dpiPresetValues } from "../../dpi-presets";
import { t, tp } from "../../i18n";
import { LiftOffDistance, hasLiftOff } from "./PerformanceCards";
import { LunaFuryDpiEditor } from "./LunaFuryDpiEditor";
-import { lunaFuryDpiEdits } from "../../device/lunafury-dpi.ts";
const MAX_EDITOR_ROWS = 4;
const DEFAULT_LOD = 2;
-type StageRow = { enabled: boolean; value: string; lod: number; y?: number };
+type StageRow = { enabled: boolean; value: string; lod: number };
function isUniform(stages: readonly number[] | undefined): boolean {
return stages !== undefined && stages.length > 1 && stages.every((value) => value === stages[0]);
@@ -90,8 +89,8 @@ function DpiStageEditor({
if (mode === "stage" && status?.dpiStages) {
const stages = status.dpiStages.slice(0, rowCap);
const last = stages[stages.length - 1] ?? status.dpi ?? 800;
- const rows: StageRow[] = stages.map((value, index) => ({ enabled: true, value: String(value), lod: DEFAULT_LOD, y: status.dpiStagesY?.[index] }));
- while (rows.length < rowCap) rows.push({ enabled: false, value: String(last), lod: DEFAULT_LOD, y: status.dpiStagesY?.at(-1) });
+ const rows: StageRow[] = stages.map((value) => ({ enabled: true, value: String(value), lod: DEFAULT_LOD }));
+ while (rows.length < rowCap) rows.push({ enabled: false, value: String(last), lod: DEFAULT_LOD });
return rows;
}
const presets = dpiPresetValues(options);
@@ -154,26 +153,6 @@ function DpiStageEditor({
? (status?.dpiStages?.join(",") ?? "-")
: String(status?.dpi ?? 0);
const lastSigRef = useRef(sourceSig);
- const profileSource = `${status?.brand}:${status?.activeProfile}`;
- const lastProfileRef = useRef(profileSource);
- const ySource = status?.dpiStagesY?.join(",") ?? "-";
- useEffect(() => {
- if (status?.brand !== "LunaFury") return;
- if (lastProfileRef.current !== profileSource) {
- lastProfileRef.current = profileSource;
- if (timerRef.current) clearTimeout(timerRef.current);
- touchedRef.current = 0;
- setRows(initRows());
- return;
- }
- // A Y-row edit comes from a separate control. Refresh the stored Y pairs
- // without discarding the shared editor's disabled-but-kept rows.
- setRows((current) => {
- let stage = 0;
- return current.map((row) => row.enabled ? { ...row, y: status.dpiStagesY?.[stage++] } : row);
- });
- // eslint-disable-next-line react-hooks/exhaustive-deps
- }, [profileSource, ySource]);
useEffect(() => {
if (sourceSig === lastSigRef.current) return;
lastSigRef.current = sourceSig;
@@ -226,13 +205,6 @@ function DpiStageEditor({
if (stageEditor?.countEditable === true && enabled.length !== currentCount) {
control.applyDpiStageCount(enabled.length);
}
- if (status?.brand === "LunaFury" && status.dpiStagesY) {
- const edits = lunaFuryDpiEdits(next.map((row) => ({ enabled: row.enabled,
- x: closestDpiOption(options, parseRow(row.value) ?? 50) ?? 50, y: row.y })),
- current, status.dpiStagesY, status.lunafury?.separateDpiAxes !== false);
- edits.forEach(({ stage, x, y }) => control.applyLunaFuryDpiStageAxes(stage, x, y));
- return;
- }
enabled.forEach((row, position) => {
const value = parseRow(row.value);
if (value === null || current[position] === value) return;
diff --git a/src/device/lunafury-dpi.test.ts b/src/device/lunafury-dpi.test.ts
index 4f10531c..29c8e7e6 100644
--- a/src/device/lunafury-dpi.test.ts
+++ b/src/device/lunafury-dpi.test.ts
@@ -1,6 +1,6 @@
import assert from "node:assert/strict";
import test from "node:test";
-import { lunaFuryDpiEdits, lunaFuryDpiInput } from "./lunafury-dpi.ts";
+import { lunaFuryDpiInput } from "./lunafury-dpi.ts";
test("vendor DPI inputs round down to 50 and stay within the sensor range", () => {
for (const [raw, expected] of [["", 50], ["0", 50], ["-100", 50], ["849", 800],
@@ -8,28 +8,3 @@ test("vendor DPI inputs round down to 50 and stay within the sensor range", () =
assert.equal(lunaFuryDpiInput(raw), expected);
}
});
-
-const rows = [
- { enabled: true, x: 400, y: 800 },
- { enabled: true, x: 800, y: 1600 },
- { enabled: true, x: 1600, y: 3200 },
-];
-
-test("removing a middle DPI stage moves its surviving X/Y pairs together", () => {
- assert.deepEqual(lunaFuryDpiEdits(rows.map((row, index) => ({ ...row, enabled: index !== 1 })),
- [400, 800, 1600], [800, 1600, 3200], true), [{ stage: 1, x: 1600, y: 3200 }]);
-});
-
-test("removing the first stage retains the Y values of both surviving stages", () => {
- assert.deepEqual(lunaFuryDpiEdits(rows.map((row, index) => ({ ...row, enabled: index !== 0 })),
- [400, 800, 1600], [800, 1600, 3200], true), [
- { stage: 0, x: 800, y: 1600 }, { stage: 1, x: 1600, y: 3200 },
- ]);
-});
-
-test("editing X preserves independent Y and linked axes use X for both", () => {
- const changed = [{ ...rows[0], x: 1200 }];
- assert.deepEqual(lunaFuryDpiEdits(changed, [400], [800], true), [{ stage: 0, x: 1200, y: 800 }]);
- assert.deepEqual(lunaFuryDpiEdits(changed, [400], [800], false), [{ stage: 0, x: 1200, y: 1200 }]);
- assert.deepEqual(lunaFuryDpiEdits(rows, [400, 800, 1600], [800, 1600, 3200], true), []);
-});
diff --git a/src/device/lunafury-dpi.ts b/src/device/lunafury-dpi.ts
index 0dd9707a..50a69ebd 100644
--- a/src/device/lunafury-dpi.ts
+++ b/src/device/lunafury-dpi.ts
@@ -3,16 +3,3 @@ export function lunaFuryDpiInput(raw: string, max = 30000): number {
const value = Number(raw);
return Math.min(max, Math.max(50, Number.isFinite(value) ? Math.floor(value / 50) * 50 : 50));
}
-
-/** Keep X/Y pairs together when the shared editor removes a middle stage. */
-export function lunaFuryDpiEdits(
- rows: readonly { enabled: boolean; x: number; y?: number }[],
- currentX: readonly number[],
- currentY: readonly number[],
- separate: boolean,
-): Array<{ stage: number; x: number; y: number }> {
- return rows.filter((row) => row.enabled).flatMap((row, stage) => {
- const y = separate ? row.y ?? row.x : row.x;
- return currentX[stage] === row.x && currentY[stage] === y ? [] : [{ stage, x: row.x, y }];
- });
-}
From bef0bd55fb3bbd798ce75e250224443d105a31da Mon Sep 17 00:00:00 2001
From: Breakdown <169538186+RINZE1@users.noreply.github.com>
Date: Wed, 14 Oct 2026 08:59:57 +0800
Subject: [PATCH 12/14] feat(lunafury): match public firmware by model and
component
---
build/lunafury-controller.test.ts | 32 +++++++++
docs/lunafury-firmware.md | 60 +++++++++++++++++
public/firmware-manifest.json | 56 +++++++++++++++-
scripts/firmware-manifest.extra.json | 42 +++++++++++-
scripts/generate-firmware-manifest.mjs | 13 ++--
src/device/firmware-updates.test.ts | 3 +
src/device/firmware-updates.ts | 2 +-
src/device/lunafury-firmware.test.ts | 91 ++++++++++++++++++++++++++
8 files changed, 288 insertions(+), 11 deletions(-)
create mode 100644 docs/lunafury-firmware.md
create mode 100644 src/device/lunafury-firmware.test.ts
diff --git a/build/lunafury-controller.test.ts b/build/lunafury-controller.test.ts
index 98067953..7ef46bbe 100644
--- a/build/lunafury-controller.test.ts
+++ b/build/lunafury-controller.test.ts
@@ -1,8 +1,10 @@
import assert from "node:assert/strict";
+import { readFileSync } from "node:fs";
import { fileURLToPath } from "node:url";
import { before, test } from "node:test";
import { build } from "vite";
import type { BridgeProfile } from "../src/bridge.ts";
+import { getDfuInfo, type FirmwareManifest } from "../src/device/firmware-updates.ts";
let controller: any;
const controllerPath = fileURLToPath(new URL("../src/device/controller.ts", import.meta.url)).replaceAll("\\", "/");
@@ -242,6 +244,36 @@ function dpiEditorNodes(status: unknown): any[] {
}
for (const pid of [0x32, 0x33, 0x54, 0x84]) {
+ test(`firmware manifest matches actual protocol readouts on ${pid.toString(16)}`, async () => {
+ const manifest = JSON.parse(readFileSync(new URL("../public/firmware-manifest.json", import.meta.url), "utf8")) as FirmwareManifest;
+ const wireless = pid === 0x33 || pid === 0x84;
+ const latest = pid === 0x32 || pid === 0x33 ? [25, 0] : [1, 47];
+ const older = latest[1] > 0 ? [latest[0], latest[1] - 1] : [latest[0] - 1, 0];
+ const newer = [latest[0] + 1, latest[1]];
+ for (const [mouseVersion, dongleVersion, entity] of [
+ [latest, latest, null], [newer, newer, null],
+ [older, latest, "Mouse"], [latest, older, wireless ? "Dongle" : null],
+ ] as const) {
+ const mouse = fixture(pid), receive = mouse.device.receiveFeatureReport;
+ mouse.device.receiveFeatureReport = async () => {
+ const reply = await receive(), packet = mouse.sent.at(-1)!;
+ if (packet[4] === 0 && packet[5] === 0x81) {
+ const version = wireless && packet[2] === 0 ? dongleVersion : mouseVersion;
+ new Uint8Array(reply.buffer, reply.byteOffset, reply.byteLength).set([0, 0, ...version], 6);
+ }
+ return reply;
+ };
+ const status = await controller.testConnect(mouse.device);
+ assert.deepEqual(status.firmware, wireless
+ ? [`Mouse ${mouseVersion.join(".")}`, `Dongle ${dongleVersion.join(".")}`]
+ : [`Mouse ${mouseVersion.join(".")}`]);
+ const info = getDfuInfo({ ...status, interfaceId: `373e_${pid.toString(16).padStart(4, "0")}` }, manifest);
+ assert.equal(info?.latestVersion, latest.join("."));
+ assert.equal(info?.dfuAvailable, entity !== null);
+ if (entity !== null) assert.equal(info?.entityName, entity);
+ }
+ });
+
for (const input of ["slider", "number"]) {
test(`DPI editor ${input} on ${pid.toString(16)} preserves Y after an axis-mode read failure`, async () => {
const mouse = fixture(pid), receive = mouse.device.receiveFeatureReport;
diff --git a/docs/lunafury-firmware.md b/docs/lunafury-firmware.md
new file mode 100644
index 00000000..4120c1f6
--- /dev/null
+++ b/docs/lunafury-firmware.md
@@ -0,0 +1,60 @@
+# LunaFury firmware manifest
+
+The entries in `scripts/firmware-manifest.extra.json` use the public production
+[LunaFury driver](https://mouse.lunafury.games/), checked on 2026-10-14.
+The model table in [app.9b5df071.js](https://mouse.lunafury.games/js/app.9b5df071.js)
+provides the runtime VID/PIDs and firmware filenames. Its update dialog reads
+the mouse version from `DeviceFWFile_00` and the receiver version from
+`Receiver4K8KFWFile_00`.
+
+| Model | Mouse interfaces | Receiver interface | Public version | Driver readout |
+| --- | --- | --- | --- | --- |
+| LUNA33 | `373e_0032`, `373e_0033` | `373e_0033` | `0.0.25.0` | `25.0` |
+| TYPE33 | `373e_0054`, `373e_0084` | `373e_0084` | `0.0.1.47` | `1.47` |
+
+Each model has separate `Mouse` and `Dongle` entries. The connected interface
+identifies the model; the firmware label identifies which component is compared.
+Mouse entries include both cable and receiver interfaces because the receiver
+also returns the paired mouse's version. Dongle entries match only receivers.
+Bootloader PIDs and name-only matches are excluded.
+
+Protocol 0.41.0's CompX decoder formats the last two version bytes, so
+`latestVersion` uses the two-part driver readout. Both public versions above
+have zero first and second bytes. Recheck the decoder if those bytes change;
+do not discard nonzero version components. A newer internal version, such as
+LUNA33 `26.0`, does not trigger an update or downgrade prompt.
+
+## Published files
+
+All six URLs returned HTTP 200 with binary content on the verification date.
+The official updater uses `fwfiles//`; TYPE33's `FWFolder`
+value (`TYPE33_54H`) is not the download directory used by its update dialog.
+
+| Model | Component | File under `https://mouse.lunafury.games/fwfiles/` |
+| --- | --- | --- |
+| LUNA33 | Mouse | `LUNA33/LunaFury33_Mouse_840_App_v0.0.25.0_20260202.xvi` |
+| LUNA33 | Receiver 00 | `LUNA33/LunaFury33_8K_Dongle_AT405_App_v0.0.25.0_20260202.xvi` |
+| LUNA33 | Receiver 01 | `LUNA33/LunaFury33_8K_Dongle_820_App_v0.0.25.0_20260202.xvi` |
+| TYPE33 | Mouse | `TYPE33/TYPE33_Mouse_54H20_App_v0.0.1.47_20261009.xvi` |
+| TYPE33 | Receiver 00 | `TYPE33/TYPE33_Dongle_305_App_v0.0.1.47_20261009.xvi` |
+| TYPE33 | Receiver 01 | `TYPE33/TYPE33_Dongle_54L15_App_v0.0.1.47_20261009.xvi` |
+
+The updater accepts both receiver files. OpenMouse reads target 0 as `Dongle`
+and does not expose separate version verdicts for both receiver components.
+The manifest follows the official dialog's Receiver 00 comparison and links
+to the official driver, which selects and updates the appropriate files.
+It does not offer direct binary downloads or perform flashing.
+
+## Maintenance
+
+These entries are maintained manually. For a public release, read the current
+production page's linked app script, verify the model table and file URLs,
+and update the matching entries in `scripts/firmware-manifest.extra.json`.
+Then regenerate with `node scripts/generate-firmware-manifest.mjs` and review
+`public/firmware-manifest.json`. Preserve model and component boundaries even
+when two files share a version. Test or internal firmware must not become the
+public baseline.
+
+Tests cover actual protocol readouts on all four runtime PIDs, component
+isolation, missing versions, unknown and bootloader IDs, and older/current/newer
+firmware. They do not flash hardware.
diff --git a/public/firmware-manifest.json b/public/firmware-manifest.json
index d8257cf1..235e036d 100644
--- a/public/firmware-manifest.json
+++ b/public/firmware-manifest.json
@@ -1,8 +1,8 @@
{
- "_comment": "AUTO-GENERATED — do not edit by hand. Regenerate with: node scripts/generate-firmware-manifest.mjs. Sources: Logitech update CDN depots listed in scripts/firmware-depots.seed.json (plain HTTPS, no auth). Versions/hashes/blockers are re-derived from each depot's dfu.json every run.",
+ "_comment": "AUTO-GENERATED — do not edit by hand. Regenerate with: node scripts/generate-firmware-manifest.mjs. Sources: Logitech update CDN depots listed in scripts/firmware-depots.seed.json (plain HTTPS, no auth), plus verified vendor entries in scripts/firmware-manifest.extra.json. Versions/hashes/blockers are re-derived from each depot's dfu.json every run.",
"manifestVersion": 3,
- "updatedAt": "2026-10-10T19:45:56.998Z",
- "source": "scripts/generate-firmware-manifest.mjs over updates.ghub.logitechg.com",
+ "updatedAt": "2026-10-14T00:55:55.535Z",
+ "source": "Logitech update CDN and verified vendor entries (scripts/firmware-manifest.extra.json)",
"devices": [
{
"id": "c53a_dfu@40.3.14:046d_c53a",
@@ -402,6 +402,56 @@
"downloadUrl": "https://www.logitechg.com/software/ghub",
"releaseNotes": "Entity MPM 38.00 == package 38.0.5, confirmed current in G HUB on 2026-10-09."
},
+ {
+ "id": "lunafury-luna33-dongle",
+ "brand": "LunaFury",
+ "interfaceIds": [
+ "373e_0033"
+ ],
+ "firmwareName": "Dongle",
+ "latestVersion": "25.0",
+ "required": false,
+ "downloadUrl": "https://mouse.lunafury.games/",
+ "releaseNotes": "Public firmware 0.0.25.0 (reported as 25.0). Use the LUNA33 8K receiver update in the official LunaFury web driver."
+ },
+ {
+ "id": "lunafury-luna33-mouse",
+ "brand": "LunaFury",
+ "interfaceIds": [
+ "373e_0032",
+ "373e_0033"
+ ],
+ "firmwareName": "Mouse",
+ "latestVersion": "25.0",
+ "required": false,
+ "downloadUrl": "https://mouse.lunafury.games/",
+ "releaseNotes": "Public firmware 0.0.25.0 (reported as 25.0). Connect the LUNA33 by USB and use the official LunaFury web driver to update."
+ },
+ {
+ "id": "lunafury-type33-dongle",
+ "brand": "LunaFury",
+ "interfaceIds": [
+ "373e_0084"
+ ],
+ "firmwareName": "Dongle",
+ "latestVersion": "1.47",
+ "required": false,
+ "downloadUrl": "https://mouse.lunafury.games/",
+ "releaseNotes": "Public firmware 0.0.1.47 (reported as 1.47). Use the TYPE33 8K receiver update in the official LunaFury web driver."
+ },
+ {
+ "id": "lunafury-type33-mouse",
+ "brand": "LunaFury",
+ "interfaceIds": [
+ "373e_0054",
+ "373e_0084"
+ ],
+ "firmwareName": "Mouse",
+ "latestVersion": "1.47",
+ "required": false,
+ "downloadUrl": "https://mouse.lunafury.games/",
+ "releaseNotes": "Public firmware 0.0.1.47 (reported as 1.47). Connect the TYPE33 by USB and use the official LunaFury web driver to update."
+ },
{
"id": "pro_mouse_hero_dfu@128.02.07:046d_c08c",
"depot": "pro_mouse_hero_dfu",
diff --git a/scripts/firmware-manifest.extra.json b/scripts/firmware-manifest.extra.json
index 3958ac96..029b2049 100644
--- a/scripts/firmware-manifest.extra.json
+++ b/scripts/firmware-manifest.extra.json
@@ -1,5 +1,5 @@
{
- "_comment": "Hand-maintained entries merged into public/firmware-manifest.json by scripts/generate-firmware-manifest.mjs (extra wins on id clash). Use for devices whose firmware Logitech only ships outside versioned depots, or values confirmed against vendor software. Prefer generated entries whenever a depot exists. Versions here are in device-reported (entity) numbering, e.g. HID++ MPM 38.00, which G HUB displays as package 38.0.5 \u2014 see releaseNotes. Receiver entries are deliberately absent: HID++ 1.0 register 0xF1 was proven (pre/post-flash identical bytes) to report per-MCU bootloader identifiers, not app versions, so no honest version verdict exists yet. See docs/logitech-firmware-handoff.md.",
+ "_comment": "Hand-maintained entries merged into public/firmware-manifest.json by scripts/generate-firmware-manifest.mjs (use unique ids; generated ids take priority). Use for devices without usable depots, with versions confirmed against vendor software or public firmware directories. Prefer generated entries whenever a depot exists. Versions here are in device-reported (entity) numbering, e.g. HID++ MPM 38.00, which G HUB displays as package 38.0.5 \u2014 see releaseNotes. Logitech receiver entries are deliberately absent: HID++ 1.0 register 0xF1 was proven (pre/post-flash identical bytes) to report per-MCU bootloader identifiers, not app versions, so no honest version verdict exists yet. See docs/logitech-firmware-handoff.md.",
"devices": [
{
"id": "logitech-pro-x-superlight-2c-mpm",
@@ -72,6 +72,46 @@
"firmwareName": "Dongle USB",
"latestVersion": "8.0.3",
"releaseNotes": "Dongle USB 8.0.3 == xpanel 2.6.2 DONGLE_USB_LATEST. Check-only; see mouse entry."
+ },
+ {
+ "id": "lunafury-luna33-mouse",
+ "brand": "LunaFury",
+ "interfaceIds": ["373e_0032", "373e_0033"],
+ "firmwareName": "Mouse",
+ "latestVersion": "25.0",
+ "required": false,
+ "downloadUrl": "https://mouse.lunafury.games/",
+ "releaseNotes": "Public firmware 0.0.25.0 (reported as 25.0). Connect the LUNA33 by USB and use the official LunaFury web driver to update."
+ },
+ {
+ "id": "lunafury-luna33-dongle",
+ "brand": "LunaFury",
+ "interfaceIds": ["373e_0033"],
+ "firmwareName": "Dongle",
+ "latestVersion": "25.0",
+ "required": false,
+ "downloadUrl": "https://mouse.lunafury.games/",
+ "releaseNotes": "Public firmware 0.0.25.0 (reported as 25.0). Use the LUNA33 8K receiver update in the official LunaFury web driver."
+ },
+ {
+ "id": "lunafury-type33-mouse",
+ "brand": "LunaFury",
+ "interfaceIds": ["373e_0054", "373e_0084"],
+ "firmwareName": "Mouse",
+ "latestVersion": "1.47",
+ "required": false,
+ "downloadUrl": "https://mouse.lunafury.games/",
+ "releaseNotes": "Public firmware 0.0.1.47 (reported as 1.47). Connect the TYPE33 by USB and use the official LunaFury web driver to update."
+ },
+ {
+ "id": "lunafury-type33-dongle",
+ "brand": "LunaFury",
+ "interfaceIds": ["373e_0084"],
+ "firmwareName": "Dongle",
+ "latestVersion": "1.47",
+ "required": false,
+ "downloadUrl": "https://mouse.lunafury.games/",
+ "releaseNotes": "Public firmware 0.0.1.47 (reported as 1.47). Use the TYPE33 8K receiver update in the official LunaFury web driver."
}
]
}
diff --git a/scripts/generate-firmware-manifest.mjs b/scripts/generate-firmware-manifest.mjs
index 99acfd74..5cd3cb3e 100644
--- a/scripts/generate-firmware-manifest.mjs
+++ b/scripts/generate-firmware-manifest.mjs
@@ -1,5 +1,5 @@
-// Builds public/firmware-manifest.json from Logitech's own update CDN —
-// no vendor software involved at any step.
+// Builds public/firmware-manifest.json from Logitech's update CDN and
+// verified vendor entries in firmware-manifest.extra.json.
//
// Each firmware depot is a small archive published at:
// https://updates.ghub.logitechg.com/depots//.depot
@@ -30,7 +30,7 @@
// such devices via firmware-manifest.extra.json instead.
//
// Hand entries: scripts/firmware-manifest.extra.json holds confirmed values
-// for devices without usable depots (merged last, extra wins on id clash).
+// for devices without usable depots. Use unique ids; generated ids take priority.
//
// Safety: downloads are verified (archive parses end-to-end; binaries are
// cross-checked against dfu.json hashes where present). A depot that fails
@@ -171,7 +171,7 @@ for (const entry of seed) {
}
-// Hand-maintained entries (confirmed values, non-depot devices). Extra wins.
+// Hand-maintained entries (confirmed values, non-depot devices).
const extraPath = join(here, 'firmware-manifest.extra.json');
try {
const extra = JSON.parse(readFileSync(extraPath, 'utf8'));
@@ -209,11 +209,12 @@ devices.sort((a, b) => a.id.localeCompare(b.id));
const manifest = {
_comment:
"AUTO-GENERATED — do not edit by hand. Regenerate with: node scripts/generate-firmware-manifest.mjs. " +
- "Sources: Logitech update CDN depots listed in scripts/firmware-depots.seed.json (plain HTTPS, no auth). " +
+ "Sources: Logitech update CDN depots listed in scripts/firmware-depots.seed.json (plain HTTPS, no auth), " +
+ "plus verified vendor entries in scripts/firmware-manifest.extra.json. " +
"Versions/hashes/blockers are re-derived from each depot's dfu.json every run.",
manifestVersion: MANIFEST_VERSION,
updatedAt: new Date().toISOString(),
- source: "scripts/generate-firmware-manifest.mjs over updates.ghub.logitechg.com",
+ source: "Logitech update CDN and verified vendor entries (scripts/firmware-manifest.extra.json)",
devices,
};
diff --git a/src/device/firmware-updates.test.ts b/src/device/firmware-updates.test.ts
index afdd6d58..54d6aeb7 100644
--- a/src/device/firmware-updates.test.ts
+++ b/src/device/firmware-updates.test.ts
@@ -49,6 +49,9 @@ test("extractVersionToken finds the dotted token inside driver strings", () => {
assert.equal(extractVersionToken("Mouse v27.1.2"), "27.1.2");
assert.equal(extractVersionToken("MPM 39.00.B0004"), "39.00");
assert.equal(extractVersionToken(" "), null);
+ assert.equal(extractVersionToken("Mouse firmware unavailable"), null);
+ assert.equal(extractVersionToken("Dongle firmware unavailable"), null);
+ assert.equal(extractVersionToken("42"), "42");
});
test("compareVersions compares numerically, not lexicographically", () => {
diff --git a/src/device/firmware-updates.ts b/src/device/firmware-updates.ts
index 021781c8..04c64c81 100644
--- a/src/device/firmware-updates.ts
+++ b/src/device/firmware-updates.ts
@@ -112,7 +112,7 @@ export function extractVersionToken(raw: string): string | null {
const match = raw.match(/\d+(?:\.\d+)+/);
if (match) return match[0];
const trimmed = raw.trim();
- return trimmed.length > 0 ? trimmed : null;
+ return /^\d+$/.test(trimmed) ? trimmed : null;
}
function splitNumeric(version: string): number[] {
diff --git a/src/device/lunafury-firmware.test.ts b/src/device/lunafury-firmware.test.ts
new file mode 100644
index 00000000..4ee55ad8
--- /dev/null
+++ b/src/device/lunafury-firmware.test.ts
@@ -0,0 +1,91 @@
+import assert from "node:assert/strict";
+import { readFileSync } from "node:fs";
+import test from "node:test";
+import { describeFirmwareEntities, getDfuInfo, type FirmwareDeviceRef, type FirmwareManifest } from "./firmware-updates.ts";
+
+const published = JSON.parse(readFileSync(new URL("../../public/firmware-manifest.json", import.meta.url), "utf8")) as FirmwareManifest;
+const extra = JSON.parse(readFileSync(new URL("../../scripts/firmware-manifest.extra.json", import.meta.url), "utf8")) as Pick;
+const models = [
+ { model: "LUNA33", id: "luna33", cable: "373e_0032", receiver: "373e_0033", latest: "25.0", older: "24.0", newer: "26.0" },
+ { model: "TYPE33", id: "type33", cable: "373e_0054", receiver: "373e_0084", latest: "1.47", older: "1.46", newer: "1.48" },
+] as const;
+
+test("published LunaFury entries match their maintained source", () => {
+ const entries = (manifest: Pick) => manifest.devices
+ .filter(entry => entry.brand === "LunaFury")
+ .sort((a, b) => a.id.localeCompare(b.id));
+ assert.equal(entries(published).length, 4);
+ assert.deepEqual(entries(published), entries(extra));
+});
+
+for (const model of models) {
+ const ref = (interfaceId: string, mouse: string = model.latest, dongle: string = model.latest): FirmwareDeviceRef => ({
+ brand: "LunaFury", name: `LunaFury ${model.model} EL`, interfaceId,
+ firmware: [`Mouse ${mouse}`, `Dongle ${dongle}`],
+ });
+
+ test(`${model.model} firmware entries pin exact runtime IDs and entities`, () => {
+ const mouse = published.devices.find(entry => entry.id === `lunafury-${model.id}-mouse`)!;
+ const dongle = published.devices.find(entry => entry.id === `lunafury-${model.id}-dongle`)!;
+ assert.deepEqual(mouse.interfaceIds, [model.cable, model.receiver]);
+ assert.deepEqual(dongle.interfaceIds, [model.receiver]);
+ assert.equal(mouse.firmwareName, "Mouse");
+ assert.equal(dongle.firmwareName, "Dongle");
+ for (const entry of [mouse, dongle]) {
+ assert.equal(entry.latestVersion, model.latest);
+ assert.equal(entry.downloadUrl, "https://mouse.lunafury.games/");
+ assert.equal(entry.required, false);
+ assert.equal(entry.nameMatch, undefined);
+ }
+ });
+
+ test(`${model.model} cable and receiver compare only the entities they expose`, () => {
+ for (const interfaceId of [model.cable, model.receiver]) {
+ const device = { ...ref(interfaceId), name: "Different product label" };
+ const info = describeFirmwareEntities(device, published);
+ assert.equal(info[0]?.entryId, `lunafury-${model.id}-mouse`);
+ assert.equal(info[0]?.available, false);
+ assert.equal(info[1]?.entryId, interfaceId === model.receiver ? `lunafury-${model.id}-dongle` : null);
+ assert.equal(info[1]?.available, interfaceId === model.receiver ? false : null);
+ assert.equal(getDfuInfo(device, published)?.latestVersion, model.latest);
+ }
+ assert.equal(getDfuInfo({ ...ref(model.cable), firmware: [`Dongle ${model.older}`] }, published), null);
+ });
+
+ test(`${model.model} mouse and receiver updates remain independent`, () => {
+ const mouse = getDfuInfo(ref(model.receiver, model.older, model.newer), published);
+ assert.equal(mouse?.dfuAvailable, true);
+ assert.equal(mouse?.entityName, "Mouse");
+ assert.equal(mouse?.currentVersion, model.older);
+
+ const dongle = getDfuInfo(ref(model.receiver, model.newer, model.older), published);
+ assert.equal(dongle?.dfuAvailable, true);
+ assert.equal(dongle?.entityName, "Dongle");
+ assert.equal(dongle?.currentVersion, model.older);
+ });
+
+ test(`${model.model} current and newer internal firmware never prompt a downgrade`, () => {
+ for (const version of [model.latest, model.newer]) {
+ for (const interfaceId of [model.cable, model.receiver]) {
+ const info = getDfuInfo(ref(interfaceId, version, version), published);
+ assert.equal(info?.dfuAvailable, false);
+ assert.equal(info?.dfuRequired, false);
+ }
+ }
+ });
+
+ test(`${model.model} names cannot match another model, bootloader or foreign VID`, () => {
+ const ownManifest = { ...published, devices: published.devices.filter(entry => entry.id.startsWith(`lunafury-${model.id}-`)) };
+ const other = models.find(entry => entry.model !== model.model)!;
+ for (const interfaceId of [other.cable, other.receiver, "373e_b032", "373e_b033", "373e_b054", "373e_b084", "373e_ffff", "046d_0033", ""]) {
+ assert.equal(getDfuInfo(ref(interfaceId, model.older, model.older), ownManifest), null, interfaceId);
+ }
+ });
+
+ test(`${model.model} missing firmware readings stay unknown`, () => {
+ const device = { ...ref(model.receiver), firmware: ["Mouse firmware unavailable", "Dongle firmware unavailable"] };
+ assert.equal(getDfuInfo(device, published), null);
+ assert.deepEqual(describeFirmwareEntities(device, published).map(info => info.available), [null, null]);
+ assert.equal(getDfuInfo({ ...device, firmware: [] }, published), null);
+ });
+}
From 233450e6efcc1f5123212deb043ef501b0585def Mon Sep 17 00:00:00 2001
From: Breakdown <169538186+RINZE1@users.noreply.github.com>
Date: Wed, 14 Oct 2026 09:00:50 +0800
Subject: [PATCH 13/14] chore: align protocol dependency with main
---
package-lock.json | 8 ++++----
package.json | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index 846b42be..c0fce518 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -10,7 +10,7 @@
"license": "AGPL-3.0-or-later",
"dependencies": {
"@openmouse/keyboard-protocol": "1.1.0",
- "@openmouse/protocol": "0.41.0",
+ "@openmouse/protocol": "0.42.1",
"lucide-react": "^1.43.0",
"preact": "^10.29.8"
},
@@ -539,9 +539,9 @@
}
},
"node_modules/@openmouse/protocol": {
- "version": "0.41.0",
- "resolved": "https://registry.npmjs.org/@openmouse/protocol/-/protocol-0.41.0.tgz",
- "integrity": "sha512-qpNeKMje6uTvzG5LNPiOaQwKmlrUc87DPaoM/oh5rTqJqhOCC19rE/Gg8m7dKa3qnj3b7ITfIMy+9n0l0m+g5w==",
+ "version": "0.42.1",
+ "resolved": "https://registry.npmjs.org/@openmouse/protocol/-/protocol-0.42.1.tgz",
+ "integrity": "sha512-ssVUoQxmF8YEJw4XSR/iQ5KPjZWAZX+F/mJ2T76nzLq1PEEbIT4Hcsv/run1xbX3ZjLr0YvqgQGa2euxb8qROA==",
"license": "AGPL-3.0-or-later",
"engines": {
"node": ">=20"
diff --git a/package.json b/package.json
index e62bace7..582f0ccb 100644
--- a/package.json
+++ b/package.json
@@ -14,7 +14,7 @@
},
"dependencies": {
"@openmouse/keyboard-protocol": "1.1.0",
- "@openmouse/protocol": "0.41.0",
+ "@openmouse/protocol": "0.42.1",
"lucide-react": "^1.43.0",
"preact": "^10.29.8"
},
From 303cda445c62cfc698b5a486082e54406665b652 Mon Sep 17 00:00:00 2001
From: Breakdown <169538186+RINZE1@users.noreply.github.com>
Date: Sat, 17 Oct 2026 19:15:48 +0800
Subject: [PATCH 14/14] fix: preserve LunaFury custom button assignment labels
---
src/device/lunafury-buttons.test.ts | 5 ++++-
src/device/lunafury-buttons.ts | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/device/lunafury-buttons.test.ts b/src/device/lunafury-buttons.test.ts
index 5e971280..62b59e6f 100644
--- a/src/device/lunafury-buttons.test.ts
+++ b/src/device/lunafury-buttons.test.ts
@@ -48,8 +48,11 @@ test("every locale labels the complete physical-button and action vocabularies",
assert.equal(t(locale, "luna.physicalButtons").split("|").length, Object.keys(LUNAFURY_BUTTON_IDS).length);
assert.equal(t(locale, "luna.buttonActions").split("|").length, LUNAFURY_BUTTON_ACTIONS.length);
for (const action of LUNAFURY_BUTTON_ACTIONS) assert.ok(lunaFuryMappingLabel(locale, action));
+ for (const action of ["Macro:16:1", "Macro:17:1", "Unknown:255:"]) {
+ assert.equal(lunaFuryMappingLabel(locale, action), action);
+ }
+ assert.equal(lunaFuryMappingLabel(locale, "Keyboard:129:4"), "Ctrl L + Win R + A");
}
assert.equal(lunaFuryMappingLabel("zh", "Right", true), "右键");
assert.equal(lunaFuryMappingLabel("zh", "DPI Cycle"), "循环切换 DPI");
- assert.equal(lunaFuryMappingLabel("zh", "Macro:16:1"), t("zh", "prof.customPreserved"));
});
diff --git a/src/device/lunafury-buttons.ts b/src/device/lunafury-buttons.ts
index 65b0b51c..fc6aca4a 100644
--- a/src/device/lunafury-buttons.ts
+++ b/src/device/lunafury-buttons.ts
@@ -64,5 +64,5 @@ export function lunaFuryMappingLabel(locale: InterfaceLocale, value: string, phy
const names = physical ? Object.keys(LUNAFURY_BUTTON_IDS) : LUNAFURY_BUTTON_ACTIONS;
const index = names.indexOf(value);
if (index >= 0) return t(locale, physical ? "luna.physicalButtons" : "luna.buttonActions").split("|")[index] ?? value;
- return lunaFuryKeyboardLabel(value) ?? t(locale, "prof.customPreserved");
+ return lunaFuryKeyboardLabel(value) ?? value;
}