rhodes 6.2.0 → 7.1.17

data/platform/shared/common/IRhoClassFactory.h

@@ -41,6 +41,7 @@ struct ICallbackObject
 namespace common {
 struct IRhoThreadImpl;
 struct IRhoCrypt;
+class ISecurityTokenGenerator;
 
 struct IRhoClassFactory
 {
@@ -52,6 +53,7 @@ struct IRhoClassFactory
     virtual IRhoCrypt* createRhoCrypt() = 0;
 
     virtual net::INetRequestImpl* createNetRequestImpl() = 0;
+    virtual const ISecurityTokenGenerator* createSecurityTokenGenerator() = 0;
 };
 
 }

data/platform/shared/common/ISecurityTokenGenerator.h

@@ -0,0 +1,16 @@
+#pragma once
+
+#include "common/RhoStd.h"
+
+namespace rho{
+namespace common{
+
+class ISecurityTokenGenerator
+{
+public:
+    virtual ~ISecurityTokenGenerator(){}
+    virtual const rho::String& getSecurityToken() const = 0;
+};
+
+}
+}

data/platform/shared/common/RhoFile.cpp

@@ -82,6 +82,10 @@ extern "C"{
     extern "C" int  rename(const char *, const char *);
 #endif
 
+#if defined(OS_MACOSX) && defined(TARGET_OS_IOS) && (TARGET_OS_IOS==1)
+extern "C" int rhodes_ios_delete_file_via_platform_api(const char* filePath);
+#endif
+
 namespace rho{
 namespace common{
 
@@ -485,11 +489,18 @@ bool CRhoFile::loadTextFile(const char* szFilePath, String& strFile)
 unsigned int CRhoFile::deleteFile( const char* szFilePath ){
 #if defined(WINDOWS_PLATFORM)
     return (unsigned int)_unlink(szFilePath);
+#else
+#if defined(OS_MACOSX) && defined(TARGET_OS_IOS) && (TARGET_OS_IOS==1)
+    // For support Citrix on iOS
+    return rhodes_ios_delete_file_via_platform_api(szFilePath);
 #else
     return (unsigned int)remove(szFilePath);
 #endif
+#endif
 }
 
+
+
 unsigned int CRhoFile::deleteEmptyFolder( const char* szFilePath ){
 #if defined(WINDOWS_PLATFORM)
     return (unsigned int)_rmdir(szFilePath);

data/platform/shared/common/RhoMath.h

@@ -33,6 +33,20 @@
 extern "C" {
 #endif
 
+#define M_E		2.7182818284590452354	/* e */
+#define M_LOG2E		1.4426950408889634074	/* log 2e */
+#define M_LOG10E	0.43429448190325182765	/* log 10e */
+#define M_LN2		0.69314718055994530942	/* log e2 */
+#define M_LN10		2.30258509299404568402	/* log e10 */
+#define M_PI		3.14159265358979323846	/* pi */
+#define M_PI_2		1.57079632679489661923	/* pi/2 */
+#define M_PI_4		0.78539816339744830962	/* pi/4 */
+#define M_1_PI		0.31830988618379067154	/* 1/pi */
+#define M_2_PI		0.63661977236758134308	/* 2/pi */
+#define M_2_SQRTPI	1.12837916709551257390	/* 2/sqrt(pi) */
+#define M_SQRT2		1.41421356237309504880	/* sqrt(2) */
+#define M_SQRT1_2	0.70710678118654752440	/* 1/sqrt(2) */
+
 double rho_math_sqrt(double n);
 uint64 rho_math_pow2(int n);
 

data/platform/shared/common/RhoMutexLock.h

@@ -153,4 +153,17 @@ CRITICAL_SECTION __g_cs_##name;
 
 #endif //__cplusplus
 
+# ifdef __cplusplus
+extern "C" {
+# endif
+
+void* rho_mutex_create();
+void rho_mutex_destroy(void*);
+void rho_mutex_lock(void*);
+void rho_mutex_release(void*);
+
+# ifdef __cplusplus
+}
+#endif //__cplusplus
+
 #endif //_RHOMUTEXLOCK_H_

data/platform/shared/common/RhoSystem.h

@@ -45,7 +45,7 @@ public:
 
 inline unsigned int CSystem::getThreadID(){ 
   // On Linux and FreeBSD, we try to use gettid().
-#if defined OS_LINUX || defined OS_FREEBSD || defined OS_MACOSX
+#if defined OS_LINUX || defined OS_FREEBSD
 #ifndef __NR_gettid
 #ifdef OS_MACOSX
 #define __NR_gettid SYS_gettid

data/platform/shared/common/RhoThread.cpp

@@ -26,6 +26,7 @@
 
 #include "RhoThread.h"
 #include "IRhoClassFactory.h"
+#include "RhoMutexLock.h"
 
 namespace rho {
 namespace common {
@@ -47,3 +48,27 @@ void CRhoThread::start(EPriority ePriority)
 
 }
 }
+
+# ifdef __cplusplus
+extern "C" {
+# endif
+
+void* rho_mutex_create() {
+    return (void*)(new rho::common::CMutex());
+}
+
+void rho_mutex_destroy(void* m) {
+    delete m;
+}
+
+void rho_mutex_lock(void* m) {
+    ((rho::common::CMutex*)m)->Lock();
+}
+
+void rho_mutex_release(void* m) {
+    ((rho::common::CMutex*)m)->Unlock();
+}
+
+# ifdef __cplusplus
+}
+#endif //__cplusplus

data/platform/shared/common/RhodesApp.cpp

@@ -194,6 +194,14 @@ void CAppCallbacksQueue::callCallback(const String& strCallback)
 
     String strUrl = RHODESAPP().getBaseUrl();
     strUrl += strCallback;
+    
+    boolean force_https = false;
+#ifdef OS_MACOSX
+    if (rho_conf_is_property_exists("ios_https_local_server")!=0) {
+        force_https = rho_conf_getBool("ios_https_local_server")!=0;
+    }
+#endif
+    
     NetResponse resp = getNetRequest().pullData( strUrl, NULL );
     if ( !resp.isOK() )
     {
@@ -205,9 +213,21 @@ void CAppCallbacksQueue::callCallback(const String& strCallback)
             bTryAgain = true;
         }
 #else
-        if ( String_startsWith( strUrl, "http://127.0.0.1:" ) )
+        String addr_number;
+        String addr_local;
+        if (force_https) {
+            addr_number = "https";
+            addr_local = "https";
+        }
+        else {
+            addr_number = "http";
+            addr_local = "http";
+        }
+        addr_number = addr_number + "://127.0.0.1:";
+        addr_local = addr_local + "://localhost:";
+        if ( String_startsWith( strUrl, addr_number ) )
         {
-            RHODESAPP().setBaseUrl("http://localhost:");
+            RHODESAPP().setBaseUrl(addr_local);
             bTryAgain = true;
         }
 #endif
@@ -390,7 +410,7 @@ void CAppCallbacksQueue::processUiCreated()
     // at this point JS app is unlikely to set its own handler, just navigate to overriden start path
     RHODESAPP().getApplicationEventReceiver()->onUIStateChange(rho::common::UIStateCreated);
 
-        if ( rho_ruby_is_started() )
+        if ( rho_ruby_is_started() && (!RHODESAPP().isRubyNodeJSApplication()))
             callCallback("/system/uicreated");
 #if !defined(APP_BUILD_CAPABILITY_SHARED_RUNTIME) || !defined(OS_ANDROID)
         else
@@ -417,6 +437,19 @@ void CAppCallbacksQueue::processUiCreated()
     m_pInstance = 0;
 }
 
+#if defined(WINDOWS_PLATFORM)
+void CRhodesApp::waitAppStarted()
+{
+    std::unique_lock<std::mutex> lock(wait_mutex);
+    activated_cond.wait(lock);
+}
+
+void CRhodesApp::notifyAppStared()
+{
+    activated_cond.notify_one();
+}
+#endif
+
 CRhodesApp::CRhodesApp(const String& strRootPath, const String& strUserPath, const String& strRuntimePath)
     :CRhodesAppBase(strRootPath, strUserPath, strRuntimePath), 
 	m_networkStatusReceiver(m_mxNetworkStatus)
@@ -523,7 +556,7 @@ void CRhodesApp::run()
 		RHODESAPP().notifyLocalServerStarted();
 
 #ifdef OS_MACOSX
-  bool shouldRunDirectQueue = true;
+  bool shouldRunDirectQueue = false;
   net::CDirectHttpRequestQueue directQueue(*m_httpServer, *this );
 
     if (RHOCONF().isExist("ios_direct_local_requests")) {
@@ -1756,10 +1789,14 @@ void CRhodesApp::initAppUrls()
         m_strHomeUrl = "https://127.0.0.1:";
     }
     else {
-        m_strHomeUrl = "http://127.0.0.1:";
+        m_strHomeUrl = "http";
+        m_strHomeUrl = m_strHomeUrl + "://127.0.0.1:";
     }
     
-    if (isNodeJSApplication()) {
+    m_strRubyServerHomeURL = m_strHomeUrl+getFreeListeningPort();
+    m_strNodeServerHomeURL = m_strHomeUrl+getNodeJSListeningPort();
+
+    if (isNodeJSApplication() || isRubyNodeJSApplication()) {
         m_strHomeUrl += getNodeJSListeningPort();
     }
     else {
@@ -3023,6 +3060,15 @@ int rho_rhodesapp_is_application_active() {
 int rho_rhodesapp_is_nodejs_app() {
     return RHODESAPP().isNodeJSApplication() ? 1 : 0;
 }
+
+int rho_rhodesapp_is_rubynodejs_app() {
+    return RHODESAPP().isRubyNodeJSApplication() ? 1 : 0;
+}
+
+const char* rho_rhodesapp_rubyhomeurl() {
+    return RHODESAPP().getRubyHomeURL().c_str();
+}
+
     
 int rho_rhodesapp_canstartapp(const char* szCmdLine, const char* szSeparators)
 {

data/platform/shared/common/RhodesApp.h

@@ -40,6 +40,9 @@
 #include "ExtManager.h"
 #include "api_generator/MethodResult.h"
 
+#include <condition_variable>
+#include <mutex>
+
 #undef DEFAULT_LOGCATEGORY
 #define DEFAULT_LOGCATEGORY "RhodesApp"
 
@@ -149,6 +152,9 @@ private:
     String m_strListeningPorts;
     String m_strNodeJSListeningPorts;
     int m_nNodeJSListeningPorts;
+    
+    String m_strRubyServerHomeURL;
+    String m_strNodeServerHomeURL;
 
     common::CAutoPtr<net::CHttpServer> m_httpServer;
     CSplashScreen m_oSplashScreen;
@@ -168,6 +174,10 @@ private:
     Vector<String> m_arAppBackUrl, m_arAppBackUrlOrig;
     Vector<ICallbackObject*> m_arCallbackObjects;
     mutable common::CMutex m_mxCallbackObjects;
+#if defined(WINDOWS_PLATFORM)
+    std::mutex wait_mutex;
+    std::condition_variable activated_cond;
+#endif
 	
     common::CMutex m_mxScreenRotationCallback;
     String m_strScreenRotationCallback, m_strScreenRotationCallbackParams;
@@ -244,7 +254,10 @@ public:
     CSplashScreen& getSplashScreen(){return m_oSplashScreen;}
     CRhoTimer&     getTimer(){ return m_oTimer; }
 
-    CExtManager&  getExtManager(){ return m_oExtManager; }
+    CExtManager&  getExtManager()
+    {
+        return m_oExtManager;
+    }
 
     String addCallbackObject(ICallbackObject* pCallbackObject, String strName);
     unsigned long getCallbackObject(int nIndex);
@@ -288,6 +301,10 @@ public:
   
     unsigned int getLocalServerPort() { return (m_httpServer!=0)?(m_httpServer->getPort()):0; }
     unsigned int getNodeJSServerPort() { return m_nNodeJSListeningPorts; }
+    
+    String& getRubyHomeURL() {return m_strRubyServerHomeURL;}
+    String& getNodeHomeURL() {return m_strNodeServerHomeURL;}
+
 #ifdef OS_MACOSX
     String directHttpRequest( const String& method, const String& uri, const String& query, const rho::net::HttpHeaderList& headers, const String& body ) {  return m_httpServer->directRequest(method, uri, query, headers, body ); }
 #endif
@@ -298,6 +315,10 @@ public:
     #endif
 
     virtual bool isApplicationActive() { return getApplicationEventReceiver()->isApplicationActive(); }
+#if defined(WINDOWS_PLATFORM)
+    void waitAppStarted();
+    void notifyAppStared();
+#endif
 
 protected:
     virtual void run();
@@ -421,7 +442,10 @@ void rho_sys_set_network_status_notify(const char* url, int poll_interval);
 void rho_sys_clear_network_status_notify();
 int rho_rhodesapp_is_application_active();
 int rho_rhodesapp_is_nodejs_app();
+int rho_rhodesapp_is_rubynodejs_app();
     
+const char* rho_rhodesapp_rubyhomeurl();
+
 #ifdef __cplusplus
 };
 #endif //__cplusplus

data/platform/shared/common/RhodesAppBase.cpp

@@ -77,9 +77,11 @@ CRhodesAppBase::CRhodesAppBase(const String& strRootPath, const String& strUserP
 #endif
 
     const char* nodejs_app = get_app_build_config_item("nodejs_application");
-    
     m_bNodeJSApplication = nodejs_app && (strcmp(nodejs_app,"true") == 0);
-    
+
+    const char* rubynodejs_app = get_app_build_config_item("rubynodejs_application");
+    m_bRubyNodeJSApplication = rubynodejs_app && (strcmp(rubynodejs_app,"true") == 0);
+
     initAppUrls();
 }
 	

data/platform/shared/common/RhodesAppBase.h

@@ -65,6 +65,7 @@ protected:
     PushManager m_appPushMgr;
     bool m_bJSApplication;
     bool m_bNodeJSApplication;
+    bool m_bRubyNodeJSApplication;
 
     CRhodesAppBase(const String& strRootPath, const String& strUserPath, const String& strRuntimePath);
 public:
@@ -99,6 +100,10 @@ public:
     void setNodeJSApplication(bool bJSApp){ m_bNodeJSApplication = bJSApp; }
     bool isNodeJSApplication()const{ return m_bNodeJSApplication; }
 
+    void setRubyNodeJSApplication(bool bJSApp){ m_bRubyNodeJSApplication = bJSApp; }
+    bool isRubyNodeJSApplication()const{ return m_bRubyNodeJSApplication; }
+
+    
     // Deprecated
     boolean callPushCallback(const String& strData) const;
 

data/platform/shared/common/iphone/RhoClassfactory.h

@@ -29,6 +29,7 @@
 #include <assert.h>
 
 #include "common/IRhoClassFactory.h"
+#include "common/ISecurityTokenGenerator.h"
 #include "net/CURLNetRequest.h"
 #include "common/PosixThreadImpl.h"
 #include "net/iphone/sslimpl.h"
@@ -79,6 +80,11 @@ public:
         return m_pSsl;
     }
 
+    const rho::common::ISecurityTokenGenerator* createSecurityTokenGenerator()
+    {
+        return nullptr;
+    }
+
 private:
     CMutex m_sslMutex;
     common::CAutoPtr<net::ISSL> m_pSsl;

data/platform/shared/common/iphone/RhoCryptImpl.mm

@@ -53,6 +53,8 @@ namespace common{
 IMPLEMENT_LOGCLASS(CRhoCryptImpl,"RhoCrypt");
 #define checkError(func) _checkError(func, #func)
 
+static NSMutableDictionary* ourKeys = [NSMutableDictionary dictionaryWithCapacity:16];
+
 CRhoCryptImpl::CRhoCryptImpl(void) : m_dbKeyData(NULL)
 {
 	m_dwLastError = 0;
@@ -61,8 +63,9 @@ CRhoCryptImpl::CRhoCryptImpl(void) : m_dbKeyData(NULL)
 
 CRhoCryptImpl::~CRhoCryptImpl(void)
 {
-    if ( m_dbKeyData ) 
-        free(m_dbKeyData);
+    // keys now stored into ourKeys hash. For restore in case of DB was reset and reopen - new CRhoCryptImpl created during this process and new CRhoCryptImpl forget about key - so we store keys in hash partition -> key
+    //if ( m_dbKeyData )
+    //    free(m_dbKeyData);
 }
 	
 bool CRhoCryptImpl::_checkError( int32_t status, const char* szFunc )
@@ -607,6 +610,15 @@ void CRhoCryptImpl::initContext(const char* szPartition)
 
     RAWLOG_INFO1("CRhoCryptImpl::initContext() Partition = [%s]", szPartition);
     m_strDBPartition = szPartition;
+    
+    if (!m_dbKeyData) {
+        // if DB was reopen again we restore stored key from hash by partition for avoid regenerate key in case of isNewInstallation
+        NSObject* obj = [ourKeys objectForKey:[NSString stringWithUTF8String:szPartition]];
+        if (obj != nil) {
+            NSNumber* nsn = (NSNumber*)obj;
+            m_dbKeyData = (unsigned char*)[nsn unsignedLongLongValue];
+        }
+    }
 
     RAWLOG_INFO1("CRhoCryptImpl::initContext() START m_strDBPartition = [%s]", m_strDBPartition.c_str());
 	if(isNewInstallation && !m_dbKeyData)
@@ -633,6 +645,13 @@ void CRhoCryptImpl::initContext(const char* szPartition)
     }
 
 	generateNewKey();
+    
+    {
+        // store key for partition - key will be restored in future in case of DB will reopened
+        NSNumber* nsn = [NSNumber numberWithUnsignedLongLong:(unsigned long long)m_dbKeyData];
+        [ourKeys setObject:nsn forKey:[NSString stringWithUTF8String:szPartition]];
+    }
+    
     writeKeyToStorageOld();
 	writeKeyToStorageNew();
     RAWLOG_INFO("CRhoCryptImpl::initContext() FINISH");

data/platform/shared/common/map/BaseMapEngine.cpp

@@ -796,12 +796,12 @@ BaseMapView::BaseMapView(IDrawingDevice *device, const char* name)
 {
     String url = RHOCONF().getString("ESRI_map_url_roadmap");
     if (url.empty())
-        url = "http://server.arcgisonline.com/ArcGIS/rest/services/World_Street_Map/";
+        url = "https://server.arcgisonline.com/ArcGIS/rest/services/World_Street_Map/";
     m_map_urls.put("roadmap", url);
 
     url = RHOCONF().getString("ESRI_map_url_satellite");
     if (url.empty())
-        url = "http://server.arcgisonline.com/ArcGIS/rest/services/World_Imagery/";
+        url = "https://server.arcgisonline.com/ArcGIS/rest/services/World_Imagery/";
     m_map_urls.put("satellite", url);
 }