single xmpp component, WIP

1 files changed, 21 insertions, 19 deletions

diff --git a/src/main/java/com/juick/xmpp/s2s/ConnectionIn.java b/src/main/java/com/juick/xmpp/s2s/ConnectionIn.java
index c215e375..a8572ddc 100644
--- a/src/main/java/com/juick/xmpp/s2s/ConnectionIn.java
+++ b/src/main/java/com/juick/xmpp/s2s/ConnectionIn.java
@@ -1,9 +1,6 @@
 package com.juick.xmpp.s2s;
 
-import com.juick.xmpp.Iq;
-import com.juick.xmpp.JID;
-import com.juick.xmpp.Message;
-import com.juick.xmpp.Presence;
+import com.juick.xmpp.*;
 import com.juick.xmpp.utils.XmlUtils;
 import org.xmlpull.v1.XmlPullParser;
 
@@ -31,9 +28,14 @@ public class ConnectionIn extends Connection {
     public long tsRemoteData = 0;
     public long packetsRemote = 0;
 
-    public ConnectionIn(AsynchronousSocketChannel socket) {
+    JuickBot bot;
+    Stream xmpp;
+
+    public ConnectionIn(AsynchronousSocketChannel socket, JuickBot bot, Stream xmpp) {
         super();
         this.socket = socket;
+        this.bot = bot;
+        this.xmpp = xmpp;
         streamID = UUID.randomUUID().toString();
     }
 
@@ -57,7 +59,7 @@ public class ConnectionIn extends Connection {
 
             String openStream = "<?xml version='1.0'?><stream:stream xmlns='jabber:server' " +
                     "xmlns:stream='http://etherx.jabber.org/streams' xmlns:db='jabber:server:dialback' from='" +
-                    XMPPComponent.HOSTNAME + "' id='" + streamID + "' version='1.0'>";
+                    S2SComponent.HOSTNAME + "' id='" + streamID + "' version='1.0'>";
             if (xmppversionnew) {
                 openStream += "<stream:features></stream:features>";
             }
@@ -77,14 +79,14 @@ public class ConnectionIn extends Connection {
                     String dfrom = parser.getAttributeValue(null, "from");
                     String to = parser.getAttributeValue(null, "to");
                     LOGGER.info("STREAM FROM " + dfrom + " TO " + to + " " + streamID + " ASKING FOR DIALBACK");
-                    if (dfrom.endsWith(XMPPComponent.HOSTNAME) && (dfrom.equals(XMPPComponent.HOSTNAME) || dfrom.endsWith("." + XMPPComponent.HOSTNAME))) {
+                    if (dfrom.endsWith(S2SComponent.HOSTNAME) && (dfrom.equals(S2SComponent.HOSTNAME) || dfrom.endsWith("." + S2SComponent.HOSTNAME))) {
                         break;
                     }
-                    if (dfrom != null && to != null && to.equals(XMPPComponent.HOSTNAME)) {
+                    if (dfrom != null && to != null && to.equals(S2SComponent.HOSTNAME)) {
                         String dbKey = XmlUtils.getTagText(parser);
                         updateTsRemoteData();
 
-                        ConnectionOut c = XMPPComponent.getConnectionOut(dfrom, false);
+                        ConnectionOut c = S2SComponent.getConnectionOut(dfrom, false);
                         if (c != null) {
                             c.sendDialbackVerify(streamID, dbKey);
                         } else {
@@ -115,15 +117,15 @@ public class ConnectionIn extends Connection {
                 } else if (tag.equals("presence") && checkFromTo(parser)) {
                     Presence p = Presence.parse(parser, null);
                     if (p != null && (p.type == null || !p.type.equals(Presence.Type.error))) {
-                        JuickBot.incomingPresence(p);
+                        bot.incomingPresence(p);
                     }
                 } else if (tag.equals("message") && checkFromTo(parser)) {
                     updateTsRemoteData();
-                    Message msg = Message.parse(parser, XMPPComponent.childParsers);
+                    Message msg = Message.parse(parser, S2SComponent.childParsers);
                     if (msg != null && (msg.type == null || !msg.type.equals(Message.Type.error))) {
                         LOGGER.info("STREAM " + streamID + ": " + msg.toString());
-                        if (!JuickBot.incomingMessage(msg)) {
-                            XMPPComponent.connRouter.sendStanza(msg.toString());
+                        if (!bot.incomingMessage(msg)) {
+                            xmpp.send(msg);
                         }
                     }
                 } else if (tag.equals("iq") && checkFromTo(parser)) {
@@ -132,22 +134,22 @@ public class ConnectionIn extends Connection {
                     String xml = XmlUtils.parseToString(parser, true);
                     if (type == null || !type.equals(Iq.Type.error)) {
                         LOGGER.info("STREAM " + streamID + ": " + xml);
-                        XMPPComponent.connRouter.sendStanza(xml);
+                        xmpp.send(xml);
                     }
                 } else {
                     LOGGER.info("STREAM " + streamID + ": " + XmlUtils.parseToString(parser, true));
                 }
             }
             LOGGER.warning("STREAM " + streamID + " FINISHED");
-            XMPPComponent.removeConnectionIn(this);
+            S2SComponent.removeConnectionIn(this);
             closeConnection();
         } catch (EOFException ex) {
             LOGGER.info(String.format("STREAM %s CLOSED (dirty)", streamID));
-            XMPPComponent.removeConnectionIn(this);
+            S2SComponent.removeConnectionIn(this);
             closeConnection();
         } catch (Exception e) {
             LOGGER.log(Level.WARNING, "STREAM " + streamID + " ERROR", e);
-            XMPPComponent.removeConnectionIn(this);
+            S2SComponent.removeConnectionIn(this);
             closeConnection();
         }
     }
@@ -158,7 +160,7 @@ public class ConnectionIn extends Connection {
 
     public void sendDialbackResult(String sfrom, String type) {
         try {
-            sendStanza("<db:result from='" + XMPPComponent.HOSTNAME + "' to='" + sfrom + "' type='" + type + "'/>");
+            sendStanza("<db:result from='" + S2SComponent.HOSTNAME + "' to='" + sfrom + "' type='" + type + "'/>");
             if (type.equals("valid")) {
                 from.add(sfrom);
                 LOGGER.info("STREAM FROM " + sfrom + " " + streamID + " READY");
@@ -173,7 +175,7 @@ public class ConnectionIn extends Connection {
         String cto = parser.getAttributeValue(null, "to");
         if (cfrom != null && cto != null && !cfrom.isEmpty() && !cto.isEmpty()) {
             JID jidto = new JID(cto);
-            if (jidto.Host != null && jidto.Username != null && jidto.Host.equals(XMPPComponent.HOSTNAME) && jidto.Username.matches("^[a-zA-Z0-9\\-]{2,16}$")) {
+            if (jidto.Host != null && jidto.Username != null && jidto.Host.equals(S2SComponent.HOSTNAME) && jidto.Username.matches("^[a-zA-Z0-9\\-]{2,16}$")) {
                 JID jidfrom = new JID(cfrom);
                 int size = from.size();
                 for (int i = 0; i < size; i++) {