opt: restore #47, optimize StopAtEntry message (#74)

* opt: restore #47, optimize StopAtEngry message

* opt: restore #47, optimize StopAtEngry message

* opt: restore #47, optimize StopAtEngry message

Author: talisk

src/renderer/components/connection/DeviceSelect.tsx

@@ -17,13 +17,16 @@ import { useEffect, useMemo } from 'react';
 import './DeviceSelect.scss';
 import IconPlatform from './IconPlatform/IconPlatform';
 import useldtConnection from '@/renderer/ldt/store/ldtConnection';
+import { getStopAtEntry } from '@/renderer/utils/switchUtils';
 
 export default function DeviceSelect() {
   const { deviceList, selectedDevice, setSelectedDevice } = useConnection();
   const { selectedDevice: currentDevice, setCurrentDevice } = useldtConnection();
 
   useEffect(() => {
     setCurrentDevice(xdbDriver.getCurrentDevice());
+    getStopAtEntry('DEFAULT');
+    getStopAtEntry('MTS');
   }, [selectedDevice]);
 
   function combieDevices(groupKey: 'App' | 'deviceModel' = 'App'): IDevice[] {

src/renderer/hooks/connection.ts

@@ -18,6 +18,7 @@ import debugDriver from '../utils/debugDriver';
 import create from '../utils/flooks';
 import { queryService } from '../utils/query';
 import { sendStatisticsEvent } from '../utils/statisticsUtils';
+import * as switchUtils from '../utils/switchUtils';
 
 export type ConnectionStoreType = ReturnType<typeof connectionStore>;
 
@@ -390,42 +391,62 @@ const connectionStore = (store: any) => ({
     }
   },
 
-  async setStopAtEntry(value: boolean) {
-    const { selectedDevice } = store() as ConnectionStoreType;
+  async setStopAtEntryLegacy(value: boolean) {
+    const { selectedDevice, deviceInfoMap } = store() as ConnectionStoreType;
     const { clientId } = selectedDevice;
-    if (clientId) {
+    if (clientId === undefined) {
+      return;
+    }
+    try {
+      const deviceInfo = deviceInfoMap[clientId];
+      if (deviceInfo === undefined) {
+        return;
+      }
       await debugDriver.sendCustomMessageAsync({
         type: ECustomDataType.D2RStopAtEntry,
         params: { stop_at_entry: value },
         useParamsAsData: true,
         clientId
       });
-      const { deviceInfoMap } = store() as ConnectionStoreType;
-      const deviceInfo = deviceInfoMap[clientId];
-      if (deviceInfo) {
-        deviceInfo.stopAtEntry = value;
-        store({ deviceInfoMap: { ...deviceInfoMap } });
-      }
+      deviceInfo.stopAtEntry = value;
+      store({ deviceInfoMap: { ...deviceInfoMap } });
+    } catch (error: any) {
+      console.error(error.toString());
     }
   },
-  async setStopLepusAtEntry(value: boolean) {
-    const { selectedDevice } = store() as ConnectionStoreType;
+  setStopAtEntry(value: boolean) {
+    switchUtils.setStopAtEntry('DEFAULT', value);
+    const { setStopAtEntryLegacy } = store();
+    setStopAtEntryLegacy(value);
+  },
+  async setStopLepusAtEntryLegacy(value: boolean) {
+    const { selectedDevice, deviceInfoMap } = store() as ConnectionStoreType;
     const { clientId } = selectedDevice;
-    if (clientId) {
+    if (clientId === undefined) {
+      return;
+    }
+    try {
+      const deviceInfo = deviceInfoMap[clientId];
+      if (deviceInfo === undefined) {
+        return;
+      }
       await debugDriver.sendCustomMessageAsync({
         type: ECustomDataType.D2RStopLepusAtEntry,
         params: { stop_at_entry: value },
         useParamsAsData: true,
         clientId
       });
-      const { deviceInfoMap } = store() as ConnectionStoreType;
-      const deviceInfo = deviceInfoMap[clientId];
-      if (deviceInfo) {
-        deviceInfo.stopLepusAtEntry = value;
-        store({ deviceInfoMap: { ...deviceInfoMap } });
-      }
+      deviceInfo.stopLepusAtEntry = value;
+      store({ deviceInfoMap: { ...deviceInfoMap } });
+    } catch (error: any) {
+      console.error(error.toString());
     }
   },
+  setStopLepusAtEntry(value: boolean) {
+    switchUtils.setStopAtEntry('MTS', value);
+    const { setStopLepusAtEntryLegacy } = store();
+    setStopLepusAtEntryLegacy(value);
+  },
   updateSessionScreenshot(sessionId: number, data: string) {
     const { deviceInfoMap, selectedDevice } = store() as ConnectionStoreType;
     const sessions = deviceInfoMap[selectedDevice.clientId ?? 0]?.sessions;

src/renderer/utils/switchUtils.ts

@@ -0,0 +1,58 @@
+// Copyright 2024 The Lynx Authors. All rights reserved.
+// Licensed under the Apache License Version 2.0 that can be found in the
+// LICENSE file in the root directory of this source tree.
+
+import debugDriver from './debugDriver';
+import { getStore } from './flooks';
+import useConnection from '../hooks/connection';
+
+function updateStopAtEntry(type: string, value: boolean) {
+  const currentClientId = debugDriver.getSelectClientId();
+  if (currentClientId === undefined) {
+    return;
+  }
+  const { deviceInfoMap, setDeviceInfoMap } = getStore(useConnection);
+  const newDeviceInfoMap = { ...deviceInfoMap };
+  const deviceInfo = newDeviceInfoMap[currentClientId];
+  if (deviceInfo === undefined) {
+    return;
+  }
+  if (type === 'MTS') {
+    deviceInfo.stopLepusAtEntry = value;
+  } else if (type === 'DEFAULT') {
+    deviceInfo.stopAtEntry = value;
+  }
+  setDeviceInfoMap(newDeviceInfoMap);
+}
+
+export async function getStopAtEntry(type: string) {
+  try {
+    const result = await debugDriver.sendCustomMessageAsync({
+      type: 'GetStopAtEntry',
+      params: { type }
+    });
+    const { value } = result;
+    if (value === undefined) {
+      return;
+    }
+    updateStopAtEntry(type, value);
+  } catch (error: any) {
+    console.error('getStopAtEntry error:', type, error);
+  }
+}
+
+export async function setStopAtEntry(type: string, value: boolean) {
+  try {
+    const result = await debugDriver.sendCustomMessageAsync({
+      type: 'SetStopAtEntry',
+      params: { type, value }
+    });
+    const { value: resultValue } = result;
+    if (resultValue === undefined) {
+      return;
+    }
+    updateStopAtEntry(type, resultValue);
+  } catch (error: any) {
+    console.error('setStopAtEntry error:', type, value, error);
+  }
+}