Allowed network plugins to see the request type.

Closes #602 Change-Id: Ib86389956c4908d94184abe8775d497b09a5f90e
shaka-project · Jan 6, 2017 · 07ce752 · shaharmor · May 3, 2017 · joeyparrish
1 parent 9153f68
commit 07ce752
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/externs/shaka/net.js b/externs/shaka/net.js
@@ -119,7 +119,9 @@ shakaExtern.Response;
 /**
  * Defines a plugin that handles a specific scheme.
  *
- * @typedef {!function(string, shakaExtern.Request):
+ * @typedef {!function(string,
+ *                     shakaExtern.Request,
+ *                     shaka.net.NetworkingEngine.RequestType):
  *     !Promise.<shakaExtern.Response>}
  * @exportDoc
  */

diff --git a/lib/net/networking_engine.js b/lib/net/networking_engine.js
@@ -354,7 +354,7 @@ shaka.net.NetworkingEngine.prototype.send_ = function(
   }
 
   var startTimeMs = Date.now();
-  return plugin(request.uris[index], request).then(function(response) {
+  return plugin(request.uris[index], request, type).then(function(response) {
     if (response.timeMs === undefined)
       response.timeMs = Date.now() - startTimeMs;
 

diff --git a/test/net/networking_engine_unit.js b/test/net/networking_engine_unit.js
@@ -266,9 +266,10 @@ describe('NetworkingEngine', /** @suppress {accessControls} */ function() {
       var request = createRequest('resolve://foo');
       request.method = 'POST';
 
-      resolveScheme.and.callFake(function(uri, request) {
+      resolveScheme.and.callFake(function(uri, request, requestTypePassed) {
         expect(uri).toBe(request.uris[0]);
         expect(request).toEqual(request);
+        expect(requestTypePassed).toEqual(requestType);
         return Promise.resolve({});
       });
       networkingEngine.request(requestType, request).catch(fail).then(done);