coop-cloud-chaos-patchs
/
go-ssb-room
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update muxrpc v2 branch

This commit is contained in:
Henry 2021-01-27 11:38:45 +01:00
parent f4a0a48c97
commit b50f052e66
5 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
go.mod
View File

@ -8,7 +8,7 @@ require (
github.com/keks/nocomment v0.0.0-20181007001506-30c6dcb4a472
github.com/pkg/errors v0.9.1
github.com/stretchr/testify v1.6.1
go.cryptoscope.co/muxrpc/v2 v2.0.0-20210125173825-b504fe615f90
go.cryptoscope.co/muxrpc/v2 v2.0.0-20210127103630-af1d494467a7
go.cryptoscope.co/netwrap v0.1.1
go.cryptoscope.co/secretstream v1.2.2
go.mindeco.de/ssb-refs v0.1.1-0.20210108133850-cf1f44fea870

6
go.sum
View File

@ -303,6 +303,11 @@ go.cryptoscope.co/margaret v0.0.5/go.mod h1:W+Q6lvzHIrF8+Yt3dItHHsx2R9/Xvj/NkJGM
go.cryptoscope.co/margaret v0.0.8/go.mod h1:VbP0bqavqW5osTmdNvgukrqtmqvZC5sXyPSBUW5rzv8=
go.cryptoscope.co/margaret v0.0.12-0.20190912103626-34323ad497f4 h1:gLSldWRujtUOfdnpA1XKD71xcCp3Wz1URMnT6xpUPV4=
go.cryptoscope.co/margaret v0.0.12-0.20190912103626-34323ad497f4/go.mod h1:3rt+RmZTFZEgfvFxz0ZPDBIWtLJOouWtzV6YbBl6sek=
go.cryptoscope.co/muxrpc/v2 v2.0.0-20210125173825-b504fe615f90/go.mod h1:MgaeojIkWY3lLuoNw1mlMT3b3jiZwOj/fgsoGZp/VNA=
go.cryptoscope.co/muxrpc/v2 v2.0.0-20210127103034-f81955ef1d47 h1:p5y76xZAemZXlVh/iOJ694kOyID+/41Qw6vGbKClM+w=
go.cryptoscope.co/muxrpc/v2 v2.0.0-20210127103034-f81955ef1d47/go.mod h1:MgaeojIkWY3lLuoNw1mlMT3b3jiZwOj/fgsoGZp/VNA=
go.cryptoscope.co/muxrpc/v2 v2.0.0-20210127103630-af1d494467a7 h1:mGsK7AoWNrSJFUFnY60TYonXkWjk411ABu9TFU9L7JI=
go.cryptoscope.co/muxrpc/v2 v2.0.0-20210127103630-af1d494467a7/go.mod h1:MgaeojIkWY3lLuoNw1mlMT3b3jiZwOj/fgsoGZp/VNA=
go.cryptoscope.co/netwrap v0.1.0/go.mod h1:7zcYswCa4CT+ct54e9uH9+IIbYYETEMHKDNpzl8Ukew=
go.cryptoscope.co/netwrap v0.1.1 h1:JLzzGKEvrUrkKzu3iM0DhpHmt+L/gYqmpcf1lJMUyFs=
go.cryptoscope.co/netwrap v0.1.1/go.mod h1:7zcYswCa4CT+ct54e9uH9+IIbYYETEMHKDNpzl8Ukew=
@ -310,6 +315,7 @@ go.cryptoscope.co/secretstream v1.2.2 h1:kPxsgWrTDFyS9ZklcD0si1KGljPLz6mmPKnFQjG
go.cryptoscope.co/secretstream v1.2.2/go.mod h1:7nRGZ7fTqSgQAnv2Y4m8xQsS3MFxvB7I0C19reUNlXg=
go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738/go.mod h1:dnLIgRNXwCJa5e+c6mIZCrds/GIG4ncV9HhK5PX7jPg=
go.mindeco.de v0.0.0-20191122233605-f02621a5bca7 h1:si0O0lnNT3SHzEBwuFfqWBaZlME/FnXWlxyZGdri3D8=
go.mindeco.de/ssb-refs v0.1.1-0.20210108133850-cf1f44fea870 h1:TCI3AefMAaOYECvppn30+CfEB0Fn8IES1SKvvacc3/c=
go.mindeco.de/ssb-refs v0.1.1-0.20210108133850-cf1f44fea870/go.mod h1:OnBnV02ux4lLsZ39LID6yYLqSDp+dqTHb/3miYPkQFs=
go.opencensus.io v0.20.1/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk=

7
handlers/tunnel/state.go
View File

@ -79,10 +79,9 @@ func (rs *roomState) announce(_ context.Context, req *muxrpc.Request) (interface
}
rs.roomsMu.Lock()
// add ref to lobby
rs.rooms["lobby"][ref.Ref()] = req.Endpoint()
// update all the connected tunnel.endpoints calls
rs.updater.Update(rs.rooms["lobby"].asList())
rs.roomsMu.Unlock()
@ -98,14 +97,14 @@ func (rs *roomState) leave(_ context.Context, req *muxrpc.Request) (interface{},
rs.roomsMu.Lock()
// remove ref from lobby
delete(rs.rooms["lobby"], ref.Ref())
// update all the connected tunnel.endpoints calls
rs.updater.Update(rs.rooms["lobby"].asList())
rs.roomsMu.Unlock()
return false, nil
}
func (rs *roomState) endpoints(_ context.Context, req *muxrpc.Request, snk *muxrpc.ByteSink, edp muxrpc.Endpoint) error {
func (rs *roomState) endpoints(_ context.Context, req *muxrpc.Request, snk *muxrpc.ByteSink) error {
level.Debug(rs.logger).Log("called", "endpoints")
rs.broadcaster.Register(newForwarder(snk))
return nil

2
handlers/whoami/whoami.go
View File

@ -51,7 +51,7 @@ type handler struct {
func (handler) HandleConnect(ctx context.Context, edp muxrpc.Endpoint) {}
func (h handler) HandleCall(ctx context.Context, req *muxrpc.Request, edp muxrpc.Endpoint) {
func (h handler) HandleCall(ctx context.Context, req *muxrpc.Request) {
// TODO: push manifest check into muxrpc
if req.Type == "" {
req.Type = "async"

2
roomsrv/manifest.go
View File

@ -23,7 +23,7 @@ type manifestHandler string
func (manifestHandler) HandleConnect(context.Context, muxrpc.Endpoint) {}
func (h manifestHandler) HandleCall(ctx context.Context, req *muxrpc.Request, edp muxrpc.Endpoint) {
func (h manifestHandler) HandleCall(ctx context.Context, req *muxrpc.Request) {
err := req.Return(ctx, json.RawMessage(h))
if err != nil {
fmt.Println("manifest err", err)