-
Notifications
You must be signed in to change notification settings - Fork 516
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
fix: resolves #1103 - crash on disconnect #1111
Merged
gmiszewski-intent
merged 9 commits into
master
from
bugfix/handle-android-connecton-problems
Oct 16, 2023
Merged
Changes from all commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
f8cb467
chore: recreate native error
dimninik 789b9ab
test: android device disconnecting example
dimninik 95ae38b
fix: resolves #1103 - crash on disconnect
gmiszewski-intent a2c6b9a
refactor: sorted imports
gmiszewski-intent 9b93a1c
refactor: types
dimninik 4d67f28
fix: fast reuse of connect to device leads to 'device not connected e…
gmiszewski-intent c262e3d
fix: fast reuse of connect to device leads to 'device not connected e…
gmiszewski-intent dacc477
refactor: change numbers into variables
dimninik bb0d429
Merge branch 'bugfix/handle-android-connecton-problems' of https://gi…
dimninik File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,4 @@ | ||
/**/node_modules/* | ||
node_modules/ | ||
docs/** | ||
docs/** | ||
lib/** |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
import { fullUUID } from 'react-native-ble-plx' | ||
import base64 from 'react-native-base64' | ||
import { getDateAsBase64 } from '../utils/getDateAsBase64' | ||
|
||
export const deviceTimeService = fullUUID('1847') | ||
export const currentTimeCharacteristic = fullUUID('2A2B') | ||
export const deviceTimeCharacteristic = fullUUID('2B90') | ||
export const currentTimeCharacteristicTimeTriggerDescriptor = fullUUID('290E') | ||
|
||
export const writeWithResponseBase64Time = getDateAsBase64(new Date('2022-08-11T08:17:19Z')) | ||
export const writeWithoutResponseBase64Time = getDateAsBase64(new Date('2023-09-12T10:12:16Z')) | ||
export const monitorExpectedMessage = 'Hi, it works!' | ||
export const currentTimeCharacteristicTimeTriggerDescriptorValue = base64.encode('BLE-PLX') |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
233 changes: 233 additions & 0 deletions
233
...screens/MainStack/DeviceConnectDisconnectTestScreen/DeviceConnectDisconnectTestScreen.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,233 @@ | ||
import React, { useRef, useState } from 'react' | ||
import type { NativeStackScreenProps } from '@react-navigation/native-stack' | ||
import { BleError, Characteristic, Device, type Subscription, type DeviceId, BleErrorCode } from 'react-native-ble-plx' | ||
import { ScrollView } from 'react-native' | ||
import base64 from 'react-native-base64' | ||
import Toast from 'react-native-toast-message' | ||
import type { TestStateType } from '../../../types' | ||
import { BLEService } from '../../../services' | ||
import type { MainStackParamList } from '../../../navigation/navigators' | ||
import { AppButton, AppTextInput, ScreenDefaultContainer, TestStateDisplay } from '../../../components/atoms' | ||
import { currentTimeCharacteristic, deviceTimeService } from '../../../consts/nRFDeviceConsts' | ||
import { wait } from '../../../utils/wait' | ||
|
||
type DeviceConnectDisconnectTestScreenProps = NativeStackScreenProps< | ||
MainStackParamList, | ||
'DEVICE_CONNECT_DISCONNECT_TEST_SCREEN' | ||
> | ||
const NUMBER_OF_CALLS_IN_THE_TEST_SCENARIO = 10 | ||
|
||
export function DeviceConnectDisconnectTestScreen(_props: DeviceConnectDisconnectTestScreenProps) { | ||
const [expectedDeviceName, setExpectedDeviceName] = useState('') | ||
const [testScanDevicesState, setTestScanDevicesState] = useState<TestStateType>('WAITING') | ||
const [deviceId, setDeviceId] = useState('') | ||
const [connectCounter, setConnectCounter] = useState(0) | ||
const [characteristicDiscoverCounter, setCharacteristicDiscoverCounter] = useState(0) | ||
const [connectInDisconnectTestCounter, setConnectInDisconnectTestCounter] = useState(0) | ||
const [disconnectCounter, setDisconnectCounter] = useState(0) | ||
const [monitorMessages, setMonitorMessages] = useState<string[]>([]) | ||
const monitorSubscriptionRef = useRef<Subscription | null>(null) | ||
|
||
const addMonitorMessage = (message: string) => setMonitorMessages(prevMessages => [...prevMessages, message]) | ||
|
||
const checkDeviceName = (device: Device) => | ||
device.name?.toLocaleLowerCase() === expectedDeviceName.toLocaleLowerCase() | ||
|
||
const startConnectAndDiscover = async () => { | ||
setTestScanDevicesState('IN_PROGRESS') | ||
await BLEService.initializeBLE() | ||
await BLEService.scanDevices(connectAndDiscoverOnDeviceFound, [deviceTimeService]) | ||
} | ||
|
||
const startConnectAndDisconnect = async () => { | ||
setTestScanDevicesState('IN_PROGRESS') | ||
await BLEService.initializeBLE() | ||
await BLEService.scanDevices(connectAndDisconnectOnDeviceFound, [deviceTimeService]) | ||
} | ||
|
||
const startConnectOnly = async () => { | ||
setTestScanDevicesState('IN_PROGRESS') | ||
await BLEService.initializeBLE() | ||
await BLEService.scanDevices( | ||
async (device: Device) => { | ||
if (checkDeviceName(device)) { | ||
console.info(`connecting to ${device.id}`) | ||
await startConnectToDevice(device) | ||
setConnectCounter(prevCount => prevCount + 1) | ||
setTestScanDevicesState('DONE') | ||
setDeviceId(device.id) | ||
} | ||
}, | ||
[deviceTimeService] | ||
) | ||
} | ||
|
||
const connectAndDiscoverOnDeviceFound = async (device: Device) => { | ||
if (checkDeviceName(device)) { | ||
setTestScanDevicesState('DONE') | ||
setDeviceId(device.id) | ||
try { | ||
for (let i = 0; i < NUMBER_OF_CALLS_IN_THE_TEST_SCENARIO; i += 1) { | ||
console.info(`connecting to ${device.id}`) | ||
await startConnectToDevice(device) | ||
setConnectCounter(prevCount => prevCount + 1) | ||
console.info(`discovering in ${device.id}`) | ||
await startDiscoverServices() | ||
setCharacteristicDiscoverCounter(prevCount => prevCount + 1) | ||
} | ||
console.info('Multiple connect success') | ||
} catch (error) { | ||
console.error('Multiple connect error') | ||
} | ||
} | ||
} | ||
const connectAndDisconnectOnDeviceFound = async (device: Device) => { | ||
if (checkDeviceName(device)) { | ||
setTestScanDevicesState('DONE') | ||
setDeviceId(device.id) | ||
try { | ||
for (let i = 0; i < NUMBER_OF_CALLS_IN_THE_TEST_SCENARIO; i += 1) { | ||
await startConnectToDevice(device) | ||
console.info(`connecting to ${device.id}`) | ||
setConnectInDisconnectTestCounter(prevCount => prevCount + 1) | ||
await startDisconnect(device) | ||
console.info(`disconnecting from ${device.id}`) | ||
setDisconnectCounter(prevCount => prevCount + 1) | ||
} | ||
console.info('connect/disconnect success') | ||
} catch (error) { | ||
console.error('Connect/disconnect error') | ||
} | ||
} | ||
} | ||
|
||
const discoverCharacteristicsOnly = async () => { | ||
if (!deviceId) { | ||
console.error('Device not ready') | ||
return | ||
} | ||
try { | ||
for (let i = 0; i < NUMBER_OF_CALLS_IN_THE_TEST_SCENARIO; i += 1) { | ||
console.info(`discovering in ${deviceId}`) | ||
await startDiscoverServices() | ||
setCharacteristicDiscoverCounter(prevCount => prevCount + 1) | ||
} | ||
console.info('Multiple discovering success') | ||
} catch (error) { | ||
console.error('Multiple discovering error') | ||
} | ||
} | ||
|
||
const startConnectToDevice = (device: Device) => BLEService.connectToDevice(device.id) | ||
|
||
const startDiscoverServices = () => BLEService.discoverAllServicesAndCharacteristicsForDevice() | ||
|
||
const startDisconnect = (device: Device) => BLEService.disconnectDeviceById(device.id) | ||
|
||
const startCharacteristicMonitor = (directDeviceId?: DeviceId) => { | ||
if (!deviceId && !directDeviceId) { | ||
console.error('Device not ready') | ||
return | ||
} | ||
monitorSubscriptionRef.current = BLEService.setupCustomMonitor( | ||
directDeviceId || deviceId, | ||
deviceTimeService, | ||
currentTimeCharacteristic, | ||
characteristicListener | ||
) | ||
} | ||
|
||
const characteristicListener = (error: BleError | null, characteristic: Characteristic | null) => { | ||
if (error) { | ||
if (error.errorCode === BleErrorCode.ServiceNotFound || error.errorCode === BleErrorCode.ServicesNotDiscovered) { | ||
startDiscoverServices().then(() => startCharacteristicMonitor()) | ||
return | ||
} | ||
console.error(JSON.stringify(error)) | ||
} | ||
if (characteristic) { | ||
if (characteristic.value) { | ||
const message = base64.decode(characteristic.value) | ||
console.info(message) | ||
addMonitorMessage(message) | ||
} | ||
} | ||
} | ||
|
||
const setupOnDeviceDisconnected = (directDeviceId?: DeviceId) => { | ||
if (!deviceId && !directDeviceId) { | ||
console.error('Device not ready') | ||
return | ||
} | ||
BLEService.onDeviceDisconnectedCustom(directDeviceId || deviceId, disconnectedListener) | ||
} | ||
|
||
const disconnectedListener = (error: BleError | null, device: Device | null) => { | ||
if (error) { | ||
console.error('onDeviceDisconnected') | ||
console.error(JSON.stringify(error, null, 4)) | ||
} | ||
if (device) { | ||
console.info(JSON.stringify(device, null, 4)) | ||
} | ||
} | ||
|
||
// https://github.com/dotintent/react-native-ble-plx/issues/1103 | ||
const showIssue1103Crash = async () => { | ||
setTestScanDevicesState('IN_PROGRESS') | ||
await BLEService.initializeBLE() | ||
await BLEService.scanDevices( | ||
async (device: Device) => { | ||
if (checkDeviceName(device)) { | ||
console.info(`connecting to ${device.id}`) | ||
await startConnectToDevice(device) | ||
setConnectCounter(prevCount => prevCount + 1) | ||
setTestScanDevicesState('DONE') | ||
setDeviceId(device.id) | ||
await startDiscoverServices() | ||
await wait(1000) | ||
setupOnDeviceDisconnected(device.id) | ||
await wait(1000) | ||
startCharacteristicMonitor(device.id) | ||
await wait(1000) | ||
const info = 'Now disconnect device' | ||
console.info(info) | ||
Toast.show({ | ||
type: 'info', | ||
text1: info | ||
}) | ||
} | ||
}, | ||
[deviceTimeService] | ||
) | ||
} | ||
|
||
return ( | ||
<ScreenDefaultContainer> | ||
<ScrollView showsVerticalScrollIndicator={false}> | ||
<AppTextInput | ||
placeholder="Device name to connect" | ||
value={expectedDeviceName} | ||
onChangeText={setExpectedDeviceName} | ||
/> | ||
<AppButton label="#1103" onPress={showIssue1103Crash} /> | ||
<AppButton label="Just connect" onPress={startConnectOnly} /> | ||
<AppButton label="Setup on device disconnected" onPress={() => setupOnDeviceDisconnected()} /> | ||
<TestStateDisplay label="Looking for device" state={testScanDevicesState} /> | ||
<AppButton label="Start connect and discover" onPress={startConnectAndDiscover} /> | ||
<AppButton label="Discover characteristics only" onPress={discoverCharacteristicsOnly} /> | ||
<TestStateDisplay label="Connect counter" value={connectCounter.toString()} /> | ||
<TestStateDisplay label="Characteristic discover counter" value={characteristicDiscoverCounter.toString()} /> | ||
<AppButton label="Start connect and disconnect" onPress={startConnectAndDisconnect} /> | ||
<TestStateDisplay | ||
label="Connect in disconnect test counter" | ||
value={connectInDisconnectTestCounter.toString()} | ||
/> | ||
<TestStateDisplay label="Disconnect counter" value={disconnectCounter.toString()} /> | ||
<AppButton label="Setup monitor" onPress={() => startCharacteristicMonitor()} /> | ||
<AppButton label="Remove monitor" onPress={monitorSubscriptionRef.current?.remove} /> | ||
<TestStateDisplay label="Connect in disconnect test counter" value={JSON.stringify(monitorMessages, null, 4)} /> | ||
</ScrollView> | ||
</ScreenDefaultContainer> | ||
) | ||
} |
25 changes: 12 additions & 13 deletions
25
example/src/screens/MainStack/DevicenRFTestScreen/DevicenRFTestScreen.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,4 @@ | ||
export * from './DashboardScreen/DashboardScreen' | ||
export * from './DeviceDetailsScreen/DeviceDetailsScreen' | ||
export * from './DevicenRFTestScreen/DevicenRFTestScreen' | ||
export * from './DeviceConnectDisconnectTestScreen/DeviceConnectDisconnectTestScreen' |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should we really use an internal log method here?
The benefits are it follows log level settings?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There are more places in library where it was used...
We should think about global refactor of this.