rhodes 2.3.0 → 2.3.1.beta.1

data/platform/shared/net/AsyncHttp.cpp

@@ -18,7 +18,7 @@ CAsyncHttp* CAsyncHttp::m_pInstance = 0;
     if ( m_pInstance ) 
         return m_pInstance;
 
-    m_pInstance = new CAsyncHttp( rho_impl_createClassFactory());
+    m_pInstance = new CAsyncHttp( );
     return m_pInstance;
 }
 
@@ -30,33 +30,36 @@ CAsyncHttp* CAsyncHttp::m_pInstance = 0;
     m_pInstance = 0;
 }
 
-CAsyncHttp::CAsyncHttp(common::IRhoClassFactory* factory) : CThreadQueue(factory)
+CAsyncHttp::CAsyncHttp() : CThreadQueue()
 {
     CThreadQueue::setLogCategory(getLogCategory());
 
     setPollInterval(QUEUE_POLL_INTERVAL_INFINITE);
-
-    m_pCurCmd = null;
 }
 
 CAsyncHttp::~CAsyncHttp(void)
 {
-    cancelRequest("*", true);
+    stop(-1);
     LOG(INFO) + "Thread shutdown";
 }
 
-void CAsyncHttp::addQueueCommand(IQueueCommand* pCmd)
+unsigned long CAsyncHttp::addHttpCommand(IQueueCommand* pCmd)
 {
     if ( ((CHttpCommand*)pCmd)->m_strCallback.length()==0)
-        processCommand(pCmd);
-    else
     {
-        CThreadQueue::addQueueCommand(pCmd);
-        start(epLow);
+        processCommandBase(pCmd);
+        unsigned long ret = ((CHttpCommand*)pCmd)->getRetValue();
+        delete pCmd;
+        return ret;
     }
+
+    CThreadQueue::addQueueCommand(pCmd);
+    start(epLow);
+
+    return ((CHttpCommand*)pCmd)->getRetValue();
 }
 
-void CAsyncHttp::cancelRequest(const char* szCallback, boolean bWait)
+void CAsyncHttp::cancelRequest(const char* szCallback)
 {
     if (!szCallback || !*szCallback )
     {
@@ -64,20 +67,30 @@ void CAsyncHttp::cancelRequest(const char* szCallback, boolean bWait)
         return;
     }
 
-    if ( m_pCurCmd != null )
-        m_pCurCmd->cancel();
+    synchronized(getCommandLock());    
+    CHttpCommand* pCmd = (CHttpCommand*)getCurCommand();
+
+    if ( pCmd != null && ( *szCallback == '*' || pCmd->m_strCallback.compare(szCallback) == 0) )
+        pCmd->cancel();
+
+    if ( *szCallback == '*' )
+        getCommands().clear();
+    else
+    {
+        for (int i = getCommands().size()-1; i >= 0; i--)
+        {
+            CHttpCommand* pCmd1 = (CHttpCommand*)getCommands().get(i);
 
-    if ( bWait )
-        stop(-1);
+            if ( pCmd1 != null && pCmd1->m_strCallback.compare(szCallback) == 0 )
+                getCommands().remove(i);
+        }
 
-    //TODO: find command by callback and cancel it if current, remove if it is still in queue
+    }
 }
 
 void CAsyncHttp::processCommand(IQueueCommand* pCmd)
 {
-    m_pCurCmd = (CHttpCommand*)pCmd;
-    m_pCurCmd->execute();
-    m_pCurCmd = null;
+    ((CHttpCommand*)pCmd)->execute();
 }
 
 extern "C" void header_iter(const char* szName, const char* szValue, void* pHash)
@@ -93,33 +106,25 @@ CAsyncHttp::CHttpCommand::CHttpCommand(String strCmd, rho_param *p) : m_params(p
 
     m_params.getHash("headers", m_mapHeaders);
 
-    m_pNetRequest = CAsyncHttp::getInstance()->getFactory()->createNetRequest();
-    m_pNetRequest->sslVerifyPeer(m_params.getBool("ssl_verify_peer"));
-
-}
-
-void CAsyncHttp::CHttpCommand::cancel()
-{
-    if (m_pNetRequest!=null && !m_pNetRequest->isCancelled() )
-        m_pNetRequest->cancel();
+    m_NetRequest.setSslVerifyPeer(m_params.getBool("ssl_verify_peer"));
 }
 
 void CAsyncHttp::CHttpCommand::execute()
 {
-    INetResponse* resp = null;
+    NetResponse resp;
     switch( m_eCmd )
     {
     case hcGet:
-        resp = m_pNetRequest->doRequest( m_params.getString("http_command", "GET").c_str(), 
+        resp = getNet().doRequest( m_params.getString("http_command", "GET").c_str(), 
             m_params.getString("url"), m_params.getString("body"), null, &m_mapHeaders);
         break;
     case hcPost:
-        resp = m_pNetRequest->doRequest(m_params.getString("http_command", "POST").c_str(), 
+        resp = getNet().doRequest(m_params.getString("http_command", "POST").c_str(), 
             m_params.getString("url"), m_params.getString("body"), null, &m_mapHeaders);
         break;
 
     case hcDownload:
-        resp = m_pNetRequest->pullFile(m_params.getString("url"), m_params.getString("filename"), null, &m_mapHeaders);
+        resp = getNet().pullFile(m_params.getString("url"), m_params.getString("filename"), null, &m_mapHeaders);
         break;
 
     case hcUpload:
@@ -169,12 +174,12 @@ void CAsyncHttp::CHttpCommand::execute()
                 }
             }
 
-            resp = m_pNetRequest->pushMultipartData( m_params.getString("url"), arMultipartItems, null, &m_mapHeaders );
+            resp = getNet().pushMultipartData( m_params.getString("url"), arMultipartItems, null, &m_mapHeaders );
             break;
         }
     }
 
-    if ( !m_pNetRequest->isCancelled())
+    if ( !m_NetRequest.isCancelled())
         callNotify(resp,0);
 
     m_params.free_params();
@@ -206,10 +211,8 @@ String CAsyncHttp::CHttpCommand::makeHeadersString()
     return strRes;
 }
 
-void CAsyncHttp::CHttpCommand::callNotify(rho::net::INetResponse* pResp, int nError )
+void CAsyncHttp::CHttpCommand::callNotify(NetResponse& resp, int nError )
 {
-    rho::net::INetResponse& resp = *pResp;
-
     m_strResBody = "rho_callback=1";
     m_strResBody += "&status=";
     if ( nError > 0 )
@@ -236,7 +239,7 @@ void CAsyncHttp::CHttpCommand::callNotify(rho::net::INetResponse* pResp, int nEr
             m_strResBody += "&" + strHeaders;
 
         m_strResBody += "&" + RHODESAPP().addCallbackObject(
-            new CAsyncHttpResponse(pResp, m_mapHeaders.get("content-type")), "body");
+            new CAsyncHttpResponse(resp, m_mapHeaders.get("content-type")), "body");
     }
 
     if ( m_strCallbackParams.length() > 0 )
@@ -244,8 +247,8 @@ void CAsyncHttp::CHttpCommand::callNotify(rho::net::INetResponse* pResp, int nEr
 
     if ( m_strCallback.length() > 0 )
     {
-        String strFullUrl = m_pNetRequest->resolveUrl(m_strCallback);
-        m_pNetRequest->pushData( strFullUrl, m_strResBody, null );
+        String strFullUrl = m_NetRequest.resolveUrl(m_strCallback);
+        getNet().pushData( strFullUrl, m_strResBody, null );
     }
 }
 
@@ -254,13 +257,12 @@ CAsyncHttp::CAsyncHttpResponse::~CAsyncHttpResponse(){}
 extern "C" VALUE rjson_tokener_parse(const char *str, char** pszError );
 unsigned long CAsyncHttp::CAsyncHttpResponse::getObjectValue()
 { 
-    rho::net::INetResponse& resp = *m_pNetResponse;
-    if (resp.isOK())
+    if (m_NetResponse.isOK())
     {
         if ( m_strContentType.find("application/json") != String::npos )
         {
             char* szError = 0;
-            unsigned long valBody = rjson_tokener_parse(resp.getCharData(), &szError);
+            unsigned long valBody = rjson_tokener_parse(m_NetResponse.getCharData(), &szError);
             if ( valBody != 0 )
                 return valBody;
 
@@ -270,7 +272,7 @@ unsigned long CAsyncHttp::CAsyncHttpResponse::getObjectValue()
         }
     }
 
-    return rho_ruby_create_string(resp.getCharData()); 
+    return rho_ruby_create_string(m_NetResponse.getCharData()); 
 }
 
 } // namespace net
@@ -283,16 +285,14 @@ using namespace rho::net;
 void rho_asynchttp_cancel(const char* cancel_callback)
 {
     if ( CAsyncHttp::getInstance() != null )
-        CAsyncHttp::getInstance()->cancelRequest(cancel_callback, false);
+        CAsyncHttp::getInstance()->cancelRequest(cancel_callback);
 }
 
 unsigned long rho_asynchttp_request(const char* command, rho_param *p)
 {
     CAsyncHttp::Create();
 
-    CAsyncHttp::CHttpCommand* pHttp = new CAsyncHttp::CHttpCommand( command, p );
-    CAsyncHttp::getInstance()->addQueueCommand(pHttp);
-    return pHttp->getRetValue();
+    return CAsyncHttp::getInstance()->addHttpCommand(new CAsyncHttp::CHttpCommand( command, p ));
 }
 
 }

data/platform/shared/net/AsyncHttp.h

@@ -18,12 +18,12 @@ class CAsyncHttp : public common::CThreadQueue
 
     class CAsyncHttpResponse : public rho::ICallbackObject
     {
-        common::CAutoPtr<INetResponse> m_pNetResponse;
+        NetResponse m_NetResponse;
         String m_strContentType;
     public:
-        CAsyncHttpResponse(INetResponse* pResp, const String& strContentType)
+        CAsyncHttpResponse(NetResponse& resp, const String& strContentType)
         {
-            m_pNetResponse = pResp;
+            m_NetResponse = resp;
             m_strContentType = strContentType;
         }
         ~CAsyncHttpResponse();
@@ -42,7 +42,7 @@ public:
         String m_strCallback, m_strCallbackParams;
         Hashtable<String,String> m_mapHeaders;
 
-        common::CAutoPtr<INetRequest> m_pNetRequest;
+        NetRequest m_NetRequest;
         String m_strResBody;
 
         CRhoParams    m_params;
@@ -64,9 +64,8 @@ public:
         }
 
         void execute();
-        void cancel();
 
-        void callNotify(INetResponse* pResp, int nError );
+        void callNotify(NetResponse& resp, int nError );
         unsigned long getRetValue();
 
 	    boolean equals(const IQueueCommand& cmd){ return false; }
@@ -87,28 +86,32 @@ public:
             return "Unknown";
         }
 
+        virtual void cancel()
+        {
+            m_NetRequest.cancel();
+        }
+
     private:
         String makeHeadersString();
-
+        net::CNetRequestWrapper getNet(){ return getNetRequest(&m_NetRequest); }
+    
     };
 
 private:
     static CAsyncHttp* m_pInstance;
 
-    CHttpCommand* m_pCurCmd;
-
 public:
 
     static CAsyncHttp* Create();
     static void Destroy();
     static CAsyncHttp* getInstance(){ return m_pInstance; }
 
-    void cancelRequest(const char* szCallback, boolean bWait);
+    void cancelRequest(const char* szCallback);
 
-    virtual void addQueueCommand(IQueueCommand* pCmd);
+    unsigned long addHttpCommand(IQueueCommand* pCmd);
 
 private:
-    CAsyncHttp(common::IRhoClassFactory* factory);
+    CAsyncHttp();
     ~CAsyncHttp();
 
     virtual void processCommand(IQueueCommand* pCmd);

data/platform/shared/net/CURLNetRequest.cpp

@@ -46,32 +46,42 @@ public:
         return m_data.size();
     }
 
-    void setRespCode(int nRespCode) 
+    virtual int getRespCode() 
     {
-        m_nRespCode = nRespCode;
+        return m_nRespCode;
     }
 
-    virtual int getRespCode() 
+    virtual String getCookies()
     {
-        return m_nRespCode;
+        return m_cookies;
     }
 
-    virtual boolean isOK()
+    virtual void setCharData(const char* szData)
+    {
+        m_data = szData;
+    }
+
+    void setRespCode(int nRespCode) 
+    {
+        m_nRespCode = nRespCode;
+    }
+
+    boolean isOK()
     {
         return m_nRespCode == 200 || m_nRespCode == 206;
     }
     
-    virtual boolean isUnathorized()
+    boolean isUnathorized()
     {
         return m_nRespCode == 401;
     }
 
-    virtual boolean isSuccess()
+    boolean isSuccess()
     {
         return m_nRespCode > 0 && m_nRespCode < 400;
     }
 
-    virtual boolean isResponseRecieved(){ return m_nRespCode!=-1;}
+    boolean isResponseRecieved(){ return m_nRespCode!=-1;}
 
     void setCharData(const String &data)
     {
@@ -82,11 +92,7 @@ public:
     {
         m_cookies = s;
     }
-    
-    String getCookies()
-    {
-        return m_cookies;
-    }
+   
 };
 
 INetResponse *CURLNetRequest::makeResponse(String const &body, int nErrorCode)
@@ -159,27 +165,6 @@ static size_t curlBodyBinaryCallback(void *ptr, size_t size, size_t nmemb, void
 }
 
 extern "C" int rho_net_ping_network(const char* szHost);	
-INetResponse* CURLNetRequest::pullData(const String& strUrl, IRhoSession* oSession )
-{
-    RAWLOG_INFO1("GET url: %s", strUrl.c_str());
-    return doRequest("GET", strUrl, String(), oSession, null );
-}
-
-INetResponse* CURLNetRequest::pushData(const String& strUrl, const String& strBody, IRhoSession* oSession)
-{
-    RAWLOG_INFO1("POST url: %s", strUrl.c_str());
-    return doRequest("POST", strUrl, strBody, oSession, null );
-}
-
-INetResponse* CURLNetRequest::pullCookies(const String& strUrl, const String& strBody, IRhoSession* oSession)
-{
-    RAWLOG_INFO1("POST url: %s (requesting cookies)", strUrl.c_str());
-    INetResponse* pResp = doRequest("POST", strUrl, strBody, oSession, null );
-    if ( pResp->isOK() )
-        ((CURLNetResponseImpl*)pResp)->setCharData(pResp->getCookies());
-
-    return pResp;
-}
 
 INetResponse* CURLNetRequest::doRequest(const char *method, const String& strUrl,
                                         const String& strBody, IRhoSession *oSession,
@@ -196,10 +181,10 @@ CURLcode CURLNetRequest::doCURLPerform(const String& strUrl)
 	{
 		long statusCode = 0;
 		curl_easy_getinfo(m_curl.curl(), CURLINFO_RESPONSE_CODE, &statusCode);
-		if ( statusCode == 0 && rho_net_ping_network(strUrl.c_str()) )
+		if ( statusCode == 0 && rho_net_ping_network(strUrl.substr(0, strUrl.find("?")).c_str()) )
 			err = m_curl.perform();
 	}
-	
+
 	return err;
 }
 	
@@ -277,19 +262,13 @@ INetResponse* CURLNetRequest::doPull(const char* method, const String& strUrl,
     return makeResponse(respBody, nRespCode);
 }
 
-INetResponse* CURLNetRequest::pullFile(const String& strUrl, const String& strFilePath, IRhoSession* oSession, Hashtable<String,String>* pHeaders)
+INetResponse* CURLNetRequest::createEmptyNetResponse()
+{
+    return new CURLNetResponseImpl("", 0, -1);
+}
+
+INetResponse* CURLNetRequest::pullFile(const String& strUrl, common::CRhoFile& oFile, IRhoSession* oSession, Hashtable<String,String>* pHeaders)
 {
-    int nRespCode = -1;
-    
-    RAWLOG_INFO2("Pull file. Url: %s; File: %s", strUrl.c_str(), strFilePath.c_str());
-    
-    common::CRhoFile oFile;
-    if ( !oFile.open(strFilePath.c_str(),common::CRhoFile::OpenForAppend) ) 
-    {
-        RAWLOG_ERROR1("pullFile: cannot create file: %s", strFilePath.c_str());
-        return new CURLNetResponseImpl("", 0, nRespCode);
-    }
-    
     return doPull("GET", strUrl, String(), &oFile, oSession, pHeaders);
 }
 
@@ -364,58 +343,6 @@ INetResponse* CURLNetRequest::pushMultipartData(const String& strUrl, VectorPtr<
     return makeResponse(strRespBody, nRespCode);
 }
 
-INetResponse* CURLNetRequest::pushMultipartData(const String& strUrl, CMultipartItem& oItem, IRhoSession* oSession, Hashtable<String,String>* pHeaders)
-{
-    VectorPtr<CMultipartItem*> arItems;
-    arItems.addElement(&oItem);
-
-    INetResponse* pResp = pushMultipartData(strUrl, arItems, oSession, pHeaders);
-
-    arItems[0] = 0; //do not delete item
-    return pResp;
-}
-
-INetResponse* CURLNetRequest::pushFile(const String& strUrl, const String& strFilePath, IRhoSession* oSession, Hashtable<String,String>* pHeaders)
-{
-    int nRespCode = -1;
-    String strRespBody;
-	
-    RAWLOG_INFO2("Push file. Url: %s; File: %s", strUrl.c_str(), strFilePath.c_str());
-	
-    common::CRhoFile oFile;
-    if ( !oFile.open(strFilePath.c_str(),common::CRhoFile::OpenReadOnly) ) 
-    {
-        LOG(ERROR) + "pushFile: cannot find file :" + strFilePath;
-        return new CURLNetResponseImpl(strRespBody.c_str(), strRespBody.size(), nRespCode);
-    }
-	
-    rho_net_impl_network_indicator(1);
-	
-    curl_slist *hdrs = m_curl.set_options("POST", strUrl, String(), oSession, pHeaders);
-    CURL *curl = m_curl.curl();
-    curl_easy_setopt(curl, CURLOPT_WRITEDATA, &strRespBody);
-    curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, &curlBodyStringCallback);
-	
-    curl_httppost *post = NULL, *last = NULL;
-    curl_easy_setopt(curl, CURLOPT_POSTFIELDS, NULL);
-    curl_formadd(&post, &last,
-                 CURLFORM_COPYNAME, "blob",
-                 CURLFORM_FILE, strFilePath.c_str(),
-                 CURLFORM_CONTENTTYPE, "application/octet-stream",
-                 CURLFORM_END);
-    curl_easy_setopt(curl, CURLOPT_HTTPPOST, post);
-    
-	CURLcode err = doCURLPerform(strUrl);
-	
-    curl_slist_free_all(hdrs);
-    curl_formfree(post);
-	
-    rho_net_impl_network_indicator(0);
-    
-    nRespCode = getResponseCode(err, strRespBody, oSession);
-    return makeResponse(strRespBody, nRespCode);
-}
-
 int CURLNetRequest::getResponseCode(CURLcode err, String const &body, IRhoSession* oSession)
 {
     return getResponseCode(err, body.c_str(), body.size(), oSession);
@@ -461,11 +388,6 @@ int CURLNetRequest::getResponseCode(CURLcode err, char const *body, size_t bodys
     return (int)statusCode;
 }
 
-String CURLNetRequest::resolveUrl(const String& strUrl)
-{
-    return RHODESAPP().canonicalizeRhoUrl(strUrl);
-}
-
 void CURLNetRequest::cancel()
 {
     m_curl.cancel();

data/platform/shared/net/CURLNetRequest.h

@@ -12,7 +12,7 @@ namespace rho
 namespace net
 {
 
-class CURLNetRequest : public INetRequest
+class CURLNetRequest : public INetRequestImpl
 {
     DEFINE_LOGCLASS;
     
@@ -50,23 +50,16 @@ class CURLNetRequest : public INetRequest
     };
     
 public:
-    INetResponse *pullData(const String& strUrl, IRhoSession *oSession);
-    INetResponse *pushData(const String& strUrl, const String& strBody, IRhoSession *oSession);
-    INetResponse *pushFile(const String& strUrl, const String& strFileName, IRhoSession *oSession, Hashtable<String,String>* pHeaders);
-    INetResponse* pushMultipartData(const String& strUrl, VectorPtr<CMultipartItem*>& arItems, IRhoSession* oSession, Hashtable<String,String>* pHeaders);
-    INetResponse* pushMultipartData(const String& strUrl, CMultipartItem& oItem, IRhoSession* oSession, Hashtable<String,String>* pHeaders);
-    INetResponse *pullFile(const String& strUrl, const String& strFilePath, IRhoSession *oSession, Hashtable<String,String>* pHeaders);
-    INetResponse *pullCookies(const String& strUrl, const String& strBody, IRhoSession *oSession);
-    INetResponse* doRequest( const char* method, const String& strUrl, const String& strBody, IRhoSession* oSession, Hashtable<String,String>* pHeaders );
+    virtual INetResponse* doRequest( const char* method, const String& strUrl, const String& strBody, IRhoSession* oSession, Hashtable<String,String>* pHeaders );
+    virtual INetResponse* pullFile(const String& strUrl, common::CRhoFile& oFile, IRhoSession* oSession, Hashtable<String,String>* pHeaders);
+    virtual INetResponse* pushMultipartData(const String& strUrl, VectorPtr<CMultipartItem*>& arItems, IRhoSession* oSession, Hashtable<String,String>* pHeaders);
 
-    boolean sslVerifyPeer() {return m_curl.sslVerifyPeer();}
-    void sslVerifyPeer(boolean mode) {m_curl.sslVerifyPeer(mode);}
-    
-    String resolveUrl(const String& strUrl);
+    virtual void cancel();
 
-    void cancel();
-    virtual boolean isCancelled(){return false;}
+    virtual boolean getSslVerifyPeer() {return m_curl.sslVerifyPeer();}
+    virtual void setSslVerifyPeer(boolean mode){m_curl.sslVerifyPeer(mode);}
 
+    virtual INetResponse* createEmptyNetResponse();
 private:
     INetResponse* doPull(const char *method, const String &strUrl, const String &strBody, common::CRhoFile *oFile, IRhoSession *oSession, Hashtable<String,String>* pHeaders);
     int getResponseCode(CURLcode err, String const &body, IRhoSession* oSession);

data/platform/shared/net/INetRequest.cpp

@@ -0,0 +1,122 @@
+#include "INetRequest.h"
+
+#include "common/RhoFile.h"
+#include "common/RhodesAppBase.h"
+
+namespace rho {
+namespace net {
+
+void CNetRequestHolder::setRequest(INetRequestImpl* pReq)
+{
+    synchronized(m_mxReq)
+    {
+        m_pReq = pReq;
+
+        if ( pReq )
+        {
+            m_bCancel = false;
+            m_pReq->setSslVerifyPeer(m_sslVerifyPeer);
+        }
+    }
+}
+
+void CNetRequestHolder::cancel()
+{
+    synchronized(m_mxReq)
+    {
+        m_bCancel = true;
+        if ( m_pReq != 0 )
+            m_pReq->cancel();
+
+        m_pReq = 0;
+    }
+}
+
+boolean CNetRequestHolder::isCancelled()
+{ 
+    synchronized(m_mxReq)
+    {
+        return m_bCancel;
+    }
+}
+
+/*static*/ String CNetRequestHolder::resolveUrl(const String& strUrl)
+{
+    return RHODESAPPBASE().canonicalizeRhoUrl(strUrl);
+}
+
+CNetRequestWrapper::CNetRequestWrapper(INetRequestImpl* pImpl, CNetRequestHolder* pHolder) : m_pReqImpl(pImpl), m_pHolder(pHolder)
+{
+    if ( m_pHolder )
+        m_pHolder->setRequest(pImpl);
+}
+
+CNetRequestWrapper::~CNetRequestWrapper()
+{ 
+    if ( m_pHolder )
+        m_pHolder->setRequest(0); 
+}
+
+INetResponse* CNetRequestWrapper::pullData(const String& strUrl, IRhoSession* oSession )
+{
+    return doRequest("GET",strUrl,String(),oSession,null);
+}
+
+INetResponse* CNetRequestWrapper::pushData(const String& strUrl, const String& strBody, IRhoSession* oSession)
+{
+    return doRequest("POST",strUrl,strBody,oSession,null);
+}
+
+INetResponse* CNetRequestWrapper::pullCookies(const String& strUrl, const String& strBody, IRhoSession* oSession)
+{
+    INetResponse* pResp = doRequest("POST", strUrl, strBody, oSession, null );
+    if ( pResp->getRespCode() == 200 )
+        pResp->setCharData(pResp->getCookies().c_str());
+		
+    return pResp;
+}
+
+INetResponse* CNetRequestWrapper::doRequest( const char* method, const String& strUrl, const String& strBody, IRhoSession* oSession, Hashtable<String,String>* pHeaders )
+{
+    return m_pReqImpl->doRequest(method, strUrl, strBody, oSession, pHeaders );
+}
+
+INetResponse* CNetRequestWrapper::pushMultipartData(const String& strUrl, VectorPtr<CMultipartItem*>& arItems, IRhoSession* oSession, Hashtable<String,String>* pHeaders)
+{
+    return m_pReqImpl->pushMultipartData(strUrl, arItems, oSession, pHeaders);
+}
+
+INetResponse* CNetRequestWrapper::pushMultipartData(const String& strUrl, CMultipartItem& oItem, IRhoSession* oSession, Hashtable<String,String>* pHeaders)
+{
+    VectorPtr<CMultipartItem*> arItems;
+    arItems.addElement(&oItem);
+
+    INetResponse* pResp = pushMultipartData(strUrl, arItems, oSession, pHeaders);
+
+    arItems[0] = 0; //do not delete item
+    return pResp;
+}
+
+INetResponse* CNetRequestWrapper::pullFile(const String& strUrl, const String& strFilePath, IRhoSession* oSession, Hashtable<String,String>* pHeaders)
+{
+    common::CRhoFile oFile;
+    if ( !oFile.open(strFilePath.c_str(),common::CRhoFile::OpenForAppend) ) 
+    {
+        LOGC(ERROR, "Net") + "pullFile: cannot create file :" + strFilePath;
+        return m_pReqImpl->createEmptyNetResponse();
+    }
+
+    return m_pReqImpl->pullFile( strUrl, oFile, oSession, pHeaders );
+}
+
+String CNetRequestWrapper::resolveUrl(const String& strUrl)
+{
+    return RHODESAPPBASE().canonicalizeRhoUrl(strUrl);
+}
+}
+}
+
+rho::net::CNetRequestWrapper getNetRequest(rho::net::CNetRequestHolder* pHolder/* = 0*/)
+{
+    return rho::net::CNetRequestWrapper( rho_get_RhoClassFactory()->createNetRequestImpl(), pHolder );
+}