Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to nex-go rewrite #3

Merged
merged 7 commits into from
Feb 12, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file removed .DS_Store
Binary file not shown.
56 changes: 56 additions & 0 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
name: Build and Publish Docker Image

on:
push:
pull_request:
workflow_dispatch:

env:
REGISTRY: ghcr.io
IMAGE_NAME: ${{ github.repository }}

jobs:
build-publish:
env:
SHOULD_PUSH_IMAGE: ${{ (github.event_name == 'push' && (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/dev')) || github.event_name == 'workflow_dispatch' }}
runs-on: ubuntu-latest

permissions:
contents: read
packages: write

steps:
- name: Set up QEMU for Docker
uses: docker/setup-qemu-action@v3

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3

- name: Log into the container registry
if: ${{ env.SHOULD_PUSH_IMAGE == 'true' }}
uses: docker/login-action@v3
with:
registry: ${{ env.REGISTRY }}
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Extract Docker metadata
id: meta
uses: docker/metadata-action@v5
with:
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
tags: |
type=raw,value=latest,enable=${{ github.ref == 'refs/heads/master' }}
type=raw,value=edge,enable=${{ github.ref == 'refs/heads/dev' }}
type=sha

- name: Build and push Docker image
id: build-and-push
uses: docker/build-push-action@v6
with:
platforms: linux/amd64,linux/arm64
push: ${{ env.SHOULD_PUSH_IMAGE }}
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
cache-from: type=gha
cache-to: type=gha,mode=max
45 changes: 31 additions & 14 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,19 +1,36 @@
# --- builder ---
FROM golang:1.20.6-alpine3.17 as builder
LABEL stage=builder
RUN apk add git
WORKDIR /build
# syntax=docker/dockerfile:1

COPY go.* ./
RUN go mod download
ARG app_dir="/home/go/app"

COPY . ./

# * Building the application
FROM golang:1.22-alpine3.20 AS build
ARG app_dir

WORKDIR ${app_dir}

RUN --mount=type=cache,target=/go/pkg/mod/ \
--mount=type=bind,source=go.sum,target=go.sum \
--mount=type=bind,source=go.mod,target=go.mod \
go mod download -x

COPY . .
ARG BUILD_STRING=pretendo.luigismansion2.docker
RUN go build -ldflags "-X 'main.serverBuildString=${BUILD_STRING}'" -v -o server
RUN --mount=type=cache,target=/go/pkg/mod/ \
CGO_ENABLED=0 go build -ldflags "-X 'main.serverBuildString=${BUILD_STRING}'" -v -o ${app_dir}/build/server


# * Running the final application
FROM alpine:3.20 AS final
ARG app_dir
WORKDIR ${app_dir}

RUN addgroup go && adduser -D -G go go

RUN mkdir -p ${app_dir}/log && chown go:go ${app_dir}/log

USER go

# --- runner ---
FROM alpine:3.17 as runner
WORKDIR /build
COPY --from=build ${app_dir}/build/server ${app_dir}/server

COPY --from=builder /build/server /build/
CMD ["/build/server"]
CMD [ "./server" ]
Empty file modified LICENSE
100755 → 100644
Empty file.
Empty file modified Makefile
100755 → 100644
Empty file.
33 changes: 16 additions & 17 deletions README.md
100755 → 100644
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
# Luigi's Mansion: Dark Moon (Luigi's Mansion 2) replacement server
Includes both the authentication and secure servers

## Status
This does not work well at all. Sometimes, a room can be started, but on attempting to fetch the room list, the game crashes.

## Compiling

### Setup
Expand All @@ -29,8 +26,8 @@ Create a `.env` file with all of the necessary environment variables set. The va

Example:
```
PN_LUIGISMANSION2_POSTGRES_URI=postgres://username:password@localhost/luigismansion2?sslmode=disable
PN_LUIGISMANSION2_AUTHENTICATION_SERVER_PORT=61001
PN_LM2_AUTHENTICATION_SERVER_PORT=61001
PN_LM2_SECURE_SERVER_PORT=61002
...
```

Expand All @@ -47,10 +44,10 @@ To compile using Go, `go get` the required modules and then `go build` to your d
```bash
$ go get -u
$ go mod tidy
$ go build -o build/luigismansion2
$ go build -o build/luigis-mansion-2
```

The server is now built to `build/luigismansion2`
The server is now built to `build/luigis-mansion-2`

When compiling with only Go, the authentication servers build string is not automatically set. This should not cause any issues with gameplay, but it means that the server build will not be visible in any packet dumps or logs a title may produce

Expand All @@ -72,13 +69,15 @@ All configuration options are handled via environment variables

`.env` files are supported

| Name | Description | Required |
|-----------------------------------------|------------------------------------------------------------------------------------------------------------------------|-----------------------------------------------|
| `PN_LUIGISMANSION2_POSTGRES_URI` | Fully qualified URI to your Postgres server (Example `postgres://username:password@localhost/luigismansion2?sslmode=disable`) | Yes |
| `PN_LUIGISMANSION2_KERBEROS_PASSWORD` | Password used as part of the internal server data in Kerberos tickets | No (Default password `password` will be used) |
| `PN_LUIGISMANSION2_AUTHENTICATION_SERVER_PORT` | Port for the authentication server | Yes |
| `PN_LUIGISMANSION2_SECURE_SERVER_HOST` | Host name for the secure server (should point to the same address as the authentication server) | Yes |
| `PN_LUIGISMANSION2_SECURE_SERVER_PORT` | Port for the secure server | Yes |
| `PN_LUIGISMANSION2_ACCOUNT_GRPC_HOST` | Host name for your account server gRPC service | Yes |
| `PN_LUIGISMANSION2_ACCOUNT_GRPC_PORT` | Port for your account server gRPC service | Yes |
| `PN_LUIGISMANSION2_ACCOUNT_GRPC_API_KEY` | API key for your account server gRPC service | No (Assumed to be an open gRPC API) |
| 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_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 |
| `PN_LM2_SECURE_SERVER_PORT` | Port for the secure server | Yes |
| `PN_LM2_ACCOUNT_GRPC_HOST` | Host name for your account server gRPC service | Yes |
| `PN_LM2_ACCOUNT_GRPC_PORT` | Port for your account server gRPC service | Yes |
| `PN_LM2_ACCOUNT_GRPC_API_KEY` | API key for your account server gRPC service | No (Assumed to be an open gRPC API) |
| `PN_LM2_FRIENDS_GRPC_HOST` | Host name for your friends server gRPC service | Yes |
| `PN_LM2_FRIENDS_GRPC_PORT` | Port for your friends server gRPC service | Yes |
| `PN_LM2_FRIENDS_GRPC_API_KEY` | API key for your friends server gRPC service | No (Assumed to be an open gRPC API) |
23 changes: 23 additions & 0 deletions database/connect_postgres.go
Original file line number Diff line number Diff line change
@@ -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!")
}
29 changes: 0 additions & 29 deletions database/create_room.go

This file was deleted.

24 changes: 0 additions & 24 deletions database/database.go

This file was deleted.

13 changes: 0 additions & 13 deletions database/destory_room.go

This file was deleted.

37 changes: 0 additions & 37 deletions database/get_room_by_gid.go

This file was deleted.

41 changes: 0 additions & 41 deletions database/get_rooms.go

This file was deleted.

26 changes: 0 additions & 26 deletions database/init_sqlite.go

This file was deleted.

Loading