norbipeti/ChatServer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Many fixes and other things

Browse source 
- Fixed handling the case of no messages in conversation
- Changed sending new messages to HTML instead of JSON - So the message
format is at one place
- Fixed new messages showing the conversation ID to the user at the top
- Fixed unsent messages
- Fixed unread indicator on own message
- Fixed error hider timer
- Fixed message receiving when not logged in
This commit is contained in:
Norbi Peti 2016-08-16 23:11:42 +02:00
parent f997da810b
commit 23134e74f0
11 changed files with 83 additions and 70 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.settings/org.eclipse.jdt.core.prefs
View file

@ -104,3 +104,4 @@ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
org.eclipse.jdt.core.compiler.source=1.8
org.eclipse.jdt.core.javaFormatter=org.eclipse.jdt.core.defaultJavaFormatter

2
.settings/org.eclipse.jdt.ui.prefs Normal file
View file

@ -0,0 +1,2 @@
eclipse.preferences.version=1
formatter_settings_version=12

55
pages/js/receivemessage.js
View file

@ -1,11 +1,15 @@
function handlereceivedmessage(msgnode) {
function updatemsgtime(msgnode) {
var spans = msgnode.getElementsByTagName("span");
var ctime = null;
for (var i = 0; i < spans.length; i++)
if (spans[i].className.split(' ').indexOf("converttime") > -1)
ctime = spans[i];
if (ctime != null)
ctime.innerText = moment(ctime.innerText, "YYYY-MM-DDTHH:mm:ssZ").fromNow();
ctime.innerText = moment($(ctime).data("val"), "YYYY-MM-DDTHH:mm:ssZ").fromNow();
}
function handlereceivedmessage(msgnode) {
updatemsgtime(msgnode);
msgnode.scrollIntoView(false);
}
@ -16,12 +20,13 @@ var updateUnreadCount = function () {
document.title = "(" + unreadCount + ") Chat";
else
document.title = "Chat";
var msgs = document.getElementById("channelmessages").children;
var msgs = document.getElementById("channelmessages").getElementsByClassName("chmessage");
for (var i = msgs.length - 1; i >= 0; i--) {
if (i >= msgs.length - unreadCount)
msgs[i].style.backgroundColor = "darkgray";
else
msgs[i].style = "";
updatemsgtime(msgs[i]);
}
};
@ -35,27 +40,29 @@ var resetUnread = function resetUnread() {
updateUnreadCount();
};
(function poll() {
setTimeout(function () {
$.ajax({
url: "/receivemessage", success: function (data) {
console.log(data);
var msgelement = document.getElementById("channelmessages").appendChild(document.createElement("div"));
var header = msgelement.appendChild(document.createElement("p"));
header.innerText = data.sender.name + " - ";
var span = header.appendChild(document.createElement("span"));
span.className = "converttime";
span.innerText = data.time;
var body = msgelement.appendChild(document.createElement("p"));
body.innerText = data.message;
handlereceivedmessage(msgelement);
addUnread();
}, dataType: "json", complete: poll
});
}, 100);
})();
var readTimer = null;
$(document).ready(function () {
$('#msginput').on("focus", resetUnread);
$('#msginput').on("focus", function () { readTimer == null ? readTimer = setTimeout(function () { resetUnread(); }, 3000) : readTimer; });
$('#msginput').on("keydown", resetUnread);
$('#msginput').on("blur", function () { readTimer != null ? clearTimeout(readTimer) : readTimer; });
if (isLoggedIn())
(function poll() {
setTimeout(function () {
$.ajax({
url: "/receivemessage", success: function (data) {
var msgs = document.getElementById("channelmessages");
msgs.innerHTML += data;
var msgelement = msgs.children[msgs.children.length - 1];
handlereceivedmessage(msgelement);
if (justsentmsgread)
justsentmsgread = false;
else
addUnread();
}, error: function (data) {
showError(data.responseText);
}, dataType: "text", complete: poll
});
}, 100);
})();
});

4
pages/js/sendmessage.js
View file

@ -1,11 +1,11 @@
var sendmsg = function sendmsg(msginputta) {
window.jsonobj = JSON.stringify({ "message": msginputta.value, "conversation": window.convid });
console.log(window.jsonobj);
$.ajax({
url: "/sendmessage", data: window.jsonobj, method: "POST", success: respfunc, error: respfunc
});
};
var justsentmsgread = false;
var respfunc = function respfunc(result) {
var msginput = document.getElementById("msginput");
if (result != "Success") { //on success result is string
@ -18,12 +18,14 @@ var respfunc = function respfunc(result) {
showError(result.responseText);
msginput.disabled = false;
msginput.focus();
resetUnread();
}
}
else {
msginput.value = "";
msginput.disabled = false;
msginput.focus();
justsentmsgread = true;
}
};

9
pages/js/utils.js
View file

@ -12,9 +12,16 @@ function getFormData($form) {
return indexed_array;
}
var errorcleartimer = null;
function showError(message) {
if (errorcleartimer != null)
clearInterval(errorcleartimer);
var errormsg = document.getElementById("errormsg");
errormsg.innerHTML = message;
errormsg.style = "display: block";
setTimeout(function () { errormsg.style.display = "none"; }, 2000);
errorcleartimer = setTimeout(function () { errormsg.style.display = "none"; }, 2000);
}
function isLoggedIn() {
return document.getElementById("usercontent") != null;
}

2
src/io/github/norbipeti/chat/server/Main.java
View file

@ -19,7 +19,6 @@ import io.github.norbipeti.chat.server.data.*;
import io.github.norbipeti.chat.server.db.domain.*;
import io.github.norbipeti.chat.server.io.DataType;
import io.github.norbipeti.chat.server.page.*;
import io.vertx.core.Vertx;
public class Main {
public static Gson gson;
@ -31,7 +30,6 @@ public class Main {
LogManager.getLogger().log(Level.INFO, "Loading files...");
DataManager.init();
final GsonBuilder saveGsonBuilder = new GsonBuilder();
final GsonBuilder exchangeGsonBuilder = new GsonBuilder();
Reflections rf = new Reflections(new ConfigurationBuilder()
.setUrls(ClasspathHelper.forClassLoader(ManagedData.class.getClassLoader()))
.addClassLoader(ManagedData.class.getClassLoader()).addScanners(new SubTypesScanner())

2
src/io/github/norbipeti/chat/server/data/LoaderCollectionSerializer.java
View file

@ -1,7 +1,6 @@
package io.github.norbipeti.chat.server.data;
import java.io.IOException;
import java.util.Collection;
import java.util.List;
import com.google.gson.Gson;
@ -40,7 +39,6 @@ public class LoaderCollectionSerializer extends TypeAdapter<LoaderCollection<?>>
in.beginObject();
in.nextName();
List<Long> list;
LoaderCollection<? extends ManagedData> itemcol;
list = new Gson().fromJson(in, new TypeToken<List<Long>>() {
}.getType());
if (!in.nextName().equals("class"))

8
src/io/github/norbipeti/chat/server/db/domain/Message.java
View file

@ -103,14 +103,20 @@ public class Message extends ManagedData {
public Element getAsHTML(Element channelmessages) {
Element msgelement = channelmessages.appendElement("div");
msgelement.addClass("chmessage");
Element header = msgelement.appendElement("p");
header.text(getSender().get().getName() + " - ");
header.appendElement("span").addClass("converttime").text(formatDate());
header.appendElement("span").addClass("converttime").attr("data-val", formatDate());
Element body = msgelement.appendElement("p");
body.text(getMessage());
return msgelement;
}
/**
*
* @Deprecated Why send it as JSON then convert it to HTML?
*/
@Deprecated
public JsonObject getAsJson() {
JsonObject msgobj = new JsonObject();
msgobj.add("sender", Main.gson.toJsonTree(getSender().get()));

1
src/io/github/norbipeti/chat/server/db/domain/User.java
View file

@ -4,7 +4,6 @@ import java.io.IOException;
import java.util.List;
import javax.persistence.*;
import io.github.norbipeti.chat.server.data.DataManager;
import io.github.norbipeti.chat.server.data.LoaderCollection;
@Entity

14
src/io/github/norbipeti/chat/server/page/IndexPage.java
View file

@ -1,10 +1,6 @@
package io.github.norbipeti.chat.server.page;
import java.io.IOException;
import java.text.SimpleDateFormat;
import java.util.Collections;
import java.util.TimeZone;
import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.LogManager;
import org.jsoup.nodes.Element;
@ -57,10 +53,12 @@ public class IndexPage extends Page {
cide.attr("style", "display: none");
cide.attr("id", "convidp");
cide.text(Long.toString(conv.getId()));
LogManager.getLogger().log(Level.DEBUG, "Messages: " + conv.getMesssageChunks().size());
MessageChunk chunk = conv.getMesssageChunks().get(conv.getMesssageChunks().size() - 1);
for (Message message : chunk.getMessages()) {
message.getAsHTML(channelmessages);
LogManager.getLogger().log(Level.DEBUG, "Messagechunks: " + conv.getMesssageChunks().size());
if (conv.getMesssageChunks().size() > 0) {
MessageChunk chunk = conv.getMesssageChunks().get(conv.getMesssageChunks().size() - 1);
for (Message message : chunk.getMessages()) {
message.getAsHTML(channelmessages);
}
}
return doc;
}, exchange);

55
src/io/github/norbipeti/chat/server/page/ReceiveMessageAjaxPage.java
View file

@ -1,17 +1,19 @@
package io.github.norbipeti.chat.server.page;
import java.io.IOException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Map.Entry;
import java.util.Iterator;
import javax.swing.text.html.HTMLDocument;
import org.apache.logging.log4j.LogManager;
import org.jsoup.nodes.Document;
import org.jsoup.nodes.Element;
import com.google.gson.Gson;
import com.google.gson.JsonObject;
import com.sun.net.httpserver.HttpExchange;
import io.github.norbipeti.chat.server.Main;
import io.github.norbipeti.chat.server.data.LoaderRef;
import io.github.norbipeti.chat.server.db.domain.Conversation;
import io.github.norbipeti.chat.server.db.domain.Message;
import io.github.norbipeti.chat.server.db.domain.User;
@ -26,7 +28,7 @@ public class ReceiveMessageAjaxPage extends Page {
}
public static HashMap<User, HttpExchange> exmap = new HashMap<>();
public static HashMap<User, Message> unsentmessages = new HashMap<>();
public static HashMap<User, ArrayList<Message>> unsentmessages = new HashMap<>();
@Override
public void handlePage(HttpExchange exchange) throws IOException {
@ -36,42 +38,35 @@ public class ReceiveMessageAjaxPage extends Page {
return;
}
exmap.put(user, exchange);
/*
* String message = obj.get("message").getAsString().trim(); int conversation = obj.get("conversation").getAsInt(); if (message.trim().length() == 0) { IOHelper.SendResponse(400,
* "<h1>400 Bad request</h1><p>The message cannot be empty.</p>", exchange); return; } LoaderCollection<Conversation> convos = user.getConversations(); Conversation conv = null;
* LogManager.getLogger().log(Level.DEBUG, "Len: " + convos.size()); for (Conversation con : convos) { LogManager.getLogger().log(Level.DEBUG, con.getId()); if (con.getId() == conversation) {
* conv = con; break; } } if (conv == null) { IOHelper.SendResponse(400, "<h1>400 Conversation not found</h1><p>The conversation with the id " + conversation + " is not found.</p>", exchange);
* return; } MessageChunk chunk = ManagedData.create(MessageChunk.class); chunk.setConversation(conv); Message msg = new Message(); msg.setSender(user); msg.setMessage(message);
* msg.setTime(new Date()); msg.setMessageChunk(chunk); chunk.getMessages().add(msg); conv.getMesssageChunks().add(chunk); DataManager.save(conv); LogManager.getLogger().log(Level.DEBUG,
* "Added conversation's message count: " + conv.getMesssageChunks().size());
*/
}
public static void sendMessageBack(Message msg, Conversation conv) throws IOException {
for (User user : conv.getUsers()) { // TODO: Load older messages when scrolling up
if (unsentmessages.size() > 10)
unsentmessages.clear();
if (exmap.containsKey(user)) { // TODO: Save new messages if not listening - If message count is bigger than 10, remove (the user is probably offline)
unsentmessages.put(user, msg);
for (Entry<User, Message> entry : unsentmessages.) { //TODO: Only one key allowed, fix
JsonObject msgobj = entry.getValue().getAsJson(); // TODO: Only send messages if the user's current conversation matches
if (unsentmessages.containsKey(user) && unsentmessages.get(user).size() > 10) {
unsentmessages.get(user).clear();
}
if (!unsentmessages.containsKey(user))
unsentmessages.put(user, new ArrayList<Message>());
unsentmessages.get(user).add(msg);
if (exmap.containsKey(user)) {
Iterator<Message> it = unsentmessages.get(user).iterator();
String finalmsghtml = "";
while (it.hasNext()) {
Message entry = it.next();
Element msgobj = entry.getAsHTML(new Document("")); // TODO: Only send messages if the user's current conversation matches
finalmsghtml += msgobj.toString() + "\n";
try {
IOHelper.SendResponse(200, msgobj.toString(), exmap.get(user));
} catch (IOException e) { // Remove users even if an error occurs (otherwise they may not be able to send a new message due to "headers already sent")
it.remove(); // Remove sent message
} catch (Exception e) { // Remove users even if an error occurs (otherwise they may not be able to send a new/ message due to "headers already sent")
e.printStackTrace();
}
}
JsonObject msgobj = msg.getAsJson(); // TODO: Only send messages if the user's current conversation matches
try {
IOHelper.SendResponse(200, msgobj.toString(), exmap.get(user));
} catch (IOException e) { // Remove users even if an error occurs (otherwise they may not be able to send a new message due to "headers already sent")
e.printStackTrace();
}
IOHelper.SendResponse(200, finalmsghtml, exmap.get(user));
exmap.remove(user);
if (unsentmessages.get(user).size() == 0)
unsentmessages.remove(user);
} else {
LogManager.getLogger().warn("User is not listening: " + user);
unsentmessages.put(user, msg);
}
}
}