Skip to content

feat(gap): add ConnectWithContext in gap_darwin.go #387

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 3 commits into
base: dev
Choose a base branch
from
Open

feat(gap): add ConnectWithContext in gap_darwin.go #387

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dadb65c
feat(gap): add ConnectWithContext in gap_darwin.go
acouvreur Oct 4, 2025
434206b
feat(gap): add DiscoverServicesWithContext DiscoverCharacteristicsWit…
acouvreur Oct 4, 2025
828c879
wait for scanChan in ctx Done for scanning
acouvreur Oct 13, 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
16 changes: 16 additions & 0 deletions gap_darwin.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package bluetooth

import (
"context"
"errors"
"fmt"
"time"
Expand Down Expand Up @@ -104,6 +105,11 @@ type deviceInternal struct {

// Connect starts a connection attempt to the given peripheral device address.
func (a *Adapter) Connect(address Address, params ConnectionParams) (Device, error) {
return a.ConnectWithContext(context.Background(), address, params)
}

// ConnectWithContext starts a connection attempt to the given peripheral device address.
func (a *Adapter) ConnectWithContext(ctx context.Context, address Address, params ConnectionParams) (Device, error) {
uuid, err := cbgo.ParseUUID(address.UUID.String())
if err != nil {
return Device{}, err
Expand Down Expand Up @@ -162,6 +168,16 @@ func (a *Adapter) Connect(address Address, params ConnectionParams) (Device, err
// record an error to use when the disconnect comes through later.
connectionError = errors.New("timeout on Connect")

// we are not ready to return yet, we need to wait for the disconnect event to come through
// so continue on from this case and wait for something to show up on prphCh
continue
case <-ctx.Done():
// we need to cancel the connection if the context is done
a.cm.CancelConnect(prphs[0])

// record an error to use when the disconnect comes through later.
connectionError = ctx.Err()
Copy link
Author

@acouvreur acouvreur Oct 4, 2025

Choose a reason for hiding this comment

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

This only difference is the error retrieval, here. Maybe we can find a "clever" way to not duplicate code.


// we are not ready to return yet, we need to wait for the disconnect event to come through
// so continue on from this case and wait for something to show up on prphCh
continue
Expand Down
Loading