rhodes 1.5.5 → 2.0.0.beta1

data/platform/shared/sync/SyncEngine.h

@@ -4,6 +4,7 @@
 #include "common/IRhoClassFactory.h"
 #include "common/RhoMutexLock.h"
 #include "net/INetRequest.h"
+#include "ISyncProtocol.h"
 
 #include "SyncSource.h"
 #include "SyncNotify.h"
@@ -11,54 +12,31 @@
 #include "logging/RhoLog.h"
 
 namespace rho {
-struct _CRhoRuby {
-static const int ERR_NONE = 0;
-static const int ERR_NETWORK = 1;
-static const int ERR_REMOTESERVER = 2;
-static const int ERR_RUNTIME = 3;
-static const int ERR_UNEXPECTEDSERVERRESPONSE = 4;
-static const int ERR_DIFFDOMAINSINSYNCSRC = 5;
-static const int ERR_NOSERVERRESPONSE = 6;
-static const int ERR_CLIENTISNOTLOGGEDIN = 7;
-static const int ERR_CUSTOMSYNCSERVER = 8;
-static const int ERR_UNATHORIZED = 9;
-static const int ERR_CANCELBYUSER = 10;
-static const int ERR_SYNCVERSION = 11;
-static const int ERR_GEOLOCATION = 12;
-
-static String getMessageText(const char* szName);
-static String getErrorText(int nError);
-};
-extern const _CRhoRuby& RhoRuby;
-
 namespace sync {
 
 class CSyncEngine : public net::IRhoSession
 {
     DEFINE_LOGCLASS;
 public:
-    enum ESyncState{ esNone, esSyncAllSources, esSyncSource, esStop, esExit };
-
-    static String SYNC_SOURCE_FORMAT() { return "?format=json"; }
-    static int SYNC_VERSION() { return 2; }
-
-    static String SYNC_ASK_ACTION() { return "/ask"; }
-//    static int MAX_SYNC_TRY_COUNT() { return 2; }
+    enum ESyncState{ esNone, esSyncAllSources, esSyncSource, esSearch, esStop, esExit };
 
     struct CSourceID
     {
         String m_strName;
-        String m_strUrl;
         int m_nID;
 
+        CSourceID(int id, const String& strName ){ m_nID = id; m_strName = strName; }
+        CSourceID(const String& strName ){ m_strName = strName; }
+
         String toString()const;
         boolean isEqual(CSyncSource& src)const;
     };
 
 private:
     VectorPtr<CSyncSource*> m_sources;
-    db::CDBAdapter& m_dbAdapter;
+    Vector<String>          m_arPartitions;
     common::CAutoPtr<net::INetRequest> m_NetRequest;
+    common::CAutoPtr<ISyncProtocol> m_SyncProtocol;
     ESyncState m_syncState;
     String     m_clientID;
     common::CMutex m_mxLoadClientID;
@@ -66,10 +44,11 @@ private:
     CSyncNotify m_oSyncNotify;
     boolean m_bStopByUser;
     int m_nSyncPageSize;
-    boolean m_bNoThreaded;
+	boolean m_bNoThreaded;
+    int m_nErrCode;
 
 public:
-    CSyncEngine(db::CDBAdapter& db);
+    CSyncEngine();
     ~CSyncEngine(void){}
 
     void setFactory(common::IRhoClassFactory* factory){ 
@@ -77,7 +56,9 @@ public:
     }
 
     void doSyncAllSources();
-    void doSyncSource(const CSourceID& oSrcID, String strParams, String strAction, boolean bSearchSyncChanges, int nProgressStep);
+    void doSyncSource(const CSourceID& oSrcID);
+    void doSearch(rho::Vector<rho::String>& arSources, String strParams, String strAction, boolean bSearchSyncChanges, int nProgressStep);
+
     void login(String name, String password, String callback);
     boolean isLoggedIn();
     String loadSession();
@@ -95,26 +76,28 @@ public:
 //private:
     String getClientID()const{ return m_clientID; }
     void setSession(String strSession){m_strSession=strSession;}
-    const String& getSession(){ return m_strSession; }
     boolean isSessionExist(){ return m_strSession.length() > 0; }
-
-    //CSyncEngine(): m_dbAdapter(db::CDBAdapter()), m_NetRequest(0), m_isLoggedIn(true){}
+//IRhoSession
+    virtual const String& getSession(){ return m_strSession; }
+    virtual const String& getContentType(){ return getProtocol().getContentType();}
 
     void loadAllSources();
     void syncAllSources();
+    void prepareSync(ESyncState eState);
+
     VectorPtr<CSyncSource*>& getSources(){ return m_sources; }
     int getStartSource();
     String loadClientID();
     String requestClientIDByNet();
     boolean resetClientIDByNet(const String& strClientID);//throws Exception
+    void doBulkSync();//throws Exception
 
-    db::CDBAdapter& getDB(){ return m_dbAdapter; }
     CSyncNotify& getNotify(){ return m_oSyncNotify; }
     net::INetRequest& getNet(){ return *m_NetRequest; }
+    ISyncProtocol& getProtocol(){ return *m_SyncProtocol; }
 
     CSyncSource* findSourceByName(const String& strSrcName);
 
-    String SYNC_PAGE_SIZE();
     int getSyncPageSize() { return m_nSyncPageSize; }
     void setSyncPageSize(int nPageSize){ m_nSyncPageSize = nPageSize; }
 
@@ -124,7 +107,14 @@ private:
  
     CSyncSource* findSource(const CSourceID& oSrcID);
 
-    boolean checkAllSourcesFromOneDomain();
+    void loadBulkPartition(const String& strPartition);
+    String makeBulkDataFileName(String strDataUrl, String strDbPath, String strExt);
+    db::CDBAdapter& getUserDB(){ return db::CDBAdapter::getUserDB(); }
+    db::CDBAdapter& getDB(const String& strPartition){ return db::CDBAdapter::getDB(strPartition.c_str()); }
+
+    void initProtocol();
+    void processServerSources(String strSources);
+
     friend class CSyncSource;
 };
 

data/platform/shared/sync/SyncNotify.cpp

@@ -1,7 +1,7 @@
 #include "SyncNotify.h"
 #include "SyncEngine.h"
 #include "net/URI.h"
-#include "ruby/ext/rho/rhoruby.h"
+#include "rubyext/RhoRuby.h"
 
 namespace rho {
 namespace sync {
@@ -14,7 +14,6 @@ String CSyncNotify::m_strObjectNotifyUrl;
 common::CMutex CSyncNotify::m_mxObjectNotify;
 
 INetRequest& CSyncNotify::getNet(){ return getSync().getNet(); }
-CDBAdapter& CSyncNotify::getDB(){ return getSync().getDB(); }
 
 void CSyncNotify::addObjectNotify(int nSrcID, const String& strObject)
 {
@@ -97,14 +96,16 @@ void CSyncNotify::fireObjectsNotification()
                 int nNotifyType = itObject->second;
                 if (nNotifyType == enNone)
                     continue;
-
+                //This is slow operation
+/*
                 if ( nNotifyType == enDelete )
                 {
+                    //TODO: get db for source
                     DBResult( res , getDB().executeSQL("SELECT object FROM object_values where object=? LIMIT 1 OFFSET 0", itObject->first ));
                     if ( !res.isEnd() )
                         nNotifyType = enUpdate;    
                 }
-
+*/
                 if ( strBody.length() > 0 )
                     strBody += "&rho_callback=1&";
 
@@ -230,7 +231,7 @@ void CSyncNotify::setSyncNotification(int source_id, String strUrl, String strPa
     		
 		    if ( strFullUrl.length() > 0 )
 		    {
-                DBResult( res, getDB().executeSQL("SELECT source_id from sources order by source_id") );
+                DBResult( res, CDBAdapter::getUserDB().executeSQL("SELECT source_id from sources order by source_id") );
                 for ( ; !res.isEnd(); res.next() )
 		    	    m_mapSyncNotifications.put( res.getIntByIdx(0),new CSyncNotification( strFullUrl, strParams, false ) );
 		    }
@@ -251,27 +252,27 @@ void CSyncNotify::setSyncNotification(int source_id, String strUrl, String strPa
     }
 }
 
-void CSyncNotify::setSearchNotification(int source_id, String strUrl, String strParams )
+void CSyncNotify::setSearchNotification(String strUrl, String strParams )
 {
-	LOG(INFO) + "Set search notification. Source ID: " + source_id + "; Url :" + strUrl + "; Params: " + strParams;
+	LOG(INFO) + "Set search notification. Url :" + strUrl + "; Params: " + strParams;
     String strFullUrl = getNet().resolveUrl(strUrl);
 
     if ( strFullUrl.length() > 0 )
     {
         synchronized(m_mxSyncNotifications)
         {
-            m_mapSearchNotifications.put(source_id,new CSyncNotification( strFullUrl, strParams, true ) );
+            m_pSearchNotification = new CSyncNotification( strFullUrl, strParams, true );
 
-	        LOG(INFO) + " Done Set search notification. Source ID: " + source_id + "; Url :" + strFullUrl + "; Params: " + strParams;
+	        LOG(INFO) + " Done Set search notification. Url :" + strFullUrl + "; Params: " + strParams;
         }
     }
 }
 
-void CSyncNotify::setInitialSyncNotification(String strUrl, String strParams )//throws Exception
+void CSyncNotify::setBulkSyncNotification(String strUrl, String strParams )//throws Exception
 {
     String strFullUrl = getNet().resolveUrl(strUrl);
 	
-	m_initialSyncNotify = CSyncNotification( strFullUrl, strParams, true );
+	m_bulkSyncNotify = CSyncNotification( strFullUrl, strParams, false );
 }
 
 extern "C" void alert_show_popup(const char* message);
@@ -283,15 +284,10 @@ void CSyncNotify::reportSyncStatus(String status, int error, String strDetails)
         return;
     }
     //TODO: reportStatus
-	//if (m_statusListener != null && (m_bEnableReporting || error == RhoRuby.ERR_SYNCVERSION) ) {
-//        if ( error == RhoRuby.ERR_SYNCVERSION )
-//    		status = RhoRuby.getErrorText(error);
-//		else
-//		{
-		    //if ( strDetails.length() == 0 )
-		    //	strDetails = RhoRuby.getErrorText(error);
-            //status += (strDetails.length() > 0 ? RhoRuby.getMessageText("details") + strDetails: "");
-//        }
+	//if (m_statusListener != null) {
+	//	if ( strDetails.length() == 0 )
+	//		strDetails = RhoRuby.getErrorText(error);
+    //    status += (strDetails.length() > 0 ? RhoRuby.getMessageText("details") + strDetails: "");
 	//	m_statusListener.reportStatus( status, error);
 	//}
 	//LOG(INFO) + "Status: "+status;
@@ -305,7 +301,7 @@ void CSyncNotify::fireAllSyncNotifications( boolean bFinish, int nErrCode, Strin
     }
 }
 
-void CSyncNotify::fireInitialSyncNotification( boolean bFinish, int nErrCode )
+void CSyncNotify::fireBulkSyncNotification( boolean bFinish, String status, String partition, int nErrCode )
 {
     if ( getSync().getState() == CSyncEngine::esExit )
 		return;
@@ -313,7 +309,7 @@ void CSyncNotify::fireInitialSyncNotification( boolean bFinish, int nErrCode )
 	//TODO: show report
 	if( nErrCode != RhoRuby.ERR_NONE)
 	{
-		String strMessage = RhoRuby.getMessageText("sync_failed_for") + "initial.";
+		String strMessage = RhoRuby.getMessageText("sync_failed_for") + "bulk.";
 		reportSyncStatus(strMessage,nErrCode,"");
 	}
 	
@@ -322,16 +318,18 @@ void CSyncNotify::fireInitialSyncNotification( boolean bFinish, int nErrCode )
 	{
     	synchronized(m_mxSyncNotifications)
 
-        if ( m_initialSyncNotify.m_strUrl.length() == 0 )
+        if ( m_bulkSyncNotify.m_strUrl.length() == 0 )
             return;
         
-        strUrl = m_initialSyncNotify.m_strUrl;
+        strUrl = m_bulkSyncNotify.m_strUrl;
         strBody = "rho_callback=1";
+        strBody += "&partition=" + partition;
+        strBody += "&bulk_status="+status;
         strBody += "&status=";
         if ( bFinish )
         {
 	        if ( nErrCode == RhoRuby.ERR_NONE )
-	        	strBody += "ok";
+                strBody += "ok";
 	        else
 	        {
 	        	if ( getSync().isStoppedByUser() )
@@ -344,19 +342,19 @@ void CSyncNotify::fireInitialSyncNotification( boolean bFinish, int nErrCode )
         else
         	strBody += "in_progress";
         
-        if ( m_initialSyncNotify.m_strParams.length() > 0 )
-            strBody += "&" + m_initialSyncNotify.m_strParams;
+        if ( m_bulkSyncNotify.m_strParams.length() > 0 )
+            strBody += "&" + m_bulkSyncNotify.m_strParams;
         
-        bRemoveAfterFire = bRemoveAfterFire && m_initialSyncNotify.m_bRemoveAfterFire;
+        bRemoveAfterFire = bRemoveAfterFire && m_bulkSyncNotify.m_bRemoveAfterFire;
 	}
 	
     if ( bRemoveAfterFire )
-    	clearInitialSyncNotification();
+    	clearBulkSyncNotification();
     
-	LOG(INFO) +  "Fire initial notification.Url :" + strUrl + "; Body: " + strBody;
+	LOG(INFO) +  "Fire Bulk notification.Url :" + strUrl + "; Body: " + strBody;
 	
     if ( callNotify(strUrl, strBody) )
-    	clearInitialSyncNotification();
+    	clearBulkSyncNotification();
 }
 
 void CSyncNotify::fireSyncNotification( CSyncSource* psrc, boolean bFinish, int nErrCode, String strMessage)
@@ -366,7 +364,7 @@ void CSyncNotify::fireSyncNotification( CSyncSource* psrc, boolean bFinish, int
 	
 	if( strMessage.length() > 0 || nErrCode != RhoRuby.ERR_NONE)
 	{
-		if ( !( psrc != null && psrc->m_strParams.length()>0) )
+		if ( !( psrc != null && psrc->isSearch()) )
         {
 	//		if ( psrc != null && strMessage.length() == 0 )
 	//			strMessage = RhoRuby.getMessageText("sync_failed_for") + psrc->getName() + ".";
@@ -389,8 +387,13 @@ void CSyncNotify::doFireSyncNotification( CSyncSource* psrc, boolean bFinish, in
     {
         synchronized(m_mxSyncNotifications)
         {
-            CSyncNotification* pSN = src.isSearch() ? m_mapSearchNotifications.get(src.getID()) : m_mapSyncNotifications.get(src.getID());
-            if ( pSN == 0 )
+            CSyncNotification* pSN = 0;
+			if ( src.isSearch() )
+				pSN = m_pSearchNotification;
+			else
+				pSN = m_mapSyncNotifications.get(src.getID());
+            
+			if ( pSN == 0 )
                 return;
             CSyncNotification& sn = *pSN;
 
@@ -398,8 +401,8 @@ void CSyncNotify::doFireSyncNotification( CSyncSource* psrc, boolean bFinish, in
 		    strBody = "";
             strBody = "total_count=" + convertToStringA(src.getTotalCount());
             strBody += "&processed_count=" + convertToStringA(src.getCurPageCount());
-            strBody += "&processed_objects_count=" + convertToStringA(getLastSyncObjectCount(src.getID()));
-            strBody += "&cumulative_count=" + convertToStringA(src.getServerObjectsCount());
+            //strBody += "&processed_objects_count=" + convertToStringA(getLastSyncObjectCount(src.getID()));
+            strBody += "&cumulative_count=" + convertToStringA(getLastSyncObjectCount(src.getID()));
             strBody += "&source_id=" + convertToStringA(src.getID());
             strBody += "&source_name=" + src.getName();
             strBody += "&rho_callback=1";
@@ -476,7 +479,7 @@ void CSyncNotify::clearNotification(CSyncSource& src)
     synchronized(m_mxSyncNotifications)
     {
         if ( src.isSearch() )
-            m_mapSearchNotifications.remove(src.getID());
+            m_pSearchNotification = null;
         else
             m_mapSyncNotifications.remove(src.getID());
     }
@@ -495,12 +498,12 @@ void CSyncNotify::clearSyncNotification(int source_id)
     }
 }
 
-void CSyncNotify::clearInitialSyncNotification() 
+void CSyncNotify::clearBulkSyncNotification() 
 {
-	LOG(INFO) + "Clear initial notification.";
+	LOG(INFO) + "Clear bulk notification.";
 	
 	synchronized(m_mxSyncNotifications){
-		m_initialSyncNotify = CSyncNotification();
+		m_bulkSyncNotify = CSyncNotification();
 	}
 }
 
@@ -553,6 +556,5 @@ void CSyncNotify::callLoginCallback(String callback, int nErrCode, String strMes
 	//	LOG.ERROR("Call Login callback failed.", exc);
 	//}
 }
-
 }
 }

data/platform/shared/sync/SyncNotify.h

@@ -2,6 +2,7 @@
 
 #include "common/RhoStd.h"
 #include "logging/RhoLog.h"
+#include "common/AutoPointer.h"
 
 namespace rho {
 namespace db {
@@ -46,13 +47,12 @@ private:
     static common::CMutex m_mxObjectNotify;
 
     HashtablePtr<int,CSyncNotification*> m_mapSyncNotifications;
-    HashtablePtr<int,CSyncNotification*> m_mapSearchNotifications;
-    CSyncNotification m_initialSyncNotify;
+    common::CAutoPtr<CSyncNotification> m_pSearchNotification;
+	CSyncNotification m_bulkSyncNotify;
     common::CMutex m_mxSyncNotifications;
 
     net::INetRequest& getNet();
     CSyncEngine& getSync(){ return m_syncEngine; }
-    db::CDBAdapter& getDB();
 public:
     CSyncNotify( CSyncEngine& syncEngine ) : m_syncEngine(syncEngine), m_bEnableReporting(false){}
 
@@ -70,7 +70,7 @@ public:
 
     //Sync notifications
     void setSyncNotification(int source_id, String strUrl, String strParams );
-    void setSearchNotification(int source_id, String strUrl, String strParams );
+    void setSearchNotification(String strUrl, String strParams );
 
     void clearSyncNotification(int source_id);
     void clearNotification(CSyncSource& src);
@@ -78,9 +78,9 @@ public:
     void onSyncSourceEnd( int nSrc, VectorPtr<CSyncSource*>& sources );
     void fireSyncNotification( CSyncSource* psrc, boolean bFinish, int nErrCode, String strMessage);
 
-    void setInitialSyncNotification(String strUrl, String strParams );//throws Exception
-    void fireInitialSyncNotification( boolean bFinish, int nErrCode );
-    void clearInitialSyncNotification();
+    void setBulkSyncNotification(String strUrl, String strParams );//throws Exception
+    void fireBulkSyncNotification( boolean bFinish, String status, String partition, int nErrCode );
+    void clearBulkSyncNotification();
 
     void cleanLastSyncObjectCount();
     int incLastSyncObjectCount(int nSrcID);

data/platform/shared/sync/SyncProtocol_3.h

@@ -0,0 +1,86 @@
+#pragma once
+
+#include "ISyncProtocol.h"
+#include "common/StringConverter.h"
+#include "common/RhoFilePath.h"
+
+namespace rho {
+namespace sync {
+
+struct CSyncProtocol_3 : public ISyncProtocol
+{
+    String m_strContentType;
+
+    CSyncProtocol_3()
+    {
+        m_strContentType = "application/json";
+    }
+
+    const String& getContentType(){ return m_strContentType; }
+    virtual int getVersion(){ return 3; }
+
+    String getLoginUrl()
+    {
+        return RHOCONF().getPath("syncserver") + "clientlogin";
+    }
+
+    String getLoginBody( const String& name, const String& password)
+    {
+        return "{\"login\":\"" + name + "\",\"password\":\"" + password + "\",\"remember_me\":1}";
+    }
+
+    String getClientCreateUrl()
+    {
+        return RHOCONF().getPath("syncserver") + "clientcreate";
+    }
+
+    String getClientRegisterUrl()
+    {
+        return RHOCONF().getPath("syncserver") + "clientregister";
+    }
+
+    String getClientRegisterBody( const String& strClientID, const String& strPin, int nPort, const String& strType )
+    {
+        return "{\"client_id\":\"" + strClientID + 
+            "\",\"device_pin\":\"" + strPin +
+            "\",\"device_port\":\"" + common::convertToStringA(nPort) +
+            "\",\"device_type\":\"" + strType + "\"}";
+    }
+
+    String getClientResetUrl(const String& strClientID)
+    {
+        return RHOCONF().getPath("syncserver") + "clientreset?client_id=" + strClientID;
+    }
+
+    String getClientChangesUrl()
+    {
+        String strUrl = RHOCONF().getPath("syncserver");
+        return strUrl.substr(0,strUrl.length()-1);
+    }
+
+    String getServerQueryUrl(const String& strAction )
+    {
+        String strUrl = RHOCONF().getPath("syncserver");
+        if ( strAction.length() > 0 )
+            strUrl = common::CFilePath::join(strUrl, strAction);
+        else
+            strUrl = strUrl.substr(0,strUrl.length()-1);
+
+        return strUrl;
+    }
+
+    String getServerQueryBody(const String& strSrcName, const String& strClientID, int nPageSize )
+    {
+        String strQuery = "?client_id=" + strClientID + 
+                "&p_size=" + common::convertToStringA(nPageSize) + "&version=3";
+        
+        if ( strSrcName.length() > 0 )
+            strQuery += "&source_name=" + strSrcName;
+
+        return strQuery;
+    }
+
+};
+
+}
+}