库更新

lib/JQLibrary/include/JQFoundation.h

@@ -203,7 +203,9 @@ QByteArray imageToByteArray(const QImage &image, const QString &format);
 
 QPixmap byteArrayToPixmap(const QByteArray &byteArray);
 
+#if ( ( defined Q_OS_MAC ) && !( defined Q_OS_IOS ) ) || ( defined Q_OS_WIN ) || ( defined Q_OS_LINUX )
 QPair< int, QByteArray > startProcessAndReadOutput(const QString &program, const QStringList &arguments, const int &maximumTime = 5 * 1000);
+#endif
 
 #ifdef QT_WIDGETS_LIB
 void tableWidgetSetHorizontalHeaderLabels(QTableWidget *tableWidget, const QStringList &stringList);

lib/JQLibrary/src/JQFoundation.cpp

@@ -387,6 +387,7 @@ QPixmap JQFoundation::byteArrayToPixmap(const QByteArray &byteArray)
     return Pixmap;
 }
 
+#if ( ( defined Q_OS_MAC ) && !( defined Q_OS_IOS ) ) || ( defined Q_OS_WIN ) || ( defined Q_OS_LINUX )
 QPair< int, QByteArray > JQFoundation::startProcessAndReadOutput(const QString &program, const QStringList &arguments, const int &maximumTime)
 {
     QPair< int, QByteArray > reply;
@@ -409,6 +410,7 @@ QPair< int, QByteArray > JQFoundation::startProcessAndReadOutput(const QString &
 
     return reply;
 }
+#endif
 
 #ifdef QT_WIDGETS_LIB
 void JQFoundation::tableWidgetSetHorizontalHeaderLabels(QTableWidget *tableWidget, const QStringList &stringList)

lib/JQNetwork/JQNetwork.pri

@@ -22,7 +22,6 @@ lessThan( QT_MAJOR_VERSION, 5 ) | lessThan( QT_MINOR_VERSION, 7 ) {
     error( JQNetwork request minimum Qt version is 5.7.0 )
 }
 
-
 JQNETWORK_BIN_NO1_DIR = $$[QT_VERSION]
 JQNETWORK_BIN_NO2_DIR = $$QT_ARCH
 JQNETWORK_BIN_NO3_DIR = $$[QMAKE_XSPEC]
@@ -125,6 +124,12 @@ contains( QT, qml ) {
 
     SOURCES *= \
         $$PWD/src/jqnetwork_clientforqml.cpp
+
+    RESOURCES *= \
+        $$PWD/qml/JQNetworkQml.qrc
+
+    QML_IMPORT_PATH *= \
+        $$PWD/qml/
 }
 
 DEFINES += JQNETWORK_COMPILE_MODE_STRING=\\\"$$JQNETWORK_COMPILE_MODE\\\"

lib/JQNetwork/include/jqnetwork_client.h

@@ -19,6 +19,7 @@
 struct JQNetworkClientSettings
 {
     QString dutyMark;
+    int maximumAutoConnectToHostWaitTime = 15 * 1000;
 
     std::function< void( const JQNetworkConnectPointer &, const QString &hostName, const quint16 &port ) > connectToHostErrorCallback = nullptr;
     std::function< void( const JQNetworkConnectPointer &, const QString &hostName, const quint16 &port ) > connectToHostTimeoutCallback = nullptr;
@@ -63,7 +64,11 @@ class JQNetworkClient: public QObject
 
     void createConnect(const QString &hostName, const quint16 &port);
 
-    bool waitForCreateConnect(const QString &hostName, const quint16 &port);
+    bool waitForCreateConnect(
+            const QString &hostName,
+            const quint16 &port,
+            const int &maximumConnectToHostWaitTime = -1
+        );
 
     qint32 sendPayloadData(
             const QString &hostName,

lib/JQNetwork/include/jqnetwork_clientforqml.h

@@ -16,27 +16,33 @@
 // Qt lib import
 #include <QJSValue>
 #include <QJSValueList>
+#include <QDateTime>
 
 // JQNetwork lib import
 #include <JQNetworkFoundation>
 
 #ifdef QT_QML_LIB
-#   define JQNETWORKCLIENTFORQML_REGISTERTYPE \
-    qmlRegisterType< JQNetworkClientForQml >( "JQNetwork", 1, 0, "JQNetworkClientForQml" );
+#   define JQNETWORKCLIENTFORQML_REGISTERTYPE( engine ) \
+    qmlRegisterType< JQNetworkClientForQml >( "JQNetworkClientForQml", 1, 0, "JQNetworkClientForQml" ); \
+    engine.addImportPath( ":/JQNetwork/" );
 #endif
 
 class JQNetworkClientForQml: public QObject
 {
     Q_OBJECT
 
 public:
-    JQNetworkClientForQml() = default;
+    JQNetworkClientForQml();
 
     ~JQNetworkClientForQml() = default;
 
 public slots:
     bool beginClient();
 
+    QVariantMap test() { return { { "key", QDateTime::currentDateTime() }, { "key2", QByteArray::fromHex( "00112233" ) } }; }
+
+    void print(const QVariant &d) { qDebug() << d; }
+
     void createConnect(const QString &hostName, const quint16 &port);
 
     void sendPayloadData(
@@ -48,6 +54,9 @@ public slots:
             QJSValue failCallback
         );
 
+private Q_SLOTS:
+    inline void runOnClientThread(const std::function<void()> &callback);
+
 signals:
     void connectToHostError(const QString &hostName, const quint16 &port);
 

lib/JQNetwork/include/jqnetwork_clientforqml.inc

@@ -16,4 +16,9 @@
 // JQNetwork lib import
 #include "jqnetwork_clientforqml.h"
 
+inline void JQNetworkClientForQml::runOnClientThread(const std::function<void()> &callback)
+{
+    callback();
+}
+
 #endif//JQNETWORK_INCLUDE_JQNETWORK_CLIENGFORQML_INC

lib/JQNetwork/include/jqnetwork_connect.h

@@ -56,6 +56,8 @@ struct JQNetworkConnectSettings
     std::function< QString( const JQNetworkConnectPointer &, const JQNetworkPackageSharedPointer &, const QString & ) > filePathProvider = nullptr;
 
     void setFilePathProviderToDefaultDir();
+
+    void setFilePathProviderToDir(const QDir &dir);
 };
 
 class JQNetworkConnect: public QObject
@@ -176,7 +178,10 @@ private Q_SLOTS:
 
     void onDataTransportPackageReceived(const JQNetworkPackageSharedPointer &package);
 
-    void onFileDataTransportPackageReceived(const JQNetworkPackageSharedPointer &package);
+    bool onFileDataTransportPackageReceived(
+            const JQNetworkPackageSharedPointer &package,
+            const bool &callbackOnFinish
+        );
 
     void onReadyToDelete();
 

lib/JQNetwork/include/jqnetwork_foundation.h

@@ -26,7 +26,7 @@
 #include <QVariant>
 #include <QHostAddress>
 
-#define JQNETWORK_VERSIONNUMBER QVersionNumber( 0, 5, 2 )
+#define JQNETWORK_VERSIONNUMBER QVersionNumber( 0, 5, 5 )
 
 #define JQNETWORKPACKAGE_BOOTFLAG qint8( 0x7d )
 #define JQNETWORKPACKAGE_PAYLOADDATATRANSPORTPACKGEFLAG qint8( 0x1 )
@@ -57,6 +57,7 @@ class QJsonArray;
 class QJsonValue;
 class QJsonDocument;
 class QFile;
+class QDir;
 class QFileInfo;
 class QTcpSocket;
 class QTcpServer;
@@ -88,6 +89,8 @@ typedef QPointer< JQNetworkProcessor > JQNetworkProcessorPointer;
 typedef QPointer< JQNetworkClient > JQNetworkClientPointer;
 typedef QPointer< JQNetworkLan > JQNetworkLanPointer;
 
+typedef std::shared_ptr< void > JQNetworkVoidSharedPointer;
+
 typedef QSharedPointer< JQNetworkPackage > JQNetworkPackageSharedPointer;
 typedef QSharedPointer< JQNetworkConnect > JQNetworkConnectSharedPointer;
 typedef QSharedPointer< JQNetworkConnectPool > JQNetworkConnectPoolSharedPointer;

lib/JQNetwork/include/jqnetwork_package.h

@@ -42,7 +42,7 @@ class JQNetworkPackage
     static JQNetworkPackageSharedPointer readPackage(QByteArray &rawData);
 
     static QList< JQNetworkPackageSharedPointer > createPayloadTransportPackages(
-            const QString &targerActionFlag,
+            const QString &targetActionFlag,
             const QByteArray &payloadData,
             const QVariantMap &appendData,
             const qint32 &randomFlag,
@@ -51,7 +51,7 @@ class JQNetworkPackage
         );
 
     static JQNetworkPackageSharedPointer createFileTransportPackage(
-            const QString &targerActionFlag,
+            const QString &targetActionFlag,
             const QFileInfo &fileInfo,
             const QByteArray &fileData,
             const QVariantMap &appendData,
@@ -90,8 +90,6 @@ class JQNetworkPackage
 
     inline int metaDataSize() const;
 
-    inline QString metaDataActionFlag() const;
-
     inline QByteArray payloadData() const;
 
     inline int payloadDataSize() const;
@@ -107,7 +105,7 @@ class JQNetworkPackage
 
     inline QVariantMap metaDataInVariantMap() const;
 
-    inline QString targerActionFlag() const;
+    inline QString targetActionFlag() const;
 
     inline QVariantMap appendData() const;
 

lib/JQNetwork/include/jqnetwork_package.inc

@@ -86,11 +86,6 @@ inline int JQNetworkPackage::metaDataSize() const
     return metaData_.size();
 }
 
-inline QString JQNetworkPackage::metaDataActionFlag() const
-{
-    return "actionFlag";
-}
-
 inline QByteArray JQNetworkPackage::payloadData() const 
 { 
     return payloadData_; 
@@ -126,9 +121,9 @@ inline QVariantMap JQNetworkPackage::metaDataInVariantMap() const
     return metaDataInVariantMap_;
 }
 
-inline QString JQNetworkPackage::targerActionFlag() const
+inline QString JQNetworkPackage::targetActionFlag() const
 {
-    return ( metaDataInVariantMap_.contains( "targerActionFlag" ) ) ? ( metaDataInVariantMap_[ "targerActionFlag" ].toString() ) : ( QString() );
+    return ( metaDataInVariantMap_.contains( "targetActionFlag" ) ) ? ( metaDataInVariantMap_[ "targetActionFlag" ].toString() ) : ( QString() );
 }
 
 inline QVariantMap JQNetworkPackage::appendData() const

lib/JQNetwork/include/jqnetwork_processor.h

@@ -35,6 +35,13 @@ class JQNetworkProcessor: public QObject
 protected:
     JQNetworkConnectPointer currentThreadConnect();
 
+private:
+    inline static void deleteByteArray(QByteArray *ptr);
+
+    inline static void deleteVariantMap(QVariantMap *ptr);
+
+    static void deleteFileInfo(QFileInfo *ptr);
+
 private:
     static QSet< QString > exceptionSlots_;
 

lib/JQNetwork/include/jqnetwork_processor.inc

@@ -16,4 +16,14 @@
 // JQNetwork lib import
 #include "jqnetwork_processor.h"
 
+inline void JQNetworkProcessor::deleteByteArray(QByteArray *ptr)
+{
+    delete ptr;
+}
+
+inline void JQNetworkProcessor::deleteVariantMap(QVariantMap *ptr)
+{
+    delete ptr;
+}
+
 #endif//JQNETWORK_INCLUDE_JQNETWORK_PROCESSOR_INC

lib/JQNetwork/include/jqnetwork_server.h

@@ -69,6 +69,8 @@ class JQNetworkServer: public QObject
 
     void registerProcessor(const JQNetworkProcessorPointer &processor);
 
+    inline QSet< QString > availableProcessorMethodNames() const;
+
 private:
     void incomingConnection(const qintptr &socketDescriptor);
 
@@ -128,7 +130,8 @@ class JQNetworkServer: public QObject
     QString nodeMarkSummary_;
 
     // Processor
-    QMap< QString, std::function< void( const JQNetworkConnectPointer &, const JQNetworkPackageSharedPointer & ) > > processor_;
+    QSet< JQNetworkProcessor * > processors_;
+    QMap< QString, std::function< void( const JQNetworkConnectPointer &, const JQNetworkPackageSharedPointer & ) > > processorCallbacks_;
 };
 
 // inc import

lib/JQNetwork/include/jqnetwork_server.inc

@@ -36,6 +36,11 @@ inline QString JQNetworkServer::nodeMarkSummary() const
     return nodeMarkSummary_;
 }
 
+inline QSet< QString > JQNetworkServer::availableProcessorMethodNames() const
+{
+    return QSet< QString >::fromList( processorCallbacks_.keys() );
+}
+
 inline void JQNetworkServer::onConnectToHostError(const JQNetworkConnectPointer &connect, const JQNetworkConnectPoolPointer &)
 {
     if ( !serverSettings_->connectToHostErrorCallback ) { return; }

lib/JQNetwork/qml/JQNetwork/JQNetworkClient.qml

@@ -0,0 +1,14 @@
+import QtQuick 2.8
+import JQNetworkClientForQml 1.0
+
+JQNetworkClientForQml {
+    id: jqNetworkClientForQml
+
+    function onSendSucceed( callback, received ) {
+        callback( received );
+    }
+
+    function onSendFail( callback ) {
+        callback();
+    }
+}

lib/JQNetwork/qml/JQNetwork/qmldir

@@ -0,0 +1,3 @@
+module JQNetwork
+
+JQNetworkClient 1.0 JQNetworkClient.qml

lib/JQNetwork/qml/JQNetworkQml.qrc

@@ -0,0 +1,6 @@
+<RCC>
+    <qresource prefix="/JQNetwork">
+        <file>JQNetwork/JQNetworkClient.qml</file>
+        <file>JQNetwork/qmldir</file>
+    </qresource>
+</RCC>

lib/JQNetwork/src/jqnetwork_client.cpp

@@ -158,7 +158,11 @@ void JQNetworkClient::createConnect(const QString &hostName, const quint16 &port
     );
 }
 
-bool JQNetworkClient::waitForCreateConnect(const QString &hostName, const quint16 &port)
+bool JQNetworkClient::waitForCreateConnect(
+        const QString &hostName,
+        const quint16 &port,
+        const int &maximumConnectToHostWaitTime
+    )
 {
     QSharedPointer< QSemaphore > semaphore( new QSemaphore );
     const auto &&hostKey = QString( "%1:%2" ).arg( hostName, QString::number( port ) );
@@ -170,7 +174,10 @@ bool JQNetworkClient::waitForCreateConnect(const QString &hostName, const quint1
 
     mutex_.unlock();
 
-    const auto &&acquireSucceed = semaphore->tryAcquire( 1, connectSettings_->maximumConnectToHostWaitTime );
+    const auto &&acquireSucceed = semaphore->tryAcquire(
+                1,
+                ( maximumConnectToHostWaitTime == -1 ) ? ( connectSettings_->maximumConnectToHostWaitTime ) : ( maximumConnectToHostWaitTime )
+            );
 
     mutex_.lock();
 
@@ -238,6 +245,19 @@ JQNetworkConnectPointer JQNetworkClient::getConnect(const QString &hostName, con
         return connect;
     }
 
+    const auto &&autoConnectSucceed = this->waitForCreateConnect( hostName, port, clientSettings_->maximumAutoConnectToHostWaitTime );
+
+    if ( !autoConnectSucceed ) { return { }; }
+
+    for ( const auto &connectPool: this->connectPools_ )
+    {
+        auto connect = connectPool->getConnectByHostAndPort( hostName, port );
+
+        if ( !connect ) { continue; }
+
+        return connect;
+    }
+
     return { };
 }