replace usePrebidCache with cache:url and remove default #1904
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -46,128 +46,130 @@ const ALL_TOPICS = '*'; | |
| /** | ||
| * @typedef {object} PrebidConfig | ||
| * | ||
| * @property {bool} config.cacheUrl Set a url if we should use prebid-cache to store video bids before adding | ||
|
There was a problem hiding this comment. Looks like this should be a Just so you're aware, we'll be building some cache features into To give you some idea, this is (roughly) the API I'm planning for PBS: If you have feedback on this, feel free to discuss it over on prebid/prebid-server#216. For this PR, though: It might be better to make a There was a problem hiding this comment. I'm cool with that. I'll update it to be |
||
| * bids to the auction. **NOTE** This must be set if you want to use the dfpAdServerVideo module. | ||
| */ | ||
|
|
||
| export function newConfig() { | ||
| let listeners = []; | ||
| let defaults; | ||
| let config; | ||
|
|
||
| function resetConfig() { | ||
| defaults = {}; | ||
| config = { | ||
| // `debug` is equivalent to legacy `pbjs.logging` property | ||
| _debug: DEFAULT_DEBUG, | ||
| get debug() { | ||
| return this._debug; | ||
| }, | ||
| set debug(val) { | ||
| this._debug = val; | ||
| }, | ||
|
|
||
| // default timeout for all bids | ||
| _bidderTimeout: DEFAULT_BIDDER_TIMEOUT, | ||
| get bidderTimeout() { | ||
| return this._bidderTimeout; | ||
| }, | ||
| set bidderTimeout(val) { | ||
| this._bidderTimeout = val; | ||
| }, | ||
|
|
||
| // domain where prebid is running for cross domain iframe communication | ||
| _publisherDomain: DEFAULT_PUBLISHER_DOMAIN, | ||
| get publisherDomain() { | ||
| return this._publisherDomain; | ||
| }, | ||
| set publisherDomain(val) { | ||
| this._publisherDomain = val; | ||
| }, | ||
|
|
||
| // delay to request cookie sync to stay out of critical path | ||
| _cookieSyncDelay: DEFAULT_COOKIESYNC_DELAY, | ||
| get cookieSyncDelay() { | ||
| return $$PREBID_GLOBAL$$.cookieSyncDelay || this._cookieSyncDelay; | ||
| }, | ||
| set cookieSyncDelay(val) { | ||
| this._cookieSyncDelay = val; | ||
| }, | ||
|
|
||
| // calls existing function which may be moved after deprecation | ||
| _priceGranularity: GRANULARITY_OPTIONS.MEDIUM, | ||
| set priceGranularity(val) { | ||
| if (validatePriceGranularity(val)) { | ||
| if (typeof val === 'string') { | ||
| this._priceGranularity = (hasGranularity(val)) ? val : GRANULARITY_OPTIONS.MEDIUM; | ||
| } else if (typeof val === 'object') { | ||
| this._customPriceBucket = val; | ||
| this._priceGranularity = GRANULARITY_OPTIONS.CUSTOM; | ||
| utils.logMessage('Using custom price granularity'); | ||
| } | ||
| } | ||
| }, | ||
| get priceGranularity() { | ||
| return this._priceGranularity; | ||
| }, | ||
|
|
||
| _customPriceBucket: {}, | ||
| get customPriceBucket() { | ||
| return this._customPriceBucket; | ||
| }, | ||
|
|
||
| _sendAllBids: DEFAULT_ENABLE_SEND_ALL_BIDS, | ||
| get enableSendAllBids() { | ||
| return this._sendAllBids; | ||
| }, | ||
| set enableSendAllBids(val) { | ||
| this._sendAllBids = val; | ||
| }, | ||
|
|
||
| _bidderSequence: DEFAULT_BIDDER_SEQUENCE, | ||
| get bidderSequence() { | ||
| return this._bidderSequence; | ||
| }, | ||
| set bidderSequence(val) { | ||
| if (VALID_ORDERS[val]) { | ||
| this._bidderSequence = val; | ||
| } else { | ||
| utils.logWarn(`Invalid order: ${val}. Bidder Sequence was not set.`); | ||
| } | ||
| }, | ||
|
|
||
| // timeout buffer to adjust for bidder CDN latency | ||
| _timoutBuffer: DEFAULT_TIMEOUTBUFFER, | ||
| get timeoutBuffer() { | ||
| return this._timoutBuffer; | ||
| }, | ||
| set timeoutBuffer(val) { | ||
| this._timoutBuffer = val; | ||
| }, | ||
|
|
||
| // userSync defaults | ||
| userSync: DEFAULT_USERSYNC | ||
| }; | ||
|
|
||
| function hasGranularity(val) { | ||
| return Object.keys(GRANULARITY_OPTIONS).find(option => val === GRANULARITY_OPTIONS[option]); | ||
| } | ||
|
|
||
| function validatePriceGranularity(val) { | ||
| if (!val) { | ||
| utils.logError('Prebid Error: no value passed to `setPriceGranularity()`'); | ||
| return false; | ||
| } | ||
| if (typeof val === 'string') { | ||
| if (!hasGranularity(val)) { | ||
| utils.logWarn('Prebid Warning: setPriceGranularity was called with invalid setting, using `medium` as default.'); | ||
| } | ||
| } else if (typeof val === 'object') { | ||
| if (!isValidPriceConfig(val)) { | ||
| utils.logError('Invalid custom price value passed to `setPriceGranularity()`'); | ||
| return false; | ||
| } | ||
| } | ||
| return true; | ||
| } | ||
| } | ||
|
|
||
| /* | ||
|
|
@@ -289,10 +291,13 @@ export function newConfig() { | |
| .forEach(listener => listener.callback(options)); | ||
| } | ||
|
|
||
| resetConfig(); | ||
|
|
||
| return { | ||
| getConfig, | ||
| setConfig, | ||
| setDefaults, | ||
| resetConfig | ||
| }; | ||
| } | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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.
@snapwich Not sure if I did something wrong when checking this branch out locally but I see one remaining reference to
usePrebidCachein this file on line 155. Everything else lgtmThere 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.
No you are correct. It looks like Jaimin added a new call to
usePrebidCacheafter the creation of this pull-request which I got with the latest merge update. Just fixed and updated, as well as removed a call to it in one of the bid adapters.