prebid.js 6.3.0 → 6.7.0

package/.circleci/config.yml

@@ -52,7 +52,7 @@ aliases:
   - &unit_test_steps
     - checkout
     - restore_cache: *restore_dep_cache
-    - run: npm install
+    - run: npm ci
     - save_cache: *save_dep_cache
     - run: *install
     - run: *setup_browserstack

package/gulpfile.js

@@ -115,32 +115,6 @@ function viewReview(done) {
 
 viewReview.displayName = 'view-review';
 
-// Watch Task with Live Reload
-function watch(done) {
-  var mainWatcher = gulp.watch([
-    'src/**/*.js',
-    'modules/**/*.js',
-    'test/spec/**/*.js',
-    '!test/spec/loaders/**/*.js'
-  ]);
-  var loaderWatcher = gulp.watch([
-    'loaders/**/*.js',
-    'test/spec/loaders/**/*.js'
-  ]);
-
-  connect.server({
-    https: argv.https,
-    port: port,
-    host: FAKE_SERVER_HOST,
-    root: './',
-    livereload: true
-  });
-
-  mainWatcher.on('all', gulp.series(clean, gulp.parallel(lint, 'build-bundle-dev', test)));
-  loaderWatcher.on('all', gulp.series(lint));
-  done();
-};
-
 function makeDevpackPkg() {
   var cloned = _.cloneDeep(webpackConfig);
   cloned.devtool = 'source-map';
@@ -247,60 +221,68 @@ function bundle(dev, moduleArr) {
 // If --browsers is given, browsers can be chosen explicitly. e.g. --browsers=chrome,firefox,ie9
 // If --notest is given, it will immediately skip the test task (useful for developing changes with `gulp serve --notest`)
 
-function test(done) {
-  if (argv.notest) {
-    done();
-  } else if (argv.e2e) {
-    let wdioCmd = path.join(__dirname, 'node_modules/.bin/wdio');
-    let wdioConf = path.join(__dirname, 'wdio.conf.js');
-    let wdioOpts;
-
-    if (argv.file) {
-      wdioOpts = [
-        wdioConf,
-        `--spec`,
-        `${argv.file}`
-      ]
-    } else {
-      wdioOpts = [
-        wdioConf
-      ];
-    }
+function testTaskMaker(options = {}) {
+  ['watch', 'e2e', 'file', 'browserstack', 'notest'].forEach(opt => {
+    options[opt] = options[opt] || argv[opt];
+  })
 
-    // run fake-server
-    const fakeServer = spawn('node', ['./test/fake-server/index.js', `--port=${FAKE_SERVER_PORT}`]);
-    fakeServer.stdout.on('data', (data) => {
-      console.log(`stdout: ${data}`);
-    });
-    fakeServer.stderr.on('data', (data) => {
-      console.log(`stderr: ${data}`);
-    });
+  return function test(done) {
+    if (options.notest) {
+      done();
+    } else if (options.e2e) {
+      let wdioCmd = path.join(__dirname, 'node_modules/.bin/wdio');
+      let wdioConf = path.join(__dirname, 'wdio.conf.js');
+      let wdioOpts;
+
+      if (options.file) {
+        wdioOpts = [
+          wdioConf,
+          `--spec`,
+          `${options.file}`
+        ]
+      } else {
+        wdioOpts = [
+          wdioConf
+        ];
+      }
 
-    execa(wdioCmd, wdioOpts, { stdio: 'inherit' })
-      .then(stdout => {
-        // kill fake server
-        fakeServer.kill('SIGINT');
-        done();
-        process.exit(0);
-      })
-      .catch(err => {
-        // kill fake server
-        fakeServer.kill('SIGINT');
-        done(new Error(`Tests failed with error: ${err}`));
-        process.exit(1);
+      // run fake-server
+      const fakeServer = spawn('node', ['./test/fake-server/index.js', `--port=${FAKE_SERVER_PORT}`]);
+      fakeServer.stdout.on('data', (data) => {
+        console.log(`stdout: ${data}`);
+      });
+      fakeServer.stderr.on('data', (data) => {
+        console.log(`stderr: ${data}`);
       });
-  } else {
-    var karmaConf = karmaConfMaker(false, argv.browserstack, argv.watch, argv.file);
 
-    var browserOverride = helpers.parseBrowserArgs(argv);
-    if (browserOverride.length > 0) {
-      karmaConf.browsers = browserOverride;
-    }
+      execa(wdioCmd, wdioOpts, { stdio: 'inherit' })
+        .then(stdout => {
+          // kill fake server
+          fakeServer.kill('SIGINT');
+          done();
+          process.exit(0);
+        })
+        .catch(err => {
+          // kill fake server
+          fakeServer.kill('SIGINT');
+          done(new Error(`Tests failed with error: ${err}`));
+          process.exit(1);
+        });
+    } else {
+      var karmaConf = karmaConfMaker(false, options.browserstack, options.watch, options.file);
 
-    new KarmaServer(karmaConf, newKarmaCallback(done)).start();
+      var browserOverride = helpers.parseBrowserArgs(argv);
+      if (browserOverride.length > 0) {
+        karmaConf.browsers = browserOverride;
+      }
+
+      new KarmaServer(karmaConf, newKarmaCallback(done)).start();
+    }
   }
 }
 
+const test = testTaskMaker();
+
 function newKarmaCallback(done) {
   return function (exitCode) {
     if (exitCode) {
@@ -377,6 +359,35 @@ function startFakeServer() {
   });
 }
 
+// Watch Task with Live Reload
+function watchTaskMaker(options = {}) {
+  if (options.livereload == null) {
+    options.livereload = true;
+  }
+  options.alsoWatch = options.alsoWatch || [];
+
+  return function watch(done) {
+    var mainWatcher = gulp.watch([
+      'src/**/*.js',
+      'modules/**/*.js',
+    ].concat(options.alsoWatch));
+
+    connect.server({
+      https: argv.https,
+      port: port,
+      host: FAKE_SERVER_HOST,
+      root: './',
+      livereload: options.livereload
+    });
+
+    mainWatcher.on('all', options.task());
+    done();
+  }
+}
+
+const watch = watchTaskMaker({alsoWatch: ['test/**/*.js'], task: () => gulp.series(clean, gulp.parallel(lint, 'build-bundle-dev', test))});
+const watchFast = watchTaskMaker({livereload: false, task: () => gulp.series('build-bundle-dev')});
+
 // support tasks
 gulp.task(lint);
 gulp.task(watch);
@@ -389,7 +400,8 @@ gulp.task('build-bundle-dev', gulp.series(makeDevpackPkg, gulpBundle.bind(null,
 gulp.task('build-bundle-prod', gulp.series(makeWebpackPkg, gulpBundle.bind(null, false)));
 
 // public tasks (dependencies are needed for each task since they can be ran on their own)
-gulp.task('test', gulp.series(clean, lint, test));
+gulp.task('test-only', test);
+gulp.task('test', gulp.series(clean, lint, 'test-only'));
 
 gulp.task('test-coverage', gulp.series(clean, testCoverage));
 gulp.task(viewCoverage);
@@ -400,7 +412,8 @@ gulp.task('build', gulp.series(clean, 'build-bundle-prod'));
 gulp.task('build-postbid', gulp.series(escapePostbidConfig, buildPostbid));
 
 gulp.task('serve', gulp.series(clean, lint, gulp.parallel('build-bundle-dev', watch, test)));
-gulp.task('serve-fast', gulp.series(clean, gulp.parallel('build-bundle-dev', watch)));
+gulp.task('serve-fast', gulp.series(clean, gulp.parallel('build-bundle-dev', watchFast)));
+gulp.task('serve-and-test', gulp.series(clean, gulp.parallel('build-bundle-dev', watchFast, testTaskMaker({watch: true}))));
 gulp.task('serve-fake', gulp.series(clean, gulp.parallel('build-bundle-dev', watch), injectFakeServerEndpointDev, test, startFakeServer));
 
 gulp.task('default', gulp.series(clean, makeWebpackPkg));

package/integrationExamples/gpt/amp/creative.html

@@ -1,38 +1,16 @@
 <!-- This script tag should be returned by your ad server -->
 
+<script src="https://cdn.jsdelivr.net/npm/prebid-universal-creative@latest/dist/creative.js"></script>
 <script>
-    // This is the `renderAd` function from Prebid.js moved within the creative iframe
-  var renderAd = function (ev) {
-    var key = ev.message ? "message" : "data";
-    var data = {};
-    try {
-      data = JSON.parse(ev[key]);
-    } catch (e) {
-      // Do nothing.  No ad found.
-    }
-    if (data.ad || data.adUrl) {
-      if (data.ad) {
-        document.write(data.ad);
-        document.close();
-      } else if (data.adUrl) {
-        document.write('<IFRAME SRC="' + data.adUrl + '" WIDTH="'+ data.width +'" HEIGHT="'+ data.height +'" FRAMEBORDER="0" SCROLLING="no" MARGINHEIGHT="0" MARGINWIDTH="0" TOPMARGIN="0" LEFTMARGIN="0" ALLOWTRANSPARENCY="true"></IFRAME>');
-        document.close();
-      }
-    }
-  };
+  var ucTagData = {};
+  ucTagData.adServerDomain = "";
+  ucTagData.pubUrl = "%%PATTERN:url%%";
+  ucTagData.targetingMap = "%%PATTERN:TARGETINGMAP%%";
+  ucTagData.hbPb = "%%PATTERN:hb_pb%%";
 
-  var requestAdFromPrebid = function () {
-    var message = JSON.stringify({
-      message: 'Prebid creative requested: %%PATTERN:hb_adid%%',
-      adId: '%%PATTERN:hb_adid%%'
-    });
-    window.parent.postMessage(message, '*');
-  };
-
-  var listenAdFromPrebid = function () {
-    window.addEventListener("message", renderAd, false);
-  };
-
-  listenAdFromPrebid();
-  requestAdFromPrebid();
+  try {
+    ucTag.renderAd(document, ucTagData);
+  } catch (e) {
+    console.log(e);
+  }
 </script>

package/karma.conf.maker.js

@@ -111,7 +111,7 @@ module.exports = function(codeCoverage, browserstack, watchMode, file) {
   var webpackConfig = newWebpackConfig(codeCoverage);
   var plugins = newPluginsArray(browserstack);
 
-  var files = file ? ['test/helpers/prebidGlobal.js', file] : ['test/test_index.js'];
+  var files = file ? ['test/test_deps.js', file] : ['test/test_index.js'];
   // This file opens the /debug.html tab automatically.
   // It has no real value unless you're running --watch, and intend to do some debugging in the browser.
   if (watchMode) {

package/modules/.submodules.json

@@ -35,7 +35,8 @@
     "uid2IdSystem",
     "unifiedIdSystem",
     "verizonMediaIdSystem",
-    "zeotapIdPlusIdSystem"
+    "zeotapIdPlusIdSystem",
+    "adqueryIdSystem"
   ],
   "adpod": [
     "freeWheelAdserverVideo",

package/modules/adbookpspBidAdapter.js

@@ -363,7 +363,7 @@ function impBidsToPrebidBids(
 }
 
 const impToPrebidBid =
-  (bidderRequestBody, bidResponseCurrency, referrer, targetingMap) => (bid) => {
+  (bidderRequestBody, bidResponseCurrency, referrer, targetingMap) => (bid, bidIndex) => {
     try {
       const bidRequest = findBidRequest(bidderRequestBody, bid);
 
@@ -377,7 +377,7 @@ const impToPrebidBid =
       let prebidBid = {
         ad: bid.adm,
         adId: bid.adid,
-        adserverTargeting: targetingMap[bid.impid],
+        adserverTargeting: targetingMap[bidIndex],
         adUnitCode: bidRequest.tagid,
         bidderRequestId: bidderRequestBody.id,
         bidId: bid.id,
@@ -408,6 +408,9 @@ const impToPrebidBid =
         };
       }
 
+      if (deepAccess(bid, 'ext.pa_win') === true) {
+        prebidBid.auctionWinner = true;
+      }
       return prebidBid;
     } catch (error) {
       logError(`${BIDDER_CODE}: Error while building bid`, error);
@@ -429,29 +432,43 @@ function buildTargetingMap(bids) {
   const values = impIds.reduce((result, id) => {
     result[id] = {
       lineItemIds: [],
+      orderIds: [],
       dealIds: [],
       adIds: [],
+      adAndOrderIndexes: []
     };
 
     return result;
   }, {});
 
-  bids.forEach((bid) => {
-    values[bid.impid].lineItemIds.push(bid.ext.liid);
-    values[bid.impid].dealIds.push(bid.dealid);
-    values[bid.impid].adIds.push(bid.adid);
+  bids.forEach((bid, bidIndex) => {
+    let impId = bid.impid;
+    values[impId].lineItemIds.push(bid.ext.liid);
+    values[impId].dealIds.push(bid.dealid);
+    values[impId].adIds.push(bid.adid);
+
+    if (deepAccess(bid, 'ext.ordid')) {
+      values[impId].orderIds.push(bid.ext.ordid);
+      bid.ext.ordid.split(TARGETING_VALUE_SEPARATOR).forEach((ordid, ordIndex) => {
+        let adIdIndex = values[impId].adIds.indexOf(bid.adid);
+        values[impId].adAndOrderIndexes.push(adIdIndex + '_' + ordIndex)
+      })
+    }
   });
 
   const targetingMap = {};
 
-  for (const id of impIds) {
-    targetingMap[id] = {
+  bids.forEach((bid, bidIndex) => {
+    let id = bid.impid;
+
+    targetingMap[bidIndex] = {
       hb_liid_adbookpsp: values[id].lineItemIds.join(TARGETING_VALUE_SEPARATOR),
       hb_deal_adbookpsp: values[id].dealIds.join(TARGETING_VALUE_SEPARATOR),
+      hb_ad_ord_adbookpsp: values[id].adAndOrderIndexes.join(TARGETING_VALUE_SEPARATOR),
       hb_adid_c_adbookpsp: values[id].adIds.join(TARGETING_VALUE_SEPARATOR),
+      hb_ordid_adbookpsp: values[id].orderIds.join(TARGETING_VALUE_SEPARATOR),
     };
-  }
-
+  })
   return targetingMap;
 }
 

package/modules/adhashBidAdapter.js

@@ -6,7 +6,7 @@ const VERSION = '1.0';
 
 export const spec = {
   code: 'adhash',
-  url: 'https://bidder.adhash.org/rtb?version=' + VERSION + '&prebid=true',
+  url: 'https://bidder.adhash.com/rtb?version=' + VERSION + '&prebid=true',
   supportedMediaTypes: [ BANNER ],
 
   isBidRequestValid: (bid) => {
@@ -37,7 +37,7 @@ export const spec = {
       var size = validBidRequests[i].sizes[index].join('x');
       bidRequests.push({
         method: 'POST',
-        url: url,
+        url: url + '&publisher=' + validBidRequests[i].params.publisherId,
         bidRequest: validBidRequests[i],
         data: {
           timezone: new Date().getTimezoneOffset() / 60,
@@ -87,7 +87,7 @@ export const spec = {
       cpm: responseBody.creatives[0].costEUR,
       ad:
         `<div id="${oneTimeId}"></div>
-        <script src="https://bidder.adhash.org/static/scripts/creative.min.js"></script>
+        <script src="https://bidder.adhash.com/static/scripts/creative.min.js"></script>
         <script>callAdvertiser(${bidderResponse},['${oneTimeId}'],${requestData},${publisherURL})</script>`,
       width: request.bidRequest.sizes[0][0],
       height: request.bidRequest.sizes[0][1],

package/modules/adkernelBidAdapter.js

@@ -1,6 +1,6 @@
 import {
   isStr, isArray, isPlainObject, deepSetValue, isNumber, deepAccess, getAdUnitSizes, parseGPTSingleSizeArrayToRtbSize,
-  cleanObj, contains, getDNT, parseUrl, createTrackPixelHtml, _each, isArrayOfNums
+  cleanObj, contains, getDNT, parseUrl, createTrackPixelHtml, _each, isArrayOfNums, mergeDeep, isEmpty, inIframe
 } from '../src/utils.js';
 import {BANNER, NATIVE, VIDEO} from '../src/mediaTypes.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
@@ -77,7 +77,8 @@ export const spec = {
     {code: 'unibots'},
     {code: 'catapultx'},
     {code: 'ergadx'},
-    {code: 'turktelekom'}
+    {code: 'turktelekom'},
+    {code: 'felixads'}
   ],
   supportedMediaTypes: [BANNER, VIDEO, NATIVE],
 
@@ -103,17 +104,16 @@ export const spec = {
    * @returns {ServerRequest[]}
    */
   buildRequests: function (bidRequests, bidderRequest) {
-    let impDispatch = dispatchImps(bidRequests, bidderRequest.refererInfo);
+    let impGroups = groupImpressionsByHostZone(bidRequests, bidderRequest.refererInfo);
     let requests = [];
     let schain = bidRequests[0].schain;
-    Object.keys(impDispatch).forEach(host => {
-      Object.keys(impDispatch[host]).forEach(zoneId => {
-        const request = buildRtbRequest(impDispatch[host][zoneId], bidderRequest, schain);
-        requests.push({
-          method: 'POST',
-          url: `https://${host}/hb?zone=${zoneId}&v=${VERSION}`,
-          data: JSON.stringify(request)
-        });
+    _each(impGroups, impGroup => {
+      let {host, zoneId, imps} = impGroup;
+      const request = buildRtbRequest(imps, bidderRequest, schain);
+      requests.push({
+        method: 'POST',
+        url: `https://${host}/hb?zone=${zoneId}&v=${VERSION}`,
+        data: JSON.stringify(request)
       });
     });
     return requests;
@@ -209,17 +209,19 @@ registerBidder(spec);
  * @param bidRequests {BidRequest[]}
  * @param refererInfo {refererInfo}
  */
-function dispatchImps(bidRequests, refererInfo) {
+function groupImpressionsByHostZone(bidRequests, refererInfo) {
   let secure = (refererInfo && refererInfo.referer.indexOf('https:') === 0);
-  return bidRequests.map(bidRequest => buildImp(bidRequest, secure))
-    .reduce((acc, curr, index) => {
-      let bidRequest = bidRequests[index];
-      let {zoneId, host} = bidRequest.params;
-      acc[host] = acc[host] || {};
-      acc[host][zoneId] = acc[host][zoneId] || [];
-      acc[host][zoneId].push(curr);
-      return acc;
-    }, {});
+  return Object.values(
+    bidRequests.map(bidRequest => buildImp(bidRequest, secure))
+      .reduce((acc, curr, index) => {
+        let bidRequest = bidRequests[index];
+        let {zoneId, host} = bidRequest.params;
+        let key = `${host}_${zoneId}`;
+        acc[key] = acc[key] || {host: host, zoneId: zoneId, imps: []};
+        acc[key].imps.push(curr);
+        return acc;
+      }, {})
+  );
 }
 
 function getBidFloor(bid, mediaType, sizes) {
@@ -365,57 +367,142 @@ function getAllowedSyncMethod(bidderCode) {
 }
 
 /**
- * Builds complete rtb request
- * @param imps {Object} Collection of rtb impressions
- * @param bidderRequest {BidderRequest}
- * @param schain {Object=} Supply chain config
- * @return {Object} Complete rtb request
+ * Create device object from fpd and host-collected data
+ * @param fpd {Object}
+ * @returns {{device: Object}}
  */
-function buildRtbRequest(imps, bidderRequest, schain) {
-  let {bidderCode, gdprConsent, auctionId, refererInfo, timeout, uspConsent} = bidderRequest;
-  let coppa = config.getConfig('coppa');
-  let req = {
-    'id': auctionId,
-    'imp': imps,
-    'site': createSite(refererInfo),
-    'at': 1,
-    'device': {
-      'ip': 'caller',
-      'ipv6': 'caller',
-      'ua': 'caller',
-      'js': 1,
-      'language': getLanguage()
-    },
-    'tmax': parseInt(timeout)
-  };
+function makeDevice(fpd) {
+  let device = mergeDeep({
+    'ip': 'caller',
+    'ipv6': 'caller',
+    'ua': 'caller',
+    'js': 1,
+    'language': getLanguage()
+  }, fpd.device || {});
   if (getDNT()) {
-    req.device.dnt = 1;
+    device.dnt = 1;
+  }
+  return {device: device};
+}
+
+/**
+ * Create site or app description object
+ * @param bidderRequest {BidderRequest}
+ * @param fpd {Object}
+ * @returns {{site: Object}|{app: Object}}
+ */
+function makeSiteOrApp(bidderRequest, fpd) {
+  let {refererInfo} = bidderRequest;
+  let appConfig = config.getConfig('app');
+  if (isEmpty(appConfig)) {
+    return {site: createSite(refererInfo, fpd)}
+  } else {
+    return {app: appConfig};
   }
+}
+
+/**
+ * Create user description object
+ * @param bidderRequest {BidderRequest}
+ * @param fpd {Object}
+ * @returns {{user: Object} | undefined}
+ */
+function makeUser(bidderRequest, fpd) {
+  let {gdprConsent} = bidderRequest;
+  let user = fpd.user || {};
+  if (gdprConsent && gdprConsent.consentString !== undefined) {
+    deepSetValue(user, 'ext.consent', gdprConsent.consentString);
+  }
+  let eids = getExtendedUserIds(bidderRequest);
+  if (eids) {
+    deepSetValue(user, 'ext.eids', eids);
+  }
+  if (!isEmpty(user)) { return {user: user}; }
+}
+
+/**
+ * Create privacy regulations object
+ * @param bidderRequest {BidderRequest}
+ * @returns {{regs: Object} | undefined}
+ */
+function makeRegulations(bidderRequest) {
+  let {gdprConsent, uspConsent} = bidderRequest;
+  let regs = {};
   if (gdprConsent) {
     if (gdprConsent.gdprApplies !== undefined) {
-      deepSetValue(req, 'regs.ext.gdpr', ~~gdprConsent.gdprApplies);
-    }
-    if (gdprConsent.consentString !== undefined) {
-      deepSetValue(req, 'user.ext.consent', gdprConsent.consentString);
+      deepSetValue(regs, 'regs.ext.gdpr', ~~gdprConsent.gdprApplies);
     }
   }
   if (uspConsent) {
-    deepSetValue(req, 'regs.ext.us_privacy', uspConsent);
+    deepSetValue(regs, 'regs.ext.us_privacy', uspConsent);
+  }
+  if (config.getConfig('coppa')) {
+    deepSetValue(regs, 'regs.coppa', 1);
   }
-  if (coppa) {
-    deepSetValue(req, 'regs.coppa', 1);
+  if (!isEmpty(regs)) {
+    return regs;
   }
+}
+
+/**
+ * Create top-level request object
+ * @param bidderRequest {BidderRequest}
+ * @param imps {Object} Impressions
+ * @param fpd {Object} First party data
+ * @returns
+ */
+function makeBaseRequest(bidderRequest, imps, fpd) {
+  let {auctionId, timeout} = bidderRequest;
+  let request = {
+    'id': auctionId,
+    'imp': imps,
+    'at': 1,
+    'tmax': parseInt(timeout)
+  };
+  if (!isEmpty(fpd.bcat)) {
+    request.bcat = fpd.bcat;
+  }
+  if (!isEmpty(fpd.badv)) {
+    request.badv = fpd.badv;
+  }
+  return request;
+}
+
+/**
+ * Initialize sync capabilities
+ * @param bidderRequest {BidderRequest}
+ */
+function makeSyncInfo(bidderRequest) {
+  let {bidderCode} = bidderRequest;
   let syncMethod = getAllowedSyncMethod(bidderCode);
   if (syncMethod) {
-    deepSetValue(req, 'ext.adk_usersync', syncMethod);
+    let res = {};
+    deepSetValue(res, 'ext.adk_usersync', syncMethod);
+    return res;
   }
+}
+
+/**
+ * Builds complete rtb request
+ * @param imps {Object} Collection of rtb impressions
+ * @param bidderRequest {BidderRequest}
+ * @param schain {Object=} Supply chain config
+ * @return {Object} Complete rtb request
+ */
+function buildRtbRequest(imps, bidderRequest, schain) {
+  let fpd = config.getConfig('ortb2') || {};
+
+  let req = mergeDeep(
+    makeBaseRequest(bidderRequest, imps, fpd),
+    makeDevice(fpd),
+    makeSiteOrApp(bidderRequest, fpd),
+    makeUser(bidderRequest, fpd),
+    makeRegulations(bidderRequest),
+    makeSyncInfo(bidderRequest)
+  );
   if (schain) {
     deepSetValue(req, 'source.ext.schain', schain);
   }
-  let eids = getExtendedUserIds(bidderRequest);
-  if (eids) {
-    deepSetValue(req, 'user.ext.eids', eids);
-  }
   return req;
 }
 
@@ -431,18 +518,17 @@ function getLanguage() {
 /**
  * Creates site description object
  */
-function createSite(refInfo) {
+function createSite(refInfo, fpd) {
   let url = parseUrl(refInfo.referer);
   let site = {
     'domain': url.hostname,
     'page': `${url.protocol}://${url.hostname}${url.pathname}`
   };
-  if (self === top && document.referrer) {
+  mergeDeep(site, fpd.site);
+  if (!inIframe() && document.referrer) {
     site.ref = document.referrer;
-  }
-  let keywords = document.getElementsByTagName('meta')['keywords'];
-  if (keywords && keywords.content) {
-    site.keywords = keywords.content;
+  } else {
+    delete site.ref;
   }
   return site;
 }