rhodes 5.5.15 → 5.5.17

data/lib/extensions/zlib/ext/zlib.pro

@@ -1,4 +1,13 @@
 QT -= core
+    greaterThan(QT_VERSION, 5.6.0): {
+        CONFIG += c++14
+        DEFINES += CPP_ELEVEN
+        DEFINES += RHODES_VERSION_2
+    }
+
+    lessThan(QT_VERSION, 5.6.0): {
+        DEFINES += RHODES_VERSION_1
+    }
 
 TARGET = zlib
 TEMPLATE = lib
@@ -45,6 +54,8 @@ win32 {
   QMAKE_CXXFLAGS_WARN_ON += /wd4996 /wd4100 /wd4005
   QMAKE_CFLAGS_RELEASE += /O2
   QMAKE_CXXFLAGS_RELEASE += /O2
+  QMAKE_CXXFLAGS_RELEASE += -MP9
+  QMAKE_CXXFLAGS_DEBUG += -MP9
 }
 
 HEADERS += \

data/platform/android/Rhodes/jni/src/fileapi.cpp

@@ -1,18 +1,18 @@
 /*------------------------------------------------------------------------
 * (The MIT License)
-* 
+*
 * Copyright (c) 2008-2011 Rhomobile, Inc.
-* 
+*
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
 * in the Software without restriction, including without limitation the rights
 * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 * copies of the Software, and to permit persons to whom the Software is
 * furnished to do so, subject to the following conditions:
-* 
+*
 * The above copyright notice and this permission notice shall be included in
 * all copies or substantial portions of the Software.
-* 
+*
 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -20,7 +20,7 @@
 * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 * THE SOFTWARE.
-* 
+*
 * http://rhomobile.com
 *------------------------------------------------------------------------*/
 
@@ -166,6 +166,7 @@ typedef int (*func_readlink_t)(const char *path, char *buf, size_t bufsize);
 typedef int (*func_mkdir_t)(const char *path, mode_t mode);
 typedef int (*func_fchdir_t)(int fd);
 typedef int (*func_fcntl_t)(int fd, int command, ...);
+typedef int (*func_ioctl_t)(int fd, int command, ...);
 typedef int (*func_fdatasync_t)(int fd);
 typedef int (*func_flock_t)(int fd, int operation);
 typedef int (*func_fstat_t)(int filedes, struct stat *buf);
@@ -206,6 +207,7 @@ static func_readlink_t real_readlink;
 static func_mkdir_t real_mkdir;
 static func_fchdir_t real_fchdir;
 static func_fcntl_t real_fcntl;
+static func_ioctl_t real_ioctl;
 static func_fdatasync_t real_fdatasync;
 static func_flock_t real_flock;
 static func_fstat_t real_fstat;
@@ -531,6 +533,7 @@ RHO_GLOBAL void JNICALL Java_com_rhomobile_rhodes_file_RhoFileApi_nativeInit
     real_mkdir = (func_mkdir_t)dlsym(pc, "mkdir");
     real_fchdir = (func_fchdir_t)dlsym(pc, "fchdir");
     real_fcntl = (func_fcntl_t)dlsym(pc, "fcntl");
+    real_ioctl = (func_ioctl_t)dlsym(pc, "ioctl");
     real_fsync = (func_fsync_t)dlsym(pc, "fsync");
     real_fdatasync = (func_fdatasync_t)dlsym(pc, "fdatasync");
 
@@ -1335,11 +1338,22 @@ RHO_GLOBAL int flock(int fd, int operation)
     RHO_NOT_IMPLEMENTED;
 }
 
-RHO_GLOBAL int ioctl(int, int, ...)
+RHO_GLOBAL int ioctl(int fd, int command, ...)
 {
-    RHO_NOT_IMPLEMENTED;
+     RHO_LOG("ioctl: fd %d, command: %d", fd, command);
+     if ((rho_fs_mode == RHO_FS_DISK_ONLY || fd < RHO_FD_BASE) && (real_ioctl!=0) )
+     {
+         va_list vl;
+         va_start(vl, command);
+         int arg = va_arg(vl, int);
+         va_end(vl);
+         return real_ioctl(fd, command, arg);
+     }
+
+     RHO_NOT_IMPLEMENTED;
 }
 
+
 RHO_GLOBAL int fsync(int fd)
 {
     if (rho_fs_mode == RHO_FS_DISK_ONLY || fd < RHO_FD_BASE)
@@ -1421,13 +1435,13 @@ RHO_GLOBAL int stat(const char *path, struct stat *buf)
 {
     RHO_LOG("stat: %s", path);
     std::string fpath = make_full_path(path);
-    
+
     /* fail immediately if found invalid symbol */
     if (fpath.find(':')!=std::string::npos)
     {
         return -1;
     }
-    
+
     if (!need_emulate(fpath))
     {
         int e = real_stat(path, buf);
@@ -1466,13 +1480,13 @@ RHO_GLOBAL int lstat(const char *path, struct stat *buf)
 {
     RHO_LOG("lstat: %s", path);
     std::string fpath = make_full_path(path);
-    
+
     /* fail immediately if found invalid symbol */
     if (fpath.find(':')!=std::string::npos)
     {
         return -1;
     }
-    
+
     if (!need_emulate(fpath))
         return real_lstat(path, buf);
 
@@ -1593,16 +1607,16 @@ RHO_GLOBAL int select(int maxfd, fd_set *rfd, fd_set *wfd, fd_set *efd, struct t
             {
              if (FD_ISSET(i, rfd))
                 {
-                    
+
                  FD_SET(i, &fds);
                     ++count;
-	
-	
+
+
                 }
             }
             if (count > 0)
           {
-	    
+
                 RHO_LOG("select: return %d (rho)", count);
                 memmove(rfd, &fds, sizeof(fds));
                 if (wfd)
@@ -1958,25 +1972,25 @@ RHO_GLOBAL int rho_file_get_fs_mode()
 }
 
 RHO_GLOBAL void rho_android_file_reload_stat_table() {
-    
+
     RHO_LOG("rho_android_file_reload_stat_table() START");
-    
+
     rho_stat_map.clear();
-    
+
     JNIEnv *env = jnienv();
     env->CallStaticVoidMethod(clsFileApi, midReloadStatTable);
-    
+
     RHO_LOG("rho_android_file_reload_stat_table() FINISH");
 }
 
 RHO_GLOBAL void rho_android_force_all_files() {
-    
+
     RHO_LOG("rho_android_force_all_files() START");
-    
+
     JNIEnv *env = jnienv();
 
     env->CallStaticVoidMethod(clsFileApi, midForceAllFiles);
-    
+
     RHO_LOG("rho_android_force_all_files() FINISH");
 }
 

data/platform/iphone/Classes/SimpleMainView.m

@@ -939,7 +939,7 @@ static BOOL makeHiddenUntilLoadContent = YES;
         //else {
 
         NSString *redirect = nil;
-        if ([cleared_url hasPrefix:@"file:"]) {
+        if ([cleared_url hasPrefix:@"file:"] || rho_rhodesapp_is_nodejs_app()) {
             redirect = cleared_url;
         }
         else {

data/platform/shared/api_generator/MethodResult.cpp

@@ -8,6 +8,7 @@
 #include "MethodResultConvertor.h"
 #include "RubyResultConvertor.h"
 #include "JSONResultConvertor.h"
+#include "js_helpers.h"
 
 namespace rho
 {
@@ -256,12 +257,16 @@ void CMethodResult::callCallback()
                     strCallback += "},\"";
                     strCallback += m_strCallbackParam + "\")";
                     
-                    if (m_synchronousCallback)
-                    {
-                        rho_webview_execute_js_sync(strCallback.c_str(), m_iTabId);
-                    } else
-                    {
-                        rho_webview_execute_js(strCallback.c_str(), m_iTabId);
+                    
+                    if (callCustomJVMCallbackProvider(m_strJVMID.c_str(), strCallback.c_str()) != 1) {
+                        
+                        if (m_synchronousCallback)
+                        {
+                            rho_webview_execute_js_sync(strCallback.c_str(), m_iTabId);
+                        } else
+                        {
+                            rho_webview_execute_js(strCallback.c_str(), m_iTabId);
+                        }
                     }
                     break;
                 }
@@ -298,10 +303,20 @@ void CMethodResult::setRubyCallbackProc(unsigned long oRubyCallbackProc)
 
 void CMethodResult::setJSCallback(const rho::String& strCallback)
 {
-    LOG(TRACE) + "setJSCallback: " + strCallback;
+    LOG(TRACE) + "setJSCallback: " + strCallback + " without JVMID";
+        
+    m_strJSCallback = strCallback;
+    m_iTabId = rho_webview_active_tab();
+}
+    
+
+void CMethodResult::setJSCallback(const rho::String& strCallback, const rho::String& strJVMID)
+{
+    LOG(TRACE) + "setJSCallback: " + strCallback + " JVMID: "+strJVMID;
 
     m_strJSCallback = strCallback;
     m_iTabId = rho_webview_active_tab();
+    m_strJVMID = strJVMID;
 }
     
 bool CMethodResult::isSynchronousCallback()

data/platform/shared/api_generator/MethodResult.h

@@ -22,6 +22,7 @@ private:
     rho::String m_strJSCallback;
     bool m_synchronousCallback;
     int m_iTabId;
+    rho::String m_strJVMID;
     rho::Hashtable<rho::String, rho::String> m_hashStrRes;
     rho::Hashtable<rho::String, rho::Hashtable<rho::String, rho::String> > m_hashStrL2Res;
     rho::Hashtable<rho::String, rho::Vector<rho::String> > m_hashStrVecRes;
@@ -59,7 +60,7 @@ private:
 
 public:
 
-    CMethodResult(bool bCollectionMode=false): m_strParamName("result"), m_synchronousCallback(false), m_iTabId(-1),
+    CMethodResult(bool bCollectionMode=false): m_strParamName("result"), m_synchronousCallback(false), m_iTabId(-1), m_strJVMID(""),
         m_nRes(0), m_bRes(false), m_dRes(0), m_ResType(eNone), m_eRequestedType(eNone), m_resClassType(rctPlain), m_oRubyObjectClass(0), m_bCollectionMode(bCollectionMode){}
     
     ECallbackType getCallbackType();
@@ -69,6 +70,7 @@ public:
     const rho::String& getRubyCallback() const { return m_strRubyCallback; }
     void setRubyCallbackProc(unsigned long oRubyCallbackProc);
     void setJSCallback(const rho::String& strCallback);
+    void setJSCallback(const rho::String& strCallback, const rho::String& strJVMID);
     void setCallInUIThread(rho::boolean bUIThread) {}
     void setCallbackParam(const rho::String& strCallbackParam){ m_strCallbackParam = strCallbackParam; }
     const rho::String& getCallbackParam() const { return m_strCallbackParam; }

data/platform/shared/api_generator/iphone/CMethodResult.m

@@ -6,7 +6,7 @@
 #import "CJSConverter.h"
 #import "RubyCallbackHelper.h"
 
-
+#include "../js_helpers.h"
 
 extern const char* rho_webview_execute_js(const char* js, int index);
 
@@ -242,7 +242,11 @@ extern int rho_webview_active_tab();
     //    tabIndex = [mJSWebViewUID intValue];
     //}
     //[[[Rhodes sharedInstance] mainView] executeJs:jscode tab:tabIndex];
-    rho_webview_execute_js([jscode UTF8String], tabIndex);
+    
+    const char* js_code = [jscode UTF8String];
+    if (callCustomJVMCallbackProvider([mJSWebViewUID UTF8String], js_code) != 1) {
+        rho_webview_execute_js(js_code, tabIndex);
+    }
 }
 
 -(void) callCallback {

data/platform/shared/api_generator/js_helpers.cpp

@@ -154,3 +154,22 @@ void rho_http_js_entry_point(void *arg, rho::String const &query )
 
 }
 }
+
+static std::map<rho::String, JVM_Callback_Provider> g_jvm_providers;
+
+
+
+
+void setCustomJVMCallbackProvider(const char* jvm_id, JVM_Callback_Provider provider) {
+    g_jvm_providers[jvm_id] = provider;
+}
+
+
+int callCustomJVMCallbackProvider(const char* jvm_id, const char* js_code) {
+    JVM_Callback_Provider provider = g_jvm_providers[jvm_id];
+    if (provider != NULL) {
+        provider(js_code);
+        return 1;
+    }
+    return 0;
+}

data/platform/shared/api_generator/js_helpers.h

@@ -1,5 +1,8 @@
 #pragma once
 
+
+#ifdef __cplusplus
+
 #include "json/JSONIterator.h"
 
 namespace rho
@@ -18,3 +21,23 @@ void rho_http_js_entry_point(void *arg, rho::String const &query );
 
 }
 }
+
+#endif
+//__cplusplus
+
+
+#ifdef __cplusplus
+extern "C"{
+#endif //__cplusplus
+    
+typedef void (*JVM_Callback_Provider)(const char* js_code);
+    
+void setCustomJVMCallbackProvider(const char* jvm_id, JVM_Callback_Provider provider);
+
+//return 1 if callback called (has JVM with defined ID
+// if not found return zero
+int callCustomJVMCallbackProvider(const char* jvm_id, const char* js_code);
+    
+#ifdef __cplusplus
+}
+#endif //__cplusplus

data/platform/shared/common/RhoConf.cpp

@@ -226,7 +226,6 @@ int RhoSettings::getInt(const char* szName){
 	std::map<String,String>::iterator it = m_mapValues.find(szName);
 	if ( it != m_mapValues.end() )
         return atoi(it->second.c_str());
-
     return 0;
 }
 

data/platform/shared/common/RhoPort.h

@@ -107,7 +107,10 @@ typedef __int64 int64;
 typedef unsigned __int64 uint64;
 
 #define strcasecmp _stricmp
+
+#ifndef CPP_ELEVEN
 #define snprintf _snprintf
+#endif
 
 #define FMTI64 "%I64d"
 #define FMTU64 "%I64u"

data/platform/shared/common/RhodesApp.cpp

@@ -402,8 +402,7 @@ void CAppCallbacksQueue::processUiCreated()
 
 /*static*/ CRhodesApp* CRhodesApp::Create(const String& strRootPath, const String& strUserPath, const String& strRuntimePath)
 {
-    if ( m_pInstance != null) 
-        return (CRhodesApp*)m_pInstance;
+    if ( m_pInstance != null) return (CRhodesApp*)m_pInstance;
 
     m_pInstance = new CRhodesApp(strRootPath, strUserPath, strRuntimePath);
 
@@ -481,7 +480,7 @@ void CRhodesApp::run()
 {
     LOG(INFO) + "Starting RhodesApp main routine...";
 #ifndef RHO_NO_RUBY_API
-    if (!isJSApplication())
+    if (!isJSApplication() && !isNodeJSApplication())
     {
         RhoRubyStart();
         rubyext::CGeoLocation::Create();
@@ -496,7 +495,7 @@ void CRhodesApp::run()
 		sync::RhoconnectClientManager::syncThreadCreate();
 	}
 #ifndef RHO_NO_RUBY_API
-    if (!isJSApplication())
+    if (!isJSApplication() && !isNodeJSApplication())
     {
         LOG(INFO) + "RhoRubyInitApp...";
         RhoRubyInitApp();
@@ -570,7 +569,7 @@ void CRhodesApp::run()
 
     getExtManager().close();
 
-    if (!isJSApplication())
+    if (!isJSApplication() && !isNodeJSApplication())
     {
         rubyext::CGeoLocation::Destroy();
     }
@@ -583,7 +582,7 @@ void CRhodesApp::run()
 
     db::CDBAdapter::closeAll();
 #ifndef RHO_NO_RUBY_API
-    if (!isJSApplication())
+    if (!isJSApplication() && !isNodeJSApplication())
     {
         RhoRubyStop();
     }
@@ -672,7 +671,7 @@ void CRhodesApp::runCallbackInThread(const String& strCallback, const String& st
 static void callback_activateapp(void *arg, String const &strQuery)
 {
 #ifndef RHO_NO_RUBY_API
-    if (!RHODESAPP().isJSApplication())
+    if (!RHODESAPP().isJSApplication() && !RHODESAPP().isNodeJSApplication())
         rho_ruby_activateApp();
 #endif
 
@@ -683,7 +682,7 @@ static void callback_activateapp(void *arg, String const &strQuery)
 static void callback_deactivateapp(void *arg, String const &strQuery)
 {
 #ifndef RHO_NO_RUBY_API
-    if (!RHODESAPP().isJSApplication())
+    if (!RHODESAPP().isJSApplication() && !RHODESAPP().isNodeJSApplication())
         rho_ruby_deactivateApp();
 #endif
 
@@ -694,7 +693,7 @@ static void callback_deactivateapp(void *arg, String const &strQuery)
 static void callback_uicreated(void *arg, String const &strQuery)
 {
 #ifndef RHO_NO_RUBY_API
-    if (!RHODESAPP().isJSApplication())
+    if (!RHODESAPP().isJSApplication() && !RHODESAPP().isNodeJSApplication())
         rho_ruby_uiCreated();
 #endif
 
@@ -704,7 +703,7 @@ static void callback_uicreated(void *arg, String const &strQuery)
 static void callback_uidestroyed(void *arg, String const &strQuery)
 {
 #ifndef RHO_NO_RUBY_API
-    if (!RHODESAPP().isJSApplication())
+    if (!RHODESAPP().isJSApplication() && !RHODESAPP().isNodeJSApplication())
         rho_ruby_uiDestroyed();
 #endif
 
@@ -1587,6 +1586,27 @@ const char* CRhodesApp::getFreeListeningPort()
 
     return m_strListeningPorts.c_str();
 }
+    
+const char* CRhodesApp::getNodeJSListeningPort() {
+    if ( m_strNodeJSListeningPorts.length() > 0 )
+        return m_strNodeJSListeningPorts.c_str();
+    
+    int port = rho_conf_getInt("nodejs_local_server_port");
+    if (port == 0) {
+        port = determineFreeListeningPort();
+    }
+    if (port < 0)
+        port = 0;
+    if (port > 65535)
+        port = 0;
+    
+    m_strNodeJSListeningPorts = convertToStringA(port);
+    m_nNodeJSListeningPorts = port;
+    
+    LOG(INFO) + "Free Node.js listening port: " + m_strNodeJSListeningPorts;
+    
+    return m_strNodeJSListeningPorts.c_str();
+}
 
 int CRhodesApp::determineFreeListeningPort()
 {
@@ -1729,7 +1749,12 @@ void CRhodesApp::initAppUrls()
         m_strHomeUrl = "http://127.0.0.1:";
     }
     
-    m_strHomeUrl += getFreeListeningPort();
+    if (isNodeJSApplication()) {
+        m_strHomeUrl += getNodeJSListeningPort();
+    }
+    else {
+        m_strHomeUrl += getFreeListeningPort();
+    }
 
 #ifndef RHODES_EMULATOR
     m_strLoadingPagePath = "file://" + getRhoRootPath() + "apps/app/loading.html";
@@ -2640,6 +2665,12 @@ int rho_http_get_port()
   return RHODESAPP().getLocalServerPort();
 }
 
+int rho_nodejs_get_port()
+{
+  return RHODESAPP().getNodeJSServerPort();
+}
+    
+    
 #ifdef OS_MACOSX
 const char* rho_http_direct_request( const char* method, const char* uri, const char* query, const void* headers, const char* body, int bodylen, int* responseLength )
 {
@@ -2974,6 +3005,10 @@ int rho_rhodesapp_is_application_active() {
     return RHODESAPP().isApplicationActive() ? 1 : 0;
 }
     
+int rho_rhodesapp_is_nodejs_app() {
+    return RHODESAPP().isNodeJSApplication() ? 1 : 0;
+}
+    
 int rho_rhodesapp_canstartapp(const char* szCmdLine, const char* szSeparators)
 {
     String strCmdLineSecToken;