Skip to content
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

[RSDK-8293] Pass in Connection to Answerer in WebRTC Server #4762

Merged
merged 5 commits into from
Feb 5, 2025
Merged

[RSDK-8293] Pass in Connection to Answerer in WebRTC Server #4762

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ee0d84d
dial while connection is nil
bashar-515 Jan 30, 2025
4ab31e6
include global connection to App in web options
bashar-515 Jan 31, 2025
aee7f9f
lint again
bashar-515 Jan 31, 2025
1df92c3
bump goutils
bashar-515 Feb 5, 2025
707f55c
revert grpc/app_conn.go file
bashar-515 Feb 5, 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
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ require (
go.uber.org/zap v1.27.0
go.viam.com/api v0.1.388
go.viam.com/test v1.2.4
go.viam.com/utils v0.1.128
go.viam.com/utils v0.1.130
goji.io v2.0.2+incompatible
golang.org/x/image v0.19.0
golang.org/x/mobile v0.0.0-20240112133503-c713f31d574b
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1517,8 +1517,8 @@ go.viam.com/api v0.1.388 h1:6UW1+5DY1zIupzJnms9oGEKG8xHgu0T1hc6Zx5UhAeQ=
go.viam.com/api v0.1.388/go.mod h1:g5eipXHNm0rQmW7DWya6avKcmzoypLmxnMlAaIsE5Ls=
go.viam.com/test v1.2.4 h1:JYgZhsuGAQ8sL9jWkziAXN9VJJiKbjoi9BsO33TW3ug=
go.viam.com/test v1.2.4/go.mod h1:zI2xzosHdqXAJ/kFqcN+OIF78kQuTV2nIhGZ8EzvaJI=
go.viam.com/utils v0.1.128 h1:ScO0pWiwoYzsILcJudL4axCAGhNPmzszJeMoHhdx23s=
go.viam.com/utils v0.1.128/go.mod h1:g1CaEkf7aJCrSI/Sfkx+6cBS1+Y3fPT2pvMQbp7TTBI=
go.viam.com/utils v0.1.130 h1:5vggHNK/ar/YHXjf9z5WuihX+n9jYFnA2CEFOYi99d8=
go.viam.com/utils v0.1.130/go.mod h1:g1CaEkf7aJCrSI/Sfkx+6cBS1+Y3fPT2pvMQbp7TTBI=
go4.org/unsafe/assume-no-moving-gc v0.0.0-20230525183740-e7c30c78aeb2 h1:WJhcL4p+YeDxmZWg141nRm7XC8IDmhz7lk5GpadO1Sg=
go4.org/unsafe/assume-no-moving-gc v0.0.0-20230525183740-e7c30c78aeb2/go.mod h1:FftLjUGFEDu5k8lt0ddY+HcrH/qU/0qk+H8j9/nTl3E=
gocv.io/x/gocv v0.25.0/go.mod h1:Rar2PS6DV+T4FL+PM535EImD/h13hGVaHhnCu1xarBs=
Expand Down
1 change: 1 addition & 0 deletions web/server/entrypoint.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,6 +275,7 @@ func (s *robotServer) createWebOptions(cfg *config.Config) (weboptions.Options,
if cfg.Cloud != nil && s.args.AllowInsecureCreds {
options.SignalingDialOpts = append(options.SignalingDialOpts, rpc.WithAllowInsecureWithCredentialsDowngrade())
}
options.SignalingDialOpts = append(options.SignalingDialOpts, rpc.WithSignalingConn(s.conn))

if len(options.Auth.Handlers) == 0 {
host, _, err := net.SplitHostPort(cfg.Network.BindAddress)
Expand Down
Loading