cthrace/collabvm-1.2.ts
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

switch to mariadb library

Browse Source 
ok mdmck you can stop putting eggs in my mailbox now
This commit is contained in:
Elijah R
2024-08-04 15:30:19 -04:00
committed by Elijah R
parent b0c23c3cdf
commit 5aa842bb3e
3 changed files with 28 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cvmts/package.json
View File

@@ -17,9 +17,9 @@
"@maxmind/geoip2-node": "^5.0.0",
"execa": "^8.0.1",
"ip-address": "^9.0.5",
"mariadb": "^3.3.1",
"mnemonist": "^0.39.5",
"msgpackr": "^1.10.2",
"mysql2": "^3.11.0",
"pino": "^9.3.1",
"sharp": "^0.33.3",
"toml": "^3.0.0",

10
cvmts/src/Database.ts
View File

@@ -1,17 +1,17 @@
import pino, { Logger } from "pino";
import { MySQLConfig } from "./IConfig";
import * as mysql from 'mysql2/promise';
import mariadb from 'mariadb';
export class Database {
cfg: MySQLConfig;
logger: Logger;
db: mysql.Pool;
db: mariadb.Pool;
constructor(config: MySQLConfig) {
this.cfg = config;
this.logger = pino({
name: "CVMTS.Database"
});
this.db = mysql.createPool({
this.db = mariadb.createPool({
host: this.cfg.host,
user: this.cfg.username,
password: this.cfg.password,
@@ -37,8 +37,8 @@ export class Database {
async isIPBanned(ip: string): Promise<boolean> {
let conn = await this.db.getConnection();
let res = (await conn.query('SELECT COUNT(ip) AS cnt FROM bans WHERE ip = ?', [ip])) as mysql.RowDataPacket;
let res = (await conn.query('SELECT COUNT(ip) AS cnt FROM bans WHERE ip = ?', [ip]));
conn.release();
return res[0][0]['cnt'] !== 0;
return res[0]['cnt'] !== 0n;
}
}