Skip to content

linux (gap): improve error information #388

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

Open
wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

linux (gap): improve error information #388

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
49 changes: 28 additions & 21 deletions gap_linux.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ func (a *Adapter) Scan(callback func(*Adapter, ScanResult)) error {
// Check if the adapter is powered on.
powered, err := a.adapter.GetProperty("org.bluez.Adapter1.Powered")
if err != nil {
return err
return fmt.Errorf("bluetooth: scan bluez get Powered: %w", err)
}
if !powered.Value().(bool) {
return errAdaptorNotPowered
Expand All @@ -244,11 +244,10 @@ func (a *Adapter) Scan(callback func(*Adapter, ScanResult)) error {

// This appears to be necessary to receive any BLE discovery results at all.
defer a.adapter.Call("org.bluez.Adapter1.SetDiscoveryFilter", 0)
err = a.adapter.Call("org.bluez.Adapter1.SetDiscoveryFilter", 0, map[string]interface{}{
if err := a.adapter.Call("org.bluez.Adapter1.SetDiscoveryFilter", 0, map[string]interface{}{
"Transport": "le",
}).Err
if err != nil {
return err
}).Err; err != nil {
return fmt.Errorf("bluetooth: scan bluez SetDiscoveryFilter: %w", err)
}

// Go through all connected devices and present the connected devices as
Expand All @@ -257,9 +256,8 @@ func (a *Adapter) Scan(callback func(*Adapter, ScanResult)) error {
// list of cached devices as scan results as devices may be cached for a
// long time, long after they have moved out of range.
var deviceList map[dbus.ObjectPath]map[string]map[string]dbus.Variant
err = a.bluez.Call("org.freedesktop.DBus.ObjectManager.GetManagedObjects", 0).Store(&deviceList)
if err != nil {
return err
if err := a.bluez.Call("org.freedesktop.DBus.ObjectManager.GetManagedObjects", 0).Store(&deviceList); err != nil {
return fmt.Errorf("bluetooth: scan dbus GetManagedObjects: %w", err)
}
devices := make(map[dbus.ObjectPath]map[string]dbus.Variant)
for path, v := range deviceList {
Expand Down Expand Up @@ -293,7 +291,10 @@ func (a *Adapter) Scan(callback func(*Adapter, ScanResult)) error {
// StopScan is called).
select {
case <-cancelChan:
return a.adapter.Call("org.bluez.Adapter1.StopDiscovery", 0).Err
if err := a.adapter.Call("org.bluez.Adapter1.StopDiscovery", 0).Err; err != nil {
return fmt.Errorf("bluetooth: scan bluez StopDiscovery: %w", err)
}
return nil
default:
}

Expand All @@ -302,7 +303,10 @@ func (a *Adapter) Scan(callback func(*Adapter, ScanResult)) error {
if startDiscovery.Err != nil {
close(cancelChan)
a.scanCancelChan = nil
return startDiscovery.Err
if err := startDiscovery.Err; err != nil {
return fmt.Errorf("bluetooth: scan bluez StartDiscovery: %w", err)
}
return nil
}
case sig := <-signal:
// This channel receives anything that we watch for, so we'll have
Expand Down Expand Up @@ -462,7 +466,7 @@ func (a *Adapter) Connect(address Address, params ConnectionParams) (Device, err

powered, err := a.adapter.GetProperty("org.bluez.Adapter1.Powered")
if err != nil {
return Device{}, err
return Device{}, fmt.Errorf("bluetooth: bluez get Powered: %w", err)
}
if !powered.Value().(bool) {
return Device{}, errAdaptorNotPowered
Expand All @@ -471,19 +475,18 @@ func (a *Adapter) Connect(address Address, params ConnectionParams) (Device, err
// Read whether this device is already connected.
connected, err := device.device.GetProperty("org.bluez.Device1.Connected")
if err != nil {
return Device{}, err
return Device{}, fmt.Errorf("bluetooth: bluez get Connected: %w", err)
}

// Connect to the device, if not already connected.
if !connected.Value().(bool) {
// Start connecting (async).
err := device.device.Call("org.bluez.Device1.Connect", 0).Err
if err != nil {
if err := device.device.Call("org.bluez.Device1.Connect", 0).Err; err != nil {
return Device{}, fmt.Errorf("bluetooth: failed to connect: %w", err)
}

// Wait until the device has connected.
connectChan := make(chan struct{})
// Wait until the device has connected successfully or finished with error.
errChan := make(chan error)
go func() {
for sig := range signal {
switch sig.Name {
Expand All @@ -496,8 +499,7 @@ func (a *Adapter) Connect(address Address, params ConnectionParams) (Device, err
for k, v := range changes {
if k == "Powered" && !v.Value().(bool) {
// adapter is powered off, stop the scan
err = errAdaptorNotPowered
close(connectChan)
errChan <- errAdaptorNotPowered
}
}
case "org.bluez.Device1":
Expand All @@ -506,14 +508,15 @@ func (a *Adapter) Connect(address Address, params ConnectionParams) (Device, err
}
changes := sig.Body[1].(map[string]dbus.Variant)
if connected, ok := changes["Connected"].Value().(bool); ok && connected {
close(connectChan)
errChan <- nil
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
errChan <- nil

most likely this can be removed, I'm not quite sure

close(errChan)
}
}
}
}
}()
<-connectChan

err := <-errChan
if err != nil {
return Device{}, err
}
Expand All @@ -535,7 +538,11 @@ func (d Device) Disconnect() error {

// we don't call our cancel function here, instead we wait for the
// property change in `watchForConnect` and cancel things then
return d.device.Call("org.bluez.Device1.Disconnect", 0).Err
if err := d.device.Call("org.bluez.Device1.Disconnect", 0).Err; err != nil {
return fmt.Errorf("bluetooth: bluez failed to disconnect: %w", err)
}

return nil
}

// RequestConnectionParams requests a different connection latency and timeout
Expand Down
Loading