rhodes 2.4.1 → 3.0.0.beta.1

data/platform/shared/common/RhoConf.cpp

@@ -2,7 +2,11 @@
 #include "RhoFile.h"
 #include "RhoFilePath.h"
 #include "StringConverter.h"
+#ifdef RHODES_EMULATOR
+static const char* CONF_FILENAME = "rhoconfig.txt";
+#else
 static const char* CONF_FILENAME = "apps/rhoconfig.txt";
+#endif
 static const char* CONF_CHANGES = ".changes";
 static const char* CONF_TIMESTAMP = ".timestamp";
 static const char* CONF_TIMESTAMP_PROP = "rho_conf_timestamp";
@@ -90,7 +94,7 @@ void RhoSettings::loadFromFile()
     m_mapChangedValues.clear();
 
     String strSettings;
-    CRhoFile::readStringFromFile(getConfFilePath().c_str(), strSettings);
+    CRhoFile::readStringFromFile(getAppConfFilePath().c_str(), strSettings);
     loadFromString( strSettings.c_str(), m_mapValues );
 
     readChanges();
@@ -231,7 +235,15 @@ extern "C" {
 void rho_conf_Init(const char* szRootPath){
 	rho::common::CFilePath oRhoPath( szRootPath );
 
+    RHOCONF().setAppConfFilePath(oRhoPath.makeFullPath(CONF_FILENAME).c_str());
+#ifdef RHODES_EMULATOR
+    rho::String strPath = rho::common::CFilePath::join( szRootPath, RHO_EMULATOR_DIR);
+    strPath = rho::common::CFilePath::join( strPath, CONF_FILENAME);
+    RHOCONF().setConfFilePath(strPath.c_str());
+#else
     RHOCONF().setConfFilePath(oRhoPath.makeFullPath(CONF_FILENAME).c_str());
+#endif
+
     RHOCONF().loadFromFile();
 }
 

data/platform/shared/common/RhoConf.h

@@ -12,7 +12,7 @@ namespace common{
 #define RHODBVERSION "DBVersion"
 
 class RhoSettings{
-    String      m_strConfFilePath;
+    String      m_strConfFilePath, m_strAppConfFilePath;
     Hashtable<String,String> m_mapValues;
     Hashtable<String,String> m_mapChangedValues;
     HashtablePtr<String,Vector<String>* > m_mapConflictedValues;
@@ -31,6 +31,8 @@ public:
 
     const String& getConfFilePath()const{ return m_strConfFilePath;}
     void setConfFilePath(const char* szConfFilePath){ m_strConfFilePath = szConfFilePath; }
+    const String& getAppConfFilePath()const{ return m_strAppConfFilePath;}
+    void setAppConfFilePath(const char* szConfFilePath){ m_strAppConfFilePath = szConfFilePath; }
 
     void loadFromFile();
 

data/platform/shared/common/RhoDefs.h

@@ -88,5 +88,15 @@ typedef int LogSeverity;
 #include "tcmalloc/rhomem.h"
 #endif
 
+#ifdef RHODES_EMULATOR
+#define RHO_RB_EXT ".rb"
+#define RHO_ERB_EXT ".erb"
+#define RHO_EMULATOR_DIR "rhosimulator"
+#else
+#define RHO_RB_EXT ".iseq"
+#define RHO_ERB_EXT "_erb.iseq"
+#define RHO_EMULATOR_DIR ""
+#endif
+
 #endif //_RHODEFS_H_
 

data/platform/shared/common/RhoFile.cpp

@@ -1,5 +1,7 @@
 #include "RhoFile.h"
 #include "common/StringConverter.h"
+#include "common/Tokenizer.h"
+#include "common/RhoFilePath.h"
 
 namespace rho{
 namespace common{
@@ -221,6 +223,19 @@ void CRhoFile::deleteFilesInFolder(const char* szFolderPath)
 #endif
 }
 
+/*static*/ void CRhoFile::recursiveCreateDir(const char* szFolderPath, const char* szBasePath)
+{
+    String strRelPath = String(szFolderPath).substr(strlen(szBasePath), strlen(szFolderPath) );
+    String strPath = szBasePath;
+    CTokenizer oTokenizer( strRelPath, "/\\" );
+	while (oTokenizer.hasMoreTokens()) 
+    {
+		String tok = oTokenizer.nextToken();
+        strPath = CFilePath::join(strPath, tok);
+        createFolder(strPath.c_str());
+    }
+}
+
 /*static*/ void CRhoFile::renameFile( const char* szOldFilePath, const char* szNewFilePath )
 {
 #if defined(OS_WINDOWS) || defined(OS_WINCE)

data/platform/shared/common/RhoFile.h

@@ -42,6 +42,7 @@ public:
     static void         deleteFilesInFolder(const char* szFolderPath);
     static void         loadTextFile(const char* szFilePath, String& strFile);
     static void         createFolder(const char* szDirPath);
+    static void         recursiveCreateDir(const char* szFolderPath, const char* szBasePath);
     static void         readStringFromFile( const char* szFilePath, String& strData );
     static void         writeStringToFile( const char* szFilePath, String& strData );
 private:

data/platform/shared/common/RhodesApp.cpp

@@ -218,6 +218,11 @@ void CAppCallbacksQueue::processCommand(IQueueCommand* pCmd)
         return (CRhodesApp*)m_pInstance;
 
     m_pInstance = new CRhodesApp(strRootPath);
+
+    String push_pin = RHOCONF().getString("push_pin");
+    if(!push_pin.empty())
+        rho::sync::CClientRegister::Create(push_pin.c_str());
+
     return (CRhodesApp*)m_pInstance;
 }
 
@@ -653,8 +658,11 @@ const String& CRhodesApp::getRhoMessage(int nError, const char* szName)
 
 void CRhodesApp::initHttpServer()
 {
-    String strAppRootPath = getRhoRootPath() + "apps";
-    
+    String strAppRootPath = getRhoRootPath();
+#ifndef RHODES_EMULATOR
+    strAppRootPath += "apps";
+#endif
+
     m_httpServer = new net::CHttpServer(atoi(getFreeListeningPort()), strAppRootPath);
     m_httpServer->register_uri("/system/geolocation", rubyext::CGeoLocation::callback_geolocation);
     m_httpServer->register_uri("/system/syncdb", callback_syncdb);
@@ -788,7 +796,7 @@ void CRhodesApp::initAppUrls()
     CRhodesAppBase::initAppUrls(); 
     m_currentTabIndex = 0;
 
-#if defined( OS_WINCE ) || defined( OS_WINDOWS )
+#if defined( OS_WINCE )
     m_strHomeUrl = "http://localhost:";
 #else
     m_strHomeUrl = "http://127.0.0.1:";
@@ -1269,6 +1277,11 @@ const char* rho_rhodesapp_getblobsdirpath()
     return RHODESAPP().getBlobsDirPath().c_str();
 }
 
+const char* rho_rhodesapp_getdbdirpath()
+{
+    return RHODESAPP().getDBDirPath().c_str();
+}
+
 const char* rho_rhodesapp_getapprootpath() {
     return RHODESAPP().getAppRootPath().c_str();
 }

data/platform/shared/common/RhodesApp.h

@@ -158,6 +158,7 @@ const char* rho_rhodesapp_getcurrenturl(int tabindex);
 
 const char* rho_rhodesapp_getloadingpagepath();
 const char* rho_rhodesapp_getblobsdirpath();
+const char* rho_rhodesapp_getdbdirpath();
 const char* rho_rhodesapp_getapprootpath();
 	
 void rho_http_redirect(void* httpContext, const char* szUrl);

data/platform/shared/common/RhodesAppBase.cpp

@@ -1,5 +1,6 @@
 #include "RhodesAppBase.h"
 #include "common/RhoFilePath.h"
+#include "common/RhoFile.h"
 #include "unzip/unzip.h"
 
 namespace rho {
@@ -34,17 +35,46 @@ CRhodesAppBase::CRhodesAppBase(const String& strRootPath) : CRhoThread()
 	
 void CRhodesAppBase::initAppUrls() 
 {
+#ifndef RHODES_EMULATOR
     m_strBlobsDirPath = getRhoRootPath() + "db/db-files";
 	m_strDBDirPath = getRhoRootPath() + "db";
+
     m_strAppRootPath = getRhoRootPath() + "apps";
+    m_strRhodesPath = "";
+#else
+    m_strBlobsDirPath = getRhoRootPath() + RHO_EMULATOR_DIR"/db/db-files";
+	m_strDBDirPath = getRhoRootPath() + RHO_EMULATOR_DIR"/db";
+
+    m_strAppRootPath += getRhoRootPath();
+#endif
+}
+
+String CRhodesAppBase::getRelativeDBFilesPath(const String& strFilePath)
+{
+#ifndef RHODES_EMULATOR
+    String strDbFileRoot = getRhoRootPath();
+#else
+    String strDbFileRoot = getRhoRootPath() + RHO_EMULATOR_DIR;
+#endif
+
+    if ( !String_startsWith(strFilePath, strDbFileRoot) )
+        return strFilePath;
+
+    return strFilePath.substr(strDbFileRoot.length());
 }
 
 String CRhodesAppBase::resolveDBFilesPath(const String& strFilePath)
 {
-    if ( String_startsWith(strFilePath, getRhoRootPath()) )
+#ifndef RHODES_EMULATOR
+    String strDbFileRoot = getRhoRootPath();
+#else
+    String strDbFileRoot = getRhoRootPath() + RHO_EMULATOR_DIR;
+#endif
+
+    if ( String_startsWith(strFilePath, strDbFileRoot) )
         return strFilePath;
 
-    return CFilePath::join(getRhoRootPath(), strFilePath);
+    return CFilePath::join(strDbFileRoot, strFilePath);
 }
 
 String CRhodesAppBase::canonicalizeRhoUrl(const String& strUrl) 
@@ -122,75 +152,85 @@ const char* rho_rhodesapp_getplatform()
 #endif			
 }
 
-	static const char table64[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+const char* rho_rhodesapp_getrhodespath()
+{
+    return RHODESAPPBASE().getRhodesPath().c_str();
+}
+
+void rho_file_recursive_createdir(const char* szPath, const char* szBasePath)
+{
+    rho::common::CRhoFile::recursiveCreateDir(szPath, szBasePath);
+}
+
+static const char table64[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+
+int rho_base64_encode(const char *src, int srclen, char *dst)
+{
+	if (srclen < 0)
+		srclen = strlen(src);
+	if (!dst)
+		return (srclen/3)*4 + (srclen%3 ? 4 : 0) + 1;
 	
-	int rho_base64_encode(const char *src, int srclen, char *dst)
-	{
-		if (srclen < 0)
-			srclen = strlen(src);
-		if (!dst)
-			return (srclen/3)*4 + (srclen%3 ? 4 : 0) + 1;
+	int out = 0;
+	for(int in = 0; in < srclen; in += 3, out += 4) {
 		
-		int out = 0;
-		for(int in = 0; in < srclen; in += 3, out += 4) {
-			
-			unsigned x = 0;
-			int actual = 0;
-			for (int i = 0; i < 3; ++i) {
-				char c;
-				if (in + i >= srclen)
-					c = 0;
-				else {
-					c = src[in + i];
-					actual += 8;
-				}
-				x = (x << 8) + (unsigned char)c;
-			}
-			
-			for (int i = 0; i < 4; ++i) {
-				if (actual <= 0) {
-					dst[out + i] = '=';
-				}
-				else {
-					dst[out + i] = table64[(x >> 18) & 0x3F];
-					x <<= 6;
-					actual -= 6;
-				}
+		unsigned x = 0;
+		int actual = 0;
+		for (int i = 0; i < 3; ++i) {
+			char c;
+			if (in + i >= srclen)
+				c = 0;
+			else {
+				c = src[in + i];
+				actual += 8;
 			}
+			x = (x << 8) + (unsigned char)c;
 		}
 		
-		dst[out++] = '\0';
-		return out;
+		for (int i = 0; i < 4; ++i) {
+			if (actual <= 0) {
+				dst[out + i] = '=';
+			}
+			else {
+				dst[out + i] = table64[(x >> 18) & 0x3F];
+				x <<= 6;
+				actual -= 6;
+			}
+		}
 	}
 	
-	int rho_base64_decode(const char *src, int srclen, char *dst)
-	{
-		if (srclen < 0)
-			srclen = strlen(src);
-		// Do not decode in case if srclen can not be divided by 4
-		if (srclen%4)
-			return 0;
-		if (!dst)
-			return srclen*3/4 + 1;
+	dst[out++] = '\0';
+	return out;
+}
+
+int rho_base64_decode(const char *src, int srclen, char *dst)
+{
+	if (srclen < 0)
+		srclen = strlen(src);
+	// Do not decode in case if srclen can not be divided by 4
+	if (srclen%4)
+		return 0;
+	if (!dst)
+		return srclen*3/4 + 1;
+	
+	char *found;
+	int out = 0;
+	for (int in = 0; in < srclen; in += 4, out += 3) {
+		unsigned x = 0;
+		for (int i = 0; i < 4; ++i) {
+			if ((found = strchr(const_cast<char*>(table64), src[in + i])) != NULL)
+				x = (x << 6) + (unsigned int)(found - table64);
+			else if (src[in + i] == '=')
+				x <<= 6;
+		}
 		
-		char *found;
-		int out = 0;
-		for (int in = 0; in < srclen; in += 4, out += 3) {
-			unsigned x = 0;
-			for (int i = 0; i < 4; ++i) {
-				if ((found = strchr(const_cast<char*>(table64), src[in + i])) != NULL)
-					x = (x << 6) + (unsigned int)(found - table64);
-				else if (src[in + i] == '=')
-					x <<= 6;
-			}
-			
-			for (int i = 0; i < 3; ++i) {
-				dst[out + i] = (unsigned char)((x >> 16) & 0xFF);
-				x <<= 8;
-			}
+		for (int i = 0; i < 3; ++i) {
+			dst[out + i] = (unsigned char)((x >> 16) & 0xFF);
+			x <<= 8;
 		}
-		dst[out++] = '\0';
-		return out;
 	}
+	dst[out++] = '\0';
+	return out;
+}
 	
 } //extern "C"

data/platform/shared/common/RhodesAppBase.h

@@ -21,7 +21,7 @@ protected:
 
     static CRhodesAppBase* m_pInstance;
 
-    String m_strRhoRootPath, m_strBlobsDirPath, m_strDBDirPath, m_strAppRootPath;
+    String m_strRhoRootPath, m_strBlobsDirPath, m_strDBDirPath, m_strAppRootPath, m_strRhodesPath;
     String m_strHomeUrl;
 
     CRhodesAppBase(const String& strRootPath);
@@ -31,7 +31,10 @@ public:
     static CRhodesAppBase* getInstance(){ return m_pInstance; }
 
     String resolveDBFilesPath(const String& strFilePath);
+    String getRelativeDBFilesPath(const String& strFilePath);
     const String& getRhoRootPath(){return m_strRhoRootPath;}
+    const String& getRhodesPath(){return m_strRhodesPath;}
+    void setRhodesPath(const String& path){m_strRhodesPath = path;}
     const String& getAppRootPath(){return m_strAppRootPath;}
     const String& getBlobsDirPath(){return m_strBlobsDirPath; }
     const String& getDBDirPath(){return m_strDBDirPath; }
@@ -58,6 +61,9 @@ extern "C" {
 
 const char* rho_native_rhopath();
 const char* rho_rhodesapp_getplatform();
+const char* rho_rhodesapp_getrhodespath();
+void rho_file_recursive_createdir(const char* szPath, const char* szBasePath);
+
 int rho_unzip_file(const char* szZipPath);
 
 void rho_free_callbackdata(void* pData);

data/platform/shared/curl/lib/rhossl.c

@@ -143,6 +143,7 @@ int Curl_rhossl_shutdown(struct connectdata *conn, int sockindex)
 {
     struct ssl_connect_data *connssl = &conn->ssl[sockindex];
     rho_ssl_shutdown(connssl->storage);
+    rho_ssl_free_storage(connssl->storage);
     return 0;
 }
 

data/platform/shared/db/DBAdapter.cpp

@@ -430,9 +430,11 @@ static boolean destroyTableName(String tableName, const rho::Vector<rho::String>
 boolean CDBAdapter::isTableExist(String strTableName)
 {
     Vector<String> vecTables;
-
+    Lock();
     IDBResult res = executeSQL( "SELECT name FROM sqlite_master WHERE type='table' AND name=?", strTableName.c_str() );
-    return !res.isEnd();
+    boolean bRes = !res.isEnd();
+    Unlock();
+    return bRes;
 }
 
 void CDBAdapter::destroy_tables(const rho::Vector<rho::String>& arIncludeTables, const rho::Vector<rho::String>& arExcludeTables)
@@ -646,7 +648,12 @@ void CDBAdapter::executeBatch(const char* szSql, CDBError& error)
 	
 void CDBAdapter::createSchema()
 {
+#ifdef RHODES_EMULATOR
+    String strPath = CFilePath::join( RHODESAPP().getRhodesPath(), "platform/shared/db/res/db/syncdb.schema" );
+    CFilePath oPath(strPath);
+#else
     CFilePath oPath(m_strDbPath);
+#endif
 
     String strSqlScript;
     CRhoFile::loadTextFile(oPath.changeBaseName("syncdb.schema").c_str(), strSqlScript);
@@ -667,7 +674,12 @@ void CDBAdapter::createSchema()
 void CDBAdapter::createTriggers()
 {
     char* errmsg = 0;
+#ifdef RHODES_EMULATOR
+    String strPath = CFilePath::join( RHODESAPP().getRhodesPath(), "platform/shared/db/res/db/syncdb.triggers" );
+    CFilePath oPath(strPath);
+#else
     CFilePath oPath(m_strDbPath);
+#endif
 
     String strSqlTriggers;
     CRhoFile::loadTextFile(oPath.changeBaseName("syncdb.triggers").c_str(), strSqlTriggers);

data/platform/shared/logging/RhoLogConf.cpp

@@ -18,18 +18,24 @@ LogSettings::LogSettings(){
     m_nMinSeverity = 0; 
     m_bLogToOutput = true; 
     m_bLogToFile = false;
+    m_bLogToSocket = true;
 
     m_nMaxLogFileSize = 0; 
     m_bLogPrefix = true; 
 
+	m_strLogHost = "PPP_PEER";
+	m_strLogPort = "11000";
+
     m_pFileSink = new CLogFileSink(*this);
     m_pOutputSink = new CLogOutputSink(*this);
+    m_pSocketSink = new CLogSocketSink(*this);
     m_pLogViewSink = NULL;
 }
 
 LogSettings::~LogSettings(){
     delete m_pFileSink;
     delete m_pOutputSink;
+    delete m_pSocketSink;
 }
 
 void LogSettings::getLogTextW(StringW& strTextW)
@@ -88,6 +94,12 @@ void LogSettings::loadFromConf(rho::common::RhoSettings& oRhoConf){
         setEnabledCategories( oRhoConf.getString("LogCategories").c_str() );
     if (oRhoConf.isExist( "ExcludeLogCategories") )
         setDisabledCategories( oRhoConf.getString("ExcludeLogCategories").c_str() );
+	if ( oRhoConf.isExist( "LogToSocket") )
+		setLogToSocket( oRhoConf.getBool("LogToSocket") );
+	if ( oRhoConf.isExist( "LogSocketHost") )
+		m_strLogHost = oRhoConf.getString("LogSocketHost");
+	if ( oRhoConf.isExist( "LogSocketPort") )
+		m_strLogPort = oRhoConf.getString("LogSocketPort");
 }
 
 void LogSettings::setLogFilePath(const char* szLogFilePath){ 
@@ -124,6 +136,9 @@ void LogSettings::sinkLogMessage( String& strMsg ){
     //Should be at the end
     if ( isLogToOutput() )
         m_pOutputSink->writeLogMessage(strMsg);
+
+    if ( isLogToSocket() )
+        m_pSocketSink->writeLogMessage(strMsg);
 }
 
 bool LogSettings::isCategoryEnabled(const LogCategory& cat)const{
@@ -165,7 +180,13 @@ using namespace rho::common;
 
 void rho_logconf_Init(const char* szRootPath){
 
+#ifdef RHODES_EMULATOR
+    String strRootPath = szRootPath;
+    strRootPath += RHO_EMULATOR_DIR"/";
+    rho::common::CFilePath oLogPath( strRootPath );
+#else
     rho::common::CFilePath oLogPath( szRootPath );
+#endif
 
     //Set defaults
 #ifdef RHO_DEBUG