fix(server) wait for init done

wirewirewirewire · Nov 26, 2024 · d2a127f · d2a127f
1 parent 518d1a6
commit d2a127f
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 13 deletions.
diff --git a/app/hwcontrol.js b/app/hwcontrol.js
@@ -222,19 +222,23 @@ function pjlinkSet(ip, command) {
 
 module.exports = {
   init: async function () {
-    beamerArray = BEAMER_IP.split(",");
-    if (beamerArray.length >= 1) {
-      console.log("[INIT] projector defined: " + beamerArray);
-      console.log("[INIT] PJLINK data:");
-      for (let index = 0; index < beamerArray.length; index++) {
-        const element = beamerArray[index];
-        //await sendSerialProjector("7E3030303020310D", element); //power on optoma
-        var status = await pjlinkSet(element, "status");
-        console.log(status);
+    return new Promise(async (resolve, reject) => {
+      beamerArray = BEAMER_IP.split(",");
+      if (beamerArray.length >= 1) {
+        console.log("[INIT] projector defined: " + beamerArray);
+        console.log("[INIT] PJLINK data:");
+        for (let index = 0; index < beamerArray.length; index++) {
+          const element = beamerArray[index];
+          //await sendSerialProjector("7E3030303020310D", element); //power on optoma
+          var status = await pjlinkSet(element, "status");
+          console.log(status);
+        }
+        resolve(true);
+      } else {
+        console.log("[INIT] NO projector defined");
+        resolve(false);
       }
-    } else {
-      console.log("[INIT] NO projector defined");
-    }
+    });
   },
 
   setScreenPower: async function (powerState, screenNumber = 0, ddc = false) {

diff --git a/server.js b/server.js
@@ -89,7 +89,7 @@ httpServer2.listen(PORT2, () => {
 init();
 
 async function init() {
-  control.init();
+  await control.init();
   let displayCount = (await control.getDisplayCount()).data;
   if (displayCount < 1) {
     if (AUTOREBOOT) {