Unverified Commit b5d04f14 authored by Simon Esposito's avatar Simon Esposito Committed by GitHub
Browse files

Add ReadFile runtime functions (#522) 

Add runtime ReadFile functions to be able to read a file from a path relative to runtime.path.
Upgrade goja.
parent 42fb7d93

go.mod

+2 −2
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ require ( 
	github.com/cznic/strutil v0.0.0-20181122101858-275e90344537 // indirect

	github.com/dgrijalva/jwt-go v3.2.1-0.20200107013213-dc14462fd587+incompatible

	github.com/dlclark/regexp2 v1.4.0 // indirect

	github.com/dop251/goja v0.0.0-20201212162034-be0895b77e07

	github.com/dop251/goja v0.0.0-20210106133455-27b0a7dc4c7f

	github.com/facebookgo/ensure v0.0.0-20160127193407-b4ab57deab51 // indirect

	github.com/facebookgo/stack v0.0.0-20160209184415-751773369052 // indirect

	github.com/facebookgo/subset v0.0.0-20150612182917-8dac2c3c4870 // indirect
@@ -52,7 +52,7 @@ require ( 
	golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9

	golang.org/x/net v0.0.0-20200925080053-05aa5d4ee321 // indirect

	golang.org/x/sys v0.0.0-20200926100807-9d91bd62050c // indirect

	golang.org/x/text v0.3.4 // indirect

	golang.org/x/text v0.3.5 // indirect

	google.golang.org/genproto v0.0.0-20201019141844-1ed22bb0c154

	google.golang.org/grpc v1.33.1

	google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.0.0

go.sum

+4 −6
Original line number Diff line number Diff line
@@ -93,8 +93,8 @@ github.com/dgrijalva/jwt-go v3.2.1-0.20200107013213-dc14462fd587+incompatible h1 
github.com/dgrijalva/jwt-go v3.2.1-0.20200107013213-dc14462fd587+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=

github.com/dlclark/regexp2 v1.4.0 h1:F1rxgk7p4uKjwIQxBs9oAXe5CqrXlCduYEJvrF4u93E=

github.com/dlclark/regexp2 v1.4.0/go.mod h1:2pZnwuY/m+8K6iRw6wQdMtk+rH5tNGR1i55kozfMjCc=

github.com/dop251/goja v0.0.0-20201212162034-be0895b77e07 h1:Fn066OGb3xiuFSljnjA5gq7zzNj/4Df2St727lGnhMI=

github.com/dop251/goja v0.0.0-20201212162034-be0895b77e07/go.mod h1:Mw6PkjjMXWbTj+nnj4s3QPXq1jaT0s5pC0iFD4+BOAA=

github.com/dop251/goja v0.0.0-20210106133455-27b0a7dc4c7f h1:tHoCUlro23JdXvcvYXH1AseEyWJf+b8cBbVm16RYRkU=

github.com/dop251/goja v0.0.0-20210106133455-27b0a7dc4c7f/go.mod h1:Mw6PkjjMXWbTj+nnj4s3QPXq1jaT0s5pC0iFD4+BOAA=

github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=

github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=

github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
@@ -205,8 +205,6 @@ github.com/grpc-ecosystem/grpc-gateway/v2 v2.0.1/go.mod h1:oVMjMN64nzEcepv1kdZKg 
github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=

github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=

github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=

github.com/heroiclabs/nakama-common v1.10.1-0.20201216142705-136e6c0d214f h1:RTKN7L8sWQjsyBEv4fW65MsHbLxnO/NbgR/l+M3uaF4=

github.com/heroiclabs/nakama-common v1.10.1-0.20201216142705-136e6c0d214f/go.mod h1:li7bMQwOYA0NjT3DM4NKQBNruULPa2hrqdiSaaTwui4=

github.com/heroiclabs/nakama-common v1.10.1-0.20210112124918-da701a0f7020 h1:6jaVk2j7QSdSb4APKMQjDDa/s6FgxcZF+vAKszoCbkg=

github.com/heroiclabs/nakama-common v1.10.1-0.20210112124918-da701a0f7020/go.mod h1:li7bMQwOYA0NjT3DM4NKQBNruULPa2hrqdiSaaTwui4=

github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI=
@@ -461,8 +459,8 @@ golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs= 
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=

golang.org/x/text v0.3.3 h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k=

golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=

golang.org/x/text v0.3.4 h1:0YWbFKbhXG/wIiuHDSKpS0Iy7FSA+u45VtBMfQcFTTc=

golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=

golang.org/x/text v0.3.5 h1:i6eZZ+zk0SOf0xgBpEpPD18qWcJda6q1sxt3S0kzyUQ=

golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=

golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=

golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=

golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=

server/core_file.go

0 → 100644
+32 −0
Original line number Diff line number Diff line 
// Copyright 2020 The Nakama Authors

//

// Licensed under the Apache License, Version 2.0 (the "License");

// you may not use this file except in compliance with the License.

// You may obtain a copy of the License at

//

// http://www.apache.org/licenses/LICENSE-2.0

//

// Unless required by applicable law or agreed to in writing, software

// distributed under the License is distributed on an "AS IS" BASIS,

// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

// See the License for the specific language governing permissions and

// limitations under the License.



package server



import (

	"os"

	"path/filepath"

)



// Open a file relative to the runtime path.

func FileRead(rootPath, relPath string) (*os.File, error) {

	path := filepath.Join(rootPath, relPath)



	f, err := os.Open(path)

	if err != nil {

		return nil, err

	}



	return f, nil

}

server/runtime_go_nakama.go

+5 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import ( 
	"encoding/base64"

	"encoding/gob"

	"encoding/json"

	"os"

	"strings"

	"sync"

	"time"
@@ -559,6 +560,10 @@ func (n *RuntimeGoNakamaModule) LinkSteam(ctx context.Context, userID, token str 
	return LinkSteam(ctx, n.logger, n.db, n.config, n.socialClient, id, token)

}



func (n *RuntimeGoNakamaModule) ReadFile(relPath string) (*os.File, error) {

	return FileRead(n.config.GetRuntime().Path, relPath)

}



func (n *RuntimeGoNakamaModule) UnlinkApple(ctx context.Context, userID, token string) error {

	id, err := uuid.FromString(userID)

	if err != nil {

server/runtime_javascript.go

+1 −1
Original line number Diff line number Diff line 
// Copyright 2018 The Nakama Authors

// Copyright 2020 The Nakama Authors

//

// Licensed under the Apache License, Version 2.0 (the "License");

// you may not use this file except in compliance with the License.