Commit c17c9f79 authored by Andrei Mihu's avatar Andrei Mihu
Browse files

Update vendored nakama-common.

parent 31873b2b

go.mod

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ require ( 
	github.com/gorilla/mux v1.7.4

	github.com/gorilla/websocket v1.4.2

	github.com/grpc-ecosystem/grpc-gateway/v2 v2.0.1

	github.com/heroiclabs/nakama-common v0.0.0-20210310182534-5118454ac852

	github.com/heroiclabs/nakama-common v0.0.0-20210324184331-c33a19836925

	github.com/jackc/fake v0.0.0-20150926172116-812a484cc733 // indirect

	github.com/jackc/pgx v3.5.0+incompatible

	github.com/jmhodges/levigo v1.0.0 // indirect

go.sum

+2 −0
Original line number Diff line number Diff line
@@ -187,6 +187,8 @@ github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ 
github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=

github.com/heroiclabs/nakama-common v0.0.0-20210310182534-5118454ac852 h1:CQ1sqllnrpnDySXVxB8H0GKVG9ht/TjziZOnAixUzR0=

github.com/heroiclabs/nakama-common v0.0.0-20210310182534-5118454ac852/go.mod h1:li7bMQwOYA0NjT3DM4NKQBNruULPa2hrqdiSaaTwui4=

github.com/heroiclabs/nakama-common v0.0.0-20210324184331-c33a19836925 h1:ga9O6p73ddcCbLZ48IBJBq06SOtBB7X8GM/Sku0WxTY=

github.com/heroiclabs/nakama-common v0.0.0-20210324184331-c33a19836925/go.mod h1:li7bMQwOYA0NjT3DM4NKQBNruULPa2hrqdiSaaTwui4=

github.com/heroiclabs/nakama-common v1.12.1 h1:3ZB9CW5iCF/bWipFeULEBzZz/j/QYPGjbs7HyRUITu8=

github.com/heroiclabs/nakama-common v1.12.1/go.mod h1:li7bMQwOYA0NjT3DM4NKQBNruULPa2hrqdiSaaTwui4=

github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=

server/runtime_go_nakama.go

+1 −1
Original line number Diff line number Diff line
@@ -1023,7 +1023,7 @@ func (n *RuntimeGoNakamaModule) StreamSendRaw(mode uint8, subject, subcontext, l 
	return nil

}



func (n *RuntimeGoNakamaModule) SessionDisconnect(ctx context.Context, sessionID string) error {

func (n *RuntimeGoNakamaModule) SessionDisconnect(ctx context.Context, sessionID string, reason ...runtime.PresenceReason) error {

	sid, err := uuid.FromString(sessionID)

	if err != nil {

		return errors.New("expects valid session id")

server/session_registry.go

+7 −3
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ type SessionRegistry interface { 
	Get(sessionID uuid.UUID) Session

	Add(session Session)

	Remove(sessionID uuid.UUID)

	Disconnect(ctx context.Context, sessionID uuid.UUID) error

	Disconnect(ctx context.Context, sessionID uuid.UUID, reason ...runtime.PresenceReason) error

}



type LocalSessionRegistry struct {
@@ -107,11 +107,15 @@ func (r *LocalSessionRegistry) Remove(sessionID uuid.UUID) { 
	r.metrics.GaugeSessions(float64(count))

}



func (r *LocalSessionRegistry) Disconnect(ctx context.Context, sessionID uuid.UUID) error {

func (r *LocalSessionRegistry) Disconnect(ctx context.Context, sessionID uuid.UUID, reason ...runtime.PresenceReason) error {

	session, ok := r.sessions.Load(sessionID)

	if ok {

		// No need to remove the session from the map, session.Close() will do that.

		session.(Session).Close("server-side session disconnect", runtime.PresenceReasonLeave)

		reasonOverride := runtime.PresenceReasonDisconnect

		if len(reason) > 0 {

			reasonOverride = reason[0]

		}

		session.(Session).Close("server-side session disconnect", reasonOverride)

	}

	return nil

}

vendor/github.com/heroiclabs/nakama-common/runtime/runtime.go

+1 −1
Original line number Diff line number Diff line
@@ -892,7 +892,7 @@ type NakamaModule interface { 
	StreamSend(mode uint8, subject, subcontext, label, data string, presences []Presence, reliable bool) error

	StreamSendRaw(mode uint8, subject, subcontext, label string, msg *rtapi.Envelope, presences []Presence, reliable bool) error



	SessionDisconnect(ctx context.Context, sessionID string) error

	SessionDisconnect(ctx context.Context, sessionID string, reason ...PresenceReason) error

	SessionLogout(userID, token, refreshToken string) error



	MatchCreate(ctx context.Context, module string, params map[string]interface{}) (string, error)