Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion client/internal/conn_mgr.go
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ func (e *ConnMgr) UpdatedRemoteFeatureFlag(ctx context.Context, enabled bool) er
return nil
}

log.Warnf("lazy connection manager is enabled by management feature flag")
log.Infof("lazy connection manager is enabled by the management feature flag")
e.initLazyManager(ctx)
e.statusRecorder.UpdateLazyConnection(true)
return e.addPeersToLazyConnManager()
Expand Down
7 changes: 6 additions & 1 deletion client/internal/profilemanager/service.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import (
"runtime"
"sort"
"strings"
"syscall"

log "github.com/sirupsen/logrus"

Expand Down Expand Up @@ -439,7 +440,11 @@ func (s *ServiceManager) GetStatePath() string {

activeProf, err := s.GetActiveProfileState()
if err != nil {
log.Warnf("failed to get active profile state: %v", err)
if errors.Is(err, syscall.ENOSYS) {
log.Debugf("active profile state unavailable on this platform: %v", err)
} else {
log.Warnf("failed to get active profile state: %v", err)
}
return defaultStatePath
}

Expand Down
7 changes: 6 additions & 1 deletion client/internal/routemanager/manager.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import (
"strings"
"sync"
"sync/atomic"
"syscall"
"time"

"github.com/google/uuid"
Expand Down Expand Up @@ -264,7 +265,11 @@ func (m *DefaultManager) initSelector() *routeselector.RouteSelector {

// restore selector state if it exists
if err := m.stateManager.LoadState(state); err != nil {
log.Warnf("failed to load state: %v", err)
if errors.Is(err, syscall.ENOSYS) {
log.Debugf("route selector state unavailable on this platform: %v", err)
} else {
log.Warnf("failed to load state: %v", err)
}
return routeselector.NewRouteSelector()
}

Expand Down
2 changes: 1 addition & 1 deletion client/wasm/internal/rdp/rdcleanpath.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ const (
RDCleanPathProxyHost = "rdcleanpath.proxy.local"
RDCleanPathProxyScheme = "ws"

rdpDialTimeout = 15 * time.Second
rdpDialTimeout = 30 * time.Second

GeneralErrorCode = 1
WSAETimedOut = 10060
Expand Down
9 changes: 9 additions & 0 deletions shared/relay/client/dialer/ws/close_generic.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
//go:build !js

package ws

// closeConn closes the underlying WebSocket immediately, skipping the close
// handshake.
func (c *Conn) closeConn() error {
return c.Conn.CloseNow()
}
25 changes: 25 additions & 0 deletions shared/relay/client/dialer/ws/close_js.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
//go:build js

package ws

import (
"github.com/coder/websocket"
log "github.com/sirupsen/logrus"
)

// closeConn closes the browser WebSocket without blocking the caller.
//
// The browser close API only accepts codes 1000 and 3000-4999, so CloseNow's
// 1001 (going away) throws an InvalidAccessError. Close with a valid code
// waits for the browser close event before returning, which can park the
// calling goroutine (the relay teardown path holds its mutexes while closing)
// until the close handshake finishes. Run the close in the background and
// report success; a teardown close error is not actionable.
func (c *Conn) closeConn() error {
go func() {
if err := c.Conn.Close(websocket.StatusNormalClosure, ""); err != nil {
log.Debugf("failed to close relay websocket: %v", err)
}
}()
return nil
}
2 changes: 1 addition & 1 deletion shared/relay/client/dialer/ws/conn.go
Original file line number Diff line number Diff line change
Expand Up @@ -77,5 +77,5 @@ func (c *Conn) SetDeadline(t time.Time) error {
}

func (c *Conn) Close() error {
return c.Conn.CloseNow()
return c.closeConn()
}
Loading