consider-client-disconnect-disconnect

Author: dhewzulla

index.d.ts

@@ -1,14 +1,14 @@
 import React from 'react';
-import { InitData, FormField, FieldValue, Sender } from 'global-input-message';
-export * from 'global-input-message';
+import type { InitData, FormField, FieldValue, Sender } from 'global-input-message';
+export type * from 'global-input-message';
 export function useGlobalInputApp(config: ConfigData | (() => ConfigData), canConnect?: boolean, configId?: any): GlobalInputData;
 export function getGlobalInputState(): GlobalInputState;
 
 interface GlobalInputState {
     isLoading: boolean;
     isReady: boolean;
     isError: boolean;
-    isDisconnected: boolean;
+    isClosed: boolean;
     isConnected: boolean;
     isConnectionDenied: boolean;
     initData: InitData;
@@ -62,15 +62,17 @@ export interface GlobalInputData {
     isLoading: boolean;
     isReady: boolean;
     isError: boolean;
-    isDisconnected: boolean;
+    isClosed: boolean;
     isConnected: boolean;
+    isDisconnected:boolean;
     isConnectionDenied: boolean;
     initData: InitData;
     senders: Sender[];
+    sender:Sender;
     sendValue: SendValueFunction;
     sendInitData: SendInitDataFunction;
     setOnchange: (onchange: OnchangeFunction) => void;
-    disconnect: () => void;
+    close: () => void;
     restart: (config?: ConfigData) => void;
 }
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "global-input-react",
-  "version": "4.5.1",
+  "version": "4.6.0",
   "description": "global input react component",
   "main": "./dist/index",
   "repository": {
@@ -72,4 +72,4 @@
     "global-input-message": "^2.1.3",
     "qrcode.react": "^1.0.0"
   }
-}
+}

src/__tests__/mobile-app-and-device-app-communicate.test.js

@@ -107,6 +107,6 @@ it("Device App and Mobile App should be able to communicate", async function ()
     expect(deviceApp.message).toEqual(mobileApp.message);
 
     mobileApp.con.disconnect();
-    deviceApp.hook.result.current.disconnect();
+    deviceApp.hook.result.current.close();
     deviceApp.hook.unmount();
 }, 10000);

src/globalinput.js

@@ -17,7 +17,7 @@ const ACTION_TYPES = {
 
 const MobileState = {
     INITIALIZING: 1,
-    DISCONNECTED: 2,
+    CLOSED: 2,
     ERROR: 3,
     WAITING_FOR_MOBILE: 4,
     MOBILE_CONNECTED: 5
@@ -31,9 +31,10 @@ export const initialState = {
     isLoading: true,
     isReady: false,
     isError: false,
-    isDisconnected: false,
+    isClosed: false,
     isConnected: false,
     isConnectionDenied: false,
+    isDisconnected: false,
     initData: null,
     connected: []
 };
@@ -57,7 +58,8 @@ const setFieldProperties = (fields, values, setters) => {
 }
 
 
-const closeConnection = () => {
+
+export const closeConnection = (notify) => {
     if (mobileData.session) {
         mobileData.session.disconnect();
         mobileData.session = null;
@@ -67,10 +69,7 @@ const closeConnection = () => {
         mobileData.values = [];
         mobileData.setters = [];
     }
-};
-export const disconnect = (notify) => {
-    closeConnection();
-    mobileData.mobileState = MobileState.DISCONNECTED;
+    mobileData.mobileState = MobileState.CLOSED;
     if (notify) {
         notify({ type: ACTION_TYPES.CLOSE });
     }
@@ -312,10 +311,12 @@ const getStateData = () => {
         isLoading: mobileData.mobileState === MobileState.INITIALIZING,
         isReady: mobileData.mobileState === MobileState.WAITING_FOR_MOBILE,
         isError: mobileData.mobileState === MobileState.ERROR,
-        isDisconnected: mobileData.mobileState === MobileState.DISCONNECTED,
+        isClosed: mobileData.mobileState === MobileState.CLOSED,
         isConnected: mobileData.mobileState === MobileState.MOBILE_CONNECTED,
+        isDisconnected: (!!mobileData.sender) && (mobileData.mobileState !== MobileState.MOBILE_CONNECTED),
         initData: mobileData.mobileConfig && mobileData.mobileConfig.initData,
-        senders: mobileData.senders
+        senders: mobileData.senders,
+        sender: mobileData.sender
     }
 }
 

src/useGlobalInputApp.js

@@ -9,11 +9,13 @@ export const useGlobalInputApp = (config, canConnect = true, configId = "") => {
         isLoading,
         isReady,
         isError,
-        isDisconnected,
+        isClosed,
         isConnected,
+        isDisconnected,
         isConnectionDenied,
         initData,
-        senders
+        senders,
+        sender
     }, dispatch] = useReducer(globalInput.reducer, globalInput.initialState);
 
     const attached = useRef(true);
@@ -62,7 +64,7 @@ export const useGlobalInputApp = (config, canConnect = true, configId = "") => {
                 configRef.current.initData = configRef.current.initData();
             }
         }
-        globalInput.disconnect(notify);
+        globalInput.closeConnection(notify);
         globalInput.startConnect(config ? config : configRef.current, notify);
     }, [])
 
@@ -82,8 +84,8 @@ export const useGlobalInputApp = (config, canConnect = true, configId = "") => {
     }, []);
 
 
-    const disconnect = useCallback(() => {
-        globalInput.disconnect(notify);
+    const close = useCallback(() => {
+        globalInput.closeConnection(notify);
     }, []);
 
 
@@ -113,15 +115,17 @@ export const useGlobalInputApp = (config, canConnect = true, configId = "") => {
         isLoading,
         isReady,
         isError,
-        isDisconnected,
+        isClosed,
         isConnected,
+        isDisconnected,
         isConnectionDenied,
         initData,
         senders,
+        sender,
         sendValue,
         sendInitData,
         setOnchange,
-        disconnect,
+        close,
         restart,
     };
 };