expose Agent in http_wrap (pxscene#1678)

npoltorapavlo · Michael Fiess · commit 8db98ba67a8b · 2019-01-11T16:26:54.000-05:00
* expose Agent in http_wrap

* update CI tests to newer version

* add capabilities.network.http2
diff --git a/examples/pxScene2d/src/pxScene2d.cpp b/examples/pxScene2d/src/pxScene2d.cpp
@@ -1982,6 +1982,7 @@ pxScene2d::pxScene2d(bool top, pxScriptView* scriptView)
   //
   // capabilities.network.cors          = 1
   // capabilities.network.corsResources = 1
+  // capabilities.network.http2         = 2
   //
   // capabilities.metrics.textureMemory = 1
 
@@ -2017,6 +2018,8 @@ pxScene2d::pxScene2d(bool top, pxScriptView* scriptView)
 
 #endif // ENABLE_ACCESS_CONTROL_CHECK
 
+  networkCapabilities.set("http2", 2);
+
   mCapabilityVersions.set("network", networkCapabilities);
 
   rtObjectRef metricsCapabilities = new rtMapObject;
diff --git a/examples/pxScene2d/src/rcvrcore/http_wrap.js b/examples/pxScene2d/src/rcvrcore/http_wrap.js
@@ -36,6 +36,7 @@ function Module(moduleName, appSceneContext) {
   this.get = function (options, callback) {
     return new Request(moduleName, appSceneContext, options, callback).end();
   };
+  this.Agent = Agent;
 }
 
 module.exports = Module;
@@ -100,10 +101,25 @@ function Request(moduleName, appSceneContext, options, callback) {
   }
 
   if (!isBlocked) {
+    var module = moduleName === 'http' ? http : (moduleName === 'https' ? https : (isV8 ? https : http2));
+
+    // for v8 http/https/http2 are the same, set protocol explicitly
     if (isV8 && !options.protocol) {
       options.protocol = defaultProtocol;
     }
-    var module = moduleName === 'http' ? http : (moduleName === 'https' ? https : (isV8 ? https : http2));
+
+    // convert a dummy Agent into a real one
+    if (options.agent instanceof Agent) {
+      var agentObj = options.agent;
+      var newAgent = isV8 ? null : new module.Agent(agentObj.options);
+      options.agent = newAgent;
+      agentObj.once('destroy', function () {
+        if (newAgent) {
+          newAgent.destroy.apply(newAgent, arguments);
+        }
+      });
+    }
+
     httpRequest = module.request.call(null, options);
 
     httpRequest.once('response', function (httpResponse) {
@@ -286,6 +302,22 @@ Response.prototype = Object.create(EventEmitter.prototype);
 Response.prototype.constructor = Response;
 Response.prototype.blocked = false;
 
+function Agent(options) {
+  EventEmitter.call(this);
+
+  log.message(4, "creating a new agent");
+  this.options = options;
+
+  var self = this;
+  this.destroy = function () {
+    log.message(4, "emit agent 'destroy'");
+    self.emit('destroy');
+  };
+}
+
+Agent.prototype = Object.create(EventEmitter.prototype);
+Agent.prototype.constructor = Agent;
+
 function Utils() {
 }
 
diff --git a/tests/pxScene2d/testRunner/tests.json b/tests/pxScene2d/testRunner/tests.json
@@ -25,10 +25,11 @@
       {"url":"../tests/test_pxImage9.js", "title":"test_pxImage9","useBaseURI":"true"},
       {"url":"../tests/test_textureMemoryUsage.js", "title":"test_textureMemoryUsage.js","useBaseURI":"true"},
       {"url":"../tests/test_moveForwardBackward.js", "title":"test_moveForwardBackward","useBaseURI":"true"},
-      {"url":"../tests/test_imports_v3.js", "title":"test_imports","useBaseURI":"true"},
+      {"url":"../tests/test_imports_v4.js", "title":"test_imports","useBaseURI":"true"},
       {"url":"../tests/test_permissions_v5.js", "title":"test_permissions","useBaseURI":"true"},
-      {"url":"../tests/test_permissions_http2_v5.js", "title":"test_permissions_http2","useBaseURI":"true"},
-      {"url":"../tests/test_cors_v5.js", "title":"test_cors","useBaseURI":"true"},
+      {"url":"../tests/test_permissions_http2_v6.js", "title":"test_permissions_http2","useBaseURI":"true"},
+      {"url":"../tests/test_cors_v6.js", "title":"test_cors","useBaseURI":"true"},
+      {"url":"../tests/test_cors_http2_v6.js", "title":"test_cors_http2","useBaseURI":"true"},
       {"url":"../tests/test_textFontRejection.js",  "title":"test_textFontRejection","useBaseURI":"true"},
       {"url":"../tests/test_onBlur_loseFocusChain.js","title":"test_onBlur_loseFocusChain", "useBaseURI":"true"},
       {"url":"../tests/test_promiseRejectionAnimation.js", "title":"test_promiseRejectionAnimation","useBaseURI":"true"},
