Fix concurrency issue when posting characteristics and animation name

client/src/views/LampPage.vue

@@ -145,11 +145,10 @@ function onNewAnimation() {
 }
 
 function applyAnimation() {
-  axiosInstance.post("/lamp/animation", {
-    animation: currentConfig.selectedAnimation,
+  axiosInstance.post("/lamp/characteristics", {
+    characteristics: characteristics.array,
+    animation: currentConfig.selectedAnimation
   });
-
-  axiosInstance.post("/lamp/characteristics", characteristics.array);
 }
 
 function onBrightnessChange(brightness: number) {

server/lamp/index.ts

@@ -117,7 +117,7 @@ export function initLamp() {
   });
 
   lamp.post("/characteristics", (req, res) => {
-    const characteristics: Characteristic[] = req.body;
+    const { characteristics, animation }: { characteristics: Characteristic[], animation: string } = req.body;
     characteristics.forEach((c) => {
       if (c.type === "color") {
         if (c.value.type === "static") {
@@ -132,10 +132,11 @@ export function initLamp() {
         }
       }
     });
-    currentCharacteristics[currentAnimation] = characteristics;
+
+    currentCharacteristics[animation] = characteristics;
 
     startLamp();
-    res.send("OK");
+    changeAnimation(animation, res);
   });
 
   lamp.get("/animation", (req, res) => {
@@ -144,7 +145,10 @@ export function initLamp() {
 
   lamp.post("/animation", (req, res) => {
     const animation: string = req.body.animation;
+    changeAnimation(animation, res);
+  });
 
+  function changeAnimation(animation: string, res: express.Response) {
     if (animation.toLowerCase() === "off") {
       lampShouldStop = true;
       res.send("OK");
@@ -159,7 +163,7 @@ export function initLamp() {
     currentAnimation = animation;
     startLamp();
     res.send("OK");
-  });
+  }
 
   lamp.get("/brightness", (req, res) => {
     res.send({ brightness: display.brightness });