@eohjsc/react-native-smart-city 0.7.3-rc23 → 0.7.3-rc25

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@eohjsc/react-native-smart-city",
   "title": "React Native Smart Home",
-  "version": "0.7.3-rc23",
+  "version": "0.7.3-rc25",
   "description": "TODO",
   "main": "index.js",
   "files": [
@@ -119,6 +119,7 @@
     "lodash": "^4.17.19",
     "lottie-react-native": "^6.7.2",
     "metro-react-native-babel-preset": "0.73.9",
+    "md5": "^2.3.0",
     "moment": "^2.27.0",
     "moment-timezone": "^0.5.32",
     "node-html-parser": "^2.0.2",
@@ -131,7 +132,7 @@
     "pusher-js-auth": "^4.0.1",
     "python-struct": "^1.1.3",
     "querystring": "^0.2.0",
-    "react": "18.2.0",
+    "react": "^18.3.1",
     "react-content-loader": "^6.0.3",
     "react-dom": "18.2.0",
     "react-hooks-global-state": "^2.1.0",

package/src/commons/ActionGroup/index.js

@@ -1,4 +1,4 @@
-import React, { memo, useMemo } from 'react';
+import React, { useMemo } from 'react';
 import Text from '../Text';
 import OneBigButtonTemplate from './OneBigButtonTemplate';
 import ThreeButtonTemplate from './ThreeButtonTemplate';
@@ -74,4 +74,4 @@ const ActionGroup = (params = {}) => {
   );
 };
 
-export default memo(ActionGroup);
+export default ActionGroup;

package/src/commons/Widgets/IFrameWithConfig/IFrameWithConfig.js

@@ -9,16 +9,10 @@ import { useFetchConfigHistory } from '../../UnitSummary/ConfigHistoryChart';
 import API from '../../../configs/API';
 import WebView from 'react-native-webview';
 import { TouchableOpacity, View } from 'react-native';
-import { useRemoteControl } from '../../../hooks/IoT';
-import { useSCContextSelector } from '../../../context';
 
 const IFrameWithConfig = memo(
-  ({ item = {}, widgetStyle, isWidgetBox, isSetting, isEditing }) => {
+  ({ item = {}, widgetStyle, isWidgetBox, isSetting, isEditing, doAction }) => {
     const ref = useRef();
-    const sendRemoteCommand = useRemoteControl();
-    const userId = useSCContextSelector(
-      (state) => state?.auth?.account?.user?.id
-    );
 
     const { configuration } = item;
     const { url } = configuration || {};
@@ -73,7 +67,7 @@ const IFrameWithConfig = memo(
     }, [item?.id, url]);
 
     const triggerAction = useCallback(
-      async ({ actionKey, actionIndex, data }) => {
+      async ({ actionKey, actionIndex, data, interrupted = false, silent }) => {
         let action = null;
         if (!configuration?.actions) {
           return;
@@ -90,14 +84,9 @@ const IFrameWithConfig = memo(
         if (!action) {
           return;
         }
-        await sendRemoteCommand(
-          action.action_data.end_device,
-          action.action_data,
-          data,
-          userId
-        );
+        await doAction(action.action_data, data, interrupted, silent);
       },
-      [configuration?.actions, sendRemoteCommand, userId]
+      [configuration?.actions, doAction]
     );
 
     const onMessage = useCallback(

package/src/commons/Widgets/IFrameWithConfig/__tests__/IFrameWithConfig.test.js

@@ -12,13 +12,6 @@ import { TouchableOpacity, View } from 'react-native';
 import { refFunctions } from '../../../../../__mocks__/react-native-webview';
 
 const mockDoAction = jest.fn();
-jest.mock('../../../../hooks/IoT', () => {
-  return {
-    ...jest.requireActual('../../../../hooks/IoT'),
-    useRemoteControl: () => mockDoAction,
-  };
-});
-
 jest.mock('../../../../iot/states', () => {
   return {
     ...jest.requireActual('../../../../iot/states'),
@@ -48,7 +41,9 @@ describe('Test IFrame With Config', () => {
   });
 
   test('test with widget box', async () => {
-    const { root } = await render(<IFrameWithConfig isWidgetBox item={item} />);
+    const { root } = await render(
+      <IFrameWithConfig doAction={mockDoAction} isWidgetBox item={item} />
+    );
 
     const iframes = root.findAllByType(WebView);
     expect(iframes).toHaveLength(1);
@@ -60,7 +55,9 @@ describe('Test IFrame With Config', () => {
 
   test('test with query string', async () => {
     item.configuration.url = 'http://localhost:3000/?test=1';
-    const { root } = await render(<IFrameWithConfig isWidgetBox item={item} />);
+    const { root } = await render(
+      <IFrameWithConfig isWidgetBox doAction={mockDoAction} item={item} />
+    );
 
     const iframes = root.findAllByType(WebView);
     expect(iframes).toHaveLength(1);
@@ -71,7 +68,9 @@ describe('Test IFrame With Config', () => {
   });
 
   test('test reload', async () => {
-    const { root } = await render(<IFrameWithConfig isWidgetBox item={item} />);
+    const { root } = await render(
+      <IFrameWithConfig isWidgetBox doAction={mockDoAction} item={item} />
+    );
 
     const buttons = root.findAllByType(TouchableOpacity);
     expect(buttons).toHaveLength(1);
@@ -84,7 +83,9 @@ describe('Test IFrame With Config', () => {
   });
 
   test('test iframe is ready', async () => {
-    const { root } = await render(<IFrameWithConfig isWidgetBox item={item} />);
+    const { root } = await render(
+      <IFrameWithConfig isWidgetBox doAction={mockDoAction} item={item} />
+    );
     const webview = root.findByType(WebView);
 
     await act(async () => {
@@ -129,7 +130,9 @@ describe('Test IFrame With Config', () => {
   });
 
   test('test iframe request more height', async () => {
-    const { root } = await render(<IFrameWithConfig isWidgetBox item={item} />);
+    const { root } = await render(
+      <IFrameWithConfig isWidgetBox doAction={mockDoAction} item={item} />
+    );
     const webview = root.findByType(WebView);
 
     await act(async () => {
@@ -151,7 +154,9 @@ describe('Test IFrame With Config', () => {
   });
 
   test('test iframe receive message from unexpected origin', async () => {
-    const { root } = await render(<IFrameWithConfig isWidgetBox item={item} />);
+    const { root } = await render(
+      <IFrameWithConfig isWidgetBox doAction={mockDoAction} item={item} />
+    );
     const webview = root.findByType(WebView);
 
     await act(async () => {
@@ -187,7 +192,9 @@ describe('Test IFrame With Config', () => {
     item.configuration.history_configs = [{ id: 1 }];
     item.configuration.realtime_configs = [];
 
-    const { root } = await render(<IFrameWithConfig isWidgetBox item={item} />);
+    const { root } = await render(
+      <IFrameWithConfig isWidgetBox doAction={mockDoAction} item={item} />
+    );
     const webview = root.findByType(WebView);
 
     await act(async () => {
@@ -226,7 +233,9 @@ describe('Test IFrame With Config', () => {
     item.configuration.history_configs = [{ id: 1 }];
     item.configuration.realtime_configs = [];
 
-    const { root } = await render(<IFrameWithConfig isWidgetBox item={item} />);
+    const { root } = await render(
+      <IFrameWithConfig isWidgetBox doAction={mockDoAction} item={item} />
+    );
     const webview = root.findByType(WebView);
 
     await act(async () => {
@@ -303,7 +312,9 @@ describe('Test IFrame With Config', () => {
     ]
   ) => {
     item.configuration.actions = actions;
-    const { root } = await render(<IFrameWithConfig isWidgetBox item={item} />);
+    const { root } = await render(
+      <IFrameWithConfig isWidgetBox doAction={mockDoAction} item={item} />
+    );
     const webview = root.findByType(WebView);
 
     await act(async () => {
@@ -324,9 +335,9 @@ describe('Test IFrame With Config', () => {
   test('test iframe trigger action', async () => {
     await triggerAction({ actionKey: 'xxx' });
     expect(mockDoAction).toHaveBeenCalledWith(
-      item.configuration.actions[0].action_data.end_device,
       item.configuration.actions[0].action_data,
       undefined,
+      false,
       undefined
     );
   });
@@ -334,9 +345,9 @@ describe('Test IFrame With Config', () => {
   test('test iframe trigger by index', async () => {
     await triggerAction({ actionIndex: 0 });
     expect(mockDoAction).toHaveBeenCalledWith(
-      item.configuration.actions[0].action_data.end_device,
       item.configuration.actions[0].action_data,
       undefined,
+      false,
       undefined
     );
   });

package/src/configs/API.js

@@ -54,7 +54,7 @@ const API = {
     JSON_CONFIGURATION: '/chip_manager/chips/json_configuration/',
   },
   DEVICE: {
-    SENSOR_DETAIL: (id) => `/property_manager/devices/${id}/`,
+    DEVICE_DETAIL: (id) => `/property_manager/devices/${id}/`,
     DISPLAY: (id) => `/property_manager/devices/${id}/display/`,
     SIDE_MENU_DETAIL: (id, side_menu_id) =>
       `/property_manager/devices/${id}/display/side_menu/${side_menu_id}/`,

package/src/hooks/IoT/__test__/useRemoteControl.test.js

@@ -81,7 +81,8 @@ describe('Test useRemoteControl', () => {
       sensor,
       action,
       data,
-      userId
+      userId,
+      false
     );
     expect(sendCommandOverInternet).not.toBeCalled();
     expect(sendCommandOverHomeAssistant).not.toBeCalled();
@@ -106,13 +107,15 @@ describe('Test useRemoteControl', () => {
       sensor,
       action,
       data,
-      userId
+      userId,
+      false
     );
     expect(sendCommandOverInternet).toBeCalledWith(
       sensor,
       action,
       data,
-      'bluetooth'
+      'bluetooth',
+      false
     );
     expect(sendCommandOverInternet).toBeCalledTimes(1);
     expect(sendCommandOverHomeAssistant).not.toBeCalled();
@@ -143,7 +146,8 @@ describe('Test useRemoteControl', () => {
       sensor,
       action,
       data,
-      userId
+      userId,
+      false
     );
     expect(sendCommandOverInternet).not.toBeCalled();
     expect(sendCommandOverHomeAssistant).not.toBeCalled();
@@ -181,7 +185,8 @@ describe('Test useRemoteControl', () => {
       sensor,
       action,
       data,
-      userId
+      userId,
+      false
     );
     expect(sendCommandOverHomeAssistant).not.toBeCalled();
   });
@@ -202,7 +207,8 @@ describe('Test useRemoteControl', () => {
       sensor,
       action,
       data,
-      'internet'
+      'internet',
+      false
     );
     expect(sendCommandOverInternet).toBeCalledTimes(1);
     expect(sendCommandOverBluetooth).not.toBeCalled();
@@ -303,7 +309,8 @@ describe('Test useRemoteControl', () => {
       sensor,
       action,
       data,
-      'bluetooth'
+      'bluetooth',
+      false
     );
     expect(sendCommandOverBluetooth).toBeCalledTimes(6);
     expect(sendCommandOverInternet).toBeCalledTimes(1);

package/src/hooks/IoT/useRemoteControl.js

@@ -26,13 +26,13 @@ const handleReconnectionDeviceBle = async (device, action, data, userId) => {
   return SEND_COMMAND_OVER_BLUETOOTH_FAIL;
 };
 
-const useRemoteControl = () => {
+const useRemoteControl = (bluetoothDevice) => {
   const homeAssistantConnections = useSCContextSelector(
     (state) => state.iot.homeassistant.connections
   );
 
   const sendRemoteCommand = useCallback(
-    async (device, action, data, userId) => {
+    async (device, action, data, userId, silent = false) => {
       // No action, raise not authorized
       let result = false;
       if (!action) {
@@ -41,9 +41,18 @@ const useRemoteControl = () => {
         );
         return result;
       }
-
       if (action.command_prefer_over_bluetooth) {
-        let res = await sendCommandOverBluetooth(device, action, data, userId);
+        // custom control for i/o pin over bluetooth
+        if (bluetoothDevice?.isConnected && action.arduino_action) {
+          return bluetoothDevice.control(action, data, silent);
+        }
+        let res = await sendCommandOverBluetooth(
+          device,
+          action,
+          data,
+          userId,
+          silent
+        );
         if (res === BLUETOOOH_DEVICE_UNSTABLE) {
           res = await handleReconnectionDeviceBle(device, action, data, userId);
         }
@@ -57,7 +66,8 @@ const useRemoteControl = () => {
                 device,
                 action,
                 data,
-                'bluetooth'
+                'bluetooth',
+                silent
               );
             }
             return result;
@@ -80,7 +90,8 @@ const useRemoteControl = () => {
           device,
           action,
           data,
-          action.command_prefer_over_bluetooth ? 'bluetooth' : 'internet'
+          action.command_prefer_over_bluetooth ? 'bluetooth' : 'internet',
+          silent
         );
       }
 
@@ -95,7 +106,7 @@ const useRemoteControl = () => {
 
       return await sendCommandOverInternet(device, action, data, 'internet');
     },
-    [homeAssistantConnections]
+    [bluetoothDevice, homeAssistantConnections]
   );
 
   return sendRemoteCommand;

package/src/iot/RemoteControl/Bluetooth.js

@@ -1,15 +1,15 @@
 /* eslint-disable promise/prefer-await-to-callbacks */
 import base64 from 'react-native-base64';
-import { BleManager, ScanMode } from 'react-native-ble-plx';
+import { ScanMode } from 'react-native-ble-plx';
 import CryptoAesCbc from 'react-native-crypto-aes-cbc';
 
 import { base64ToHex, ToastBottomHelper } from '../../utils/Utils';
 import { BLE } from '../../configs';
 import t from '../../hooks/Common/useTranslations';
+import { bleManager } from '../../utils/bluetooth';
 
 const bluetoothDevices = {};
 const needToScanDevices = [];
-const bleManager = new BleManager();
 
 let isScanning = false;
 
@@ -98,7 +98,8 @@ export const sendCommandOverBluetooth = async (
   sensor,
   action,
   data,
-  userID
+  userID,
+  silent
 ) => {
   const bluetooth = sensor?.remote_control_options?.bluetooth;
   let device = null;
@@ -115,7 +116,8 @@ export const sendCommandOverBluetooth = async (
       user: userID,
     },
     false,
-    bluetooth?.is_use_secret_key
+    bluetooth?.is_use_secret_key,
+    silent
   );
   return result;
 };
@@ -124,18 +126,6 @@ export const getDeviceByName = (name) => {
   return bluetoothDevices[name];
 };
 
-export const isDeviceConnected = (deviceName) => {
-  return !!bluetoothDevices[deviceName];
-};
-
-export const subcribeCharacteristicNotify = async (device, onListener) => {
-  return await device.monitorCharacteristicForService(
-    BLE.BLE_REMOTE_SERVICE_UUID,
-    BLE.BLE_REMOTE_CHARACTERISTIC_UUID_TX,
-    onListener
-  );
-};
-
 export const readCharacteristic = async (
   device,
   serviceUUID = BLE.BLE_REMOTE_SERVICE_UUID,
@@ -151,13 +141,16 @@ export const sendDataOverBluetooth = async (
   device = null,
   data,
   keepConnect = false,
-  isUseSecretKey = false
+  isUseSecretKey = false,
+  silent
 ) => {
   if (!device) {
     return SEND_COMMAND_OVER_BLUETOOTH_FAIL;
   }
 
-  ToastBottomHelper.error(t('Sending command via bluetooth'));
+  if (!silent) {
+    ToastBottomHelper.info(t('Sending command via bluetooth'));
+  }
 
   let connectedDevice = null;
   let fullDataDevice = null;
@@ -196,9 +189,11 @@ export const sendDataOverBluetooth = async (
         hasResponse = true;
         const notify = error ? '' : base64.decode(characteristic.value);
         if (notify === BLE.BLE_RESPONSE_OK) {
-          ToastBottomHelper.success(
-            t('control_device_via_bluetooth_successfully')
-          );
+          if (!silent) {
+            ToastBottomHelper.success(
+              t('control_device_via_bluetooth_successfully')
+            );
+          }
           if (!keepConnect) {
             await connectedDevice.cancelConnection();
           }
@@ -234,7 +229,9 @@ export const sendDataOverBluetooth = async (
         base64.encode(JSON.stringify(data))
       );
     }
-    ToastBottomHelper.error(t('command_is_sent_to_device_via_bluetooth'));
+    if (!silent) {
+      ToastBottomHelper.info(t('command_is_sent_to_device_via_bluetooth'));
+    }
   } catch (e) {
     await connectedDevice.cancelConnection();
     ToastBottomHelper.error(t('command_is_fail_to_send_via_bluetooth'));

package/src/iot/RemoteControl/Internet.js

@@ -4,7 +4,13 @@ import { API } from '../../configs';
 import { axiosPost } from '../../utils/Apis/axios';
 import { ToastBottomHelper } from '../../utils/Utils';
 
-export const sendCommandOverInternet = async (sensor, action, data, source) => {
+export const sendCommandOverInternet = async (
+  sensor,
+  action,
+  data,
+  source,
+  silent
+) => {
   if (data !== null) {
     if (Number.isInteger(data)) {
       data = data.toString(16).toUpperCase();
@@ -13,13 +19,15 @@ export const sendCommandOverInternet = async (sensor, action, data, source) => {
   if (typeof data === 'object') {
     data = JSON.stringify(data);
   }
-  ToastBottomHelper.success(t('Sending command via internet'));
+  if (!silent) {
+    ToastBottomHelper.info(t('Sending command via internet'));
+  }
   const { success } = await axiosPost(API.DEVICE.TRIGGER_ACTION(sensor.id), {
     key: action.key,
     data,
     source,
   });
-  if (success) {
+  if (success && !silent) {
     ToastBottomHelper.success(t('Command is sent to device via internet'));
   }
   return success;

package/src/navigations/UnitStack.js

@@ -4,7 +4,6 @@ import { createNativeStackNavigator } from '@react-navigation/native-stack';
 import { get } from 'lodash';
 import React, { memo, useContext, useEffect } from 'react';
 import { AppState, View } from 'react-native';
-import { BleManager } from 'react-native-ble-plx';
 
 import Text from '../commons/Text';
 import { API, Colors, Device } from '../configs';
@@ -68,11 +67,10 @@ import { axiosGet, fetchWithCache } from '../utils/Apis/axios';
 import { ToastBottomHelper } from '../utils/Utils';
 import { HanetCameraStack } from './HanetCameraStack';
 import { styles } from './UnitStackStyles';
+import { bleManager } from '../utils/bluetooth';
 
 const Stack = createNativeStackNavigator();
 
-const bleManager = new BleManager();
-
 export const UnitStack = memo((props) => {
   const t = useTranslations();
   const { setAction } = useContext(SCContext);

package/src/screens/Device/EditDevice/__test__/EditDevice.test.js

@@ -63,7 +63,7 @@ describe('Test EditDevice', () => {
     await act(async () => {
       textInput.props.onChange('new_name');
     });
-    mock.onPatch(API.DEVICE.SENSOR_DETAIL(1)).reply(200, { name: 'new_name' });
+    mock.onPatch(API.DEVICE.DEVICE_DETAIL(1)).reply(200, { name: 'new_name' });
     await act(async () => {
       await alertAction.props.rightButtonClick();
     });
@@ -92,7 +92,7 @@ describe('Test EditDevice', () => {
     await act(async () => {
       textInput.props.onChange('new_name');
     });
-    mock.onPatch(API.DEVICE.SENSOR_DETAIL(1)).reply(400);
+    mock.onPatch(API.DEVICE.DEVICE_DETAIL(1)).reply(400);
     await act(async () => {
       await alertAction.props.rightButtonClick();
     });
@@ -120,7 +120,7 @@ describe('Test EditDevice', () => {
       await buttonDelete[0].props.onPress();
     });
     expect(alertAction.props.visible).toBeTruthy();
-    mock.onDelete(API.DEVICE.SENSOR_DETAIL(1)).reply(204);
+    mock.onDelete(API.DEVICE.DEVICE_DETAIL(1)).reply(204);
     await act(async () => {
       await alertAction.props.rightButtonClick();
     });
@@ -144,7 +144,7 @@ describe('Test EditDevice', () => {
       await buttonDelete[0].props.onPress();
     });
     expect(alertAction.props.visible).toBeTruthy();
-    mock.onDelete(API.DEVICE.SENSOR_DETAIL(1)).reply(400);
+    mock.onDelete(API.DEVICE.DEVICE_DETAIL(1)).reply(400);
     await act(async () => {
       await alertAction.props.rightButtonClick();
     });

package/src/screens/Device/EditDevice/index.js

@@ -30,7 +30,7 @@ const EditDevice = memo(() => {
     useEditDevice();
   const renameSensor = useCallback(async () => {
     const { success, data } = await axiosPatch(
-      API.DEVICE.SENSOR_DETAIL(sensor?.id),
+      API.DEVICE.DEVICE_DETAIL(sensor?.id),
       {
         name: inputName,
       }
@@ -55,7 +55,7 @@ const EditDevice = memo(() => {
 
   const deleteSensor = useCallback(async () => {
     hideAlertAction();
-    const { success } = await axiosDelete(API.DEVICE.SENSOR_DETAIL(sensor?.id));
+    const { success } = await axiosDelete(API.DEVICE.DEVICE_DETAIL(sensor?.id));
 
     if (success) {
       navigation.pop(2);