diff --git a/README.md b/README.md index 24e850d..99e198e 100644 --- a/README.md +++ b/README.md @@ -71,6 +71,7 @@ All configuration options are handled via environment variables | Name | Description | Required | |-------------------------------------|------------------------------------------------------------------------------------------------------------------------|-----------------------------------------------| +| `PN_LM2_POSTGRES_URI` | Fully qualified URI to your Postgres server (Example `postgres://username:password@localhost/lm2?sslmode=disable`) | Yes | | `PN_LM2_KERBEROS_PASSWORD` | Password used as part of the internal server data in Kerberos tickets | No (Default password `password` will be used) | | `PN_LM2_AUTHENTICATION_SERVER_PORT` | Port for the authentication server | Yes | | `PN_LM2_SECURE_SERVER_HOST` | Host name for the secure server (should point to the same address as the authentication server) | Yes | diff --git a/database/connect_postgres.go b/database/connect_postgres.go new file mode 100644 index 0000000..3c09b05 --- /dev/null +++ b/database/connect_postgres.go @@ -0,0 +1,23 @@ +package database + +import ( + "database/sql" + "os" + + _ "github.com/lib/pq" + + "github.com/PretendoNetwork/luigis-mansion-2/globals" +) + +var Postgres *sql.DB + +func ConnectPostgres() { + var err error + + Postgres, err = sql.Open("postgres", os.Getenv("PN_LM2_POSTGRES_URI")) + if err != nil { + globals.Logger.Critical(err.Error()) + } + + globals.Logger.Success("Connected to Postgres!") +} diff --git a/globals/accounts.go b/globals/accounts.go index 5160601..40ecadc 100644 --- a/globals/accounts.go +++ b/globals/accounts.go @@ -3,8 +3,8 @@ package globals import ( "strconv" - "github.com/PretendoNetwork/nex-go" - "github.com/PretendoNetwork/nex-go/types" + "github.com/PretendoNetwork/nex-go/v2" + "github.com/PretendoNetwork/nex-go/v2/types" ) var AuthenticationServerAccount *nex.Account diff --git a/globals/get_user_friend_pids.go b/globals/get_user_friend_pids.go index 150415f..1cb8eaf 100644 --- a/globals/get_user_friend_pids.go +++ b/globals/get_user_friend_pids.go @@ -4,7 +4,7 @@ import ( "context" pb_friends "github.com/PretendoNetwork/grpc-go/friends" - "github.com/PretendoNetwork/nex-protocols-go/globals" + "github.com/PretendoNetwork/nex-protocols-go/v2/globals" "google.golang.org/grpc/metadata" ) diff --git a/globals/globals.go b/globals/globals.go index f5e160c..fbdea36 100644 --- a/globals/globals.go +++ b/globals/globals.go @@ -3,7 +3,7 @@ package globals import ( pb_account "github.com/PretendoNetwork/grpc-go/account" pb_friends "github.com/PretendoNetwork/grpc-go/friends" - "github.com/PretendoNetwork/nex-go" + "github.com/PretendoNetwork/nex-go/v2" "github.com/PretendoNetwork/plogger-go" "google.golang.org/grpc" "google.golang.org/grpc/metadata" diff --git a/globals/password_from_pid.go b/globals/password_from_pid.go index 5aafee5..6a97f80 100644 --- a/globals/password_from_pid.go +++ b/globals/password_from_pid.go @@ -4,9 +4,9 @@ import ( "context" pb_account "github.com/PretendoNetwork/grpc-go/account" - "github.com/PretendoNetwork/nex-go" - "github.com/PretendoNetwork/nex-go/types" - "github.com/PretendoNetwork/nex-protocols-go/globals" + "github.com/PretendoNetwork/nex-go/v2" + "github.com/PretendoNetwork/nex-go/v2/types" + "github.com/PretendoNetwork/nex-protocols-go/v2/globals" "google.golang.org/grpc/metadata" ) diff --git a/go.mod b/go.mod index 44c35dd..d73ec80 100644 --- a/go.mod +++ b/go.mod @@ -1,34 +1,38 @@ module github.com/PretendoNetwork/luigis-mansion-2 -go 1.21 +go 1.22.1 + +toolchain go1.22.4 require ( github.com/PretendoNetwork/grpc-go v1.0.2 - github.com/PretendoNetwork/nex-go v1.0.42-0.20240224112250-3f3d8da0ba52 - github.com/PretendoNetwork/nex-protocols-common-go v1.0.30-0.20240224002826-4c2b1506becb - github.com/PretendoNetwork/nex-protocols-go v1.0.59-0.20240224002032-9a0f5efc5ff2 + github.com/PretendoNetwork/nex-go/v2 v2.0.5 + github.com/PretendoNetwork/nex-protocols-common-go/v2 v2.0.6 + github.com/PretendoNetwork/nex-protocols-go/v2 v2.0.4 github.com/PretendoNetwork/plogger-go v1.0.4 github.com/joho/godotenv v1.5.1 - google.golang.org/grpc v1.62.0 + github.com/lib/pq v1.10.9 + google.golang.org/grpc v1.67.1 ) require ( - github.com/cyberdelia/lzo v1.0.0 // indirect + github.com/PretendoNetwork/pq-extended v1.0.0 // indirect github.com/dolthub/maphash v0.1.0 // indirect - github.com/fatih/color v1.16.0 // indirect - github.com/golang/protobuf v1.5.3 // indirect + github.com/fatih/color v1.18.0 // indirect + github.com/golang/protobuf v1.5.4 // indirect github.com/jwalton/go-supportscolor v1.2.0 // indirect - github.com/klauspost/compress v1.17.7 // indirect - github.com/lxzan/gws v1.8.1 // indirect + github.com/klauspost/compress v1.17.11 // indirect + github.com/lxzan/gws v1.8.8 // indirect github.com/mattn/go-colorable v0.1.13 // indirect github.com/mattn/go-isatty v0.0.20 // indirect + github.com/rasky/go-lzo v0.0.0-20200203143853-96a758eda86e // indirect github.com/superwhiskers/crunch/v3 v3.5.7 // indirect - golang.org/x/exp v0.0.0-20240222234643-814bf88cf225 // indirect - golang.org/x/mod v0.15.0 // indirect - golang.org/x/net v0.21.0 // indirect - golang.org/x/sys v0.17.0 // indirect - golang.org/x/term v0.17.0 // indirect - golang.org/x/text v0.14.0 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20240221002015-b0ce06bbee7c // indirect - google.golang.org/protobuf v1.32.0 // indirect + golang.org/x/exp v0.0.0-20241009180824-f66d83c29e7c // indirect + golang.org/x/mod v0.21.0 // indirect + golang.org/x/net v0.30.0 // indirect + golang.org/x/sys v0.26.0 // indirect + golang.org/x/term v0.25.0 // indirect + golang.org/x/text v0.19.0 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20241021214115-324edc3d5d38 // indirect + google.golang.org/protobuf v1.35.1 // indirect ) diff --git a/go.sum b/go.sum index 2d5ef07..739fdf0 100644 --- a/go.sum +++ b/go.sum @@ -1,35 +1,35 @@ github.com/PretendoNetwork/grpc-go v1.0.2 h1:9TvKmX7dCOANyoHEra1MMYqS1N/RGav66TRG4SHInvo= github.com/PretendoNetwork/grpc-go v1.0.2/go.mod h1:XZjEsij9lL7HJBNkH6JPbBIkUSq/1rjflvjGdv+DAj0= -github.com/PretendoNetwork/nex-go v1.0.42-0.20240224112250-3f3d8da0ba52 h1:JzG2Ivt4V/yAILwCYZD7NECqMvyWWTM5y5zbOchCOm4= -github.com/PretendoNetwork/nex-go v1.0.42-0.20240224112250-3f3d8da0ba52/go.mod h1:DLSle96ARltxGsQWPSyTbBfWj+vheN02/9EJA/6zTqE= -github.com/PretendoNetwork/nex-protocols-common-go v1.0.30-0.20240224002826-4c2b1506becb h1:zK2Ploa80UTKCenuZI7pc7N0cJ+Mp5RvuM6VO5DO/gg= -github.com/PretendoNetwork/nex-protocols-common-go v1.0.30-0.20240224002826-4c2b1506becb/go.mod h1:37jNRX6M/s0xA/gc4BccO8k2GLG1lpMZXAtIYRCZCTY= -github.com/PretendoNetwork/nex-protocols-go v1.0.59-0.20240224002032-9a0f5efc5ff2 h1:tiVY/H9Nlew10ZwL/S9HQB0w1SeBVfRRoOGVMuFe6To= -github.com/PretendoNetwork/nex-protocols-go v1.0.59-0.20240224002032-9a0f5efc5ff2/go.mod h1:136762CMIcAsTZDrt4W7gDE4ppiBuc9zN2QFOHESjS8= +github.com/PretendoNetwork/nex-go/v2 v2.0.5 h1:S/bYPb2SNUb9MSzai4wlqj/9J1JIiLuMtZcAAbBughM= +github.com/PretendoNetwork/nex-go/v2 v2.0.5/go.mod h1:iW1xjbg/vl2c3uheitUFxGcrt0sxaDxeXR5QqDcyLpI= +github.com/PretendoNetwork/nex-protocols-common-go/v2 v2.0.6 h1:8nNJvJi5aTmGBRtEGVYAI6cjNK1WyIiF+AnGD1QyD+E= +github.com/PretendoNetwork/nex-protocols-common-go/v2 v2.0.6/go.mod h1:Mngar0XMLs7oG9KfeyVJBBhYNCNRXxDcucJTthpP9GY= +github.com/PretendoNetwork/nex-protocols-go/v2 v2.0.4 h1:7Vb/jV/cO6c8XcGzGCoowSNXjZDLb/D1lYkLk8rxm7c= +github.com/PretendoNetwork/nex-protocols-go/v2 v2.0.4/go.mod h1:2UN8khoMDNaeJ4GcIG7ez7MqqmbLfLzbVS6hSa+kGnk= github.com/PretendoNetwork/plogger-go v1.0.4 h1:PF7xHw9eDRHH+RsAP9tmAE7fG0N0p6H4iPwHKnsoXwc= github.com/PretendoNetwork/plogger-go v1.0.4/go.mod h1:7kD6M4vPq1JL4LTuPg6kuB1OvUBOwQOtAvTaUwMbwvU= -github.com/cyberdelia/lzo v1.0.0 h1:smmvcahczwI/VWSzZ7iikt50lubari5py3qL4hAEHII= -github.com/cyberdelia/lzo v1.0.0/go.mod h1:UVNk6eM6Sozt1wx17TECJKuqmIY58TJOVeJxjlGGAGs= +github.com/PretendoNetwork/pq-extended v1.0.0 h1:GHZ0hLvCvmYKQPTV9I9XtTx8J1iB5Z9CEnfW2tUpsYg= +github.com/PretendoNetwork/pq-extended v1.0.0/go.mod h1:bq6Ai+3lG4/M0iamUBt2Uzi5vL/nYy1a1Ar2ow9NDF0= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/dolthub/maphash v0.1.0 h1:bsQ7JsF4FkkWyrP3oCnFJgrCUAFbFf3kOl4L/QxPDyQ= github.com/dolthub/maphash v0.1.0/go.mod h1:gkg4Ch4CdCDu5h6PMriVLawB7koZ+5ijb9puGMV50a4= -github.com/fatih/color v1.16.0 h1:zmkK9Ngbjj+K0yRhTVONQh1p/HknKYSlNT+vZCzyokM= -github.com/fatih/color v1.16.0/go.mod h1:fL2Sau1YI5c0pdGEVCbKQbLXB6edEj1ZgiY4NijnWvE= -github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= -github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= -github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= -github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/fatih/color v1.18.0 h1:S8gINlzdQ840/4pfAwic/ZE0djQEH3wM94VfqLTZcOM= +github.com/fatih/color v1.18.0/go.mod h1:4FelSpRwEGDpQ12mAdzqdOukCy4u8WUtOY6lkT/6HfU= +github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= +github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0= github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4= github.com/jwalton/go-supportscolor v1.2.0 h1:g6Ha4u7Vm3LIsQ5wmeBpS4gazu0UP1DRDE8y6bre4H8= github.com/jwalton/go-supportscolor v1.2.0/go.mod h1:hFVUAZV2cWg+WFFC4v8pT2X/S2qUUBYMioBD9AINXGs= -github.com/klauspost/compress v1.17.7 h1:ehO88t2UGzQK66LMdE8tibEd1ErmzZjNEqWkjLAKQQg= -github.com/klauspost/compress v1.17.7/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw= -github.com/lxzan/gws v1.8.1 h1:+Oc2f8U0YUE7mkBKUYUABvszUB9pfTfPQl7C26PW+LE= -github.com/lxzan/gws v1.8.1/go.mod h1:FcGeRMB7HwGuTvMLR24ku0Zx0p6RXqeKASeMc4VYgi4= +github.com/klauspost/compress v1.17.11 h1:In6xLpyWOi1+C7tXUUWv2ot1QvBjxevKAaI6IXrJmUc= +github.com/klauspost/compress v1.17.11/go.mod h1:pMDklpSncoRMuLFrf1W9Ss9KT+0rH90U12bZKk7uwG0= +github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw= +github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= +github.com/lxzan/gws v1.8.8 h1:st193ZG8qN8sSw8/g/UituFhs7etmKzS7jUqhijg5wM= +github.com/lxzan/gws v1.8.8/go.mod h1:FcGeRMB7HwGuTvMLR24ku0Zx0p6RXqeKASeMc4VYgi4= github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA= github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg= github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= @@ -37,35 +37,34 @@ github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWE github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/rasky/go-lzo v0.0.0-20200203143853-96a758eda86e h1:dCWirM5F3wMY+cmRda/B1BiPsFtmzXqV9b0hLWtVBMs= +github.com/rasky/go-lzo v0.0.0-20200203143853-96a758eda86e/go.mod h1:9leZcVcItj6m9/CfHY5Em/iBrCz7js8LcRQGTKEEv2M= github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/superwhiskers/crunch/v3 v3.5.7 h1:N9RLxaR65C36i26BUIpzPXGy2f6pQ7wisu2bawbKNqg= github.com/superwhiskers/crunch/v3 v3.5.7/go.mod h1:4ub2EKgF1MAhTjoOCTU4b9uLMsAweHEa89aRrfAypXA= -golang.org/x/exp v0.0.0-20240222234643-814bf88cf225 h1:LfspQV/FYTatPTr/3HzIcmiUFH7PGP+OQ6mgDYo3yuQ= -golang.org/x/exp v0.0.0-20240222234643-814bf88cf225/go.mod h1:CxmFvTBINI24O/j8iY7H1xHzx2i4OsyguNBmN/uPtqc= -golang.org/x/mod v0.15.0 h1:SernR4v+D55NyBH2QiEQrlBAnj1ECL6AGrA5+dPaMY8= -golang.org/x/mod v0.15.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= -golang.org/x/net v0.21.0 h1:AQyQV4dYCvJ7vGmJyKki9+PBdyvhkSd8EIx/qb0AYv4= -golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= +golang.org/x/exp v0.0.0-20241009180824-f66d83c29e7c h1:7dEasQXItcW1xKJ2+gg5VOiBnqWrJc+rq0DPKyvvdbY= +golang.org/x/exp v0.0.0-20241009180824-f66d83c29e7c/go.mod h1:NQtJDoLvd6faHhE7m4T/1IY708gDefGGjR/iUW8yQQ8= +golang.org/x/mod v0.21.0 h1:vvrHzRwRfVKSiLrG+d4FMl/Qi4ukBCE6kZlTUkDYRT0= +golang.org/x/mod v0.21.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY= +golang.org/x/net v0.30.0 h1:AcW1SDZMkb8IpzCdQUaIq2sP4sZ4zw+55h6ynffypl4= +golang.org/x/net v0.30.0/go.mod h1:2wGyMJ5iFasEhkwi13ChkO/t1ECNC4X4eBKkVFyYFlU= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210220050731-9a76102bfb43/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.17.0 h1:25cE3gD+tdBA7lp7QfhuV+rJiE9YXTcS3VG1SqssI/Y= -golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.26.0 h1:KHjCJyddX0LoSTb3J+vWpupP9p0oznkqVk/IfjymZbo= +golang.org/x/sys v0.26.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= -golang.org/x/term v0.17.0 h1:mkTF7LCd6WGJNL3K1Ad7kwxNfYAW6a8a8QqtMblp/4U= -golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk= -golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= -golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= -golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240221002015-b0ce06bbee7c h1:NUsgEN92SQQqzfA+YtqYNqYmB3DMMYLlIwUZAQFVFbo= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240221002015-b0ce06bbee7c/go.mod h1:H4O17MA/PE9BsGx3w+a+W2VOLLD1Qf7oJneAoU6WktY= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= -google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= -google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -google.golang.org/protobuf v1.32.0 h1:pPC6BG5ex8PDFnkbrGU3EixyhKcQ2aDuBS36lqK/C7I= -google.golang.org/protobuf v1.32.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= +golang.org/x/term v0.25.0 h1:WtHI/ltw4NvSUig5KARz9h521QvRC8RmF/cuYqifU24= +golang.org/x/term v0.25.0/go.mod h1:RPyXicDX+6vLxogjjRxjgD2TKtmAO6NZBsBRfrOLu7M= +golang.org/x/text v0.19.0 h1:kTxAhCbGbxhK0IwgSKiMO5awPoDQ0RpfiVYBfK860YM= +golang.org/x/text v0.19.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= +google.golang.org/genproto/googleapis/rpc v0.0.0-20241021214115-324edc3d5d38 h1:zciRKQ4kBpFgpfC5QQCVtnnNAcLIqweL7plyZRQHVpI= +google.golang.org/genproto/googleapis/rpc v0.0.0-20241021214115-324edc3d5d38/go.mod h1:GX3210XPVPUjJbTUbvwI8f2IpZDMZuPJWDzDuebbviI= +google.golang.org/grpc v1.67.1 h1:zWnc1Vrcno+lHZCOofnIMvycFcc0QRGIzm9dhnDX68E= +google.golang.org/grpc v1.67.1/go.mod h1:1gLDyUQU7CTLJI90u3nXZ9ekeghjeM7pTDZlqFNg2AA= +google.golang.org/protobuf v1.35.1 h1:m3LfL6/Ca+fqnjnlqQXNpFPABW1UD7mjh8KO2mKFytA= +google.golang.org/protobuf v1.35.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/init.go b/init.go index cb193be..7e57061 100644 --- a/init.go +++ b/init.go @@ -6,16 +6,17 @@ import ( "strconv" "strings" - "github.com/PretendoNetwork/nex-go" - "github.com/PretendoNetwork/nex-go/types" pb_account "github.com/PretendoNetwork/grpc-go/account" pb_friends "github.com/PretendoNetwork/grpc-go/friends" + "github.com/PretendoNetwork/nex-go/v2" + "github.com/PretendoNetwork/nex-go/v2/types" "github.com/PretendoNetwork/plogger-go" "github.com/joho/godotenv" "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" "google.golang.org/grpc/metadata" + "github.com/PretendoNetwork/luigis-mansion-2/database" "github.com/PretendoNetwork/luigis-mansion-2/globals" ) @@ -29,6 +30,7 @@ func init() { globals.Logger.Warning("Error loading .env file") } + postgresURI := os.Getenv("PN_LM2_POSTGRES_URI") kerberosPassword := os.Getenv("PN_LM2_KERBEROS_PASSWORD") authenticationServerPort := os.Getenv("PN_LM2_AUTHENTICATION_SERVER_PORT") secureServerHost := os.Getenv("PN_LM2_SECURE_SERVER_HOST") @@ -40,6 +42,11 @@ func init() { friendsGRPCPort := os.Getenv("PN_LM2_FRIENDS_GRPC_PORT") friendsGRPCAPIKey := os.Getenv("PN_LM2_FRIENDS_GRPC_API_KEY") + if strings.TrimSpace(postgresURI) == "" { + globals.Logger.Error("PN_LM2_POSTGRES_URI environment variable not set") + os.Exit(0) + } + if strings.TrimSpace(kerberosPassword) == "" { globals.Logger.Warningf("PN_LM2_KERBEROS_PASSWORD environment variable not set. Using default password: %q", globals.KerberosPassword) } else { @@ -145,4 +152,6 @@ func init() { globals.GRPCFriendsCommonMetadata = metadata.Pairs( "X-API-Key", friendsGRPCAPIKey, ) + + database.ConnectPostgres() } diff --git a/nex/authentication.go b/nex/authentication.go index 9f27899..1cfd9c9 100644 --- a/nex/authentication.go +++ b/nex/authentication.go @@ -5,7 +5,7 @@ import ( "os" "strconv" - "github.com/PretendoNetwork/nex-go" + "github.com/PretendoNetwork/nex-go/v2" "github.com/PretendoNetwork/luigis-mansion-2/globals" ) diff --git a/nex/register_common_authentication_server_protocols.go b/nex/register_common_authentication_server_protocols.go index cbe33bd..afefefa 100644 --- a/nex/register_common_authentication_server_protocols.go +++ b/nex/register_common_authentication_server_protocols.go @@ -2,11 +2,13 @@ package nex import ( "os" + "strconv" - "github.com/PretendoNetwork/nex-go/types" - ticket_granting "github.com/PretendoNetwork/nex-protocols-go/ticket-granting" - common_ticket_granting "github.com/PretendoNetwork/nex-protocols-common-go/ticket-granting" "github.com/PretendoNetwork/luigis-mansion-2/globals" + "github.com/PretendoNetwork/nex-go/v2/constants" + "github.com/PretendoNetwork/nex-go/v2/types" + common_ticket_granting "github.com/PretendoNetwork/nex-protocols-common-go/v2/ticket-granting" + ticket_granting "github.com/PretendoNetwork/nex-protocols-go/v2/ticket-granting" ) func registerCommonAuthenticationServerProtocols() { @@ -14,15 +16,17 @@ func registerCommonAuthenticationServerProtocols() { globals.AuthenticationEndpoint.RegisterServiceProtocol(ticketGrantingProtocol) commonTicketGrantingProtocol := common_ticket_granting.NewCommonProtocol(ticketGrantingProtocol) + port, _ := strconv.Atoi(os.Getenv("PN_LM2_SECURE_SERVER_PORT")) + secureStationURL := types.NewStationURL("") - secureStationURL.Scheme = "prudps" - secureStationURL.Fields["address"] = os.Getenv("PN_LM2_SECURE_SERVER_HOST") - secureStationURL.Fields["port"] = os.Getenv("PN_LM2_SECURE_SERVER_PORT") - secureStationURL.Fields["CID"] = "1" - secureStationURL.Fields["PID"] = "2" - secureStationURL.Fields["sid"] = "1" - secureStationURL.Fields["stream"] = "10" - secureStationURL.Fields["type"] = "2" + secureStationURL.SetURLType(constants.StationURLPRUDPS) + secureStationURL.SetAddress(os.Getenv("PN_LM2_SECURE_SERVER_HOST")) + secureStationURL.SetPortNumber(uint16(port)) + secureStationURL.SetConnectionID(1) + secureStationURL.SetPrincipalID(types.NewPID(2)) + secureStationURL.SetStreamID(1) + secureStationURL.SetStreamType(constants.StreamTypeRVSecure) + secureStationURL.SetType(uint8(constants.StationURLFlagPublic)) commonTicketGrantingProtocol.SecureStationURL = secureStationURL commonTicketGrantingProtocol.BuildName = types.NewString(serverBuildString) diff --git a/nex/register_common_secure_server_protocols.go b/nex/register_common_secure_server_protocols.go index de326f1..45cc507 100644 --- a/nex/register_common_secure_server_protocols.go +++ b/nex/register_common_secure_server_protocols.go @@ -1,17 +1,19 @@ package nex import ( + "github.com/PretendoNetwork/luigis-mansion-2/database" "github.com/PretendoNetwork/luigis-mansion-2/globals" - matchmake_extension "github.com/PretendoNetwork/nex-protocols-go/matchmake-extension" - common_matchmake_extension "github.com/PretendoNetwork/nex-protocols-common-go/matchmake-extension" - match_making "github.com/PretendoNetwork/nex-protocols-go/match-making" - common_match_making "github.com/PretendoNetwork/nex-protocols-common-go/match-making" - match_making_ext "github.com/PretendoNetwork/nex-protocols-go/match-making-ext" - common_match_making_ext "github.com/PretendoNetwork/nex-protocols-common-go/match-making-ext" - nat_traversal "github.com/PretendoNetwork/nex-protocols-go/nat-traversal" - common_nat_traversal "github.com/PretendoNetwork/nex-protocols-common-go/nat-traversal" - secure "github.com/PretendoNetwork/nex-protocols-go/secure-connection" - common_secure "github.com/PretendoNetwork/nex-protocols-common-go/secure-connection" + common_globals "github.com/PretendoNetwork/nex-protocols-common-go/v2/globals" + common_match_making "github.com/PretendoNetwork/nex-protocols-common-go/v2/match-making" + common_match_making_ext "github.com/PretendoNetwork/nex-protocols-common-go/v2/match-making-ext" + common_matchmake_extension "github.com/PretendoNetwork/nex-protocols-common-go/v2/matchmake-extension" + common_nat_traversal "github.com/PretendoNetwork/nex-protocols-common-go/v2/nat-traversal" + common_secure "github.com/PretendoNetwork/nex-protocols-common-go/v2/secure-connection" + match_making "github.com/PretendoNetwork/nex-protocols-go/v2/match-making" + match_making_ext "github.com/PretendoNetwork/nex-protocols-go/v2/match-making-ext" + matchmake_extension "github.com/PretendoNetwork/nex-protocols-go/v2/matchmake-extension" + nat_traversal "github.com/PretendoNetwork/nex-protocols-go/v2/nat-traversal" + secure "github.com/PretendoNetwork/nex-protocols-go/v2/secure-connection" ) func registerCommonSecureServerProtocols() { @@ -23,16 +25,21 @@ func registerCommonSecureServerProtocols() { globals.SecureEndpoint.RegisterServiceProtocol(natTraversalProtocol) common_nat_traversal.NewCommonProtocol(natTraversalProtocol) + matchmakingManager := common_globals.NewMatchmakingManager(globals.SecureEndpoint, database.Postgres) + matchmakingManager.GetUserFriendPIDs = globals.GetUserFriendPIDs + matchMakingProtocol := match_making.NewProtocol() globals.SecureEndpoint.RegisterServiceProtocol(matchMakingProtocol) - common_match_making.NewCommonProtocol(matchMakingProtocol) + commonMatchMakingProtocol := common_match_making.NewCommonProtocol(matchMakingProtocol) + commonMatchMakingProtocol.SetManager(matchmakingManager) matchMakingExtProtocol := match_making_ext.NewProtocol() globals.SecureEndpoint.RegisterServiceProtocol(matchMakingExtProtocol) - common_match_making_ext.NewCommonProtocol(matchMakingExtProtocol) + commonMatchMakingExtProtocol := common_match_making_ext.NewCommonProtocol(matchMakingExtProtocol) + commonMatchMakingExtProtocol.SetManager(matchmakingManager) matchmakeExtensionProtocol := matchmake_extension.NewProtocol() globals.SecureEndpoint.RegisterServiceProtocol(matchmakeExtensionProtocol) commonMatchmakeExtensionProtocol := common_matchmake_extension.NewCommonProtocol(matchmakeExtensionProtocol) - commonMatchmakeExtensionProtocol.GetUserFriendPIDs(globals.GetUserFriendPIDs) + commonMatchmakeExtensionProtocol.SetManager(matchmakingManager) } diff --git a/nex/secure.go b/nex/secure.go index 98d04f8..ac8bb41 100644 --- a/nex/secure.go +++ b/nex/secure.go @@ -5,7 +5,7 @@ import ( "os" "strconv" - nex "github.com/PretendoNetwork/nex-go" + nex "github.com/PretendoNetwork/nex-go/v2" "github.com/PretendoNetwork/luigis-mansion-2/globals" ) @@ -32,6 +32,10 @@ func StartSecureServer() { fmt.Println("==================================") }) + globals.SecureEndpoint.OnError(func(err *nex.Error) { + globals.Logger.Error(err.Error()) + }) + registerCommonSecureServerProtocols() port, _ := strconv.Atoi(os.Getenv("PN_LM2_SECURE_SERVER_PORT"))