Skip to content
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.

Sign up for GitHub

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

Yieldbot adapter use utils.timestamp #2848

Merged
merged 1 commit into from
Jul 19, 2018
Merged

Yieldbot adapter use utils.timestamp #2848

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions modules/yieldbotBidAdapter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import { registerBidder } from 'src/adapters/bidderFactory';
* @private
*/
export const YieldbotAdapter = {
_adapterLoaded: Date.now(),
_adapterLoaded: utils.timestamp(),
_navigationStart: 0,
_version: 'pbjs-yb-0.0.1',
_bidRequestCount: 0,
Expand Down Expand Up @@ -205,7 +205,7 @@ export const YieldbotAdapter = {

const bidUrl = this.urlPrefix() + yieldbotSlotParams.psn + '/v1/init';

searchParams['cts_ini'] = Date.now();
searchParams['cts_ini'] = utils.timestamp();
requests.push({
method: 'GET',
url: bidUrl,
Expand Down Expand Up @@ -325,7 +325,7 @@ export const YieldbotAdapter = {

buildAdUrl: function(urlPrefix, publisherNumber, commonSearchParams, bid) {
const searchParams = Object.assign({}, commonSearchParams);
searchParams['cts_res'] = Date.now();
searchParams['cts_res'] = utils.timestamp();
searchParams['slot'] = bid.slot + ':' + bid.size;
searchParams['ioa'] = this.intersectionObserverAvailable(window);

Expand Down Expand Up @@ -369,7 +369,7 @@ export const YieldbotAdapter = {
const adUrl = this.buildAdUrl(urlPrefix, publisherNumber, commonSearchParams, bid);
const impressionUrl = this.buildImpressionUrl(urlPrefix, publisherNumber, commonSearchParams);

const htmlMarkup = `<div id="ybot-${ybotAdRequestId}"></div><script type="text/javascript">var yieldbot={iframeType:function(win){var it='none';while(win !== window.top){try{win=win.parent;var doc=win.document;it=doc?'so':'co';}catch(e){it='co';}}return it;},'_render':function(data){try{yieldbot['cts_rend_'+'${ybotAdRequestId}']=Date.now();var bodyHtml=data.html,width=data.size[0]||0,height=data.size[1]||0,divEl=document.createElement('div');divEl.style.width=width+'px';divEl.style.height=height+'px';divEl.className='ybot-creativecreative-wrapper';var containerEl=document.getElementById(data.wrapper_id||'ybot-'+data.request_id);containerEl.appendChild(divEl);var iframeHtml='<!DOCTYPE html><head><meta charset=utf-8><style>'+data.style+'</style></head><body>'+data.html+'</body>',innerFrame=document.createElement('iframe');innerFrame.width=width;innerFrame.height=height;innerFrame.scrolling='no';innerFrame.marginWidth='0';innerFrame.marginHeight='0';innerFrame.frameBorder='0';innerFrame.style.border='0px';innerFrame.style['vertical-align']='bottom';innerFrame.id='ybot-'+data.request_id+'-iframe';divEl.appendChild(innerFrame);var innerFrameDoc=innerFrame.contentWindow.document;innerFrameDoc.open();innerFrameDoc.write(iframeHtml);innerFrameDoc.close();var image=new Image(1,1);image.onload=function(){};var cts_rend=yieldbot['cts_rend_'+'${ybotAdRequestId}']||0;image.src='${impressionUrl}'+'&cts_imp='+Date.now()+'&cts_rend='+cts_rend+'&e';}catch(err){}}};</script><script type="text/javascript">var jsEl=document.createElement('script');var src='${adUrl}'+'&it='+yieldbot.iframeType(window)+'&cts_ad='+Date.now()+'&e';jsEl.src=src;var firstEl=document.getElementsByTagName('script')[0];firstEl.parentNode.insertBefore(jsEl,firstEl);</script>`;
const htmlMarkup = `<div id="ybot-${ybotAdRequestId}"></div><script type="text/javascript">var yieldbot={iframeType:function(win){var it='none';while(win !== window.top){try{win=win.parent;var doc=win.document;it=doc?'so':'co';}catch(e){it='co';}}return it;},'_render':function(data){try{yieldbot['cts_rend_'+'${ybotAdRequestId}']=(new Date()).getTime();var bodyHtml=data.html,width=data.size[0]||0,height=data.size[1]||0,divEl=document.createElement('div');divEl.style.width=width+'px';divEl.style.height=height+'px';divEl.className='ybot-creativecreative-wrapper';var containerEl=document.getElementById(data.wrapper_id||'ybot-'+data.request_id);containerEl.appendChild(divEl);var iframeHtml='<!DOCTYPE html><head><meta charset=utf-8><style>'+data.style+'</style></head><body>'+data.html+'</body>',innerFrame=document.createElement('iframe');innerFrame.width=width;innerFrame.height=height;innerFrame.scrolling='no';innerFrame.marginWidth='0';innerFrame.marginHeight='0';innerFrame.frameBorder='0';innerFrame.style.border='0px';innerFrame.style['vertical-align']='bottom';innerFrame.id='ybot-'+data.request_id+'-iframe';divEl.appendChild(innerFrame);var innerFrameDoc=innerFrame.contentWindow.document;innerFrameDoc.open();innerFrameDoc.write(iframeHtml);innerFrameDoc.close();var image=new Image(1,1);image.onload=function(){};var cts_rend=yieldbot['cts_rend_'+'${ybotAdRequestId}']||0;image.src='${impressionUrl}'+'&cts_imp='+(new Date()).getTime()+'&cts_rend='+cts_rend+'&e';}catch(err){}}};</script><script type="text/javascript">var jsEl=document.createElement('script');var src='${adUrl}'+'&it='+yieldbot.iframeType(window)+'&cts_ad='+(new Date()).getTime()+'&e';jsEl.src=src;var firstEl=document.getElementsByTagName('script')[0];firstEl.parentNode.insertBefore(jsEl,firstEl);</script>`;
return { ad: htmlMarkup, creativeId: ybotAdRequestId };
},

Expand Down Expand Up @@ -410,7 +410,7 @@ export const YieldbotAdapter = {
const userId = this.userId;
const sessionId = this.sessionId;
const pageviewId = this.newId();
const currentBidTime = Date.now();
const currentBidTime = utils.timestamp();
const lastBidTime = this.lastPageviewTime;
const lastBidId = this.lastPageviewId;
this.lastPageviewTime = currentBidTime;
Expand Down Expand Up @@ -537,7 +537,7 @@ export const YieldbotAdapter = {
setCookie: function(name, value, expireMillis, path, domain, secure) {
const dataValue = encodeURIComponent(value);
const cookieStr = name + '=' + dataValue +
(expireMillis ? ';expires=' + new Date(Date.now() + expireMillis).toGMTString() : '') +
(expireMillis ? ';expires=' + new Date(utils.timestamp() + expireMillis).toGMTString() : '') +
(path ? ';path=' + path : '') +
(domain ? ';domain=' + domain : '') +
(secure ? ';secure' : '');
Expand Down Expand Up @@ -567,7 +567,7 @@ export const YieldbotAdapter = {
* @private
*/
newId: function() {
return (+new Date()).toString(36) + 'xxxxxxxxxx'
return (utils.timestamp()).toString(36) + 'xxxxxxxxxx'
.replace(/[x]/g, function() {
return (0 | Math.random() * 36).toString(36);
});
Expand Down Expand Up @@ -600,5 +600,5 @@ export const spec = {
getUserSyncs: YieldbotAdapter.createDelegate(YieldbotAdapter, YieldbotAdapter.getUserSyncs)
};

YieldbotAdapter._navigationStart = Date.now();
YieldbotAdapter._navigationStart = utils.timestamp();
registerBidder(spec);
47 changes: 47 additions & 0 deletions test/spec/modules/yieldbotBidAdapter_spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1323,4 +1323,51 @@ describe('Yieldbot Adapter Unit Tests', function() {
done();
});
});

describe('Adapter Request Timestamps', function() {
let sandbox;
beforeEach(function() {
sandbox = sinon.sandbox.create();
sandbox.stub(Date, 'now').callsFake(() => {
return new Date();
});
});

afterEach(function() {
sandbox.restore();
});

it('should have overridden Date.now() function', function() {
expect(Date.now().getTime()).to.match(/^[0-9]+/);
});

it('should be milliseconds past epoch query param values', function() {
const request = YieldbotAdapter.buildRequests(FIXTURE_BID_REQUESTS)[0];
expect(request.data).to.not.equal(undefined);

const timestampParams = [
'cts_ns',
'cts_js',
'cts_ini'
];

timestampParams.forEach((item) => {
expect(!isNaN(request.data[item])).to.equal(true);
expect(request.data[item] > 0).to.equal(true);
expect(request.data[item]).to.match(/^[0-9]+/);
});
});

it('should use (new Date()).getTime() for timestamps in ad markup', function() {
FIXTURE_SERVER_RESPONSE.body.url_prefix = 'http://close.edge.adserver.com/';
const responses = YieldbotAdapter.interpretResponse(
FIXTURE_SERVER_RESPONSE,
FIXTURE_BID_REQUEST
);

expect(responses[0].ad).to.match(/cts_rend_.*='\+\(new Date\(\)\)\.getTime\(\)/);
expect(responses[0].ad).to.match(/cts_ad='\+\(new Date\(\)\)\.getTime\(\)/);
expect(responses[0].ad).to.match(/cts_imp='\+\(new Date\(\)\)\.getTime\(\)/);
});
});
});