Compare commits
No commits in common. "main" and "main" have entirely different histories.
4
.gitignore
vendored
4
.gitignore
vendored
|
|
@ -5,4 +5,6 @@ server/.gradle
|
|||
server/uploads
|
||||
server/userDatabase
|
||||
server/chatHistory
|
||||
server/roomChats
|
||||
client-cli/build
|
||||
client-cli/.gradle
|
||||
client-cli/.chookpen.profile
|
||||
|
|
|
|||
|
|
@ -1,13 +0,0 @@
|
|||
## Chookchat Python Client
|
||||
|
||||
This is an example client for Chookchat, written in Python. It is very simplistic. It connects to the Websocket, and prints recieved messages.
|
||||
|
||||
This would be a good baseline for a GUI client with tkinter, or a bot for Chookchat linking it to other services.
|
||||
|
||||
Not much else to say.
|
||||
|
||||
### Running
|
||||
|
||||
First, `pip3 install websocket-client rel`. If you need, create a virtual environment for Python.
|
||||
|
||||
Then, run with `python3 client.py`
|
||||
|
|
@ -1,68 +0,0 @@
|
|||
import websocket
|
||||
import json
|
||||
import _thread
|
||||
import time
|
||||
import rel
|
||||
from google import genai
|
||||
|
||||
username = "(insert username here)"
|
||||
token = "(insert token here)"
|
||||
|
||||
def joinRoom(roomName):
|
||||
ws.send(json.dumps({
|
||||
"type": "joinRoom",
|
||||
"username": username,
|
||||
"token": token,
|
||||
"room": roomName,
|
||||
"content": ""
|
||||
}))
|
||||
|
||||
def sendMessage(content):
|
||||
ws.send(json.dumps({
|
||||
"type": "message",
|
||||
"username": username,
|
||||
"token": token,
|
||||
"content": content
|
||||
}))
|
||||
|
||||
def sendTyping(content):
|
||||
ws.send(json.dumps({
|
||||
"type": "typing",
|
||||
"username": username,
|
||||
"token": token,
|
||||
"content": content
|
||||
}))
|
||||
|
||||
def on_message(ws, message):
|
||||
print("Message received: " + message)
|
||||
if message == "ping":
|
||||
ws.send("pong")
|
||||
|
||||
def on_error(ws, error):
|
||||
print("Error:", error)
|
||||
|
||||
def on_close(ws, close_status_code, close_msg):
|
||||
print(f"Connection closed: {close_status_code} - {close_msg}")
|
||||
|
||||
def on_open(ws):
|
||||
print("Opening connection to Chookchat...")
|
||||
joinRoom("general")
|
||||
ws.send(json.dumps({
|
||||
"type": "connect",
|
||||
"username": username,
|
||||
"token": token,
|
||||
"content": username + " joined the room!"
|
||||
}))
|
||||
|
||||
if __name__ == "__main__":
|
||||
websocket.enableTrace(True)
|
||||
ws = websocket.WebSocketApp("wss://bobcompass.online/api/websocket",
|
||||
on_open=on_open,
|
||||
on_message=on_message,
|
||||
on_error=on_error,
|
||||
on_close=on_close
|
||||
)
|
||||
|
||||
ws.run_forever(dispatcher=rel, reconnect=5, ping_interval=30, ping_timeout=10)
|
||||
rel.signal(2, rel.abort)
|
||||
rel.dispatch()
|
||||
|
|
@ -127,7 +127,7 @@ body {
|
|||
overflow-y: auto;
|
||||
border: 0px;
|
||||
padding: 20px;
|
||||
margin: 10px 0;
|
||||
margin: 10px 0; /* Remove horizontal margin */
|
||||
flex-grow: 1;
|
||||
width: 100%;
|
||||
box-sizing: border-box;
|
||||
|
|
@ -155,6 +155,7 @@ body {
|
|||
box-sizing: border-box;
|
||||
}
|
||||
|
||||
/* Update input styles */
|
||||
input {
|
||||
color: white;
|
||||
background: rgba(0, 0, 0, 0.5);
|
||||
|
|
@ -349,71 +350,3 @@ input {
|
|||
margin: 10px;
|
||||
}
|
||||
|
||||
.room-list {
|
||||
width: 200px;
|
||||
background: rgba(0, 0, 0, 0.5);
|
||||
border-radius: 10px;
|
||||
margin-right: 10px;
|
||||
padding: 10px;
|
||||
height: 100%;
|
||||
overflow-y: auto;
|
||||
}
|
||||
|
||||
.room-header {
|
||||
font-weight: bold;
|
||||
text-align: center;
|
||||
padding: 5px;
|
||||
margin-bottom: 10px;
|
||||
border-bottom: 1px solid rgba(255, 255, 255, 0.3);
|
||||
}
|
||||
|
||||
.room-item {
|
||||
padding: 10px;
|
||||
margin: 5px 0;
|
||||
border-radius: 5px;
|
||||
cursor: pointer;
|
||||
transition: background 0.2s;
|
||||
}
|
||||
|
||||
.room-item:hover {
|
||||
background: rgba(255, 255, 255, 0.1);
|
||||
}
|
||||
|
||||
.room-item.active {
|
||||
background: rgba(104, 79, 255, 0.3);
|
||||
font-weight: bold;
|
||||
}
|
||||
|
||||
.create-room-button {
|
||||
width: 100%;
|
||||
padding: 8px;
|
||||
margin-top: 10px;
|
||||
background: rgba(73, 255, 145, 0.3);
|
||||
border: none;
|
||||
border-radius: 5px;
|
||||
color: white;
|
||||
cursor: pointer;
|
||||
transition: background 0.2s;
|
||||
}
|
||||
|
||||
.create-room-button:hover {
|
||||
background: rgba(73, 255, 145, 0.5);
|
||||
}
|
||||
|
||||
.room-title {
|
||||
font-weight: bold;
|
||||
font-size: 16px;
|
||||
margin-bottom: 5px;
|
||||
padding: 5px 10px;
|
||||
background: rgba(0, 0, 0, 0.3);
|
||||
border-radius: 5px;
|
||||
}
|
||||
|
||||
.message.system-message {
|
||||
color: rgba(73, 255, 145, 0.8);
|
||||
font-style: italic;
|
||||
}
|
||||
|
||||
.message.history-message {
|
||||
color: rgba(255, 255, 255, 0.7);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -9,26 +9,26 @@
|
|||
<link type="text/css" rel="stylesheet" href="index.css">
|
||||
<link type="text/css" rel="stylesheet" href="gradient.css">
|
||||
<link rel="shortcut icon" type="image/jpg" href="favicon.ico"/>
|
||||
<script src="https://cdnjs.cloudflare.com/ajax/libs/crypto-js/4.1.1/crypto-js.min.js"></script>
|
||||
<script src="https://code.jquery.com/jquery-3.7.1.min.js"></script>
|
||||
<script src="https://cdnjs.cloudflare.com/ajax/libs/crypto-js/4.1.1/crypto-js.min.js"></script>
|
||||
<script src="https://code.jquery.com/jquery-3.7.1.min.js"></script>
|
||||
</head>
|
||||
<body class="gradient">
|
||||
<div id="login">
|
||||
<div class="section">
|
||||
<div class="box">
|
||||
<h3>Chookchat</h3>
|
||||
<input type="text" id="username" placeholder="Username"><br>
|
||||
<input type="password" id="password" placeholder="Password"><br>
|
||||
<button class="bluebutton" onclick="connect()">Log in</button>
|
||||
<button class="greenbutton" onclick="register()">Register</button>
|
||||
<button class="redbutton" onclick="showConfig()">Show Server Config</button>
|
||||
<input type="text" id="username" placeholder="Username"><br>
|
||||
<input type="password" id="password" placeholder="Password"><br>
|
||||
<button class="bluebutton" onclick="connect()">Log in</button>
|
||||
<button class="greenbutton" onclick="register()">Register</button>
|
||||
<button class="redbutton" onclick="showConfig()">Show Server Config</button>
|
||||
<div id="serverStatus"></div>
|
||||
</div>
|
||||
<div class="box" style="display: none;" id="serverconfig">
|
||||
<input type="text" id="serverUrl" value="bobcompass.online" placeholder="Server URL"><br>
|
||||
<input type="text" id="serverPort" value="443" placeholder="Server Port"><br>
|
||||
<input type="checkbox" id="securityStatus" checked>
|
||||
<label for="securityStatus">Use HTTPS/WSS</label>
|
||||
<div class="box" style="display: none;" id="serverconfig">
|
||||
<input type="text" id="serverUrl" value="bobcompass.online" placeholder="Server URL"><br>
|
||||
<input type="text" id="serverPort" value="443" placeholder="Server Port"><br>
|
||||
<input type="checkbox" id="securityStatus" checked>
|
||||
<label for="securityStatus">Use HTTPS/WSS</label>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -37,32 +37,25 @@
|
|||
<div id="meet"></div>
|
||||
<div class="box">
|
||||
<div id="users" class="suttle"></div>
|
||||
<button id="meeting" class="bluebutton" onclick="startMeeting()">📞</button>
|
||||
<div id="messagebox" class="box" style="height: 600px;">
|
||||
<div></div>
|
||||
</div>
|
||||
<button id="meeting" class="bluebutton" onclick="startMeeting()">📞</button>
|
||||
<div id="messagebox" class="box" style="height: 600px;"><div></div></div>
|
||||
<div id="typing" class="suttle"></div>
|
||||
<div id="upload" class="suttle" style="display: none;">
|
||||
<input type="file" id="fileupload" accept="image/*,text/*">
|
||||
<button class="bluebutton" onclick="uploadFile()">Upload</button>
|
||||
</input>
|
||||
</div>
|
||||
<div class="input-container">
|
||||
<button onclick="showFileUpload()" class="bluebutton">📁</button>
|
||||
<button onclick="showEggs()" class="bluebutton">🥚</button>
|
||||
<input type="text" id="messageInput" placeholder="Send a message..." autofocus>
|
||||
<button onclick="sendMessage()" class="bluebutton">Send</button>
|
||||
<div id="upload" class="suttle" style="display: none;"><input type="file" id="fileupload"><button class="bluebutton" onclick="uploadFile()">Upload</button></input></div>
|
||||
<div class="input-container">
|
||||
<button onclick="showFileUpload()" class="bluebutton">📁</button>
|
||||
<button onclick="showEggs()" class="bluebutton">🥚</button>
|
||||
<input type="text" id="messageInput" placeholder="Send a message..." autofocus>
|
||||
<button onclick="sendMessage()" class="bluebutton">Send</button>
|
||||
</div>
|
||||
</div>
|
||||
<div id="eggs" style="display: none;">
|
||||
<div id="eggs-list" class="eggs-list">
|
||||
<button class="egg-item" onclick="eggNotepad()">📝 Notepad</button>
|
||||
<div id="eggs-list" class="eggs-list">
|
||||
<button class="egg-item" onclick="eggNotepad()">📝 Notepad</button>
|
||||
</div>
|
||||
<!-- Eggs Start Here -->
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<script src="index.js"></script>
|
||||
<script src="index.js"></script>
|
||||
</body>
|
||||
</html>
|
||||
|
||||
|
|
|
|||
|
|
@ -6,8 +6,6 @@ let password;
|
|||
let typingTimeout;
|
||||
let typingPeople = new Array();
|
||||
let api;
|
||||
let currentRoom = "general";
|
||||
let availableRooms = ["general"];
|
||||
|
||||
function resizeMessaging() {
|
||||
const messagingDiv = document.getElementById('messaging');
|
||||
|
|
@ -19,6 +17,7 @@ function resizeMessaging() {
|
|||
|
||||
resizeMessaging();
|
||||
|
||||
// Add resize listener to handle window resizing
|
||||
window.addEventListener('resize', resizeMessaging);
|
||||
|
||||
function showConfig() {
|
||||
|
|
@ -62,72 +61,7 @@ function getUploadUrl() {
|
|||
|
||||
return `${protocol}://${cleanUrl}:${serverPort}/api/upload`;
|
||||
}
|
||||
async function getRooms() {
|
||||
try {
|
||||
const serverUrl = document.getElementById('serverUrl').value.trim();
|
||||
const serverPort = document.getElementById('serverPort').value;
|
||||
const useWss = document.getElementById('securityStatus').checked;
|
||||
const protocol = useWss ? 'https' : 'http';
|
||||
const cleanUrl = serverUrl.replace(/^(https?:\/\/|wss?:\/\/)/, '');
|
||||
const url = `${protocol}://${cleanUrl}:${serverPort}/api/rooms`;
|
||||
const response = await fetch(url, {
|
||||
mode: "no-cors"
|
||||
});
|
||||
const data = await response.json();
|
||||
return JSON.parse(data.content);
|
||||
} catch (error) {
|
||||
console.error('Error fetching rooms:', error);
|
||||
return ["general"];
|
||||
}
|
||||
}
|
||||
|
||||
async function getRoomHistory(roomName) {
|
||||
try {
|
||||
const serverUrl = document.getElementById('serverUrl').value.trim();
|
||||
const serverPort = document.getElementById('serverPort').value;
|
||||
const useWss = document.getElementById('securityStatus').checked;
|
||||
const protocol = useWss ? 'https' : 'http';
|
||||
const cleanUrl = serverUrl.replace(/^(https?:\/\/|wss?:\/\/)/, '');
|
||||
const url = `${protocol}://${cleanUrl}:${serverPort}/api/room/${roomName}/history`;
|
||||
const response = await fetch(url, {
|
||||
mode: "no-cors"
|
||||
});
|
||||
const history = await response.text();
|
||||
return history;
|
||||
} catch (error) {
|
||||
console.error('Error fetching room history:', error);
|
||||
return '';
|
||||
}
|
||||
}
|
||||
|
||||
const imageMimeTypes = [
|
||||
'image/webp',
|
||||
'image/tiff',
|
||||
'image/svg+xml',
|
||||
'image/png',
|
||||
'image/jpeg',
|
||||
'image/vnd.microsoft.icon',
|
||||
'image/gif',
|
||||
'image/bmp',
|
||||
];
|
||||
|
||||
const imageTypes = [
|
||||
'png',
|
||||
'jpg',
|
||||
'jpeg',
|
||||
'svg',
|
||||
'tiff',
|
||||
'gif',
|
||||
'webp',
|
||||
'bmp'
|
||||
];
|
||||
|
||||
function isImage(file) {
|
||||
const fileSplit = file.split(".");
|
||||
return imageTypes.includes(fileSplit[fileSplit.length - 1]);
|
||||
}
|
||||
|
||||
async function connect() {
|
||||
function connect() {
|
||||
username = document.getElementById('username').value;
|
||||
password = document.getElementById('password').value;
|
||||
|
||||
|
|
@ -145,22 +79,13 @@ async function connect() {
|
|||
|
||||
var incorrectDetail = 0;
|
||||
|
||||
ws.onopen = async () => {
|
||||
ws.onopen = () => {
|
||||
if (typeof Notification !== "undefined") {
|
||||
Notification.requestPermission();
|
||||
}
|
||||
console.log('Connected!');
|
||||
document.getElementById('login').style.display = 'none';
|
||||
document.getElementById('messaging').style.display = 'block';
|
||||
|
||||
try {
|
||||
availableRooms = await getRooms();
|
||||
updateRoomList();
|
||||
} catch (error) {
|
||||
console.error('Failed to get room list:', error);
|
||||
availableRooms = ["general"];
|
||||
}
|
||||
|
||||
const connectMessage = {
|
||||
"type": "connect",
|
||||
"username": username,
|
||||
|
|
@ -168,9 +93,6 @@ async function connect() {
|
|||
"content": `${username} joined the room!`
|
||||
}
|
||||
ws.send(JSON.stringify(connectMessage));
|
||||
|
||||
joinRoom("general");
|
||||
|
||||
ws.onmessage = (event) => {
|
||||
if (event.data === "ping") {
|
||||
ws.send("pong");
|
||||
|
|
@ -218,88 +140,24 @@ async function connect() {
|
|||
}
|
||||
return;
|
||||
}
|
||||
else if (message.type == "roomUsers" && message.username == "system") {
|
||||
const usersInRoom = message.content;
|
||||
const roomName = message.room;
|
||||
usersDiv = document.getElementById("users");
|
||||
if (usersDiv) {
|
||||
usersDiv.textContent = `Users in ${roomName}: ${usersInRoom}`;
|
||||
if (roomName !== currentRoom) {
|
||||
currentRoom = roomName;
|
||||
updateCurrentRoomDisplay();
|
||||
}
|
||||
}
|
||||
return;
|
||||
}
|
||||
else if (message.type == "roomsList" && message.username == "system") {
|
||||
try {
|
||||
availableRooms = JSON.parse(message.content);
|
||||
updateRoomList();
|
||||
} catch (error) {
|
||||
console.error('Error parsing rooms list:', error);
|
||||
}
|
||||
return;
|
||||
}
|
||||
else if (message.type == "roomCreated" || message.type == "roomJoin") {
|
||||
if (message.room) {
|
||||
currentRoom = message.room;
|
||||
updateCurrentRoomDisplay();
|
||||
clearMessages();
|
||||
loadRoomHistory(currentRoom);
|
||||
updateRoomList();
|
||||
}
|
||||
|
||||
// Display the system message
|
||||
const messagesDiv = document.getElementById('messagebox');
|
||||
const messageElement = document.createElement('div');
|
||||
if (messageElement && messagesDiv) {
|
||||
messagesDiv.appendChild(messageElement);
|
||||
messageElement.className = 'message system-message';
|
||||
messageElement.textContent = message.content;
|
||||
messagesDiv.scrollTop = messagesDiv.scrollHeight;
|
||||
}
|
||||
return;
|
||||
}
|
||||
else if (message.type == "file") {
|
||||
// Only show file if it's for current room
|
||||
if (message.room && message.room !== currentRoom) {
|
||||
return;
|
||||
}
|
||||
const messagesDiv = document.getElementById('messagebox');
|
||||
let filename = message.content.replace("https://maxwellj.xyz/chookchat/uploads/", "");
|
||||
if (isImage(filename)) {
|
||||
const imagePreview = document.createElement('img');
|
||||
if (imagePreview) {
|
||||
if (messagesDiv) {
|
||||
messagesDiv.appendChild(imagePreview);
|
||||
imagePreview.src = message.content;
|
||||
imagePreview.height = 300;
|
||||
imagePreview.addEventListener("click", function() {
|
||||
window.open(message.content, "_blank");
|
||||
});
|
||||
}
|
||||
}
|
||||
} else {
|
||||
const fileButton = document.createElement('button');
|
||||
if (fileButton) {
|
||||
if (messagesDiv) {
|
||||
messagesDiv.appendChild(fileButton);
|
||||
fileButton.textContent = `Open ${filename} in new tab`;
|
||||
fileButton.className = "bluebutton";
|
||||
fileButton.addEventListener("click", function() {
|
||||
window.open(message.content, "_blank");
|
||||
});
|
||||
messagesDiv.scrollTop = messagesDiv.scrollHeight;
|
||||
}
|
||||
const fileElement = document.createElement('embed');
|
||||
if (fileElement) {
|
||||
if (messagesDiv) {
|
||||
messagesDiv.appendChild(fileElement);
|
||||
fileElement.className = "file";
|
||||
fileElement.src = message.content;
|
||||
fileElement.height = 200;
|
||||
fileElement.addEventListener("click", function() {
|
||||
window.open(message.content, "_blank");
|
||||
});
|
||||
messagesDiv.scrollTop = messagesDiv.scrollHeight;
|
||||
}
|
||||
}
|
||||
return;
|
||||
}
|
||||
else if (message.type == "call") {
|
||||
if (message.room && message.room !== currentRoom) {
|
||||
return;
|
||||
}
|
||||
|
||||
const messagesDiv = document.getElementById('messagebox');
|
||||
const callButton = document.createElement('div');
|
||||
if (callButton) {
|
||||
|
|
@ -331,10 +189,6 @@ async function connect() {
|
|||
}
|
||||
}
|
||||
else if (message.type == "message") {
|
||||
if (message.room && message.room !== currentRoom) {
|
||||
return;
|
||||
}
|
||||
|
||||
const messagesDiv = document.getElementById('messagebox');
|
||||
const messageElement = document.createElement('div');
|
||||
if (messageElement) {
|
||||
|
|
@ -349,6 +203,7 @@ async function connect() {
|
|||
const notifiction = new Notification("Chookchat", {body: messageElement.textContent});
|
||||
}
|
||||
}
|
||||
// Egg message logic
|
||||
else {
|
||||
return
|
||||
}
|
||||
|
|
@ -358,40 +213,7 @@ async function connect() {
|
|||
alert("Chookchat has disconnected :/ Refresh the page to try again");
|
||||
}
|
||||
}
|
||||
async function createRoom(roomName) {
|
||||
const message = {
|
||||
type: 'createRoom',
|
||||
username: username,
|
||||
token: md5(password),
|
||||
room: roomName,
|
||||
content: ""
|
||||
};
|
||||
ws.send(JSON.stringify(message));
|
||||
setTimeout(updateRoomList, 500);
|
||||
}
|
||||
|
||||
async function joinRoom(roomName) {
|
||||
if (roomName === currentRoom) {
|
||||
const usersMessage = {
|
||||
type: 'getUsersInRoom',
|
||||
username: username,
|
||||
token: md5(password),
|
||||
room: roomName,
|
||||
content: ""
|
||||
};
|
||||
ws.send(JSON.stringify(usersMessage));
|
||||
return;
|
||||
}
|
||||
|
||||
const message = {
|
||||
type: 'joinRoom',
|
||||
username: username,
|
||||
token: md5(password),
|
||||
room: roomName,
|
||||
content: ""
|
||||
};
|
||||
ws.send(JSON.stringify(message));
|
||||
}
|
||||
function sendMessage() {
|
||||
const messageInput = document.getElementById('messageInput');
|
||||
const message = messageInput.value.trim();
|
||||
|
|
@ -400,11 +222,10 @@ function sendMessage() {
|
|||
"type": "message",
|
||||
"username": username,
|
||||
"token": md5(password),
|
||||
"room": currentRoom,
|
||||
"content": message
|
||||
}
|
||||
}
|
||||
|
||||
if (processedMessage.content && ws && ws.readyState === WebSocket.OPEN) {
|
||||
if (processedMessage && ws && ws.readyState === WebSocket.OPEN) {
|
||||
ws.send(JSON.stringify(processedMessage));
|
||||
messageInput.value = '';
|
||||
|
||||
|
|
@ -415,13 +236,21 @@ function sendMessage() {
|
|||
"type": "typing",
|
||||
"username": username,
|
||||
"token": md5(password),
|
||||
"room": currentRoom,
|
||||
"content": "0"
|
||||
};
|
||||
if (ws && ws.readyState === WebSocket.OPEN) {
|
||||
ws.send(JSON.stringify(stoppedTypingMessage));
|
||||
}
|
||||
}
|
||||
const processedMessage2 = {
|
||||
"type": "typing",
|
||||
"username": username,
|
||||
"token": md5(password),
|
||||
"content": "0"
|
||||
}
|
||||
if (processedMessage && ws && ws.readyState === WebSocket.OPEN) {
|
||||
ws.send(JSON.stringify(processedMessage2));
|
||||
}
|
||||
}
|
||||
|
||||
function showFileUpload() {
|
||||
|
|
@ -433,14 +262,13 @@ function showFileUpload() {
|
|||
|
||||
async function uploadFile() {
|
||||
const fileInput = document.getElementById("fileupload");
|
||||
|
||||
if (!fileInput.files.length) {
|
||||
alert("Please add a file!");
|
||||
return;
|
||||
}
|
||||
const formData = new FormData();
|
||||
formData.append("file", fileInput.files[0]);
|
||||
formData.append("room", currentRoom);
|
||||
|
||||
try {
|
||||
const response = await fetch(getUploadUrl(), {
|
||||
method: 'POST',
|
||||
|
|
@ -453,7 +281,6 @@ async function uploadFile() {
|
|||
"type": "message",
|
||||
"username": username,
|
||||
"token": md5(password),
|
||||
"room": currentRoom,
|
||||
"content": `Sent a file`
|
||||
}
|
||||
if (processedMessage && ws && ws.readyState === WebSocket.OPEN) {
|
||||
|
|
@ -483,11 +310,7 @@ document.getElementById('password').addEventListener('keypress', (event) => {
|
|||
}
|
||||
});
|
||||
|
||||
async function doRegister(username, password) {
|
||||
return fetch(`${getSignupUrl()}username:{${username}}token:{${md5(password)}}`).then((response)=>response.json()).then((responseJson)=>{return responseJson});
|
||||
}
|
||||
|
||||
async function register() {
|
||||
function register() {
|
||||
username = document.getElementById('username').value;
|
||||
password = document.getElementById('password').value;
|
||||
|
||||
|
|
@ -496,12 +319,7 @@ async function register() {
|
|||
return;
|
||||
}
|
||||
|
||||
const response = await this.doRegister(username, password);
|
||||
if (response.type == "success") {
|
||||
alert("Account created! Click 'log in' to access Chookchat!")
|
||||
} else {
|
||||
alert(`We couldn't create your account :( Reason: ${response.content}`)
|
||||
}
|
||||
window.open(`${getSignupUrl()}username:{${username}}token:{${md5(password)}}`);
|
||||
}
|
||||
|
||||
function sleep(ms) {
|
||||
|
|
@ -517,7 +335,6 @@ function startTypingIndicator() {
|
|||
"type": "typing",
|
||||
"username": username,
|
||||
"token": md5(password),
|
||||
"room": currentRoom,
|
||||
"content": "1"
|
||||
};
|
||||
|
||||
|
|
@ -530,7 +347,6 @@ function startTypingIndicator() {
|
|||
"type": "typing",
|
||||
"username": username,
|
||||
"token": md5(password),
|
||||
"room": currentRoom,
|
||||
"content": "0"
|
||||
};
|
||||
|
||||
|
|
@ -574,7 +390,6 @@ function startMeeting() {
|
|||
"type": "call",
|
||||
"username": username,
|
||||
"token": md5(password),
|
||||
"room": currentRoom,
|
||||
"content": link
|
||||
};
|
||||
if (ws && ws.readyState === WebSocket.OPEN) {
|
||||
|
|
@ -586,95 +401,11 @@ function startMeeting() {
|
|||
|
||||
document.getElementById('messageInput').addEventListener('input', startTypingIndicator);
|
||||
|
||||
async function updateRoomList() {
|
||||
let roomListDiv = document.getElementById('room-list');
|
||||
if (!roomListDiv) {
|
||||
const messagingDiv = document.querySelector('.messaging-container');
|
||||
roomListDiv = document.createElement('div');
|
||||
roomListDiv.id = 'room-list';
|
||||
roomListDiv.className = 'room-list';
|
||||
messagingDiv.insertBefore(roomListDiv, messagingDiv.firstChild);
|
||||
}
|
||||
|
||||
try {
|
||||
availableRooms = await getRooms();
|
||||
} catch (error) {
|
||||
console.error('Error updating room list:', error);
|
||||
}
|
||||
|
||||
roomListDiv.innerHTML = '<div class="room-header">Rooms</div>';
|
||||
|
||||
availableRooms.forEach(room => {
|
||||
const roomElement = document.createElement('div');
|
||||
roomElement.className = `room-item ${room === currentRoom ? 'active' : ''}`;
|
||||
roomElement.textContent = room;
|
||||
roomElement.addEventListener('click', () => joinRoom(room));
|
||||
roomListDiv.appendChild(roomElement);
|
||||
});
|
||||
|
||||
const createRoomButton = document.createElement('button');
|
||||
createRoomButton.className = 'create-room-button';
|
||||
createRoomButton.textContent = '+ New Room';
|
||||
createRoomButton.addEventListener('click', promptCreateRoom);
|
||||
roomListDiv.appendChild(createRoomButton);
|
||||
}
|
||||
|
||||
function updateCurrentRoomDisplay() {
|
||||
const roomTitle = document.getElementById('room-title');
|
||||
if (roomTitle) {
|
||||
roomTitle.remove();
|
||||
}
|
||||
|
||||
const roomItems = document.querySelectorAll('.room-item');
|
||||
roomItems.forEach(item => {
|
||||
if (item.textContent === currentRoom) {
|
||||
item.classList.add('active');
|
||||
} else {
|
||||
item.classList.remove('active');
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
function clearMessages() {
|
||||
const messagebox = document.getElementById('messagebox');
|
||||
if (messagebox) {
|
||||
messagebox.innerHTML = '';
|
||||
}
|
||||
}
|
||||
|
||||
async function loadRoomHistory(roomName) {
|
||||
try {
|
||||
const history = await getRoomHistory(roomName);
|
||||
if (history) {
|
||||
const messagebox = document.getElementById('messagebox');
|
||||
const lines = history.split('\n');
|
||||
|
||||
lines.forEach(line => {
|
||||
if (line.trim()) {
|
||||
const messageElement = document.createElement('div');
|
||||
messageElement.className = 'message history-message';
|
||||
messageElement.textContent = line;
|
||||
messagebox.appendChild(messageElement);
|
||||
}
|
||||
});
|
||||
|
||||
messagebox.scrollTop = messagebox.scrollHeight;
|
||||
}
|
||||
} catch (error) {
|
||||
console.error('Error loading room history:', error);
|
||||
}
|
||||
}
|
||||
|
||||
function promptCreateRoom() {
|
||||
const roomName = prompt('Enter a name for the new room:');
|
||||
if (roomName && roomName.trim()) {
|
||||
createRoom(roomName.trim());
|
||||
}
|
||||
}
|
||||
|
||||
function showEggs() {
|
||||
const eggsPanel = document.getElementById('eggs');
|
||||
eggsPanel.style.display = "block";
|
||||
|
||||
// Adjust main box width when eggs panel is toggled
|
||||
const mainBox = document.querySelector('#messaging .box');
|
||||
if (eggsPanel.classList.contains('visible')) {
|
||||
mainBox.style.width = 'calc(100% - 310px)';
|
||||
|
|
@ -687,15 +418,6 @@ function closeEggs() {
|
|||
const eggsPanel = document.getElementById('eggs');
|
||||
eggsPanel.style.display = "block";
|
||||
}
|
||||
const uploadField = document.getElementById("fileupload");
|
||||
|
||||
uploadField.onchange = function() {
|
||||
if(this.files[0].size > 10485760) {
|
||||
alert("That file is too big bro. Not as big as my (message terminated)");
|
||||
this.value = "";
|
||||
}
|
||||
};
|
||||
|
||||
// Eggs begin here
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
address:localhost;port:7070;security:false;serviceName:chookchat;
|
||||
address:localhost;port:7070;security:false;serviceName:fnkjdsnfiewnifdwsocidw;
|
||||
|
|
|
|||
|
|
@ -73,147 +73,17 @@ object config {
|
|||
}
|
||||
|
||||
object WsSessionManager {
|
||||
val peopleOnline = mutableListOf<String>()
|
||||
val sessionsList = mutableListOf<String>()
|
||||
val peopleOnline = mutableListOf("")
|
||||
val sessionsList = mutableListOf("")
|
||||
val sessions = ConcurrentHashMap<WsContext, String>()
|
||||
val sessionIds = ConcurrentHashMap<String, WsContext>()
|
||||
val userSessions = ConcurrentHashMap<String, String>()
|
||||
|
||||
val roomList = mutableListOf<String>()
|
||||
val userRooms = ConcurrentHashMap<String, String>()
|
||||
val roomUsers = ConcurrentHashMap<String, MutableList<String>>()
|
||||
|
||||
|
||||
init {
|
||||
createRoom("general")
|
||||
|
||||
fixedRateTimer("websocket-ping", period = 5000) {
|
||||
sendPing()
|
||||
}
|
||||
}
|
||||
|
||||
fun createRoom(roomName: String): Boolean {
|
||||
if (roomList.contains(roomName)) {
|
||||
return false
|
||||
}
|
||||
roomList.add(roomName)
|
||||
roomUsers[roomName] = mutableListOf()
|
||||
return true
|
||||
}
|
||||
|
||||
fun joinRoom(username: String, roomName: String): Boolean {
|
||||
if (!roomList.contains(roomName)) {
|
||||
createRoom(roomName)
|
||||
}
|
||||
|
||||
val currentRoom = userRooms[username]
|
||||
if (currentRoom != null) {
|
||||
roomUsers[currentRoom]?.remove(username)
|
||||
|
||||
val leftMessage = JSONObject().apply {
|
||||
put("type", "roomLeave")
|
||||
put("username", "system")
|
||||
put("room", currentRoom)
|
||||
put("content", "$username left the room")
|
||||
}
|
||||
broadcastToRoom(currentRoom, leftMessage.toString())
|
||||
|
||||
broadcastRoomUsers(currentRoom)
|
||||
}
|
||||
|
||||
userRooms[username] = roomName
|
||||
roomUsers[roomName]?.add(username)
|
||||
|
||||
broadcastRoomUsers(roomName)
|
||||
return true
|
||||
}
|
||||
|
||||
fun getRoomUsers(roomName: String): List<String> {
|
||||
return roomUsers[roomName] ?: listOf()
|
||||
}
|
||||
|
||||
fun broadcastRoomUsers(roomName: String) {
|
||||
val usersInRoom = roomUsers[roomName] ?: listOf()
|
||||
val processedData = JSONObject().apply {
|
||||
put("type", "roomUsers")
|
||||
put("username", "system")
|
||||
put("room", roomName)
|
||||
put("content", usersInRoom.joinToString(", "))
|
||||
}
|
||||
broadcastToRoom(roomName, processedData.toString(), false)
|
||||
}
|
||||
|
||||
fun broadcastOnlineUsers() {
|
||||
val processedData = JSONObject().apply {
|
||||
put("type", "users")
|
||||
put("username", "system")
|
||||
put("content", peopleOnline.joinToString(", "))
|
||||
}
|
||||
broadcast(processedData.toString())
|
||||
}
|
||||
|
||||
fun broadcastToRoom(roomName: String, message: String, cleanupDeadSessions: Boolean = true) {
|
||||
val deadSessions = mutableListOf<WsContext>()
|
||||
|
||||
sessions.keys.forEach { ctx ->
|
||||
try {
|
||||
if (ctx.session.isOpen) {
|
||||
val sessionId = sessions[ctx]
|
||||
if (sessionId != null) {
|
||||
val username = userSessions.entries.find { it.value == sessionId }?.key
|
||||
if (username != null && userRooms[username] == roomName) {
|
||||
ctx.send(message)
|
||||
}
|
||||
}
|
||||
} else {
|
||||
deadSessions.add(ctx)
|
||||
}
|
||||
} catch (e: Exception) {
|
||||
println("Error broadcasting to session: ${e.message}")
|
||||
deadSessions.add(ctx)
|
||||
}
|
||||
}
|
||||
|
||||
if (cleanupDeadSessions) {
|
||||
deadSessions.forEach { removeSessionWithoutBroadcast(it) }
|
||||
}
|
||||
}
|
||||
|
||||
private fun removeSessionWithoutBroadcast(ctx: WsContext) {
|
||||
try {
|
||||
val sessionId = sessions[ctx]
|
||||
if (sessionId != null) {
|
||||
userSessions.entries.find { it.value == sessionId }?.let { entry ->
|
||||
val username = entry.key
|
||||
val room = userRooms[username]
|
||||
|
||||
if (room != null) {
|
||||
roomUsers[room]?.remove(username)
|
||||
}
|
||||
|
||||
peopleOnline.remove(username)
|
||||
userSessions.remove(username)
|
||||
userRooms.remove(username)
|
||||
}
|
||||
|
||||
sessionsList.remove(sessionId)
|
||||
sessions.remove(ctx)
|
||||
sessionIds.remove(sessionId)
|
||||
}
|
||||
} catch (e: Exception) {
|
||||
println("Error removing session without broadcast: ${e.message}")
|
||||
}
|
||||
}
|
||||
|
||||
fun handleUserLogin(username: String) {
|
||||
if (!peopleOnline.contains(username)) {
|
||||
peopleOnline.add(username)
|
||||
if (!userRooms.containsKey(username)) {
|
||||
joinRoom(username, "general")
|
||||
}
|
||||
broadcastOnlineUsers()
|
||||
}
|
||||
}
|
||||
|
||||
private fun sendPing() {
|
||||
val deadSessions = mutableListOf<WsContext>()
|
||||
|
||||
|
|
@ -229,13 +99,31 @@ object WsSessionManager {
|
|||
deadSessions.add(ctx)
|
||||
}
|
||||
}
|
||||
|
||||
// Clean up any dead sessions
|
||||
deadSessions.forEach { removeSession(it) }
|
||||
}
|
||||
|
||||
|
||||
fun broadcastOnlineUsers() {
|
||||
val processedData = JSONObject().apply {
|
||||
put("type", "users")
|
||||
put("username", "system")
|
||||
put("content", peopleOnline.joinToString(", "))
|
||||
}
|
||||
broadcast(processedData.toString())
|
||||
}
|
||||
|
||||
fun handleUserLogin(username: String) {
|
||||
if (!peopleOnline.contains(username)) {
|
||||
peopleOnline.add(username)
|
||||
broadcastOnlineUsers()
|
||||
}
|
||||
}
|
||||
|
||||
fun addSession(ctx: WsContext) {
|
||||
try {
|
||||
val sessionId = UUID.randomUUID().toString()
|
||||
sessionsList.add(sessionId)
|
||||
sessionsList.add(sessionId) // Changed from += to add()
|
||||
sessions[ctx] = sessionId
|
||||
sessionIds[sessionId] = ctx
|
||||
} catch (e: Exception) {
|
||||
|
|
@ -247,18 +135,10 @@ object WsSessionManager {
|
|||
try {
|
||||
val sessionId = sessions[ctx]
|
||||
if (sessionId != null) {
|
||||
// Find and remove the username associated with this session
|
||||
userSessions.entries.find { it.value == sessionId }?.let { entry ->
|
||||
val username = entry.key
|
||||
val room = userRooms[username]
|
||||
|
||||
if (room != null) {
|
||||
roomUsers[room]?.remove(username)
|
||||
broadcastRoomUsers(room)
|
||||
}
|
||||
|
||||
peopleOnline.remove(username)
|
||||
userSessions.remove(username)
|
||||
userRooms.remove(username)
|
||||
peopleOnline.remove(entry.key)
|
||||
userSessions.remove(entry.key)
|
||||
}
|
||||
|
||||
sessionsList.remove(sessionId)
|
||||
|
|
@ -277,7 +157,7 @@ object WsSessionManager {
|
|||
userSessions[username] = sessionId
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
fun broadcast(message: String) {
|
||||
val deadSessions = mutableListOf<WsContext>()
|
||||
|
||||
|
|
@ -294,202 +174,48 @@ object WsSessionManager {
|
|||
}
|
||||
}
|
||||
|
||||
// Clean up any dead sessions
|
||||
deadSessions.forEach { removeSession(it) }
|
||||
}
|
||||
|
||||
fun getSessionCount(): Int = sessions.size
|
||||
|
||||
fun getUserRoom(username: String): String? {
|
||||
return userRooms[username]
|
||||
}
|
||||
|
||||
fun getRooms(): List<String> {
|
||||
return roomList
|
||||
}
|
||||
}
|
||||
|
||||
fun extractMessageContent(inputData: String, ctx: WsContext): String {
|
||||
val jsonInputData = JSONObject(inputData)
|
||||
|
||||
if (jsonInputData.getString("type") == "connect") {
|
||||
val username = jsonInputData.getString("username")
|
||||
WsSessionManager.associateUserWithSession(username, ctx)
|
||||
WsSessionManager.handleUserLogin(username)
|
||||
|
||||
val processedData = JSONObject().apply {
|
||||
put("type", "connect")
|
||||
put("username", "system")
|
||||
put("content", "${jsonInputData.getString("username")} just joined the chat!")
|
||||
put("content", "${jsonInputData.getString("username")} just joined the room!")
|
||||
}
|
||||
return processedData.toString()
|
||||
return(processedData.toString())
|
||||
}
|
||||
|
||||
if (jsonInputData.getString("type") == "joinRoom") {
|
||||
val username = jsonInputData.getString("username")
|
||||
val roomName = jsonInputData.getString("room")
|
||||
|
||||
if (!jsonInputData.has("token")) {
|
||||
val processedData = JSONObject().apply {
|
||||
put("type", "error")
|
||||
put("username", "system")
|
||||
put("content", "Authentication required")
|
||||
}
|
||||
return processedData.toString()
|
||||
}
|
||||
|
||||
val success = WsSessionManager.joinRoom(username, roomName)
|
||||
if (success) {
|
||||
val processedData = JSONObject().apply {
|
||||
put("type", "roomJoin")
|
||||
put("username", "system")
|
||||
put("room", roomName)
|
||||
put("content", "$username just joined the room!")
|
||||
}
|
||||
return processedData.toString()
|
||||
} else {
|
||||
val processedData = JSONObject().apply {
|
||||
put("type", "error")
|
||||
put("username", "system")
|
||||
put("content", "Failed to join room: $roomName")
|
||||
}
|
||||
return processedData.toString()
|
||||
}
|
||||
}
|
||||
|
||||
if (jsonInputData.getString("type") == "getUsersInRoom") {
|
||||
val username = jsonInputData.getString("username")
|
||||
val roomName = jsonInputData.getString("room")
|
||||
|
||||
if (!jsonInputData.has("token")) {
|
||||
val processedData = JSONObject().apply {
|
||||
put("type", "error")
|
||||
put("username", "system")
|
||||
put("content", "Authentication required")
|
||||
}
|
||||
return processedData.toString()
|
||||
}
|
||||
|
||||
val usersInRoom = WsSessionManager.getRoomUsers(roomName)
|
||||
val processedData = JSONObject().apply {
|
||||
put("type", "roomUsers")
|
||||
put("username", "system")
|
||||
put("room", roomName)
|
||||
put("content", usersInRoom.joinToString(", "))
|
||||
}
|
||||
return processedData.toString()
|
||||
}
|
||||
|
||||
if (jsonInputData.getString("type") == "createRoom") {
|
||||
val username = jsonInputData.getString("username")
|
||||
val roomName = jsonInputData.getString("room")
|
||||
|
||||
if (!jsonInputData.has("token")) {
|
||||
val processedData = JSONObject().apply {
|
||||
put("type", "error")
|
||||
put("username", "system")
|
||||
put("content", "Authentication required")
|
||||
}
|
||||
return processedData.toString()
|
||||
}
|
||||
|
||||
val success = WsSessionManager.createRoom(roomName)
|
||||
if (success) {
|
||||
WsSessionManager.joinRoom(username, roomName)
|
||||
val processedData = JSONObject().apply {
|
||||
put("type", "roomCreated")
|
||||
put("username", "system")
|
||||
put("room", roomName)
|
||||
put("content", "Room '$roomName' created and joined!")
|
||||
}
|
||||
return processedData.toString()
|
||||
} else {
|
||||
val processedData = JSONObject().apply {
|
||||
put("type", "error")
|
||||
put("username", "system")
|
||||
put("content", "Room '$roomName' already exists!")
|
||||
}
|
||||
return processedData.toString()
|
||||
}
|
||||
}
|
||||
|
||||
val username = jsonInputData.getString("username")
|
||||
val room = WsSessionManager.getUserRoom(username) ?: "general"
|
||||
|
||||
val processedData = JSONObject().apply {
|
||||
put("type", jsonInputData.getString("type"))
|
||||
put("username", username)
|
||||
put("room", room)
|
||||
put("username", jsonInputData.getString("username"))
|
||||
put("content", jsonInputData.getString("content"))
|
||||
}
|
||||
|
||||
return processedData.toString()
|
||||
}
|
||||
return(processedData.toString())
|
||||
}
|
||||
|
||||
fun handleSentMessage(inputData: String): String {
|
||||
println("API request received: $inputData")
|
||||
println("API request recieved: $inputData")
|
||||
var jsonInputData: JSONObject
|
||||
try {
|
||||
jsonInputData = JSONObject(inputData)
|
||||
} catch (error: JSONException) {
|
||||
return error.toString()
|
||||
}
|
||||
try {jsonInputData = JSONObject(inputData)} catch (error: JSONException){return(error.toString())}
|
||||
|
||||
val username = jsonInputData.getString("username")
|
||||
val token = jsonInputData.getString("token")
|
||||
val content = jsonInputData.getString("content")
|
||||
val type = jsonInputData.getString("type")
|
||||
|
||||
if (jsonInputData.has("type")) {
|
||||
val type = jsonInputData.getString("type")
|
||||
if (type == "joinRoom" || type == "createRoom") {
|
||||
val userDatabaseParser = BufferedReader(File("userDatabase").reader())
|
||||
var userLine = ""
|
||||
|
||||
userDatabaseParser.forEachLine { line ->
|
||||
if (line.contains(username)) {
|
||||
userLine = line
|
||||
}
|
||||
}
|
||||
userDatabaseParser.close()
|
||||
|
||||
if (userLine == "") {
|
||||
val processedData = JSONObject().apply {
|
||||
put("type", "error")
|
||||
put("username", "system")
|
||||
put("content", "unknown-account")
|
||||
}
|
||||
return processedData.toString()
|
||||
}
|
||||
|
||||
var tokenInDatabase = ""
|
||||
var currentStage = 0
|
||||
for (char in userLine) {
|
||||
if (char == ':') {
|
||||
currentStage++
|
||||
}
|
||||
if (currentStage == 1) {
|
||||
tokenInDatabase += char
|
||||
}
|
||||
}
|
||||
tokenInDatabase = tokenInDatabase.replace(":", "")
|
||||
|
||||
if (token != tokenInDatabase) {
|
||||
val processedData = JSONObject().apply {
|
||||
put("type", "error")
|
||||
put("username", "system")
|
||||
put("content", "invalid-token")
|
||||
}
|
||||
return processedData.toString()
|
||||
}
|
||||
|
||||
return "Success"
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
val userDatabaseParser = BufferedReader(File("userDatabase").reader())
|
||||
var lineNumber = 1
|
||||
var userLine = ""
|
||||
|
||||
// Search the user database to find required information about the user
|
||||
userDatabaseParser.forEachLine { line ->
|
||||
if (line.contains(username)) {
|
||||
userLine = line
|
||||
|
|
@ -504,7 +230,7 @@ fun handleSentMessage(inputData: String): String {
|
|||
put("username", "system")
|
||||
put("content", "unknown-account")
|
||||
}
|
||||
return processedData.toString()
|
||||
return(processedData.toString())
|
||||
}
|
||||
|
||||
var usernameInDatabase = ""
|
||||
|
|
@ -529,54 +255,133 @@ fun handleSentMessage(inputData: String): String {
|
|||
tokenInDatabase = tokenInDatabase.replace(":", "")
|
||||
saltInDatabase = saltInDatabase.replace(":", "")
|
||||
banStatus = banStatus.replace(":", "")
|
||||
|
||||
if (banStatus == "1") {
|
||||
val processedData = JSONObject().apply {
|
||||
put("type", "error")
|
||||
put("username", "system")
|
||||
put("content", "banned")
|
||||
}
|
||||
return processedData.toString()
|
||||
return(processedData.toString())
|
||||
}
|
||||
|
||||
val tokenWithSalt = (md5(token + saltInDatabase))
|
||||
/*println(saltInDatabase)
|
||||
println(tokenWithSalt)
|
||||
if (tokenWithSalt != tokenInDatabase) {*/
|
||||
if (token != tokenInDatabase) {
|
||||
val processedData = JSONObject().apply {
|
||||
put("type", "error")
|
||||
put("username", "system")
|
||||
put("content", "invalid-token")
|
||||
}
|
||||
return processedData.toString()
|
||||
return(processedData.toString())
|
||||
}
|
||||
|
||||
// Make the message to respond to the client
|
||||
val chatHistoryView = File("chatHistory")
|
||||
var fullMessage = ""
|
||||
if (content != "") {
|
||||
if (type != "message") {
|
||||
return "Success"
|
||||
}
|
||||
val room = WsSessionManager.getUserRoom(username) ?: "general"
|
||||
|
||||
val roomDirectory = File("roomChats")
|
||||
if (!roomDirectory.exists()) {
|
||||
roomDirectory.mkdir()
|
||||
}
|
||||
|
||||
val roomChatHistory = File("roomChats/$room.txt")
|
||||
roomChatHistory.appendText("$username: $content ${System.lineSeparator()}")
|
||||
|
||||
fullMessage = "${chatHistoryView.readText()}$username: $content"
|
||||
// Add the client's message to the chat history
|
||||
val chatHistory = File("chatHistory")
|
||||
chatHistory.appendText("$username: $content [Room: $room] ${System.lineSeparator()}")
|
||||
|
||||
return "Success"
|
||||
chatHistory.appendText("$username: $content ${System.lineSeparator()}")
|
||||
return("Success")
|
||||
} else {
|
||||
return "No data provided"
|
||||
return("No data provided")
|
||||
}
|
||||
return("Chookchat")
|
||||
}
|
||||
|
||||
fun getRoomChatHistory(roomName: String): String {
|
||||
val roomChatFile = File("roomChats/$roomName.txt")
|
||||
if (roomChatFile.exists()) {
|
||||
return roomChatFile.readText()
|
||||
fun createAccount(inputData: String): String {
|
||||
println("Account creation request recieved: $inputData")
|
||||
// Parse data sent to the server by client
|
||||
var username = ""
|
||||
var token = ""
|
||||
var message = ""
|
||||
var dataType = ""
|
||||
var isParsingData = 0
|
||||
for (char in inputData) {
|
||||
val character = char
|
||||
if (character == ':') {
|
||||
isParsingData = 1
|
||||
} else if (isParsingData == 1) {
|
||||
if (character == '}') {
|
||||
isParsingData = 0
|
||||
dataType = ""
|
||||
} else if (character != '{') {
|
||||
if (dataType == "username") {
|
||||
username += character
|
||||
} else if (dataType == "token") {
|
||||
token += character
|
||||
} else if (dataType == "message") {
|
||||
message += character
|
||||
}
|
||||
}
|
||||
} else {
|
||||
dataType += character
|
||||
}
|
||||
}
|
||||
return ""
|
||||
val userDatabaseParser = BufferedReader(File("userDatabase").reader())
|
||||
var lineNumber = 1
|
||||
var userExists = 0
|
||||
|
||||
// Search the user database to find required information about the user
|
||||
var response = ""
|
||||
userDatabaseParser.forEachLine { line ->
|
||||
if (line.contains(username)) {
|
||||
val processedData = JSONObject().apply {
|
||||
put("type", "error")
|
||||
put("username", "system")
|
||||
put("content", "username-taken")
|
||||
}
|
||||
response = processedData.toString()
|
||||
}
|
||||
lineNumber++
|
||||
}
|
||||
if (response != "") {
|
||||
return(response)
|
||||
}
|
||||
userDatabaseParser.close()
|
||||
if (username == "") {
|
||||
val processedData = JSONObject().apply {
|
||||
put("type", "error")
|
||||
put("username", "system")
|
||||
put("content", "no-username")
|
||||
}
|
||||
return(processedData.toString())
|
||||
}
|
||||
|
||||
if (token == "") {
|
||||
val processedData = JSONObject().apply {
|
||||
put("type", "error")
|
||||
put("username", "system")
|
||||
put("content", "no-token")
|
||||
}
|
||||
return(processedData.toString())
|
||||
}
|
||||
|
||||
val userDatabaseFile = File("userDatabase")
|
||||
userDatabaseFile.appendText("${System.lineSeparator()}$username:$token")
|
||||
val processedData = JSONObject().apply {
|
||||
put("type", "success")
|
||||
put("username", "system")
|
||||
put("content", "success")
|
||||
}
|
||||
return(processedData.toString())
|
||||
}
|
||||
|
||||
fun handleServerCommand(command: String): String {
|
||||
val commandArgs = mutableListOf("")
|
||||
commandArgs.drop(1)
|
||||
var currentStage = 0
|
||||
|
||||
for (char in command) {
|
||||
if (char == ' ') {
|
||||
currentStage ++
|
||||
commandArgs += ""
|
||||
} else {
|
||||
commandArgs[currentStage] += char
|
||||
}
|
||||
}
|
||||
return("I'm not sure how to ${commandArgs.toString()}")
|
||||
}
|
||||
|
||||
fun buildHTML(): String {
|
||||
|
|
@ -637,6 +442,7 @@ fun buildJS(): String {
|
|||
editedJS += "$line\n"
|
||||
}
|
||||
}
|
||||
//editedJS += js
|
||||
for (line in eggs) {
|
||||
val eggJSFile = File("eggs/$line/index.js")
|
||||
if (eggJSFile.exists()) {
|
||||
|
|
@ -652,136 +458,19 @@ fun buildJS(): String {
|
|||
return("dingus")
|
||||
}
|
||||
|
||||
fun handleServerCommand(command: String): String {
|
||||
val commandArgs = mutableListOf("")
|
||||
commandArgs.drop(1)
|
||||
var currentStage = 0
|
||||
|
||||
for (char in command) {
|
||||
if (char == ' ') {
|
||||
currentStage ++
|
||||
commandArgs += ""
|
||||
} else {
|
||||
commandArgs[currentStage] += char
|
||||
}
|
||||
}
|
||||
return("I'm not sure how to ${commandArgs.toString()}")
|
||||
}
|
||||
|
||||
fun createAccount(inputData: String): String {
|
||||
println("Account creation request recieved: $inputData")
|
||||
var username = ""
|
||||
var token = ""
|
||||
var message = ""
|
||||
var dataType = ""
|
||||
var isParsingData = 0
|
||||
for (char in inputData) {
|
||||
val character = char
|
||||
if (character == ':') {
|
||||
isParsingData = 1
|
||||
} else if (isParsingData == 1) {
|
||||
if (character == '}') {
|
||||
isParsingData = 0
|
||||
dataType = ""
|
||||
} else if (character != '{') {
|
||||
if (dataType == "username") {
|
||||
username += character
|
||||
} else if (dataType == "token") {
|
||||
token += character
|
||||
} else if (dataType == "message") {
|
||||
message += character
|
||||
}
|
||||
}
|
||||
} else {
|
||||
dataType += character
|
||||
}
|
||||
}
|
||||
val userDatabaseParser = BufferedReader(File("userDatabase").reader())
|
||||
var lineNumber = 1
|
||||
var userExists = 0
|
||||
|
||||
var response = ""
|
||||
userDatabaseParser.forEachLine { line ->
|
||||
if (line.contains(username)) {
|
||||
val processedData = JSONObject().apply {
|
||||
put("type", "error")
|
||||
put("username", "system")
|
||||
put("content", "username-taken")
|
||||
}
|
||||
response = processedData.toString()
|
||||
}
|
||||
lineNumber++
|
||||
}
|
||||
if (response != "") {
|
||||
return(response)
|
||||
}
|
||||
userDatabaseParser.close()
|
||||
if (username == "") {
|
||||
val processedData = JSONObject().apply {
|
||||
put("type", "error")
|
||||
put("username", "system")
|
||||
put("content", "no-username")
|
||||
}
|
||||
return(processedData.toString())
|
||||
}
|
||||
|
||||
if (token == "") {
|
||||
val processedData = JSONObject().apply {
|
||||
put("type", "error")
|
||||
put("username", "system")
|
||||
put("content", "no-token")
|
||||
}
|
||||
return(processedData.toString())
|
||||
}
|
||||
|
||||
val userDatabaseFile = File("userDatabase")
|
||||
userDatabaseFile.appendText("${System.lineSeparator()}$username:$token")
|
||||
val processedData = JSONObject().apply {
|
||||
put("type", "success")
|
||||
put("username", "system")
|
||||
put("content", "success")
|
||||
}
|
||||
return(processedData.toString())
|
||||
}
|
||||
|
||||
fun main(args: Array<String>) {
|
||||
WsSessionManager.peopleOnline.clear()
|
||||
WsSessionManager.sessionsList.clear()
|
||||
WsSessionManager.roomList.clear()
|
||||
|
||||
WsSessionManager.createRoom("general")
|
||||
|
||||
val roomDirectory = File("roomChats")
|
||||
if (!roomDirectory.exists()) {
|
||||
roomDirectory.mkdir()
|
||||
}
|
||||
|
||||
WsSessionManager.peopleOnline.removeAt(0)
|
||||
WsSessionManager.sessionsList.removeAt(0)
|
||||
val app = Javalin.create { config ->
|
||||
config.staticFiles.add("/public")
|
||||
}
|
||||
.get("/") { ctx ->
|
||||
}.get("/") { ctx ->
|
||||
ctx.html(buildHTML())
|
||||
//ctx.redirect("/index.html")
|
||||
}
|
||||
.get("/index.js") { ctx ->
|
||||
ctx.result(buildJS())
|
||||
}
|
||||
.get("/api/createaccount/{content}") { ctx ->
|
||||
ctx.result(createAccount(ctx.pathParam("content")))
|
||||
}
|
||||
.get("/api/rooms") { ctx ->
|
||||
val rooms = WsSessionManager.getRooms()
|
||||
val roomsJson = JSONArray(rooms)
|
||||
val processedData = JSONObject().apply {
|
||||
put("type", "roomsList")
|
||||
put("username", "system")
|
||||
put("content", roomsJson.toString())
|
||||
}
|
||||
ctx.result(processedData.toString())
|
||||
}
|
||||
.get("/api/room/{roomName}/history") { ctx ->
|
||||
val roomName = ctx.pathParam("roomName")
|
||||
ctx.result(getRoomChatHistory(roomName))
|
||||
}
|
||||
.get("/api/createaccount/{content}") { ctx -> ctx.result(createAccount(ctx.pathParam("content")))}
|
||||
.post("/api/upload") { ctx ->
|
||||
val uploadedFiles = ctx.uploadedFiles()
|
||||
if (uploadedFiles.isEmpty()) {
|
||||
|
|
@ -796,28 +485,18 @@ fun main(args: Array<String>) {
|
|||
val newFilename = "${baseFilename}_${uuid}${if (fileExtension.isNotEmpty()) ".$fileExtension" else ""}"
|
||||
val filePath = Paths.get("uploads", newFilename)
|
||||
Files.copy(uploadedFile.content(), filePath)
|
||||
|
||||
val room = if (ctx.formParam("room") != null) ctx.formParam("room") else "general"
|
||||
|
||||
val processedData = JSONObject().apply {
|
||||
put("type", "fileStatus")
|
||||
put("username", "system")
|
||||
put("content", "success")
|
||||
}
|
||||
ctx.result(processedData.toString())
|
||||
|
||||
val processedData2 = JSONObject().apply {
|
||||
put("type", "file")
|
||||
put("username", "system")
|
||||
put("room", room)
|
||||
put("content", "https://maxwellj.xyz/chookchat/uploads/$newFilename")
|
||||
}
|
||||
|
||||
if (room != null && room != "general") {
|
||||
WsSessionManager.broadcastToRoom(room, processedData2.toString())
|
||||
} else {
|
||||
WsSessionManager.broadcast(processedData2.toString())
|
||||
}
|
||||
WsSessionManager.broadcast(processedData2.toString())
|
||||
}
|
||||
.ws("/api/websocket") { ws ->
|
||||
ws.onConnect { ctx ->
|
||||
|
|
@ -829,42 +508,24 @@ fun main(args: Array<String>) {
|
|||
ws.onMessage { ctx ->
|
||||
when (ctx.message()) {
|
||||
"pong" -> {}
|
||||
else -> {
|
||||
println(ctx.message())
|
||||
val successState = handleSentMessage(ctx.message())
|
||||
if (successState != "Success") {
|
||||
try {
|
||||
ctx.send(successState)
|
||||
} catch (e: Exception) {
|
||||
println("Error sending error message: ${e.message}")
|
||||
}
|
||||
} else {
|
||||
val messageContent = extractMessageContent(ctx.message(), ctx)
|
||||
|
||||
try {
|
||||
val jsonMessage = JSONObject(messageContent)
|
||||
if (jsonMessage.has("room")) {
|
||||
val room = jsonMessage.getString("room")
|
||||
if (WsSessionManager.roomList.contains(room)) {
|
||||
WsSessionManager.broadcastToRoom(room, messageContent)
|
||||
} else {
|
||||
WsSessionManager.createRoom(room)
|
||||
WsSessionManager.broadcastToRoom(room, messageContent)
|
||||
}
|
||||
} else {
|
||||
WsSessionManager.broadcastToRoom("general", messageContent)
|
||||
}
|
||||
} catch (e: Exception) {
|
||||
println("Error in broadcasting message: ${e.message}")
|
||||
WsSessionManager.broadcastToRoom("general", messageContent)
|
||||
}
|
||||
else -> {
|
||||
println(ctx.message())
|
||||
val successState = handleSentMessage(ctx.message())
|
||||
if (successState != "Success") {
|
||||
try {
|
||||
ctx.send(successState)
|
||||
} catch (e: Exception) {
|
||||
println("Error sending error message: ${e.message}")
|
||||
}
|
||||
} else {
|
||||
val messageContent = extractMessageContent(ctx.message(), ctx)
|
||||
WsSessionManager.broadcast(messageContent)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
.start(7070)
|
||||
|
||||
.start(7070)
|
||||
try {
|
||||
if (args[0] == "-i") {
|
||||
println("Type a command for the server")
|
||||
|
|
@ -878,3 +539,4 @@ fun main(args: Array<String>) {
|
|||
println("Interactive mode disabled, add -i to enable")
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user