-
-
-
- Details:
-
-
- Hardware:{" "}
- {Protobuf.Mesh.HardwareModel[device.user?.hwModel ?? 0]}
-
-
Node Number: {device.num}
-
Node HEX: !{numberToHexUnpadded(device.num)}
-
- Role:{" "}
- {
- Protobuf.Config.Config_DeviceConfig_Role[
- device.user?.role ?? 0
- ]
- }
-
-
- Last Heard:{" "}
- {device.lastHeard === 0 ? (
- "Never"
- ) : (
-
- )}
-
-
-
- {device.position ? (
-
+ return device
+ ? (
+
+
+
+
+ )
+ : null;
};
diff --git a/src/components/Dialog/NodeOptionsDialog.tsx b/src/components/Dialog/NodeOptionsDialog.tsx
index d62e4065..d95ea7ab 100644
--- a/src/components/Dialog/NodeOptionsDialog.tsx
+++ b/src/components/Dialog/NodeOptionsDialog.tsx
@@ -7,7 +7,7 @@ import {
DialogHeader,
DialogTitle,
} from "@components/UI/Dialog";
-import type { Protobuf } from "@meshtastic/js";
+import type { Protobuf } from "@meshtastic/core";
import { numberToHexUnpadded } from "@noble/curves/abstract/utils";
import { TrashIcon } from "lucide-react";
import type { JSX } from "react";
@@ -31,11 +31,9 @@ export const NodeOptionsDialog = ({
setChatType,
setActiveChat,
} = useAppStore();
- const longName =
- node?.user?.longName ??
+ const longName = node?.user?.longName ??
(node ? `!${numberToHexUnpadded(node?.num)}` : "Unknown");
- const shortName =
- node?.user?.shortName ??
+ const shortName = node?.user?.shortName ??
(node ? `${numberToHexUnpadded(node?.num).substring(0, 4)}` : "UNK");
function handleDirectMessage() {
@@ -53,7 +51,7 @@ export const NodeOptionsDialog = ({
connection?.requestPosition(node.num).then(() =>
toast({
title: "Position request sent.",
- }),
+ })
);
onOpenChange();
}
@@ -66,7 +64,7 @@ export const NodeOptionsDialog = ({
connection?.traceRoute(node.num).then(() =>
toast({
title: "Traceroute sent.",
- }),
+ })
);
onOpenChange();
}
diff --git a/src/components/Dialog/QRDialog.tsx b/src/components/Dialog/QRDialog.tsx
index 4b612a8d..751b6f69 100644
--- a/src/components/Dialog/QRDialog.tsx
+++ b/src/components/Dialog/QRDialog.tsx
@@ -10,7 +10,7 @@ import {
} from "@components/UI/Dialog.tsx";
import { Input } from "@components/UI/Input.tsx";
import { Label } from "@components/UI/Label.tsx";
-import { Protobuf, type Types } from "@meshtastic/js";
+import { Protobuf, type Types } from "@meshtastic/core";
import { fromByteArray } from "base64-js";
import { ClipboardIcon } from "lucide-react";
import { useEffect, useMemo, useState } from "react";
@@ -77,8 +77,8 @@ export const QRDialog = ({
{channel.settings?.name.length
? channel.settings.name
: channel.role === Protobuf.Channel.Channel_Role.PRIMARY
- ? "Primary"
- : `Channel: ${channel.index}`}
+ ? "Primary"
+ : `Channel: ${channel.index}`}
{
if (selectedChannels.includes(channel.index)) {
setSelectedChannels(
- selectedChannels.filter((c) => c !== channel.index),
+ selectedChannels.filter((c) =>
+ c !== channel.index
+ ),
);
} else {
setSelectedChannels([
diff --git a/src/components/Dialog/TracerouteResponseDialog.tsx b/src/components/Dialog/TracerouteResponseDialog.tsx
index 9fce1cfa..7e97fb81 100644
--- a/src/components/Dialog/TracerouteResponseDialog.tsx
+++ b/src/components/Dialog/TracerouteResponseDialog.tsx
@@ -6,7 +6,7 @@ import {
DialogHeader,
DialogTitle,
} from "@components/UI/Dialog";
-import type { Protobuf, Types } from "@meshtastic/js";
+import type { Protobuf, Types } from "@meshtastic/core";
import { numberToHexUnpadded } from "@noble/curves/abstract/utils";
import type { JSX } from "react";
import { TraceRoute } from "../PageComponents/Messages/TraceRoute";
@@ -28,11 +28,9 @@ export const TracerouteResponseDialog = ({
const snrTowards = traceroute?.data.snrTowards ?? [];
const snrBack = traceroute?.data.snrBack ?? [];
const from = nodes.get(traceroute?.from ?? 0);
- const longName =
- from?.user?.longName ??
+ const longName = from?.user?.longName ??
(from ? `!${numberToHexUnpadded(from?.num)}` : "Unknown");
- const shortName =
- from?.user?.shortName ??
+ const shortName = from?.user?.shortName ??
(from ? `${numberToHexUnpadded(from?.num).substring(0, 4)}` : "UNK");
const to = nodes.get(traceroute?.to ?? 0);
return (
diff --git a/src/components/PageComponents/Channel.tsx b/src/components/PageComponents/Channel.tsx
index f3c7a1df..53e9c68f 100644
--- a/src/components/PageComponents/Channel.tsx
+++ b/src/components/PageComponents/Channel.tsx
@@ -3,7 +3,7 @@ import { create } from "@bufbuild/protobuf";
import { DynamicForm } from "@components/Form/DynamicForm.tsx";
import { useToast } from "@core/hooks/useToast.ts";
import { useDevice } from "@core/stores/deviceStore.ts";
-import { Protobuf } from "@meshtastic/js";
+import { Protobuf } from "@meshtastic/core";
import { fromByteArray, toByteArray } from "base64-js";
import cryptoRandomString from "crypto-random-string";
import { useState } from "react";
@@ -24,8 +24,9 @@ export const Channel = ({ channel }: SettingsPanelProps): JSX.Element => {
channel?.settings?.psk.length ?? 16,
);
const [validationText, setValidationText] = useState();
- const [preSharedDialogOpen, setPreSharedDialogOpen] =
- useState(false);
+ const [preSharedDialogOpen, setPreSharedDialogOpen] = useState(
+ false,
+ );
const onSubmit = (data: ChannelValidation) => {
const channel = create(Protobuf.Channel.ChannelSchema, {
@@ -107,7 +108,7 @@ export const Channel = ({ channel }: SettingsPanelProps): JSX.Element => {
channel?.settings?.moduleSettings?.positionPrecision === 32,
positionPrecision:
channel?.settings?.moduleSettings?.positionPrecision ===
- undefined
+ undefined
? 10
: channel?.settings?.moduleSettings?.positionPrecision,
},
@@ -126,10 +127,9 @@ export const Channel = ({ channel }: SettingsPanelProps): JSX.Element => {
description:
"Device telemetry is sent over PRIMARY. Only one PRIMARY allowed",
properties: {
- enumValue:
- channel.index === 0
- ? { PRIMARY: 1 }
- : { DISABLED: 0, SECONDARY: 2 },
+ enumValue: channel.index === 0
+ ? { PRIMARY: 1 }
+ : { DISABLED: 0, SECONDARY: 2 },
},
},
{
@@ -192,32 +192,31 @@ export const Channel = ({ channel }: SettingsPanelProps): JSX.Element => {
description:
"If not sharing precise location, position shared on channel will be accurate within this distance",
properties: {
- enumValue:
- config.display?.units === 0
- ? {
- "Within 23 km": 10,
- "Within 12 km": 11,
- "Within 5.8 km": 12,
- "Within 2.9 km": 13,
- "Within 1.5 km": 14,
- "Within 700 m": 15,
- "Within 350 m": 16,
- "Within 200 m": 17,
- "Within 90 m": 18,
- "Within 50 m": 19,
- }
- : {
- "Within 15 miles": 10,
- "Within 7.3 miles": 11,
- "Within 3.6 miles": 12,
- "Within 1.8 miles": 13,
- "Within 0.9 miles": 14,
- "Within 0.5 miles": 15,
- "Within 0.2 miles": 16,
- "Within 600 feet": 17,
- "Within 300 feet": 18,
- "Within 150 feet": 19,
- },
+ enumValue: config.display?.units === 0
+ ? {
+ "Within 23 km": 10,
+ "Within 12 km": 11,
+ "Within 5.8 km": 12,
+ "Within 2.9 km": 13,
+ "Within 1.5 km": 14,
+ "Within 700 m": 15,
+ "Within 350 m": 16,
+ "Within 200 m": 17,
+ "Within 90 m": 18,
+ "Within 50 m": 19,
+ }
+ : {
+ "Within 15 miles": 10,
+ "Within 7.3 miles": 11,
+ "Within 3.6 miles": 12,
+ "Within 1.8 miles": 13,
+ "Within 0.9 miles": 14,
+ "Within 0.5 miles": 15,
+ "Within 0.2 miles": 16,
+ "Within 600 feet": 17,
+ "Within 300 feet": 18,
+ "Within 150 feet": 19,
+ },
},
},
],
diff --git a/src/components/PageComponents/Config/Bluetooth.tsx b/src/components/PageComponents/Config/Bluetooth.tsx
index 362606bb..97f137b1 100644
--- a/src/components/PageComponents/Config/Bluetooth.tsx
+++ b/src/components/PageComponents/Config/Bluetooth.tsx
@@ -3,7 +3,7 @@ import type { BluetoothValidation } from "@app/validation/config/bluetooth.tsx";
import { create } from "@bufbuild/protobuf";
import { DynamicForm } from "@components/Form/DynamicForm.tsx";
import { useDevice } from "@core/stores/deviceStore.ts";
-import { Protobuf } from "@meshtastic/js";
+import { Protobuf } from "@meshtastic/core";
import { useState } from "react";
export const Bluetooth = () => {
@@ -111,9 +111,8 @@ export const Bluetooth = () => {
disabledBy: [
{
fieldName: "mode",
- selector:
- Protobuf.Config.Config_BluetoothConfig_PairingMode
- .FIXED_PIN,
+ selector: Protobuf.Config.Config_BluetoothConfig_PairingMode
+ .FIXED_PIN,
invert: true,
},
{
diff --git a/src/components/PageComponents/Config/Device.tsx b/src/components/PageComponents/Config/Device.tsx
index c06fe178..30629bed 100644
--- a/src/components/PageComponents/Config/Device.tsx
+++ b/src/components/PageComponents/Config/Device.tsx
@@ -2,7 +2,7 @@ import type { DeviceValidation } from "@app/validation/config/device.tsx";
import { create } from "@bufbuild/protobuf";
import { DynamicForm } from "@components/Form/DynamicForm.tsx";
import { useDevice } from "@core/stores/deviceStore.ts";
-import { Protobuf } from "@meshtastic/js";
+import { Protobuf } from "@meshtastic/core";
export const Device = (): JSX.Element => {
const { config, setWorkingConfig } = useDevice();
diff --git a/src/components/PageComponents/Config/Display.tsx b/src/components/PageComponents/Config/Display.tsx
index 64b5b368..e0d1e671 100644
--- a/src/components/PageComponents/Config/Display.tsx
+++ b/src/components/PageComponents/Config/Display.tsx
@@ -2,7 +2,7 @@ import type { DisplayValidation } from "@app/validation/config/display.tsx";
import { create } from "@bufbuild/protobuf";
import { DynamicForm } from "@components/Form/DynamicForm.tsx";
import { useDevice } from "@core/stores/deviceStore.ts";
-import { Protobuf } from "@meshtastic/js";
+import { Protobuf } from "@meshtastic/core";
export const Display = (): JSX.Element => {
const { config, setWorkingConfig } = useDevice();
diff --git a/src/components/PageComponents/Config/LoRa.tsx b/src/components/PageComponents/Config/LoRa.tsx
index 8dfb81c9..c1f3aa47 100644
--- a/src/components/PageComponents/Config/LoRa.tsx
+++ b/src/components/PageComponents/Config/LoRa.tsx
@@ -2,7 +2,7 @@ import type { LoRaValidation } from "@app/validation/config/lora.tsx";
import { create } from "@bufbuild/protobuf";
import { DynamicForm } from "@components/Form/DynamicForm.tsx";
import { useDevice } from "@core/stores/deviceStore.ts";
-import { Protobuf } from "@meshtastic/js";
+import { Protobuf } from "@meshtastic/core";
export const LoRa = (): JSX.Element => {
const { config, setWorkingConfig } = useDevice();
diff --git a/src/components/PageComponents/Config/Network.tsx b/src/components/PageComponents/Config/Network.tsx
index 76f1d54d..42d724d8 100644
--- a/src/components/PageComponents/Config/Network.tsx
+++ b/src/components/PageComponents/Config/Network.tsx
@@ -6,7 +6,7 @@ import {
convertIntToIpAddress,
convertIpAddressToInt,
} from "@core/utils/ip.ts";
-import { Protobuf } from "@meshtastic/js";
+import { Protobuf } from "@meshtastic/core";
export const Network = (): JSX.Element => {
const { config, setWorkingConfig } = useDevice();
diff --git a/src/components/PageComponents/Config/Position.tsx b/src/components/PageComponents/Config/Position.tsx
index 4aa3abba..8d1992cc 100644
--- a/src/components/PageComponents/Config/Position.tsx
+++ b/src/components/PageComponents/Config/Position.tsx
@@ -6,7 +6,7 @@ import type { PositionValidation } from "@app/validation/config/position.tsx";
import { create } from "@bufbuild/protobuf";
import { DynamicForm } from "@components/Form/DynamicForm.tsx";
import { useDevice } from "@core/stores/deviceStore.ts";
-import { Protobuf } from "@meshtastic/js";
+import { Protobuf } from "@meshtastic/core";
import { useCallback } from "react";
export const Position = () => {
diff --git a/src/components/PageComponents/Config/Power.tsx b/src/components/PageComponents/Config/Power.tsx
index e49d7ff6..b1e389c6 100644
--- a/src/components/PageComponents/Config/Power.tsx
+++ b/src/components/PageComponents/Config/Power.tsx
@@ -2,7 +2,7 @@ import type { PowerValidation } from "@app/validation/config/power.tsx";
import { create } from "@bufbuild/protobuf";
import { DynamicForm } from "@components/Form/DynamicForm.tsx";
import { useDevice } from "@core/stores/deviceStore.ts";
-import { Protobuf } from "@meshtastic/js";
+import { Protobuf } from "@meshtastic/core";
export const Power = (): JSX.Element => {
const { config, setWorkingConfig } = useDevice();
diff --git a/src/components/PageComponents/Config/Security/Security.tsx b/src/components/PageComponents/Config/Security/Security.tsx
index 7aee9907..c1468efc 100644
--- a/src/components/PageComponents/Config/Security/Security.tsx
+++ b/src/components/PageComponents/Config/Security/Security.tsx
@@ -8,7 +8,7 @@ import {
import type { SecurityValidation } from "@app/validation/config/security.tsx";
import { create } from "@bufbuild/protobuf";
import { useDevice } from "@core/stores/deviceStore.ts";
-import { Protobuf } from "@meshtastic/js";
+import { Protobuf } from "@meshtastic/core";
import { fromByteArray, toByteArray } from "base64-js";
import { Eye, EyeOff } from "lucide-react";
import { useReducer } from "react";
diff --git a/src/components/PageComponents/Connect/Serial.tsx b/src/components/PageComponents/Connect/Serial.tsx
index 529b8c3d..f5288403 100644
--- a/src/components/PageComponents/Connect/Serial.tsx
+++ b/src/components/PageComponents/Connect/Serial.tsx
@@ -5,7 +5,8 @@ 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 { SerialConnection } from "@meshtastic/js";
+import { MeshDevice } from "@meshtastic/core";
+import { TransportWebSerial } from "@meshtastic/transport-web-serial";
import { useCallback, useEffect, useState } from "react";
export const Serial = ({ closeDialog }: TabElementProps): JSX.Element => {
@@ -31,14 +32,9 @@ export const Serial = ({ closeDialog }: TabElementProps): JSX.Element => {
const id = randId();
const device = addDevice(id);
setSelectedDevice(id);
- const connection = new SerialConnection(id);
- await connection
- .connect({
- port,
- baudRate: undefined,
- concurrentLogOutput: true,
- })
- .catch((e: Error) => console.log(`Unable to Connect: ${e.message}`));
+ const transport = await TransportWebSerial.createFromPort(port);
+ const connection = new MeshDevice(transport, id);
+ connection.configure();
device.addConnection(connection);
subscribeAll(device, connection);
diff --git a/src/components/PageComponents/Map/NodeDetail.tsx b/src/components/PageComponents/Map/NodeDetail.tsx
index e89dcd1b..7342bdf0 100644
--- a/src/components/PageComponents/Map/NodeDetail.tsx
+++ b/src/components/PageComponents/Map/NodeDetail.tsx
@@ -5,8 +5,8 @@ import { formatQuantity } from "@app/core/utils/string";
import { Avatar } from "@components/UI/Avatar";
import { Mono } from "@components/generic/Mono.tsx";
import { TimeAgo } from "@components/generic/TimeAgo.tsx";
-import { Protobuf } from "@meshtastic/js";
-import type { Protobuf as ProtobufType } from "@meshtastic/js";
+import { Protobuf } from "@meshtastic/core";
+import type { Protobuf as ProtobufType } from "@meshtastic/core";
import { numberToHexUnpadded } from "@noble/curves/abstract/utils";
import {
BatteryChargingIcon,
@@ -37,21 +37,23 @@ export const NodeDetail = ({ node }: NodeDetailProps) => {
- {node.user?.publicKey && node.user?.publicKey.length > 0 ? (
-
- ) : (
-
- )}
+ {node.user?.publicKey && node.user?.publicKey.length > 0
+ ? (
+
+ )
+ : (
+
+ )}
{
node.deviceMetrics?.voltage?.toPrecision(3) ?? "Unknown"
} volts`}
>
- {node.deviceMetrics?.batteryLevel > 100 ? (
-
- ) : node.deviceMetrics?.batteryLevel > 80 ? (
-
- ) : node.deviceMetrics?.batteryLevel > 20 ? (
-
- ) : (
-
- )}
+ {node.deviceMetrics?.batteryLevel > 100
+ ?
+ : node.deviceMetrics?.batteryLevel > 80
+ ?
+ : node.deviceMetrics?.batteryLevel > 20
+ ?
+ : }
{node.deviceMetrics?.batteryLevel > 100
? "Charging"
diff --git a/src/components/PageComponents/Messages/ChannelChat.tsx b/src/components/PageComponents/Messages/ChannelChat.tsx
index a5231496..7969782b 100644
--- a/src/components/PageComponents/Messages/ChannelChat.tsx
+++ b/src/components/PageComponents/Messages/ChannelChat.tsx
@@ -4,7 +4,7 @@ import {
} from "@app/core/stores/deviceStore.ts";
import { Message } from "@components/PageComponents/Messages/Message.tsx";
import { MessageInput } from "@components/PageComponents/Messages/MessageInput.tsx";
-import type { Types } from "@meshtastic/js";
+import type { Types } from "@meshtastic/core";
import { InboxIcon } from "lucide-react";
import { useCallback, useEffect, useRef } from "react";
import type { JSX } from "react";
@@ -34,8 +34,7 @@ export const ChannelChat = ({
const scrollToBottom = useCallback(() => {
const scrollContainer = scrollContainerRef.current;
if (scrollContainer) {
- const isNearBottom =
- scrollContainer.scrollHeight -
+ const isNearBottom = scrollContainer.scrollHeight -
scrollContainer.scrollTop -
scrollContainer.clientHeight <
100;
@@ -72,9 +71,8 @@ export const ChannelChat = ({
key={message.id}
message={message}
sender={nodes.get(message.from)}
- lastMsgSameUser={
- index > 0 && messages[index - 1].from === message.from
- }
+ lastMsgSameUser={index > 0 &&
+ messages[index - 1].from === message.from}
/>
);
})}
diff --git a/src/components/PageComponents/Messages/Message.tsx b/src/components/PageComponents/Messages/Message.tsx
index 6c6fa79a..17b659b2 100644
--- a/src/components/PageComponents/Messages/Message.tsx
+++ b/src/components/PageComponents/Messages/Message.tsx
@@ -12,7 +12,7 @@ import {
} from "@app/core/stores/deviceStore.ts";
import { cn } from "@app/core/utils/cn";
import { Avatar } from "@components/UI/Avatar";
-import type { Protobuf } from "@meshtastic/js";
+import type { Protobuf } from "@meshtastic/core";
import { AlertCircle, CheckCircle2, CircleEllipsis } from "lucide-react";
import type { LucideIcon } from "lucide-react";
import { useMemo } from "react";
diff --git a/src/components/PageComponents/Messages/MessageInput.tsx b/src/components/PageComponents/Messages/MessageInput.tsx
index 1e4887cd..c91612be 100644
--- a/src/components/PageComponents/Messages/MessageInput.tsx
+++ b/src/components/PageComponents/Messages/MessageInput.tsx
@@ -2,7 +2,7 @@ import { debounce } from "@app/core/utils/debounce";
import { Button } from "@components/UI/Button.tsx";
import { Input } from "@components/UI/Input.tsx";
import { useDevice } from "@core/stores/deviceStore.ts";
-import type { Types } from "@meshtastic/js";
+import type { Types } from "@meshtastic/core";
import { SendIcon } from "lucide-react";
import {
type JSX,
@@ -51,7 +51,7 @@ export const MessageInput = ({
myNodeNum,
id,
"ack",
- ),
+ )
)
.catch((e: Types.PacketError) =>
setMessageState(
@@ -61,7 +61,7 @@ export const MessageInput = ({
myNodeNum,
e.id,
e.error,
- ),
+ )
);
},
[channel, connection, myNodeNum, setMessageState, to],
diff --git a/src/components/PageComponents/Messages/TraceRoute.tsx b/src/components/PageComponents/Messages/TraceRoute.tsx
index 2c9e813a..aa5580a8 100644
--- a/src/components/PageComponents/Messages/TraceRoute.tsx
+++ b/src/components/PageComponents/Messages/TraceRoute.tsx
@@ -1,5 +1,5 @@
import { useDevice } from "@app/core/stores/deviceStore.ts";
-import type { Protobuf } from "@meshtastic/js";
+import type { Protobuf } from "@meshtastic/core";
import { numberToHexUnpadded } from "@noble/curves/abstract/utils";
import type { JSX } from "react";
@@ -38,23 +38,25 @@ export const TraceRoute = ({
))}
{from?.user?.longName}
- {routeBack ? (
-
- Route back:
- {from?.user?.longName}
- ↓ {snrBack?.[0] ? snrBack[0] : "??"}dB
- {routeBack.map((hop, i) => (
-
-
- {nodes.get(hop)?.user?.longName ??
- `!${numberToHexUnpadded(hop)}`}
-
- ↓ {snrBack?.[i + 1] ? snrBack[i + 1] : "??"}dB
-
- ))}
- {to?.user?.longName}
-
- ) : null}
+ {routeBack
+ ? (
+
+ Route back:
+ {from?.user?.longName}
+ ↓ {snrBack?.[0] ? snrBack[0] : "??"}dB
+ {routeBack.map((hop, i) => (
+
+
+ {nodes.get(hop)?.user?.longName ??
+ `!${numberToHexUnpadded(hop)}`}
+
+ ↓ {snrBack?.[i + 1] ? snrBack[i + 1] : "??"}dB
+
+ ))}
+ {to?.user?.longName}
+
+ )
+ : null}