From 07ce75273e86ff7423ec430eaf988984feab9e60 Mon Sep 17 00:00:00 2001 From: Theodore Abshire Date: Thu, 5 Jan 2017 15:22:12 -0800 Subject: [PATCH] Allowed network plugins to see the request type. Closes #602 Change-Id: Ib86389956c4908d94184abe8775d497b09a5f90e --- externs/shaka/net.js | 4 +++- lib/net/networking_engine.js | 2 +- test/net/networking_engine_unit.js | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/externs/shaka/net.js b/externs/shaka/net.js index 7c3e162a25..3bc5408651 100644 --- 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.} * @exportDoc */ diff --git a/lib/net/networking_engine.js b/lib/net/networking_engine.js index a443164ebe..0238efe8b3 100644 --- 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 index 8d6deaf2d5..8addc3bc0c 100644 --- 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);