Commit 846ab81a authored by Andrei Mihu's avatar Andrei Mihu
Browse files

Add socket lang parameter to relevant runtime contexts.

parent 64d36359

CHANGELOG.md

+2 −0
Original line number Diff line number Diff line
@@ -9,6 +9,8 @@ The format is based on [keep a changelog](http://keepachangelog.com) and this pr 
- Add runtime leaderboardList and leaderboardsGetId functions.

- Add leaderboard/tournament prev_reset field.

- Add custom metrics runtime functions for counters, gauges, and timers.

- Add optional override for runtime Apple IAP configuration.

- Add socket lang parameter to relevant runtime contexts.



### Changed

- Include ticket in party matchmaker add operation responses.

go.mod

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

	github.com/gorilla/websocket v1.4.2

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

	github.com/heroiclabs/nakama-common v1.14.1-0.20210707135714-ed381a338271

	github.com/heroiclabs/nakama-common v1.14.1-0.20210707144747-9d4fc7ac4406

	github.com/jackc/pgconn v1.8.1

	github.com/jackc/pgerrcode v0.0.0-20201024163028-a0d42d470451

	github.com/jackc/pgtype v1.7.0

go.sum

+2 −0
Original line number Diff line number Diff line
@@ -312,6 +312,8 @@ github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2p 
github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc=

github.com/heroiclabs/nakama-common v1.14.1-0.20210707135714-ed381a338271 h1:iZt1PkdjXKYg7bSFw2X5oEUf5m7NFuku7nTJZibGNOY=

github.com/heroiclabs/nakama-common v1.14.1-0.20210707135714-ed381a338271/go.mod h1:jzIGV5bI45ALRQFzHPkJn4Z0tV+xhtho1+pZhOXVAsk=

github.com/heroiclabs/nakama-common v1.14.1-0.20210707144747-9d4fc7ac4406 h1:lBA9SThV3uTwtnq9pD+0eEPJpUERjP+/WlFBmgaYI1s=

github.com/heroiclabs/nakama-common v1.14.1-0.20210707144747-9d4fc7ac4406/go.mod h1:jzIGV5bI45ALRQFzHPkJn4Z0tV+xhtho1+pZhOXVAsk=

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

github.com/huandu/xstrings v1.3.2/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE=

github.com/hudl/fargo v1.3.0/go.mod h1:y3CKSmjA+wD2gak7sUSXTAoopbhU08POFhmITJgmKTg=

server/api_event.go

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ func (s *ApiServer) Event(ctx context.Context, in *api.Event) (*emptypb.Empty, e 
	// Add event to processing queue if there are any event handlers registered.

	if fn := s.runtime.Event(); fn != nil {

		clientIP, clientPort := extractClientAddressFromContext(s.logger, ctx)

		evtCtx := NewRuntimeGoContext(ctx, s.config.GetName(), s.config.GetRuntime().Environment, RuntimeExecutionModeEvent, nil, ctx.Value(ctxExpiryKey{}).(int64), ctx.Value(ctxUserIDKey{}).(uuid.UUID).String(), ctx.Value(ctxUsernameKey{}).(string), ctx.Value(ctxVarsKey{}).(map[string]string), "", clientIP, clientPort)

		evtCtx := NewRuntimeGoContext(ctx, s.config.GetName(), s.config.GetRuntime().Environment, RuntimeExecutionModeEvent, nil, ctx.Value(ctxExpiryKey{}).(int64), ctx.Value(ctxUserIDKey{}).(uuid.UUID).String(), ctx.Value(ctxUsernameKey{}).(string), ctx.Value(ctxVarsKey{}).(map[string]string), "", clientIP, clientPort, "")

		fn(evtCtx, in)

	}

server/api_rpc.go

+2 −2
Original line number Diff line number Diff line
@@ -181,7 +181,7 @@ func (s *ApiServer) RpcFuncHttp(w http.ResponseWriter, r *http.Request) { 
	clientIP, clientPort := extractClientAddressFromRequest(s.logger, r)



	// Execute the function.

	result, fnErr, code := fn(r.Context(), queryParams, uid, username, vars, expiry, "", clientIP, clientPort, payload)

	result, fnErr, code := fn(r.Context(), queryParams, uid, username, vars, expiry, "", clientIP, clientPort, "", payload)

	if fnErr != nil {

		response, _ := json.Marshal(map[string]interface{}{"error": fnErr, "message": fnErr.Error(), "code": code})

		w.Header().Set("content-type", "application/json")
@@ -278,7 +278,7 @@ func (s *ApiServer) RpcFunc(ctx context.Context, in *api.Rpc) (*api.Rpc, error) 


	clientIP, clientPort := extractClientAddressFromContext(s.logger, ctx)



	result, fnErr, code := fn(ctx, queryParams, uid, username, vars, expiry, "", clientIP, clientPort, in.Payload)

	result, fnErr, code := fn(ctx, queryParams, uid, username, vars, expiry, "", clientIP, clientPort, "", in.Payload)

	if fnErr != nil {

		return nil, status.Error(code, fnErr.Error())

	}