{row.map((item, index) => (
diff --git a/src/core/hooks/useToast.ts b/src/core/hooks/useToast.ts
index aaca05fa..90b9a1c5 100644
--- a/src/core/hooks/useToast.ts
+++ b/src/core/hooks/useToast.ts
@@ -1,4 +1,4 @@
-import { ReactNode, useEffect, useState } from "react";
+import { type ReactNode, useSyncExternalStore } from "react";
import type { ToastActionElement, ToastProps } from "@components/UI/Toast.js";
@@ -92,9 +92,9 @@ export const reducer = (state: State, action: Action): State => {
if (toastId) {
addToRemoveQueue(toastId);
} else {
- state.toasts.forEach((toast) => {
+ for (const toast of state.toasts) {
addToRemoveQueue(toast.id);
- });
+ }
}
return {
@@ -130,9 +130,9 @@ let memoryState: State = { toasts: [] };
function dispatch(action: Action) {
memoryState = reducer(memoryState, action);
- listeners.forEach((listener) => {
+ for (const listener of listeners) {
listener(memoryState);
- });
+ }
}
type Toast = Omit;
@@ -166,18 +166,22 @@ function toast({ ...props }: Toast) {
};
}
+const subscribe = (listener: () => void) => {
+ listeners.push(listener);
+ return function unsubscribe() {
+ const index = listeners.indexOf(listener);
+ if (index > -1) {
+ listeners.splice(index, 1);
+ }
+ };
+};
+
+const getState = () => {
+ return memoryState;
+};
+
function useToast() {
- const [state, setState] = useState(memoryState);
-
- useEffect(() => {
- listeners.push(setState);
- return () => {
- const index = listeners.indexOf(setState);
- if (index > -1) {
- listeners.splice(index, 1);
- }
- };
- }, [state]);
+ const state = useSyncExternalStore(subscribe, getState);
return {
...state,
diff --git a/src/core/stores/appStore.ts b/src/core/stores/appStore.ts
index ace6565e..315d908d 100644
--- a/src/core/stores/appStore.ts
+++ b/src/core/stores/appStore.ts
@@ -27,6 +27,7 @@ interface AppState {
commandPaletteOpen: boolean;
darkMode: boolean;
notifications: boolean;
+ nodeNumToBeRemoved: number;
accent: AccentColor;
connectDialogOpen: boolean;
@@ -40,6 +41,7 @@ interface AppState {
setCommandPaletteOpen: (open: boolean) => void;
setDarkMode: (enabled: boolean) => void;
setNotifications: (enabled: boolean) => void;
+ setNodeNumToBeRemoved: (nodeNum: number) => void;
setAccent: (color: AccentColor) => void;
setConnectDialogOpen: (open: boolean) => void;
}
@@ -50,10 +52,14 @@ export const useAppStore = create()((set) => ({
currentPage: "messages",
rasterSources: [],
commandPaletteOpen: false,
- darkMode: window.matchMedia("(prefers-color-scheme: dark)").matches,
notifications: true,
+ darkMode:
+ localStorage.getItem("theme-dark") !== null
+ ? localStorage.getItem("theme-dark") === "true"
+ : window.matchMedia("(prefers-color-scheme: dark)").matches,
accent: "orange",
connectDialogOpen: false,
+ nodeNumToBeRemoved: 0,
setRasterSources: (sources: RasterSource[]) => {
set(
@@ -96,6 +102,7 @@ export const useAppStore = create()((set) => ({
);
},
setDarkMode: (enabled: boolean) => {
+ localStorage.setItem("theme-dark", enabled.toString());
set(
produce((draft) => {
draft.darkMode = enabled;
@@ -109,6 +116,10 @@ export const useAppStore = create()((set) => ({
}),
);
},
+ setNodeNumToBeRemoved: (nodeNum) =>
+ set((state) => ({
+ nodeNumToBeRemoved: nodeNum,
+ })),
setAccent(color) {
set(
produce((draft) => {
diff --git a/src/core/stores/deviceStore.ts b/src/core/stores/deviceStore.ts
index fee9fb8f..a716a85b 100644
--- a/src/core/stores/deviceStore.ts
+++ b/src/core/stores/deviceStore.ts
@@ -24,7 +24,8 @@ export type DialogVariant =
| "QR"
| "shutdown"
| "reboot"
- | "deviceName";
+ | "deviceName"
+ | "nodeRemoval";
export interface Device {
id: number;
@@ -41,6 +42,10 @@ export interface Device {
direct: Map;
broadcast: Map;
};
+ traceroutes: Map<
+ number,
+ Types.PacketMetadata[]
+ >;
connection?: Types.ConnectionType;
activePage: Page;
activeNode: number;
@@ -54,6 +59,7 @@ export interface Device {
shutdown: boolean;
reboot: boolean;
deviceName: boolean;
+ nodeRemoval: boolean;
};
setStatus: (status: Types.DeviceStatusEnum) => void;
@@ -73,7 +79,11 @@ export interface Device {
addPosition: (position: Types.PacketMetadata) => void;
addConnection: (connection: Types.ConnectionType) => void;
addMessage: (message: MessageWithState) => void;
+ addTraceRoute: (
+ traceroute: Types.PacketMetadata,
+ ) => void;
addMetadata: (from: number, metadata: Protobuf.Mesh.DeviceMetadata) => void;
+ removeNode: (nodeNum: number) => void;
setMessageState: (
type: "direct" | "broadcast",
channelIndex: Types.ChannelNumber,
@@ -119,6 +129,7 @@ export const useDeviceStore = create((set, get) => ({
direct: new Map(),
broadcast: new Map(),
},
+ traceroutes: new Map(),
connection: undefined,
activePage: "messages",
activeNode: 0,
@@ -130,6 +141,7 @@ export const useDeviceStore = create((set, get) => ({
shutdown: false,
reboot: false,
deviceName: false,
+ nodeRemoval: false,
},
pendingSettingsChanges: false,
messageDraft: "",
@@ -179,6 +191,9 @@ export const useDeviceStore = create((set, get) => ({
device.config.bluetooth = config.payloadVariant.value;
break;
}
+ case "security": {
+ device.config.security = config.payloadVariant.value;
+ }
}
}
}),
@@ -483,6 +498,7 @@ export const useDeviceStore = create((set, get) => ({
}),
);
},
+
addMetadata: (from, metadata) => {
set(
produce((draft) => {
@@ -494,6 +510,37 @@ export const useDeviceStore = create((set, get) => ({
}),
);
},
+ addTraceRoute: (traceroute) => {
+ set(
+ produce((draft) => {
+ console.log("addTraceRoute called");
+ console.log(traceroute);
+ const device = draft.devices.get(id);
+ if (!device) {
+ return;
+ }
+
+ const nodetraceroutes = device.traceroutes.get(traceroute.from);
+ if (nodetraceroutes) {
+ nodetraceroutes.push(traceroute);
+ device.traceroutes.set(traceroute.from, nodetraceroutes);
+ } else {
+ device.traceroutes.set(traceroute.from, [traceroute]);
+ }
+ }),
+ );
+ },
+ removeNode: (nodeNum) => {
+ set(
+ produce((draft) => {
+ const device = draft.devices.get(id);
+ if (!device) {
+ return;
+ }
+ device.nodes.delete(nodeNum);
+ }),
+ );
+ },
setMessageState: (
type: "direct" | "broadcast",
channelIndex: Types.ChannelNumber,
diff --git a/src/core/subscriptions.ts b/src/core/subscriptions.ts
index c713d3f0..509eb96f 100644
--- a/src/core/subscriptions.ts
+++ b/src/core/subscriptions.ts
@@ -90,6 +90,12 @@ export const subscribeAll = (
}
});
+ connection.events.onTraceRoutePacket.subscribe((traceRoutePacket) => {
+ device.addTraceRoute({
+ ...traceRoutePacket,
+ });
+ });
+
connection.events.onPendingSettingsChange.subscribe((state) => {
device.setPendingSettingsChanges(state);
});
diff --git a/src/core/utils/cn.ts b/src/core/utils/cn.ts
index cec6ac9e..365058ce 100644
--- a/src/core/utils/cn.ts
+++ b/src/core/utils/cn.ts
@@ -1,4 +1,4 @@
-import { ClassValue, clsx } from "clsx";
+import { type ClassValue, clsx } from "clsx";
import { twMerge } from "tailwind-merge";
export function cn(...inputs: ClassValue[]) {
diff --git a/src/core/utils/ip.ts b/src/core/utils/ip.ts
new file mode 100644
index 00000000..27d7aa9e
--- /dev/null
+++ b/src/core/utils/ip.ts
@@ -0,0 +1,14 @@
+export function convertIntToIpAddress(int: number): string {
+ return `${int & 0xff}.${(int >> 8) & 0xff}.${(int >> 16) & 0xff}.${(int >> 24) & 0xff}`;
+}
+
+export function convertIpAddressToInt(ip: string): number | null {
+ return (
+ ip
+ .split(".")
+ .reverse()
+ .reduce((ipnum, octet) => {
+ return (ipnum << 8) + Number.parseInt(octet);
+ }, 0) >>> 0
+ );
+}
diff --git a/src/core/utils/x25519.ts b/src/core/utils/x25519.ts
new file mode 100644
index 00000000..2729d80a
--- /dev/null
+++ b/src/core/utils/x25519.ts
@@ -0,0 +1,15 @@
+import { x25519 } from "@noble/curves/ed25519";
+
+export function getX25519PrivateKey(): Uint8Array {
+ const key = x25519.utils.randomPrivateKey();
+
+ key[0] &= 248;
+ key[31] &= 127;
+ key[31] |= 64;
+
+ return key;
+}
+
+export function getX25519PublicKey(privateKey: Uint8Array): Uint8Array {
+ return x25519.getPublicKey(privateKey);
+}
diff --git a/src/pages/Config/DeviceConfig.tsx b/src/pages/Config/DeviceConfig.tsx
index c9c3b3f7..45973e60 100644
--- a/src/pages/Config/DeviceConfig.tsx
+++ b/src/pages/Config/DeviceConfig.tsx
@@ -5,6 +5,7 @@ import { LoRa } from "@components/PageComponents/Config/LoRa.js";
import { Network } from "@components/PageComponents/Config/Network.js";
import { Position } from "@components/PageComponents/Config/Position.js";
import { Power } from "@components/PageComponents/Config/Power.js";
+import { Security } from "@components/PageComponents/Config/Security.js";
import {
Tabs,
TabsContent,
@@ -47,16 +48,17 @@ export const DeviceConfig = (): JSX.Element => {
label: "Bluetooth",
element: Bluetooth,
},
+ {
+ label: "Security",
+ element: Security,
+ },
];
return (
{tabs.map((tab) => (
-
+
{tab.label}
))}
diff --git a/src/pages/Config/ModuleConfig.tsx b/src/pages/Config/ModuleConfig.tsx
index cbec8030..276553da 100644
--- a/src/pages/Config/ModuleConfig.tsx
+++ b/src/pages/Config/ModuleConfig.tsx
@@ -5,11 +5,11 @@ import { Audio } from "@components/PageComponents/ModuleConfig/Audio.js";
import { CannedMessage } from "@components/PageComponents/ModuleConfig/CannedMessage.js";
import { ExternalNotification } from "@components/PageComponents/ModuleConfig/ExternalNotification.js";
import { MQTT } from "@components/PageComponents/ModuleConfig/MQTT.js";
+import { Paxcounter } from "@components/PageComponents/ModuleConfig/Paxcounter.js";
import { RangeTest } from "@components/PageComponents/ModuleConfig/RangeTest.js";
import { Serial } from "@components/PageComponents/ModuleConfig/Serial.js";
import { StoreForward } from "@components/PageComponents/ModuleConfig/StoreForward.js";
import { Telemetry } from "@components/PageComponents/ModuleConfig/Telemetry.js";
-import { Paxcounter } from "@components/PageComponents/ModuleConfig/Paxcounter.js";
import {
Tabs,
TabsContent,
diff --git a/src/pages/Dashboard/index.tsx b/src/pages/Dashboard/index.tsx
index 5c990e8d..3bbbbd9f 100644
--- a/src/pages/Dashboard/index.tsx
+++ b/src/pages/Dashboard/index.tsx
@@ -21,79 +21,81 @@ export const Dashboard = () => {
const devices = useMemo(() => getDevices(), [getDevices]);
return (
-
-
-
- Connected Devices
- Manage, connect and disconnect devices
+ <>
+
+
+
+ Connected Devices
+ Manage, connect and disconnect devices
+
-
-
+
-
- {devices.length ? (
-
- {devices.map((device) => {
- return (
- -
-
-
-
- {device.nodes.get(device.hardware.myNodeNum)?.user
- ?.longName ?? "UNK"}
-
-
- {device.connection?.connType === "ble" && (
- <>
-
- BLE
-
- )}
- {device.connection?.connType === "serial" && (
- <>
-
- Serial
-
- )}
- {device.connection?.connType === "http" && (
- <>
-
- Network
-
- )}
+
+ {devices.length ? (
+
+ {devices.map((device) => {
+ return (
+ -
+
+
+
+ {device.nodes.get(device.hardware.myNodeNum)?.user
+ ?.longName ?? "UNK"}
+
+
+ {device.connection?.connType === "ble" && (
+ <>
+
+ BLE
+
+ )}
+ {device.connection?.connType === "serial" && (
+ <>
+
+ Serial
+
+ )}
+ {device.connection?.connType === "http" && (
+ <>
+
+ Network
+
+ )}
+
-
-
-
- {device.nodes.size === 0 ? 0 : device.nodes.size - 1}
+
+
+
+ {device.nodes.size === 0 ? 0 : device.nodes.size - 1}
+
-
- );
- })}
-
- ) : (
-
-
- No Devices
- Connect atleast one device to get started
-
-
- )}
+
+ );
+ })}
+
+ ) : (
+
+
+ No Devices
+ Connect at least one device to get started
+
+
+ )}
+
-
+
);
};
diff --git a/src/pages/Map.tsx b/src/pages/Map.tsx
index 6916df58..42cc5fcb 100644
--- a/src/pages/Map.tsx
+++ b/src/pages/Map.tsx
@@ -7,6 +7,7 @@ import { SidebarButton } from "@components/UI/Sidebar/sidebarButton.js";
import { useAppStore } from "@core/stores/appStore.js";
import { useDevice } from "@core/stores/deviceStore.js";
import { Hashicon } from "@emeraldpay/hashicon-react";
+import { numberToHexUnpadded } from "@noble/curves/abstract/utils";
import { bbox, lineString } from "@turf/turf";
import {
BoxSelectIcon,
@@ -14,20 +15,20 @@ import {
ZoomInIcon,
ZoomOutIcon,
} from "lucide-react";
-import { useEffect, useState } from "react";
+import { useCallback, useEffect, useState } from "react";
import { Marker, useMap } from "react-map-gl";
import MapGl from "react-map-gl/maplibre";
export const MapPage = (): JSX.Element => {
const { nodes, waypoints } = useDevice();
- const { rasterSources } = useAppStore();
+ const { rasterSources, darkMode } = useAppStore();
const { default: map } = useMap();
const [zoom, setZoom] = useState(0);
const allNodes = Array.from(nodes.values());
- const getBBox = () => {
+ const getBBox = useCallback(() => {
if (!map) {
return;
}
@@ -64,7 +65,7 @@ export const MapPage = (): JSX.Element => {
if (center) {
map.easeTo(center);
}
- };
+ }, [allNodes, map]);
useEffect(() => {
map?.on("zoom", () => {
@@ -128,6 +129,11 @@ export const MapPage = (): JSX.Element => {
attributionControl={false}
renderWorldCopies={false}
maxPitch={0}
+ style={{
+ filter: darkMode
+ ? "brightness(0.6) invert(1) contrast(3) hue-rotate(200deg) saturate(0.3) brightness(0.7)"
+ : "",
+ }}
dragRotate={false}
touchZoomRotate={false}
initialViewState={{
@@ -139,8 +145,8 @@ export const MapPage = (): JSX.Element => {
{waypoints.map((wp) => (
@@ -158,25 +164,25 @@ export const MapPage = (): JSX.Element => {
return (
{
+ map?.easeTo({
+ zoom: 12,
+ center: [
+ (node.position?.longitudeI ?? 0) / 1e7,
+ (node.position?.latitudeI ?? 0) / 1e7,
+ ],
+ });
+ }}
>
- {
- map?.easeTo({
- zoom: 12,
- center: [
- (node.position?.longitudeI ?? 0) / 1e7,
- (node.position?.latitudeI ?? 0) / 1e7,
- ],
- });
- }}
- >
+
- {node.user?.longName}
+ {node.user?.longName ||
+ `!${numberToHexUnpadded(node.num)}`}
diff --git a/src/pages/Messages.tsx b/src/pages/Messages.tsx
index 82325107..4e7fbae9 100644
--- a/src/pages/Messages.tsx
+++ b/src/pages/Messages.tsx
@@ -3,15 +3,18 @@ import { PageLayout } from "@components/PageLayout.js";
import { Sidebar } from "@components/Sidebar.js";
import { SidebarSection } from "@components/UI/Sidebar/SidebarSection.js";
import { SidebarButton } from "@components/UI/Sidebar/sidebarButton.js";
+import { useToast } from "@core/hooks/useToast.js";
import { useDevice } from "@core/stores/deviceStore.js";
import { Hashicon } from "@emeraldpay/hashicon-react";
import { Protobuf, Types } from "@meshtastic/js";
+import { numberToHexUnpadded } from "@noble/curves/abstract/utils";
import { getChannelName } from "@pages/Channels.js";
-import { HashIcon } from "lucide-react";
+import { HashIcon, LockIcon, LockOpenIcon, WaypointsIcon } from "lucide-react";
import { useState } from "react";
export const MessagesPage = (): JSX.Element => {
- const { channels, nodes, hardware, messages } = useDevice();
+ const { channels, nodes, hardware, messages, traceroutes, connection } =
+ useDevice();
const [chatType, setChatType] =
useState ("broadcast");
const [activeChat, setActiveChat] = useState(
@@ -25,6 +28,9 @@ export const MessagesPage = (): JSX.Element => {
(ch) => ch.role !== Protobuf.Channel.Channel_Role.DISABLED,
);
const currentChannel = channels.get(activeChat);
+ const { toast } = useToast();
+ const node = nodes.get(activeChat);
+ const nodeHex = node?.num ? numberToHexUnpadded(node.num) : "Unknown";
return (
<>
@@ -53,7 +59,7 @@ export const MessagesPage = (): JSX.Element => {
{filteredNodes.map((node) => (
{
setChatType("direct");
@@ -64,38 +70,79 @@ export const MessagesPage = (): JSX.Element => {
))}
-
- {allChannels.map(
- (channel) =>
- activeChat === channel.index && (
-
- ),
- )}
- {filteredNodes.map(
- (node) =>
- activeChat === node.num && (
-
- ),
- )}
-
+
+
+ toast({
+ title: "Traceroute sent.",
+ }),
+ );
+ },
+ },
+ ]
+ : []
+ }
+ >
+ {allChannels.map(
+ (channel) =>
+ activeChat === channel.index && (
+
+ ),
+ )}
+ {filteredNodes.map(
+ (node) =>
+ activeChat === node.num && (
+
+ ),
+ )}
+
+
- [
- ,
-
- {node.user?.longName ??
- (node.user?.macaddr
- ? `Meshtastic ${base16
- .stringify(node.user?.macaddr.subarray(4, 6) ?? [])
- .toLowerCase()}`
- : `UNK: ${node.num}`)}
- ,
+
+
+ [
+ ,
+
+ {node.user?.longName ??
+ (node.user?.macaddr
+ ? `Meshtastic ${base16
+ .stringify(node.user?.macaddr.subarray(4, 6) ?? [])
+ .toLowerCase()}`
+ : `!${numberToHexUnpadded(node.num)}`)}
+ ,
- {Protobuf.Mesh.HardwareModel[node.user?.hwModel ?? 0]},
-
- {base16
- .stringify(node.user?.macaddr ?? [])
- .match(/.{1,2}/g)
- ?.join(":") ?? "UNK"}
- ,
- node.lastHeard === 0 ? (
- Never
- ) : (
-
- ),
-
- {node.snr}db/
- {Math.min(Math.max((node.snr + 10) * 5, 0), 100)}%/
- {(node.snr + 10) * 5}raw
- ,
- ])}
- />
+
+ {Protobuf.Mesh.HardwareModel[node.user?.hwModel ?? 0]}
+ ,
+
+ {base16
+ .stringify(node.user?.macaddr ?? [])
+ .match(/.{1,2}/g)
+ ?.join(":") ?? "UNK"}
+ ,
+
+ {node.lastHeard === 0 ? (
+ Never
+ ) : (
+
+ )}
+ ,
+
+ {node.snr}db/
+ {Math.min(Math.max((node.snr + 10) * 5, 0), 100)}%/
+ {(node.snr + 10) * 5}raw
+ ,
+
+ {node.user?.publicKey && node.user?.publicKey.length > 0 ? (
+
+ ) : (
+
+ )}
+ ,
+
+ {node.lastHeard !== 0
+ ? node.viaMqtt === false && node.hopsAway === 0
+ ? "Direct"
+ : `${node.hopsAway.toString()} ${
+ node.hopsAway > 1 ? "hops" : "hop"
+ } away`
+ : "-"}
+ {node.viaMqtt === true ? ", via MQTT" : ""}
+ ,
+ ,
+ ])}
+ />
+
+
);
diff --git a/src/validation/channel.ts b/src/validation/channel.ts
index 336e35e1..33349d06 100644
--- a/src/validation/channel.ts
+++ b/src/validation/channel.ts
@@ -41,4 +41,13 @@ export class Channel_SettingsValidation
@IsBoolean()
downlinkEnabled: boolean;
+
+ @IsBoolean()
+ positionEnabled: boolean;
+
+ @IsBoolean()
+ preciseLocation: boolean;
+
+ @IsInt()
+ positionPrecision: number;
}
diff --git a/src/validation/config/bluetooth.ts b/src/validation/config/bluetooth.ts
index 65a0d0be..efaca6e9 100644
--- a/src/validation/config/bluetooth.ts
+++ b/src/validation/config/bluetooth.ts
@@ -3,7 +3,11 @@ import { Protobuf } from "@meshtastic/js";
import { IsBoolean, IsEnum, IsInt } from "class-validator";
export class BluetoothValidation
- implements Omit
+ implements
+ Omit<
+ Protobuf.Config.Config_BluetoothConfig,
+ keyof Message | "deviceLoggingEnabled"
+ >
{
@IsBoolean()
enabled: boolean;
diff --git a/src/validation/config/device.ts b/src/validation/config/device.ts
index 728625bf..b61be39f 100644
--- a/src/validation/config/device.ts
+++ b/src/validation/config/device.ts
@@ -1,6 +1,6 @@
import type { Message } from "@bufbuild/protobuf";
import { Protobuf } from "@meshtastic/js";
-import { IsBoolean, IsEnum, IsInt } from "class-validator";
+import { IsBoolean, IsEnum, IsInt, IsString } from "class-validator";
export class DeviceValidation
implements Omit
@@ -34,4 +34,10 @@ export class DeviceValidation
@IsBoolean()
disableTripleClick: boolean;
+
+ @IsBoolean()
+ ledHeartbeatDisabled: boolean;
+
+ @IsString()
+ tzdef: string;
}
diff --git a/src/validation/config/display.ts b/src/validation/config/display.ts
index 68d0a306..48831052 100644
--- a/src/validation/config/display.ts
+++ b/src/validation/config/display.ts
@@ -34,4 +34,7 @@ export class DisplayValidation
@IsBoolean()
wakeOnTapOrMotion: boolean;
+
+ @IsEnum(Protobuf.Config.Config_DisplayConfig_CompassOrientation)
+ compassOrientation: Protobuf.Config.Config_DisplayConfig_CompassOrientation;
}
diff --git a/src/validation/config/lora.ts b/src/validation/config/lora.ts
index 291a42d0..e8ff5cef 100644
--- a/src/validation/config/lora.ts
+++ b/src/validation/config/lora.ts
@@ -3,7 +3,8 @@ import { Protobuf } from "@meshtastic/js";
import { IsArray, IsBoolean, IsEnum, IsInt, Max, Min } from "class-validator";
export class LoRaValidation
- implements Omit
+ implements
+ Omit
{
@IsBoolean()
usePreset: boolean;
@@ -59,4 +60,7 @@ export class LoRaValidation
@IsBoolean()
ignoreMqtt: boolean;
+
+ @IsBoolean()
+ configOkToMqtt: boolean;
}
diff --git a/src/validation/config/network.ts b/src/validation/config/network.ts
index 8f851d69..41db88d7 100644
--- a/src/validation/config/network.ts
+++ b/src/validation/config/network.ts
@@ -41,21 +41,24 @@ export class NetworkValidation
export class NetworkValidationIpV4Config
implements
- Omit
+ Omit<
+ Protobuf.Config.Config_NetworkConfig_IpV4Config,
+ keyof Message | "ip" | "gateway" | "subnet" | "dns"
+ >
{
@IsIP()
@IsOptional()
- ip: number;
+ ip: string;
@IsIP()
@IsOptional()
- gateway: number;
+ gateway: string;
@IsIP()
@IsOptional()
- subnet: number;
+ subnet: string;
@IsIP()
@IsOptional()
- dns: number;
+ dns: string;
}
diff --git a/src/validation/config/position.ts b/src/validation/config/position.ts
index c2630150..7eb42c56 100644
--- a/src/validation/config/position.ts
+++ b/src/validation/config/position.ts
@@ -2,8 +2,14 @@ import type { Message } from "@bufbuild/protobuf";
import { Protobuf } from "@meshtastic/js";
import { IsArray, IsBoolean, IsEnum, IsInt } from "class-validator";
+const DeprecatedPositionValidationFields = ["gpsEnabled", "gpsAttemptTime"];
+
export class PositionValidation
- implements Omit
+ implements
+ Omit<
+ Protobuf.Config.Config_PositionConfig,
+ keyof Message | (typeof DeprecatedPositionValidationFields)[number]
+ >
{
@IsInt()
positionBroadcastSecs: number;
@@ -14,15 +20,9 @@ export class PositionValidation
@IsBoolean()
fixedPosition: boolean;
- @IsBoolean()
- gpsEnabled: boolean;
-
@IsInt()
gpsUpdateInterval: number;
- @IsInt()
- gpsAttemptTime: number;
-
@IsInt()
positionFlags: number;
@@ -43,7 +43,4 @@ export class PositionValidation
@IsEnum(Protobuf.Config.Config_PositionConfig_GpsMode)
gpsMode: Protobuf.Config.Config_PositionConfig_GpsMode;
-
- @IsArray()
- channelPrecision: number[];
}
diff --git a/src/validation/config/power.ts b/src/validation/config/power.ts
index f1cc1691..67bd1cd0 100644
--- a/src/validation/config/power.ts
+++ b/src/validation/config/power.ts
@@ -1,9 +1,10 @@
import type { Message } from "@bufbuild/protobuf";
import type { Protobuf } from "@meshtastic/js";
-import { IsBoolean, IsInt, Max, Min } from "class-validator";
+import { IsBoolean, IsInt, IsNumber, Max, Min } from "class-validator";
export class PowerValidation
- implements Omit
+ implements
+ Omit
{
@IsBoolean()
isPowerSaving: boolean;
@@ -11,7 +12,7 @@ export class PowerValidation
@IsInt()
onBatteryShutdownAfterSecs: number;
- @IsInt()
+ @IsNumber()
@Min(2)
@Max(4)
adcMultiplierOverride: number;
diff --git a/src/validation/config/security.ts b/src/validation/config/security.ts
new file mode 100644
index 00000000..d1a35808
--- /dev/null
+++ b/src/validation/config/security.ts
@@ -0,0 +1,35 @@
+import type { Message } from "@bufbuild/protobuf";
+import type { Protobuf } from "@meshtastic/js";
+import { IsBoolean, IsString } from "class-validator";
+
+export class SecurityValidation
+ implements
+ Omit<
+ Protobuf.Config.Config_SecurityConfig,
+ keyof Message | "adminKey" | "privateKey" | "publicKey"
+ >
+{
+ @IsBoolean()
+ adminChannelEnabled: boolean;
+
+ @IsString()
+ adminKey: string;
+
+ @IsBoolean()
+ bluetoothLoggingEnabled: boolean;
+
+ @IsBoolean()
+ debugLogApiEnabled: boolean;
+
+ @IsBoolean()
+ isManaged: boolean;
+
+ @IsString()
+ privateKey: string;
+
+ @IsString()
+ publicKey: string;
+
+ @IsBoolean()
+ serialEnabled: boolean;
+}
diff --git a/src/validation/moduleConfig/mqtt.ts b/src/validation/moduleConfig/mqtt.ts
index 07f8da54..7a2c9170 100644
--- a/src/validation/moduleConfig/mqtt.ts
+++ b/src/validation/moduleConfig/mqtt.ts
@@ -1,6 +1,12 @@
import type { Message } from "@bufbuild/protobuf";
import type { Protobuf } from "@meshtastic/js";
-import { IsBoolean, IsString, Length, IsNumber } from "class-validator";
+import {
+ IsBoolean,
+ IsNumber,
+ IsOptional,
+ IsString,
+ Length,
+} from "class-validator";
export class MqttValidation
implements
@@ -47,8 +53,10 @@ export class MqttValidationMapReportSettings
Omit
{
@IsNumber()
+ @IsOptional()
publishIntervalSecs: number;
@IsNumber()
+ @IsOptional()
positionPrecision: number;
}
diff --git a/src/validation/moduleConfig/paxcounter.ts b/src/validation/moduleConfig/paxcounter.ts
index 67317c96..6f5bc66a 100644
--- a/src/validation/moduleConfig/paxcounter.ts
+++ b/src/validation/moduleConfig/paxcounter.ts
@@ -11,4 +11,10 @@ export class PaxcounterValidation
@IsInt()
paxcounterUpdateInterval: number;
+
+ @IsInt()
+ bleThreshold: number;
+
+ @IsInt()
+ wifiThreshold: number;
}
diff --git a/src/validation/moduleConfig/storeForward.ts b/src/validation/moduleConfig/storeForward.ts
index 82d9f4c2..773a2539 100644
--- a/src/validation/moduleConfig/storeForward.ts
+++ b/src/validation/moduleConfig/storeForward.ts
@@ -4,7 +4,10 @@ import { IsBoolean, IsInt } from "class-validator";
export class StoreForwardValidation
implements
- Omit
+ Omit<
+ Protobuf.ModuleConfig.ModuleConfig_StoreForwardConfig,
+ keyof Message | "isServer"
+ >
{
@IsBoolean()
enabled: boolean;
diff --git a/vercel.json b/vercel.json
index 7ae9a3de..29bf418c 100644
--- a/vercel.json
+++ b/vercel.json
@@ -1,5 +1 @@
-{
- "github": {
- "silent": true
- }
-}
+{ "github": { "silent": true } }
diff --git a/vite.config.ts b/vite.config.ts
index 49e5b855..caf6f779 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -1,11 +1,10 @@
-import { execSync } from "child_process";
-import { resolve } from "path";
+import { execSync } from "node:child_process";
+import { resolve } from "node:path";
+import react from "@vitejs/plugin-react";
import { visualizer } from "rollup-plugin-visualizer";
import { defineConfig } from "vite";
import EnvironmentPlugin from "vite-plugin-environment";
-import react from "@vitejs/plugin-react";
-
let hash = "";
try {
|