hermes/meshtastic-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use new js lib version

Browse Source
This commit is contained in:
Sacha Weatherstone
2022-12-30 22:14:29 +11:00
parent fca3719bce
commit acf2f9c3f4
26 changed files with 240 additions and 276 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/CommandPalette/Index.tsx
+1 -1
View File
@@ -214,7 +214,7 @@ export const CommandPalette = (): JSX.Element => {
icon: TrashIcon,
action() {
if (connection) {
void toast.promise(connection.resetPeers({}), {
void toast.promise(connection.resetPeers(), {
loading: "Resetting...",
success: "Succesfully reset peers",
error: "No response received"
src/components/Dialog/RebootDialog.tsx
+10 -14
View File
@@ -36,13 +36,11 @@ export const RebootDialog = ({
action={{
icon: <ClockIcon className="w-4" />,
action() {
connection?.reboot({
time: time * 60,
callback: async () => {
setRebootDialogOpen(false);
await Promise.resolve();
}
});
connection
?.reboot({
time: time * 60
})
.then(() => setRebootDialogOpen(false));
}
}}
/>
@@ -50,13 +48,11 @@ export const RebootDialog = ({
className="w-24"
iconBefore={<ArrowPathIcon className="w-4" />}
onClick={() => {
connection?.reboot({
time: 0,
callback: async () => {
setRebootDialogOpen(false);
await Promise.resolve();
}
});
connection
?.reboot({
time: 0
})
.then(() => setRebootDialogOpen(false));
}}
>
Now
src/components/Dialog/ShutdownDialog.tsx
+10 -14
View File
@@ -36,13 +36,11 @@ export const ShutdownDialog = ({
action={{
icon: <ClockIcon className="w-4" />,
action() {
connection?.shutdown({
time: time * 60,
callback: async () => {
setShutdownDialogOpen(false);
await Promise.resolve();
}
});
connection
?.shutdown({
time: time * 60
})
.then(() => setShutdownDialogOpen(false));
}
}}
/>
@@ -50,13 +48,11 @@ export const ShutdownDialog = ({
className="w-24"
iconBefore={<PowerIcon className="w-4" />}
onClick={() => {
connection?.shutdown({
time: 0,
callback: async () => {
setShutdownDialogOpen(false);
await Promise.resolve();
}
});
connection
?.shutdown({
time: 0
})
.then(() => setShutdownDialogOpen(false));
}}
>
Now
src/components/PageComponents/Channel.tsx
+16 -18
View File
@@ -65,25 +65,23 @@ export const Channel = ({ channel }: SettingsPanelProps): JSX.Element => {
const onSubmit = handleSubmit((data) => {
if (connection) {
void toast.promise(
connection.setChannel({
channel: {
role:
channel?.role === Protobuf.Channel_Role.PRIMARY
? Protobuf.Channel_Role.PRIMARY
: data.enabled
? Protobuf.Channel_Role.SECONDARY
: Protobuf.Channel_Role.DISABLED,
index: channel?.index,
settings: {
...data,
psk: toByteArray(data.psk ?? "")
connection
.setChannel({
channel: {
role:
channel?.role === Protobuf.Channel_Role.PRIMARY
? Protobuf.Channel_Role.PRIMARY
: data.enabled
? Protobuf.Channel_Role.SECONDARY
: Protobuf.Channel_Role.DISABLED,
index: channel?.index,
settings: {
...data,
psk: toByteArray(data.psk ?? "")
}
}
},
callback: (): Promise<void> => {
reset({ ...data });
return Promise.resolve();
}
}),
})
.then(() => reset({ ...data })),
{
loading: "Saving...",
success: "Saved Channel",
src/components/PageComponents/Config/Bluetooth.tsx
+9 -11
View File
@@ -35,18 +35,16 @@ export const Bluetooth = (): JSX.Element => {
const onSubmit = handleSubmit((data) => {
if (connection) {
void toast.promise(
connection.setConfig({
config: {
payloadVariant: {
oneofKind: "bluetooth",
bluetooth: data
connection
.setConfig({
config: {
payloadVariant: {
oneofKind: "bluetooth",
bluetooth: data
}
}
},
callback: async () => {
reset({ ...data });
await Promise.resolve();
}
}),
})
.then(() => reset({ ...data })),
{
loading: "Saving...",
success: "Saved Bluetooth Config, Restarting Node",
src/components/PageComponents/Config/Device.tsx
+9 -11
View File
@@ -34,18 +34,16 @@ export const Device = (): JSX.Element => {
const onSubmit = handleSubmit((data) => {
if (connection) {
void toast.promise(
connection.setConfig({
config: {
payloadVariant: {
oneofKind: "device",
device: data
connection
.setConfig({
config: {
payloadVariant: {
oneofKind: "device",
device: data
}
}
},
callback: async () => {
reset({ ...data });
await Promise.resolve();
}
}),
})
.then(() => reset({ ...data })),
{
loading: "Saving...",
success: "Saved Device Config, Restarting Node",
src/components/PageComponents/Config/Display.tsx
+9 -11
View File
@@ -34,18 +34,16 @@ export const Display = (): JSX.Element => {
const onSubmit = handleSubmit((data) => {
if (connection) {
void toast.promise(
connection.setConfig({
config: {
payloadVariant: {
oneofKind: "display",
display: data
connection
.setConfig({
config: {
payloadVariant: {
oneofKind: "display",
display: data
}
}
},
callback: async () => {
reset({ ...data });
await Promise.resolve();
}
}),
})
.then(() => reset({ ...data })),
{
loading: "Saving...",
success: "Saved Display Config, Restarting Node",
src/components/PageComponents/Config/LoRa.tsx
+9 -11
View File
@@ -42,18 +42,16 @@ export const LoRa = (): JSX.Element => {
const onSubmit = handleSubmit((data) => {
if (connection) {
void toast.promise(
connection.setConfig({
config: {
payloadVariant: {
oneofKind: "lora",
lora: data
connection
.setConfig({
config: {
payloadVariant: {
oneofKind: "lora",
lora: data
}
}
},
callback: async () => {
reset({ ...data });
await Promise.resolve();
}
}),
})
.then(() => reset({ ...data })),
{
loading: "Saving...",
success: "Saved LoRa Config, Restarting Node",
src/components/PageComponents/Config/Network.tsx
+1 -5
View File
@@ -63,13 +63,9 @@ export const Network = (): JSX.Element => {
oneofKind: "network",
network: Protobuf.Config_NetworkConfig.create(data)
}
},
callback: async () => {
reset({ ...data });
await Promise.resolve();
}
})
.catch((e) => console.log(e)),
.then(() => reset({ ...data })),
{
loading: "Saving...",
success: "Saved Network Config, Restarting Node",
src/components/PageComponents/Config/Position.tsx
+18 -22
View File
@@ -60,17 +60,15 @@ export const Position = (): JSX.Element => {
if (connection) {
void toast.promise(
connection.setPosition({
position: Protobuf.Position.create({
altitude: fixedAlt,
latitudeI: fixedLat * 1e7,
longitudeI: fixedLng * 1e7
}),
callback: async () => {
reset({ ...data });
await Promise.resolve();
}
}),
connection
.setPosition({
position: Protobuf.Position.create({
altitude: fixedAlt,
latitudeI: fixedLat * 1e7,
longitudeI: fixedLng * 1e7
})
})
.then(() => reset({ ...data })),
{
loading: "Saving...",
success: "Saved Position Config, Restarting Node",
@@ -79,18 +77,16 @@ export const Position = (): JSX.Element => {
);
if (configHasChanged) {
void toast.promise(
connection.setConfig({
config: {
payloadVariant: {
oneofKind: "position",
position: rest
connection
.setConfig({
config: {
payloadVariant: {
oneofKind: "position",
position: rest
}
}
},
callback: async () => {
reset({ ...data });
await Promise.resolve();
}
}),
})
.then(() => reset({ ...data })),
{
loading: "Saving...",
success: "Saved Position Config, Restarting Node",
src/components/PageComponents/Config/Power.tsx
+9 -11
View File
@@ -32,18 +32,16 @@ export const Power = (): JSX.Element => {
const onSubmit = handleSubmit((data) => {
if (connection) {
void toast.promise(
connection.setConfig({
config: {
payloadVariant: {
oneofKind: "power",
power: data
connection
.setConfig({
config: {
payloadVariant: {
oneofKind: "power",
power: data
}
}
},
callback: async () => {
reset({ ...data });
await Promise.resolve();
}
}),
})
.then(() => reset({ ...data })),
{
loading: "Saving...",
success: "Saved Power Config, Restarting Node",
src/components/PageComponents/Config/User.tsx
+5 -7
View File
@@ -42,13 +42,11 @@ export const User = (): JSX.Element => {
const onSubmit = handleSubmit((data) => {
if (connection && myNode?.data.user) {
void toast.promise(
connection.setOwner({
owner: { ...myNode.data.user, ...data },
callback: async () => {
reset({ ...data });
await Promise.resolve();
}
}),
connection
.setOwner({
owner: { ...myNode.data.user, ...data }
})
.then(() => reset({ ...data })),
{
loading: "Saving...",
success: "Saved User, Restarting Node",
src/components/PageComponents/Messages/Message.tsx
+12 -6
View File
@@ -31,17 +31,19 @@ export const Message = ({
return lastMsgSameUser ? (
<div className="ml-4 flex">
{message.ack ? (
{message.state === "ack" ? (
<CheckCircleIcon className="my-auto h-4 text-textSecondary" />
) : (
) : message.state === "waiting" ? (
<EllipsisHorizontalCircleIcon className="my-auto h-4 text-textSecondary" />
) : (
<ExclamationCircleIcon className="my-auto h-4 text-textSecondary" />
)}
{"waypointID" in message ? (
<WaypointMessage waypointID={message.waypointID} />
) : (
<span
className={`ml-4 border-l-2 border-l-backgroundPrimary pl-2 ${
message.ack ? "text-textPrimary" : "text-textSecondary"
message.state === "ack" ? "text-textPrimary" : "text-textSecondary"
}`}
>
{message.text}
@@ -69,17 +71,21 @@ export const Message = ({
</div>
<div className="flex">
{/* <ExclamationCircleIcon /> */}
{message.ack ? (
{message.state === "ack" ? (
<CheckCircleIcon className="my-auto h-4 text-textSecondary" />
) : (
) : message.state === "waiting" ? (
<EllipsisHorizontalCircleIcon className="my-auto h-4 text-textSecondary" />
) : (
<ExclamationCircleIcon className="my-auto h-4 text-textSecondary" />
)}
{"waypointID" in message ? (
<WaypointMessage waypointID={message.waypointID} />
) : (
<span
className={`ml-4 border-l-2 border-l-backgroundPrimary pl-2 ${
message.ack ? "text-textPrimary" : "text-textSecondary"
message.state === "ack"
? "text-textPrimary"
: "text-textSecondary"
}`}
>
{message.text}
src/components/PageComponents/Messages/MessageInput.tsx
+12 -11
View File
@@ -14,7 +14,7 @@ export interface MessageInputProps {
}
export const MessageInput = ({ channel }: MessageInputProps): JSX.Element => {
const { connection, ackMessage } = useDevice();
const { connection, setMessageState } = useDevice();
const { register, handleSubmit } = useForm<{
message: string;
@@ -24,16 +24,17 @@ export const MessageInput = ({ channel }: MessageInputProps): JSX.Element => {
}
});
const onSubmit = handleSubmit((data) => {
void connection?.sendText({
text: data.message,
wantAck: true,
channel: channel.config.index as Types.ChannelNumber,
callback: (id) => {
ackMessage(channel.config.index, id);
return Promise.resolve();
}
});
const onSubmit = handleSubmit(async (data) => {
await connection
?.sendText({
text: data.message,
wantAck: true,
channel: channel.config.index as Types.ChannelNumber
})
.then((id) => setMessageState(channel.config.index, id, "ack"))
.catch((e: Types.PacketError) =>
setMessageState(channel.config.index, e.id, e.error)
);
});
return (
src/components/PageComponents/ModuleConfig/CannedMessage.tsx
+9 -11
View File
@@ -40,18 +40,16 @@ export const CannedMessage = (): JSX.Element => {
const onSubmit = handleSubmit((data) => {
if (connection) {
void toast.promise(
connection.setModuleConfig({
moduleConfig: {
payloadVariant: {
oneofKind: "cannedMessage",
cannedMessage: data
connection
.setModuleConfig({
moduleConfig: {
payloadVariant: {
oneofKind: "cannedMessage",
cannedMessage: data
}
}
},
callback: async () => {
reset({ ...data });
await Promise.resolve();
}
}),
})
.then(() => reset({ ...data })),
{
loading: "Saving...",
success: "Saved Canned Message Config, Restarting Node",
src/components/PageComponents/ModuleConfig/ExternalNotification.tsx
+9 -11
View File
@@ -30,18 +30,16 @@ export const ExternalNotification = (): JSX.Element => {
const onSubmit = handleSubmit((data) => {
if (connection) {
void toast.promise(
connection.setModuleConfig({
moduleConfig: {
payloadVariant: {
oneofKind: "externalNotification",
externalNotification: data
connection
.setModuleConfig({
moduleConfig: {
payloadVariant: {
oneofKind: "externalNotification",
externalNotification: data
}
}
},
callback: async () => {
reset({ ...data });
await Promise.resolve();
}
}),
})
.then(() => reset({ ...data })),
{
loading: "Saving...",
success: "Saved External Notification Config, Restarting Node",
src/components/PageComponents/ModuleConfig/MQTT.tsx
+9 -11
View File
@@ -37,18 +37,16 @@ export const MQTT = (): JSX.Element => {
const onSubmit = handleSubmit((data) => {
if (connection) {
void toast.promise(
connection.setModuleConfig({
moduleConfig: {
payloadVariant: {
oneofKind: "mqtt",
mqtt: data
connection
.setModuleConfig({
moduleConfig: {
payloadVariant: {
oneofKind: "mqtt",
mqtt: data
}
}
},
callback: async () => {
reset({ ...data });
await Promise.resolve();
}
}),
})
.then(() => reset({ ...data })),
{
loading: "Saving...",
success: "Saved MQTT Config, Restarting Node",
src/components/PageComponents/ModuleConfig/RangeTest.tsx
+9 -11
View File
@@ -31,18 +31,16 @@ export const RangeTest = (): JSX.Element => {
const onSubmit = handleSubmit((data) => {
if (connection) {
void toast.promise(
connection.setModuleConfig({
moduleConfig: {
payloadVariant: {
oneofKind: "rangeTest",
rangeTest: data
connection
.setModuleConfig({
moduleConfig: {
payloadVariant: {
oneofKind: "rangeTest",
rangeTest: data
}
}
},
callback: async () => {
reset({ ...data });
await Promise.resolve();
}
}),
})
.then(() => reset({ ...data })),
{
loading: "Saving...",
success: "Saved Range Test Config, Restarting Node",
src/components/PageComponents/ModuleConfig/Serial.tsx
+9 -11
View File
@@ -31,18 +31,16 @@ export const Serial = (): JSX.Element => {
const onSubmit = handleSubmit((data) => {
if (connection) {
void toast.promise(
connection.setModuleConfig({
moduleConfig: {
payloadVariant: {
oneofKind: "serial",
serial: data
connection
.setModuleConfig({
moduleConfig: {
payloadVariant: {
oneofKind: "serial",
serial: data
}
}
},
callback: async () => {
reset({ ...data });
await Promise.resolve();
}
}),
})
.then(() => reset({ ...data })),
{
loading: "Saving...",
success: "Saved Serial Config, Restarting Node",
src/components/PageComponents/ModuleConfig/StoreForward.tsx
+9 -11
View File
@@ -31,18 +31,16 @@ export const StoreForward = (): JSX.Element => {
const onSubmit = handleSubmit((data) => {
if (connection) {
void toast.promise(
connection.setModuleConfig({
moduleConfig: {
payloadVariant: {
oneofKind: "storeForward",
storeForward: data
connection
.setModuleConfig({
moduleConfig: {
payloadVariant: {
oneofKind: "storeForward",
storeForward: data
}
}
},
callback: async () => {
reset({ ...data });
await Promise.resolve();
}
}),
})
.then(() => reset({ ...data })),
{
loading: "Saving...",
success: "Saved Store & Forward Config, Restarting Node",
src/components/PageComponents/ModuleConfig/Telemetry.tsx
+10 -9
View File
@@ -31,18 +31,19 @@ export const Telemetry = (): JSX.Element => {
const onSubmit = handleSubmit((data) => {
if (connection) {
void toast.promise(
connection.setModuleConfig({
moduleConfig: {
payloadVariant: {
oneofKind: "telemetry",
telemetry: data
connection
.setModuleConfig({
moduleConfig: {
payloadVariant: {
oneofKind: "telemetry",
telemetry: data
}
}
},
callback: async () => {
})
.then(async () => {
reset({ ...data });
await Promise.resolve();
}
}),
}),
{
loading: "Saving...",
success: "Saved Telemetry Config, Restarting Node",
src/core/stores/deviceStore.ts
+21 -10
View File
@@ -15,16 +15,19 @@ export type Page =
| "info"
| "logs";
export interface MessageWithAck extends Types.MessagePacket {
ack: boolean;
export interface MessageWithState extends Types.MessagePacket {
state: MessageState;
}
export interface WaypointIDWithAck extends Omit<Types.WaypointPacket, "data"> {
export interface WaypointIDWithState
extends Omit<Types.WaypointPacket, "data"> {
waypointID: number;
ack: boolean;
state: MessageState;
}
export type AllMessageTypes = MessageWithAck | WaypointIDWithAck;
export type AllMessageTypes = MessageWithState | WaypointIDWithState;
export type MessageState = "ack" | "waiting" | Protobuf.Routing_Error;
export interface Channel {
config: Protobuf.Channel;
@@ -77,10 +80,14 @@ export interface Device {
addUser: (user: Types.UserPacket) => void;
addPosition: (position: Types.PositionPacket) => void;
addConnection: (connection: Types.ConnectionType) => void;
addMessage: (message: MessageWithAck) => void;
addWaypointMessage: (message: WaypointIDWithAck) => void;
addMessage: (message: MessageWithState) => void;
addWaypointMessage: (message: WaypointIDWithState) => void;
addDeviceMetadataMessage: (metadata: Types.DeviceMetadataPacket) => void;
ackMessage: (channelIndex: number, messageId: number) => void;
setMessageState: (
channelIndex: number,
messageId: number,
state: MessageState
) => void;
setImportDialogOpen: (open: boolean) => void;
setQRDialogOpen: (open: boolean) => void;
setShutdownDialogOpen: (open: boolean) => void;
@@ -517,7 +524,11 @@ export const useDeviceStore = create<DeviceState>((set, get) => ({
})
);
},
ackMessage: (channelIndex: number, messageId: number) => {
setMessageState: (
channelIndex: number,
messageId: number,
state: MessageState
) => {
set(
produce<DeviceState>((draft) => {
const device = draft.devices.get(id);
@@ -529,7 +540,7 @@ export const useDeviceStore = create<DeviceState>((set, get) => ({
(msg) => msg.packet.id === messageId
);
if (message) {
message.ack = true;
message.state = state;
}
})
);
src/core/subscriptions.ts
+2 -2
View File
@@ -65,7 +65,7 @@ export const subscribeAll = (
device.addWaypoint(data);
device.addWaypointMessage({
waypointID: data.id,
ack: rest.packet.from !== myNodeNum,
state: rest.packet.from !== myNodeNum ? "ack" : "waiting",
...rest
});
});
@@ -107,7 +107,7 @@ export const subscribeAll = (
connection.events.onMessagePacket.subscribe((messagePacket) => {
device.addMessage({
...messagePacket,
ack: messagePacket.packet.from !== myNodeNum
state: messagePacket.packet.from !== myNodeNum ? "ack" : "waiting"
});
});