Fascinated/Minetrack
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Compare commits

base: Fascinated:renovate/configure
Branches Tags
Fascinated:main Fascinated:renovate/configure Fascinated:Cryptkeeper-main
..
compare: Fascinated:f9a9a37e1a93f7625bf555e7771afd1e907906e8
Branches Tags
Fascinated:main Fascinated:renovate/configure Fascinated:Cryptkeeper-main

8 Commits
renovate/c ... f9a9a37e1a

Author SHA1 Message Date
Liam
f9a9a37e1a add embed
All checks were successful
Publish Docker Image / docker (push) Successful in 4m2s
Details
2023-12-31 00:00:23 +00:00
Liam
0fbea0cb4e update default connection timeout 2023-12-30 23:54:53 +00:00
Liam
2992ad84da remove ignore (temp)
All checks were successful
Publish Docker Image / docker (push) Successful in 5m16s
Details
2023-12-30 23:32:53 +00:00
Liam
f9c7c90d44 e 2023-12-30 23:32:24 +00:00
Liam
cc0c0f2368 fix fr 2023-12-30 23:27:22 +00:00
Liam
1d4dd08fc6 fix angry (eslint)
Some checks failed
Publish Docker Image / docker (push) Failing after 2m1s
Details
2023-12-30 23:23:56 +00:00
Liam
0d03516d04 remove schedule
Some checks failed
Publish Docker Image / docker (push) Failing after 3m19s
Details
2023-12-30 23:15:10 +00:00
Liam
4bce544d98 add workflow to build image
Some checks are pending
Publish Docker Image / docker (push) Waiting to run
Details
2023-12-30 23:14:59 +00:00
10 changed files with 64 additions and 40 deletions
Show Stats Expand all files Collapse all files

4
.babelrc
View File

@ -1,5 +1,3 @@
{ {
"plugins": [ "plugins": ["@babel/plugin-proposal-class-properties"]
"@babel/plugin-proposal-class-properties"
]
} }

16
.eslintrc.json
View File

@ -1,19 +1,3 @@
{ {
"env": {
"browser": true,
"es6": true
},
"extends": [
"standard"
],
"globals": {
"Atomics": "readonly",
"SharedArrayBuffer": "readonly"
},
"parserOptions": {
"ecmaVersion": 2018
},
"rules": {
},
"parser": "babel-eslint" "parser": "babel-eslint"
} }

43
.gitea/workflows/publish.yml Normal file
View File

@ -0,0 +1,43 @@
name: Publish Docker Image
on:
push:
branches:
- "main"
jobs:
docker:
runs-on: ubuntu-22.04
steps:
- name: Checkout
uses: actions/checkout@v3
- name: Restore Docker Cache
uses: actions/cache@v3
id: docker-cache
with:
path: /usr/bin/docker
key: ${{ runner.os }}-docker
- name: Install Docker (if not cached)
if: steps.docker-cache.outputs.cache-hit != 'true'
run: |
wget -q -O /tmp/docker.tgz https://download.docker.com/linux/static/stable/x86_64/docker-20.10.23.tgz \
&& tar --extract --file /tmp/docker.tgz --directory /usr/bin --strip-components 1 --no-same-owner docker/docker \
&& rm -rf /tmp/* &&
echo "Done"
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
- name: Login to Repo
uses: docker/login-action@v2
with:
username: ${{ secrets.REPO_USERNAME }}
password: ${{ secrets.REPO_TOKEN }}
- name: Build and Push
uses: docker/build-push-action@v4
with:
push: true
tags: fascinated/minetrack:latest

6
README.md
View File

@ -51,7 +51,7 @@ Minetrack can be built and run with Docker from this repository in several ways:
### Build and deploy directly with Docker ### Build and deploy directly with Docker
``` ```bash
# build image with name minetrack and tag latest # build image with name minetrack and tag latest
docker build . --tag minetrack:latest docker build . --tag minetrack:latest
@ -67,7 +67,7 @@ The published port can be changed by modifying the parameter argument, e.g.:
### Build and deploy with docker-compose ### Build and deploy with docker-compose
``` ```bash
# build and start service # build and start service
docker-compose up --build docker-compose up --build
@ -79,7 +79,7 @@ docker-compose down
The following configuration enables Nginx to act as reverse proxy for a Minetrack instance that is available at port 8080 on localhost: The following configuration enables Nginx to act as reverse proxy for a Minetrack instance that is available at port 8080 on localhost:
``` ```nginx
server { server {
server_name minetrack.example.net; server_name minetrack.example.net;
listen 80; listen 80;

16
assets/html/index.html
View File

@ -2,8 +2,18 @@
<html> <html>
<head> <head>
<link rel="stylesheet" href="../css/main.css" /> <title>Minetrack</title>
<meta charset="UTF-8" />
<!-- Discord Embed -->
<meta content="Minetrack" property="og:title" />
<meta
content="Tracking minecraft servers since 2023"
property="og:description"
/>
<meta content="https://mc.fascinated.cc/" property="og:url" />
<link rel="stylesheet" href="../css/main.css" />
<link <link
rel="stylesheet" rel="stylesheet"
href="https://fonts.googleapis.com/css2?family=Open+Sans:wght@300;700&display=swap" href="https://fonts.googleapis.com/css2?family=Open+Sans:wght@300;700&display=swap"
@ -11,11 +21,7 @@
<link rel="icon" type="image/svg+xml" href="../images/logo.svg" /> <link rel="icon" type="image/svg+xml" href="../images/logo.svg" />
<meta charset="UTF-8" />
<script defer type="module" src="../js/main.js"></script> <script defer type="module" src="../js/main.js"></script>
<title>Minetrack</title>
</head> </head>
<body> <body>

2
config.json
View File

@ -5,7 +5,7 @@
}, },
"rates": { "rates": {
"pingAll": 15000, "pingAll": 15000,
"connectTimeout": 2500 "connectTimeout": 10000
}, },
"oldPingsCleanup": { "oldPingsCleanup": {
"enabled": false, "enabled": false,

4
docker-compose.yml
View File

@ -2,7 +2,9 @@ version: "3"
services: services:
minetrack: minetrack:
build: https://git.fascinated.cc/Fascinated/Minetrack.git image: fascinated/minetrack:latest
# or
# build: https://git.fascinated.cc/Fascinated/Minetrack.git
container_name: minetrack container_name: minetrack
dns: dns:
- 8.8.8.8 - 8.8.8.8

4
lib/database.js
View File

@ -239,7 +239,6 @@ class Database {
// Record not found // Record not found
if (data[0] === undefined) { if (data[0] === undefined) {
// eslint-disable-next-line node/no-callback-literal
callback(false); callback(false);
return; return;
} }
@ -248,7 +247,6 @@ class Database {
const timestamp = data[0].timestamp; const timestamp = data[0].timestamp;
// Allow null player counts and timestamps, the frontend will safely handle them // Allow null player counts and timestamps, the frontend will safely handle them
// eslint-disable-next-line node/no-callback-literal
callback(true, playerCount, timestamp); callback(true, playerCount, timestamp);
} }
); );
@ -272,10 +270,8 @@ class Database {
// Allow null timestamps, the frontend will safely handle them // Allow null timestamps, the frontend will safely handle them
// This allows insertion of free standing records without a known timestamp // This allows insertion of free standing records without a known timestamp
if (playerCount !== null) { if (playerCount !== null) {
// eslint-disable-next-line node/no-callback-literal
callback(true, playerCount, timestamp); callback(true, playerCount, timestamp);
} else { } else {
// eslint-disable-next-line node/no-callback-literal
callback(false); callback(false);
} }
} }

1
lib/ping.js
View File

@ -106,6 +106,7 @@ class PingController {
schedule() { schedule() {
setInterval(this.pingAll, config.rates.pingAll); setInterval(this.pingAll, config.rates.pingAll);
// todo: make this a cron job?
this.pingAll(); this.pingAll();
} }

6
renovate.json
View File

@ -1,6 +0,0 @@
{
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
"extends": [
"local>Fascinated/renovate-config"
]
}