Merge pull request #33 from OpenDTU-App/multi-device-preparations

OpenDTU-App · Feb 3, 2024 · f4e7815 · f4e7815
2 parents b14d762 + a2e416e
commit f4e7815
Show file tree

Hide file tree

Showing 25 changed files with 306 additions and 93 deletions.
diff --git a/package.json b/package.json
@@ -16,6 +16,7 @@
     "ios": "react-native run-ios",
     "lint": "eslint .",
     "lint:fix": "eslint . --fix",
+    "typecheck": "tsc --noEmit",
     "start": "react-native start",
     "test": "jest --passWithNoTests",
     "postinstall": "yarn run npm-license-crawler -onlyDirectDependencies -json licenses.json && patch-package",

diff --git a/src/api/ApiHandler.tsx b/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 });

diff --git a/src/api/opendtuapi.ts b/src/api/opendtuapi.ts
@@ -69,7 +69,7 @@ class OpenDtuApi {
     this.baseUrl = baseUrl;
   }
 
-  public setUserString(userString: string): void {
+  public setUserString(userString: string | null): void {
     this.userString = userString;
   }
 
@@ -142,7 +142,7 @@ class OpenDtuApi {
     this.onDisconnectedHandler = null;
   }
 
-  private async getSystemStatusFromUrl(
+  public async getSystemStatusFromUrl(
     url: URL,
   ): Promise<GetSystemStatusReturn> {
     // GET <url>/api/system/status
@@ -288,13 +288,15 @@ class OpenDtuApi {
       return;
     }
 
-    if (this.baseUrl && this.userString) {
+    if (this.baseUrl) {
       const urlObject = new URL(this.baseUrl);
       const authString = this.getAuthString();
       const protocol = urlObject.protocol === 'https:' ? 'wss' : 'ws';
       const host = urlObject.host;
 
-      const url = `${protocol}://${authString}${host}/livedata`;
+      const url = `${protocol}://${authString ?? ''}${host}/livedata`;
+
+      console.log(`Connecting websocket to ${url}`);
 
       this.ws = new WebSocket(url);
 
@@ -466,9 +468,13 @@ class OpenDtuApi {
     );
   }
 
-  private getAuthString(): string {
+  private getAuthString(): string | null {
     let user = null;
 
+    if (!this.userString) {
+      return null;
+    }
+
     try {
       user = JSON.parse(this.userString || '');
     } catch {
@@ -492,6 +498,10 @@ class OpenDtuApi {
       'GET',
     );
 
+    if (!res) {
+      return null;
+    }
+
     if (res.status === 200) {
       return await res.json();
     }
@@ -506,6 +516,10 @@ class OpenDtuApi {
 
     const res = await this.makeAuthenticatedRequest('/api/ntp/status', 'GET');
 
+    if (!res) {
+      return null;
+    }
+
     if (res.status === 200) {
       return await res.json();
     }
@@ -520,6 +534,10 @@ class OpenDtuApi {
 
     const res = await this.makeAuthenticatedRequest('/api/mqtt/status', 'GET');
 
+    if (!res) {
+      return null;
+    }
+
     if (res.status === 200) {
       return await res.json();
     }
@@ -531,7 +549,7 @@ class OpenDtuApi {
     route: string,
     method: string,
     body: string | null = null,
-  ): Promise<Response> {
+  ): Promise<Response | null> {
     const authString = this.getAuthString();
 
     const controller = new AbortController();
@@ -546,8 +564,8 @@ class OpenDtuApi {
       signal: controller.signal,
       headers: {
         'X-Requested-With': 'XMLHttpRequest',
-        Authorization: 'Basic ' + authString,
         'Content-Type': 'application/json',
+        ...(authString ? { Authorization: 'Basic ' + authString } : {}),
       },
     };
 
@@ -558,12 +576,16 @@ class OpenDtuApi {
     const url = `${authString}${this.baseUrl}${route}`;
 
     console.log('makeAuthenticatedRequest', url, requestOptions);
-    const res = await fetch(url, requestOptions);
-    if (res.status === 200) {
+
+    try {
+      const res = await fetch(url, requestOptions);
       clearTimeout(abortTimeout);
-    }
 
-    return res;
+      return res;
+    } catch (error) {
+      console.log('makeAuthenticatedRequest error', error);
+      return null;
+    }
   }
 }
 

diff --git a/src/components/OpenDTUValue.tsx b/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'>;
 }

diff --git a/src/database/index.tsx b/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

diff --git a/src/github/FetchHandler.tsx b/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

diff --git a/src/hooks/useDeviceIndex.ts b/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;
diff --git a/src/hooks/useDtuState.ts b/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;
diff --git a/src/hooks/useHasLiveData.ts b/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;

diff --git a/src/hooks/useIsConnected.ts b/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;
diff --git a/src/hooks/useLivedata.ts b/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;
diff --git a/src/hooks/useTriedToConnect.ts b/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;