@@ -8,11 +8,10 @@ import { config } from '../src/config.js';
88const BIDDER_CODE = 'tappx' ;
99const TTL = 360 ;
1010const CUR = 'USD' ;
11- const TAPPX_BIDDER_VERSION = '0.1.10420 ' ;
11+ const TAPPX_BIDDER_VERSION = '0.1.10514 ' ;
1212const TYPE_CNN = 'prebidjs' ;
1313const VIDEO_SUPPORT = [ 'instream' ] ;
1414
15- var HOST ;
1615var hostDomain ;
1716
1817export const spec = {
@@ -105,13 +104,31 @@ export const spec = {
105104}
106105
107106function validBasic ( bid ) {
108- if (
109- ( bid . params == null ) ||
110- ( bid . params . endpoint == null ) ||
111- ( bid . params . tappxkey == null ) ) {
107+ if ( bid . params == null ) {
112108 utils . logWarn ( `[TAPPX]: Please review the mandatory Tappx parameters.` ) ;
113109 return false ;
114110 }
111+
112+ if ( bid . params . tappxkey == null ) {
113+ utils . logWarn ( `[TAPPX]: Please review the mandatory Tappxkey parameter.` ) ;
114+ return false ;
115+ }
116+
117+ if ( bid . params . host == null ) {
118+ utils . logWarn ( `[TAPPX]: Please review the mandatory Host parameter.` ) ;
119+ return false ;
120+ }
121+
122+ let classicEndpoint = true
123+ if ( ( new RegExp ( `^(vz.*|zz.*)\.*$` , 'i' ) ) . test ( bid . params . host ) ) {
124+ classicEndpoint = false
125+ }
126+
127+ if ( classicEndpoint && bid . params . endpoint == null ) {
128+ utils . logWarn ( `[TAPPX]: Please review the mandatory endpoint Tappx parameters.` ) ;
129+ return false ;
130+ }
131+
115132 return true ;
116133}
117134
@@ -174,11 +191,10 @@ function interpretBid(serverBid, request) {
174191* @return response ad
175192*/
176193function buildOneRequest ( validBidRequests , bidderRequest ) {
177- HOST = utils . deepAccess ( validBidRequests , 'params.host' ) ;
178- let hostInfo = getHostInfo ( HOST ) ;
194+ let hostInfo = getHostInfo ( validBidRequests ) ;
195+ const ENDPOINT = hostInfo . endpoint ;
179196 hostDomain = hostInfo . domain ;
180197
181- const ENDPOINT = utils . deepAccess ( validBidRequests , 'params.endpoint' ) ;
182198 const TAPPXKEY = utils . deepAccess ( validBidRequests , 'params.tappxkey' ) ;
183199 const BIDFLOOR = utils . deepAccess ( validBidRequests , 'params.bidfloor' ) ;
184200 const BIDEXTRA = utils . deepAccess ( validBidRequests , 'params.ext' ) ;
@@ -359,7 +375,7 @@ function buildOneRequest(validBidRequests, bidderRequest) {
359375
360376 return {
361377 method : 'POST' ,
362- url : `https:// ${ HOST } / ${ ENDPOINT } ${ TYPE_CNN } ${ TAPPX_BIDDER_VERSION } ,
378+ url : `${ hostInfo . url } ${ TYPE_CNN } ${ TAPPX_BIDDER_VERSION } ,
363379 data : JSON . stringify ( payload ) ,
364380 bids : validBidRequests
365381 } ;
@@ -375,23 +391,24 @@ function getOs() {
375391 if ( ua == null ) { return 'unknown' ; } else if ( ua . match ( / ( i P h o n e | i P o d | i P a d ) / ) ) { return 'ios' ; } else if ( ua . match ( / A n d r o i d / ) ) { return 'android' ; } else if ( ua . match ( / W i n d o w / ) ) { return 'windows' ; } else { return 'unknown' ; }
376392}
377393
378- function getHostInfo ( hostParam ) {
394+ function getHostInfo ( validBidRequests ) {
379395 let domainInfo = { } ;
396+ let endpoint = utils . deepAccess ( validBidRequests , 'params.endpoint' ) ;
397+ let hostParam = utils . deepAccess ( validBidRequests , 'params.host' ) ;
380398
381399 domainInfo . domain = hostParam . split ( '/' , 1 ) [ 0 ] ;
382- domainInfo . url = hostParam ;
383400
384- let regexNewEndpoints = new RegExp ( `^(vz.*|zz.*|testing )\.ssp \.tappx\.com$` , 'i' ) ;
385- let regexClassicEndpoints = new RegExp ( `^[a-z]{3}\.[a-z]{3}\.tappx\.com$` , 'i' ) ;
401+ let regexNewEndpoints = new RegExp ( `^(vz.*|zz.*)\.pub \.tappx\.com$` , 'i' ) ;
402+ let regexClassicEndpoints = new RegExp ( `^( [a-z]{3}|testing) \.[a-z]{3}\.tappx\.com$` , 'i' ) ;
386403
387404 if ( regexNewEndpoints . test ( domainInfo . domain ) ) {
388- let endpoint = domainInfo . domain . split ( '.' , 1 ) [ 0 ]
389- if ( endpoint . toUpperCase ( ) . indexOf ( 'TESTING' ) === - 1 ) {
390- domainInfo . endpoint = endpoint
391- domainInfo . new_endpoint = true ;
392- }
405+ domainInfo . newEndpoint = true ;
406+ domainInfo . endpoint = domainInfo . domain . split ( '.' , 1 ) [ 0 ]
407+ domainInfo . url = `https://${ hostParam }
393408 } else if ( regexClassicEndpoints . test ( domainInfo . domain ) ) {
394- domainInfo . new_endpoint = false ;
409+ domainInfo . newEndpoint = false ;
410+ domainInfo . endpoint = endpoint
411+ domainInfo . url = `https://${ hostParam } ${ endpoint }
395412 }
396413
397414 return domainInfo ;
0 commit comments