mirror
/
meshastic.web
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

wip

pull/547/head
Dan Ditomaso 1 year ago
parent
a378cce0be
commit
c55fdbd982
7 changed files with 103 additions and 69 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 5
      deno.json
  2. 115
      deno.lock
  3. 5
      package.json
  4. 9
      src/components/Form/FormSelect.tsx
  5. 23
      src/components/PageComponents/Config/Network.tsx
  6. 10
      src/core/utils/ip.ts
  7. 5
      src/validation/config/network.ts

5
deno.json
View File

@ -1,5 +1,10 @@
{
"imports": {
"@meshtastic/core": "jsr:@meshtastic/core@^2.6.2",
"@meshtastic/js": "jsr:@meshtastic/js@^2.3.4",
"@meshtastic/transport-http": "jsr:@meshtastic/transport-http@^0.2.1",
"@meshtastic/transport-web-bluetooth": "jsr:@meshtastic/transport-web-bluetooth@^0.1.1",
"@meshtastic/transport-web-serial": "jsr:@meshtastic/transport-web-serial@^0.2.1",
"@app/": "./src/",
"@pages/": "./src/pages/",
"@components/": "./src/components/",

115
deno.lock
View File

@ -1,11 +1,15 @@
{
"version": "4",
"specifiers": {
"jsr:@meshtastic/core@^2.6.0": "2.6.2",
"jsr:@meshtastic/core@^2.6.2": "2.6.2",
"jsr:@meshtastic/js@^2.3.4": "2.3.4",
"jsr:@meshtastic/protobufs@^2.3.12": "2.6.2",
"jsr:@meshtastic/protobufs@^2.6.2": "2.6.2",
"jsr:@meshtastic/transport-http@~0.2.1": "0.2.1",
"jsr:@meshtastic/transport-web-bluetooth@~0.1.1": "0.1.1",
"jsr:@meshtastic/transport-web-serial@~0.2.1": "0.2.1",
"npm:@bufbuild/protobuf@^2.2.3": "2.2.3",
"npm:@jsr/[email protected]": "2.6.0-0",
"npm:@jsr/[email protected]": "2.6.0-0",
"npm:@jsr/meshtastic__transport-http@*": "0.2.1",
"npm:@jsr/meshtastic__transport-web-serial@*": "0.2.1",
"npm:@noble/curves@^1.8.1": "1.8.1",
"npm:@radix-ui/react-accordion@^1.2.3": "1.2.3_@[email protected]_@[email protected]__@[email protected][email protected][email protected][email protected]",
"npm:@radix-ui/react-checkbox@^1.1.4": "1.1.4_@[email protected]_@[email protected]__@[email protected][email protected][email protected][email protected]",
@ -73,8 +77,48 @@
"npm:vite@*": "6.2.0_@[email protected]",
"npm:vite@^6.2.0": "6.2.0_@[email protected]",
"npm:vitest@^3.0.7": "3.0.8_@[email protected][email protected][email protected]__@[email protected]_@[email protected][email protected][email protected]___@[email protected][email protected]___@[email protected][email protected][email protected][email protected][email protected]_____@[email protected][email protected]_____@[email protected][email protected]____@[email protected][email protected][email protected][email protected]____@[email protected][email protected][email protected][email protected][email protected][email protected]___@[email protected][email protected]___@[email protected]__@[email protected][email protected][email protected]",
"npm:zod@^3.24.2": "3.24.2",
"npm:[email protected]": "5.0.3_@[email protected][email protected][email protected]"
},
"jsr": {
"@meshtastic/[email protected]": {
"integrity": "5c948bbbfad280c5eb093c62edc84773f76509487b333066ec4a349f40dcacf2",
"dependencies": [
"jsr:@meshtastic/protobufs@^2.6.2",
"npm:@bufbuild/protobuf",
"npm:crc",
"npm:ste-simple-events",
"npm:tslog@^4.9.3"
]
},
"@meshtastic/[email protected]": {
"integrity": "7a81a36fb7ef1b7b68a3989c02d50f687114ac56bcd7f0452a31ef560ac99719",
"dependencies": [
"jsr:@meshtastic/protobufs@^2.3.12",
"npm:crc",
"npm:ste-simple-events",
"npm:tslog@^4.9.2"
]
},
"@meshtastic/[email protected]": {
"integrity": "55e9b98fc22ea0d28e6a7979e4ff0a5f2c94513c1bc93e67522636a89925ad69",
"dependencies": [
"npm:@bufbuild/protobuf"
]
},
"@meshtastic/[email protected]": {
"integrity": "4d086ee6d5665c3490736737c4354eb3049edf792b1d195b30a3254cb535a7d6"
},
"@meshtastic/[email protected]": {
"integrity": "f7676b98e2049ad0bca508e34054730b22cf2648019921989f11297441fe958d"
},
"@meshtastic/[email protected]": {
"integrity": "d09fa8ac278b105c8f2b3a72af9cf8a5676baac6f4e9111c6773ff6217e2d5be",
"dependencies": [
"jsr:@meshtastic/core@^2.6.0"
]
}
},
"npm": {
"@adobe/[email protected]": {
"integrity": "sha512-baYZExFpsdkBNuvGKTKWCwKH57HRZLVtycZS05WTQNVOiXVSeAki3nU35zlRbToeMW8aHlJfyS+1C4BOv27q0A=="
@ -1082,54 +1126,6 @@
"@jridgewell/sourcemap-codec"
]
},
"@jsr/[email protected]": {
"integrity": "sha512-+Ik6gzZnfi5sW+WC06bRayA6KGF2NI+zi3bqKbvA8mGDNSOPgsFhA4VZ79DKY4bSflTW170MRIUeyYo0IWQQuw==",
"dependencies": [
"@bufbuild/protobuf",
"@jsr/meshtastic__protobufs",
"crc",
"ste-simple-events",
"tslog"
]
},
"@jsr/[email protected]": {
"integrity": "sha512-Ks71sRagbBipotznULpsJZ1EMcQIqCEJQx6mf628dmCNVf2YECi2zi/i/5zErp1hGPgfbDvCz9oPogvsd/7fMA==",
"dependencies": [
"@bufbuild/protobuf",
"@jsr/meshtastic__protobufs",
"crc",
"ste-simple-events",
"tslog"
]
},
"@jsr/[email protected]": {
"integrity": "sha512-+xpZpxK6oUIVOuEs7C+LyxRr2druvc7UNNNTK9Rl8ioXj63Jz1uQXlYe2Gj0xjnRAiSQLR7QVaPef21BR/YTxA==",
"dependencies": [
"@bufbuild/protobuf",
"@jsr/meshtastic__protobufs",
"crc",
"ste-simple-events",
"tslog"
]
},
"@jsr/[email protected]": {
"integrity": "sha512-CGlgBdzAuQCZuGPrnzP8zU+EcLlmyYeeMbqFHuJ834cYfArWXDjDh1UYaPo2rI03LTjqa3MeWpfqDlzBR8kIMg==",
"dependencies": [
"@bufbuild/protobuf"
]
},
"@jsr/[email protected]": {
"integrity": "sha512-lmQKr3aIINKvtGROU4HchmSVqbZSbkIHqajowRRC8IAjsnR0zNTyxz210QyY4pFUF9hpcW3GRjwq5h/VO2JuGg==",
"dependencies": [
"@jsr/[email protected]"
]
},
"@jsr/[email protected]": {
"integrity": "sha512-yumjEGLkAuJYOC3aWKvZzbQqi/LnqaKfNpVCY7Ki7oLtAshNiZrBLiwiFhN7+ZR9FfMdJThyBMqREBDRRWTO1Q==",
"dependencies": [
"@jsr/[email protected]"
]
},
"@mapbox/[email protected]": {
"integrity": "sha512-tJaT+RbYGJYStt7wI3cq4Nl4SXxG8W7JDG5DMJu97V25RnbNg3QtQtf+KD+VLjNpWKYsRvXDNmNrBgEETr1ifA==",
"dependencies": [
@ -6869,6 +6865,9 @@
"[email protected]": {
"integrity": "sha512-cYVsTjKl8b+FrnidjibDWskAv7UKOfcwaVZdp/it9n1s9fU3IkgDbhdIRKCW4JDsAlECJY0ytoVPT3sK6kideA=="
},
"[email protected]": {
"integrity": "sha512-lY7CDW43ECgW9u1TcT3IoXHflywfVqDYze4waEz812jR/bZ8FHDsl7pFQoSZTz5N+2NqRXs8GBwnAwo3ZNxqhQ=="
},
"[email protected]": {
"integrity": "sha512-mla2acNCMkWXBD+c+yeUrBUrzOxYMNFdQ6FGfigGGtEVBPJx07BQeJekjt9DmH1FtZek4E9rE1eRR9qQpxACOQ=="
},
@ -6882,13 +6881,16 @@
}
},
"workspace": {
"dependencies": [
"jsr:@meshtastic/core@^2.6.2",
"jsr:@meshtastic/js@^2.3.4",
"jsr:@meshtastic/transport-http@~0.2.1",
"jsr:@meshtastic/transport-web-bluetooth@~0.1.1",
"jsr:@meshtastic/transport-web-serial@~0.2.1"
],
"packageJson": {
"dependencies": [
"npm:@bufbuild/protobuf@^2.2.3",
"npm:@jsr/[email protected]",
"npm:@jsr/[email protected]",
"npm:@jsr/meshtastic__transport-http@*",
"npm:@jsr/meshtastic__transport-web-serial@*",
"npm:@noble/curves@^1.8.1",
"npm:@radix-ui/react-accordion@^1.2.3",
"npm:@radix-ui/react-checkbox@^1.1.4",
@ -6950,6 +6952,7 @@
"npm:vite-plugin-pwa@~0.21.1",
"npm:vite@^6.2.0",
"npm:vitest@^3.0.7",
"npm:zod@^3.24.2",
"npm:[email protected]"
]
}

5
package.json
View File

@ -35,10 +35,6 @@
"homepage": "https://meshtastic.org",
"dependencies": {
"@bufbuild/protobuf": "^2.2.3",
"@meshtastic/core": "npm:@jsr/[email protected]",
"@meshtastic/js": "npm:@jsr/[email protected]",
"@meshtastic/transport-http": "npm:@jsr/meshtastic__transport-http",
"@meshtastic/transport-web-serial": "npm:@jsr/meshtastic__transport-web-serial",
"@noble/curves": "^1.8.1",
"@radix-ui/react-accordion": "^1.2.3",
"@radix-ui/react-checkbox": "^1.1.4",
@ -73,6 +69,7 @@
"react-qrcode-logo": "^3.0.0",
"rfc4648": "^1.5.4",
"vite-plugin-node-polyfills": "^0.23.0",
"zod": "^3.24.2",
"zustand": "5.0.3"
},
"devDependencies": {

9
src/components/Form/FormSelect.tsx
View File

@ -10,13 +10,14 @@ import {
SelectValue,
} from "@components/UI/Select.tsx";
import { useController, type FieldValues } from "react-hook-form";
import { computeHeadingLevel } from "@core/utils/test.tsx";
export interface SelectFieldProps<T> extends BaseFormBuilderProps<T> {
type: "select";
selectChange?: (e: string, name: string) => void;
validate?: (newValue: string) => Promise<boolean>;
defaultValue?: string;
properties: BaseFormBuilderProps<T>["properties"] & {
defaultValue?: T;
enumValue: {
[s: string]: string | number;
};
@ -38,11 +39,15 @@ export function SelectInput<T extends FieldValues>({
disabled,
field,
}: GenericFormElementProps<T, SelectFieldProps<T>>) {
// Get default value and set it
const defaultValue = field.properties.defaultValue ?? field.defaultValue;
const {
field: { value, onChange, ...rest },
} = useController({
name: field.name,
control,
defaultValue: defaultValue ? defaultValue.toString() : undefined,
});
const { enumValue, formatEnumName, ...remainingProperties } = field.properties;
@ -70,12 +75,12 @@ export function SelectInput<T extends FieldValues>({
onChange(Number.parseInt(newValue));
};
return (
<Select
onValueChange={handleValueChange}
disabled={disabled}
value={value?.toString()}
defaultValue={defaultValue?.toString()}
{...remainingProperties}
{...rest}
>

23
src/components/PageComponents/Config/Network.tsx
View File

@ -1,4 +1,4 @@
import type { NetworkValidation } from "@app/validation/config/network.tsx";
import type { NetworkValidation } from "@app/validation/config/network.ts";
import { create } from "@bufbuild/protobuf";
import { DynamicForm } from "@components/Form/DynamicForm.tsx";
import { useDevice } from "@core/stores/deviceStore.ts";
@ -12,6 +12,9 @@ export const Network = () => {
const { config, setWorkingConfig } = useDevice();
const onSubmit = (data: NetworkValidation) => {
console.log("Network data", data);
setWorkingConfig(
create(Protobuf.Config.ConfigSchema, {
payloadVariant: {
@ -21,7 +24,7 @@ export const Network = () => {
ipv4Config: create(
Protobuf.Config.Config_NetworkConfig_IpV4ConfigSchema,
{
ip: convertIpAddressToInt(data.ipv4Config.ip) ?? 0,
ip: convertIpAddressToInt(data?.ipv4Config?.ip) ?? 0,
gateway: convertIpAddressToInt(data.ipv4Config.gateway) ?? 0,
subnet: convertIpAddressToInt(data.ipv4Config.subnet) ?? 0,
dns: convertIpAddressToInt(data.ipv4Config.dns) ?? 0,
@ -165,6 +168,22 @@ export const Network = () => {
},
],
},
{
label: "UDP Config",
description: "UDP over Mesh configuration",
fields: [
{
type: "select",
name: "enabledProtocols",
label: "Mesh via UDP enabled",
properties: {
enumValue:
Protobuf.Config.Config_NetworkConfig_ProtocolFlags,
formatEnumName: true,
}
},
],
},
{
label: "NTP Config",
description: "NTP configuration",

10
src/core/utils/ip.ts
View File

@ -1,10 +1,12 @@
export function convertIntToIpAddress(int: number): string {
return `${int & 0xff}.${(int >> 8) & 0xff}.${(int >> 16) & 0xff}.${
(int >> 24) & 0xff
}`;
return `${int & 0xff}.${(int >> 8) & 0xff}.${(int >> 16) & 0xff}.${(int >> 24) & 0xff
}`;
}
export function convertIpAddressToInt(ip: string): number | null {
export function convertIpAddressToInt(ip: string): number | undefined {
if (!ip) {
return undefined;
}
return (
ip
.split(".")

5
src/validation/config/network.ts
View File

@ -11,7 +11,7 @@ import {
export class NetworkValidation
implements
Omit<Protobuf.Config.Config_NetworkConfig, keyof Message | "ipv4Config"> {
Omit<Protobuf.Config.Config_NetworkConfig, keyof Message | "ipv4Config"> {
@IsBoolean()
wifiEnabled: boolean;
@ -34,6 +34,9 @@ export class NetworkValidation
ipv4Config: NetworkValidationIpV4Config;
@IsEnum(Protobuf.Config.Config_NetworkConfig_EnabledProtocols)
enabledProtocols: Protobuf.Config.Config_NetworkConfig_ProtocolFlags;
@IsString()
rsyslogServer: string;
}

Write Preview
Loading…
Cancel
Save