WIP updates

src/core/stores/appStore.ts

@@ -1,11 +1,24 @@
+import { produce } from "immer";
 import create from "zustand";
 
+export interface RasterSource {
+  enabled: boolean;
+  title: string;
+  tiles: string[];
+  tileSize: number;
+}
+
 interface AppState {
   selectedDevice: number;
   devices: {
     id: number;
     num: number;
   }[];
+  rasterSources: RasterSource[];
+
+  setRasterSources: (sources: RasterSource[]) => void;
+  addRasterSource: (source: RasterSource) => void;
+  removeRasterSource: (index: number) => void;
 
   setSelectedDevice: (deviceId: number) => void;
   addDevice: (device: { id: number; num: number }) => void;
@@ -16,17 +29,40 @@ export const useAppStore = create<AppState>()((set) => ({
   selectedDevice: 0,
   devices: [],
   currentPage: "messages",
+  rasterSources: [],
+
+  setRasterSources: (sources: RasterSource[]) => {
+    set(
+      produce<AppState>((draft) => {
+        draft.rasterSources = sources;
+      })
+    );
+  },
+  addRasterSource: (source: RasterSource) => {
+    set(
+      produce<AppState>((draft) => {
+        draft.rasterSources.push(source);
+      })
+    );
+  },
+  removeRasterSource: (index: number) => {
+    set(
+      produce<AppState>((draft) => {
+        draft.rasterSources.splice(index, 1);
+      })
+    );
+  },
 
   setSelectedDevice: (deviceId) =>
     set(() => ({
-      selectedDevice: deviceId,
+      selectedDevice: deviceId
     })),
   addDevice: (device) =>
     set((state) => ({
-      devices: [...state.devices, device],
+      devices: [...state.devices, device]
     })),
   removeDevice: (deviceId) =>
     set((state) => ({
-      devices: state.devices.filter((device) => device.id !== deviceId),
-    })),
+      devices: state.devices.filter((device) => device.id !== deviceId)
+    }))
 }));

src/core/subscriptions.ts

@@ -1,14 +1,13 @@
 import { toast } from "react-hot-toast";
 
 import type { Device } from "@core/stores/deviceStore.js";
-import { Protobuf, Types } from "@meshtastic/meshtasticjs";
+import { Types } from "@meshtastic/meshtasticjs";
 
 export const subscribeAll = (
   device: Device,
   connection: Types.ConnectionType
 ) => {
   let myNodeNum = 0;
-  connection.setLogLevel(Protobuf.LogRecord_Level.TRACE);
 
   // onLogEvent
   // onMeshHeartbeat
@@ -43,26 +42,31 @@ export const subscribeAll = (
     device.addWaypointMessage({
       waypointID: data.id,
       ack: rest.packet.from !== myNodeNum,
-      ...rest,
+      ...rest
     });
   });
 
   connection.onMyNodeInfo.subscribe((nodeInfo) => {
+    console.log("^^^^^^^ GOT MY NODE INFO");
+
     device.setHardware(nodeInfo);
     myNodeNum = nodeInfo.myNodeNum;
   });
 
   connection.onUserPacket.subscribe((user) => {
+    console.log("^^^^^^^ GOT USER");
     device.addUser(user);
   });
 
   connection.onPositionPacket.subscribe((position) => {
+    console.log("^^^^^^^ GOT POSITION");
     device.addPosition(position);
   });
 
   connection.onNodeInfoPacket.subscribe((nodeInfo) => {
+    console.log("^^^^^^^ GOT NODE INFO");
     toast(`New Node Discovered: ${nodeInfo.data.user?.shortName ?? "UNK"}`, {
-      icon: "🔎",
+      icon: "🔎"
     });
     device.addNodeInfo(nodeInfo);
   });
@@ -71,7 +75,7 @@ export const subscribeAll = (
     device.addChannel({
       config: channel.data,
       lastInterraction: new Date(),
-      messages: [],
+      messages: []
     });
   });
   connection.onConfigPacket.subscribe((config) => {
@@ -84,7 +88,7 @@ export const subscribeAll = (
   connection.onMessagePacket.subscribe((messagePacket) => {
     device.addMessage({
       ...messagePacket,
-      ack: messagePacket.packet.from !== myNodeNum,
+      ack: messagePacket.packet.from !== myNodeNum
     });
   });
 };

src/core/utils/bitwise.ts

@@ -1,9 +1,15 @@
+export interface enumLike {
+  [key: number]: string | number;
+}
+
 export const bitwiseEncode = (enumValues: number[]): number => {
   return enumValues.reduce((acc, curr) => acc | curr, 0);
 };
 
-export const bitwiseDecode = (value: number, decodeEnum: object): number[] => {
+export const bitwiseDecode = (
+  value: number,
+  decodeEnum: enumLike
+): number[] => {
   const enumValues = Object.keys(decodeEnum).map(Number).filter(Boolean);
-
   return enumValues.map((b) => value & b).filter(Boolean);
 };