[Feat] Further PLS ctrl & childProc perf improvements

src/aura/ui/js/plsConnectionManager.js

@@ -15,19 +15,91 @@
   const REQUIRE_BASE = "../../aura/ui";
   const __SCOPE = "desktopAssistant";
 
+  const PLS_REG_PATH = "ProxyLayerServices";
+
   const { pushMsgHandler } = require(`${REQUIRE_BASE}/pls/pushHandler`);
+  const RegistryManager = require(`${REQUIRE_BASE}/../init/shared/registryManager`);
+
+  const registryManager = new RegistryManager();
 
   /** @type {number} */
   let failedCounter = 0;
   /** @type {boolean} */
   let isErrorOccurred = false;
 
+  /** @type {number} */
+  let plsPort = 22077;
+  /** @type {"wss" | "ws"} */
+  let plsProtocol = "wss";
+
+  /** @type {boolean} */
+  let isRetrying = false;
+
+  /** @type {any} */
+  let curSendListener = null;
+
   const sendRetryStatusToMain = (/** @type {Boolean} */ status) => {
     global.ipcRenderer.invoke(`${IPC_METHOD_BASE}.post.updateRetryStatus`, {
       success: status,
     });
   };
 
+  const calcFullAuthToken = (/** @type {string} */ authToken) => {
+    const trustToken = window._ACCEPT_DATA.getData("deviceId");
+    const conjToken = authToken + "AuraXAuth" + trustToken + "NeverEnds";
+    const crypto = require("crypto");
+    return crypto.createHash("sha512").update(conjToken).digest("hex");
+  };
+
+  const clearIpcListener = () => {
+    if (curSendListener) {
+      global.ipcRenderer.off(
+        `${IPC_METHOD_BASE}.ws.post.onReqSendMsg`,
+        curSendListener
+      );
+      curSendListener = null;
+    }
+  };
+
+  const startConnPlsProc = async (updatedPlsStats) => {
+    const authTokenRet = await registryManager.readRegKey(
+      PLS_REG_PATH,
+      "AuthToken",
+      true
+    );
+    if (authTokenRet.success) {
+      updatedPlsStats.authToken = authTokenRet.data;
+      // @ts-expect-error
+      global.__HUGO_AURA__.plsStats.authToken = authTokenRet.data;
+    } else {
+      sendRetryStatusToMain(false);
+      return;
+    }
+    const portRet = await registryManager.readRegKey(
+      PLS_REG_PATH,
+      "WsPort",
+      true
+    );
+    if (portRet.success) {
+      try {
+        plsPort = Number(portRet.data);
+      } catch {
+        console.warn(
+          `[HugoAura / UI / PLS Manager] Invalid PLS port: ${portRet.data}`
+        );
+      }
+    }
+    const protoRet = await registryManager.readRegKey(
+      PLS_REG_PATH,
+      "Protocol",
+      true
+    );
+    if (protoRet.success) {
+      plsProtocol = protoRet.data;
+    }
+    createPlsConnection(updatedPlsStats.authToken, connectionResultCallback);
+  };
+
   /**
    *
    * @param {string} authToken
@@ -43,9 +115,11 @@
       return;
     }
 
+    const fullAuthToken = calcFullAuthToken(authToken);
+
     /** @type {WebSocket} */
     const plsWs = new WebSocket(
-      `wss://pls.hugoaura.local:22077/?auth=${authToken}`
+      `${plsProtocol}://pls.hugoaura.local:${plsPort}/?auth=${fullAuthToken}`
     );
 
     plsWs.onopen = () => {
@@ -59,6 +133,26 @@
     };
 
     plsWs.onclose = () => {
+      clearIpcListener();
+      if (global.__HUGO_AURA__.plsStats) {
+        if (global.__HUGO_AURA__.plsStats.status === "notReady") {
+          if (isRetrying) {
+            sendRetryStatusToMain(false);
+            return;
+          }
+          console.warn(
+            "[HugoAura / UI / PLS Manager / WARN] PLS not ready, try again after 10s..."
+          );
+          isRetrying = true;
+          setTimeout(async () => {
+            isRetrying = false;
+            startConnPlsProc(global.__HUGO_AURA__.plsStats);
+          }, 10000);
+          sendRetryStatusToMain(false);
+          return;
+        }
+      }
+
       console.error(
         "[HugoAura / UI / PLS Manager / ERROR] WebSocket connection closed."
       );
@@ -73,16 +167,18 @@
    * @param {WebSocket} wsObj
    */
   const registerSendReqListener = (wsObj) => {
+    clearIpcListener();
+    /**
+     *
+     * @param {import("electron").IpcRendererEvent} _evt
+     * @param {any} arg
+     */
+    curSendListener = (_evt, arg) => {
+      wsObj.send(JSON.stringify(arg));
+    };
     global.ipcRenderer.on(
       `${IPC_METHOD_BASE}.ws.post.onReqSendMsg`,
-      /**
-       *
-       * @param {import("electron").IpcRendererEvent} _evt
-       * @param {any} arg
-       */
-      (_evt, arg) => {
-        wsObj.send(JSON.stringify(arg));
-      }
+      curSendListener
     );
   };
 
@@ -151,6 +247,11 @@
   const initPlsConnection = async () => {
     if (!global.__HUGO_AURA__.plsStats) return;
 
+    if (isRetrying) {
+      sendRetryStatusToMain(false);
+      return;
+    }
+
     failedCounter = 0;
     isErrorOccurred = false;
 
@@ -173,7 +274,7 @@
     }
 
     const isPlsFolderExists = (
-      await global.ipcRenderer.invoke(`${IPC_METHOD_BASE}.getPlsFolderExists`)
+      await global.ipcRenderer.invoke(`${IPC_METHOD_BASE}.getPlsBinExists`)
     ).data.isExists;
     updatedPlsStats.installed = isPlsFolderExists;
 
@@ -189,15 +290,11 @@
       updatedPlsStats
     );
 
-    const startConnPls = () => {
-      createPlsConnection(updatedPlsStats.authToken, connectionResultCallback);
-    };
-
     /*
     if (updatedPlsStats.detached && updatedPlsStats.installed) {
     */
     if (updatedPlsStats.installed) {
-      startConnPls();
+      await startConnPlsProc(updatedPlsStats);
     } else {
       sendRetryStatusToMain(false);
     }