diff options
| -rw-r--r-- | commands.js | 3 | ||||
| -rw-r--r-- | config.json | 3 | ||||
| -rw-r--r-- | index.js | 10 | ||||
| -rw-r--r-- | newserver.js | 233 |
4 files changed, 243 insertions, 6 deletions
diff --git a/commands.js b/commands.js index cf677b9..5a8200f 100644 --- a/commands.js +++ b/commands.js @@ -47,7 +47,8 @@ export const commands = { description: "Shows info about wsChat", aliases: [], command({ user, args, sendInChannel }) { - user.socket.send(`wsChat v${JSON.parse(String(fs.readFileSync("package.json"))).version}\nGithub: https://github.com/WlodekM/wsChat`); + let packagejson = JSON.parse(fs.readFileSync("package.json").toString()) + user.socket.send(`wsChat v${packagejson.version}\nGithub: https://github.com/WlodekM/wsChat`); }, }, whois: { diff --git a/config.json b/config.json index 01d849a..d02a20a 100644 --- a/config.json +++ b/config.json @@ -8,5 +8,6 @@ "profanity": false, "profanityRemoveWords": ["butt", "arse", "balls", "dick"], "profanityAddWords": ["kys"], - "fullMessage": "Sorry, but the server is full right now, come back later" + "fullMessage": "Sorry, but the server is full right now, come back later", + "annonFormat": "Anonymous#[num]" } diff --git a/index.js b/index.js index 28db598..6c17622 100644 --- a/index.js +++ b/index.js @@ -8,7 +8,8 @@ import fs from "fs"; const server = { config: JSON.parse(String(fs.readFileSync("config.json"))), - channels: ["home", "off-topic"], + channels: ["home", "off-topic", "randomness"], + annonChannels: ["randomness"], users: {}, accounts: accounts, }; @@ -70,9 +71,10 @@ ws.on("connection", (socket, request) => { let ip = request.headers["x-forwarded-for"] || request.socket.remoteAddress; console.log(request.headers["x-forwarded-for"], request.socket.remoteAddress); let anonID = getRandomInt(0, 99999); + let annonNum = "0".repeat(5 - anonID.toString().length) + anonID.toString() server.users[userID] = { - username: `Anonymous#${"0".repeat(5 - anonID.toString().length) + anonID.toString()}`, - nickname: `Anonymous#${"0".repeat(5 - anonID.toString().length) + anonID.toString()}`, + username: server.config.annonFormat ? server.config.annonFormat.replace('[num]', annonNum) : 'Anonymous' + annonNum, + nickname: server.config.annonFormat ? server.config.annonFormat.replace('[num]', annonNum) : 'Anonymous' + annonNum, guest: true, socket: socket, joinReq: request, @@ -193,7 +195,7 @@ ws.on("connection", (socket, request) => { } return; } - if (server.config.requireLogin && user.guest) return socket.send("This server requires you to log in, use /login <username> <password> to log in or /register <username> <password> to make an account."); + if (server.config.requireLogin && user.guest && !server.annonChannels.includes(user.channel)) return socket.send("This server requires you to log in, use /login <username> <password> to log in or /register <username> <password> to make an account."); profanity.options.grawlixChar = "*"; if (!server.config.profanity) rawData = profanity.censor(String(rawData)); if (rawData.length < 1) return socket.send("Error: message too short!"); diff --git a/newserver.js b/newserver.js new file mode 100644 index 0000000..27b0f7f --- /dev/null +++ b/newserver.js @@ -0,0 +1,233 @@ +import { WebSocketServer } from "ws"; +import { getRandomInt } from "./lib.js"; +import { profanity } from "@2toad/profanity"; +import { commands } from "./commands.js"; +import * as accounts from "./accounts.js"; +import cuid from "cuid"; +import fs from "fs"; + +class User { + /** + * + * @param {import("http").IncomingMessage} request request + * @param {Server} server the server + */ + constructor (request, socket, server) { + this.id = cuid(); + let anonID = getRandomInt(0, 99999); + let annonNum = "0".repeat(5 - anonID.toString().length) + anonID.toString() + this.username = server.config.annonFormat ? server.config.annonFormat.replace('[num]', annonNum) : 'Anonymous' + annonNum; + this.nickname = server.config.annonFormat ? server.config.annonFormat.replace('[num]', annonNum) : 'Anonymous' + annonNum; + this.guest = true; + this.socket = socket; + this.joinReq = request; + this.ip = request.headers["x-forwarded-for"] || request.socket.remoteAddress; + this.t = { + js: Number(new Date()), + unix: Math.floor(new Date().getTime() / 1000), + str: String(new Date()), + }; + this.channel = "home"; + this.name = function () { + return this.nickname != "" ? this.nickname : this.username; + }; + } +} + +class Server { + sendInChannel(msg, channel) { + for (const userID in this.users) { + const user = this.users[userID]; + if (user.channel == channel) user.socket.send(msg); + } + } + + format(txt) { + txt = String(txt); + txt = txt.replaceAll("$(serverName)$", this.config.name); + txt = txt.replaceAll("$(userCount)$", Object.keys(this.users).length); + for (const configName in this.config) { + if (Object.prototype.hasOwnProperty.call(this.config, configName)) { + const configValue = this.config[configName]; + txt = txt.replaceAll(`$(${configName})$`, configValue); + } + } + return txt; + } + + updateUsers() { + Object.keys(this.users).forEach((user) => { + if (user.subscribedToUsers) { + user.socket.send( + `:json.sub<users>:${JSON.stringify( + Object.values(this.users).map((usr) => { + return { + username: usr.username, + nickname: usr.nickname, + t: usr.t, + channel: user.channel, + displayName: user.name(), + }; + }) + )}` + ); + } + }); + } + + /** + * A wsChat server + * @param {{ + * name: String, + * motd: String, + * max: Number, + * owner: String, + * saveIP: Boolean, + * requireLogin: Boolean, + * profanity: Boolean, + * profanityRemoveWords: String[], + * profanityAddWords: String[], + * fullMessage: String, + * annonFormat: String + * }} config + * @param {String[]} channels + * @param {String[]} annonChannels + */ + constructor (config, channels, annonChannels=[]) { + this.config = config; + this.channels = channels; + this.annonChannels = annonChannels; + this.accounts = accounts; + this.ws = new WebSocketServer({ + port: 9933, + }); + + if (this.config.profanityRemoveWords) profanity.removeWords(this.config.profanityRemoveWords); + if (this.config.profanityAddWords) profanity.addWords(this.config.profanityAddWords); + + this.ws.on("connection", (socket, request) => { + if (this.config.max && Object.keys(this.users).length >= this.config.max) { + socket.send(format(this.config.fullMessage ?? "Sorry, but the server is full right now, come back later")); + socket.close(1001, "Server full"); + return; + } + let ipBanList = JSON.parse(String(fs.readFileSync("db/bannedIps.json"))); + if (ipBanList[user.ip]) { + socket.send("Your IP is banned for " + ipBanList[user.ip]); + socket.close(1002, "Banned"); + return; + } + const user = new User(request, socket, this) + this.users[user.id] = user + socket.send(format(this.config.motd)); + console.info(`${user.name()}[${user.id}] joined the server!`); + sendInChannel(`${user.name()} joined.`, this.users[user.id].channel); + this.updateUsers(); + socket.on("close", function (code, reason) { + sendInChannel(`${user.name()} left.`, this.users[user.id].channel); + this.updateUsers(); + delete this.users[user.id]; + }); + socket.on("message", function (rawData) { + if (rawData.toString().startsWith("/")) { + let args = String(rawData).replace("/", "").split(" "); + let command = args.shift(); + let commandObj = Object.values(commands).find((cmd) => cmd.name == command || cmd.aliases.includes(command)); + console.log(`${user.name()} used /${command}`); + if (!commandObj) return socket.send(`Error: Command "${command}" not found!`); + try { + let server = this + commandObj.command({ + user, + command, + args, + sendInChannel, + server, + commands, + }); + } catch (error) { + console.error(error); + user.socket.send(`Unexpected error ocurred while running the command`); + } + return; + } + if (rawData.toString().startsWith(":client")) { + let client = String(rawData).replace(":client", ""); + if (!client) return socket.send("Error: client info missing!"); + if (client.length < 2) return socket.send("Error: client info too short!"); + if (client.length >= 100) return socket.send("Error: client info too long!"); + user.client = client; + return; + } + if (rawData.toString().startsWith(":jsonGet")) { + let params = String(rawData).split(" "); + params.shift(); + switch (params[0]) { + case "channels": + socket.send(":json.channels>" + JSON.stringify(this.channels)); + break; + case "users": + socket.send( + ":json.users>" + + JSON.stringify( + Object.values(this.users).map((usr) => { + return { + username: usr.username, + nickname: usr.nickname, + t: usr.t, + channel: user.channel, + displayName: user.name(), + }; + }) + ) + ); + break; + case "usersLocal": + socket.send( + JSON.stringify( + Object.values(this.users) + .filter((usr) => usr.channel == user.channel) + .map((usr) => { + return { + username: usr.username, + nickname: usr.nickname, + t: usr.t, + channel: user.channel, + displayName: user.name(), + }; + }) + ) + ); + break; + + default: + socket.send(`unknown "${params[0]}"`); + break; + } + return; + } + if (rawData.toString().startsWith(":jsonSubscribe")) { + let params = String(rawData).split(" "); + params.shift(); + switch (params[0]) { + case "users": + user.subscribedToUsers = true; + break; + + default: + socket.send(`unknown "${params[0]}"`); + break; + } + return; + } + if (this.config.requireLogin && user.guest && !this.annonChannels.includes(user.channel)) return socket.send("This server requires you to log in, use /login <username> <password> to log in or /register <username> <password> to make an account."); + profanity.options.grawlixChar = "*"; + if (!this.config.profanity) rawData = profanity.censor(String(rawData)); + if (rawData.length < 1) return socket.send("Error: message too short!"); + if (rawData.length >= 2000) return socket.send("Error: message too long!"); + sendInChannel(`${user.admin ? '[ADMIN] ' : ''}<${user.name()}${user.guest ? " (guest)" : ""}> ${rawData}`, this.channel); + console.log(`(#${user.channel}) <${user.name()}> ${rawData}`); + }); + }); + } +} \ No newline at end of file |