Merge branch 'meshtastic:main' into new-channel-config

packages/transport-http/src/transport.test.ts

@@ -1,13 +1,23 @@
-import { describe, vi, expect, it, beforeEach, afterEach, type MockInstance } from "vitest";
+import {
+  afterEach,
+  beforeEach,
+  describe,
+  expect,
+  it,
+  type MockInstance,
+  vi,
+} from "vitest";
 import { runTransportContract } from "../../../tests/utils/transportContract";
 import { TransportHTTP } from "./transport";
 
 let abortTimeoutSpy: MockInstance | undefined;
 beforeEach(() => {
-  abortTimeoutSpy = vi.spyOn(
+  abortTimeoutSpy = vi
+    .spyOn(
       globalThis.AbortSignal as unknown as { timeout(ms: number): AbortSignal },
       "timeout",
-    ).mockImplementation((ms: number) => {
+    )
+    .mockImplementation((ms: number) => {
       const ctrl = new AbortController();
       const abort = () =>
         ctrl.abort(new DOMException("Timeout reached", "TimeoutError"));
@@ -118,20 +128,28 @@ describe("TransportHTTP (contract)", () => {
       vi.unstubAllGlobals();
     },
     create: async () => {
-      (globalThis as unknown as { __http: ReturnType<typeof stubFetch> }).__http = stubFetch();
+      (
+        globalThis as unknown as { __http: ReturnType<typeof stubFetch> }
+      ).__http = stubFetch();
       const transport = await TransportHTTP.create("127.0.0.1:80", false);
       await tickNextTimer();
       return transport;
     },
     pushIncoming: async (bytes) => {
-      (globalThis as unknown as { __http: ReturnType<typeof stubFetch> }).__http.pushIncoming(bytes);
+      (
+        globalThis as unknown as { __http: ReturnType<typeof stubFetch> }
+      ).__http.pushIncoming(bytes);
       await tickNextTimer();
     },
     assertLastWritten: (bytes) => {
-      (globalThis as unknown as { __http: ReturnType<typeof stubFetch> }).__http.assertLastWritten(bytes);
+      (
+        globalThis as unknown as { __http: ReturnType<typeof stubFetch> }
+      ).__http.assertLastWritten(bytes);
     },
     triggerDisconnect: async () => {
-      (globalThis as unknown as { __http: ReturnType<typeof stubFetch> }).__http.forceReadErrorOnce();
+      (
+        globalThis as unknown as { __http: ReturnType<typeof stubFetch> }
+      ).__http.forceReadErrorOnce();
       await tickNextTimer();
     },
   });

packages/transport-node-serial/src/transport.test.ts

@@ -1,7 +1,7 @@
-import { describe, vi, expect, beforeEach, afterEach, it } from "vitest";
 import { Duplex } from "node:stream";
-import type { SerialPort } from "serialport";
 import { Types, Utils } from "@meshtastic/core";
+import type { SerialPort } from "serialport";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
 import { runTransportContract } from "../../../tests/utils/transportContract";
 import { TransportNodeSerial } from "./transport";
 
@@ -112,21 +112,21 @@ describe("TransportNodeSerial (contract)", () => {
       return transport;
     },
     pushIncoming: async (bytes) => {
-      (globalThis as unknown as { __fakePort: FakeSerialPort }).__fakePort.pushIncoming(
+      (
-        bytes,
+        globalThis as unknown as { __fakePort: FakeSerialPort }
-      );
+      ).__fakePort.pushIncoming(bytes);
       await Promise.resolve();
     },
     assertLastWritten: (bytes) => {
-      const port =
+      const port = (globalThis as unknown as { __fakePort: FakeSerialPort })
-        (globalThis as unknown as { __fakePort: FakeSerialPort }).__fakePort;
+        .__fakePort;
       expect(port.lastWritten).toBeDefined();
       expect(port.lastWritten).toEqual(bytes);
     },
     triggerDisconnect: async () => {
-      (globalThis as unknown as { __fakePort: FakeSerialPort }).__fakePort.emitErrorOnce(
+      (
-        "test-disconnect",
+        globalThis as unknown as { __fakePort: FakeSerialPort }
-      );
+      ).__fakePort.emitErrorOnce("test-disconnect");
       await Promise.resolve();
     },
   });

packages/transport-node/src/transport.test.ts

@@ -1,9 +1,9 @@
-import { describe, vi, expect, beforeEach, afterEach, it } from "vitest";
-import { Duplex } from "node:stream";
 import type { Socket } from "node:net";
+import { Duplex } from "node:stream";
+import { Types, Utils } from "@meshtastic/core";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
 import { runTransportContract } from "../../../tests/utils/transportContract";
 import { TransportNode } from "./transport";
-import { Utils, Types } from "@meshtastic/core";
 
 function isStatusEvent(
   out: Types.DeviceOutput | undefined,
@@ -71,9 +71,7 @@ function stubCoreTransforms() {
     toDevice as unknown as typeof Utils.toDeviceStream,
   );
 
-  vi
+  vi.spyOn(Utils, "fromDeviceStream").mockImplementation(
-    .spyOn(Utils, "fromDeviceStream")
-    .mockImplementation(
     () =>
       fromDeviceFactory() as unknown as TransformStream<
         Uint8Array,
@@ -112,9 +110,9 @@ describe("TransportNode (contract)", () => {
       return transport;
     },
     pushIncoming: async (bytes) => {
-      (globalThis as unknown as { __nodeSock: FakeSocket }).__nodeSock.pushIncoming(
+      (
-        bytes,
+        globalThis as unknown as { __nodeSock: FakeSocket }
-      );
+      ).__nodeSock.pushIncoming(bytes);
       await Promise.resolve();
     },
     assertLastWritten: (bytes) => {
@@ -124,9 +122,9 @@ describe("TransportNode (contract)", () => {
       expect(sock.lastWritten).toEqual(bytes);
     },
     triggerDisconnect: async () => {
-      (globalThis as unknown as { __nodeSock: FakeSocket }).__nodeSock.emitErrorOnce(
+      (
-        "test-disconnect",
+        globalThis as unknown as { __nodeSock: FakeSocket }
-      );
+      ).__nodeSock.emitErrorOnce("test-disconnect");
       await Promise.resolve();
     },
   });
@@ -182,5 +180,4 @@ describe("TransportNode (extras)", () => {
     reader.releaseLock();
     await transport.disconnect();
   });
-
 });

packages/web/src/components/Dialog/DeleteMessagesDialog/DeleteMessagesDialog.test.tsx

@@ -1,8 +1,7 @@
 import { DeleteMessagesDialog } from "@components/Dialog/DeleteMessagesDialog/DeleteMessagesDialog.tsx";
+import { useMessageStore } from "@core/stores";
 import { fireEvent, render, screen } from "@testing-library/react";
 import { beforeEach, describe, expect, it, vi } from "vitest";
-// Ensure the path is correct for import
-import { useMessageStore } from "@core/stores";
 
 vi.mock("@core/stores", () => ({
   useMessageStore: vi.fn(() => ({

packages/web/src/components/Dialog/RebootDialog.test.tsx

@@ -1,4 +1,4 @@
-import { fireEvent, render, screen, act } from "@testing-library/react";
+import { act, fireEvent, render, screen } from "@testing-library/react";
 import type {
   ButtonHTMLAttributes,
   ClassAttributes,
@@ -11,10 +11,12 @@ import { RebootDialog } from "./RebootDialog.tsx";
 
 const rebootMock = vi.fn();
 const rebootOtaMock = vi.fn();
-let mockConnection: { 
+let mockConnection:
-  rebootOta: (delay: number) => void,
+  | {
-  reboot: (delay: number) => void
+      rebootOta: (delay: number) => void;
- } | undefined = {
+      reboot: (delay: number) => void;
+    }
+  | undefined = {
   reboot: rebootMock,
   rebootOta: rebootOtaMock,
 };
@@ -82,7 +84,9 @@ describe("RebootDialog", () => {
     expect(
       screen.getByRole("heading", { name: /reboot device/i, level: 1 }),
     ).toBeInTheDocument();
-    expect(screen.getByRole("button", { name: /reboot now/i })).toBeInTheDocument();
+    expect(
+      screen.getByRole("button", { name: /reboot now/i }),
+    ).toBeInTheDocument();
   });
 
   it("calls correct reboot function based on OTA checkbox state", () => {
@@ -142,7 +146,6 @@ describe("RebootDialog", () => {
     });
 
     expect(onOpenChangeMock).toHaveBeenCalledWith(false);
-
   });
 
   it("triggers an instant reboot", async () => {
@@ -196,6 +199,8 @@ describe("RebootDialog", () => {
       fireEvent.click(screen.getByRole("button", { name: /cancel/i }));
     });
     expect(rebootMock).toHaveBeenCalledWith(-1);
-    expect(screen.queryByText(/reboot has been scheduled/i)).not.toBeInTheDocument();
+    expect(
+      screen.queryByText(/reboot has been scheduled/i),
+    ).not.toBeInTheDocument();
   });
 });

packages/web/src/components/Dialog/RefreshKeysDialog/RefreshKeysDialog.test.tsx

@@ -1,11 +1,17 @@
-import { CurrentDeviceContext, useDeviceStore, useMessageStore } from "@core/stores";
+import {
+  CurrentDeviceContext,
+  useDeviceStore,
+  useMessageStore,
+} from "@core/stores";
 import { render } from "@testing-library/react";
 import { afterEach, beforeEach, expect, test, vi } from "vitest";
 import { RefreshKeysDialog } from "./RefreshKeysDialog.tsx";
 import { useRefreshKeysDialog } from "./useRefreshKeysDialog.ts";
 
 vi.mock("@core/stores", async () => {
-  const actual = (await vi.importActual("@core/stores")) as typeof import("@core/stores");
+  const actual = (await vi.importActual(
+    "@core/stores",
+  )) as typeof import("@core/stores");
   return {
     ...actual,
     useMessageStore: vi.fn(),

packages/web/src/components/PageComponents/Messages/TraceRoute.test.tsx

@@ -1,6 +1,6 @@
 import { TraceRoute } from "@components/PageComponents/Messages/TraceRoute.tsx";
-import { mockNodeDBStore } from "@core/stores/nodeDBStore/nodeDBStore.mock.ts";
 import { useNodeDB } from "@core/stores";
+import { mockNodeDBStore } from "@core/stores/nodeDBStore/nodeDBStore.mock.ts";
 import { Protobuf } from "@meshtastic/core";
 import { render, screen } from "@testing-library/react";
 import { beforeEach, describe, expect, it, vi } from "vitest";
@@ -64,7 +64,6 @@ describe("TraceRoute", () => {
   ]);
 
   beforeEach(() => {
-
     vi.resetAllMocks();
     vi.mocked(useNodeDB).mockReturnValue({
       ...mockNodeDBStore,

packages/web/src/components/UI/Checkbox/Checkbox.test.tsx

@@ -58,7 +58,9 @@ describe("Checkbox", () => {
 
   it("controlled: reflects external prop changes after onChange", () => {
     const onChange = vi.fn();
-    const { rerender } = render(<Checkbox checked={false} onChange={onChange} />);
+    const { rerender } = render(
+      <Checkbox checked={false} onChange={onChange} />,
+    );
 
     const checkbox = screen.getByRole("checkbox");
     const presentation = screen.getByRole("presentation");
@@ -79,7 +81,9 @@ describe("Checkbox", () => {
 
   it("renders children inside the label", () => {
     render(<Checkbox>Test Label</Checkbox>);
-    expect(screen.getByTestId("label-component")).toHaveTextContent("Test Label");
+    expect(screen.getByTestId("label-component")).toHaveTextContent(
+      "Test Label",
+    );
   });
 
   it("applies custom className to wrapper label", () => {
@@ -112,7 +116,10 @@ describe("Checkbox", () => {
 
   it("passes through additional props to the input", () => {
     render(<Checkbox data-testid="extra-prop" />);
-    expect(screen.getByRole("checkbox")).toHaveAttribute("data-testid", "extra-prop");
+    expect(screen.getByRole("checkbox")).toHaveAttribute(
+      "data-testid",
+      "extra-prop",
+    );
   });
 
   it("uncontrolled: toggles checked state when clicking the visual box", () => {

packages/web/src/core/hooks/useToast.test.tsx

@@ -28,7 +28,7 @@ describe("useToast", () => {
       vi.runAllTimers();
     });
 
-    const toast = result.current.toasts[0];
+    const toast = result.current.toasts[0]!;
     expect(result.current.toasts.length).toBe(1);
     expect(toast.title).toBe("Backup Reminder");
     expect(toast.description).toBe("Don't forget to backup!");

packages/web/src/core/stores/utils/indexDB.test.ts

@@ -1,5 +1,5 @@
-import { beforeEach, describe, expect, it, vi } from "vitest";
 import * as idb from "idb-keyval";
+import { beforeEach, describe, expect, it, vi } from "vitest";
 import { createStorage } from "./indexDB";
 
 type PersistStorage<T> = ReturnType<typeof createStorage<T>>;