1 files changed, 10 insertions, 309 deletions

diff --git a/src/declarative/debugger/qdeclarativedebugservice.cpp b/src/declarative/debugger/qdeclarativedebugservice.cpp
index e916de4..1b39f1c 100644
--- a/src/declarative/debugger/qdeclarativedebugservice.cpp
+++ b/src/declarative/debugger/qdeclarativedebugservice.cpp
@@ -40,301 +40,14 @@
 ****************************************************************************/
 
 #include "private/qdeclarativedebugservice_p.h"
+#include "private/qdeclarativedebugservice_p_p.h"
+#include "private/qdeclarativedebugserver_p.h"
 
-#include "private/qpacketprotocol_p.h"
-#include "private/qdeclarativeengine_p.h"
-
-#include <QtCore/qdebug.h>
-#include <QtNetwork/qtcpserver.h>
-#include <QtNetwork/qtcpsocket.h>
-#include <QtCore/qstringlist.h>
-
-#include <private/qobject_p.h>
-#include <private/qapplication_p.h>
-#include <QtGui/qapplication.h>
+#include <QtCore/QDebug>
+#include <QtCore/QStringList>
 
 QT_BEGIN_NAMESPACE
 
-/*
-  QDeclarativeDebug Protocol (Version 1):
-
-  handshake:
-    1. Client sends
-         "QDeclarativeDebugServer" 0 version pluginNames
-       version: an int representing the highest protocol version the client knows
-       pluginNames: plugins available on client side
-    2. Server sends
-         "QDeclarativeDebugClient" 0 version pluginNames
-       version: an int representing the highest protocol version the client & server know
-       pluginNames: plugins available on server side. plugins both in the client and server message are enabled.
-  client plugin advertisement
-    1. Client sends
-         "QDeclarativeDebugServer" 1 pluginNames
-  server plugin advertisement
-    1. Server sends
-         "QDeclarativeDebugClient" 1 pluginNames
-  plugin communication:
-       Everything send with a header different to "QDeclarativeDebugServer" is sent to the appropriate plugin.
-  */
-
-const int protocolVersion = 1;
-
-class QDeclarativeDebugServerPrivate;
-class QDeclarativeDebugServer : public QObject
-{
-    Q_OBJECT
-    Q_DECLARE_PRIVATE(QDeclarativeDebugServer)
-    Q_DISABLE_COPY(QDeclarativeDebugServer)
-public:
-    static QDeclarativeDebugServer *instance();
-    void listen();
-    void waitForConnection();
-    bool hasDebuggingClient() const;
-
-private Q_SLOTS:
-    void readyRead();
-    void newConnection();
-
-private:
-    friend class QDeclarativeDebugService;
-    friend class QDeclarativeDebugServicePrivate;
-    QDeclarativeDebugServer(int); 
-};
-
-class QDeclarativeDebugServerPrivate : public QObjectPrivate
-{
-    Q_DECLARE_PUBLIC(QDeclarativeDebugServer)
-public:
-    QDeclarativeDebugServerPrivate();
-
-    void advertisePlugins();
-
-    int port;
-    QTcpSocket *connection;
-    QPacketProtocol *protocol;
-    QHash<QString, QDeclarativeDebugService *> plugins;
-    QStringList clientPlugins;
-    QTcpServer *tcpServer;
-    bool gotHello;
-};
-
-class QDeclarativeDebugServicePrivate : public QObjectPrivate
-{
-    Q_DECLARE_PUBLIC(QDeclarativeDebugService)
-public:
-    QDeclarativeDebugServicePrivate();
-
-    QString name;
-    QDeclarativeDebugServer *server;
-};
-
-QDeclarativeDebugServerPrivate::QDeclarativeDebugServerPrivate()
-: connection(0), protocol(0), gotHello(false)
-{
-}
-
-void QDeclarativeDebugServerPrivate::advertisePlugins()
-{
-    if (!connection
-            || connection->state() != QTcpSocket::ConnectedState
-            || !gotHello)
-        return;
-
-    QPacket pack;
-    pack << QString(QLatin1String("QDeclarativeDebugClient")) << 1 << plugins.keys();
-    protocol->send(pack);
-    connection->flush();
-}
-
-void QDeclarativeDebugServer::listen()
-{
-    Q_D(QDeclarativeDebugServer);
-
-    d->tcpServer = new QTcpServer(this);
-    QObject::connect(d->tcpServer, SIGNAL(newConnection()), this, SLOT(newConnection()));
-    if (d->tcpServer->listen(QHostAddress::Any, d->port)) 
-        qWarning("QDeclarativeDebugServer: Waiting for connection on port %d...", d->port);
-    else
-        qWarning("QDeclarativeDebugServer: Unable to listen on port %d", d->port);
-}
-
-void QDeclarativeDebugServer::waitForConnection()
-{
-    Q_D(QDeclarativeDebugServer);
-    d->tcpServer->waitForNewConnection(-1);
-}
-
-void QDeclarativeDebugServer::newConnection()
-{
-    Q_D(QDeclarativeDebugServer);
-
-    if (d->connection) {
-        qWarning("QDeclarativeDebugServer error: another client is already connected");
-        QTcpSocket *faultyConnection = d->tcpServer->nextPendingConnection();
-        delete faultyConnection;
-        return;
-    }
-
-    d->connection = d->tcpServer->nextPendingConnection();
-    d->connection->setParent(this);
-    d->protocol = new QPacketProtocol(d->connection, this);
-    QObject::connect(d->protocol, SIGNAL(readyRead()), this, SLOT(readyRead()));
-}
-
-bool QDeclarativeDebugServer::hasDebuggingClient() const
-{
-    Q_D(const QDeclarativeDebugServer);
-    return d->connection
-            && (d->connection->state() == QTcpSocket::ConnectedState)
-            && d->gotHello;
-}
-
-QDeclarativeDebugServer *QDeclarativeDebugServer::instance()
-{
-    static bool commandLineTested = false;
-    static QDeclarativeDebugServer *server = 0;
-
-    if (!commandLineTested) {
-        commandLineTested = true;
-
-#ifndef QDECLARATIVE_NO_DEBUG_PROTOCOL
-        QApplicationPrivate *appD = static_cast<QApplicationPrivate*>(QObjectPrivate::get(qApp));
-        // ### remove port definition when protocol is changed
-        int port = 0;
-        bool block = false;
-        bool ok = false;
-
-        // format: qmljsdebugger=port:3768[,block]
-        if (!appD->qmljsDebugArgumentsString().isEmpty()) {
-            if (!QDeclarativeEnginePrivate::qml_debugging_enabled) {
-                qWarning() << QString::fromLatin1("QDeclarativeDebugServer: Ignoring \"-qmljsdebugger=%1\". "
-                              "Debugging has not been enabled.").arg(
-                                  appD->qmljsDebugArgumentsString()).toAscii().constData();
-                return 0;
-            }
-
-            if (appD->qmljsDebugArgumentsString().indexOf(QLatin1String("port:")) == 0) {
-                int separatorIndex = appD->qmljsDebugArgumentsString().indexOf(QLatin1Char(','));
-                port = appD->qmljsDebugArgumentsString().mid(5, separatorIndex - 5).toInt(&ok);
-            }
-            block = appD->qmljsDebugArgumentsString().contains(QLatin1String("block"));
-
-            if (ok) {
-                server = new QDeclarativeDebugServer(port);
-                server->listen();
-                if (block) {
-                    server->waitForConnection();
-                }
-            } else {
-                const QString message =
-                    QString::fromAscii("QDeclarativeDebugServer: Ignoring \"-qmljsdebugger=%1\". "
-                                       "Format is -qmljsdebugger=port:<port>[,block]").
-                                       arg(appD->qmljsDebugArgumentsString());
-                qWarning("%s", qPrintable(message));
-            }
-        }
-#endif
-    }
-
-    return server;
-}
-
-QDeclarativeDebugServer::QDeclarativeDebugServer(int port)
-: QObject(*(new QDeclarativeDebugServerPrivate))
-{
-    Q_D(QDeclarativeDebugServer);
-    d->port = port;
-}
-
-void QDeclarativeDebugServer::readyRead()
-{
-    Q_D(QDeclarativeDebugServer);
-
-    if (!d->gotHello) {
-        QPacket hello = d->protocol->read();
-
-        QString name;
-        int op;
-        hello >> name >> op;
-
-        if (name != QLatin1String("QDeclarativeDebugServer")
-                || op != 0) {
-            qWarning("QDeclarativeDebugServer: Invalid hello message");
-            QObject::disconnect(d->protocol, SIGNAL(readyRead()), this, SLOT(readyRead()));
-            d->protocol->deleteLater();
-            d->protocol = 0;
-            d->connection->deleteLater();
-            d->connection = 0;
-            return;
-        }
-
-        int version;
-        hello >> version >> d->clientPlugins;
-
-        QHash<QString, QDeclarativeDebugService*>::Iterator iter = d->plugins.begin();
-        for (; iter != d->plugins.end(); ++iter) {
-            QDeclarativeDebugService::Status newStatus = QDeclarativeDebugService::Unavailable;
-            if (d->clientPlugins.contains(iter.key()))
-                newStatus = QDeclarativeDebugService::Enabled;
-            iter.value()->statusChanged(newStatus);
-        }
-
-        QPacket helloAnswer;
-        helloAnswer << QString(QLatin1String("QDeclarativeDebugClient")) << 0 << protocolVersion << d->plugins.keys();
-        d->protocol->send(helloAnswer);
-        d->connection->flush();
-
-        d->gotHello = true;
-        qWarning("QDeclarativeDebugServer: Connection established");
-    }
-
-    QString debugServer(QLatin1String("QDeclarativeDebugServer"));
-
-    while (d->protocol->packetsAvailable()) {
-        QPacket pack = d->protocol->read();
-
-        QString name;
-        pack >> name;
-
-        if (name == debugServer) {
-            int op = -1;
-            pack >> op;
-
-            if (op == 1) {
-                // Service Discovery
-                QStringList oldClientPlugins = d->clientPlugins;
-                pack >> d->clientPlugins;
-
-                QHash<QString, QDeclarativeDebugService*>::Iterator iter = d->plugins.begin();
-                for (; iter != d->plugins.end(); ++iter) {
-                    const QString pluginName = iter.key();
-                    QDeclarativeDebugService::Status newStatus = QDeclarativeDebugService::Unavailable;
-                    if (d->clientPlugins.contains(pluginName))
-                        newStatus = QDeclarativeDebugService::Enabled;
-
-                    if (oldClientPlugins.contains(pluginName)
-                            != d->clientPlugins.contains(pluginName)) {
-                        iter.value()->statusChanged(newStatus);
-                    }
-                }
-            } else {
-                qWarning("QDeclarativeDebugServer: Invalid control message %d", op);
-            }
-        } else {
-            QByteArray message;
-            pack >> message;
-
-            QHash<QString, QDeclarativeDebugService *>::Iterator iter = 
-                d->plugins.find(name);
-            if (iter == d->plugins.end()) {
-                qWarning() << "QDeclarativeDebugServer: Message received for missing plugin" << name;
-            } else {
-                (*iter)->messageReceived(message);
-            }
-        }
-    }
-}
-
 QDeclarativeDebugServicePrivate::QDeclarativeDebugServicePrivate()
 : server(0)
 {
@@ -346,16 +59,16 @@ QDeclarativeDebugService::QDeclarativeDebugService(const QString &name, QObject
     Q_D(QDeclarativeDebugService);
     d->name = name;
     d->server = QDeclarativeDebugServer::instance();
+    d->status = QDeclarativeDebugService::NotConnected;
 
     if (!d->server)
         return;
 
-    if (d->server->d_func()->plugins.contains(name)) {
+    if (d->server->serviceNames().contains(name)) {
         qWarning() << "QDeclarativeDebugService: Conflicting plugin name" << name;
         d->server = 0;
     } else {
-        d->server->d_func()->plugins.insert(name, this);
-        d->server->d_func()->advertisePlugins();
+        d->server->addService(this);
     }
 }
 
@@ -363,8 +76,7 @@ QDeclarativeDebugService::~QDeclarativeDebugService()
 {
     Q_D(const QDeclarativeDebugService);
     if (d->server) {
-        d->server->d_func()->plugins.remove(d->name);
-        d->server->d_func()->advertisePlugins();
+        d->server->removeService(this);
     }
 }
 
@@ -377,13 +89,7 @@ QString QDeclarativeDebugService::name() const
 QDeclarativeDebugService::Status QDeclarativeDebugService::status() const
 {
     Q_D(const QDeclarativeDebugService);
-    if (!d->server
-            || !d->server->hasDebuggingClient())
-        return NotConnected;
-    if (d->server->d_func()->clientPlugins.contains(d->name))
-        return Enabled;
-
-    return Unavailable;
+    return d->status;
 }
 
 namespace {
@@ -500,10 +206,7 @@ void QDeclarativeDebugService::sendMessage(const QByteArray &message)
     if (status() != Enabled)
         return;
 
-    QPacket pack;
-    pack << d->name << message;
-    d->server->d_func()->protocol->send(pack);
-    d->server->d_func()->connection->flush();
+    d->server->sendMessage(this, message);
 }
 
 void QDeclarativeDebugService::statusChanged(Status)
@@ -515,5 +218,3 @@ void QDeclarativeDebugService::messageReceived(const QByteArray &)
 }
 
 QT_END_NAMESPACE
-
-#include <qdeclarativedebugservice.moc>