Skip to content

Fix connect handler leak #83

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.

Sign up for GitHub

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

Closed
LiterallyVoid wants to merge 3 commits into from
Closed

Fix connect handler leak #83

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
33f72ba
rename test event:valuechanged to event:connect
LiterallyVoid Sep 23, 2025
0350acc
test that `connect` event is fired once per connection
LiterallyVoid Sep 23, 2025
d1ec7a9
Move Device's built-in {dis-}connection watcher to constructor
LiterallyVoid Sep 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 13 additions & 12 deletions src/Device.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,19 @@ class Device extends EventEmitter {
this.adapter = adapter
this.device = device
this.helper = new BusHelper(dbus, 'org.bluez', `/org/bluez/${adapter}/${device}`, 'org.bluez.Device1', { usePropsEvents: true })

const cb = (propertiesChanged) => {
if ('Connected' in propertiesChanged) {
const { value } = propertiesChanged.Connected
if (value) {
this.emit('connect', { connected: true })
} else {
this.emit('disconnect', { connected: false })
}
}
}

this.helper.on('PropertiesChanged', cb)
}

/**
Expand Down Expand Up @@ -124,18 +137,6 @@ class Device extends EventEmitter {
* Connect to remote device
*/
async connect () {
const cb = (propertiesChanged) => {
if ('Connected' in propertiesChanged) {
const { value } = propertiesChanged.Connected
if (value) {
this.emit('connect', { connected: true })
} else {
this.emit('disconnect', { connected: false })
}
}
}

this.helper.on('PropertiesChanged', cb)
await this.helper.callMethod('Connect')
}

Expand Down
35 changes: 34 additions & 1 deletion test/Device.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ test('gatt server initialization', async () => {
expect(gattServer.init).toHaveBeenCalledTimes(1)
})

test('event:valuechanged', async () => {
test('event:connect', async () => {
const device = new Device(dbus, 'hci0', 'dev_00_00_00_00_00_00')

const connectedFn = jest.fn()
Expand All @@ -114,3 +114,36 @@ test('event:valuechanged', async () => {

await device.disconnect()
})

test('event:connect once per connect', async () => {
const device = new Device(dbus, 'hci0', 'dev_00_00_00_00_00_00')

const connectedFn = jest.fn()
const disconnectedFn = jest.fn()

device.on('connect', connectedFn)
device.on('disconnect', disconnectedFn)

await device.connect()
device.helper.emit('PropertiesChanged',
{ Connected: { signature: 'b', value: true } }
)

await device.disconnect()
device.helper.emit('PropertiesChanged',
{ Connected: { signature: 'b', value: false } }
)

await device.connect()
device.helper.emit('PropertiesChanged',
{ Connected: { signature: 'b', value: true } }
)

await device.disconnect()
device.helper.emit('PropertiesChanged',
{ Connected: { signature: 'b', value: false } }
)

expect(connectedFn).toHaveBeenCalledTimes(2)
expect(disconnectedFn).toHaveBeenCalledTimes(2)
})