Merge branch 'main' into config-reset-work

package.json

@@ -36,10 +36,9 @@
   "dependencies": {
     "@bufbuild/protobuf": "^2.2.5",
     "@meshtastic/core": "npm:@jsr/[email protected]",
-    "@meshtastic/js": "npm:@jsr/[email protected]",
+    "@meshtastic/transport-http": "npm:@jsr/[email protected]",
-    "@meshtastic/transport-http": "npm:@jsr/meshtastic__transport-http",
+    "@meshtastic/transport-web-bluetooth": "npm:@jsr/[email protected]",
-    "@meshtastic/transport-web-bluetooth": "npm:@jsr/meshtastic__transport-web-bluetooth",
+    "@meshtastic/transport-web-serial": "npm:@jsr/[email protected]",
-    "@meshtastic/transport-web-serial": "npm:@jsr/meshtastic__transport-web-serial",
     "@noble/curves": "^1.9.0",
     "@radix-ui/react-accordion": "^1.2.8",
     "@radix-ui/react-checkbox": "^1.2.3",

src/components/Dialog/UnsafeRolesDialog/UnsafeRolesDialog.test.tsx

@@ -34,7 +34,7 @@ describe.skip("UnsafeRolesDialog", () => {
 
   it("renders the dialog when open is true", () => {
     renderWithProviders(
-      <UnsafeRolesDialog open={true} onOpenChange={vi.fn()} />,
+      <UnsafeRolesDialog open onOpenChange={vi.fn()} />,
     );
 
     const dialog = screen.getByRole("dialog");
@@ -52,7 +52,7 @@ describe.skip("UnsafeRolesDialog", () => {
 
   it("displays the correct links", () => {
     renderWithProviders(
-      <UnsafeRolesDialog open={true} onOpenChange={vi.fn()} />,
+      <UnsafeRolesDialog open onOpenChange={vi.fn()} />,
     );
 
     const docLink = screen.getByRole("link", {
@@ -74,7 +74,7 @@ describe.skip("UnsafeRolesDialog", () => {
 
   it("does not allow confirmation until checkbox is checked", () => {
     renderWithProviders(
-      <UnsafeRolesDialog open={true} onOpenChange={vi.fn()} />,
+      <UnsafeRolesDialog open onOpenChange={vi.fn()} />,
     );
 
     const confirmButton = screen.getByRole("button", { name: /confirm/i });
@@ -90,7 +90,7 @@ describe.skip("UnsafeRolesDialog", () => {
   it("emits the correct event when closing via close button", () => {
     const eventSpy = vi.spyOn(eventBus, "emit");
     renderWithProviders(
-      <UnsafeRolesDialog open={true} onOpenChange={vi.fn()} />,
+      <UnsafeRolesDialog open onOpenChange={vi.fn()} />,
     );
 
     const dismissButton = screen.getByRole("button", { name: /close/i });
@@ -104,7 +104,7 @@ describe.skip("UnsafeRolesDialog", () => {
   it("emits the correct event when dismissing", () => {
     const eventSpy = vi.spyOn(eventBus, "emit");
     renderWithProviders(
-      <UnsafeRolesDialog open={true} onOpenChange={vi.fn()} />,
+      <UnsafeRolesDialog open onOpenChange={vi.fn()} />,
     );
 
     const dismissButton = screen.getByRole("button", { name: /dismiss/i });
@@ -118,7 +118,7 @@ describe.skip("UnsafeRolesDialog", () => {
   it("emits the correct event when confirming", () => {
     const eventSpy = vi.spyOn(eventBus, "emit");
     renderWithProviders(
-      <UnsafeRolesDialog open={true} onOpenChange={vi.fn()} />,
+      <UnsafeRolesDialog open onOpenChange={vi.fn()} />,
     );
 
     const checkbox = screen.getByRole("checkbox");

src/components/Form/DynamicForm.test.tsx

@@ -3,6 +3,7 @@ import { fireEvent, render, screen, waitFor } from "@core/utils/test.tsx";
 import { DynamicForm } from "./DynamicForm.tsx";
 import { z } from "zod/v4";
 import { useAppStore } from "@core/stores/appStore.ts";
+import userEvent from "@testing-library/user-event";
 
 vi.mock("react-i18next", () => ({
   useTranslation: () => ({
@@ -20,7 +21,7 @@ vi.mock("@core/stores/appStore.ts", () => ({
   }),
 }));
 
-describe("DynamicForm", () => {
+describe.skip("DynamicForm", () => {
   const schema = z.object({
     name: z.string().min(3, { message: "Too short" }),
   });
@@ -116,7 +117,10 @@ describe("DynamicForm", () => {
   });
 
   it("renders a button and only calls onSubmit on click with submitType='onSubmit'", async () => {
+    // Use the userEvent setup
+    const user = userEvent.setup();
     const onSubmit = vi.fn();
+
     render(
       <DynamicForm<z.infer<typeof schema>>
         onSubmit={onSubmit}
@@ -128,23 +132,29 @@ describe("DynamicForm", () => {
       />,
     );
 
-    const btn = screen.getByRole("button", { name: /submit/i });
+    const nameInput = screen.getByLabelText("Name");
-    expect(btn).toBeInTheDocument();
+    const submitButton = screen.getByRole("button", { name: /submit/i });
+
+    expect(submitButton).toBeInTheDocument();
+    await user.type(nameInput, "ab");
 
-    fireEvent.input(screen.getByLabelText("Name"), { target: { value: "ab" } });
+    expect(await screen.findByText("formValidation.tooSmall.string"))
-    await screen.findByText("formValidation.tooSmall.string");
+      .toBeInTheDocument();
-    fireEvent.click(btn);
+    await user.click(submitButton);
     expect(onSubmit).not.toHaveBeenCalled();
 
-    fireEvent.input(screen.getByLabelText("Name"), {
+    await user.clear(nameInput);
-      target: { value: "abcd" },
+    await user.type(nameInput, "abcd");
+
+    await waitFor(() => {
+      expect(screen.queryByText("formValidation.tooSmall.string")).not
+        .toBeInTheDocument();
+    });
+    await user.click(submitButton);
+    await waitFor(() => {
+      expect(onSubmit).toHaveBeenCalledTimes(1);
     });
-    await waitFor(() =>
-      expect(screen.queryByText("formValidation.tooSmall.string")).toBeNull()
-    );
-    fireEvent.click(btn);
 
-    await waitFor(() => expect(onSubmit).toHaveBeenCalledTimes(1));
     expect(onSubmit).toHaveBeenCalledWith({ name: "abcd" }, expect.any(Object));
   });
 

src/components/PageComponents/Config/Network/Network.test.tsx

@@ -109,8 +109,6 @@ describe("Network component", () => {
   it("should enable SSID and PSK when wifi is toggled on", async () => {
     render(<Network />);
     const toggle = screen.getByLabelText("WiFi Enabled");
-    screen.debug();
-
     fireEvent.click(toggle); // turns wifiEnabled = true
 
     await waitFor(() => {

src/components/PageComponents/Connect/BLE.tsx

@@ -5,9 +5,10 @@ import { useAppStore } from "@core/stores/appStore.ts";
 import { useDeviceStore } from "@core/stores/deviceStore.ts";
 import { subscribeAll } from "@core/subscriptions.ts";
 import { randId } from "@core/utils/randId.ts";
-import { BleConnection, ServiceUuid } from "@meshtastic/js";
+import { TransportWebBluetooth } from "@meshtastic/transport-web-bluetooth";
+import { MeshDevice } from "@meshtastic/core";
 import { useCallback, useEffect, useState } from "react";
-import { useMessageStore } from "../../../core/stores/messageStore/index.ts";
+import { useMessageStore } from "@core/stores/messageStore/index.ts";
 import { useTranslation } from "react-i18next";
 
 export const BLE = (
@@ -30,15 +31,13 @@ export const BLE = (
 
   const onConnect = async (bleDevice: BluetoothDevice) => {
     const id = randId();
+    const transport = await TransportWebBluetooth.createFromDevice(bleDevice);
     const device = addDevice(id);
+    const connection = new MeshDevice(transport, id);
+    connection.configure();
     setSelectedDevice(id);
-    const connection = new BleConnection(id);
-    await connection.connect({
-      device: bleDevice,
-    });
     device.addConnection(connection);
     subscribeAll(device, connection, messageStore);
-
     closeDialog();
   };
 
@@ -71,7 +70,7 @@ export const BLE = (
         onClick={async () => {
           await navigator.bluetooth
             .requestDevice({
-              filters: [{ services: [ServiceUuid] }],
+              filters: [{ services: [TransportWebBluetooth.ServiceUuid] }],
             })
             .then((device) => {
               const exists = bleDevices.findIndex((d) => d.id === device.id);

src/components/PageComponents/Messages/MessageItem.tsx

@@ -15,7 +15,7 @@ import {
   MessageState,
   useMessageStore,
 } from "@core/stores/messageStore/index.ts";
-import { Protobuf, Types } from "@meshtastic/js";
+import { Protobuf, Types } from "@meshtastic/core";
 import { Message } from "@core/stores/messageStore/types.ts";
 import { useTranslation } from "react-i18next";
 // import { MessageActionsMenu } from "@components/PageComponents/Messages/MessageActionsMenu.tsx"; // TODO: Uncomment when actions menu is implemented

src/core/dto/PacketToMessageDTO.ts

@@ -1,10 +1,6 @@
-import type { Types } from "@meshtastic/js";
+import type { Types } from "@meshtastic/core";
-import {
+import { MessageState, MessageType } from "@core/stores/messageStore/index.ts";
-  Message,
+import { Message } from "@core/stores/messageStore/types.ts";
-  MessageState,
-  MessageType,
-} from "../stores/messageStore/index.ts";
-
 class PacketToMessageDTO {
   channel: Types.ChannelNumber;
   to: number;

src/pages/Messages.tsx

@@ -140,7 +140,7 @@ export const MessagesPage = () => {
       } else {
         console.warn("sendText completed but messageId is undefined");
       }
-    } catch (e: any) {
+    } catch (e: unknown) {
       console.error("Failed to send message:", e);
       const failedId = messageId ?? randId();
       if (chatType === MessageType.Broadcast) {

src/validation/config/security.test.ts

@@ -86,8 +86,6 @@ describe("ParsedSecuritySchema", () => {
       publicKey: validKey,
       adminKey: [validKey, new Uint8Array(), new Uint8Array()],
     });
-    console.log(result);
-
     expect(result.success).toBe(true);
   });