PFG-2532 update to 1.16.0

README.md

@@ -89,6 +89,17 @@ When we run `npm publish`, prepublish script of package.json is executed. Script
 
 [jsDelivr](https://www.jsdelivr.com/) – Open Source CDN is used to serve creative.js file.
 
+## Freestar Build For Staging and Production
+
+`gulp build` is executed before publish. It creates following files in dist directory
+
++ `./dist/amp.js` - Minified amp.js source code (responsible for rendering amp ads)
++ `./dist/banner.js` - Minified banner.js source code (responsible for rendering banner ads)
++ `./dist/mobile.js` - Minified mobile.js source code (responsible for rendering mobile ads)
++ `./dist/native.js` - Minified native.js source code (responsible for rendering native ads)
++ `./dist/video.js` - Minified video.js source code (responsible for rendering outstream video ads)
+  [jsDelivr](https://www.jsdelivr.com/) – Open Source CDN is used to serve creative.js file.
+
 ## Freestar Deployment
 ```
 $ bash bin/publish.sh

bin/publish.sh

@@ -19,7 +19,13 @@ read -p "
 If you are missing the dev-a sub domain that means you will be publishing to PRODUCTION.
 
 
-Are you sure you're ready to publish the file prebid-universal-creative.js to $DOMAIN?" -n 1 -r
+Are you sure you're ready to publish following files:
+- prebid-universal-creative-amp.js
+- prebid-universal-creative-banner.js
+- prebid-universal-creative-mobile.js
+- prebid-universal-creative-native.js
+- prebid-universal-creative-video.js
+to $DOMAIN?" -n 1 -r
 if [[ $REPLY =~ ^[Yy]$ ]]; then
   echo -e "${GREN}*** OKAY ***"
   PARENT_DIRECTORY="$(dirname $( cd "$(dirname "${BASH_SOURCE[0]}")" ; pwd -P ) )"
@@ -28,10 +34,35 @@ if [[ $REPLY =~ ^[Yy]$ ]]; then
     echo -e "${RED}*** DID YOU FORGET TO BUILD? ***${NC}"
     exit 1
   fi
-  FILE=$PARENT_DIRECTORY/dist/creative.js
+
+  FILE=$PARENT_DIRECTORY/dist/amp.js
+  echo -e "${GREEN}Built File ${FILE}"
+  gsutil mv $PARENT_DIRECTORY/dist/amp.js gs://$DOMAIN/core/prebid-universal-creative-amp.js
+  echo -e "${GREEN}Setting permissions for $FILE...${NC}"
+  gsutil acl ch -u AllUsers:R gs://$DOMAIN/core/prebid-universal-creative-amp.js
+
+  FILE=$PARENT_DIRECTORY/dist/banner.js
+  echo -e "${GREEN}Built File ${FILE}"
+  gsutil mv $PARENT_DIRECTORY/dist/banner.js gs://$DOMAIN/core/prebid-universal-creative-banner.js
+  echo -e "${GREEN}Setting permissions for $FILE...${NC}"
+  gsutil acl ch -u AllUsers:R gs://$DOMAIN/core/prebid-universal-creative-banner.js
+
+  FILE=$PARENT_DIRECTORY/dist/mobile.js
+  echo -e "${GREEN}Built File ${FILE}"
+  gsutil mv $PARENT_DIRECTORY/dist/mobile.js gs://$DOMAIN/core/prebid-universal-creative-mobile.js
+  echo -e "${GREEN}Setting permissions for $FILE...${NC}"
+  gsutil acl ch -u AllUsers:R gs://$DOMAIN/core/prebid-universal-creative-mobile.js
+
+  FILE=$PARENT_DIRECTORY/dist/native.js
+  echo -e "${GREEN}Built File ${FILE}"
+  gsutil mv $PARENT_DIRECTORY/dist/native.js gs://$DOMAIN/core/prebid-universal-creative-native.js
+  echo -e "${GREEN}Setting permissions for $FILE...${NC}"
+  gsutil acl ch -u AllUsers:R gs://$DOMAIN/core/prebid-universal-creative-native.js
+
+  FILE=$PARENT_DIRECTORY/dist/video.js
   echo -e "${GREEN}Built File ${FILE}"
-  gsutil mv $PARENT_DIRECTORY/dist/creative.js gs://$DOMAIN/core/prebid-universal-creative.js
+  gsutil mv $PARENT_DIRECTORY/dist/video.js gs://$DOMAIN/core/prebid-universal-creative-video.js
   echo -e "${GREEN}Setting permissions for $FILE...${NC}"
-  gsutil acl ch -u AllUsers:R gs://$DOMAIN/core/prebid-universal-creative.js
+  gsutil acl ch -u AllUsers:R gs://$DOMAIN/core/prebid-universal-creative-video.js
 fi
 

package.json

@@ -4,7 +4,7 @@
     "description": "Universal creative for Prebid apps",
     "main": "dist/creative.js",
     "scripts": {
-        "test": "echo test",
+        "test": "gulp test",
         "prepublish": "gulp build"
     },
     "repository": {

src/mobileAndAmpRender.js

@@ -2,6 +2,7 @@ import { getCreativeCommentMarkup, triggerPixel, createTrackPixelHtml, loadScrip
 import { isSafeFrame, isMobileApp } from './environment';
 import { insertElement } from './domHelper';
 import { writeAdHtml } from './postscribeRender';
+import {appBidTrack, Freestar} from "./freestar";
 
 const DEFAULT_CACHE_HOST = 'prebid.adnxs.com';
 const DEFAULT_CACHE_PATH = '/pbc/v1/cache';
@@ -17,7 +18,8 @@ const DEFAULT_CACHE_PATH = '/pbc/v1/cache';
  */
 export function renderAmpOrMobileAd(dataObject) {
   const targetingData = transformAuctionTargetingData(dataObject);
-  let { cacheHost, cachePath, uuid, size, hbPb } = targetingData;
+  const freestar = new Freestar(targetingData);
+  let { cacheHost, cachePath, uuid, size, hbPb, env } = freestar;
   uuid = uuid || '';
   // For MoPub, creative is stored in localStorage via SDK.
   let search = 'Prebid_';
@@ -29,7 +31,7 @@ export function renderAmpOrMobileAd(dataObject) {
     let adUrl = `${getCacheEndpoint(cacheHost, cachePath)}?uuid=${uuid}`;
     //register creative right away to not miss initial geom-update
     updateIframe(size);
-    sendRequest(adUrl, responseCallback(isMobileApp(targetingData.env), hbPb));
+    sendRequest(adUrl, responseCallback(isMobileApp(env), hbPb, uuid));
   }
 }
 
@@ -102,13 +104,15 @@ function getCacheEndpoint(cacheHost, cachePath) {
  * Cache request Callback to display creative
  * @param {Bool} isMobileApp
  * @param {string} hbPb final price of the winning bid
+ * @param {string} uuid
  * @returns {function} a callback function that parses response
  */
-function responseCallback(isMobileApp, hbPb) {
+function responseCallback(isMobileApp, hbPb, uuid) {
   return function (response) {
     let bidObject = parseResponse(response);
     let auctionPrice = bidObject.price || hbPb;
     let ad = getCreativeCommentMarkup(bidObject);
+    appBidTrack(uuid);
     let width = (bidObject.width) ? bidObject.width : bidObject.w;
     let height = (bidObject.height) ? bidObject.height : bidObject.h;
 

src/nativeTrackerManager.js

@@ -4,6 +4,7 @@
 import { parseUrl, triggerPixel, transformAuctionTargetingData } from './utils';
 import { newNativeAssetManager } from './nativeAssetManager';
 import {prebidMessenger} from './messaging.js';
+import {Freestar} from "./freestar";
 
 const AD_ANCHOR_CLASS_NAME = 'pb-click';
 const AD_DATA_ADID_ATTRIBUTE = 'pbAdId';
@@ -71,10 +72,11 @@ export function newNativeTrackerManager(win) {
   // START OF MAIN CODE
   let startTrackers = function (dataObject) {
     const targetingData = transformAuctionTargetingData(dataObject);
+    const freestar = new Freestar(targetingData);
     sendMessage = prebidMessenger(targetingData.pubUrl, win);
     const nativeAssetManager = newNativeAssetManager(window, targetingData.pubUrl);
 
-    if (targetingData && targetingData.env === 'mobile-app') {
+    if (freestar && freestar.env === 'mobile-app') {
       let cb = function({clickTrackers, impTrackers, eventtrackers} = {}) {
         function loadMobileClickTrackers(clickTrackers) {
           (clickTrackers || []).forEach(triggerPixel);
@@ -96,7 +98,7 @@ export function newNativeTrackerManager(win) {
           .map(tracker => tracker.url)
           .forEach(trackerUrl => loadScript(document, trackerUrl));
       }
-      nativeAssetManager.loadMobileAssets(targetingData, cb);
+      nativeAssetManager.loadMobileAssets(freestar, cb);
     } else {
       let adElements = findAdElements(AD_ANCHOR_CLASS_NAME);
 

src/renderingManager.js

@@ -2,14 +2,15 @@ import { parseUrl, transformAuctionTargetingData } from './utils';
 import { canLocatePrebid } from './environment';
 import { insertElement, getEmptyIframe } from './domHelper';
 import {prebidMessenger} from './messaging.js';
+import {Freestar} from "./freestar";
 
 export function renderBannerOrDisplayAd(doc, dataObject) {
   const targetingData = transformAuctionTargetingData(dataObject);
-
+  const freestar = new Freestar(targetingData);
   if (!canLocatePrebid(window)) {
-    renderCrossDomain(window, targetingData.adId, targetingData.adServerDomain, targetingData.pubUrl);
+    renderCrossDomain(window, freestar.adId, targetingData.adServerDomain, targetingData.pubUrl);
   } else {
-    renderLegacy(doc, targetingData.adId);
+    renderLegacy(doc, freestar.adId);
   }
 }