rhodes 2.0.3 → 2.1.0

data/platform/shared/net/HttpServer.cpp

@@ -1,6 +1,7 @@
 #include "net/HttpServer.h"
 #include "common/RhodesApp.h"
 #include "common/RhoFilePath.h"
+#include "net/URI.h"
 #include "ruby/ext/rho/rhoruby.h"
 
 #include <algorithm>
@@ -46,6 +47,8 @@ namespace net
 using namespace rho::common;
 
 IMPLEMENT_LOGCLASS(CHttpServer, "HttpServer");
+
+static size_t const FILE_BUF_SIZE = 65536;
     
 static bool isid(String const &s)
 {
@@ -64,40 +67,6 @@ static bool isfile(String const &path)
     return stat(path.c_str(), &st) == 0 && S_ISREG(st.st_mode);
 }
 
-static String decode(String const &url)
-{
-    String ret;
-    for (const char *s = url.c_str(); *s != '\0'; ++s) {
-        if (*s != '%') {
-            ret.push_back(*s);
-            continue;
-        }
-        
-        unsigned int c1 = (unsigned char)*++s;
-        if (c1 >= (unsigned char)'0' && c1 <= (unsigned char)'9')
-            c1 = c1 - (unsigned char)'0';
-        else if (c1 >= (unsigned char)'a' && c1 <= (unsigned char)'f')
-            c1 = c1 - (unsigned char)'a' + 10;
-        else if (c1 >= (unsigned char)'A' && c1 <= (unsigned char)'F')
-            c1 = c1 - (unsigned char)'A' + 10;
-        else
-            break;
-        unsigned int c2 = (unsigned char)*++s;
-        if (c2 >= (unsigned char)'0' && c2 <= (unsigned char)'9')
-            c2 = c2 - (unsigned char)'0';
-        else if (c2 >= (unsigned char)'a' && c2 <= (unsigned char)'f')
-            c2 = c2 - (unsigned char)'a' + 10;
-        else if (c2 >= (unsigned char)'A' && c2 <= (unsigned char)'F')
-            c2 = c2 - (unsigned char)'A' + 10;
-        else
-            break;
-        
-        char c = (char)((c1 << 4) | c2);
-        ret.push_back(c);
-    }
-    return ret;
-}
-
 static bool isindex(String const &uri)
 {
     static struct {
@@ -263,40 +232,11 @@ static VALUE create_request_hash(String const &application, String const &model,
 }
 
 CHttpServer::CHttpServer(int port, String const &root)
-    :m_exit(false), m_port(port), verbose(true)
+    :m_port(port), verbose(true)
 {
-    RAWTRACE("Open listening socket...");
-
     m_root = CFilePath::normalizePath(root);
-    m_bPause = false;
-    m_listener = socket(AF_INET, SOCK_STREAM, 0);
-    if (m_listener == SOCKET_ERROR) {
-        RAWLOG_ERROR1("Can not create listener: %d", RHO_NET_ERROR_CODE);
-        return;
-    }
-    
-    int enable = 1;
-    if (setsockopt(m_listener, SOL_SOCKET, SO_REUSEADDR, (const char *)&enable, sizeof(enable)) == SOCKET_ERROR) {
-        RAWLOG_ERROR1("Can not set socket option (SO_REUSEADDR): %d", RHO_NET_ERROR_CODE);
-        return;
-    }
-    
-    struct sockaddr_in sa;
-    memset(&sa, 0, sizeof(sa));
-    sa.sin_family = AF_INET;
-    sa.sin_port = htons((uint16_t)m_port);
-    sa.sin_addr.s_addr = INADDR_ANY;
-    if (bind(m_listener, (const sockaddr *)&sa, sizeof(sa)) == SOCKET_ERROR) {
-        RAWLOG_ERROR2("Can not bind to port %d: %d", m_port, RHO_NET_ERROR_CODE);
-        return;
-    }
-    
-    if (listen(m_listener, 128) == SOCKET_ERROR) {
-        RAWLOG_ERROR1("Can not listen on socket: %d", RHO_NET_ERROR_CODE);
-        return;
-    }
-    
-    RAWTRACE1("Listen for connections on port %d", m_port);
+    m_strRhoRoot = m_root.substr(0, m_root.length()-5);
+	m_exit = true;
 }
 
 CHttpServer::~CHttpServer()
@@ -335,11 +275,51 @@ CHttpServer::callback_t CHttpServer::registered(String const &uri)
 
 extern "C" void rb_gc(void);
 
+bool CHttpServer::init()
+{
+    RAWTRACE("Open listening socket...");
+    
+    if (m_listener != INVALID_SOCKET)
+        closesocket(m_listener);
+    m_listener = socket(AF_INET, SOCK_STREAM, 0);
+    if (m_listener == INVALID_SOCKET) {
+        RAWLOG_ERROR1("Can not create listener: %d", RHO_NET_ERROR_CODE);
+        return false;
+    }
+    
+    int enable = 1;
+    if (setsockopt(m_listener, SOL_SOCKET, SO_REUSEADDR, (const char *)&enable, sizeof(enable)) == SOCKET_ERROR) {
+        RAWLOG_ERROR1("Can not set socket option (SO_REUSEADDR): %d", RHO_NET_ERROR_CODE);
+        return false;
+    }
+    
+    struct sockaddr_in sa;
+    memset(&sa, 0, sizeof(sa));
+    sa.sin_family = AF_INET;
+    sa.sin_port = htons((uint16_t)m_port);
+    sa.sin_addr.s_addr = INADDR_ANY;
+    if (bind(m_listener, (const sockaddr *)&sa, sizeof(sa)) == SOCKET_ERROR) {
+        RAWLOG_ERROR2("Can not bind to port %d: %d", m_port, RHO_NET_ERROR_CODE);
+        return false;
+    }
+    
+    if (listen(m_listener, 128) == SOCKET_ERROR) {
+        RAWLOG_ERROR1("Can not listen on socket: %d", RHO_NET_ERROR_CODE);
+        return false;
+    }
+    
+    RAWTRACE1("Listen for connections on port %d", m_port);
+    return true;
+}
+
 bool CHttpServer::run()
 {
-    if (m_listener == INVALID_SOCKET)
+    RAWTRACE("Start HTTP server");
+    if (!init())
         return false;
     
+    m_exit = false;
+    
     for(;;) {
         RAWTRACE("Waiting for connections...");
         rho_ruby_start_threadidle();
@@ -354,16 +334,12 @@ bool CHttpServer::run()
             if (RHO_NET_ERROR_CODE == EINTR)
                 continue;
 #endif
-            
             RAWLOG_ERROR1("Can not accept connection: %d", RHO_NET_ERROR_CODE);
             return false;
         }
 
-        bool bProcessed = false;
-        if (!m_bPause){
-            RAWTRACE("Connection accepted, process it...");
-            bProcessed = process(conn);
-        }
+        RAWTRACE("Connection accepted, process it...");
+        bool bProcessed = process(conn);
 
         RAWTRACE("Close connected socket");
         closesocket(conn);
@@ -371,8 +347,6 @@ bool CHttpServer::run()
         if ( bProcessed )
             rb_gc();
     }
-    
-    return true;
 }
 
 typedef Vector<char> ByteVector;
@@ -474,11 +448,11 @@ bool CHttpServer::send_response_impl(String const &data, bool continuation)
     
     // First of all, make socket blocking
 #if defined(OS_WINDOWS) || defined(OS_WINCE)
-	unsigned long optval = 0;
-	if(::ioctlsocket(m_sock, FIONBIO, &optval) == SOCKET_ERROR) {
-		RAWLOG_ERROR1("Can not set blocking socket mode: %d", RHO_NET_ERROR_CODE);
-		return false;
-	}
+    unsigned long optval = 0;
+        if(::ioctlsocket(m_sock, FIONBIO, &optval) == SOCKET_ERROR) {
+        RAWLOG_ERROR1("Can not set blocking socket mode: %d", RHO_NET_ERROR_CODE);
+        return false;
+    }
 #else
     int flags = fcntl(m_sock, F_GETFL);
     if (flags == -1) {
@@ -516,7 +490,7 @@ bool CHttpServer::send_response_impl(String const &data, bool continuation)
     if (continuation)
         RAWTRACE1("Sent response body: %d bytes", data.size());
     else
-        RAWTRACE1("Sent response:\n%s", data.c_str());
+        RAWTRACE1("Sent response (only headers displayed):\n%s", data.c_str());
     return true;
 }
 
@@ -697,7 +671,7 @@ bool CHttpServer::parse_startline(String const &line, String &method, String &ur
     }
     
     uri.assign(s, e);
-    uri = decode(uri);
+    uri = URI::urlDecode(uri);
     
     query.clear();
     if (*e == '?') {
@@ -829,7 +803,7 @@ bool CHttpServer::send_file(String const &path)
     String fullPath = CFilePath::normalizePath(path);
     if (String_startsWith(fullPath,"/app/db/db-files") )
         fullPath = CFilePath::join( RHODESAPP().getRhoRootPath(), path.substr(4) );
-    else if (fullPath.find(m_root) != 0)
+    else if (fullPath.find(m_root) != 0 && fullPath.find(m_strRhoRoot) != 0)
         fullPath = CFilePath::join( m_root, path );
 	
     if (verbose) RAWTRACE1("Sending file %s...", fullPath.c_str());
@@ -858,7 +832,7 @@ bool CHttpServer::send_file(String const &path)
     //headers.push_back(Header("Cache-Control", "max-age=2592000") );
 
     // Content length
-    char buf[8192];
+    char buf[FILE_BUF_SIZE];
     
     size_t fileSize = st.st_size;
     snprintf(buf, sizeof(buf), "%lu", (unsigned long)fileSize);

data/platform/shared/net/HttpServer.h

@@ -71,10 +71,11 @@ public:
     ~CHttpServer();
     
     void register_uri(String const &uri, callback_t const &callback);
+
+    bool started() const {return !m_exit;}
     
     bool run();
-	void stop();
-    void pause(bool bPause){m_bPause = bPause;}
+    void stop();
 
     bool send_response(String const &response) {return send_response_impl(response, false);}
     bool send_response_body(String const &data) {return send_response_impl(data, true);}
@@ -85,6 +86,7 @@ public:
     String create_response(String const &reason, HeaderList const &headers, String const &body);
     
 private:
+    bool init();
     bool process(SOCKET sock);
     bool parse_request(String &method, String &uri, String &query, HeaderList &headers, String &body);
     bool parse_startline(String const &line, String &method, String &uri, String &query);
@@ -105,10 +107,9 @@ private:
     callback_t registered(String const &uri);
     
 private:
-	bool m_exit;
-    bool m_bPause;
+    bool m_exit;
     int m_port;
-    String m_root;
+    String m_root, m_strRhoRoot;
     SOCKET m_listener;
     SOCKET m_sock;
     std::map<String, callback_t> m_registered;

data/platform/shared/net/URI.cpp

@@ -141,6 +141,45 @@ String URI::urlEncode(const String& fullPath)
         strRes += fullPath;
 }
 
+/*static*/String URI::urlDecode(const String& fullPath)
+{
+	String res;
+	urlDecode(fullPath, res);
+	return res;
+}
+	
+/*static*/ void URI::urlDecode(const String &url, String& ret )
+{
+	for (const char *s = url.c_str(); *s != '\0'; ++s) {
+		if (*s != '%') {
+			ret.push_back(*s);
+			continue;
+		}
+			
+		unsigned int c1 = (unsigned char)*++s;
+		if (c1 >= (unsigned char)'0' && c1 <= (unsigned char)'9')
+			c1 = c1 - (unsigned char)'0';
+		else if (c1 >= (unsigned char)'a' && c1 <= (unsigned char)'f')
+			c1 = c1 - (unsigned char)'a' + 10;
+		else if (c1 >= (unsigned char)'A' && c1 <= (unsigned char)'F')
+			c1 = c1 - (unsigned char)'A' + 10;
+		else
+			break;
+		unsigned int c2 = (unsigned char)*++s;
+		if (c2 >= (unsigned char)'0' && c2 <= (unsigned char)'9')
+			c2 = c2 - (unsigned char)'0';
+		else if (c2 >= (unsigned char)'a' && c2 <= (unsigned char)'f')
+			c2 = c2 - (unsigned char)'a' + 10;
+		else if (c2 >= (unsigned char)'A' && c2 <= (unsigned char)'F')
+			c2 = c2 - (unsigned char)'A' + 10;
+		else
+			break;
+			
+		char c = (char)((c1 << 4) | c2);
+		ret.push_back(c);
+	}
+}
+	
 //"auth_token=; path=/; expires=Thu, 01 Jan 1970 00:00:00 GMT, auth_token=887b2ffd30a7b97be9a0986d7746a934421eec7d; path=/; expires=Sat, 24 Oct 2009 20:56:55 GMT, rhosync_session=BAh7BzoMdXNlcl9pZGkIIgpmbGFzaElDOidBY3Rpb25Db250cm9sbGVyOjpGbGFzaDo6Rmxhc2hIYXNoewAGOgpAdXNlZHsA--f9b67d99397fc534107fb3b7483ccdae23b4a761; path=/; expires=Sun, 10 Oct 2010 19:10:58 GMT; HttpOnly");
 //"auth_token=; path=/; expires=Thu, 01 Jan 1970 00:00:00 GMT");
 //"rhosync_session=BAh7CToNcGFzc3dvcmQiFTiMYru1W11zuoAlN%2FPtgjc6CmxvZ2luIhU4jGK7tVtdc7qAJTfz7YI3Ogx1c2VyX2lkaQYiCmZsYXNoSUM6J0FjdGlvbkNvbnRyb2xsZXI6OkZsYXNoOjpGbGFzaEhhc2h7AAY6CkB1c2VkewA%3D--a7829a70171203d72cd4e83d07b18e8fcf5e2f78; path=/; expires=Thu, 02 Sep 2010 23:51:31 GMT; HttpOnly");

data/platform/shared/net/URI.h

@@ -14,6 +14,9 @@ public:
 
     static void urlEncode(const String& fullPath, String& strRes);
     static String urlEncode(const String& fullPath);
+    static String urlDecode(const String& url);	
+	static void urlDecode(const String &url, String& ret );
+	
     String getPath();
     String getQueryString();
     String getScheme();

data/platform/shared/net/ssl.cpp

@@ -3,7 +3,7 @@
 
 extern "C" {
 
-#define GETSSL rho::common::createClassFactory()->createSSLEngine()
+#define GETSSL rho::common::rho_impl_createClassFactory()->createSSLEngine()
 
 void *rho_ssl_create_storage()
 {

data/platform/shared/ruby/ext/alert/alert.i

@@ -13,7 +13,7 @@ extern void alert_play_file(char* file_name, ...);
 %}
 
 %typemap(in) (rho_param *p) {
-    $1 = valueToRhoParam($input);
+    $1 = rho_param_fromvalue($input);
 }
 
 %typemap(freearg) (rho_param *p) {

data/platform/shared/ruby/ext/alert/alert_wrap.c

@@ -998,10 +998,10 @@ extern "C" {
 /* Global Ruby hash table to store Trackings from C/C++
    structs to Ruby Objects. */
 static VALUE swig_ruby_trackings;
-
-/* Global variable that stores a reference to the ruby
-   hash table delete function. */
-static ID swig_ruby_hash_delete = 0;
+
+/* Global variable that stores a reference to the ruby
+   hash table delete function. */
+static ID swig_ruby_hash_delete = 0;
 
 /* Setup a Ruby hash table to store Trackings */
 SWIGRUNTIME void SWIG_RubyInitializeTrackings(void) {
@@ -1011,9 +1011,9 @@ SWIGRUNTIME void SWIG_RubyInitializeTrackings(void) {
   swig_ruby_trackings = rb_hash_new();
   rb_gc_register_address(&swig_ruby_trackings);
   
-  /* Now store a reference to the hash table delete function
-     so that we only have to look it up once.*/
-  swig_ruby_hash_delete = rb_intern("delete");
+  /* Now store a reference to the hash table delete function
+     so that we only have to look it up once.*/
+  swig_ruby_hash_delete = rb_intern("delete");
 }
 
 /* Get a Ruby number to reference a pointer */
@@ -1618,7 +1618,7 @@ _wrap_show_popup(int argc, VALUE *argv, VALUE self) {
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
   }
   {
-    arg1 = valueToRhoParam(argv[0]);
+    arg1 = rho_param_fromvalue(argv[0]);
   }
   show_popup(arg1);
   {

data/platform/shared/ruby/ext/asynchttp/asynchttp.i

@@ -1,30 +1,23 @@
 /* asynchttp.i */
 %module "Rho::AsyncHttp"
 %{
-/* Put header files here or function declarations like below */
-	extern VALUE rho_asynchttp_get(const char* url, VALUE headers, const char* callback, const char* callback_params, int ssl_verify_peer);
-	#define do_get rho_asynchttp_get
-	
-	extern VALUE rho_asynchttp_post(const char* url, VALUE headers, const char* body, const char* callback, const char* callback_params, int ssl_verify_peer);
-	#define do_post rho_asynchttp_post
-
-	extern VALUE rho_asynchttp_downloadfile(const char* url, VALUE headers, const char* filename, const char* callback, const char* callback_params, int ssl_verify_peer);
-	#define do_downloadfile rho_asynchttp_downloadfile
-
-	extern VALUE rho_asynchttp_uploadfile(const char* url, VALUE headers, const char* body, const char* filename, const char* callback, const char* callback_params, int ssl_verify_peer);
-	#define do_uploadfile rho_asynchttp_uploadfile
+    #include "ext/rho/rhoruby.h"
+    
+	extern VALUE rho_asynchttp_request(const char* command, rho_param *p);
+	#define do_request rho_asynchttp_request
 
 	extern void rho_asynchttp_cancel(const char* cancel_callback);
 	#define cancel rho_asynchttp_cancel
-
 %}
 
 %typemap(default) const char* cancel_callback {
  $1 = "*";
 }
 
-extern VALUE do_get(const char* url, VALUE headers, const char* callback, const char* callback_params, int ssl_verify_peer);
-extern VALUE do_post(const char* url, VALUE headers, const char* body, const char* callback, const char* callback_params, int ssl_verify_peer);
-extern VALUE do_downloadfile(const char* url, VALUE headers, const char* filename, const char* callback, const char* callback_params, int ssl_verify_peer);
-extern VALUE do_uploadfile(const char* url, VALUE headers, const char* body, const char* filename, const char* callback, const char* callback_params, int ssl_verify_peer);
+%typemap(in) (rho_param *p) {
+    $1 = rho_param_fromvalue($input);
+}
+
+extern VALUE do_request(const char* command, rho_param *p);
 extern void cancel(const char* cancel_callback);
+