();
private static _lastGeneratedPage:string;
private static _hasChanged:boolean = true;
@@ -8,7 +8,7 @@ export abstract class ChatHistory {
private static readonly PAGE_TEMPLATE = readFileSync("./web/chatPageTemplate.html").toString();
public static AddMessage(message:string) : void {
- if (this._history.length === 10) {
+ if (this._history.length === this.HISTORY_LENGTH) {
this._history.splice(0, 1);
}
@@ -17,14 +17,14 @@ export abstract class ChatHistory {
}
public static GenerateForWeb() : string {
- let lines:string = "", flip:boolean = false;
-
- for (let i:number = Math.max(this._history.length - this.HISTORY_LENGTH, this.HISTORY_LENGTH); i < this._history.length; i++) {
- lines += `${this._history[i] == null ? "blank" : this._history[i]}
`
- flip = !flip;
- }
-
if (this._hasChanged) {
+ let lines = "", flip = false;
+
+ for (let i = 0; i < this.HISTORY_LENGTH; i++) {
+ lines += `${this._history[i] == null ? "blank" : this._history[i].replaceAll("<", "<").replaceAll(">", ">").replaceAll("\n", "
")}
`
+ flip = !flip;
+ }
+
this._lastGeneratedPage = this.PAGE_TEMPLATE.toString().replace("|content|", lines);
this._hasChanged = false;
}
diff --git a/server/ChatManager.ts b/server/ChatManager.ts
index 1a41eb7..6b64502 100644
--- a/server/ChatManager.ts
+++ b/server/ChatManager.ts
@@ -1,12 +1,12 @@
-import { Channel } from "./objects/Channel";
+import Channel from "./objects/Channel";
import { ConsoleHelper } from "../ConsoleHelper";
-import { FunkyArray } from "./objects/FunkyArray";
-import { User } from "./objects/User";
-import { Shared } from "./objects/Shared";
-import { osu } from "../osuTyping";
-import { PrivateChannel } from "./objects/PrivateChannel";
+import FunkyArray from "./objects/FunkyArray";
+import User from "./objects/User";
+import Shared from "./objects/Shared";
+import osu from "../osuTyping";
+import PrivateChannel from "./objects/PrivateChannel";
-export class ChatManager {
+export default class ChatManager {
public chatChannels:FunkyArray = new FunkyArray();
public forceJoinChannels:FunkyArray = new FunkyArray();
private readonly shared:Shared;
diff --git a/server/Country.ts b/server/Country.ts
index 01672fb..c4908f1 100644
--- a/server/Country.ts
+++ b/server/Country.ts
@@ -254,7 +254,7 @@ enum CountryCodes {
const keys = Object.keys(CountryCodes);
const values = Object.values(CountryCodes);
-export function getCountryID(code:string) : number {
+export default function getCountryID(code:string) : number {
// Get id of a country from a 2 char code
const upperCode:string = code.toUpperCase();
if (upperCode in CountryCodes) {
diff --git a/server/LoginProcess.ts b/server/LoginProcess.ts
index bb9e312..28b5fd6 100644
--- a/server/LoginProcess.ts
+++ b/server/LoginProcess.ts
@@ -1,19 +1,19 @@
import { ConsoleHelper } from "../ConsoleHelper";
import fetch from "node-fetch";
-import { getCountryID } from "./Country";
+import getCountryID from "./Country";
import { generateSession } from "./Util";
-import { LatLng } from "./objects/LatLng";
-import { LoginInfo } from "./objects/LoginInfo";
-import { Logout } from "./packets/Logout";
+import LatLng from "./objects/LatLng";
+import LoginInfo from "./objects/LoginInfo";
+import Logout from "./packets/Logout";
import { pbkdf2 } from "crypto";
-import { Request, Response } from "express";
-import { User } from "./objects/User";
-import { UserPresenceBundle } from "./packets/UserPresenceBundle";
-import { UserPresence } from "./packets/UserPresence";
-import { StatusUpdate } from "./packets/StatusUpdate";
-import { Shared } from "./objects/Shared";
-import { osu } from "../osuTyping";
-import { IpZxqResponse } from "./interfaces/IpZxqResponse";
+import User from "./objects/User";
+import UserPresenceBundle from "./packets/UserPresenceBundle";
+import UserPresence from "./packets/UserPresence";
+import StatusUpdate from "./packets/StatusUpdate";
+import Shared from "./objects/Shared";
+import osu from "../osuTyping";
+import IpZxqResponse from "./interfaces/IpZxqResponse";
+import { IncomingMessage, ServerResponse } from "http";
const { decrypt: aesDecrypt } = require("aes256");
const incorrectLoginResponse:Buffer = osu.Bancho.Writer().LoginReply(-1).toBuffer;
@@ -43,7 +43,6 @@ function TestLogin(loginInfo:LoginInfo, shared:Shared) {
// Make sure the username is the same as the login info
if (userDBData.username !== loginInfo.username) return resolve(LoginResult.INCORRECT);
- console.log(userDBData.has_old_password);
switch (userDBData.has_old_password) {
case LoginTypes.CURRENT:
pbkdf2(loginInfo.password, userDBData.password_salt, shared.config.database.pbkdf2.itterations, shared.config.database.pbkdf2.keylength, "sha512", (err, derivedKey) => {
@@ -58,11 +57,9 @@ function TestLogin(loginInfo:LoginInfo, shared:Shared) {
});
break;
case LoginTypes.OLD_AES:
- console.log("OLD AES");
if (aesDecrypt(shared.config.database.key, userDBData.password_hash) !== loginInfo.password) {
return resolve(LoginResult.INCORRECT);
}
- console.log("correct password");
return resolve(LoginResult.MIGRATION);
case LoginTypes.OLD_MD5:
if (userDBData.password_hash !== loginInfo.password) {
@@ -73,7 +70,7 @@ function TestLogin(loginInfo:LoginInfo, shared:Shared) {
});
}
-export async function LoginProcess(req:Request, res:Response, packet:Buffer, shared:Shared) {
+export default async function LoginProcess(req:IncomingMessage, res:ServerResponse, packet:Buffer, shared:Shared) {
const loginStartTime = Date.now();
const loginInfo = LoginInfo.From(packet);
@@ -93,11 +90,11 @@ export async function LoginProcess(req:Request, res:Response, packet:Buffer, sha
// Get users IP for getting location
// Get cloudflare requestee IP first
- let requestIP = req.get("cf-connecting-ip");
+ let requestIP = req.headers["cf-connecting-ip"];
// Get IP of requestee since we are probably behind a reverse proxy
if (requestIP === undefined) {
- requestIP = req.get("X-Real-IP");
+ requestIP = req.headers["X-Real-IP"];
}
// Just get the requestee IP (we are not behind a reverse proxy)
@@ -196,7 +193,7 @@ export async function LoginProcess(req:Request, res:Response, packet:Buffer, sha
osuPacketWriter.Announce(`Welcome back ${loginInfo.username}!`);
// TODO: Remove once merged into master
- osuPacketWriter.Announce("WARNING\nThis is a development test server made for the TypeScript rewrite.\nAnything could happen be it data loss, catastrophic crashes or otherwise.\nHere be dragons.");
+ osuPacketWriter.Announce("Heads up!\nWhile the TypeScript server rewrite is mostly stable it still has some issues.");
} catch (err) {
console.error(err);
}
@@ -208,10 +205,10 @@ export async function LoginProcess(req:Request, res:Response, packet:Buffer, sha
const writerBuffer:Buffer = osuPacketWriter.toBuffer;
if (newUser === undefined) {
res.writeHead(200, {
+ "cho-token": "no",
"Connection": "keep-alive",
"Keep-Alive": "timeout=5, max=100"
});
- console.log(res.headersSent);
switch (loginResult) {
case LoginResult.INCORRECT:
res.end(incorrectLoginResponse, () => {
diff --git a/server/MultiplayerManager.ts b/server/MultiplayerManager.ts
index 2f328c5..d419aea 100644
--- a/server/MultiplayerManager.ts
+++ b/server/MultiplayerManager.ts
@@ -1,18 +1,18 @@
-import { Channel } from "./objects/Channel";
-import { Shared } from "./objects/Shared";
+import Channel from "./objects/Channel";
+import Shared from "./objects/Shared";
import { SlotStatus } from "./enums/SlotStatus";
-import { DataStream } from "./objects/DataStream";
-import { Match } from "./objects/Match";
-import { User } from "./objects/User";
-import { StatusUpdate } from "./packets/StatusUpdate";
-import { UserPresence } from "./packets/UserPresence";
-import { UserPresenceBundle } from "./packets/UserPresenceBundle";
-import { MatchArray } from "./objects/MatchArray";
-import { MatchJoinData } from "./interfaces/MatchJoinData";
-import { MatchData } from "./interfaces/MatchData";
-import { osu } from "../osuTyping";
+import DataStream from "./objects/DataStream";
+import Match from "./objects/Match";
+import User from "./objects/User";
+import StatusUpdate from "./packets/StatusUpdate";
+import UserPresence from "./packets/UserPresence";
+import UserPresenceBundle from "./packets/UserPresenceBundle";
+import MatchArray from "./objects/MatchArray";
+import MatchJoinData from "./interfaces/MatchJoinData";
+import MatchData from "./interfaces/MatchData";
+import osu from "../osuTyping";
-export class MultiplayerManager {
+export default class MultiplayerManager {
private readonly shared:Shared;
private matches:MatchArray = new MatchArray();
private readonly lobbyStream:DataStream;
diff --git a/server/PrivateChatManager.ts b/server/PrivateChatManager.ts
index d5a7978..31961d8 100644
--- a/server/PrivateChatManager.ts
+++ b/server/PrivateChatManager.ts
@@ -1,12 +1,12 @@
-import { Channel } from "./objects/Channel";
+import Channel from "./objects/Channel";
import { ConsoleHelper } from "../ConsoleHelper";
-import { FunkyArray } from "./objects/FunkyArray";
-import { User } from "./objects/User";
-import { Shared } from "./objects/Shared";
-import { osu } from "../osuTyping";
-import { PrivateChannel } from "./objects/PrivateChannel";
+import FunkyArray from "./objects/FunkyArray";
+import User from "./objects/User";
+import Shared from "./objects/Shared";
+import osu from "../osuTyping";
+import PrivateChannel from "./objects/PrivateChannel";
-export class PrivateChatManager {
+export default class PrivateChatManager {
public chatChannels:FunkyArray = new FunkyArray();
private readonly shared:Shared;
diff --git a/server/SpectatorManager.ts b/server/SpectatorManager.ts
index c740b8a..653bc46 100644
--- a/server/SpectatorManager.ts
+++ b/server/SpectatorManager.ts
@@ -1,9 +1,9 @@
-import { DataStream } from "./objects/DataStream";
-import { Shared } from "./objects/Shared";
-import { User } from "./objects/User";
-import { osu } from "../osuTyping";
+import DataStream from "./objects/DataStream";
+import Shared from "./objects/Shared";
+import User from "./objects/User";
+import osu from "../osuTyping";
-export class SpectatorManager {
+export default class SpectatorManager {
private shared:Shared;
public constructor(shared:Shared) {
diff --git a/server/Util.ts b/server/Util.ts
index 8dd792d..2b73109 100644
--- a/server/Util.ts
+++ b/server/Util.ts
@@ -12,10 +12,6 @@ export function generateSession() : Promise {
});
}
-export function generateSessionSync() : string {
- return randomBytes(12).toString("hex");
-}
-
export function hexlify(data:Buffer) : string {
let out:string = "";
for (let i = 0; i < data.length; i++) {
diff --git a/server/commands/BaseCommand.ts b/server/commands/BaseCommand.ts
index 66664a3..709998f 100644
--- a/server/commands/BaseCommand.ts
+++ b/server/commands/BaseCommand.ts
@@ -1,9 +1,9 @@
-import { ICommand } from "../interfaces/ICommand";
-import { Channel } from "../objects/Channel";
-import { Shared } from "../objects/Shared";
-import { User } from "../objects/User";
+import ICommand from "../interfaces/ICommand";
+import Channel from "../objects/Channel";
+import Shared from "../objects/Shared";
+import User from "../objects/User";
-export class BaseCommand implements ICommand {
+export default class BaseCommand implements ICommand {
public shared:Shared;
public readonly helpText:string = "No help page was found for that command";
public readonly helpDescription:string = "Command has no description set";
diff --git a/server/commands/Help.ts b/server/commands/Help.ts
index e14490d..b354c61 100644
--- a/server/commands/Help.ts
+++ b/server/commands/Help.ts
@@ -1,10 +1,10 @@
-import { Channel } from "../objects/Channel";
-import { User } from "../objects/User";
-import { BaseCommand } from "./BaseCommand";
-import { Shared } from "../objects/Shared";
-import { ICommand } from "../interfaces/ICommand";
+import Channel from "../objects/Channel";
+import User from "../objects/User";
+import BaseCommand from "./BaseCommand";
+import Shared from "../objects/Shared";
+import ICommand from "../interfaces/ICommand";
-export class HelpCommand extends BaseCommand {
+export default class HelpCommand extends BaseCommand {
public readonly helpDescription:string = "Shows this message! :)";
private readonly commandList:{ [id:string]: ICommand };
diff --git a/server/commands/Lock.ts b/server/commands/Lock.ts
index fd1650f..e25db53 100644
--- a/server/commands/Lock.ts
+++ b/server/commands/Lock.ts
@@ -1,8 +1,8 @@
-import { Channel } from "../objects/Channel";
-import { User } from "../objects/User";
-import { BaseCommand } from "./BaseCommand";
+import Channel from "../objects/Channel";
+import User from "../objects/User";
+import BaseCommand from "./BaseCommand";
-export class LockCommand extends BaseCommand {
+export default class LockCommand extends BaseCommand {
public readonly helpDescription:string = "Locks/Unlocks a channel and limits conversation to mods and above.";
public exec(channel:Channel, sender:User, args:Array) {
diff --git a/server/commands/Multiplayer.ts b/server/commands/Multiplayer.ts
index 8576d62..75fe862 100644
--- a/server/commands/Multiplayer.ts
+++ b/server/commands/Multiplayer.ts
@@ -1,15 +1,13 @@
-import { Channel } from "../objects/Channel";
-import { User } from "../objects/User";
-import { Match } from "../objects/Match";
-import { BaseCommand } from "./BaseCommand";
+import Channel from "../objects/Channel";
+import User from "../objects/User";
+import Match from "../objects/Match";
+import BaseCommand from "./BaseCommand";
-const helpText = `Multiplayer Subcommands:
+export default class MultiplayerCommands extends BaseCommand {
+ public readonly helpText:string = `Multiplayer Subcommands:
!mp start - Starts a multiplayer match with a delay (optional)
!mp abort - Aborts the currently running round / countdown
!mp obr - Toggles Battle Royale mode`;
-
-export class MultiplayerCommands extends BaseCommand {
- public readonly helpText:string = helpText;
public readonly helpDescription:string = "Command for use in multiplayer matches.";
public readonly helpArguments:Array = ["subCommand"];
diff --git a/server/commands/Ranking.ts b/server/commands/Ranking.ts
index e4d810e..f71742c 100644
--- a/server/commands/Ranking.ts
+++ b/server/commands/Ranking.ts
@@ -1,15 +1,13 @@
-import { Channel } from "../objects/Channel";
-import { User } from "../objects/User";
+import Channel from "../objects/Channel";
+import User from "../objects/User";
import { RankingModes } from "../enums/RankingModes";
-import { BaseCommand } from "./BaseCommand";
+import BaseCommand from "./BaseCommand";
-const helpText = `Ranking Modes:
+export default class RankingCommand extends BaseCommand {
+ public readonly helpText:string = `Ranking Modes:
!ranking pp - Sets your ranking mode to pp
!ranking score - Sets your ranking mode to score
!ranking acc - Sets your ranking mode to accuracy`;
-
-export class RankingCommand extends BaseCommand {
- public readonly helpText:string = helpText;
public readonly helpDescription:string = "Sets your prefered ranking type";
public exec(channel:Channel, sender:User, args:Array) {
diff --git a/server/commands/RollCommand.ts b/server/commands/RollCommand.ts
index 4b33377..0dca2b1 100644
--- a/server/commands/RollCommand.ts
+++ b/server/commands/RollCommand.ts
@@ -1,8 +1,8 @@
-import { Channel } from "../objects/Channel";
-import { User } from "../objects/User";
-import { BaseCommand } from "./BaseCommand";
+import Channel from "../objects/Channel";
+import User from "../objects/User";
+import BaseCommand from "./BaseCommand";
-export class RollCommand extends BaseCommand {
+export default class RollCommand extends BaseCommand {
public readonly helpDescription:string = "Roll some dice and get a random number between 1 and a number (default 100)";
public readonly helpArguments:Array = ["number"];
diff --git a/server/interfaces/Config.ts b/server/interfaces/Config.ts
index d6d44f1..00e5fa9 100644
--- a/server/interfaces/Config.ts
+++ b/server/interfaces/Config.ts
@@ -1,11 +1,11 @@
-export interface Config {
- express:ExpressConfigSection,
+export default interface Config {
+ http:HttpConfigSection,
prometheus:PrometheusConfigSection,
redis:RedisConfigSection,
database:DatabaseConfigSection
}
-interface ExpressConfigSection {
+interface HttpConfigSection {
port:number,
compression:boolean
}
diff --git a/server/interfaces/ICommand.ts b/server/interfaces/ICommand.ts
index 7bc8bd9..53e8a45 100644
--- a/server/interfaces/ICommand.ts
+++ b/server/interfaces/ICommand.ts
@@ -1,8 +1,8 @@
-import { Channel } from "../objects/Channel";
-import { Shared } from "../objects/Shared";
-import { User } from "../objects/User";
+import Channel from "../objects/Channel";
+import Shared from "../objects/Shared";
+import User from "../objects/User";
-export interface ICommand {
+export default interface ICommand {
shared:Shared,
helpText:string,
helpDescription:string,
diff --git a/server/interfaces/IpZxqResponse.ts b/server/interfaces/IpZxqResponse.ts
index 186a916..2c05280 100644
--- a/server/interfaces/IpZxqResponse.ts
+++ b/server/interfaces/IpZxqResponse.ts
@@ -1,4 +1,4 @@
-export interface IpZxqResponse {
+export default interface IpZxqResponse {
country: string,
loc: string
}
\ No newline at end of file
diff --git a/server/interfaces/MatchData.ts b/server/interfaces/MatchData.ts
index 3f5a6df..2d9bfe4 100644
--- a/server/interfaces/MatchData.ts
+++ b/server/interfaces/MatchData.ts
@@ -1,6 +1,6 @@
-import { MatchDataSlot } from "./MatchDataSlot";
+import MatchDataSlot from "./MatchDataSlot";
-export interface MatchData {
+export default interface MatchData {
matchId:number,
matchType:number,
activeMods:number,
diff --git a/server/interfaces/MatchDataSlot.ts b/server/interfaces/MatchDataSlot.ts
index af75d09..b950c86 100644
--- a/server/interfaces/MatchDataSlot.ts
+++ b/server/interfaces/MatchDataSlot.ts
@@ -1,4 +1,4 @@
-export interface MatchDataSlot {
+export default interface MatchDataSlot {
status:number,
team:number,
playerId:number,
diff --git a/server/interfaces/MatchJoinData.ts b/server/interfaces/MatchJoinData.ts
index ac5dbed..ca0064b 100644
--- a/server/interfaces/MatchJoinData.ts
+++ b/server/interfaces/MatchJoinData.ts
@@ -1,4 +1,4 @@
-export interface MatchJoinData {
+export default interface MatchJoinData {
matchId: number,
gamePassword: string
}
\ No newline at end of file
diff --git a/server/interfaces/MatchScoreData.ts b/server/interfaces/MatchScoreData.ts
index d79787d..5a10306 100644
--- a/server/interfaces/MatchScoreData.ts
+++ b/server/interfaces/MatchScoreData.ts
@@ -1,4 +1,4 @@
-export interface MatchScoreData {
+export default interface MatchScoreData {
time:number,
id:number,
count300:number,
diff --git a/server/interfaces/MatchStartSkipData.ts b/server/interfaces/MatchStartSkipData.ts
index 1c7ab6d..5b149f5 100644
--- a/server/interfaces/MatchStartSkipData.ts
+++ b/server/interfaces/MatchStartSkipData.ts
@@ -1,4 +1,4 @@
-export interface MatchStartSkipData {
+export default interface MatchStartSkipData {
playerId:number,
flag:boolean
}
\ No newline at end of file
diff --git a/server/interfaces/MessageData.ts b/server/interfaces/MessageData.ts
index 321d9ec..8c4735a 100644
--- a/server/interfaces/MessageData.ts
+++ b/server/interfaces/MessageData.ts
@@ -1,4 +1,4 @@
-export interface MessageData {
+export default interface MessageData {
sendingClient: string,
message: string,
target: string,
diff --git a/server/interfaces/OsuPacketWriter.ts b/server/interfaces/OsuPacketWriter.ts
index 88294d6..14c9639 100644
--- a/server/interfaces/OsuPacketWriter.ts
+++ b/server/interfaces/OsuPacketWriter.ts
@@ -1,7 +1,7 @@
-import { MatchData } from "./MatchData"
-import { MessageData } from "./MessageData"
+import MatchData from "./MatchData"
+import MessageData from "./MessageData"
-export interface OsuPacketWriter {
+export default interface OsuPacketWriter {
// Functions
LoginReply(data:number) : OsuPacketWriter,
CommandError() : OsuPacketWriter,
diff --git a/server/interfaces/PlayerScore.ts b/server/interfaces/PlayerScore.ts
index b9d64d6..2fdcec3 100644
--- a/server/interfaces/PlayerScore.ts
+++ b/server/interfaces/PlayerScore.ts
@@ -1,8 +1,8 @@
-import { Slot } from "../objects/Slot";
-import { User } from "../objects/User";
-import { MatchScoreData } from "./MatchScoreData";
+import Slot from "../objects/Slot";
+import User from "../objects/User";
+import MatchScoreData from "./MatchScoreData";
-export interface PlayerScore {
+export default interface PlayerScore {
player:User,
slot:Slot,
score:number,
diff --git a/server/objects/Channel.ts b/server/objects/Channel.ts
index 63b9bd5..a2716b3 100644
--- a/server/objects/Channel.ts
+++ b/server/objects/Channel.ts
@@ -1,10 +1,11 @@
-import { osu } from "../../osuTyping";
-import { Bot } from "../Bot";
-import { Shared } from "../objects/Shared";
-import { DataStream } from "./DataStream";
-import { User } from "./User";
+import osu from "../../osuTyping";
+import Bot from "../Bot";
+import ChatHistory from "../ChatHistory";
+import Shared from "../objects/Shared";
+import DataStream from "./DataStream";
+import User from "./User";
-export class Channel {
+export default class Channel {
public name:string;
public description:string;
public stream:DataStream;
@@ -40,6 +41,9 @@ export class Channel {
senderId: sender.id
});
this.stream.SendWithExclusion(osuPacketWriter.toBuffer, sender);
+ if (this.name === "#osu") {
+ ChatHistory.AddMessage(`${sender.username}: ${message}`);
+ }
}
if (message[0] === "!") {
@@ -63,6 +67,10 @@ export class Channel {
} else {
this.stream.Send(osuPacketWriter.toBuffer);
}
+
+ if (this.name === "#osu") {
+ ChatHistory.AddMessage(`${this.bot.user.username}: ${message}`);
+ }
}
public SendSystemMessage(message:string, sendTo?:User) {
diff --git a/server/objects/DataStream.ts b/server/objects/DataStream.ts
index 686e398..7665764 100644
--- a/server/objects/DataStream.ts
+++ b/server/objects/DataStream.ts
@@ -1,13 +1,13 @@
import { ConsoleHelper } from "../../ConsoleHelper";
-import { Constants } from "../../Constants";
-import { DataStreamArray } from "./DataStreamArray";
-import { User } from "./User";
-import { UserArray } from "./UserArray";
+import Constants from "../../Constants";
+import DataStreamArray from "./DataStreamArray";
+import User from "./User";
+import UserArray from "./UserArray";
import { hexlify } from "../Util";
type DeleteFunction = (dataStream:DataStream) => void;
-export class DataStream {
+export default class DataStream {
private users:UserArray = new UserArray();
public readonly name:string;
private readonly parent:DataStreamArray;
diff --git a/server/objects/DataStreamArray.ts b/server/objects/DataStreamArray.ts
index 2491060..76e907a 100644
--- a/server/objects/DataStreamArray.ts
+++ b/server/objects/DataStreamArray.ts
@@ -1,9 +1,9 @@
import { ConsoleHelper } from "../../ConsoleHelper";
-import { DataStream } from "./DataStream";
-import { FunkyArray } from "./FunkyArray";
-import { User } from "./User";
+import DataStream from "./DataStream";
+import FunkyArray from "./FunkyArray";
+import User from "./User";
-export class DataStreamArray extends FunkyArray {
+export default class DataStreamArray extends FunkyArray {
public CreateStream(name:string, removeWhenEmpty:boolean = true) : DataStream {
const dataStream:DataStream = this.add(name, new DataStream(name, this, removeWhenEmpty));
ConsoleHelper.printStream(`Created stream [${name}]`);
diff --git a/server/objects/Database.ts b/server/objects/Database.ts
index cc6ee9e..3a6f7dc 100644
--- a/server/objects/Database.ts
+++ b/server/objects/Database.ts
@@ -1,7 +1,7 @@
import { ConsoleHelper } from "../../ConsoleHelper";
import { createPool, Pool } from "mysql2";
-export class Database {
+export default class Database {
private connectionPool:Pool;
private static readonly CONNECTION_LIMIT = 128;
diff --git a/server/objects/FunkyArray.ts b/server/objects/FunkyArray.ts
index 8e29b32..cbecedd 100644
--- a/server/objects/FunkyArray.ts
+++ b/server/objects/FunkyArray.ts
@@ -1,4 +1,4 @@
-export class FunkyArray {
+export default class FunkyArray {
private items:any = {};
private itemKeys:Array = Object.keys(this.items);
private iterableArray:Array = new Array();
diff --git a/server/objects/LatLng.ts b/server/objects/LatLng.ts
index 8a494d7..22e6156 100644
--- a/server/objects/LatLng.ts
+++ b/server/objects/LatLng.ts
@@ -1,4 +1,4 @@
-export class LatLng {
+export default class LatLng {
public latitude:number;
public longitude:number;
diff --git a/server/objects/LoginInfo.ts b/server/objects/LoginInfo.ts
index c8712b9..000341b 100644
--- a/server/objects/LoginInfo.ts
+++ b/server/objects/LoginInfo.ts
@@ -1,4 +1,4 @@
-export class LoginInfo {
+export default class LoginInfo {
public username:string;
public password:string;
public version:string;
@@ -19,8 +19,6 @@ export class LoginInfo {
data = data.toString();
}
- console.log(data);
-
const loginData:Array = data.split("\n");
const extraData:Array = loginData[2].split("|");
diff --git a/server/objects/Match.ts b/server/objects/Match.ts
index 0841090..9a529df 100644
--- a/server/objects/Match.ts
+++ b/server/objects/Match.ts
@@ -1,19 +1,19 @@
-import { Channel } from "./Channel";
-import { Shared } from "../objects/Shared";
-import { DataStream } from "./DataStream";
-import { Slot } from "./Slot";
-import { User } from "./User";
-import { StatusUpdate } from "../packets/StatusUpdate";
+import Channel from "./Channel";
+import Shared from "../objects/Shared";
+import DataStream from "./DataStream";
+import Slot from "./Slot";
+import User from "./User";
+import StatusUpdate from "../packets/StatusUpdate";
import { SlotStatus } from "../enums/SlotStatus";
-import { MatchData } from "../interfaces/MatchData";
+import MatchData from "../interfaces/MatchData";
import { Team } from "../enums/Team";
-import { MatchStartSkipData } from "../interfaces/MatchStartSkipData";
+import MatchStartSkipData from "../interfaces/MatchStartSkipData";
import { Mods } from "../enums/Mods";
-import { PlayerScore } from "../interfaces/PlayerScore";
-import { MatchScoreData } from "../interfaces/MatchScoreData";
-import { osu } from "../../osuTyping";
+import PlayerScore from "../interfaces/PlayerScore";
+import MatchScoreData from "../interfaces/MatchScoreData";
+import osu from "../../osuTyping";
-export class Match {
+export default class Match {
// osu! Data
public matchId:number = -1;
public inProgress:boolean = false;
@@ -236,8 +236,6 @@ export class Match {
// Update all users in the match with new match information
this.matchStream.Send(osuPacketWriter.toBuffer);
-
- console.log(this.slots);
}
public moveToSlot(user:User, slotToMoveTo:number) {
@@ -448,7 +446,6 @@ export class Match {
this.matchLoadSlots = new Array();
// Loop through all slots in the match
- console.log(this.slots);
for (let slot of this.slots) {
// Make sure the slot has a user in it
if (slot.player === undefined || slot.status === SlotStatus.Empty || slot.status === SlotStatus.Locked) {
diff --git a/server/objects/MatchArray.ts b/server/objects/MatchArray.ts
index a5fe0c7..ab477d5 100644
--- a/server/objects/MatchArray.ts
+++ b/server/objects/MatchArray.ts
@@ -1,7 +1,7 @@
-import { FunkyArray } from "./FunkyArray";
-import { Match } from "./Match";
+import FunkyArray from "./FunkyArray";
+import Match from "./Match";
-export class MatchArray extends FunkyArray {
+export default class MatchArray extends FunkyArray {
public getById(id:number) : Match | undefined {
for (let match of this.getIterableItems()) {
if (match.matchId === id) {
diff --git a/server/objects/PrivateChannel.ts b/server/objects/PrivateChannel.ts
index a0db624..ce7a971 100644
--- a/server/objects/PrivateChannel.ts
+++ b/server/objects/PrivateChannel.ts
@@ -1,10 +1,10 @@
-import { osu } from "../../osuTyping";
-import { Shared } from "../objects/Shared";
-import { Channel } from "./Channel";
-import { DataStream } from "./DataStream";
-import { User } from "./User";
+import osu from "../../osuTyping";
+import Shared from "../objects/Shared";
+import Channel from "./Channel";
+import DataStream from "./DataStream";
+import User from "./User";
-export class PrivateChannel extends Channel {
+export default class PrivateChannel extends Channel {
private readonly user0:User;
private readonly user1:User;
diff --git a/server/objects/Shared.ts b/server/objects/Shared.ts
index ce3e9cd..d918cde 100644
--- a/server/objects/Shared.ts
+++ b/server/objects/Shared.ts
@@ -1,16 +1,16 @@
-import { ChatManager } from "../ChatManager";
-import { Config } from "../interfaces/Config";
-import { Database } from "../objects/Database";
-import { DataStreamArray } from "../objects/DataStreamArray";
-import { MultiplayerManager } from "../MultiplayerManager";
-import { PrivateChatManager } from "../PrivateChatManager";
+import ChatManager from "../ChatManager";
+import Config from "../interfaces/Config";
+import Database from "../objects/Database";
+import DataStreamArray from "../objects/DataStreamArray";
+import MultiplayerManager from "../MultiplayerManager";
+import PrivateChatManager from "../PrivateChatManager";
import { readFileSync } from "fs";
-import { UserArray } from "../objects/UserArray";
-import { User } from "./User";
-import { LatLng } from "./LatLng";
-import { Bot } from "../Bot";
+import UserArray from "../objects/UserArray";
+import User from "./User";
+import LatLng from "./LatLng";
+import Bot from "../Bot";
-export class Shared {
+export default class Shared {
public readonly chatManager:ChatManager;
public readonly config:Config;
public readonly database:Database;
diff --git a/server/objects/Slot.ts b/server/objects/Slot.ts
index 8dc2ed5..d7ba751 100644
--- a/server/objects/Slot.ts
+++ b/server/objects/Slot.ts
@@ -1,8 +1,8 @@
import { Mods } from "../enums/Mods";
import { SlotStatus } from "../enums/SlotStatus";
-import { User } from "./User";
+import User from "./User";
-export class Slot {
+export default class Slot {
public readonly slotId:number;
public status:SlotStatus;
public team:number;
diff --git a/server/objects/User.ts b/server/objects/User.ts
index 1d936ca..283605b 100644
--- a/server/objects/User.ts
+++ b/server/objects/User.ts
@@ -1,10 +1,10 @@
-import { LatLng } from "./LatLng";
+import LatLng from "./LatLng";
import { RankingModes } from "../enums/RankingModes";
-import { Match } from "./Match";
-import { DataStream } from "./DataStream";
-import { StatusUpdate } from "../packets/StatusUpdate";
-import { Shared } from "../objects/Shared";
-import { Slot } from "./Slot";
+import Match from "./Match";
+import DataStream from "./DataStream";
+import StatusUpdate from "../packets/StatusUpdate";
+import Shared from "../objects/Shared";
+import Slot from "./Slot";
const rankingModes = [
"pp_raw",
@@ -12,7 +12,7 @@ const rankingModes = [
"avg_accuracy"
];
-export class User {
+export default class User {
private static readonly EMPTY_BUFFER = Buffer.alloc(0);
public shared:Shared;
diff --git a/server/objects/UserArray.ts b/server/objects/UserArray.ts
index 702d3b3..21fb33b 100644
--- a/server/objects/UserArray.ts
+++ b/server/objects/UserArray.ts
@@ -1,7 +1,7 @@
-import { FunkyArray } from "./FunkyArray";
-import { User } from "./User";
+import FunkyArray from "./FunkyArray";
+import User from "./User";
-export class UserArray extends FunkyArray {
+export default class UserArray extends FunkyArray {
public getById(id:number) : User | undefined {
for (let user of this.getIterableItems()) {
if (user.id == id)
diff --git a/server/objects/database/UserInfo.ts b/server/objects/database/UserInfo.ts
index 20638a2..ce3d5d3 100644
--- a/server/objects/database/UserInfo.ts
+++ b/server/objects/database/UserInfo.ts
@@ -1,4 +1,4 @@
-export class UserInfo {
+export default class UserInfo {
id:number = Number.MIN_VALUE;
username:string = "";
username_safe:string = "";
diff --git a/server/packets/AddFriend.ts b/server/packets/AddFriend.ts
index 680a3e2..97b9787 100644
--- a/server/packets/AddFriend.ts
+++ b/server/packets/AddFriend.ts
@@ -1,6 +1,6 @@
-import { User } from "../objects/User";
+import User from "../objects/User";
-export function AddFriend(user:User, friendId:number) {
+export default function AddFriend(user:User, friendId:number) {
user.shared.database.query("INSERT INTO friends (user, friendsWith) VALUES (?, ?)", [
user.id, friendId
]);
diff --git a/server/packets/ChangeAction.ts b/server/packets/ChangeAction.ts
index 085d4fa..30a4dd6 100644
--- a/server/packets/ChangeAction.ts
+++ b/server/packets/ChangeAction.ts
@@ -1,7 +1,7 @@
-import { User } from "../objects/User";
-import { StatusUpdate } from "./StatusUpdate";
+import User from "../objects/User";
+import StatusUpdate from "./StatusUpdate";
-export function ChangeAction(user:User, data:any) {
+export default function ChangeAction(user:User, data:any) {
user.updatePresence(data);
if (user.spectatorStream != null) {
diff --git a/server/packets/Logout.ts b/server/packets/Logout.ts
index 121a99b..f43a831 100644
--- a/server/packets/Logout.ts
+++ b/server/packets/Logout.ts
@@ -1,9 +1,9 @@
import { ConsoleHelper } from "../../ConsoleHelper";
-import { Database } from "../objects/Database";
-import { DataStreamArray } from "../objects/DataStreamArray";
-import { User } from "../objects/User";
+import Database from "../objects/Database";
+import DataStreamArray from "../objects/DataStreamArray";
+import User from "../objects/User";
-export async function Logout(user:User) {
+export default async function Logout(user:User) {
if (user.uuid === "bot") throw "Tried to log bot out, WTF???";
const logoutStartTime = Date.now();
diff --git a/server/packets/PrivateMessage.ts b/server/packets/PrivateMessage.ts
index bbaaa7f..69b3d78 100644
--- a/server/packets/PrivateMessage.ts
+++ b/server/packets/PrivateMessage.ts
@@ -1,27 +1,23 @@
-import { MessageData } from "../interfaces/MessageData";
-import { Shared } from "../objects/Shared";
-import { PrivateChannel } from "../objects/PrivateChannel";
-import { User } from "../objects/User";
+import MessageData from "../interfaces/MessageData";
+import Shared from "../objects/Shared";
+import PrivateChannel from "../objects/PrivateChannel";
+import User from "../objects/User";
-export function PrivateMessage(user:User, message:MessageData) {
+export default function PrivateMessage(user:User, message:MessageData) {
const shared:Shared = user.shared;
const sendingTo = shared.users.getByUsername(message.target);
if (!(sendingTo instanceof User)) {
- console.log("Sending User invalid");
return;
}
let channel = shared.privateChatManager.GetChannelByName(`${user.username}${sendingTo.username}`);
if (!(channel instanceof PrivateChannel)) {
- console.log("First find failed");
// Try it the other way around
channel = shared.privateChatManager.GetChannelByName(`${sendingTo.username}${user.username}`);
}
if (!(channel instanceof PrivateChannel)) {
- console.log("Second find failed, creating");
channel = shared.privateChatManager.AddChannel(user, sendingTo);
}
- console.log("sending");
channel.SendMessage(user, message.message);
}
\ No newline at end of file
diff --git a/server/packets/RemoveFriend.ts b/server/packets/RemoveFriend.ts
index 0fb81e8..aa36f9a 100644
--- a/server/packets/RemoveFriend.ts
+++ b/server/packets/RemoveFriend.ts
@@ -1,6 +1,6 @@
-import { User } from "../objects/User";
+import User from "../objects/User";
-export function RemoveFriend(user:User, friendId:number) {
+export default function RemoveFriend(user:User, friendId:number) {
user.shared.database.query("DELETE FROM friends WHERE user = ? AND friendsWith = ? LIMIT 1", [
user.id, friendId
]);
diff --git a/server/packets/StatusUpdate.ts b/server/packets/StatusUpdate.ts
index b2a6a1b..ee9afaf 100644
--- a/server/packets/StatusUpdate.ts
+++ b/server/packets/StatusUpdate.ts
@@ -1,9 +1,9 @@
-import { Shared } from "../objects/Shared";
+import Shared from "../objects/Shared";
import { RankingModes } from "../enums/RankingModes";
-import { User } from "../objects/User";
-import { osu } from "../../osuTyping";
+import User from "../objects/User";
+import osu from "../../osuTyping";
-export function StatusUpdate(arg0:User | Shared, id:number) {
+export default function StatusUpdate(arg0:User | Shared, id:number) {
if (id == 3) return; // Ignore Bot
// Create new osu packet writer
diff --git a/server/packets/TourneyJoinMatchChannel.ts b/server/packets/TourneyJoinMatchChannel.ts
index 40cee45..010e841 100644
--- a/server/packets/TourneyJoinMatchChannel.ts
+++ b/server/packets/TourneyJoinMatchChannel.ts
@@ -1,7 +1,7 @@
-import { osu } from "../../osuTyping";
-import { User } from "../objects/User";
+import osu from "../../osuTyping";
+import User from "../objects/User";
-export function TourneyMatchJoinChannel(user:User, matchId:number) {
+export default function TourneyMatchJoinChannel(user:User, matchId:number) {
const match = user.shared.multiplayerManager.GetMatchById(matchId);
if (match === undefined) {
return;
diff --git a/server/packets/TourneyMatchLeaveChannel.ts b/server/packets/TourneyMatchLeaveChannel.ts
index 481024d..6a8bb63 100644
--- a/server/packets/TourneyMatchLeaveChannel.ts
+++ b/server/packets/TourneyMatchLeaveChannel.ts
@@ -1,6 +1,6 @@
-import { User } from "../objects/User";
+import User from "../objects/User";
-export function TourneyMatchLeaveChannel(user:User, matchId:number) {
+export default function TourneyMatchLeaveChannel(user:User, matchId:number) {
const match = user.shared.multiplayerManager.GetMatchById(matchId);
if (match === undefined) {
return;
diff --git a/server/packets/TourneyMatchSpecialInfo.ts b/server/packets/TourneyMatchSpecialInfo.ts
index 91183be..c3ce745 100644
--- a/server/packets/TourneyMatchSpecialInfo.ts
+++ b/server/packets/TourneyMatchSpecialInfo.ts
@@ -1,10 +1,10 @@
-import { osu } from "../../osuTyping";
-import { Match } from "../objects/Match";
-import { User } from "../objects/User";
-import { StatusUpdate } from "./StatusUpdate";
-import { UserPresence } from "./UserPresence";
+import osu from "../../osuTyping";
+import Match from "../objects/Match";
+import User from "../objects/User";
+import StatusUpdate from "./StatusUpdate";
+import UserPresence from "./UserPresence";
-export function TourneyMatchSpecialInfo(user:User, matchId:number) {
+export default function TourneyMatchSpecialInfo(user:User, matchId:number) {
const match = user.shared.multiplayerManager.GetMatchById(matchId);
if (!(match instanceof Match)) {
return;
diff --git a/server/packets/UserPresence.ts b/server/packets/UserPresence.ts
index dac114d..aa78bf4 100644
--- a/server/packets/UserPresence.ts
+++ b/server/packets/UserPresence.ts
@@ -1,8 +1,8 @@
-import { osu } from "../../osuTyping";
-import { Shared } from "../objects/Shared";
-import { User } from "../objects/User";
+import osu from "../../osuTyping";
+import Shared from "../objects/Shared";
+import User from "../objects/User";
-export function UserPresence(arg0:User | Shared, id:number) {
+export default function UserPresence(arg0:User | Shared, id:number) {
const osuPacketWriter = osu.Bancho.Writer();
let shared:Shared;
if (arg0 instanceof User) {
diff --git a/server/packets/UserPresenceBundle.ts b/server/packets/UserPresenceBundle.ts
index 4ff0bb9..a644ec3 100644
--- a/server/packets/UserPresenceBundle.ts
+++ b/server/packets/UserPresenceBundle.ts
@@ -1,8 +1,8 @@
-import { osu } from "../../osuTyping";
-import { Shared } from "../objects/Shared";
-import { User } from "../objects/User";
+import osu from "../../osuTyping";
+import Shared from "../objects/Shared";
+import User from "../objects/User";
-export function UserPresenceBundle(arg0:User | Shared) : Buffer {
+export default function UserPresenceBundle(arg0:User | Shared) : Buffer {
const osuPacketWriter = osu.Bancho.Writer();
let shared:Shared;
if (arg0 instanceof User) {
diff --git a/server/packets/UserStatsRequest.ts b/server/packets/UserStatsRequest.ts
index 29719e4..978a711 100644
--- a/server/packets/UserStatsRequest.ts
+++ b/server/packets/UserStatsRequest.ts
@@ -1,9 +1,9 @@
-import { User } from "../objects/User";
-import { StatusUpdate } from "./StatusUpdate";
-import { UserPresence } from "./UserPresence";
-import { UserPresenceBundle } from "./UserPresenceBundle";
+import User from "../objects/User";
+import StatusUpdate from "./StatusUpdate";
+import UserPresence from "./UserPresence";
+import UserPresenceBundle from "./UserPresenceBundle";
-export function UserStatsRequest(user:User, data:Array) {
+export default function UserStatsRequest(user:User, data:Array) {
UserPresenceBundle(user);
for (let id of data) {
diff --git a/tooling/cleanup.ts b/tooling/cleanup.ts
new file mode 100644
index 0000000..cba0137
--- /dev/null
+++ b/tooling/cleanup.ts
@@ -0,0 +1,12 @@
+import { readdirSync, rmSync, renameSync } from "fs";
+
+const libFiles = readdirSync("./build");
+
+for (const file of libFiles) {
+ if (!file.startsWith("index.min.js")) {
+ rmSync(`./build/${file}`, { recursive: true });
+ }
+}
+
+//renameSync("./build/combined.js", "./build/index.js");
+//renameSync("./build/combined.d.ts", "./build/index.d.ts");
\ No newline at end of file
diff --git a/tooling/fileSmasher.ts b/tooling/fileSmasher.ts
new file mode 100644
index 0000000..b1ca63b
--- /dev/null
+++ b/tooling/fileSmasher.ts
@@ -0,0 +1,67 @@
+// fileSmasher ~.~
+// for when you're just too lazy to
+// do it properly.
+
+import { readdirSync, lstatSync, readFileSync, writeFileSync } from "fs";
+
+let tsFileData:Array = new Array();
+const tsFirstFileData:Array = new Array();
+const tsLastFileData:Array = new Array();
+const tsEverythingElse:Array = new Array();
+
+function readDir(nam:string) {
+ const files = readdirSync(nam);
+ for (const file of files) {
+ if (nam == "./" && (file.startsWith(".") || file == "tooling" || file == "build" || file == "node_modules" || file == "combined.ts")) {
+ continue;
+ }
+
+ // This is a very dumb way of checking for folders
+ // protip: don't do this.
+ if (lstatSync(`${nam}/${file}`).isDirectory()) {
+ readDir(`${nam}/${file}`);
+ } else if (file.endsWith(".ts")) {
+ if (file == "Binato.ts") {
+ tsLastFileData.push(readFileSync((`${nam}/${file}`).replace("//", "/")).toString());
+ } else if (nam.includes("enum") || nam.includes("packets") || file.includes("FunkyArray") || file.includes("SpectatorManager") || file.includes("Shared")) {
+ tsFirstFileData.push(readFileSync((`${nam}/${file}`).replace("//", "/")).toString());
+ } else {
+ tsEverythingElse.push(readFileSync((`${nam}/${file}`).replace("//", "/")).toString());
+ }
+ }
+ }
+}
+
+readDir("./");
+
+tsFileData = tsFileData.concat(tsFirstFileData).concat(tsEverythingElse).concat(tsLastFileData);
+
+const combinedFiles = tsFileData.join("\n");
+
+const splitLines = combinedFiles.split("\n");
+const resultLines:Array = new Array();
+
+// Insert allowed imports
+resultLines.push(`import { IncomingMessage, ServerResponse } from "http";
+import { Registry, collectDefaultMetrics } from "prom-client";
+import { RedisClientType, createClient } from "redis";
+import { readFileSync, existsSync } from "fs";
+import { randomBytes, pbkdf2 } from "crypto";
+import { createPool, Pool } from "mysql2";
+import * as dyetty from "dyetty";
+import fetch from "node-fetch";
+import http from "http";`);
+
+// Let's process the file to make it usable
+for (const line of splitLines) {
+ // Throw away imports as they aren't needed
+ // TODO: Add allow list for npm module imports
+ if (line.startsWith("import")) {
+ continue;
+ }
+ // Fix up classes, interfaces and such.
+ //resultLines.push(line);
+ resultLines.push(line.replace("export default", "").replace("export class", "class").replace("export interface", "interface").replace("export enum", "enum").replace("export type", "type"));
+}
+
+writeFileSync("./combined.ts", resultLines.join("\n"));
diff --git a/tooling/mangle.ts b/tooling/mangle.ts
new file mode 100644
index 0000000..73da792
--- /dev/null
+++ b/tooling/mangle.ts
@@ -0,0 +1,10 @@
+import { readFileSync, writeFileSync } from "fs";
+import { minify } from "terser";
+
+(async () => {
+ const mangled = await minify(readFileSync("./build/combined.js").toString(), {
+ mangle: true,
+ toplevel: true,
+ });
+ writeFileSync("./build/index.min.js", `${mangled.code}`);
+})();
\ No newline at end of file