-
Notifications
You must be signed in to change notification settings - Fork 2.1k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Do not load external js if renderer defined on adUnit #3284
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,6 @@ | ||
import { loadScript } from './adloader'; | ||
import * as utils from './utils'; | ||
import find from 'core-js/library/fn/array/find'; | ||
|
||
/** | ||
* @typedef {object} Renderer | ||
|
@@ -10,7 +11,7 @@ import * as utils from './utils'; | |
*/ | ||
|
||
export function Renderer(options) { | ||
const { url, config, id, callback, loaded } = options; | ||
const { url, config, id, callback, loaded, adUnitCode } = options; | ||
this.url = url; | ||
this.config = config; | ||
this.handlers = {}; | ||
|
@@ -35,12 +36,16 @@ export function Renderer(options) { | |
this.process(); | ||
}); | ||
|
||
// we expect to load a renderer url once only so cache the request to load script | ||
loadScript(url, this.callback, true); | ||
if (!isRendererDefinedOnAdUnit(adUnitCode)) { | ||
// we expect to load a renderer url once only so cache the request to load script | ||
loadScript(url, this.callback, true); | ||
} else { | ||
utils.logWarn(`External Js not loaded by Renderer since renderer url and callback is already defined on adUnit ${adUnitCode}`); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Does this need to be a warning? Given the nature of the setup (ie defining a renderer in the adunit), this seems like a There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Here the user has set that renderer defined on adUnit will render the bid but the demand partners they are working with are using different js to render. |
||
} | ||
} | ||
|
||
Renderer.install = function({ url, config, id, callback, loaded }) { | ||
return new Renderer({ url, config, id, callback, loaded }); | ||
Renderer.install = function({ url, config, id, callback, loaded, adUnitCode }) { | ||
return new Renderer({ url, config, id, callback, loaded, adUnitCode }); | ||
}; | ||
|
||
Renderer.prototype.getConfig = function() { | ||
|
@@ -94,3 +99,11 @@ export function isRendererRequired(renderer) { | |
export function executeRenderer(renderer, bid) { | ||
renderer.render(bid); | ||
} | ||
|
||
function isRendererDefinedOnAdUnit(adUnitCode) { | ||
const adUnits = $$PREBID_GLOBAL$$.adUnits; | ||
const adUnit = find(adUnits, adUnit => { | ||
return adUnit.code === adUnitCode; | ||
}); | ||
return !!(adUnit && adUnit.renderer && adUnit.renderer.url && adUnit.renderer.render); | ||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,96 +1,131 @@ | ||
import { expect } from 'chai'; | ||
import { Renderer } from 'src/Renderer'; | ||
|
||
describe('Renderer: A renderer installed on a bid response', function () { | ||
let testRenderer1; | ||
let testRenderer2; | ||
let spyRenderFn; | ||
let spyEventHandler; | ||
|
||
beforeEach(function () { | ||
testRenderer1 = Renderer.install({ | ||
url: 'https://httpbin.org/post', | ||
config: { test: 'config1' }, | ||
id: 1 | ||
import * as utils from 'src/utils'; | ||
|
||
describe('Renderer', function () { | ||
describe('Renderer: A renderer installed on a bid response', function () { | ||
let testRenderer1; | ||
let testRenderer2; | ||
let spyRenderFn; | ||
let spyEventHandler; | ||
|
||
beforeEach(function () { | ||
testRenderer1 = Renderer.install({ | ||
url: 'https://httpbin.org/post', | ||
config: { test: 'config1' }, | ||
id: 1 | ||
}); | ||
testRenderer2 = Renderer.install({ | ||
url: 'https://httpbin.org/post', | ||
config: { test: 'config2' }, | ||
id: 2 | ||
}); | ||
|
||
spyRenderFn = sinon.spy(); | ||
spyEventHandler = sinon.spy(); | ||
}); | ||
testRenderer2 = Renderer.install({ | ||
url: 'https://httpbin.org/post', | ||
config: { test: 'config2' }, | ||
id: 2 | ||
|
||
it('is an instance of Renderer', function () { | ||
expect(testRenderer1 instanceof Renderer).to.equal(true); | ||
}); | ||
|
||
spyRenderFn = sinon.spy(); | ||
spyEventHandler = sinon.spy(); | ||
}); | ||
it('has expected properties ', function () { | ||
expect(testRenderer1.url).to.equal('https://httpbin.org/post'); | ||
expect(testRenderer1.config).to.deep.equal({ test: 'config1' }); | ||
expect(testRenderer1.id).to.equal(1); | ||
}); | ||
|
||
it('is an instance of Renderer', function () { | ||
expect(testRenderer1 instanceof Renderer).to.equal(true); | ||
}); | ||
it('returns config from getConfig method', function () { | ||
expect(testRenderer1.getConfig()).to.deep.equal({ test: 'config1' }); | ||
expect(testRenderer2.getConfig()).to.deep.equal({ test: 'config2' }); | ||
}); | ||
|
||
it('has expected properties ', function () { | ||
expect(testRenderer1.url).to.equal('https://httpbin.org/post'); | ||
expect(testRenderer1.config).to.deep.equal({ test: 'config1' }); | ||
expect(testRenderer1.id).to.equal(1); | ||
}); | ||
it('sets a render function with setRender method', function () { | ||
testRenderer1.setRender(spyRenderFn); | ||
expect(typeof testRenderer1.render).to.equal('function'); | ||
testRenderer1.render(); | ||
expect(spyRenderFn.called).to.equal(true); | ||
}); | ||
|
||
it('returns config from getConfig method', function () { | ||
expect(testRenderer1.getConfig()).to.deep.equal({ test: 'config1' }); | ||
expect(testRenderer2.getConfig()).to.deep.equal({ test: 'config2' }); | ||
}); | ||
it('sets event handlers with setEventHandlers method and handles events with installed handlers', function () { | ||
testRenderer1.setEventHandlers({ | ||
testEvent: spyEventHandler | ||
}); | ||
|
||
it('sets a render function with setRender method', function () { | ||
testRenderer1.setRender(spyRenderFn); | ||
expect(typeof testRenderer1.render).to.equal('function'); | ||
testRenderer1.render(); | ||
expect(spyRenderFn.called).to.equal(true); | ||
}); | ||
expect(testRenderer1.handlers).to.deep.equal({ | ||
testEvent: spyEventHandler | ||
}); | ||
|
||
it('sets event handlers with setEventHandlers method and handles events with installed handlers', function () { | ||
testRenderer1.setEventHandlers({ | ||
testEvent: spyEventHandler | ||
testRenderer1.handleVideoEvent({ id: 1, eventName: 'testEvent' }); | ||
expect(spyEventHandler.called).to.equal(true); | ||
}); | ||
|
||
expect(testRenderer1.handlers).to.deep.equal({ | ||
testEvent: spyEventHandler | ||
it('pushes commands to queue if renderer is not loaded', function () { | ||
testRenderer1.loaded = false; | ||
testRenderer1.push(spyRenderFn); | ||
expect(testRenderer1.cmd.length).to.equal(1); | ||
|
||
// clear queue for next tests | ||
testRenderer1.cmd = []; | ||
}); | ||
|
||
testRenderer1.handleVideoEvent({ id: 1, eventName: 'testEvent' }); | ||
expect(spyEventHandler.called).to.equal(true); | ||
}); | ||
it('fires commands immediately if the renderer is loaded', function () { | ||
const func = sinon.spy(); | ||
|
||
it('pushes commands to queue if renderer is not loaded', function () { | ||
testRenderer1.loaded = false; | ||
testRenderer1.push(spyRenderFn); | ||
expect(testRenderer1.cmd.length).to.equal(1); | ||
testRenderer1.loaded = true; | ||
testRenderer1.push(func); | ||
|
||
// clear queue for next tests | ||
testRenderer1.cmd = []; | ||
}); | ||
expect(testRenderer1.cmd.length).to.equal(0); | ||
|
||
it('fires commands immediately if the renderer is loaded', function () { | ||
const func = sinon.spy(); | ||
sinon.assert.calledOnce(func); | ||
}); | ||
|
||
testRenderer1.loaded = true; | ||
testRenderer1.push(func); | ||
it('processes queue by calling each function in queue', function () { | ||
testRenderer1.loaded = false; | ||
const func1 = sinon.spy(); | ||
const func2 = sinon.spy(); | ||
|
||
expect(testRenderer1.cmd.length).to.equal(0); | ||
testRenderer1.push(func1); | ||
testRenderer1.push(func2); | ||
expect(testRenderer1.cmd.length).to.equal(2); | ||
|
||
sinon.assert.calledOnce(func); | ||
}); | ||
testRenderer1.process(); | ||
|
||
it('processes queue by calling each function in queue', function () { | ||
testRenderer1.loaded = false; | ||
const func1 = sinon.spy(); | ||
const func2 = sinon.spy(); | ||
sinon.assert.calledOnce(func1); | ||
sinon.assert.calledOnce(func2); | ||
expect(testRenderer1.cmd.length).to.equal(0); | ||
}); | ||
}); | ||
|
||
testRenderer1.push(func1); | ||
testRenderer1.push(func2); | ||
expect(testRenderer1.cmd.length).to.equal(2); | ||
describe('3rd party renderer', function () { | ||
let adUnitsOld; | ||
let utilsSpy; | ||
before(function () { | ||
adUnitsOld = $$PREBID_GLOBAL$$.adUnits; | ||
utilsSpy = sinon.spy(utils, 'logWarn'); | ||
}); | ||
|
||
testRenderer1.process(); | ||
after(function() { | ||
$$PREBID_GLOBAL$$.adUnits = adUnitsOld; | ||
utilsSpy.restore(); | ||
}); | ||
|
||
sinon.assert.calledOnce(func1); | ||
sinon.assert.calledOnce(func2); | ||
expect(testRenderer1.cmd.length).to.equal(0); | ||
it('should not load renderer and log warn message', function() { | ||
$$PREBID_GLOBAL$$.adUnits = [{ | ||
code: 'video1', | ||
renderer: { | ||
url: 'http://cdn.adnxs.com/renderer/video/ANOutstreamVideo.js', | ||
render: sinon.spy() | ||
} | ||
}] | ||
|
||
let testRenderer = Renderer.install({ | ||
url: 'https://httpbin.org/post', | ||
config: { test: 'config1' }, | ||
id: 1, | ||
adUnitCode: 'video1' | ||
}); | ||
expect(utilsSpy.callCount).to.equal(1); | ||
}); | ||
}); | ||
}); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why is this needed on the bid?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Code in master was pointing to
bid.adUnitCode
which was undefined until now. Hence i added it.Prebid.js/modules/appnexusBidAdapter.js
Line 276 in a98a349