Merge branch 'master' into issue-486-are-you-sure-dialog

src/core/stores/deviceStore.ts

@@ -1,5 +1,5 @@
 import { create } from "@bufbuild/protobuf";
-import { Protobuf, Types } from "@meshtastic/core";
+import { MeshDevice, Protobuf, Types } from "@meshtastic/core";
 import { produce } from "immer";
 import { createContext, useContext } from "react";
 import { create as createStore } from "zustand";
@@ -29,6 +29,10 @@ export type DialogVariant =
   | "nodeDetails"
   | "unsafeRoles";
 
+type QueueStatus = {
+  res: number, free: number, maxlen: number
+}
+
 export interface Device {
   id: number;
   status: Types.DeviceStatusEnum;
@@ -48,13 +52,15 @@ export interface Device {
     number,
     Types.PacketMetadata<Protobuf.Mesh.RouteDiscovery>[]
   >;
-  connection?: Types.ConnectionType;
+  connection?: MeshDevice;
   activePage: Page;
   activeNode: number;
   waypoints: Protobuf.Mesh.Waypoint[];
   // currentMetrics: Protobuf.DeviceMetrics;
   pendingSettingsChanges: boolean;
   messageDraft: string;
+  queueStatus: QueueStatus,
+  isQueueingMessages: boolean,
   dialog: {
     import: boolean;
     QR: boolean;
@@ -67,6 +73,7 @@ export interface Device {
     unsafeRoles: boolean;
   };
 
+
   setStatus: (status: Types.DeviceStatusEnum) => void;
   setConfig: (config: Protobuf.Config.Config) => void;
   setModuleConfig: (config: Protobuf.ModuleConfig.ModuleConfig) => void;
@@ -82,7 +89,7 @@ export interface Device {
   addNodeInfo: (nodeInfo: Protobuf.Mesh.NodeInfo) => void;
   addUser: (user: Types.PacketMetadata<Protobuf.Mesh.User>) => void;
   addPosition: (position: Types.PacketMetadata<Protobuf.Mesh.Position>) => void;
-  addConnection: (connection: Types.ConnectionType) => void;
+  addConnection: (connection: MeshDevice) => void;
   addMessage: (message: MessageWithState) => void;
   addTraceRoute: (
     traceroute: Types.PacketMetadata<Protobuf.Mesh.RouteDiscovery>,
@@ -101,6 +108,7 @@ export interface Device {
   getDialogOpen: (dialog: DialogVariant) => boolean;
   processPacket: (data: ProcessPacketParams) => void;
   setMessageDraft: (message: string) => void;
+  setQueueStatus: (status: QueueStatus) => void;
 }
 
 export interface DeviceState {
@@ -140,6 +148,10 @@ export const useDeviceStore = createStore<DeviceState>((set, get) => ({
           activePage: "messages",
           activeNode: 0,
           waypoints: [],
+          queueStatus: {
+            res: 0, free: 0, maxlen: 0
+          },
+          isQueueingMessages: false,
           dialog: {
             import: false,
             QR: false,
@@ -520,7 +532,6 @@ export const useDeviceStore = createStore<DeviceState>((set, get) => ({
             set(
               produce<DeviceState>((draft) => {
                 console.log("addTraceRoute called");
-                console.log(traceroute);
                 const device = draft.devices.get(id);
                 if (!device) {
                   return;
@@ -642,6 +653,17 @@ export const useDeviceStore = createStore<DeviceState>((set, get) => ({
               }),
             );
           },
+          setQueueStatus: (status: QueueStatus) => {
+            set(
+              produce<DeviceState>((draft) => {
+                const device = draft.devices.get(id);
+                if (device) {
+                  device.queueStatus = status;
+                  device.queueStatus.free >= 10 ? true : false
+                }
+              }),
+            );
+          }
         });
       }),
     );