Compare commits

..

10 Commits
1.1.0 ... main

Author SHA1 Message Date
b485b5d420 Merge pull request 'dev' (#26) from dev into main
Reviewed-on: #26
2023-09-16 15:39:32 +02:00
1c50e818b0 Merge pull request 'feature/uptime-kuma-heartbeat' (#25) from feature/uptime-kuma-heartbeat into dev
Reviewed-on: #25
2023-09-16 15:38:58 +02:00
8cb74a1291
Bump version 2023-09-16 15:35:30 +02:00
4bf782cddf
Add version scripts 2023-09-16 15:34:34 +02:00
c6a4577872
Implement push monitoring 2023-09-16 15:33:16 +02:00
3594c2ea8c Merge pull request 'hotfix/db-race' (#23) from hotfix/db-race into dev
Reviewed-on: #23
2023-09-16 11:20:08 +02:00
538d039c5c Merge branch 'dev' into hotfix/db-race 2023-09-16 11:19:12 +02:00
da1996f2ff Merge pull request 'Fix db race condition' (#20) from hotfix/db-race into main
Reviewed-on: #20
2023-09-16 11:14:33 +02:00
d5b75b12c8
Fix db race condition
- Fixed a bug where the bot would crash if the db connection took too long
- Updated packages to latest version
- Bumped version to 1.1.1
2023-09-16 11:12:43 +02:00
Lukas | AstroGD
a71dbecf8c
Merge pull request #19 from r-Overwatch2/main 2022-11-29 21:38:32 +01:00
10 changed files with 1043 additions and 414 deletions

3
.npmrc Normal file
View File

@ -0,0 +1,3 @@
@astrogd:registry=https://git.astrogd.cloud/api/packages/packages/npm/
@internal:registry=https://git.astrogd.cloud/api/packages/internal/npm/
//git.astrogd.cloud/api/packages/internal/npm/:_authToken=${NPM_TOKEN}

View File

@ -2,7 +2,18 @@
This file is used to list changes made to this software. This file is used to list changes made to this software.
_Current development release: 1.1.0_ _Current development release: 1.1.1_
## V1.1.1 [2023-09-16]
### Updates
- Updated packages to latest versions
### Bugfixes
- Fixed a bug where the bot would crash on startup if the database connection establishment took too long
### Other
- Renamed db service in docker compose file from database to db
## V1.1.0 [2022-11-29] ## V1.1.0 [2022-11-29]

View File

@ -8,15 +8,16 @@ services:
tty: true tty: true
stdin_open: true stdin_open: true
depends_on: depends_on:
- database - db
restart: unless-stopped restart: unless-stopped
environment: environment:
- TOKEN=$TOKEN - TOKEN=$TOKEN
- DB_HOST=database - DB_HOST=db
- DB_USERNAME=$DB_USERNAME - DB_USERNAME=$DB_USERNAME
- DB_PASSWORD=$DB_PASSWORD - DB_PASSWORD=$DB_PASSWORD
- DB_DATABASE=$DB_DATABASE - DB_DATABASE=$DB_DATABASE
database: - MONITOR_URL=$MONITOR_URL
db:
image: postgres:latest image: postgres:latest
restart: unless-stopped restart: unless-stopped
ports: ports:

1356
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -1,22 +1,27 @@
{ {
"name": "eu.astrogd.white-leopard", "name": "eu.astrogd.white-leopard",
"version": "1.1.0", "version": "1.2.0",
"description": "A Discord bot that checks channel names for blacklisted words and reverts the changes if necessary", "description": "A Discord bot that checks channel names for blacklisted words and reverts the changes if necessary",
"main": "build/index.js", "main": "build/index.js",
"scripts": { "scripts": {
"test": "echo \"Error: no test specified\" && exit 1", "test": "echo \"Error: no test specified\" && exit 1",
"build": "tsc && shx cp package-lock.json build/package-lock.json", "build": "tsc && shx cp package-lock.json build/package-lock.json",
"start:rebuild": "npm run build && node --enable-source-maps .", "start:rebuild": "npm run build && node --enable-source-maps .",
"version:dev": "npm version prerelease --preid dev --no-commit-hooks --no-git-tag-version",
"version:patch": "npm version prepatch --preid dev --no-commit-hooks --no-git-tag-version",
"version:minor": "npm version preminor --preid dev --no-commit-hooks --no-git-tag-version",
"version:major": "npm version premajor --preid dev --no-commit-hooks --no-git-tag-version",
"version:release": "npm version patch --no-commit-hooks --no-git-tag-version",
"deploy-commands:dev": "ts-node ci/devDeploy.ts", "deploy-commands:dev": "ts-node ci/devDeploy.ts",
"deploy-commands:prod": "ts-node ci/deploy.ts", "deploy-commands:prod": "ts-node ci/deploy.ts",
"deploy:dev": "npm run build && npm run deploy-commands:dev && docker compose build && docker compose up -d", "deploy:dev": "npm run build && npm run deploy-commands:dev && docker compose build && docker compose up -d",
"deploy:prod": "rimraf build && npm run build && npm run deploy-commands:prod && docker build -t astrogd/white-leopard:latest . && docker push astrogd/white-leopard:latest", "deploy:prod": "rimraf build && npm run build && npm run deploy-commands:prod && docker build -t astrogd/white-leopard:latest . && docker push astrogd/white-leopard:latest",
"start": "npm run build && npm run deploy-commands:dev && docker-compose up --no-start && docker compose start database && node --enable-source-maps .", "start": "npm run build && npm run deploy-commands:dev && docker-compose up -d db && node --enable-source-maps .",
"migration:create": "node --require ts-node/register ./node_modules/typeorm/cli.js migration:generate -d src/data/dataSource.ts -p src/data/migrations/data", "migration:create": "node --require ts-node/register ./node_modules/typeorm/cli.js migration:generate -d src/data/dataSource.migration.ts -p src/data/migrations/data",
"migration:run": "node --require ts-node/register ./node_modules/typeorm/cli.js migration:run -d src/data/dataSource.ts", "migration:run": "node --require ts-node/register ./node_modules/typeorm/cli.js migration:run -d src/data/dataSource.migration.ts",
"migration:revert": "node --require ts-node/register ./node_modules/typeorm/cli.js migration:revert -d src/data/dataSource.ts", "migration:revert": "node --require ts-node/register ./node_modules/typeorm/cli.js migration:revert -d src/data/dataSource.migration.ts",
"migration:show": "node --require ts-node/register ./node_modules/typeorm/cli.js migration:show -d src/data/dataSource.ts", "migration:show": "node --require ts-node/register ./node_modules/typeorm/cli.js migration:show -d src/data/dataSource.migration.ts",
"migration:check": "node --require ts-node/register ./node_modules/typeorm/cli.js migration:generate --check -d src/data/dataSource.ts src/data/migrations/data" "migration:check": "node --require ts-node/register ./node_modules/typeorm/cli.js migration:generate --check -d src/data/dataSource.migration.ts src/data/migrations/data"
}, },
"repository": { "repository": {
"type": "git", "type": "git",
@ -30,15 +35,16 @@
"homepage": "https://github.com/r-Overwatch2/eu.astrogd.white-leopard#readme", "homepage": "https://github.com/r-Overwatch2/eu.astrogd.white-leopard#readme",
"devDependencies": { "devDependencies": {
"@types/express": "^4.17.14", "@types/express": "^4.17.14",
"@types/fs-extra": "^9.0.13", "@types/fs-extra": "^11.0.2",
"@types/node": "^18.11.9", "@types/node": "^18.17.17",
"rimraf": "^3.0.2", "rimraf": "^5.0.1",
"shx": "^0.3.4", "shx": "^0.3.4",
"ts-node": "^10.9.1", "ts-node": "^10.9.1",
"typescript": "^4.9.3" "typescript": "^5.2.2"
}, },
"dependencies": { "dependencies": {
"discord.js": "^14.6.0", "@astrogd/eu.astrogd.uptime-kuma-push-monitor": "^1.0.0-dev.3",
"discord.js": "^14.13.0",
"dotenv": "^16.0.3", "dotenv": "^16.0.3",
"express": "^4.18.2", "express": "^4.18.2",
"fs-extra": "^11.0.0", "fs-extra": "^11.0.0",

View File

@ -1,13 +1,25 @@
import { runCleanup } from "../service"; import { runCleanup } from "../service";
import client from "./index"; import client from "./index";
import { initPromise } from "../data/dataSource";
import pushMonitor from "@astrogd/eu.astrogd.uptime-kuma-push-monitor";
const token = process.env["TOKEN"]; const token = process.env["TOKEN"];
if (!token) throw new ReferenceError("TOKEN environment variable is missing"); if (!token) throw new ReferenceError("TOKEN environment variable is missing");
client.login(token); async function run() {
console.log("Establishing database connection");
await initPromise;
console.log("Connection established\nAuthenticating with Discord API");
client.login(token);
}
client.on("ready", () => { client.on("ready", async () => {
console.log(`Connected to Discord API. Bot account is ${client.user?.tag} (${client.user?.id})`); console.log(`Connected to Discord API. Bot account is ${client.user?.tag} (${client.user?.id})`);
if (process.env["MONITOR_URL"]) pushMonitor.register(process.env["MONITOR_URL"], 120);
pushMonitor.enableShutdownNotifications();
pushMonitor.setPerformanceHandler(() => client.ws.ping);
runCleanup(); runCleanup();
}); });
run();

View File

@ -0,0 +1,3 @@
import dataSource from "./dataSource";
export default dataSource;

View File

@ -28,6 +28,9 @@ const dataSource = new DataSource({
migrationsTransactionMode: "each" migrationsTransactionMode: "each"
}); });
dataSource.initialize(); const initPromise = dataSource.initialize();
export default dataSource; export default dataSource;
export {
initPromise
}

View File

@ -1,4 +1,3 @@
import "./uptime";
import runCleanup from "./cleanup"; import runCleanup from "./cleanup";
export { export {

View File

@ -1,19 +0,0 @@
import express from "express";
import pack from "../../package.json";
import startupTime from "../tools/startupTime";
const app = express();
app.get("/", (_req, res) => {
res.status(200).json({
running: true,
version: pack.version,
runningSince: startupTime.toISOString()
});
});
app.all("*", (_req, res) => {
res.status(404).end();
});
app.listen(80);