From e746ca6970bea80ec9b5ae79dda8f6332254e301 Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Sat, 16 Jan 2016 16:43:43 +0300
Subject: moved to Gradle

---
 src/main/java/com/juick/jabber/ws/Main.java        |  68 +++++
 .../java/com/juick/jabber/ws/SocketSubscribed.java |  51 ++++
 .../java/com/juick/jabber/ws/WSConnections.java    |  44 ++++
 src/main/java/com/juick/jabber/ws/WSData.java      | 276 +++++++++++++++++++++
 src/main/java/com/juick/jabber/ws/WSKeepAlive.java | 102 ++++++++
 .../java/com/juick/jabber/ws/XMPPConnection.java   | 166 +++++++++++++
 6 files changed, 707 insertions(+)
 create mode 100644 src/main/java/com/juick/jabber/ws/Main.java
 create mode 100644 src/main/java/com/juick/jabber/ws/SocketSubscribed.java
 create mode 100644 src/main/java/com/juick/jabber/ws/WSConnections.java
 create mode 100644 src/main/java/com/juick/jabber/ws/WSData.java
 create mode 100644 src/main/java/com/juick/jabber/ws/WSKeepAlive.java
 create mode 100644 src/main/java/com/juick/jabber/ws/XMPPConnection.java

(limited to 'src/main/java/com')

diff --git a/src/main/java/com/juick/jabber/ws/Main.java b/src/main/java/com/juick/jabber/ws/Main.java
new file mode 100644
index 00000000..a7aea543
--- /dev/null
+++ b/src/main/java/com/juick/jabber/ws/Main.java
@@ -0,0 +1,68 @@
+/*
+ * Juick
+ * Copyright (C) 2008-2011, Ugnich Anton
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.juick.jabber.ws;
+
+import java.io.FileInputStream;
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.Properties;
+
+/**
+ *
+ * @author Ugnich Anton
+ */
+public class Main {
+
+    Connection sql;
+    XMPPConnection xmpp;
+    public static String STATSFILE = null;
+    public final static ArrayList<SocketSubscribed> clients = new ArrayList<SocketSubscribed>();
+
+    public static void main(String[] args) {
+        new Main().start();
+    }
+
+    public void start() {
+        try {
+            Properties conf = new Properties();
+            conf.load(new FileInputStream("/etc/juick/ws.conf"));
+
+            STATSFILE = conf.getProperty("statsfile");
+
+            setupSql(conf.getProperty("mysql_username", ""), conf.getProperty("mysql_password", ""));
+            xmpp = new XMPPConnection(sql, conf.getProperty("xmpp_password", ""));
+            new Thread(xmpp).start();
+
+            //new Thread(new WSConnections()).start();
+            new Thread(new WSData(sql)).start();
+            new Thread(new WSKeepAlive(sql)).start();
+        } catch (Exception e) {
+            System.err.println(e);
+        }
+    }
+
+    public void setupSql(String username, String password) {
+        try {
+            sql = DriverManager.getConnection("jdbc:mysql://localhost/juick?autoReconnect=true&user=" + username + "&password=" + password);
+        } catch (SQLException e) {
+            System.err.println(e);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/juick/jabber/ws/SocketSubscribed.java b/src/main/java/com/juick/jabber/ws/SocketSubscribed.java
new file mode 100644
index 00000000..6144380c
--- /dev/null
+++ b/src/main/java/com/juick/jabber/ws/SocketSubscribed.java
@@ -0,0 +1,51 @@
+package com.juick.jabber.ws;
+
+import java.nio.ByteBuffer;
+import java.nio.channels.SocketChannel;
+
+/**
+ *
+ * @author ugnich
+ */
+public class SocketSubscribed {
+
+    public SocketChannel sock = null;
+    public String clientName = null;
+    public int VUID = 0;
+    public int UID = 0;
+    public int MID = 0;
+    public boolean allMessages = false;
+    public boolean allReplies = false;
+    public long tsConnected;
+    public long tsLastData;
+
+    public SocketSubscribed(SocketChannel sock, String clientName, int VUID) {
+        this.sock = sock;
+        this.clientName = clientName;
+        this.VUID = VUID;
+        tsConnected = tsLastData = System.currentTimeMillis();
+    }
+
+    public boolean sendByteBuffer(ByteBuffer bb) {
+        boolean ret = false;
+        bb.rewind();
+        try {
+            sock.write(bb);
+            ret = true;
+        } catch (Exception e) {
+            close();
+        }
+        return ret;
+    }
+
+    public void close() {
+        try {
+            sock.socket().close();
+        } catch (Exception e) {
+        }
+        try {
+            sock.close();
+        } catch (Exception e) {
+        }
+    }
+}
diff --git a/src/main/java/com/juick/jabber/ws/WSConnections.java b/src/main/java/com/juick/jabber/ws/WSConnections.java
new file mode 100644
index 00000000..15fbe4e8
--- /dev/null
+++ b/src/main/java/com/juick/jabber/ws/WSConnections.java
@@ -0,0 +1,44 @@
+package com.juick.jabber.ws;
+
+import java.net.InetSocketAddress;
+import java.nio.channels.SelectionKey;
+import java.nio.channels.Selector;
+import java.nio.channels.ServerSocketChannel;
+import java.nio.channels.SocketChannel;
+import java.util.Iterator;
+
+/**
+ *
+ * @author ugnich
+ */
+public class WSConnections implements Runnable {
+
+    Selector sel;
+
+    @Override
+    public void run() {
+        try {
+            sel = Selector.open();
+            ServerSocketChannel listensock = ServerSocketChannel.open();
+            listensock.configureBlocking(false);
+            listensock.socket().bind(new InetSocketAddress(8081));
+            listensock.register(sel, SelectionKey.OP_ACCEPT);
+
+            while (true) {
+                sel.select();
+                Iterator<SelectionKey> it = sel.selectedKeys().iterator();
+                while (it.hasNext()) {
+                    SelectionKey selKey = it.next();
+                    it.remove();
+                    ServerSocketChannel ssChannel = (ServerSocketChannel) selKey.channel();
+                    SocketChannel sChannel = ssChannel.accept();
+                    sChannel.configureBlocking(false);
+                    sChannel.register(sel, SelectionKey.OP_READ);
+                    System.out.println(sChannel.socket().getRemoteSocketAddress().toString() + " ACCEPTED");
+                }
+            }
+        } catch (Exception e) {
+            System.err.println("WSConnections: " + e);
+        }
+    }
+}
diff --git a/src/main/java/com/juick/jabber/ws/WSData.java b/src/main/java/com/juick/jabber/ws/WSData.java
new file mode 100644
index 00000000..d77257e6
--- /dev/null
+++ b/src/main/java/com/juick/jabber/ws/WSData.java
@@ -0,0 +1,276 @@
+package com.juick.jabber.ws;
+
+import com.juick.server.MessagesQueries;
+import com.juick.server.UserQueries;
+import com.juick.xmpp.utils.Base64;
+import java.io.IOException;
+import java.net.InetSocketAddress;
+import java.nio.ByteBuffer;
+import java.nio.CharBuffer;
+import java.nio.channels.SelectionKey;
+import java.nio.channels.Selector;
+import java.nio.channels.ServerSocketChannel;
+import java.nio.channels.SocketChannel;
+import java.nio.charset.Charset;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.sql.Connection;
+import java.util.Iterator;
+
+/**
+ *
+ * @author ugnich
+ */
+public class WSData implements Runnable {
+    
+    static final String WEBSOCKET_GUID = "258EAFA5-E914-47DA-95CA-C5AB0DC85B11";
+    Connection sql;
+    public Selector sel;
+    
+    public WSData(Connection sql) {
+        this.sql = sql;
+    }
+    
+    @Override
+    public void run() {
+        try {
+            sel = Selector.open();
+            ServerSocketChannel listensock = ServerSocketChannel.open();
+            listensock.configureBlocking(false);
+            listensock.socket().bind(new InetSocketAddress(8081));
+            listensock.register(sel, SelectionKey.OP_ACCEPT);
+            
+            while (true) {
+                sel.select();
+                Iterator<SelectionKey> it = sel.selectedKeys().iterator();
+                while (it.hasNext()) {
+                    SelectionKey selKey = it.next();
+                    it.remove();
+                    
+                    if (selKey.isAcceptable()) {
+                        ServerSocketChannel ssChannel = (ServerSocketChannel) selKey.channel();
+                        SocketChannel sChannel = ssChannel.accept();
+                        sChannel.configureBlocking(false);
+                        sChannel.register(sel, SelectionKey.OP_READ);
+                        System.out.println(sChannel.socket().getRemoteSocketAddress().toString() + " ACCEPTED");
+                    } else if (selKey.isReadable()) {
+                        SocketChannel sChannel = (SocketChannel) selKey.channel();
+                        ByteBuffer buf = ByteBuffer.allocate(10240);
+                        try {
+                            int readbytes = sChannel.read(buf);
+                            if (readbytes > 0) {
+                                buf.flip();
+                                
+                                CharBuffer charbuf = Charset.forName("ISO-8859-1").decode(buf);
+                                System.out.println("DATA: " + charbuf.toString());
+                                buf.rewind();
+                                
+                                switch (buf.get(0)) {
+                                    case (byte) 0x89: // PING
+                                        updateSocketTS(sChannel);
+                                        wsPing(sChannel);
+                                        break;
+                                    case (byte) 0x8A: // PONG
+                                        updateSocketTS(sChannel);
+                                        break;
+                                    case (byte) 0x81: // TEXT FRAME
+                                        updateSocketTS(sChannel);
+                                        wsTextFrame(sChannel, buf);
+                                        break;
+                                    case (byte) 'G': // HTTP
+                                        updateSocketTS(sChannel);
+                                        wsHandshake(sChannel, buf);
+                                        break;
+                                    case (byte) 0x88: // CONNECTION CLOSE
+                                        throw new IOException(sChannel.socket().getRemoteSocketAddress().toString() + " CONNECTION CLOSE");
+                                }
+                            } else if (readbytes < 0) {
+                                throw new IOException(sChannel.socket().getRemoteSocketAddress().toString() + " END OF STREAM");
+                            }
+                        } catch (IOException e) {
+                            System.err.println("WSData: " + e);
+                            sChannel.socket().close();
+                            sChannel.close();
+                            selKey.cancel();
+                        }
+                    }
+                }
+            }
+        } catch (Exception e) {
+            System.err.println("WSData: " + e);
+        }
+    }
+    
+    public void wsHandshake(SocketChannel sock, ByteBuffer buf) throws Exception {
+        String hOrigin = null;
+        String hHost = null;
+        String hLocation = null;
+        String hSecWebSocketKey = null;
+        String hSecWebSocketVersion = null;
+        String hXRealIP = null;
+        
+        buf.rewind();
+        CharBuffer charbuf = Charset.forName("ISO-8859-1").decode(buf);
+        String headers[] = charbuf.toString().split("\r\n");
+        for (int i = 0; i < headers.length; i++) {
+            String h[] = headers[i].split(" ", 2);
+            if (h.length == 2) {
+                if (h[0].equals("GET")) {
+                    hLocation = headers[i].split(" ", 3)[1];
+                } else if (h[0].equals("Origin:")) {
+                    hOrigin = h[1];
+                } else if (h[0].equals("Host:")) {
+                    hHost = h[1];
+                } else if (h[0].equals("Sec-WebSocket-Key:")) {
+                    hSecWebSocketKey = h[1];
+                } else if (h[0].equals("Sec-WebSocket-Version:")) {
+                    hSecWebSocketVersion = h[1];
+                } else if (h[0].equals("X-Real-IP:")) {
+                    hXRealIP = h[1];
+                }
+            }
+        }
+        
+        if (hOrigin == null || hHost == null || hLocation == null || hSecWebSocketKey == null || hSecWebSocketVersion == null || !hSecWebSocketVersion.equals("13")) {
+            throw new IOException(sock.socket().getRemoteSocketAddress().toString() + " Invalid headers");
+        }
+
+        // Auth
+        int VUID = 0;
+        int hashloc = hLocation.indexOf("hash=");
+        if (hashloc > 0) {
+            String hash = hLocation.substring(hashloc + 5);
+            if (hash.indexOf('&') > 0) {
+                hash = hash.substring(0, hash.indexOf('&'));
+            }
+            if (hash.length() == 16) {
+                VUID = com.juick.server.UserQueries.getUIDbyHash(sql, hash);
+            }
+        }
+
+        // URL
+        int hLocationQM = hLocation.indexOf('?');
+        if (hLocationQM > 0) {
+            hLocation = hLocation.substring(0, hLocationQM);
+        }
+        
+        int MID = 0;
+        int responseCode = 404;
+        SocketSubscribed sockSubscr = null;
+        if (hLocation.equals("/") && VUID > 0) {
+            sockSubscr = new SocketSubscribed(sock, hXRealIP, VUID);
+            responseCode = 101;
+        } else if (hLocation.equals("/_all")) {
+            sockSubscr = new SocketSubscribed(sock, hXRealIP, VUID);
+            sockSubscr.allMessages = true;
+            responseCode = 101;
+        } else if (hLocation.equals("/_replies")) {
+            sockSubscr = new SocketSubscribed(sock, hXRealIP, VUID);
+            sockSubscr.allReplies = true;
+            responseCode = 101;
+        } else if (hLocation.matches("^/\\d+$")) {
+            try {
+                MID = Integer.parseInt(hLocation.substring(1));
+            } catch (Exception e) {
+            }
+            if (MID > 0) {
+                if (MessagesQueries.canViewThread(sql, MID, VUID)) {
+                    sockSubscr = new SocketSubscribed(sock, hXRealIP, VUID);
+                    sockSubscr.MID = MID;
+                    responseCode = 101;
+                } else {
+                    responseCode = 403;
+                }
+            }
+        } else if (hLocation.matches("^/[a-zA-Z0-9\\-]{2,16}/?$")) {
+            String uname;
+            if (hLocation.endsWith("/")) {
+                uname = hLocation.substring(1, hLocation.length() - 2);
+            } else {
+                uname = hLocation.substring(1);
+            }
+            
+            int UID = UserQueries.getUIDbyName(sql, uname);
+            if (UID > 0) {
+                // check access
+                sockSubscr = new SocketSubscribed(sock, hXRealIP, VUID);
+                sockSubscr.UID = UID;
+                responseCode = 101;
+            }
+        }
+        if (sockSubscr != null) {
+            synchronized (Main.clients) {
+                Main.clients.add(sockSubscr);
+            }
+        }
+
+        // Response
+        String outstr;
+        if (responseCode == 101) {
+            outstr = "HTTP/1.1 101 Switching Protocols\r\n"
+                    + "Upgrade: websocket\r\n"
+                    + "Connection: Upgrade\r\n"
+                    + "Sec-WebSocket-Accept: " + calcHeaderAccept(hSecWebSocketKey) + "\r\n"
+                    + "\r\n";
+        } else if (responseCode == 403) {
+            outstr = "HTTP/1.1 403 Forbidden\r\n\r\n";
+        } else {
+            outstr = "HTTP/1.1 404 Not Found\r\n\r\n";
+        }
+        ByteBuffer out = ByteBuffer.allocate(1024);
+        out.put(Charset.forName("ISO-8859-1").encode(outstr));
+        out.flip();
+        sock.write(out);
+        
+        if (responseCode == 101) {
+            System.out.println(sock.socket().getRemoteSocketAddress().toString() + " HANDSHAKE (VUID = " + VUID + "; MID = " + MID + ")");
+        } else {
+            throw new IOException(sock.socket().getRemoteSocketAddress().toString() + " " + responseCode);
+        }
+    }
+    
+    private String calcHeaderAccept(String key) {
+        String base = key + WEBSOCKET_GUID;
+        try {
+            MessageDigest md = MessageDigest.getInstance("SHA-1");
+            return Base64.encode(md.digest(base.getBytes()));
+        } catch (NoSuchAlgorithmException e) {
+            System.err.println("calcHeaderAccept: " + e);
+        }
+        return "";
+    }
+    
+    public void wsPing(SocketChannel sock) throws Exception {
+        ByteBuffer out = ByteBuffer.allocate(2);
+        out.put((byte) 0x8A); // PONG FRAME
+        out.put((byte) 0x00); // 1 byte long
+        out.flip();
+        out.rewind();
+        sock.write(out);
+    }
+    
+    public void wsTextFrame(SocketChannel sock, ByteBuffer buf) throws Exception {
+        /*
+        ByteBuffer out = ByteBuffer.allocate(3);
+        out.put((byte) 0x81); // TEXT FRAME
+        out.put((byte) 0x01); // 1 byte long
+        out.put((byte) 0x20); // ' '
+        out.flip();
+        out.rewind();
+        sock.write(out);
+         */
+    }
+    
+    public void updateSocketTS(SocketChannel sock) {
+        synchronized (Main.clients) {
+            Iterator<SocketSubscribed> i = Main.clients.iterator();
+            while (i.hasNext()) {
+                SocketSubscribed s = i.next();
+                if (s.sock == sock) {
+                    s.tsLastData = System.currentTimeMillis();
+                    break;
+                }
+            }
+        }
+    }
+}
diff --git a/src/main/java/com/juick/jabber/ws/WSKeepAlive.java b/src/main/java/com/juick/jabber/ws/WSKeepAlive.java
new file mode 100644
index 00000000..2deef594
--- /dev/null
+++ b/src/main/java/com/juick/jabber/ws/WSKeepAlive.java
@@ -0,0 +1,102 @@
+package com.juick.jabber.ws;
+
+import java.io.PrintWriter;
+import java.nio.ByteBuffer;
+import java.sql.Connection;
+import java.util.Iterator;
+
+/**
+ *
+ * @author ugnich
+ */
+public class WSKeepAlive implements Runnable {
+
+    Connection sql;
+    ByteBuffer pingBytes;
+    ByteBuffer closeBytes;
+
+    public WSKeepAlive(Connection sql) {
+        this.sql = sql;
+
+        //pingBytes = ByteBuffer.allocate(2);
+        //pingBytes.put((byte) 0x8A); // PONG FRAME
+        //pingBytes.put((byte) 0x00); // 0 byte long
+        pingBytes = ByteBuffer.allocate(3);
+        pingBytes.put((byte) 0x81); // TEXT FRAME
+        pingBytes.put((byte) 0x01); // 1 byte long
+        pingBytes.put((byte) 0x20); // ' '
+        pingBytes.flip();
+
+        closeBytes = ByteBuffer.allocate(2);
+        closeBytes.put((byte) 0x88); // CLOSE FRAME
+        closeBytes.put((byte) 0x00); // 0 byte long
+        closeBytes.flip();
+    }
+
+    @Override
+    public void run() {
+        while (true) {
+            PrintWriter statsFile = null;
+
+            if (Main.STATSFILE != null) {
+                try {
+                    statsFile = new PrintWriter(Main.STATSFILE, "UTF-8");
+                } catch (Exception e) {
+                    statsFile = null;
+                    System.err.println("WSKeepAlive statsFile: " + e);
+                }
+            }
+
+            long now = System.currentTimeMillis();
+
+            synchronized (Main.clients) {
+                if (statsFile != null) {
+                    statsFile.write("<html><body><h1>Connections (" + Main.clients.size() + ")</h2><table border=1><tr><th>IP</th><th>inactive</th><th>VUID</th><th>UID</th><th>MID</th><th>allM</th><th>allR</th></tr>");
+                }
+
+                for (Iterator<SocketSubscribed> i = Main.clients.iterator(); i.hasNext();) {
+                    SocketSubscribed s = i.next();
+                    int inactive = (int) ((double) (now - s.tsLastData) / 1000.0);
+
+                    if (statsFile != null) {
+                        try {
+                            statsFile.print("<tr><td>" + (s.clientName != null ? s.clientName : "?") + "</td>");
+                            statsFile.print("<td>" + inactive + "</td>");
+                            statsFile.print("<td>" + (s.VUID > 0 ? s.VUID : "") + "</td>");
+                            statsFile.print("<td>" + (s.UID > 0 ? s.UID : "") + "</td>");
+                            statsFile.print("<td>" + (s.MID > 0 ? s.MID : "") + "</td>");
+                            statsFile.print("<td>" + (s.allMessages ? "+" : "") + "</td>");
+                            statsFile.print("<td>" + (s.allReplies ? "+" : "") + "</td></tr>");
+                        } catch (Exception e) {
+                            System.err.println("WSKeepAlive statsFile print: " + e);
+                        }
+                    }
+
+                    if (inactive > 180) {
+                        s.sendByteBuffer(closeBytes);
+                        s.close();
+                        i.remove();
+                    } else if (inactive > 60) {
+                        if (!s.sendByteBuffer(pingBytes)) {
+                            i.remove();
+                        }
+                    }
+                }
+            }
+
+            if (Main.STATSFILE != null) {
+                try {
+                    statsFile.write("</table></body></html>");
+                    statsFile.close();
+                } catch (Exception e) {
+                    System.err.println("WSKeepAlive statsFile close: " + e);
+                }
+            }
+
+            try {
+                Thread.sleep(10000);
+            } catch (InterruptedException e) {
+            }
+        }
+    }
+}
diff --git a/src/main/java/com/juick/jabber/ws/XMPPConnection.java b/src/main/java/com/juick/jabber/ws/XMPPConnection.java
new file mode 100644
index 00000000..39815da5
--- /dev/null
+++ b/src/main/java/com/juick/jabber/ws/XMPPConnection.java
@@ -0,0 +1,166 @@
+package com.juick.jabber.ws;
+
+import com.juick.server.MessagesQueries;
+import com.juick.server.Utils;
+import com.juick.xmpp.JID;
+import com.juick.xmpp.Message;
+import com.juick.xmpp.Stream;
+import com.juick.xmpp.StreamComponent;
+import com.juick.xmpp.extensions.JuickMessage;
+import java.io.IOException;
+import java.net.Socket;
+import java.nio.ByteBuffer;
+import java.nio.charset.Charset;
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.ArrayList;
+import java.util.Iterator;
+
+/**
+ *
+ * @author ugnich
+ */
+public class XMPPConnection implements Runnable, Stream.StreamListener, Message.MessageListener {
+
+    Connection sql;
+    Stream xmpp;
+    String xmppPassword;
+
+    public XMPPConnection(Connection sql, String password) {
+        this.sql = sql;
+        xmppPassword = password;
+    }
+
+    @Override
+    public void run() {
+        try {
+            Socket socket = new Socket("localhost", 5347);
+            xmpp = new StreamComponent(new JID("", "ws.juick.com", ""), socket.getInputStream(), socket.getOutputStream(), xmppPassword);
+            xmpp.addChildParser(new JuickMessage());
+            xmpp.addListener((Stream.StreamListener) this);
+            xmpp.addListener((Message.MessageListener) this);
+            xmpp.startParsing();
+        } catch (IOException e) {
+            System.err.println("XMPPConnection: " + e);
+        }
+    }
+
+    @Override
+    public void onStreamReady() {
+        System.err.println("Stream ready");
+    }
+
+    @Override
+    public void onStreamFail(String msg) {
+        System.err.println("Stream failed: " + msg);
+    }
+
+    @Override
+    public void onMessage(com.juick.xmpp.Message msg) {
+        JuickMessage jmsg = (JuickMessage) msg.getChild(JuickMessage.XMLNS);
+        if (jmsg != null) {
+            System.err.println("MID=" + jmsg.MID + "; RID=" + jmsg.RID);
+            if (jmsg.MID == 0) {
+                int uid_to = 0;
+                try {
+                    uid_to = Integer.parseInt(msg.to.Username);
+                } catch (Exception e) {
+                }
+                if (uid_to > 0) {
+                    onJuickPM(uid_to, jmsg);
+                }
+            } else if (jmsg.RID == 0) {
+                onJuickMessagePost(jmsg);
+            } else {
+                onJuickMessageReply(jmsg);
+            }
+        }
+    }
+
+    private void onJuickPM(int uid_to, com.juick.Message jmsg) {
+        String json = com.juick.json.Message.toJSON(jmsg).toString();
+        ByteBuffer bbMsg = buildTextFrame(json);
+
+        synchronized (Main.clients) {
+            for (Iterator<SocketSubscribed> i = Main.clients.iterator(); i.hasNext();) {
+                SocketSubscribed s = i.next();
+                if (s.VUID == uid_to && s.MID == 0 && s.allMessages == false && s.allReplies == false) {
+                    if (!s.sendByteBuffer(bbMsg)) {
+                        i.remove();
+                    }
+                }
+            }
+        }
+    }
+
+    private void onJuickMessagePost(com.juick.Message jmsg) {
+        String json = com.juick.json.Message.toJSON(jmsg).toString();
+        ByteBuffer bbMsg = buildTextFrame(json);
+
+        ArrayList<Integer> uids = new ArrayList<Integer>();
+        String query = "SELECT suser_id FROM subscr_users WHERE user_id=" + jmsg.User.UID + " AND suser_id NOT IN (SELECT user_id FROM bl_tags INNER JOIN messages_tags USING(tag_id) WHERE message_id=" + jmsg.MID + ")";
+        if (jmsg.Privacy < 0) {
+            query += " AND suser_id IN (SELECT wl_user_id FROM wl_users WHERE user_id=" + jmsg.User.UID + ")";
+        }
+        Statement stmt = null;
+        ResultSet rs = null;
+        try {
+            stmt = sql.createStatement();
+            rs = stmt.executeQuery(query);
+            rs.beforeFirst();
+            while (rs.next()) {
+                uids.add(rs.getInt(1));
+            }
+        } catch (SQLException e) {
+            System.err.println("onJuickMessagePost: " + e);
+        } finally {
+            Utils.finishSQL(rs, stmt);
+        }
+
+        synchronized (Main.clients) {
+            for (Iterator<SocketSubscribed> i = Main.clients.iterator(); i.hasNext();) {
+                SocketSubscribed s = i.next();
+                if (s.MID == 0 && s.allReplies == false && ((jmsg.Privacy >= 0 && (s.allMessages || s.UID == jmsg.User.UID)) || uids.contains(s.VUID))) {
+                    if (!s.sendByteBuffer(bbMsg)) {
+                        i.remove();
+                    }
+                }
+            }
+        }
+    }
+
+    private void onJuickMessageReply(com.juick.Message jmsg) {
+        String json = com.juick.json.Message.toJSON(jmsg).toString();
+        ByteBuffer bbMsg = buildTextFrame(json);
+
+        int privacy = MessagesQueries.getMessagePrivacy(sql, jmsg.MID);
+
+        synchronized (Main.clients) {
+            for (Iterator<SocketSubscribed> i = Main.clients.iterator(); i.hasNext();) {
+                SocketSubscribed s = i.next();
+                if ((privacy >= 0 && s.allReplies) || s.MID == jmsg.MID) {
+                    if (!s.sendByteBuffer(bbMsg)) {
+                        i.remove();
+                    }
+                }
+            }
+        }
+    }
+
+    private ByteBuffer buildTextFrame(String json) {
+        ByteBuffer jsonbytes = Charset.forName("UTF-8").encode(json);
+        ByteBuffer bbMsg = ByteBuffer.allocate(jsonbytes.limit() + 8);
+        bbMsg.put((byte) 0x81);
+        if (jsonbytes.limit() <= 125) {
+            bbMsg.put((byte) jsonbytes.limit());
+        } else {
+            bbMsg.put((byte) 126);
+            bbMsg.putShort((short) jsonbytes.limit());
+        }
+        bbMsg.put(jsonbytes);
+        bbMsg.flip();
+        return bbMsg;
+    }
+}
-- 
cgit v1.2.3


From 27e6c9c5edb2642c31735fcb0effb9acd82bd4af Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Thu, 28 Jan 2016 17:29:55 +0300
Subject: fix build

---
 build.gradle                                       |  1 +
 .../java/com/juick/jabber/ws/XMPPConnection.java   | 30 +++++++++++++---------
 2 files changed, 19 insertions(+), 12 deletions(-)

(limited to 'src/main/java/com')

diff --git a/build.gradle b/build.gradle
index 0091459a..63ba360a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -54,6 +54,7 @@ dependencies {
     compile json
     compile "org.springframework:spring-jdbc:4.2.4.RELEASE"
     providedCompile 'javax.servlet:javax.servlet-api:3.1.0'
+    providedCompile 'javax.websocket:javax.websocket-api:1.0'
     def tomcatVersion = '7.0.+'
     tomcat "org.apache.tomcat.embed:tomcat-embed-core:${tomcatVersion}",
             "org.apache.tomcat.embed:tomcat-embed-logging-juli:${tomcatVersion}",
diff --git a/src/main/java/com/juick/jabber/ws/XMPPConnection.java b/src/main/java/com/juick/jabber/ws/XMPPConnection.java
index 39815da5..df403083 100644
--- a/src/main/java/com/juick/jabber/ws/XMPPConnection.java
+++ b/src/main/java/com/juick/jabber/ws/XMPPConnection.java
@@ -1,5 +1,6 @@
 package com.juick.jabber.ws;
 
+import com.juick.json.MessageSerializer;
 import com.juick.server.MessagesQueries;
 import com.juick.server.Utils;
 import com.juick.xmpp.JID;
@@ -53,7 +54,7 @@ public class XMPPConnection implements Runnable, Stream.StreamListener, Message.
     }
 
     @Override
-    public void onStreamFail(String msg) {
+    public void onStreamFail(Exception msg) {
         System.err.println("Stream failed: " + msg);
     }
 
@@ -61,8 +62,8 @@ public class XMPPConnection implements Runnable, Stream.StreamListener, Message.
     public void onMessage(com.juick.xmpp.Message msg) {
         JuickMessage jmsg = (JuickMessage) msg.getChild(JuickMessage.XMLNS);
         if (jmsg != null) {
-            System.err.println("MID=" + jmsg.MID + "; RID=" + jmsg.RID);
-            if (jmsg.MID == 0) {
+            System.err.println("MID=" + jmsg.getMID() + "; RID=" + jmsg.getRID());
+            if (jmsg.getMID() == 0) {
                 int uid_to = 0;
                 try {
                     uid_to = Integer.parseInt(msg.to.Username);
@@ -71,7 +72,7 @@ public class XMPPConnection implements Runnable, Stream.StreamListener, Message.
                 if (uid_to > 0) {
                     onJuickPM(uid_to, jmsg);
                 }
-            } else if (jmsg.RID == 0) {
+            } else if (jmsg.getRID() == 0) {
                 onJuickMessagePost(jmsg);
             } else {
                 onJuickMessageReply(jmsg);
@@ -79,8 +80,10 @@ public class XMPPConnection implements Runnable, Stream.StreamListener, Message.
         }
     }
 
+    MessageSerializer messageSerializer = new MessageSerializer();
+
     private void onJuickPM(int uid_to, com.juick.Message jmsg) {
-        String json = com.juick.json.Message.toJSON(jmsg).toString();
+        String json = messageSerializer.serialize(jmsg).toString();
         ByteBuffer bbMsg = buildTextFrame(json);
 
         synchronized (Main.clients) {
@@ -96,13 +99,15 @@ public class XMPPConnection implements Runnable, Stream.StreamListener, Message.
     }
 
     private void onJuickMessagePost(com.juick.Message jmsg) {
-        String json = com.juick.json.Message.toJSON(jmsg).toString();
+        String json = messageSerializer.serialize(jmsg).toString();
         ByteBuffer bbMsg = buildTextFrame(json);
 
         ArrayList<Integer> uids = new ArrayList<Integer>();
-        String query = "SELECT suser_id FROM subscr_users WHERE user_id=" + jmsg.User.UID + " AND suser_id NOT IN (SELECT user_id FROM bl_tags INNER JOIN messages_tags USING(tag_id) WHERE message_id=" + jmsg.MID + ")";
+        String query = "SELECT suser_id FROM subscr_users WHERE user_id=" + jmsg.getUser().getUID() +
+                " AND suser_id NOT IN (SELECT user_id FROM bl_tags " +
+                "INNER JOIN messages_tags USING(tag_id) WHERE message_id=" + jmsg.getMID() + ")";
         if (jmsg.Privacy < 0) {
-            query += " AND suser_id IN (SELECT wl_user_id FROM wl_users WHERE user_id=" + jmsg.User.UID + ")";
+            query += " AND suser_id IN (SELECT wl_user_id FROM wl_users WHERE user_id=" + jmsg.getUser().getUID() + ")";
         }
         Statement stmt = null;
         ResultSet rs = null;
@@ -122,7 +127,8 @@ public class XMPPConnection implements Runnable, Stream.StreamListener, Message.
         synchronized (Main.clients) {
             for (Iterator<SocketSubscribed> i = Main.clients.iterator(); i.hasNext();) {
                 SocketSubscribed s = i.next();
-                if (s.MID == 0 && s.allReplies == false && ((jmsg.Privacy >= 0 && (s.allMessages || s.UID == jmsg.User.UID)) || uids.contains(s.VUID))) {
+                if (s.MID == 0 && s.allReplies == false && ((jmsg.Privacy >= 0
+                        && (s.allMessages || s.UID == jmsg.getUser().getUID())) || uids.contains(s.VUID))) {
                     if (!s.sendByteBuffer(bbMsg)) {
                         i.remove();
                     }
@@ -132,15 +138,15 @@ public class XMPPConnection implements Runnable, Stream.StreamListener, Message.
     }
 
     private void onJuickMessageReply(com.juick.Message jmsg) {
-        String json = com.juick.json.Message.toJSON(jmsg).toString();
+        String json = messageSerializer.serialize(jmsg).toString();
         ByteBuffer bbMsg = buildTextFrame(json);
 
-        int privacy = MessagesQueries.getMessagePrivacy(sql, jmsg.MID);
+        int privacy = MessagesQueries.getMessagePrivacy(sql, jmsg.getMID());
 
         synchronized (Main.clients) {
             for (Iterator<SocketSubscribed> i = Main.clients.iterator(); i.hasNext();) {
                 SocketSubscribed s = i.next();
-                if ((privacy >= 0 && s.allReplies) || s.MID == jmsg.MID) {
+                if ((privacy >= 0 && s.allReplies) || s.MID == jmsg.getMID()) {
                     if (!s.sendByteBuffer(bbMsg)) {
                         i.remove();
                     }
-- 
cgit v1.2.3


From 095dee1388919eac7d3a3fa6fc93767f82c16365 Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Fri, 24 Jun 2016 15:06:58 +0300
Subject: spring-jdbc

---
 deps/com.juick                                     |  2 +-
 deps/com.juick.json                                |  2 +-
 deps/com.juick.server                              |  2 +-
 deps/com.juick.xmpp                                |  2 +-
 src/main/java/com/juick/jabber/ws/Main.java        | 19 +++++-----
 .../java/com/juick/jabber/ws/WSConnections.java    | 44 ----------------------
 src/main/java/com/juick/jabber/ws/WSData.java      |  7 ++--
 src/main/java/com/juick/jabber/ws/WSKeepAlive.java |  7 ++--
 .../java/com/juick/jabber/ws/XMPPConnection.java   | 41 ++++++--------------
 9 files changed, 33 insertions(+), 93 deletions(-)
 delete mode 100644 src/main/java/com/juick/jabber/ws/WSConnections.java

(limited to 'src/main/java/com')

diff --git a/deps/com.juick b/deps/com.juick
index 1df19b47..39ec74ab 160000
--- a/deps/com.juick
+++ b/deps/com.juick
@@ -1 +1 @@
-Subproject commit 1df19b47f7f463e6cafa7dcf877cb42967fff166
+Subproject commit 39ec74abe77cdab5aa8f50c2524e6f71c2dbbd01
diff --git a/deps/com.juick.json b/deps/com.juick.json
index ee0e13e7..9dfad84f 160000
--- a/deps/com.juick.json
+++ b/deps/com.juick.json
@@ -1 +1 @@
-Subproject commit ee0e13e7243abecf242236c224551774195524a3
+Subproject commit 9dfad84fa487960fde4cc4b0ac6760c8dd5f4ac9
diff --git a/deps/com.juick.server b/deps/com.juick.server
index 96188f8d..1ce6bc55 160000
--- a/deps/com.juick.server
+++ b/deps/com.juick.server
@@ -1 +1 @@
-Subproject commit 96188f8d8a31df2474bf0eaf7a91773280ddccb6
+Subproject commit 1ce6bc55817129159b1cda5076d039e9c3bc8508
diff --git a/deps/com.juick.xmpp b/deps/com.juick.xmpp
index 1f08c012..a096ecc6 160000
--- a/deps/com.juick.xmpp
+++ b/deps/com.juick.xmpp
@@ -1 +1 @@
-Subproject commit 1f08c01254fcbca79d1571ebb1ed2d68f86b8503
+Subproject commit a096ecc6d011bf0f6c738b10d7d0a7319ffcf2dc
diff --git a/src/main/java/com/juick/jabber/ws/Main.java b/src/main/java/com/juick/jabber/ws/Main.java
index a7aea543..3a26c3ad 100644
--- a/src/main/java/com/juick/jabber/ws/Main.java
+++ b/src/main/java/com/juick/jabber/ws/Main.java
@@ -17,8 +17,10 @@
  */
 package com.juick.jabber.ws;
 
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.datasource.DriverManagerDataSource;
+
 import java.io.FileInputStream;
-import java.sql.Connection;
 import java.sql.DriverManager;
 import java.sql.SQLException;
 import java.util.ArrayList;
@@ -30,7 +32,7 @@ import java.util.Properties;
  */
 public class Main {
 
-    Connection sql;
+    JdbcTemplate sql;
     XMPPConnection xmpp;
     public static String STATSFILE = null;
     public final static ArrayList<SocketSubscribed> clients = new ArrayList<SocketSubscribed>();
@@ -46,7 +48,7 @@ public class Main {
 
             STATSFILE = conf.getProperty("statsfile");
 
-            setupSql(conf.getProperty("mysql_username", ""), conf.getProperty("mysql_password", ""));
+            setupSql(conf.getProperty("datasource_driver", "com.mysql.jdbc.Driver"), conf.getProperty("datasource_url"));
             xmpp = new XMPPConnection(sql, conf.getProperty("xmpp_password", ""));
             new Thread(xmpp).start();
 
@@ -58,11 +60,10 @@ public class Main {
         }
     }
 
-    public void setupSql(String username, String password) {
-        try {
-            sql = DriverManager.getConnection("jdbc:mysql://localhost/juick?autoReconnect=true&user=" + username + "&password=" + password);
-        } catch (SQLException e) {
-            System.err.println(e);
-        }
+    public void setupSql(String driver, String url) {
+        DriverManagerDataSource dataSource = new DriverManagerDataSource();
+        dataSource.setDriverClassName(driver);
+        dataSource.setUrl(url);
+        sql = new JdbcTemplate(dataSource);
     }
 }
\ No newline at end of file
diff --git a/src/main/java/com/juick/jabber/ws/WSConnections.java b/src/main/java/com/juick/jabber/ws/WSConnections.java
deleted file mode 100644
index 15fbe4e8..00000000
--- a/src/main/java/com/juick/jabber/ws/WSConnections.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package com.juick.jabber.ws;
-
-import java.net.InetSocketAddress;
-import java.nio.channels.SelectionKey;
-import java.nio.channels.Selector;
-import java.nio.channels.ServerSocketChannel;
-import java.nio.channels.SocketChannel;
-import java.util.Iterator;
-
-/**
- *
- * @author ugnich
- */
-public class WSConnections implements Runnable {
-
-    Selector sel;
-
-    @Override
-    public void run() {
-        try {
-            sel = Selector.open();
-            ServerSocketChannel listensock = ServerSocketChannel.open();
-            listensock.configureBlocking(false);
-            listensock.socket().bind(new InetSocketAddress(8081));
-            listensock.register(sel, SelectionKey.OP_ACCEPT);
-
-            while (true) {
-                sel.select();
-                Iterator<SelectionKey> it = sel.selectedKeys().iterator();
-                while (it.hasNext()) {
-                    SelectionKey selKey = it.next();
-                    it.remove();
-                    ServerSocketChannel ssChannel = (ServerSocketChannel) selKey.channel();
-                    SocketChannel sChannel = ssChannel.accept();
-                    sChannel.configureBlocking(false);
-                    sChannel.register(sel, SelectionKey.OP_READ);
-                    System.out.println(sChannel.socket().getRemoteSocketAddress().toString() + " ACCEPTED");
-                }
-            }
-        } catch (Exception e) {
-            System.err.println("WSConnections: " + e);
-        }
-    }
-}
diff --git a/src/main/java/com/juick/jabber/ws/WSData.java b/src/main/java/com/juick/jabber/ws/WSData.java
index d77257e6..3abc63d8 100644
--- a/src/main/java/com/juick/jabber/ws/WSData.java
+++ b/src/main/java/com/juick/jabber/ws/WSData.java
@@ -3,6 +3,8 @@ package com.juick.jabber.ws;
 import com.juick.server.MessagesQueries;
 import com.juick.server.UserQueries;
 import com.juick.xmpp.utils.Base64;
+import org.springframework.jdbc.core.JdbcTemplate;
+
 import java.io.IOException;
 import java.net.InetSocketAddress;
 import java.nio.ByteBuffer;
@@ -14,7 +16,6 @@ import java.nio.channels.SocketChannel;
 import java.nio.charset.Charset;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
-import java.sql.Connection;
 import java.util.Iterator;
 
 /**
@@ -24,10 +25,10 @@ import java.util.Iterator;
 public class WSData implements Runnable {
     
     static final String WEBSOCKET_GUID = "258EAFA5-E914-47DA-95CA-C5AB0DC85B11";
-    Connection sql;
+    JdbcTemplate sql;
     public Selector sel;
     
-    public WSData(Connection sql) {
+    public WSData(JdbcTemplate sql) {
         this.sql = sql;
     }
     
diff --git a/src/main/java/com/juick/jabber/ws/WSKeepAlive.java b/src/main/java/com/juick/jabber/ws/WSKeepAlive.java
index 2deef594..f253439d 100644
--- a/src/main/java/com/juick/jabber/ws/WSKeepAlive.java
+++ b/src/main/java/com/juick/jabber/ws/WSKeepAlive.java
@@ -1,8 +1,9 @@
 package com.juick.jabber.ws;
 
+import org.springframework.jdbc.core.JdbcTemplate;
+
 import java.io.PrintWriter;
 import java.nio.ByteBuffer;
-import java.sql.Connection;
 import java.util.Iterator;
 
 /**
@@ -11,11 +12,11 @@ import java.util.Iterator;
  */
 public class WSKeepAlive implements Runnable {
 
-    Connection sql;
+    JdbcTemplate sql;
     ByteBuffer pingBytes;
     ByteBuffer closeBytes;
 
-    public WSKeepAlive(Connection sql) {
+    public WSKeepAlive(JdbcTemplate sql) {
         this.sql = sql;
 
         //pingBytes = ByteBuffer.allocate(2);
diff --git a/src/main/java/com/juick/jabber/ws/XMPPConnection.java b/src/main/java/com/juick/jabber/ws/XMPPConnection.java
index df403083..1679ae8f 100644
--- a/src/main/java/com/juick/jabber/ws/XMPPConnection.java
+++ b/src/main/java/com/juick/jabber/ws/XMPPConnection.java
@@ -1,23 +1,23 @@
 package com.juick.jabber.ws;
 
+import com.juick.User;
 import com.juick.json.MessageSerializer;
 import com.juick.server.MessagesQueries;
-import com.juick.server.Utils;
+import com.juick.server.SubscriptionsQueries;
 import com.juick.xmpp.JID;
 import com.juick.xmpp.Message;
 import com.juick.xmpp.Stream;
 import com.juick.xmpp.StreamComponent;
 import com.juick.xmpp.extensions.JuickMessage;
+import org.springframework.jdbc.core.JdbcTemplate;
+
 import java.io.IOException;
 import java.net.Socket;
 import java.nio.ByteBuffer;
 import java.nio.charset.Charset;
-import java.sql.Connection;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
-import java.util.ArrayList;
 import java.util.Iterator;
+import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  *
@@ -25,11 +25,11 @@ import java.util.Iterator;
  */
 public class XMPPConnection implements Runnable, Stream.StreamListener, Message.MessageListener {
 
-    Connection sql;
+    JdbcTemplate sql;
     Stream xmpp;
     String xmppPassword;
 
-    public XMPPConnection(Connection sql, String password) {
+    public XMPPConnection(JdbcTemplate sql, String password) {
         this.sql = sql;
         xmppPassword = password;
     }
@@ -54,7 +54,7 @@ public class XMPPConnection implements Runnable, Stream.StreamListener, Message.
     }
 
     @Override
-    public void onStreamFail(Exception msg) {
+    public void onStreamFail(String msg) {
         System.err.println("Stream failed: " + msg);
     }
 
@@ -102,27 +102,8 @@ public class XMPPConnection implements Runnable, Stream.StreamListener, Message.
         String json = messageSerializer.serialize(jmsg).toString();
         ByteBuffer bbMsg = buildTextFrame(json);
 
-        ArrayList<Integer> uids = new ArrayList<Integer>();
-        String query = "SELECT suser_id FROM subscr_users WHERE user_id=" + jmsg.getUser().getUID() +
-                " AND suser_id NOT IN (SELECT user_id FROM bl_tags " +
-                "INNER JOIN messages_tags USING(tag_id) WHERE message_id=" + jmsg.getMID() + ")";
-        if (jmsg.Privacy < 0) {
-            query += " AND suser_id IN (SELECT wl_user_id FROM wl_users WHERE user_id=" + jmsg.getUser().getUID() + ")";
-        }
-        Statement stmt = null;
-        ResultSet rs = null;
-        try {
-            stmt = sql.createStatement();
-            rs = stmt.executeQuery(query);
-            rs.beforeFirst();
-            while (rs.next()) {
-                uids.add(rs.getInt(1));
-            }
-        } catch (SQLException e) {
-            System.err.println("onJuickMessagePost: " + e);
-        } finally {
-            Utils.finishSQL(rs, stmt);
-        }
+        List<Integer> uids = SubscriptionsQueries.getSubscribedUsers(sql, jmsg.getUser().getUID(), jmsg.getMID())
+                .stream().map(User::getUID).collect(Collectors.toList());
 
         synchronized (Main.clients) {
             for (Iterator<SocketSubscribed> i = Main.clients.iterator(); i.hasNext();) {
-- 
cgit v1.2.3


From 2f5b0da83de728d7ba1b35b3528055462002de8a Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Fri, 24 Jun 2016 15:18:24 +0300
Subject: logging

---
 src/main/java/com/juick/jabber/ws/Main.java          | 10 +++++++---
 src/main/java/com/juick/jabber/ws/WSData.java        | 20 ++++++++++----------
 src/main/java/com/juick/jabber/ws/WSKeepAlive.java   |  9 ++++++---
 .../java/com/juick/jabber/ws/XMPPConnection.java     | 13 +++++++++----
 4 files changed, 32 insertions(+), 20 deletions(-)

(limited to 'src/main/java/com')

diff --git a/src/main/java/com/juick/jabber/ws/Main.java b/src/main/java/com/juick/jabber/ws/Main.java
index 3a26c3ad..6f5ed96a 100644
--- a/src/main/java/com/juick/jabber/ws/Main.java
+++ b/src/main/java/com/juick/jabber/ws/Main.java
@@ -21,10 +21,11 @@ import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.datasource.DriverManagerDataSource;
 
 import java.io.FileInputStream;
-import java.sql.DriverManager;
-import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.Properties;
+import java.util.logging.Level;
+import java.util.logging.LogManager;
+import java.util.logging.Logger;
 
 /**
  *
@@ -32,6 +33,8 @@ import java.util.Properties;
  */
 public class Main {
 
+    private static final Logger logger = Logger.getLogger("Websockets");
+
     JdbcTemplate sql;
     XMPPConnection xmpp;
     public static String STATSFILE = null;
@@ -43,6 +46,7 @@ public class Main {
 
     public void start() {
         try {
+            LogManager.getLogManager().readConfiguration(new FileInputStream("/etc/juick/ws_logging.properties"));
             Properties conf = new Properties();
             conf.load(new FileInputStream("/etc/juick/ws.conf"));
 
@@ -56,7 +60,7 @@ public class Main {
             new Thread(new WSData(sql)).start();
             new Thread(new WSKeepAlive(sql)).start();
         } catch (Exception e) {
-            System.err.println(e);
+            logger.log(Level.SEVERE, "websockets initialization error", e);
         }
     }
 
diff --git a/src/main/java/com/juick/jabber/ws/WSData.java b/src/main/java/com/juick/jabber/ws/WSData.java
index 3abc63d8..9ae98bcf 100644
--- a/src/main/java/com/juick/jabber/ws/WSData.java
+++ b/src/main/java/com/juick/jabber/ws/WSData.java
@@ -17,13 +17,16 @@ import java.nio.charset.Charset;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.util.Iterator;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 /**
  *
  * @author ugnich
  */
 public class WSData implements Runnable {
-    
+
+    private static final Logger logger = Logger.getLogger("Websockets");
     static final String WEBSOCKET_GUID = "258EAFA5-E914-47DA-95CA-C5AB0DC85B11";
     JdbcTemplate sql;
     public Selector sel;
@@ -53,7 +56,7 @@ public class WSData implements Runnable {
                         SocketChannel sChannel = ssChannel.accept();
                         sChannel.configureBlocking(false);
                         sChannel.register(sel, SelectionKey.OP_READ);
-                        System.out.println(sChannel.socket().getRemoteSocketAddress().toString() + " ACCEPTED");
+                        logger.info(sChannel.socket().getRemoteSocketAddress().toString() + " ACCEPTED");
                     } else if (selKey.isReadable()) {
                         SocketChannel sChannel = (SocketChannel) selKey.channel();
                         ByteBuffer buf = ByteBuffer.allocate(10240);
@@ -63,7 +66,6 @@ public class WSData implements Runnable {
                                 buf.flip();
                                 
                                 CharBuffer charbuf = Charset.forName("ISO-8859-1").decode(buf);
-                                System.out.println("DATA: " + charbuf.toString());
                                 buf.rewind();
                                 
                                 switch (buf.get(0)) {
@@ -89,7 +91,7 @@ public class WSData implements Runnable {
                                 throw new IOException(sChannel.socket().getRemoteSocketAddress().toString() + " END OF STREAM");
                             }
                         } catch (IOException e) {
-                            System.err.println("WSData: " + e);
+                            logger.log(Level.SEVERE, "websocket exception", e);
                             sChannel.socket().close();
                             sChannel.close();
                             selKey.cancel();
@@ -98,7 +100,7 @@ public class WSData implements Runnable {
                 }
             }
         } catch (Exception e) {
-            System.err.println("WSData: " + e);
+            logger.log(Level.SEVERE, "websocket exception", e);
         }
     }
     
@@ -224,7 +226,7 @@ public class WSData implements Runnable {
         sock.write(out);
         
         if (responseCode == 101) {
-            System.out.println(sock.socket().getRemoteSocketAddress().toString() + " HANDSHAKE (VUID = " + VUID + "; MID = " + MID + ")");
+            logger.info(sock.socket().getRemoteSocketAddress().toString() + " HANDSHAKE (VUID = " + VUID + "; MID = " + MID + ")");
         } else {
             throw new IOException(sock.socket().getRemoteSocketAddress().toString() + " " + responseCode);
         }
@@ -236,7 +238,7 @@ public class WSData implements Runnable {
             MessageDigest md = MessageDigest.getInstance("SHA-1");
             return Base64.encode(md.digest(base.getBytes()));
         } catch (NoSuchAlgorithmException e) {
-            System.err.println("calcHeaderAccept: " + e);
+            logger.severe("calcHeaderAccept: " + e);
         }
         return "";
     }
@@ -264,9 +266,7 @@ public class WSData implements Runnable {
     
     public void updateSocketTS(SocketChannel sock) {
         synchronized (Main.clients) {
-            Iterator<SocketSubscribed> i = Main.clients.iterator();
-            while (i.hasNext()) {
-                SocketSubscribed s = i.next();
+            for (SocketSubscribed s : Main.clients) {
                 if (s.sock == sock) {
                     s.tsLastData = System.currentTimeMillis();
                     break;
diff --git a/src/main/java/com/juick/jabber/ws/WSKeepAlive.java b/src/main/java/com/juick/jabber/ws/WSKeepAlive.java
index f253439d..6244013d 100644
--- a/src/main/java/com/juick/jabber/ws/WSKeepAlive.java
+++ b/src/main/java/com/juick/jabber/ws/WSKeepAlive.java
@@ -5,12 +5,15 @@ import org.springframework.jdbc.core.JdbcTemplate;
 import java.io.PrintWriter;
 import java.nio.ByteBuffer;
 import java.util.Iterator;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 /**
  *
  * @author ugnich
  */
 public class WSKeepAlive implements Runnable {
+    private static final Logger logger = Logger.getLogger(WSKeepAlive.class.getName());
 
     JdbcTemplate sql;
     ByteBuffer pingBytes;
@@ -44,7 +47,7 @@ public class WSKeepAlive implements Runnable {
                     statsFile = new PrintWriter(Main.STATSFILE, "UTF-8");
                 } catch (Exception e) {
                     statsFile = null;
-                    System.err.println("WSKeepAlive statsFile: " + e);
+                    logger.severe("WSKeepAlive statsFile: " + e);
                 }
             }
 
@@ -69,7 +72,7 @@ public class WSKeepAlive implements Runnable {
                             statsFile.print("<td>" + (s.allMessages ? "+" : "") + "</td>");
                             statsFile.print("<td>" + (s.allReplies ? "+" : "") + "</td></tr>");
                         } catch (Exception e) {
-                            System.err.println("WSKeepAlive statsFile print: " + e);
+                            logger.log(Level.SEVERE, "WSKeepAlive statsFile print", e);
                         }
                     }
 
@@ -90,7 +93,7 @@ public class WSKeepAlive implements Runnable {
                     statsFile.write("</table></body></html>");
                     statsFile.close();
                 } catch (Exception e) {
-                    System.err.println("WSKeepAlive statsFile close: " + e);
+                    logger.log(Level.SEVERE, "WSKeepAlive statsFile close", e);
                 }
             }
 
diff --git a/src/main/java/com/juick/jabber/ws/XMPPConnection.java b/src/main/java/com/juick/jabber/ws/XMPPConnection.java
index 1679ae8f..8c187a36 100644
--- a/src/main/java/com/juick/jabber/ws/XMPPConnection.java
+++ b/src/main/java/com/juick/jabber/ws/XMPPConnection.java
@@ -17,6 +17,8 @@ import java.nio.ByteBuffer;
 import java.nio.charset.Charset;
 import java.util.Iterator;
 import java.util.List;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 import java.util.stream.Collectors;
 
 /**
@@ -24,14 +26,17 @@ import java.util.stream.Collectors;
  * @author ugnich
  */
 public class XMPPConnection implements Runnable, Stream.StreamListener, Message.MessageListener {
+    private static final Logger logger = Logger.getLogger(XMPPConnection.class.getName());
 
     JdbcTemplate sql;
     Stream xmpp;
     String xmppPassword;
+    MessageSerializer ms;
 
     public XMPPConnection(JdbcTemplate sql, String password) {
         this.sql = sql;
         xmppPassword = password;
+        ms = new MessageSerializer();
     }
 
     @Override
@@ -44,25 +49,25 @@ public class XMPPConnection implements Runnable, Stream.StreamListener, Message.
             xmpp.addListener((Message.MessageListener) this);
             xmpp.startParsing();
         } catch (IOException e) {
-            System.err.println("XMPPConnection: " + e);
+            logger.log(Level.SEVERE, "XMPPConnection error", e);
         }
     }
 
     @Override
     public void onStreamReady() {
-        System.err.println("Stream ready");
+       logger.info("XMPP stream ready");
     }
 
     @Override
     public void onStreamFail(String msg) {
-        System.err.println("Stream failed: " + msg);
+        logger.severe("XMPP stream failed: " + msg);
     }
 
     @Override
     public void onMessage(com.juick.xmpp.Message msg) {
         JuickMessage jmsg = (JuickMessage) msg.getChild(JuickMessage.XMLNS);
         if (jmsg != null) {
-            System.err.println("MID=" + jmsg.getMID() + "; RID=" + jmsg.getRID());
+            logger.info("got jmsg: " + ms.serialize(jmsg).toString());
             if (jmsg.getMID() == 0) {
                 int uid_to = 0;
                 try {
-- 
cgit v1.2.3


From f1b9807af10d45fee99042af88e21e1b4dc161a2 Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Fri, 24 Jun 2016 16:14:16 +0300
Subject: update deps

---
 deps/com.juick.server                       | 2 +-
 src/main/java/com/juick/jabber/ws/Main.java | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

(limited to 'src/main/java/com')

diff --git a/deps/com.juick.server b/deps/com.juick.server
index 1ce6bc55..c1fcf803 160000
--- a/deps/com.juick.server
+++ b/deps/com.juick.server
@@ -1 +1 @@
-Subproject commit 1ce6bc55817129159b1cda5076d039e9c3bc8508
+Subproject commit c1fcf803adfe06a0a54b3e51c4fd2d67e6b732d8
diff --git a/src/main/java/com/juick/jabber/ws/Main.java b/src/main/java/com/juick/jabber/ws/Main.java
index 6f5ed96a..6a397fff 100644
--- a/src/main/java/com/juick/jabber/ws/Main.java
+++ b/src/main/java/com/juick/jabber/ws/Main.java
@@ -21,8 +21,7 @@ import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.datasource.DriverManagerDataSource;
 
 import java.io.FileInputStream;
-import java.util.ArrayList;
-import java.util.Properties;
+import java.util.*;
 import java.util.logging.Level;
 import java.util.logging.LogManager;
 import java.util.logging.Logger;
@@ -38,7 +37,7 @@ public class Main {
     JdbcTemplate sql;
     XMPPConnection xmpp;
     public static String STATSFILE = null;
-    public final static ArrayList<SocketSubscribed> clients = new ArrayList<SocketSubscribed>();
+    public final static List<SocketSubscribed> clients = Collections.synchronizedList(new ArrayList<SocketSubscribed>());
 
     public static void main(String[] args) {
         new Main().start();
-- 
cgit v1.2.3


From 331645f0fd7fbe7d9679d39dcce453cc3b2cab6e Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Tue, 28 Jun 2016 10:36:28 +0300
Subject: spring-websocket

---
 build.gradle                                       |  12 +-
 deps/com.juick.server                              |   2 +-
 src/main/java/com/juick/jabber/ws/Main.java        |  72 ------
 .../java/com/juick/jabber/ws/SocketSubscribed.java |  51 ----
 src/main/java/com/juick/jabber/ws/WSData.java      | 277 ---------------------
 src/main/java/com/juick/jabber/ws/WSKeepAlive.java | 106 --------
 .../java/com/juick/jabber/ws/XMPPConnection.java   | 158 ------------
 src/main/java/com/juick/ws/WebsocketComponent.java | 134 ++++++++++
 src/main/java/com/juick/ws/XMPPConnection.java     | 142 +++++++++++
 .../ws/configuration/WebsocketConfiguration.java   |  49 ++++
 10 files changed, 333 insertions(+), 670 deletions(-)
 delete mode 100644 src/main/java/com/juick/jabber/ws/Main.java
 delete mode 100644 src/main/java/com/juick/jabber/ws/SocketSubscribed.java
 delete mode 100644 src/main/java/com/juick/jabber/ws/WSData.java
 delete mode 100644 src/main/java/com/juick/jabber/ws/WSKeepAlive.java
 delete mode 100644 src/main/java/com/juick/jabber/ws/XMPPConnection.java
 create mode 100644 src/main/java/com/juick/ws/WebsocketComponent.java
 create mode 100644 src/main/java/com/juick/ws/XMPPConnection.java
 create mode 100644 src/main/java/com/juick/ws/configuration/WebsocketConfiguration.java

(limited to 'src/main/java/com')

diff --git a/build.gradle b/build.gradle
index 0eb80dd4..92b44bec 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,9 +6,7 @@ subprojects {
 }
 
 apply plugin: 'java'
-apply plugin: 'application'
-
-mainClassName = "com.juick.jabber.ws.Main"
+apply plugin: 'war'
 
 repositories {
     mavenCentral()
@@ -41,9 +39,13 @@ dependencies {
     compile server
     compile xmpp
     compile json
-    compile "org.springframework:spring-jdbc:4.3.0.RELEASE"
+    def springFrameworkVersion = '4.3.0.RELEASE'
+    compile "org.springframework:spring-jdbc:${springFrameworkVersion}"
+    compile "org.springframework:spring-websocket:${springFrameworkVersion}"
+    compile 'javax.inject:javax.inject:1'
+    compile 'org.apache.httpcomponents:httpclient:4.5.1'
     testCompile 'junit:junit:4.12'
-    runtime 'mysql:mysql-connector-java:5.1.37'
+    runtime 'mysql:mysql-connector-java:5.1.39'
 }
 
 compileJava.options.encoding = 'UTF-8'
diff --git a/deps/com.juick.server b/deps/com.juick.server
index bbc05316..87da42e3 160000
--- a/deps/com.juick.server
+++ b/deps/com.juick.server
@@ -1 +1 @@
-Subproject commit bbc05316ebbbd8da30ac12135791e110cacbebd5
+Subproject commit 87da42e3385e368f05d88ff125a78605a18f9cc3
diff --git a/src/main/java/com/juick/jabber/ws/Main.java b/src/main/java/com/juick/jabber/ws/Main.java
deleted file mode 100644
index 6a397fff..00000000
--- a/src/main/java/com/juick/jabber/ws/Main.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Juick
- * Copyright (C) 2008-2011, Ugnich Anton
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.juick.jabber.ws;
-
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.jdbc.datasource.DriverManagerDataSource;
-
-import java.io.FileInputStream;
-import java.util.*;
-import java.util.logging.Level;
-import java.util.logging.LogManager;
-import java.util.logging.Logger;
-
-/**
- *
- * @author Ugnich Anton
- */
-public class Main {
-
-    private static final Logger logger = Logger.getLogger("Websockets");
-
-    JdbcTemplate sql;
-    XMPPConnection xmpp;
-    public static String STATSFILE = null;
-    public final static List<SocketSubscribed> clients = Collections.synchronizedList(new ArrayList<SocketSubscribed>());
-
-    public static void main(String[] args) {
-        new Main().start();
-    }
-
-    public void start() {
-        try {
-            LogManager.getLogManager().readConfiguration(new FileInputStream("/etc/juick/ws_logging.properties"));
-            Properties conf = new Properties();
-            conf.load(new FileInputStream("/etc/juick/ws.conf"));
-
-            STATSFILE = conf.getProperty("statsfile");
-
-            setupSql(conf.getProperty("datasource_driver", "com.mysql.jdbc.Driver"), conf.getProperty("datasource_url"));
-            xmpp = new XMPPConnection(sql, conf.getProperty("xmpp_password", ""));
-            new Thread(xmpp).start();
-
-            //new Thread(new WSConnections()).start();
-            new Thread(new WSData(sql)).start();
-            new Thread(new WSKeepAlive(sql)).start();
-        } catch (Exception e) {
-            logger.log(Level.SEVERE, "websockets initialization error", e);
-        }
-    }
-
-    public void setupSql(String driver, String url) {
-        DriverManagerDataSource dataSource = new DriverManagerDataSource();
-        dataSource.setDriverClassName(driver);
-        dataSource.setUrl(url);
-        sql = new JdbcTemplate(dataSource);
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/com/juick/jabber/ws/SocketSubscribed.java b/src/main/java/com/juick/jabber/ws/SocketSubscribed.java
deleted file mode 100644
index 6144380c..00000000
--- a/src/main/java/com/juick/jabber/ws/SocketSubscribed.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package com.juick.jabber.ws;
-
-import java.nio.ByteBuffer;
-import java.nio.channels.SocketChannel;
-
-/**
- *
- * @author ugnich
- */
-public class SocketSubscribed {
-
-    public SocketChannel sock = null;
-    public String clientName = null;
-    public int VUID = 0;
-    public int UID = 0;
-    public int MID = 0;
-    public boolean allMessages = false;
-    public boolean allReplies = false;
-    public long tsConnected;
-    public long tsLastData;
-
-    public SocketSubscribed(SocketChannel sock, String clientName, int VUID) {
-        this.sock = sock;
-        this.clientName = clientName;
-        this.VUID = VUID;
-        tsConnected = tsLastData = System.currentTimeMillis();
-    }
-
-    public boolean sendByteBuffer(ByteBuffer bb) {
-        boolean ret = false;
-        bb.rewind();
-        try {
-            sock.write(bb);
-            ret = true;
-        } catch (Exception e) {
-            close();
-        }
-        return ret;
-    }
-
-    public void close() {
-        try {
-            sock.socket().close();
-        } catch (Exception e) {
-        }
-        try {
-            sock.close();
-        } catch (Exception e) {
-        }
-    }
-}
diff --git a/src/main/java/com/juick/jabber/ws/WSData.java b/src/main/java/com/juick/jabber/ws/WSData.java
deleted file mode 100644
index 9ae98bcf..00000000
--- a/src/main/java/com/juick/jabber/ws/WSData.java
+++ /dev/null
@@ -1,277 +0,0 @@
-package com.juick.jabber.ws;
-
-import com.juick.server.MessagesQueries;
-import com.juick.server.UserQueries;
-import com.juick.xmpp.utils.Base64;
-import org.springframework.jdbc.core.JdbcTemplate;
-
-import java.io.IOException;
-import java.net.InetSocketAddress;
-import java.nio.ByteBuffer;
-import java.nio.CharBuffer;
-import java.nio.channels.SelectionKey;
-import java.nio.channels.Selector;
-import java.nio.channels.ServerSocketChannel;
-import java.nio.channels.SocketChannel;
-import java.nio.charset.Charset;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
-import java.util.Iterator;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-/**
- *
- * @author ugnich
- */
-public class WSData implements Runnable {
-
-    private static final Logger logger = Logger.getLogger("Websockets");
-    static final String WEBSOCKET_GUID = "258EAFA5-E914-47DA-95CA-C5AB0DC85B11";
-    JdbcTemplate sql;
-    public Selector sel;
-    
-    public WSData(JdbcTemplate sql) {
-        this.sql = sql;
-    }
-    
-    @Override
-    public void run() {
-        try {
-            sel = Selector.open();
-            ServerSocketChannel listensock = ServerSocketChannel.open();
-            listensock.configureBlocking(false);
-            listensock.socket().bind(new InetSocketAddress(8081));
-            listensock.register(sel, SelectionKey.OP_ACCEPT);
-            
-            while (true) {
-                sel.select();
-                Iterator<SelectionKey> it = sel.selectedKeys().iterator();
-                while (it.hasNext()) {
-                    SelectionKey selKey = it.next();
-                    it.remove();
-                    
-                    if (selKey.isAcceptable()) {
-                        ServerSocketChannel ssChannel = (ServerSocketChannel) selKey.channel();
-                        SocketChannel sChannel = ssChannel.accept();
-                        sChannel.configureBlocking(false);
-                        sChannel.register(sel, SelectionKey.OP_READ);
-                        logger.info(sChannel.socket().getRemoteSocketAddress().toString() + " ACCEPTED");
-                    } else if (selKey.isReadable()) {
-                        SocketChannel sChannel = (SocketChannel) selKey.channel();
-                        ByteBuffer buf = ByteBuffer.allocate(10240);
-                        try {
-                            int readbytes = sChannel.read(buf);
-                            if (readbytes > 0) {
-                                buf.flip();
-                                
-                                CharBuffer charbuf = Charset.forName("ISO-8859-1").decode(buf);
-                                buf.rewind();
-                                
-                                switch (buf.get(0)) {
-                                    case (byte) 0x89: // PING
-                                        updateSocketTS(sChannel);
-                                        wsPing(sChannel);
-                                        break;
-                                    case (byte) 0x8A: // PONG
-                                        updateSocketTS(sChannel);
-                                        break;
-                                    case (byte) 0x81: // TEXT FRAME
-                                        updateSocketTS(sChannel);
-                                        wsTextFrame(sChannel, buf);
-                                        break;
-                                    case (byte) 'G': // HTTP
-                                        updateSocketTS(sChannel);
-                                        wsHandshake(sChannel, buf);
-                                        break;
-                                    case (byte) 0x88: // CONNECTION CLOSE
-                                        throw new IOException(sChannel.socket().getRemoteSocketAddress().toString() + " CONNECTION CLOSE");
-                                }
-                            } else if (readbytes < 0) {
-                                throw new IOException(sChannel.socket().getRemoteSocketAddress().toString() + " END OF STREAM");
-                            }
-                        } catch (IOException e) {
-                            logger.log(Level.SEVERE, "websocket exception", e);
-                            sChannel.socket().close();
-                            sChannel.close();
-                            selKey.cancel();
-                        }
-                    }
-                }
-            }
-        } catch (Exception e) {
-            logger.log(Level.SEVERE, "websocket exception", e);
-        }
-    }
-    
-    public void wsHandshake(SocketChannel sock, ByteBuffer buf) throws Exception {
-        String hOrigin = null;
-        String hHost = null;
-        String hLocation = null;
-        String hSecWebSocketKey = null;
-        String hSecWebSocketVersion = null;
-        String hXRealIP = null;
-        
-        buf.rewind();
-        CharBuffer charbuf = Charset.forName("ISO-8859-1").decode(buf);
-        String headers[] = charbuf.toString().split("\r\n");
-        for (int i = 0; i < headers.length; i++) {
-            String h[] = headers[i].split(" ", 2);
-            if (h.length == 2) {
-                if (h[0].equals("GET")) {
-                    hLocation = headers[i].split(" ", 3)[1];
-                } else if (h[0].equals("Origin:")) {
-                    hOrigin = h[1];
-                } else if (h[0].equals("Host:")) {
-                    hHost = h[1];
-                } else if (h[0].equals("Sec-WebSocket-Key:")) {
-                    hSecWebSocketKey = h[1];
-                } else if (h[0].equals("Sec-WebSocket-Version:")) {
-                    hSecWebSocketVersion = h[1];
-                } else if (h[0].equals("X-Real-IP:")) {
-                    hXRealIP = h[1];
-                }
-            }
-        }
-        
-        if (hOrigin == null || hHost == null || hLocation == null || hSecWebSocketKey == null || hSecWebSocketVersion == null || !hSecWebSocketVersion.equals("13")) {
-            throw new IOException(sock.socket().getRemoteSocketAddress().toString() + " Invalid headers");
-        }
-
-        // Auth
-        int VUID = 0;
-        int hashloc = hLocation.indexOf("hash=");
-        if (hashloc > 0) {
-            String hash = hLocation.substring(hashloc + 5);
-            if (hash.indexOf('&') > 0) {
-                hash = hash.substring(0, hash.indexOf('&'));
-            }
-            if (hash.length() == 16) {
-                VUID = com.juick.server.UserQueries.getUIDbyHash(sql, hash);
-            }
-        }
-
-        // URL
-        int hLocationQM = hLocation.indexOf('?');
-        if (hLocationQM > 0) {
-            hLocation = hLocation.substring(0, hLocationQM);
-        }
-        
-        int MID = 0;
-        int responseCode = 404;
-        SocketSubscribed sockSubscr = null;
-        if (hLocation.equals("/") && VUID > 0) {
-            sockSubscr = new SocketSubscribed(sock, hXRealIP, VUID);
-            responseCode = 101;
-        } else if (hLocation.equals("/_all")) {
-            sockSubscr = new SocketSubscribed(sock, hXRealIP, VUID);
-            sockSubscr.allMessages = true;
-            responseCode = 101;
-        } else if (hLocation.equals("/_replies")) {
-            sockSubscr = new SocketSubscribed(sock, hXRealIP, VUID);
-            sockSubscr.allReplies = true;
-            responseCode = 101;
-        } else if (hLocation.matches("^/\\d+$")) {
-            try {
-                MID = Integer.parseInt(hLocation.substring(1));
-            } catch (Exception e) {
-            }
-            if (MID > 0) {
-                if (MessagesQueries.canViewThread(sql, MID, VUID)) {
-                    sockSubscr = new SocketSubscribed(sock, hXRealIP, VUID);
-                    sockSubscr.MID = MID;
-                    responseCode = 101;
-                } else {
-                    responseCode = 403;
-                }
-            }
-        } else if (hLocation.matches("^/[a-zA-Z0-9\\-]{2,16}/?$")) {
-            String uname;
-            if (hLocation.endsWith("/")) {
-                uname = hLocation.substring(1, hLocation.length() - 2);
-            } else {
-                uname = hLocation.substring(1);
-            }
-            
-            int UID = UserQueries.getUIDbyName(sql, uname);
-            if (UID > 0) {
-                // check access
-                sockSubscr = new SocketSubscribed(sock, hXRealIP, VUID);
-                sockSubscr.UID = UID;
-                responseCode = 101;
-            }
-        }
-        if (sockSubscr != null) {
-            synchronized (Main.clients) {
-                Main.clients.add(sockSubscr);
-            }
-        }
-
-        // Response
-        String outstr;
-        if (responseCode == 101) {
-            outstr = "HTTP/1.1 101 Switching Protocols\r\n"
-                    + "Upgrade: websocket\r\n"
-                    + "Connection: Upgrade\r\n"
-                    + "Sec-WebSocket-Accept: " + calcHeaderAccept(hSecWebSocketKey) + "\r\n"
-                    + "\r\n";
-        } else if (responseCode == 403) {
-            outstr = "HTTP/1.1 403 Forbidden\r\n\r\n";
-        } else {
-            outstr = "HTTP/1.1 404 Not Found\r\n\r\n";
-        }
-        ByteBuffer out = ByteBuffer.allocate(1024);
-        out.put(Charset.forName("ISO-8859-1").encode(outstr));
-        out.flip();
-        sock.write(out);
-        
-        if (responseCode == 101) {
-            logger.info(sock.socket().getRemoteSocketAddress().toString() + " HANDSHAKE (VUID = " + VUID + "; MID = " + MID + ")");
-        } else {
-            throw new IOException(sock.socket().getRemoteSocketAddress().toString() + " " + responseCode);
-        }
-    }
-    
-    private String calcHeaderAccept(String key) {
-        String base = key + WEBSOCKET_GUID;
-        try {
-            MessageDigest md = MessageDigest.getInstance("SHA-1");
-            return Base64.encode(md.digest(base.getBytes()));
-        } catch (NoSuchAlgorithmException e) {
-            logger.severe("calcHeaderAccept: " + e);
-        }
-        return "";
-    }
-    
-    public void wsPing(SocketChannel sock) throws Exception {
-        ByteBuffer out = ByteBuffer.allocate(2);
-        out.put((byte) 0x8A); // PONG FRAME
-        out.put((byte) 0x00); // 1 byte long
-        out.flip();
-        out.rewind();
-        sock.write(out);
-    }
-    
-    public void wsTextFrame(SocketChannel sock, ByteBuffer buf) throws Exception {
-        /*
-        ByteBuffer out = ByteBuffer.allocate(3);
-        out.put((byte) 0x81); // TEXT FRAME
-        out.put((byte) 0x01); // 1 byte long
-        out.put((byte) 0x20); // ' '
-        out.flip();
-        out.rewind();
-        sock.write(out);
-         */
-    }
-    
-    public void updateSocketTS(SocketChannel sock) {
-        synchronized (Main.clients) {
-            for (SocketSubscribed s : Main.clients) {
-                if (s.sock == sock) {
-                    s.tsLastData = System.currentTimeMillis();
-                    break;
-                }
-            }
-        }
-    }
-}
diff --git a/src/main/java/com/juick/jabber/ws/WSKeepAlive.java b/src/main/java/com/juick/jabber/ws/WSKeepAlive.java
deleted file mode 100644
index 6244013d..00000000
--- a/src/main/java/com/juick/jabber/ws/WSKeepAlive.java
+++ /dev/null
@@ -1,106 +0,0 @@
-package com.juick.jabber.ws;
-
-import org.springframework.jdbc.core.JdbcTemplate;
-
-import java.io.PrintWriter;
-import java.nio.ByteBuffer;
-import java.util.Iterator;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-/**
- *
- * @author ugnich
- */
-public class WSKeepAlive implements Runnable {
-    private static final Logger logger = Logger.getLogger(WSKeepAlive.class.getName());
-
-    JdbcTemplate sql;
-    ByteBuffer pingBytes;
-    ByteBuffer closeBytes;
-
-    public WSKeepAlive(JdbcTemplate sql) {
-        this.sql = sql;
-
-        //pingBytes = ByteBuffer.allocate(2);
-        //pingBytes.put((byte) 0x8A); // PONG FRAME
-        //pingBytes.put((byte) 0x00); // 0 byte long
-        pingBytes = ByteBuffer.allocate(3);
-        pingBytes.put((byte) 0x81); // TEXT FRAME
-        pingBytes.put((byte) 0x01); // 1 byte long
-        pingBytes.put((byte) 0x20); // ' '
-        pingBytes.flip();
-
-        closeBytes = ByteBuffer.allocate(2);
-        closeBytes.put((byte) 0x88); // CLOSE FRAME
-        closeBytes.put((byte) 0x00); // 0 byte long
-        closeBytes.flip();
-    }
-
-    @Override
-    public void run() {
-        while (true) {
-            PrintWriter statsFile = null;
-
-            if (Main.STATSFILE != null) {
-                try {
-                    statsFile = new PrintWriter(Main.STATSFILE, "UTF-8");
-                } catch (Exception e) {
-                    statsFile = null;
-                    logger.severe("WSKeepAlive statsFile: " + e);
-                }
-            }
-
-            long now = System.currentTimeMillis();
-
-            synchronized (Main.clients) {
-                if (statsFile != null) {
-                    statsFile.write("<html><body><h1>Connections (" + Main.clients.size() + ")</h2><table border=1><tr><th>IP</th><th>inactive</th><th>VUID</th><th>UID</th><th>MID</th><th>allM</th><th>allR</th></tr>");
-                }
-
-                for (Iterator<SocketSubscribed> i = Main.clients.iterator(); i.hasNext();) {
-                    SocketSubscribed s = i.next();
-                    int inactive = (int) ((double) (now - s.tsLastData) / 1000.0);
-
-                    if (statsFile != null) {
-                        try {
-                            statsFile.print("<tr><td>" + (s.clientName != null ? s.clientName : "?") + "</td>");
-                            statsFile.print("<td>" + inactive + "</td>");
-                            statsFile.print("<td>" + (s.VUID > 0 ? s.VUID : "") + "</td>");
-                            statsFile.print("<td>" + (s.UID > 0 ? s.UID : "") + "</td>");
-                            statsFile.print("<td>" + (s.MID > 0 ? s.MID : "") + "</td>");
-                            statsFile.print("<td>" + (s.allMessages ? "+" : "") + "</td>");
-                            statsFile.print("<td>" + (s.allReplies ? "+" : "") + "</td></tr>");
-                        } catch (Exception e) {
-                            logger.log(Level.SEVERE, "WSKeepAlive statsFile print", e);
-                        }
-                    }
-
-                    if (inactive > 180) {
-                        s.sendByteBuffer(closeBytes);
-                        s.close();
-                        i.remove();
-                    } else if (inactive > 60) {
-                        if (!s.sendByteBuffer(pingBytes)) {
-                            i.remove();
-                        }
-                    }
-                }
-            }
-
-            if (Main.STATSFILE != null) {
-                try {
-                    statsFile.write("</table></body></html>");
-                    statsFile.close();
-                } catch (Exception e) {
-                    logger.log(Level.SEVERE, "WSKeepAlive statsFile close", e);
-                }
-            }
-
-            try {
-                Thread.sleep(10000);
-            } catch (InterruptedException e) {
-            }
-        }
-    }
-}
diff --git a/src/main/java/com/juick/jabber/ws/XMPPConnection.java b/src/main/java/com/juick/jabber/ws/XMPPConnection.java
deleted file mode 100644
index 8c187a36..00000000
--- a/src/main/java/com/juick/jabber/ws/XMPPConnection.java
+++ /dev/null
@@ -1,158 +0,0 @@
-package com.juick.jabber.ws;
-
-import com.juick.User;
-import com.juick.json.MessageSerializer;
-import com.juick.server.MessagesQueries;
-import com.juick.server.SubscriptionsQueries;
-import com.juick.xmpp.JID;
-import com.juick.xmpp.Message;
-import com.juick.xmpp.Stream;
-import com.juick.xmpp.StreamComponent;
-import com.juick.xmpp.extensions.JuickMessage;
-import org.springframework.jdbc.core.JdbcTemplate;
-
-import java.io.IOException;
-import java.net.Socket;
-import java.nio.ByteBuffer;
-import java.nio.charset.Charset;
-import java.util.Iterator;
-import java.util.List;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import java.util.stream.Collectors;
-
-/**
- *
- * @author ugnich
- */
-public class XMPPConnection implements Runnable, Stream.StreamListener, Message.MessageListener {
-    private static final Logger logger = Logger.getLogger(XMPPConnection.class.getName());
-
-    JdbcTemplate sql;
-    Stream xmpp;
-    String xmppPassword;
-    MessageSerializer ms;
-
-    public XMPPConnection(JdbcTemplate sql, String password) {
-        this.sql = sql;
-        xmppPassword = password;
-        ms = new MessageSerializer();
-    }
-
-    @Override
-    public void run() {
-        try {
-            Socket socket = new Socket("localhost", 5347);
-            xmpp = new StreamComponent(new JID("", "ws.juick.com", ""), socket.getInputStream(), socket.getOutputStream(), xmppPassword);
-            xmpp.addChildParser(new JuickMessage());
-            xmpp.addListener((Stream.StreamListener) this);
-            xmpp.addListener((Message.MessageListener) this);
-            xmpp.startParsing();
-        } catch (IOException e) {
-            logger.log(Level.SEVERE, "XMPPConnection error", e);
-        }
-    }
-
-    @Override
-    public void onStreamReady() {
-       logger.info("XMPP stream ready");
-    }
-
-    @Override
-    public void onStreamFail(String msg) {
-        logger.severe("XMPP stream failed: " + msg);
-    }
-
-    @Override
-    public void onMessage(com.juick.xmpp.Message msg) {
-        JuickMessage jmsg = (JuickMessage) msg.getChild(JuickMessage.XMLNS);
-        if (jmsg != null) {
-            logger.info("got jmsg: " + ms.serialize(jmsg).toString());
-            if (jmsg.getMID() == 0) {
-                int uid_to = 0;
-                try {
-                    uid_to = Integer.parseInt(msg.to.Username);
-                } catch (Exception e) {
-                }
-                if (uid_to > 0) {
-                    onJuickPM(uid_to, jmsg);
-                }
-            } else if (jmsg.getRID() == 0) {
-                onJuickMessagePost(jmsg);
-            } else {
-                onJuickMessageReply(jmsg);
-            }
-        }
-    }
-
-    MessageSerializer messageSerializer = new MessageSerializer();
-
-    private void onJuickPM(int uid_to, com.juick.Message jmsg) {
-        String json = messageSerializer.serialize(jmsg).toString();
-        ByteBuffer bbMsg = buildTextFrame(json);
-
-        synchronized (Main.clients) {
-            for (Iterator<SocketSubscribed> i = Main.clients.iterator(); i.hasNext();) {
-                SocketSubscribed s = i.next();
-                if (s.VUID == uid_to && s.MID == 0 && s.allMessages == false && s.allReplies == false) {
-                    if (!s.sendByteBuffer(bbMsg)) {
-                        i.remove();
-                    }
-                }
-            }
-        }
-    }
-
-    private void onJuickMessagePost(com.juick.Message jmsg) {
-        String json = messageSerializer.serialize(jmsg).toString();
-        ByteBuffer bbMsg = buildTextFrame(json);
-
-        List<Integer> uids = SubscriptionsQueries.getSubscribedUsers(sql, jmsg.getUser().getUID(), jmsg.getMID())
-                .stream().map(User::getUID).collect(Collectors.toList());
-
-        synchronized (Main.clients) {
-            for (Iterator<SocketSubscribed> i = Main.clients.iterator(); i.hasNext();) {
-                SocketSubscribed s = i.next();
-                if (s.MID == 0 && s.allReplies == false && ((jmsg.Privacy >= 0
-                        && (s.allMessages || s.UID == jmsg.getUser().getUID())) || uids.contains(s.VUID))) {
-                    if (!s.sendByteBuffer(bbMsg)) {
-                        i.remove();
-                    }
-                }
-            }
-        }
-    }
-
-    private void onJuickMessageReply(com.juick.Message jmsg) {
-        String json = messageSerializer.serialize(jmsg).toString();
-        ByteBuffer bbMsg = buildTextFrame(json);
-
-        int privacy = MessagesQueries.getMessagePrivacy(sql, jmsg.getMID());
-
-        synchronized (Main.clients) {
-            for (Iterator<SocketSubscribed> i = Main.clients.iterator(); i.hasNext();) {
-                SocketSubscribed s = i.next();
-                if ((privacy >= 0 && s.allReplies) || s.MID == jmsg.getMID()) {
-                    if (!s.sendByteBuffer(bbMsg)) {
-                        i.remove();
-                    }
-                }
-            }
-        }
-    }
-
-    private ByteBuffer buildTextFrame(String json) {
-        ByteBuffer jsonbytes = Charset.forName("UTF-8").encode(json);
-        ByteBuffer bbMsg = ByteBuffer.allocate(jsonbytes.limit() + 8);
-        bbMsg.put((byte) 0x81);
-        if (jsonbytes.limit() <= 125) {
-            bbMsg.put((byte) jsonbytes.limit());
-        } else {
-            bbMsg.put((byte) 126);
-            bbMsg.putShort((short) jsonbytes.limit());
-        }
-        bbMsg.put(jsonbytes);
-        bbMsg.flip();
-        return bbMsg;
-    }
-}
diff --git a/src/main/java/com/juick/ws/WebsocketComponent.java b/src/main/java/com/juick/ws/WebsocketComponent.java
new file mode 100644
index 00000000..83e811a6
--- /dev/null
+++ b/src/main/java/com/juick/ws/WebsocketComponent.java
@@ -0,0 +1,134 @@
+package com.juick.ws;
+
+import com.juick.User;
+import com.juick.server.MessagesQueries;
+import com.juick.server.UserQueries;
+import org.apache.http.NameValuePair;
+import org.apache.http.client.utils.URLEncodedUtils;
+import org.springframework.http.HttpHeaders;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.stereotype.Component;
+import org.springframework.web.socket.CloseStatus;
+import org.springframework.web.socket.WebSocketSession;
+import org.springframework.web.socket.handler.TextWebSocketHandler;
+
+import javax.inject.Inject;
+import java.io.IOException;
+import java.net.URI;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+/**
+ * Created by vitalyster on 28.06.2016.
+ */
+@Component
+public class WebsocketComponent extends TextWebSocketHandler {
+
+    @Inject
+    JdbcTemplate jdbc;
+
+    private static final Logger logger = Logger.getLogger(WebsocketComponent.class.getName());
+    final List<SocketSubscribed> clients = Collections.synchronizedList(new ArrayList<SocketSubscribed>());
+
+    @Override
+    public void afterConnectionEstablished(WebSocketSession session) throws Exception {
+        URI hLocation;
+        String hXRealIP = "";
+
+        hLocation = session.getUri();
+        HttpHeaders headers = session.getHandshakeHeaders();
+        hXRealIP = headers.getOrDefault("X-Real-IP",
+                Collections.singletonList(session.getRemoteAddress().toString())).get(0);
+
+        // Auth
+        User visitor = new User();
+        List<NameValuePair> params = URLEncodedUtils.parse(hLocation, "UTF-8");
+        for (NameValuePair param : params) {
+            if (param.getName().equals("hash")) {
+                String hash = param.getValue();
+                if (hash.length() == 16) {
+                    visitor = UserQueries.getUserByHash(jdbc, hash);
+                } else {
+                    try {
+                        logger.info(String.format("wrong hash for %d from %s", visitor.getUID(), hXRealIP));
+                        session.close(new CloseStatus(403, "Forbidden"));
+                    } catch (IOException e) {
+                        logger.log(Level.WARNING, "ws error", e);
+                    }
+                }
+                break;
+            }
+        }
+        logger.info(String.format("user %d connected to %s from %s", visitor.getUID(), hLocation.getPath(), hXRealIP));
+
+        int MID = 0;
+        SocketSubscribed sockSubscr = null;
+        if (hLocation.getPath().equals("/") && visitor.getUID() > 0) {
+            logger.info(String.format("user %d connected", visitor.getUID()));
+            sockSubscr = new SocketSubscribed(session, hXRealIP, visitor, false);
+        } else if (hLocation.getPath().equals("/_all")) {
+            logger.info(String.format("user %d connected to legacy _all (%s)", visitor.getUID(), hLocation.getPath()));
+            sockSubscr = new SocketSubscribed(session, hXRealIP, visitor, true);
+            sockSubscr.allMessages = true;
+        } else if (hLocation.getPath().equals("/_replies")) {
+            logger.info(String.format("user %d connected to legacy _replies (%s)", visitor.getUID(), hLocation.getPath()));
+            sockSubscr = new SocketSubscribed(session, hXRealIP, visitor, true);
+            sockSubscr.allReplies = true;
+        } else if (hLocation.getPath().matches("/\\d+$")) {
+            try {
+                MID = Integer.parseInt(hLocation.getPath().substring(8));
+            } catch (Exception e) {
+            }
+            if (MID > 0) {
+                if (MessagesQueries.canViewThread(jdbc, MID, visitor.getUID())) {
+                    logger.info(String.format("user %d connected to legacy thread (%d) from %s", visitor.getUID(), MID, hXRealIP));
+                    sockSubscr = new SocketSubscribed(session, hXRealIP, visitor, true);
+                    sockSubscr.MID = MID;
+                } else {
+                    try {
+                        session.close(new CloseStatus(403, "Forbidden"));
+                    } catch (IOException e) {
+                        logger.log(Level.WARNING, "ws error", e);
+                    }
+                }
+            }
+        }
+        if (sockSubscr != null) {
+            synchronized (clients) {
+                clients.add(sockSubscr);
+            }
+        }
+    }
+    @Override
+    public void afterConnectionClosed(WebSocketSession session, CloseStatus status) throws Exception {
+        synchronized (clients) {
+            clients.stream().filter(c -> c.session.equals(session)).forEach(c -> {
+                logger.info(String.format("session %s closed with status %s", c.clientName, status.getCode()));
+                clients.remove(c);
+            });
+        }
+    }
+    class SocketSubscribed {
+
+        WebSocketSession session;
+        String clientName;
+        User visitor;
+        int MID;
+        boolean allMessages;
+        boolean allReplies;
+        long tsConnected;
+        long tsLastData;
+        boolean legacy;
+
+        public SocketSubscribed(WebSocketSession session, String clientName, User visitor, boolean legacy) {
+            this.session = session;
+            this.clientName = clientName;
+            this.visitor = visitor;
+            tsConnected = tsLastData = System.currentTimeMillis();
+            this.legacy = legacy;
+        }
+    }
+}
diff --git a/src/main/java/com/juick/ws/XMPPConnection.java b/src/main/java/com/juick/ws/XMPPConnection.java
new file mode 100644
index 00000000..9ed3d0cd
--- /dev/null
+++ b/src/main/java/com/juick/ws/XMPPConnection.java
@@ -0,0 +1,142 @@
+package com.juick.ws;
+
+import com.juick.User;
+import com.juick.json.MessageSerializer;
+import com.juick.server.SubscriptionsQueries;
+import com.juick.xmpp.JID;
+import com.juick.xmpp.Message;
+import com.juick.xmpp.Stream;
+import com.juick.xmpp.StreamComponent;
+import com.juick.xmpp.extensions.JuickMessage;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.stereotype.Component;
+import org.springframework.web.socket.TextMessage;
+
+import javax.inject.Inject;
+import java.io.IOException;
+import java.net.Socket;
+import java.util.List;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import java.util.stream.Collectors;
+
+/**
+ *
+ * @author ugnich
+ */
+@Component
+public class XMPPConnection implements Runnable, Stream.StreamListener, Message.MessageListener {
+    private static final Logger logger = Logger.getLogger(XMPPConnection.class.getName());
+
+    JdbcTemplate sql;
+    Stream xmpp;
+    String xmppPassword;
+    MessageSerializer ms;
+    @Inject
+    WebsocketComponent ws;
+
+    @Inject
+    public XMPPConnection(JdbcTemplate sql, String password) {
+        this.sql = sql;
+        xmppPassword = password;
+        ms = new MessageSerializer();
+        new Thread(this).start();
+    }
+
+    @Override
+    public void run() {
+        try {
+            Socket socket = new Socket("localhost", 5347);
+            xmpp = new StreamComponent(new JID("", "ws.juick.com", ""), socket.getInputStream(), socket.getOutputStream(), xmppPassword);
+            xmpp.addChildParser(new JuickMessage());
+            xmpp.addListener((Stream.StreamListener) this);
+            xmpp.addListener((Message.MessageListener) this);
+            xmpp.startParsing();
+        } catch (IOException e) {
+            logger.log(Level.SEVERE, "XMPPConnection error", e);
+        }
+    }
+
+    @Override
+    public void onStreamReady() {
+       logger.info("XMPP stream ready");
+    }
+
+    @Override
+    public void onStreamFail(String msg) {
+        logger.severe("XMPP stream failed: " + msg);
+    }
+
+    @Override
+    public void onMessage(com.juick.xmpp.Message msg) {
+        JuickMessage jmsg = (JuickMessage) msg.getChild(JuickMessage.XMLNS);
+        if (jmsg != null) {
+            logger.info("got jmsg: " + ms.serialize(jmsg).toString());
+            if (jmsg.getMID() == 0) {
+                int uid_to = 0;
+                try {
+                    uid_to = Integer.parseInt(msg.to.Username);
+                } catch (Exception e) {
+                }
+                if (uid_to > 0) {
+                    onJuickPM(uid_to, jmsg);
+                }
+            } else if (jmsg.getRID() == 0) {
+                onJuickMessagePost(jmsg);
+            } else {
+                onJuickMessageReply(jmsg);
+            }
+        }
+    }
+
+    MessageSerializer messageSerializer = new MessageSerializer();
+
+    private void onJuickPM(int uid_to, com.juick.Message jmsg) {
+        String json = messageSerializer.serialize(jmsg).toString();
+        synchronized (ws.clients) {
+            ws.clients.stream().filter(c -> !c.legacy && c.visitor.getUID() == uid_to).forEach(c -> {
+                try {
+                    logger.info("sending pm to " + c.visitor.getUID());
+                    c.session.sendMessage(new TextMessage(json));
+                } catch (IOException e) {
+                    logger.log(Level.WARNING, "ws error", e);
+                }
+            });
+        }
+    }
+
+    private void onJuickMessagePost(com.juick.Message jmsg) {
+        String json = messageSerializer.serialize(jmsg).toString();
+        List<Integer> uids = SubscriptionsQueries.getSubscribedUsers(sql, jmsg.getUser().getUID(), jmsg.getMID())
+                .stream().map(User::getUID).collect(Collectors.toList());
+
+        synchronized (ws.clients) {
+            ws.clients.stream().filter(c -> !c.legacy && uids.contains(c.visitor.getUID())).forEach(c -> {
+                try {
+                    logger.info("sending message to " + c.visitor.getUID());
+                    c.session.sendMessage(new TextMessage(json));
+                } catch (IOException e) {
+                    logger.log(Level.WARNING, "ws error", e);
+                }
+            });
+        }
+    }
+
+    private void onJuickMessageReply(com.juick.Message jmsg) {
+        String json = messageSerializer.serialize(jmsg).toString();
+
+        List<Integer> threadUsers =
+                SubscriptionsQueries.getUsersSubscribedToComments(sql, jmsg.getMID(), jmsg.getUser().getUID())
+                        .stream().map(User::getUID).collect(Collectors.toList());
+        synchronized (ws.clients) {
+            ws.clients.stream().filter(c -> !c.legacy && threadUsers.contains(c.visitor.getUID())).forEach(c -> {
+                try {
+                    logger.info("sending reply to " + c.visitor.getUID());
+                    c.session.sendMessage(new TextMessage(json));
+                } catch (IOException e) {
+                    logger.log(Level.WARNING, "ws error", e);
+                }
+            });
+        }
+    }
+}
diff --git a/src/main/java/com/juick/ws/configuration/WebsocketConfiguration.java b/src/main/java/com/juick/ws/configuration/WebsocketConfiguration.java
new file mode 100644
index 00000000..a56e56f5
--- /dev/null
+++ b/src/main/java/com/juick/ws/configuration/WebsocketConfiguration.java
@@ -0,0 +1,49 @@
+package com.juick.ws.configuration;
+
+import com.juick.ws.WebsocketComponent;
+import com.juick.ws.XMPPConnection;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.PropertySource;
+import org.springframework.core.env.Environment;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.datasource.DriverManagerDataSource;
+import org.springframework.web.socket.WebSocketHandler;
+import org.springframework.web.socket.config.annotation.EnableWebSocket;
+import org.springframework.web.socket.config.annotation.WebSocketConfigurer;
+import org.springframework.web.socket.config.annotation.WebSocketHandlerRegistry;
+
+import javax.inject.Inject;
+
+/**
+ * Created by vitalyster on 28.06.2016.
+ */
+@Configuration
+@EnableWebSocket
+@ComponentScan(basePackages = {"com.juick"})
+@PropertySource("classpath:juick.conf")
+public class WebsocketConfiguration implements WebSocketConfigurer {
+    @Inject
+    Environment env;
+
+    @Bean
+    WebSocketHandler wsHandler() {
+        return new WebsocketComponent();
+    }
+    @Bean
+    JdbcTemplate jdbc() {
+        DriverManagerDataSource dataSource = new DriverManagerDataSource();
+        dataSource.setDriverClassName(env.getProperty("datasource_driver", "com.mysql.jdbc.Driver"));
+        dataSource.setUrl(env.getProperty("datasource_url"));
+        return new JdbcTemplate(dataSource);
+    }
+    @Bean
+    XMPPConnection xmpp() {
+        return new XMPPConnection(jdbc(), env.getProperty("xmpp_password"));
+    }
+    @Override
+    public void registerWebSocketHandlers(WebSocketHandlerRegistry registry) {
+        registry.addHandler(wsHandler(), "/");
+    }
+}
-- 
cgit v1.2.3


From a3b1c3f5ea8248ab9060bc773aa819ca4b090bee Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Tue, 28 Jun 2016 11:09:57 +0300
Subject: configure webmvc

---
 build.gradle                                       |  2 ++
 .../ws/configuration/WebsocketConfiguration.java   |  5 +++-
 .../ws/configuration/WebsocketInitializer.java     | 33 ++++++++++++++++++++++
 3 files changed, 39 insertions(+), 1 deletion(-)
 create mode 100644 src/main/java/com/juick/ws/configuration/WebsocketInitializer.java

(limited to 'src/main/java/com')

diff --git a/build.gradle b/build.gradle
index 92b44bec..7f0bbe52 100644
--- a/build.gradle
+++ b/build.gradle
@@ -39,8 +39,10 @@ dependencies {
     compile server
     compile xmpp
     compile json
+    providedCompile 'javax.servlet:javax.servlet-api:3.1.0'
     def springFrameworkVersion = '4.3.0.RELEASE'
     compile "org.springframework:spring-jdbc:${springFrameworkVersion}"
+    compile "org.springframework:spring-webmvc:${springFrameworkVersion}"
     compile "org.springframework:spring-websocket:${springFrameworkVersion}"
     compile 'javax.inject:javax.inject:1'
     compile 'org.apache.httpcomponents:httpclient:4.5.1'
diff --git a/src/main/java/com/juick/ws/configuration/WebsocketConfiguration.java b/src/main/java/com/juick/ws/configuration/WebsocketConfiguration.java
index a56e56f5..a298d0a0 100644
--- a/src/main/java/com/juick/ws/configuration/WebsocketConfiguration.java
+++ b/src/main/java/com/juick/ws/configuration/WebsocketConfiguration.java
@@ -9,6 +9,8 @@ import org.springframework.context.annotation.PropertySource;
 import org.springframework.core.env.Environment;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.datasource.DriverManagerDataSource;
+import org.springframework.web.servlet.config.annotation.EnableWebMvc;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
 import org.springframework.web.socket.WebSocketHandler;
 import org.springframework.web.socket.config.annotation.EnableWebSocket;
 import org.springframework.web.socket.config.annotation.WebSocketConfigurer;
@@ -20,10 +22,11 @@ import javax.inject.Inject;
  * Created by vitalyster on 28.06.2016.
  */
 @Configuration
+@EnableWebMvc
 @EnableWebSocket
 @ComponentScan(basePackages = {"com.juick"})
 @PropertySource("classpath:juick.conf")
-public class WebsocketConfiguration implements WebSocketConfigurer {
+public class WebsocketConfiguration extends WebMvcConfigurerAdapter implements WebSocketConfigurer {
     @Inject
     Environment env;
 
diff --git a/src/main/java/com/juick/ws/configuration/WebsocketInitializer.java b/src/main/java/com/juick/ws/configuration/WebsocketInitializer.java
new file mode 100644
index 00000000..89017f8b
--- /dev/null
+++ b/src/main/java/com/juick/ws/configuration/WebsocketInitializer.java
@@ -0,0 +1,33 @@
+package com.juick.ws.configuration;
+import org.springframework.web.filter.CharacterEncodingFilter;
+import org.springframework.web.servlet.support.AbstractAnnotationConfigDispatcherServletInitializer;
+
+import javax.servlet.Filter;
+
+/**
+ * Created by vt on 09/02/16.
+ */
+public class WebsocketInitializer extends AbstractAnnotationConfigDispatcherServletInitializer {
+    @Override
+    protected Class<?>[] getRootConfigClasses() {
+        return new Class[] {WebsocketConfiguration.class};
+    }
+
+    @Override
+    protected Class<?>[] getServletConfigClasses() {
+        return null;
+    }
+
+    @Override
+    protected String[] getServletMappings() {
+        return new String[] {
+                "/"
+        };
+    }
+    @Override
+    protected Filter[] getServletFilters() {
+        CharacterEncodingFilter characterEncodingFilter = new CharacterEncodingFilter();
+        characterEncodingFilter.setEncoding("UTF-8");
+        return new Filter[] { characterEncodingFilter};
+    }
+}
-- 
cgit v1.2.3


From f2387bcc06dca0bf3368f32a99a6ec74a7381ccd Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Tue, 28 Jun 2016 11:23:34 +0300
Subject: fix xmpp component wiring

---
 src/main/java/com/juick/ws/XMPPConnection.java                       | 5 ++---
 src/main/java/com/juick/ws/configuration/WebsocketConfiguration.java | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

(limited to 'src/main/java/com')

diff --git a/src/main/java/com/juick/ws/XMPPConnection.java b/src/main/java/com/juick/ws/XMPPConnection.java
index 9ed3d0cd..5d4fbce9 100644
--- a/src/main/java/com/juick/ws/XMPPConnection.java
+++ b/src/main/java/com/juick/ws/XMPPConnection.java
@@ -28,6 +28,7 @@ import java.util.stream.Collectors;
 public class XMPPConnection implements Runnable, Stream.StreamListener, Message.MessageListener {
     private static final Logger logger = Logger.getLogger(XMPPConnection.class.getName());
 
+    @Inject
     JdbcTemplate sql;
     Stream xmpp;
     String xmppPassword;
@@ -35,9 +36,7 @@ public class XMPPConnection implements Runnable, Stream.StreamListener, Message.
     @Inject
     WebsocketComponent ws;
 
-    @Inject
-    public XMPPConnection(JdbcTemplate sql, String password) {
-        this.sql = sql;
+    public XMPPConnection(String password) {
         xmppPassword = password;
         ms = new MessageSerializer();
         new Thread(this).start();
diff --git a/src/main/java/com/juick/ws/configuration/WebsocketConfiguration.java b/src/main/java/com/juick/ws/configuration/WebsocketConfiguration.java
index a298d0a0..9fd75bb0 100644
--- a/src/main/java/com/juick/ws/configuration/WebsocketConfiguration.java
+++ b/src/main/java/com/juick/ws/configuration/WebsocketConfiguration.java
@@ -43,7 +43,7 @@ public class WebsocketConfiguration extends WebMvcConfigurerAdapter implements W
     }
     @Bean
     XMPPConnection xmpp() {
-        return new XMPPConnection(jdbc(), env.getProperty("xmpp_password"));
+        return new XMPPConnection(env.getProperty("xmpp_password"));
     }
     @Override
     public void registerWebSocketHandlers(WebSocketHandlerRegistry registry) {
-- 
cgit v1.2.3


From a2faab09d3a8604ffe24dd337a3ab099f132e311 Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Tue, 28 Jun 2016 11:34:25 +0300
Subject: fix xmpp component wiring, take 2

---
 src/main/java/com/juick/ws/XMPPConnection.java                     | 7 +++++--
 .../java/com/juick/ws/configuration/WebsocketConfiguration.java    | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'src/main/java/com')

diff --git a/src/main/java/com/juick/ws/XMPPConnection.java b/src/main/java/com/juick/ws/XMPPConnection.java
index 5d4fbce9..802271a0 100644
--- a/src/main/java/com/juick/ws/XMPPConnection.java
+++ b/src/main/java/com/juick/ws/XMPPConnection.java
@@ -8,6 +8,7 @@ import com.juick.xmpp.Message;
 import com.juick.xmpp.Stream;
 import com.juick.xmpp.StreamComponent;
 import com.juick.xmpp.extensions.JuickMessage;
+import org.springframework.core.env.Environment;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Component;
 import org.springframework.web.socket.TextMessage;
@@ -30,14 +31,16 @@ public class XMPPConnection implements Runnable, Stream.StreamListener, Message.
 
     @Inject
     JdbcTemplate sql;
+    @Inject
+    Environment env;
     Stream xmpp;
     String xmppPassword;
     MessageSerializer ms;
     @Inject
     WebsocketComponent ws;
 
-    public XMPPConnection(String password) {
-        xmppPassword = password;
+    public XMPPConnection() {
+        xmppPassword = env.getProperty("xmpp_password");
         ms = new MessageSerializer();
         new Thread(this).start();
     }
diff --git a/src/main/java/com/juick/ws/configuration/WebsocketConfiguration.java b/src/main/java/com/juick/ws/configuration/WebsocketConfiguration.java
index 9fd75bb0..46ef8486 100644
--- a/src/main/java/com/juick/ws/configuration/WebsocketConfiguration.java
+++ b/src/main/java/com/juick/ws/configuration/WebsocketConfiguration.java
@@ -43,7 +43,7 @@ public class WebsocketConfiguration extends WebMvcConfigurerAdapter implements W
     }
     @Bean
     XMPPConnection xmpp() {
-        return new XMPPConnection(env.getProperty("xmpp_password"));
+        return new XMPPConnection();
     }
     @Override
     public void registerWebSocketHandlers(WebSocketHandlerRegistry registry) {
-- 
cgit v1.2.3


From 9f2503cf924d79f00cb0956d37daf10e7a163163 Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Tue, 28 Jun 2016 14:40:55 +0300
Subject: gretty

---
 build.gradle                                            | 17 +++++++++++++++++
 src/main/java/com/juick/ws/XMPPConnection.java          |  5 ++---
 .../juick/ws/configuration/WebsocketConfiguration.java  |  4 ----
 3 files changed, 19 insertions(+), 7 deletions(-)

(limited to 'src/main/java/com')

diff --git a/build.gradle b/build.gradle
index 7f0bbe52..bea96871 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,9 +4,19 @@ subprojects {
         mavenCentral()
     }
 }
+buildscript {
+    repositories {
+        mavenCentral()
+    }
+    dependencies {
+        classpath 'org.akhikhl.gretty:gretty:+'
+    }
+}
+
 
 apply plugin: 'java'
 apply plugin: 'war'
+apply plugin: 'org.akhikhl.gretty'
 
 repositories {
     mavenCentral()
@@ -51,3 +61,10 @@ dependencies {
 }
 
 compileJava.options.encoding = 'UTF-8'
+
+gretty {
+    httpPort = 8080
+    contextPath = ''
+    servletContainer = 'tomcat8'
+}
+
diff --git a/src/main/java/com/juick/ws/XMPPConnection.java b/src/main/java/com/juick/ws/XMPPConnection.java
index 802271a0..8194862c 100644
--- a/src/main/java/com/juick/ws/XMPPConnection.java
+++ b/src/main/java/com/juick/ws/XMPPConnection.java
@@ -31,15 +31,14 @@ public class XMPPConnection implements Runnable, Stream.StreamListener, Message.
 
     @Inject
     JdbcTemplate sql;
-    @Inject
-    Environment env;
     Stream xmpp;
     String xmppPassword;
     MessageSerializer ms;
     @Inject
     WebsocketComponent ws;
 
-    public XMPPConnection() {
+    @Inject
+    public XMPPConnection(Environment env) {
         xmppPassword = env.getProperty("xmpp_password");
         ms = new MessageSerializer();
         new Thread(this).start();
diff --git a/src/main/java/com/juick/ws/configuration/WebsocketConfiguration.java b/src/main/java/com/juick/ws/configuration/WebsocketConfiguration.java
index 46ef8486..b0393038 100644
--- a/src/main/java/com/juick/ws/configuration/WebsocketConfiguration.java
+++ b/src/main/java/com/juick/ws/configuration/WebsocketConfiguration.java
@@ -41,10 +41,6 @@ public class WebsocketConfiguration extends WebMvcConfigurerAdapter implements W
         dataSource.setUrl(env.getProperty("datasource_url"));
         return new JdbcTemplate(dataSource);
     }
-    @Bean
-    XMPPConnection xmpp() {
-        return new XMPPConnection();
-    }
     @Override
     public void registerWebSocketHandlers(WebSocketHandlerRegistry registry) {
         registry.addHandler(wsHandler(), "/");
-- 
cgit v1.2.3


From f53538d230440f16948a12a34ffe587edcd0f245 Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Tue, 28 Jun 2016 14:53:37 +0300
Subject: fixes

---
 src/main/java/com/juick/ws/WebsocketComponent.java | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'src/main/java/com')

diff --git a/src/main/java/com/juick/ws/WebsocketComponent.java b/src/main/java/com/juick/ws/WebsocketComponent.java
index 83e811a6..7399c298 100644
--- a/src/main/java/com/juick/ws/WebsocketComponent.java
+++ b/src/main/java/com/juick/ws/WebsocketComponent.java
@@ -97,19 +97,18 @@ public class WebsocketComponent extends TextWebSocketHandler {
             }
         }
         if (sockSubscr != null) {
-            synchronized (clients) {
-                clients.add(sockSubscr);
-            }
+            clients.add(sockSubscr);
         }
     }
     @Override
     public void afterConnectionClosed(WebSocketSession session, CloseStatus status) throws Exception {
         synchronized (clients) {
-            clients.stream().filter(c -> c.session.equals(session)).forEach(c -> {
+            clients.stream().filter(c -> c.session.getId().equals(session.getId())).forEach(c -> {
                 logger.info(String.format("session %s closed with status %s", c.clientName, status.getCode()));
                 clients.remove(c);
             });
         }
+
     }
     class SocketSubscribed {
 
-- 
cgit v1.2.3


From 2d89e7882c09be7cbe82a4e5df09c23ab106be20 Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Tue, 28 Jun 2016 15:12:47 +0300
Subject: fix handler url mapping

---
 src/main/java/com/juick/ws/configuration/WebsocketConfiguration.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/main/java/com')

diff --git a/src/main/java/com/juick/ws/configuration/WebsocketConfiguration.java b/src/main/java/com/juick/ws/configuration/WebsocketConfiguration.java
index b0393038..63ff12cb 100644
--- a/src/main/java/com/juick/ws/configuration/WebsocketConfiguration.java
+++ b/src/main/java/com/juick/ws/configuration/WebsocketConfiguration.java
@@ -43,6 +43,6 @@ public class WebsocketConfiguration extends WebMvcConfigurerAdapter implements W
     }
     @Override
     public void registerWebSocketHandlers(WebSocketHandlerRegistry registry) {
-        registry.addHandler(wsHandler(), "/");
+        registry.addHandler(wsHandler(), "/**");
     }
 }
-- 
cgit v1.2.3


From c4948c141a68433b4ba9eca167622816dcd10fa1 Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Tue, 28 Jun 2016 15:25:08 +0300
Subject: fix session closing

---
 src/main/java/com/juick/ws/WebsocketComponent.java | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'src/main/java/com')

diff --git a/src/main/java/com/juick/ws/WebsocketComponent.java b/src/main/java/com/juick/ws/WebsocketComponent.java
index 7399c298..8ccccb3b 100644
--- a/src/main/java/com/juick/ws/WebsocketComponent.java
+++ b/src/main/java/com/juick/ws/WebsocketComponent.java
@@ -103,9 +103,12 @@ public class WebsocketComponent extends TextWebSocketHandler {
     @Override
     public void afterConnectionClosed(WebSocketSession session, CloseStatus status) throws Exception {
         synchronized (clients) {
-            clients.stream().filter(c -> c.session.getId().equals(session.getId())).forEach(c -> {
-                logger.info(String.format("session %s closed with status %s", c.clientName, status.getCode()));
-                clients.remove(c);
+            clients.removeIf(c -> {
+                if (c.session.equals(session)) {
+                    logger.info(String.format("session from %s closed with status %d", c.clientName, status.getCode()));
+                    return true;
+                }
+                return false;
             });
         }
 
-- 
cgit v1.2.3


From 0f907b3973e851970882a00da123f6b7a6a359fb Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Tue, 28 Jun 2016 16:08:16 +0300
Subject: send messages to legacy urls

---
 src/main/java/com/juick/ws/XMPPConnection.java | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

(limited to 'src/main/java/com')

diff --git a/src/main/java/com/juick/ws/XMPPConnection.java b/src/main/java/com/juick/ws/XMPPConnection.java
index 8194862c..a6f4e2cb 100644
--- a/src/main/java/com/juick/ws/XMPPConnection.java
+++ b/src/main/java/com/juick/ws/XMPPConnection.java
@@ -120,6 +120,14 @@ public class XMPPConnection implements Runnable, Stream.StreamListener, Message.
                     logger.log(Level.WARNING, "ws error", e);
                 }
             });
+            ws.clients.stream().filter(c -> c.legacy && c.allMessages).forEach(c -> {
+                try {
+                    logger.info("sending message to legacy client " + c.visitor.getUID());
+                    c.session.sendMessage(new TextMessage(json));
+                } catch (IOException e) {
+                    logger.log(Level.WARNING, "ws error", e);
+                }
+            });
         }
     }
 
@@ -138,6 +146,14 @@ public class XMPPConnection implements Runnable, Stream.StreamListener, Message.
                     logger.log(Level.WARNING, "ws error", e);
                 }
             });
+            ws.clients.stream().filter(c -> (c.legacy && c.allReplies) || (c.legacy && c.MID == jmsg.getMID())).forEach(c -> {
+                try {
+                    logger.info("sending reply to legacy client " + c.visitor.getUID());
+                    c.session.sendMessage(new TextMessage(json));
+                } catch (IOException e) {
+                    logger.log(Level.WARNING, "ws error", e);
+                }
+            });
         }
     }
 }
-- 
cgit v1.2.3


From e8621033c919f0920a52463c01293349752aedec Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Tue, 28 Jun 2016 16:47:52 +0300
Subject: destroy xmpp service

---
 src/main/java/com/juick/ws/XMPPConnection.java       |  6 +++++-
 .../ws/configuration/WebsocketConfiguration.java     | 20 ++++++++++++++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)

(limited to 'src/main/java/com')

diff --git a/src/main/java/com/juick/ws/XMPPConnection.java b/src/main/java/com/juick/ws/XMPPConnection.java
index a6f4e2cb..9ac22d45 100644
--- a/src/main/java/com/juick/ws/XMPPConnection.java
+++ b/src/main/java/com/juick/ws/XMPPConnection.java
@@ -17,6 +17,8 @@ import javax.inject.Inject;
 import java.io.IOException;
 import java.net.Socket;
 import java.util.List;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.stream.Collectors;
@@ -36,12 +38,14 @@ public class XMPPConnection implements Runnable, Stream.StreamListener, Message.
     MessageSerializer ms;
     @Inject
     WebsocketComponent ws;
+    @Inject
+    ExecutorService xmppThreadService;
 
     @Inject
     public XMPPConnection(Environment env) {
         xmppPassword = env.getProperty("xmpp_password");
         ms = new MessageSerializer();
-        new Thread(this).start();
+        xmppThreadService.submit(this);
     }
 
     @Override
diff --git a/src/main/java/com/juick/ws/configuration/WebsocketConfiguration.java b/src/main/java/com/juick/ws/configuration/WebsocketConfiguration.java
index 63ff12cb..27bfcf36 100644
--- a/src/main/java/com/juick/ws/configuration/WebsocketConfiguration.java
+++ b/src/main/java/com/juick/ws/configuration/WebsocketConfiguration.java
@@ -2,6 +2,7 @@ package com.juick.ws.configuration;
 
 import com.juick.ws.WebsocketComponent;
 import com.juick.ws.XMPPConnection;
+import org.springframework.beans.factory.DisposableBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
@@ -17,6 +18,8 @@ import org.springframework.web.socket.config.annotation.WebSocketConfigurer;
 import org.springframework.web.socket.config.annotation.WebSocketHandlerRegistry;
 
 import javax.inject.Inject;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 
 /**
  * Created by vitalyster on 28.06.2016.
@@ -41,8 +44,25 @@ public class WebsocketConfiguration extends WebMvcConfigurerAdapter implements W
         dataSource.setUrl(env.getProperty("datasource_url"));
         return new JdbcTemplate(dataSource);
     }
+    @Bean
+    ExecutorService xmppThreadService() {
+        return Executors.newSingleThreadExecutor();
+    }
+    @Bean
+    DestroyBean destroyBean() {
+        return new DestroyBean();
+    }
     @Override
     public void registerWebSocketHandlers(WebSocketHandlerRegistry registry) {
         registry.addHandler(wsHandler(), "/**");
     }
+    class DestroyBean implements DisposableBean {
+
+        @Inject
+        ExecutorService xmppThreadService;
+        @Override
+        public void destroy() throws Exception {
+            xmppThreadService.shutdownNow();
+        }
+    }
 }
-- 
cgit v1.2.3


From d131a99cb1641a4ea0c61b4caaee50a50c1ffd42 Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Thu, 30 Jun 2016 09:25:16 +0300
Subject: xmpp fix, next

---
 src/main/java/com/juick/ws/XMPPConnection.java                       | 3 +--
 src/main/java/com/juick/ws/configuration/WebsocketConfiguration.java | 4 ----
 2 files changed, 1 insertion(+), 6 deletions(-)

(limited to 'src/main/java/com')

diff --git a/src/main/java/com/juick/ws/XMPPConnection.java b/src/main/java/com/juick/ws/XMPPConnection.java
index 9ac22d45..3122e715 100644
--- a/src/main/java/com/juick/ws/XMPPConnection.java
+++ b/src/main/java/com/juick/ws/XMPPConnection.java
@@ -38,8 +38,7 @@ public class XMPPConnection implements Runnable, Stream.StreamListener, Message.
     MessageSerializer ms;
     @Inject
     WebsocketComponent ws;
-    @Inject
-    ExecutorService xmppThreadService;
+    ExecutorService xmppThreadService = Executors.newSingleThreadExecutor();
 
     @Inject
     public XMPPConnection(Environment env) {
diff --git a/src/main/java/com/juick/ws/configuration/WebsocketConfiguration.java b/src/main/java/com/juick/ws/configuration/WebsocketConfiguration.java
index 27bfcf36..0a1b83d2 100644
--- a/src/main/java/com/juick/ws/configuration/WebsocketConfiguration.java
+++ b/src/main/java/com/juick/ws/configuration/WebsocketConfiguration.java
@@ -45,10 +45,6 @@ public class WebsocketConfiguration extends WebMvcConfigurerAdapter implements W
         return new JdbcTemplate(dataSource);
     }
     @Bean
-    ExecutorService xmppThreadService() {
-        return Executors.newSingleThreadExecutor();
-    }
-    @Bean
     DestroyBean destroyBean() {
         return new DestroyBean();
     }
-- 
cgit v1.2.3


From 13642efd8bd1d70264392c1ee7b87f9b0c979066 Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Thu, 30 Jun 2016 09:41:02 +0300
Subject: xmpp fix, next

---
 .../juick/ws/configuration/WebsocketConfiguration.java  | 17 -----------------
 1 file changed, 17 deletions(-)

(limited to 'src/main/java/com')

diff --git a/src/main/java/com/juick/ws/configuration/WebsocketConfiguration.java b/src/main/java/com/juick/ws/configuration/WebsocketConfiguration.java
index 0a1b83d2..ecf2de46 100644
--- a/src/main/java/com/juick/ws/configuration/WebsocketConfiguration.java
+++ b/src/main/java/com/juick/ws/configuration/WebsocketConfiguration.java
@@ -1,8 +1,6 @@
 package com.juick.ws.configuration;
 
 import com.juick.ws.WebsocketComponent;
-import com.juick.ws.XMPPConnection;
-import org.springframework.beans.factory.DisposableBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
@@ -18,8 +16,6 @@ import org.springframework.web.socket.config.annotation.WebSocketConfigurer;
 import org.springframework.web.socket.config.annotation.WebSocketHandlerRegistry;
 
 import javax.inject.Inject;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
 
 /**
  * Created by vitalyster on 28.06.2016.
@@ -44,21 +40,8 @@ public class WebsocketConfiguration extends WebMvcConfigurerAdapter implements W
         dataSource.setUrl(env.getProperty("datasource_url"));
         return new JdbcTemplate(dataSource);
     }
-    @Bean
-    DestroyBean destroyBean() {
-        return new DestroyBean();
-    }
     @Override
     public void registerWebSocketHandlers(WebSocketHandlerRegistry registry) {
         registry.addHandler(wsHandler(), "/**");
     }
-    class DestroyBean implements DisposableBean {
-
-        @Inject
-        ExecutorService xmppThreadService;
-        @Override
-        public void destroy() throws Exception {
-            xmppThreadService.shutdownNow();
-        }
-    }
 }
-- 
cgit v1.2.3


From 2e52796f2199e40deddff099830e40d1844f7793 Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Thu, 30 Jun 2016 10:50:13 +0300
Subject: allow * origins

---
 src/main/java/com/juick/ws/configuration/WebsocketConfiguration.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/main/java/com')

diff --git a/src/main/java/com/juick/ws/configuration/WebsocketConfiguration.java b/src/main/java/com/juick/ws/configuration/WebsocketConfiguration.java
index ecf2de46..0bb293f4 100644
--- a/src/main/java/com/juick/ws/configuration/WebsocketConfiguration.java
+++ b/src/main/java/com/juick/ws/configuration/WebsocketConfiguration.java
@@ -42,6 +42,6 @@ public class WebsocketConfiguration extends WebMvcConfigurerAdapter implements W
     }
     @Override
     public void registerWebSocketHandlers(WebSocketHandlerRegistry registry) {
-        registry.addHandler(wsHandler(), "/**");
+        registry.addHandler(wsHandler(), "/**").setAllowedOrigins("*");
     }
 }
-- 
cgit v1.2.3


From 614384564482c8a35a567dd092cf5674f853ebd3 Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Thu, 30 Jun 2016 11:04:41 +0300
Subject: ws debug

---
 src/main/java/com/juick/ws/XMPPConnection.java | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'src/main/java/com')

diff --git a/src/main/java/com/juick/ws/XMPPConnection.java b/src/main/java/com/juick/ws/XMPPConnection.java
index 3122e715..65008906 100644
--- a/src/main/java/com/juick/ws/XMPPConnection.java
+++ b/src/main/java/com/juick/ws/XMPPConnection.java
@@ -113,8 +113,10 @@ public class XMPPConnection implements Runnable, Stream.StreamListener, Message.
         String json = messageSerializer.serialize(jmsg).toString();
         List<Integer> uids = SubscriptionsQueries.getSubscribedUsers(sql, jmsg.getUser().getUID(), jmsg.getMID())
                 .stream().map(User::getUID).collect(Collectors.toList());
-
+        logger.info(String.format("%d users subscribed to %d", uids.size(), jmsg.getUser().getUID()));
         synchronized (ws.clients) {
+            Long legacycount = ws.clients.stream().filter(c -> c.legacy && c.allMessages).count();
+            logger.info(String.format("%d legacy users watched %d", legacycount, jmsg.getMID()));
             ws.clients.stream().filter(c -> !c.legacy && uids.contains(c.visitor.getUID())).forEach(c -> {
                 try {
                     logger.info("sending message to " + c.visitor.getUID());
@@ -136,11 +138,14 @@ public class XMPPConnection implements Runnable, Stream.StreamListener, Message.
 
     private void onJuickMessageReply(com.juick.Message jmsg) {
         String json = messageSerializer.serialize(jmsg).toString();
-
+        logger.info("got reply: " + json);
         List<Integer> threadUsers =
                 SubscriptionsQueries.getUsersSubscribedToComments(sql, jmsg.getMID(), jmsg.getUser().getUID())
                         .stream().map(User::getUID).collect(Collectors.toList());
+        logger.info(String.format("%d users subscribed to %d", threadUsers.size(), jmsg.getMID()));
         synchronized (ws.clients) {
+            Long legacycount = ws.clients.stream().filter(c -> c.legacy && c.allReplies).count();
+            logger.info(String.format("%d legacy users watched %d", legacycount, jmsg.getMID()));
             ws.clients.stream().filter(c -> !c.legacy && threadUsers.contains(c.visitor.getUID())).forEach(c -> {
                 try {
                     logger.info("sending reply to " + c.visitor.getUID());
-- 
cgit v1.2.3


From 38040c8f5faaab4fe6d7055ed010533aa1860b07 Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Thu, 30 Jun 2016 11:26:33 +0300
Subject: ws injection fix

---
 src/main/java/com/juick/ws/XMPPConnection.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/main/java/com')

diff --git a/src/main/java/com/juick/ws/XMPPConnection.java b/src/main/java/com/juick/ws/XMPPConnection.java
index 65008906..ae70d956 100644
--- a/src/main/java/com/juick/ws/XMPPConnection.java
+++ b/src/main/java/com/juick/ws/XMPPConnection.java
@@ -31,17 +31,17 @@ import java.util.stream.Collectors;
 public class XMPPConnection implements Runnable, Stream.StreamListener, Message.MessageListener {
     private static final Logger logger = Logger.getLogger(XMPPConnection.class.getName());
 
-    @Inject
     JdbcTemplate sql;
     Stream xmpp;
     String xmppPassword;
     MessageSerializer ms;
-    @Inject
     WebsocketComponent ws;
     ExecutorService xmppThreadService = Executors.newSingleThreadExecutor();
 
     @Inject
-    public XMPPConnection(Environment env) {
+    public XMPPConnection(Environment env, WebsocketComponent ws, JdbcTemplate sql) {
+        this.sql = sql;
+        this.ws = ws;
         xmppPassword = env.getProperty("xmpp_password");
         ms = new MessageSerializer();
         xmppThreadService.submit(this);
-- 
cgit v1.2.3


From dbceb8cb379c44366c1014d282a73457762aabe1 Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Thu, 30 Jun 2016 11:46:44 +0300
Subject: ws injection fix, next

---
 src/main/java/com/juick/ws/XMPPConnection.java     | 33 +++++++++-------------
 .../ws/configuration/WebsocketConfiguration.java   | 14 +++++++--
 2 files changed, 25 insertions(+), 22 deletions(-)

(limited to 'src/main/java/com')

diff --git a/src/main/java/com/juick/ws/XMPPConnection.java b/src/main/java/com/juick/ws/XMPPConnection.java
index ae70d956..d5cb4eba 100644
--- a/src/main/java/com/juick/ws/XMPPConnection.java
+++ b/src/main/java/com/juick/ws/XMPPConnection.java
@@ -17,8 +17,6 @@ import javax.inject.Inject;
 import java.io.IOException;
 import java.net.Socket;
 import java.util.List;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.stream.Collectors;
@@ -30,21 +28,18 @@ import java.util.stream.Collectors;
 @Component
 public class XMPPConnection implements Runnable, Stream.StreamListener, Message.MessageListener {
     private static final Logger logger = Logger.getLogger(XMPPConnection.class.getName());
-
+    @Inject
     JdbcTemplate sql;
     Stream xmpp;
     String xmppPassword;
     MessageSerializer ms;
-    WebsocketComponent ws;
-    ExecutorService xmppThreadService = Executors.newSingleThreadExecutor();
+    WebsocketComponent wsHandler;
 
     @Inject
-    public XMPPConnection(Environment env, WebsocketComponent ws, JdbcTemplate sql) {
-        this.sql = sql;
-        this.ws = ws;
+    public XMPPConnection(Environment env, WebsocketComponent wsHandler) {
+        this.wsHandler = wsHandler;
         xmppPassword = env.getProperty("xmpp_password");
         ms = new MessageSerializer();
-        xmppThreadService.submit(this);
     }
 
     @Override
@@ -97,8 +92,8 @@ public class XMPPConnection implements Runnable, Stream.StreamListener, Message.
 
     private void onJuickPM(int uid_to, com.juick.Message jmsg) {
         String json = messageSerializer.serialize(jmsg).toString();
-        synchronized (ws.clients) {
-            ws.clients.stream().filter(c -> !c.legacy && c.visitor.getUID() == uid_to).forEach(c -> {
+        synchronized (wsHandler.clients) {
+            wsHandler.clients.stream().filter(c -> !c.legacy && c.visitor.getUID() == uid_to).forEach(c -> {
                 try {
                     logger.info("sending pm to " + c.visitor.getUID());
                     c.session.sendMessage(new TextMessage(json));
@@ -114,10 +109,10 @@ public class XMPPConnection implements Runnable, Stream.StreamListener, Message.
         List<Integer> uids = SubscriptionsQueries.getSubscribedUsers(sql, jmsg.getUser().getUID(), jmsg.getMID())
                 .stream().map(User::getUID).collect(Collectors.toList());
         logger.info(String.format("%d users subscribed to %d", uids.size(), jmsg.getUser().getUID()));
-        synchronized (ws.clients) {
-            Long legacycount = ws.clients.stream().filter(c -> c.legacy && c.allMessages).count();
+        synchronized (wsHandler.clients) {
+            Long legacycount = wsHandler.clients.stream().filter(c -> c.legacy && c.allMessages).count();
             logger.info(String.format("%d legacy users watched %d", legacycount, jmsg.getMID()));
-            ws.clients.stream().filter(c -> !c.legacy && uids.contains(c.visitor.getUID())).forEach(c -> {
+            wsHandler.clients.stream().filter(c -> !c.legacy && uids.contains(c.visitor.getUID())).forEach(c -> {
                 try {
                     logger.info("sending message to " + c.visitor.getUID());
                     c.session.sendMessage(new TextMessage(json));
@@ -125,7 +120,7 @@ public class XMPPConnection implements Runnable, Stream.StreamListener, Message.
                     logger.log(Level.WARNING, "ws error", e);
                 }
             });
-            ws.clients.stream().filter(c -> c.legacy && c.allMessages).forEach(c -> {
+            wsHandler.clients.stream().filter(c -> c.legacy && c.allMessages).forEach(c -> {
                 try {
                     logger.info("sending message to legacy client " + c.visitor.getUID());
                     c.session.sendMessage(new TextMessage(json));
@@ -143,10 +138,10 @@ public class XMPPConnection implements Runnable, Stream.StreamListener, Message.
                 SubscriptionsQueries.getUsersSubscribedToComments(sql, jmsg.getMID(), jmsg.getUser().getUID())
                         .stream().map(User::getUID).collect(Collectors.toList());
         logger.info(String.format("%d users subscribed to %d", threadUsers.size(), jmsg.getMID()));
-        synchronized (ws.clients) {
-            Long legacycount = ws.clients.stream().filter(c -> c.legacy && c.allReplies).count();
+        synchronized (wsHandler.clients) {
+            Long legacycount = wsHandler.clients.stream().filter(c -> c.legacy && c.allReplies).count();
             logger.info(String.format("%d legacy users watched %d", legacycount, jmsg.getMID()));
-            ws.clients.stream().filter(c -> !c.legacy && threadUsers.contains(c.visitor.getUID())).forEach(c -> {
+            wsHandler.clients.stream().filter(c -> !c.legacy && threadUsers.contains(c.visitor.getUID())).forEach(c -> {
                 try {
                     logger.info("sending reply to " + c.visitor.getUID());
                     c.session.sendMessage(new TextMessage(json));
@@ -154,7 +149,7 @@ public class XMPPConnection implements Runnable, Stream.StreamListener, Message.
                     logger.log(Level.WARNING, "ws error", e);
                 }
             });
-            ws.clients.stream().filter(c -> (c.legacy && c.allReplies) || (c.legacy && c.MID == jmsg.getMID())).forEach(c -> {
+            wsHandler.clients.stream().filter(c -> (c.legacy && c.allReplies) || (c.legacy && c.MID == jmsg.getMID())).forEach(c -> {
                 try {
                     logger.info("sending reply to legacy client " + c.visitor.getUID());
                     c.session.sendMessage(new TextMessage(json));
diff --git a/src/main/java/com/juick/ws/configuration/WebsocketConfiguration.java b/src/main/java/com/juick/ws/configuration/WebsocketConfiguration.java
index 0bb293f4..223f8d63 100644
--- a/src/main/java/com/juick/ws/configuration/WebsocketConfiguration.java
+++ b/src/main/java/com/juick/ws/configuration/WebsocketConfiguration.java
@@ -1,6 +1,7 @@
 package com.juick.ws.configuration;
 
 import com.juick.ws.WebsocketComponent;
+import com.juick.ws.XMPPConnection;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
@@ -10,12 +11,13 @@ import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.datasource.DriverManagerDataSource;
 import org.springframework.web.servlet.config.annotation.EnableWebMvc;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
-import org.springframework.web.socket.WebSocketHandler;
 import org.springframework.web.socket.config.annotation.EnableWebSocket;
 import org.springframework.web.socket.config.annotation.WebSocketConfigurer;
 import org.springframework.web.socket.config.annotation.WebSocketHandlerRegistry;
 
 import javax.inject.Inject;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 
 /**
  * Created by vitalyster on 28.06.2016.
@@ -28,12 +30,18 @@ import javax.inject.Inject;
 public class WebsocketConfiguration extends WebMvcConfigurerAdapter implements WebSocketConfigurer {
     @Inject
     Environment env;
-
+    ExecutorService xmppThread = Executors.newSingleThreadExecutor();
     @Bean
-    WebSocketHandler wsHandler() {
+    WebsocketComponent wsHandler() {
         return new WebsocketComponent();
     }
     @Bean
+    XMPPConnection xmpp() {
+        XMPPConnection xmpp = new XMPPConnection(env, wsHandler());
+        xmppThread.submit(xmpp);
+        return xmpp;
+    }
+    @Bean
     JdbcTemplate jdbc() {
         DriverManagerDataSource dataSource = new DriverManagerDataSource();
         dataSource.setDriverClassName(env.getProperty("datasource_driver", "com.mysql.jdbc.Driver"));
-- 
cgit v1.2.3


From e3fdbbcd833e4be70b4e62e541cfd03b2f4d129a Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Thu, 30 Jun 2016 11:57:55 +0300
Subject: update deps

---
 .gitignore                                         |   1 +
 deps/com.juick.xmpp                                |   2 +-
 src/main/java/com/juick/ws/XMPPConnection.java     |   4 +-
 .../com/juick/xmpp/extensions/JuickMessage.java    | 183 +++++++++++++++++++++
 .../java/com/juick/xmpp/extensions/JuickUser.java  |  75 +++++++++
 5 files changed, 262 insertions(+), 3 deletions(-)
 create mode 100644 src/main/java/com/juick/xmpp/extensions/JuickMessage.java
 create mode 100644 src/main/java/com/juick/xmpp/extensions/JuickUser.java

(limited to 'src/main/java/com')

diff --git a/.gitignore b/.gitignore
index e3baf212..c26bb4f3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /dist/
 /build/
 .gradle/*
+.idea/**
\ No newline at end of file
diff --git a/deps/com.juick.xmpp b/deps/com.juick.xmpp
index a096ecc6..1d87d06b 160000
--- a/deps/com.juick.xmpp
+++ b/deps/com.juick.xmpp
@@ -1 +1 @@
-Subproject commit a096ecc6d011bf0f6c738b10d7d0a7319ffcf2dc
+Subproject commit 1d87d06b72011cb26813cf084102a02e9dcd96e9
diff --git a/src/main/java/com/juick/ws/XMPPConnection.java b/src/main/java/com/juick/ws/XMPPConnection.java
index d5cb4eba..d0bdc42f 100644
--- a/src/main/java/com/juick/ws/XMPPConnection.java
+++ b/src/main/java/com/juick/ws/XMPPConnection.java
@@ -62,8 +62,8 @@ public class XMPPConnection implements Runnable, Stream.StreamListener, Message.
     }
 
     @Override
-    public void onStreamFail(String msg) {
-        logger.severe("XMPP stream failed: " + msg);
+    public void onStreamFail(Exception ex) {
+        logger.log(Level.SEVERE, "XMPP stream failed", ex);
     }
 
     @Override
diff --git a/src/main/java/com/juick/xmpp/extensions/JuickMessage.java b/src/main/java/com/juick/xmpp/extensions/JuickMessage.java
new file mode 100644
index 00000000..a7fd1e35
--- /dev/null
+++ b/src/main/java/com/juick/xmpp/extensions/JuickMessage.java
@@ -0,0 +1,183 @@
+/*
+ * Juick
+ * Copyright (C) 2008-2011, Ugnich Anton
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.juick.xmpp.extensions;
+
+import com.juick.xmpp.utils.XmlUtils;
+import com.juick.xmpp.*;
+import java.io.IOException;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.TimeZone;
+
+import org.xmlpull.v1.XmlPullParser;
+import org.xmlpull.v1.XmlPullParserException;
+
+/**
+ *
+ * @author Ugnich Anton
+ */
+public class JuickMessage extends com.juick.Message implements StanzaChild {
+
+    public final static String XMLNS = "http://juick.com/message";
+    public final static String TagName = "juick";
+
+    private SimpleDateFormat df;
+
+    public JuickMessage() {
+        df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        df.setTimeZone(TimeZone.getTimeZone("UTC"));
+    }
+
+    public JuickMessage(com.juick.Message msg) {
+        super(msg);
+        df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        df.setTimeZone(TimeZone.getTimeZone("UTC"));
+    }
+
+    @Override
+    public String getXMLNS() {
+        return XMLNS;
+    }
+
+    @Override
+    public JuickMessage parse(XmlPullParser parser) throws XmlPullParserException, IOException, ParseException {
+        JuickMessage jmsg = new JuickMessage();
+
+        final String sMID = parser.getAttributeValue(null, "mid");
+        if (sMID != null) {
+            jmsg.setMID(Integer.parseInt(sMID));
+        }
+        final String sRID = parser.getAttributeValue(null, "rid");
+        if (sRID != null) {
+            jmsg.setRID(Integer.parseInt(sRID));
+        }
+        final String sReplyTo = parser.getAttributeValue(null, "replyto");
+        if (sReplyTo != null) {
+            jmsg.ReplyTo = Integer.parseInt(sReplyTo);
+        }
+        final String sPrivacy = parser.getAttributeValue(null, "privacy");
+        if (sPrivacy != null) {
+            jmsg.Privacy = Integer.parseInt(sPrivacy);
+        }
+        final String sFriendsOnly = parser.getAttributeValue(null, "friendsonly");
+        if (sFriendsOnly != null) {
+            jmsg.FriendsOnly = true;
+        }
+        final String sReadOnly = parser.getAttributeValue(null, "readonly");
+        if (sReadOnly != null) {
+            jmsg.ReadOnly = true;
+        }
+
+        jmsg.setDate(df.parse(parser.getAttributeValue(null, "ts")));
+        jmsg.AttachmentType = parser.getAttributeValue(null, "attach");
+
+        while (parser.next() == XmlPullParser.START_TAG) {
+            final String tag = parser.getName();
+            final String xmlns = parser.getNamespace();
+            if (tag.equals("body")) {
+                jmsg.setText(XmlUtils.getTagText(parser));
+            } else if (tag.equals(JuickUser.TagName) && xmlns != null && xmlns.equals(JuickUser.XMLNS)) {
+                jmsg.setUser(new JuickUser().parse(parser));
+            } else if (tag.equals("tag")) {
+                jmsg.Tags.add(XmlUtils.getTagText(parser));
+            } else {
+                XmlUtils.skip(parser);
+            }
+        }
+        return jmsg;
+    }
+
+    @Override
+    public String toString() {
+        String ret = "";
+
+        ret = "<" + TagName + " xmlns=\"" + XMLNS + "\"";
+        if (getMID() > 0) {
+            ret += " mid=\"" + getMID() + "\"";
+        }
+        if (getRID() > 0) {
+            ret += " rid=\"" + getRID() + "\"";
+        }
+        if (ReplyTo > 0) {
+            ret += " replyto=\"" + ReplyTo + "\"";
+        }
+        ret += " privacy=\"" + Privacy + "\"";
+        if (FriendsOnly) {
+            ret += " friendsonly=\"1\"";
+        }
+        if (ReadOnly) {
+            ret += " readonly=\"1\"";
+        }
+        if (getDate() != null) {
+            ret += " ts=\"" + df.format(getDate()) + "\"";
+        }
+        if (AttachmentType != null) {
+            ret += " attach=\"" + AttachmentType + "\"";
+        }
+        ret += ">";
+        if (getUser() != null) {
+            ret += JuickUser.toString(getUser());
+        }
+        if (getText() != null) {
+            ret += "<body>" + XmlUtils.escape(getText()) + "</body>";
+        }
+        if (!Tags.isEmpty()) {
+            for (String Tag : Tags) {
+                ret += "<tag>" + XmlUtils.escape(Tag) + "</tag>";
+            }
+        }
+        ret += "</" + TagName + ">";
+
+        return ret;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (!(obj instanceof JuickMessage)) {
+            return false;
+        }
+        JuickMessage jmsg = (JuickMessage) obj;
+        return (this.getMID() == jmsg.getMID() && this.getRID() == jmsg.getRID());
+    }
+
+    @Override
+    public int compareTo(Object obj) throws ClassCastException {
+        if (!(obj instanceof JuickMessage)) {
+            throw new ClassCastException();
+        }
+        JuickMessage jmsg = (JuickMessage) obj;
+
+        if (this.getMID() != jmsg.getMID()) {
+            if (this.getMID() > jmsg.getMID()) {
+                return -1;
+            } else {
+                return 1;
+            }
+        }
+
+        if (this.getRID() != jmsg.getRID()) {
+            if (this.getRID() < jmsg.getRID()) {
+                return -1;
+            } else {
+                return 1;
+            }
+        }
+
+        return 0;
+    }
+}
diff --git a/src/main/java/com/juick/xmpp/extensions/JuickUser.java b/src/main/java/com/juick/xmpp/extensions/JuickUser.java
new file mode 100644
index 00000000..edc6749a
--- /dev/null
+++ b/src/main/java/com/juick/xmpp/extensions/JuickUser.java
@@ -0,0 +1,75 @@
+/*
+ * Juick
+ * Copyright (C) 2008-2011, Ugnich Anton
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.juick.xmpp.extensions;
+
+import com.juick.xmpp.utils.XmlUtils;
+import com.juick.xmpp.*;
+import java.io.IOException;
+import org.xmlpull.v1.XmlPullParser;
+import org.xmlpull.v1.XmlPullParserException;
+
+/**
+ *
+ * @author Ugnich Anton
+ */
+public class JuickUser extends com.juick.User implements StanzaChild {
+
+    public final static String XMLNS = "http://juick.com/user";
+    public final static String TagName = "user";
+
+    public JuickUser() {
+    }
+
+    public JuickUser(com.juick.User user) {
+        super(user);
+    }
+
+    @Override
+    public String getXMLNS() {
+        return XMLNS;
+    }
+
+    @Override
+    public JuickUser parse(final XmlPullParser parser) throws XmlPullParserException, IOException {
+        JuickUser juser = new JuickUser();
+        String strUID = parser.getAttributeValue(null, "uid");
+        if (strUID != null) {
+            juser.setUID(Integer.parseInt(strUID));
+        }
+        juser.setUName(parser.getAttributeValue(null, "uname"));
+        XmlUtils.skip(parser);
+        return juser;
+    }
+
+    public static String toString(com.juick.User user) {
+        String str = "<" + TagName + " xmlns='" + XMLNS + "'";
+        if (user.getUID() > 0) {
+            str += " uid='" + user.getUID() + "'";
+        }
+        if (user.getUName() != null && user.getUName().length() > 0) {
+            str += " uname='" + XmlUtils.escape(user.getUName()) + "'";
+        }
+        str += "/>";
+        return str;
+    }
+
+    @Override
+    public String toString() {
+        return toString(this);
+    }
+}
-- 
cgit v1.2.3


From fb4aa5389924cb11fa8bf6489baf29ca8d7a6814 Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Thu, 30 Jun 2016 12:06:48 +0300
Subject: fix parsing date

---
 src/main/java/com/juick/xmpp/extensions/JuickMessage.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'src/main/java/com')

diff --git a/src/main/java/com/juick/xmpp/extensions/JuickMessage.java b/src/main/java/com/juick/xmpp/extensions/JuickMessage.java
index a7fd1e35..ac45f3d2 100644
--- a/src/main/java/com/juick/xmpp/extensions/JuickMessage.java
+++ b/src/main/java/com/juick/xmpp/extensions/JuickMessage.java
@@ -83,7 +83,10 @@ public class JuickMessage extends com.juick.Message implements StanzaChild {
             jmsg.ReadOnly = true;
         }
 
-        jmsg.setDate(df.parse(parser.getAttributeValue(null, "ts")));
+        String timestampString = parser.getAttributeValue(null, "ts");
+        if (timestampString != null) {
+            jmsg.setDate(df.parse(timestampString));
+        }
         jmsg.AttachmentType = parser.getAttributeValue(null, "attach");
 
         while (parser.next() == XmlPullParser.START_TAG) {
-- 
cgit v1.2.3


From 1f82412b053dce31d01e0c384bd18ad3b9e101ec Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Thu, 30 Jun 2016 12:19:14 +0300
Subject: allow anonymous ws

---
 src/main/java/com/juick/ws/WebsocketComponent.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/main/java/com')

diff --git a/src/main/java/com/juick/ws/WebsocketComponent.java b/src/main/java/com/juick/ws/WebsocketComponent.java
index 8ccccb3b..d38f7b69 100644
--- a/src/main/java/com/juick/ws/WebsocketComponent.java
+++ b/src/main/java/com/juick/ws/WebsocketComponent.java
@@ -66,7 +66,7 @@ public class WebsocketComponent extends TextWebSocketHandler {
 
         int MID = 0;
         SocketSubscribed sockSubscr = null;
-        if (hLocation.getPath().equals("/") && visitor.getUID() > 0) {
+        if (hLocation.getPath().equals("/")) {
             logger.info(String.format("user %d connected", visitor.getUID()));
             sockSubscr = new SocketSubscribed(session, hXRealIP, visitor, false);
         } else if (hLocation.getPath().equals("/_all")) {
-- 
cgit v1.2.3


From e0d4d97777962c6f1752d7772b57392ec53dfc21 Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Thu, 30 Jun 2016 12:29:38 +0300
Subject: allow anonymous replies

---
 src/main/java/com/juick/ws/WebsocketComponent.java |  6 +++++-
 src/main/java/com/juick/ws/XMPPConnection.java     | 25 ++++++++++++----------
 2 files changed, 19 insertions(+), 12 deletions(-)

(limited to 'src/main/java/com')

diff --git a/src/main/java/com/juick/ws/WebsocketComponent.java b/src/main/java/com/juick/ws/WebsocketComponent.java
index d38f7b69..daf17753 100644
--- a/src/main/java/com/juick/ws/WebsocketComponent.java
+++ b/src/main/java/com/juick/ws/WebsocketComponent.java
@@ -97,7 +97,10 @@ public class WebsocketComponent extends TextWebSocketHandler {
             }
         }
         if (sockSubscr != null) {
-            clients.add(sockSubscr);
+            synchronized (clients) {
+                clients.add(sockSubscr);
+                logger.info(clients.size() + " clients connected");
+            }
         }
     }
     @Override
@@ -110,6 +113,7 @@ public class WebsocketComponent extends TextWebSocketHandler {
                 }
                 return false;
             });
+            logger.info(clients.size() + " clients connected");
         }
 
     }
diff --git a/src/main/java/com/juick/ws/XMPPConnection.java b/src/main/java/com/juick/ws/XMPPConnection.java
index d0bdc42f..4a80eec5 100644
--- a/src/main/java/com/juick/ws/XMPPConnection.java
+++ b/src/main/java/com/juick/ws/XMPPConnection.java
@@ -108,11 +108,11 @@ public class XMPPConnection implements Runnable, Stream.StreamListener, Message.
         String json = messageSerializer.serialize(jmsg).toString();
         List<Integer> uids = SubscriptionsQueries.getSubscribedUsers(sql, jmsg.getUser().getUID(), jmsg.getMID())
                 .stream().map(User::getUID).collect(Collectors.toList());
-        logger.info(String.format("%d users subscribed to %d", uids.size(), jmsg.getUser().getUID()));
         synchronized (wsHandler.clients) {
-            Long legacycount = wsHandler.clients.stream().filter(c -> c.legacy && c.allMessages).count();
-            logger.info(String.format("%d legacy users watched %d", legacycount, jmsg.getMID()));
-            wsHandler.clients.stream().filter(c -> !c.legacy && uids.contains(c.visitor.getUID())).forEach(c -> {
+            wsHandler.clients.stream().filter(c ->
+                    (!c.legacy && c.visitor.getUID() == 0) // anonymous users
+                    || (!c.legacy && uids.contains(c.visitor.getUID()))) // subscriptions
+                    .forEach(c -> {
                 try {
                     logger.info("sending message to " + c.visitor.getUID());
                     c.session.sendMessage(new TextMessage(json));
@@ -120,7 +120,9 @@ public class XMPPConnection implements Runnable, Stream.StreamListener, Message.
                     logger.log(Level.WARNING, "ws error", e);
                 }
             });
-            wsHandler.clients.stream().filter(c -> c.legacy && c.allMessages).forEach(c -> {
+            wsHandler.clients.stream().filter(c ->
+                    c.legacy && c.allMessages) // legacy all posts
+                    .forEach(c -> {
                 try {
                     logger.info("sending message to legacy client " + c.visitor.getUID());
                     c.session.sendMessage(new TextMessage(json));
@@ -133,15 +135,14 @@ public class XMPPConnection implements Runnable, Stream.StreamListener, Message.
 
     private void onJuickMessageReply(com.juick.Message jmsg) {
         String json = messageSerializer.serialize(jmsg).toString();
-        logger.info("got reply: " + json);
         List<Integer> threadUsers =
                 SubscriptionsQueries.getUsersSubscribedToComments(sql, jmsg.getMID(), jmsg.getUser().getUID())
                         .stream().map(User::getUID).collect(Collectors.toList());
-        logger.info(String.format("%d users subscribed to %d", threadUsers.size(), jmsg.getMID()));
         synchronized (wsHandler.clients) {
-            Long legacycount = wsHandler.clients.stream().filter(c -> c.legacy && c.allReplies).count();
-            logger.info(String.format("%d legacy users watched %d", legacycount, jmsg.getMID()));
-            wsHandler.clients.stream().filter(c -> !c.legacy && threadUsers.contains(c.visitor.getUID())).forEach(c -> {
+            wsHandler.clients.stream().filter(c ->
+                    (!c.legacy && c.visitor.getUID() == 0) // anonymous users
+                    || (!c.legacy && threadUsers.contains(c.visitor.getUID()))) // subscriptions
+                    .forEach(c -> {
                 try {
                     logger.info("sending reply to " + c.visitor.getUID());
                     c.session.sendMessage(new TextMessage(json));
@@ -149,7 +150,9 @@ public class XMPPConnection implements Runnable, Stream.StreamListener, Message.
                     logger.log(Level.WARNING, "ws error", e);
                 }
             });
-            wsHandler.clients.stream().filter(c -> (c.legacy && c.allReplies) || (c.legacy && c.MID == jmsg.getMID())).forEach(c -> {
+            wsHandler.clients.stream().filter(c ->
+                    (c.legacy && c.allReplies) || (c.legacy && c.MID == jmsg.getMID())) // legacy replies
+                    .forEach(c -> {
                 try {
                     logger.info("sending reply to legacy client " + c.visitor.getUID());
                     c.session.sendMessage(new TextMessage(json));
-- 
cgit v1.2.3


From 4bc9b403ff3cac9ee115a788b18cffff520a9e3b Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Thu, 30 Jun 2016 12:33:46 +0300
Subject: fix session close

---
 src/main/java/com/juick/ws/WebsocketComponent.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/main/java/com')

diff --git a/src/main/java/com/juick/ws/WebsocketComponent.java b/src/main/java/com/juick/ws/WebsocketComponent.java
index daf17753..5dfe8237 100644
--- a/src/main/java/com/juick/ws/WebsocketComponent.java
+++ b/src/main/java/com/juick/ws/WebsocketComponent.java
@@ -107,7 +107,7 @@ public class WebsocketComponent extends TextWebSocketHandler {
     public void afterConnectionClosed(WebSocketSession session, CloseStatus status) throws Exception {
         synchronized (clients) {
             clients.removeIf(c -> {
-                if (c.session.equals(session)) {
+                if (c.session.getId().equals(session.getId())) {
                     logger.info(String.format("session from %s closed with status %d", c.clientName, status.getCode()));
                     return true;
                 }
-- 
cgit v1.2.3


From d3a850e35880ae5493b3a197e0e8f58da99350f8 Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Thu, 30 Jun 2016 13:08:52 +0300
Subject: fix thread subscription

---
 src/main/java/com/juick/ws/WebsocketComponent.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/main/java/com')

diff --git a/src/main/java/com/juick/ws/WebsocketComponent.java b/src/main/java/com/juick/ws/WebsocketComponent.java
index 5dfe8237..e87b96a5 100644
--- a/src/main/java/com/juick/ws/WebsocketComponent.java
+++ b/src/main/java/com/juick/ws/WebsocketComponent.java
@@ -79,7 +79,7 @@ public class WebsocketComponent extends TextWebSocketHandler {
             sockSubscr.allReplies = true;
         } else if (hLocation.getPath().matches("/\\d+$")) {
             try {
-                MID = Integer.parseInt(hLocation.getPath().substring(8));
+                MID = Integer.parseInt(hLocation.getPath().substring(1));
             } catch (Exception e) {
             }
             if (MID > 0) {
-- 
cgit v1.2.3