Merge pull request #201 from krunt/origin/_v8

fixes to http module to support polaroid example

Author: jmgasper

examples/pxScene2d/src/v8_modules/http_test.js

@@ -17,27 +17,35 @@ limitations under the License.
 */
 
 
-px.import({ scene: 'px:scene.1', http: 'http' }).then( function importsAreReady(imports)
+px.import({ scene: 'px:scene.1', http: 'http', url: 'url' }).then( function importsAreReady(imports)
 {
     var http = imports.http;
-
-    respData = '';
-
-    http.get('https://bellard.org/pi/pi2700e9', function (resp) {
-        console.log('http in func cb');
-
-        resp.on('data', function (chunk) {
-            console.log('http on data');
-            respData += chunk;
+    var url = imports.url;
+
+    var fetchCb = function (opt) {
+        var respData = '';
+    
+        http.get(opt, function (resp) {
+            console.log('http in func cb');
+    
+            resp.on('data', function (chunk) {
+                console.log('http on data');
+                respData += chunk;
+            });
+    
+            resp.on('end', function () {
+                console.log('http done. status_code = ' + resp.statusCode
+                    + ' response size = ' + respData.length);
+            });
+        }).on('error', function (e) {
+            console.log('error fetching data: ' + e.message);
         });
+    };
 
-        resp.on('end', function () {
-            console.log('http done. status_code = ' + resp.statusCode
-                + ' response size = ' + respData.length);
-        });
-    }).on('error', function (e) {
-        console.log('error fetching data: ' + e.message);
-    });
+    var fetchUrl = 'https://bellard.org/pi/pi2700e9';
+
+    fetchCb(fetchUrl);
+    fetchCb(url.parse(fetchUrl));
 
 }).catch( function importFailed(err){
     console.error("Import failed for http_test.js: " + err);

src/rtScriptV8/rtJsModulesV8.cpp

@@ -642,8 +642,23 @@ rtError rtHttpGetBinding(int numArgs, const rtValue* args, rtValue* result, void
     return RT_ERROR_INVALID_ARG;
   }
 
-  if (args[0].getType() != RT_stringType) {
-    return RT_ERROR_INVALID_ARG;
+  rtString resourceUrl;
+  if (args[0].getType() == RT_stringType) {
+    resourceUrl = args[0].toString();
+  } else {
+    if (args[0].getType() != RT_objectType) {
+      return RT_ERROR_INVALID_ARG;
+    }
+    rtObjectRef obj = args[0].toObject();
+
+    rtString proto = obj.get<rtString>("protocol");
+    rtString host = obj.get<rtString>("host");
+    rtString path = obj.get<rtString>("path");
+
+    resourceUrl.append(proto.cString());
+    resourceUrl.append("//");
+    resourceUrl.append(host.cString());
+    resourceUrl.append(path.cString());
   }
 
   if (args[1].getType() != RT_functionType) {
@@ -654,7 +669,7 @@ rtError rtHttpGetBinding(int numArgs, const rtValue* args, rtValue* result, void
   rtObjectRef resp(new rtHttpResponse());
   args[1].toFunction().sendReturns(resp, ret);
 
-  rtFileDownloadRequest *downloadRequest = new rtFileDownloadRequest(args[0].toString(), resp.getPtr(), rtHttpResponse::onDownloadComplete);
+  rtFileDownloadRequest *downloadRequest = new rtFileDownloadRequest(resourceUrl, resp.getPtr(), rtHttpResponse::onDownloadComplete);
   downloadRequest->setDownloadProgressCallbackFunction(rtHttpResponse::onDownloadInProgress, resp.getPtr());
   rtFileDownloader::instance()->addToDownloadQueue(downloadRequest);
 

src/rtScriptV8/rtScriptV8.cpp

@@ -471,7 +471,7 @@ rtV8Context::rtV8Context(Isolate *isolate, Platform *platform, uv_loop_t *loop)
   add("_testPromiseReturnRejectFunc", g_testPromiseReturnRejectFunc.getPtr());
 #endif
 
-  mHttpGetBinding = new rtFunctionCallback(rtHttpGetBinding);
+  mHttpGetBinding = new rtFunctionCallback(rtHttpGetBinding, loop);
 
   add("httpGet", mHttpGetBinding.getPtr());
 }