Preparations for having data from multiple DTUs

Author: CommanderRedYT

src/api/ApiHandler.tsx

@@ -52,42 +52,52 @@ export const ApiProvider: FC<PropsWithChildren<unknown>> = ({ children }) => {
   console.log('new Api');
 
   useEffect(() => {
-    dispatch(setTriedToConnect({ triedToConnect: false }));
+    if (configIndex === null) {
+      console.log('ApiProvider - configIndex is null');
 
-    if (currentConfiguration && configIndex !== null) {
+      return;
+    }
+
+    dispatch(setTriedToConnect({ triedToConnect: false, index: configIndex }));
+
+    if (currentConfiguration) {
       console.info(
         'Initializing API Handler',
         currentConfiguration,
         configIndex,
       );
 
       api.registerOnDisconnectedHandler(() => {
-        dispatch(clearOpenDtuState());
+        dispatch(clearOpenDtuState({ index: configIndex }));
       });
 
       api.disconnect();
 
       api.setConfig(currentConfiguration, configIndex);
 
       api.registerOnConnectedHandler(index => {
-        dispatch(setIsConnected({ isConnected: true }));
+        dispatch(setIsConnected({ isConnected: true, index: configIndex }));
         dispatch(setDeviceState({ deviceState: DeviceState.Connected, index }));
       });
 
       api.registerOnDisconnectedHandler(() => {
-        dispatch(setIsConnected({ isConnected: false }));
+        dispatch(setIsConnected({ isConnected: false, index: configIndex }));
       });
 
       api.registerLiveDataHandler((data, valid, index) => {
-        dispatch(setTriedToConnect({ triedToConnect: true }));
-        dispatch(setLiveData({ data, valid }));
+        dispatch(
+          setTriedToConnect({ triedToConnect: true, index: configIndex }),
+        );
+        dispatch(setLiveData({ data, valid, index: configIndex }));
         dispatch(setDeviceState({ deviceState: DeviceState.Connected, index }));
       });
 
       api.registerHttpStatusHandler(
         ({ systemStatus, networkStatus, ntpStatus, mqttStatus }, index) => {
           if (systemStatus) {
-            dispatch(setSystemStatus({ data: systemStatus }));
+            dispatch(
+              setSystemStatus({ data: systemStatus, index: configIndex }),
+            );
             dispatch(
               updateDtuHostname({
                 hostname: systemStatus.hostname,
@@ -103,15 +113,17 @@ export const ApiProvider: FC<PropsWithChildren<unknown>> = ({ children }) => {
           }
 
           if (networkStatus) {
-            dispatch(setNetworkStatus({ data: networkStatus }));
+            dispatch(
+              setNetworkStatus({ data: networkStatus, index: configIndex }),
+            );
           }
 
           if (ntpStatus) {
-            dispatch(setNtpStatus({ data: ntpStatus }));
+            dispatch(setNtpStatus({ data: ntpStatus, index: configIndex }));
           }
 
           if (mqttStatus) {
-            dispatch(setMqttStatus({ data: mqttStatus }));
+            dispatch(setMqttStatus({ data: mqttStatus, index: configIndex }));
           }
 
           setDeviceState({ deviceState: DeviceState.Connected, index });

src/components/OpenDTUValue.tsx

@@ -5,7 +5,7 @@ import { Text, useTheme } from 'react-native-paper';
 import type { ValueObject } from '@/types/opendtu/status';
 
 export interface OpenDTUValueProps {
-  statusValue?: ValueObject;
+  statusValue?: ValueObject | null;
   textWhenInvalid?: string;
   textProps?: Omit<TextProps<unknown>, 'children'>;
 }

src/database/index.tsx

@@ -244,7 +244,8 @@ const DatabaseProvider: FC<PropsWithChildren<unknown>> = ({ children }) => {
   const inverters = useAppSelector(
     state =>
       state.settings.selectedDtuConfig !== null
-        ? state.opendtu.liveData?.inverters ?? null
+        ? state.opendtu.dtuStates[state.settings.selectedDtuConfig]?.liveData
+            ?.inverters ?? null
         : null,
     (left, right) =>
       left === null && right === null

src/github/FetchHandler.tsx

@@ -9,6 +9,8 @@ import {
   setReleases,
 } from '@/slices/github';
 
+import useDeviceIndex from '@/hooks/useDeviceIndex';
+
 import ago from '@/utils/ago';
 
 import {
@@ -20,8 +22,11 @@ import { useAppDispatch, useAppSelector } from '@/store';
 
 const FetchHandler: FC = () => {
   const dispatch = useAppDispatch();
+  const index = useDeviceIndex();
 
-  const isConnected = useAppSelector(state => state.opendtu.isConnected);
+  const isConnected = useAppSelector(state =>
+    index === null ? undefined : state.opendtu.dtuStates[index]?.isConnected,
+  );
   const latestReleaseRefetchOk = useAppSelector(state =>
     state.github.latestRelease.lastUpdate
       ? ago(state.github.latestRelease.lastUpdate) > 1000 * 60 * 10 // 10 minutes

src/hooks/useDeviceIndex.ts

@@ -0,0 +1,7 @@
+import { useAppSelector } from '@/store';
+
+const useDeviceIndex = (): number | null => {
+  return useAppSelector(state => state.settings.selectedDtuConfig);
+};
+
+export default useDeviceIndex;

src/hooks/useDtuState.ts

@@ -0,0 +1,22 @@
+import type { EqualityFn } from 'react-redux';
+
+import type { OpenDTUDeviceState } from '@/types/opendtu/state';
+
+import useDeviceIndex from '@/hooks/useDeviceIndex';
+
+import { useAppSelector } from '@/store';
+
+const useDtuState = <T>(
+  selector: (state: OpenDTUDeviceState | undefined) => T,
+  equalityFn?: EqualityFn<T | undefined>,
+): T | undefined => {
+  const index = useDeviceIndex();
+
+  return useAppSelector(
+    state =>
+      index === null ? undefined : selector(state.opendtu.dtuStates[index]),
+    equalityFn,
+  );
+};
+
+export default useDtuState;

src/hooks/useHasLiveData.ts

@@ -13,13 +13,20 @@ const useHasLiveData = (): boolean => {
   );*/
 
   return useAppSelector(state => {
-    const liveData = state.opendtu.liveData;
+    const index = state.settings.selectedDtuConfig;
+
+    if (index === null) {
+      console.log('index is null');
+      return false;
+    }
+
+    const liveData = state.opendtu.dtuStates[index]?.liveData ?? null;
     if (liveData === null) {
       console.log('liveData is null');
       return false;
     }
 
-    const lastUpdate = liveData.lastUpdate;
+    const lastUpdate = liveData?.lastUpdate ?? null;
     if (lastUpdate === null) {
       console.log('lastUpdate is null');
       return false;

src/hooks/useIsConnected.ts

@@ -1,7 +1,15 @@
+import useDeviceIndex from '@/hooks/useDeviceIndex';
+
 import { useAppSelector } from '@/store';
 
 const useIsConnected = (): boolean => {
-  return useAppSelector(state => state.opendtu.isConnected);
+  const index = useDeviceIndex();
+
+  return useAppSelector(state =>
+    index === null
+      ? false
+      : state.opendtu.dtuStates[index]?.isConnected ?? false,
+  );
 };
 
 export default useIsConnected;

src/hooks/useLivedata.ts

@@ -6,9 +6,18 @@ import { useAppSelector } from '@/store';
 
 const useLivedata = <T>(
   selector: (state: LiveData | null) => T,
-  equalityFn?: EqualityFn<T>,
-): T => {
-  return useAppSelector(state => selector(state.opendtu.liveData), equalityFn);
+  equalityFn?: EqualityFn<T | null>,
+): T | null => {
+  const currentIndex = useAppSelector(
+    state => state.settings.selectedDtuConfig,
+  );
+  return useAppSelector(
+    state =>
+      currentIndex
+        ? selector(state.opendtu.dtuStates[currentIndex]?.liveData ?? null)
+        : null,
+    equalityFn,
+  );
 };
 
 export default useLivedata;

src/hooks/useTriedToConnect.ts

@@ -1,7 +1,15 @@
+import useDeviceIndex from '@/hooks/useDeviceIndex';
+
 import { useAppSelector } from '@/store';
 
 const useTriedToConnect = (): boolean => {
-  return useAppSelector(state => state.opendtu.triedToConnect);
+  const index = useDeviceIndex();
+
+  return useAppSelector(state =>
+    index === null
+      ? false
+      : state.opendtu.dtuStates[index]?.triedToConnect ?? false,
+  );
 };
 
 export default useTriedToConnect;