fixed switch list sync, new device/svg events

persist lights view single map of switches in lights ui
xyven1 · Nov 25, 2023 · 5fa1ccf · 5fa1ccf
1 parent 5f23424
commit 5fa1ccf
Show file tree

Hide file tree

Showing 4 changed files with 300 additions and 147 deletions.
diff --git a/lib/types/socket.ts b/lib/types/socket.ts
@@ -1,5 +1,5 @@
-import * as Irrigation from "./irrigationConfig.js";
 import { type Branded } from "./brand.js";
+import * as Irrigation from "./irrigationConfig.js";
 
 export type SerialNumber = Branded<string, "SerialNumber">;
 
@@ -22,7 +22,6 @@ export type Region = {
   title: string;
   sn: SerialNumber;
   stroke?: number;
-  sw?: Switch;
 };
 
 export type SvgLayer = {
@@ -118,6 +117,8 @@ export type ServerToClientEvents = {
   // for lights
   stateChange: (sn: SerialNumber, state: number) => void;
   brightnessChange: (sn: SerialNumber, brightness: number) => void;
+  newDevice: (newDevice: Switch) => void;
+  newSvg: (svg: Svg) => void;
   // for irrigation
   irrigationConfigChange: (config: Irrigation.Config) => void;
   irrigationStateChange: (state: Irrigation.State) => void;

diff --git a/server/src/manageLights.ts b/server/src/manageLights.ts
@@ -67,6 +67,12 @@ export default (io: AppServer): void => {
   function manageClient(deviceInfo: DeviceInfo): void {
     const client = wemo.client(deviceInfo);
     devices.set(client.device.serialNumber, client);
+    io.emit("newDevice", {
+      name: client.device.friendlyName,
+      serialNumber: client.device.serialNumber,
+      state: client.device.binaryState,
+      brightness: client.device.brightness,
+    });
 
     client.on("error", (err) => {
       console.error("Client error: %s", err);
@@ -120,16 +126,16 @@ export default (io: AppServer): void => {
   setInterval(discover, 10000);
 
   io.on("connection", (socket) => {
-    // returns switches from devices object to a callback function
     socket.on("getSwitches", (callback = () => {}) => {
-      console.log("getting switches");
       callback(
-        [...devices.values()].map((device) => ({
-          name: device.device.friendlyName,
-          serialNumber: device.device.serialNumber,
-          state: device.device.binaryState,
-          brightness: device.device.brightness,
-        }))
+        [...devices.values()].map((device) => {
+          return {
+            name: device.device.friendlyName,
+            serialNumber: device.device.serialNumber,
+            state: -1,
+            brightness: undefined,
+          };
+        })
       );
     });
 
@@ -174,7 +180,6 @@ export default (io: AppServer): void => {
     // allows client to toggle switches using serial number
     socket.on("toggleSwitch", async (serialNumber, wsCallback = () => {}) => {
       console.log("Toggling switch with serial number: " + serialNumber);
-      // io.emit("stateChange", serialNumber, 2);
       const device = devices.get(serialNumber);
       if (device !== undefined) {
         try {
@@ -311,6 +316,7 @@ export default (io: AppServer): void => {
         region.sn = data.sn;
         fs.writeFileSync(svgPath, JSON.stringify(svg, null, 2));
         wsCallback({ ok: true });
+        socket.broadcast.emit("newSvg", svg);
       } catch (err: any) {
         console.error(err);
         if (err instanceof Error)

diff --git a/ui/src/store/lights.ts b/ui/src/store/lights.ts
@@ -1,11 +1,17 @@
 import { defineStore } from "pinia";
 import { ref } from "vue";
 
+export enum View {
+  List,
+  FloorPlan,
+}
+
 export const useLightsStore = defineStore(
   "lights",
   () => {
     return {
       layer: ref(0),
+      view: ref(View.FloorPlan),
     };
   },
   {