prebid.js 8.7.0 → 8.9.0

package/modules/snigelBidAdapter.js

@@ -1,7 +1,7 @@
 import {config} from '../src/config.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
 import {BANNER} from '../src/mediaTypes.js';
-import {deepAccess, isArray, isFn, isPlainObject} from '../src/utils.js';
+import {deepAccess, isArray, isFn, isPlainObject, inIframe, getDNT} from '../src/utils.js';
 import {hasPurpose1Consent} from '../src/utils/gpdr.js';
 import {getGlobal} from '../src/prebidGlobal.js';
 
@@ -13,6 +13,7 @@ const DEFAULT_CURRENCIES = ['USD'];
 const FLOOR_MATCH_ALL_SIZES = '*';
 
 const getConfig = config.getConfig;
+const refreshes = {};
 
 export const spec = {
   code: BIDDER_CODE,
@@ -29,12 +30,15 @@ export const spec = {
       method: 'POST',
       url: getEndpoint(),
       data: JSON.stringify({
-        id: bidderRequest.bidderRequestId,
+        id: bidderRequest.auctionId,
+        accountId: deepAccess(bidRequests, '0.params.accountId'),
+        site: deepAccess(bidRequests, '0.params.site'),
         cur: getCurrencies(),
         test: getTestFlag(),
-        devw: window.innerWidth || document.documentElement.clientWidth || document.body.clientWidth,
-        devh: window.innerHeight || document.documentElement.clientHeight || document.body.clientHeight,
         version: getGlobal().version,
+        gpp: deepAccess(bidderRequest, 'gppConsent.gppString') || deepAccess(bidderRequest, 'ortb2.regs.gpp'),
+        gpp_sid:
+          deepAccess(bidderRequest, 'gppConsent.applicableSections') || deepAccess(bidderRequest, 'ortb2.regs.gpp_sid'),
         gdprApplies: gdprApplies,
         gdprConsentString: gdprApplies === true ? deepAccess(bidderRequest, 'gdprConsent.consentString') : undefined,
         gdprConsentProv: gdprApplies === true ? deepAccess(bidderRequest, 'gdprConsent.addtlConsent') : undefined,
@@ -43,12 +47,24 @@ export const spec = {
         eids: deepAccess(bidRequests, '0.userIdAsEids'),
         schain: deepAccess(bidRequests, '0.schain'),
         page: getPage(bidderRequest),
+        topframe: inIframe() === true ? 0 : 1,
+        device: {
+          w: window.innerWidth || document.documentElement.clientWidth || document.body.clientWidth,
+          h: window.innerHeight || document.documentElement.clientHeight || document.body.clientHeight,
+          dnt: getDNT() ? 1 : 0,
+          language: getLanguage(),
+        },
         placements: bidRequests.map((r) => {
           return {
-            uuid: r.bidId,
+            id: r.adUnitCode,
+            tid: r.transactionId,
+            gpid: deepAccess(r, 'ortb2Imp.ext.gpid'),
+            pbadslot: deepAccess(r, 'ortb2Imp.ext.data.pbadslot') || deepAccess(r, 'ortb2Imp.ext.gpid'),
             name: r.params.placement,
             sizes: r.sizes,
             floor: getPriceFloor(r, BANNER, FLOOR_MATCH_ALL_SIZES),
+            refresh: getRefreshInformation(r.adUnitCode),
+            params: r.params.additionalParams,
           };
         }),
       }),
@@ -56,14 +72,14 @@ export const spec = {
     };
   },
 
-  interpretResponse: function (serverResponse) {
+  interpretResponse: function (serverResponse, bidRequest) {
     if (!serverResponse.body || !serverResponse.body.bids) {
       return [];
     }
 
     return serverResponse.body.bids.map((bid) => {
       return {
-        requestId: bid.uuid,
+        requestId: mapIdToRequestId(bid.id, bidRequest),
         cpm: bid.price,
         creativeId: bid.crid,
         currency: serverResponse.body.cur,
@@ -77,9 +93,9 @@ export const spec = {
     });
   },
 
-  getUserSyncs: function (syncOptions, responses, gdprConsent, uspConsent) {
+  getUserSyncs: function (syncOptions, responses, gdprConsent, uspConsent, gppConsent) {
     const syncUrl = getSyncUrl(responses || []);
-    if (syncUrl && syncOptions.iframeEnabled && hasSyncConsent(gdprConsent, uspConsent)) {
+    if (syncUrl && syncOptions.iframeEnabled && hasSyncConsent(gdprConsent, uspConsent, gppConsent)) {
       return [{type: 'iframe', url: getSyncEndpoint(syncUrl, gdprConsent)}];
     }
   },
@@ -101,6 +117,14 @@ function getTestFlag() {
   return getConfig(`${BIDDER_CODE}.test`) === true;
 }
 
+function getLanguage() {
+  return navigator && navigator.language
+    ? navigator.language.indexOf('-') != -1
+      ? navigator.language.split('-')[0]
+      : navigator.language
+    : undefined;
+}
+
 function getCurrencies() {
   const currencyOverrides = getConfig(`${BIDDER_CODE}.cur`);
   if (currencyOverrides !== undefined && (!isArray(currencyOverrides) || currencyOverrides.length === 0)) {
@@ -130,14 +154,43 @@ function getPriceFloor(bidRequest, mediaType, size) {
   }
 }
 
-function hasSyncConsent(gdprConsent, uspConsent) {
-  if (gdprConsent?.gdprApplies && !hasPurpose1Consent(gdprConsent)) {
-    return false;
-  } else if (uspConsent && uspConsent[1] === 'Y' && uspConsent[2] === 'Y') {
-    return false;
-  } else {
-    return true;
+function getRefreshInformation(adUnitCode) {
+  const refresh = refreshes[adUnitCode];
+  if (!refresh) {
+    refreshes[adUnitCode] = {
+      count: 0,
+      previousTime: new Date(),
+    };
+    return undefined;
   }
+
+  const currentTime = new Date();
+  const timeDifferenceSeconds = Math.floor((currentTime - refresh.previousTime) / 1000);
+  refresh.count += 1;
+  refresh.previousTime = currentTime;
+  return {
+    count: refresh.count,
+    time: timeDifferenceSeconds,
+  };
+}
+
+function mapIdToRequestId(id, bidRequest) {
+  return bidRequest.bidderRequest.bids.filter((bid) => bid.adUnitCode === id)[0].bidId;
+}
+
+function hasUspConsent(uspConsent) {
+  return typeof uspConsent !== 'string' || !(uspConsent[0] === '1' && uspConsent[2] === 'Y');
+}
+
+function hasGppConsent(gppConsent) {
+  return (
+    !(gppConsent && Array.isArray(gppConsent.applicableSections)) ||
+    gppConsent.applicableSections.every((section) => typeof section === 'number' && section <= 5)
+  );
+}
+
+function hasSyncConsent(gdprConsent, uspConsent, gppConsent) {
+  return hasPurpose1Consent(gdprConsent) && hasUspConsent(uspConsent) && hasGppConsent(gppConsent);
 }
 
 function getSyncUrl(responses) {

package/modules/snigelBidAdapter.md

@@ -15,9 +15,13 @@ Please reach out to us [through our contact form](https://snigel.com/get-in-touc
 
 # Parameters
 
-| Name | Required | Description | Example |
-| :--- | :-------- | :---------- | :------ |
-| placement | Yes | Placement identifier | top_leaderboard |
+| Name      | Required | Description          |
+| :-------- | :------- | :------------------- |
+| accountId | Yes      | Account identifier   |
+| site      | Yes      | Site identifier      |
+| placement | Yes      | Placement identifier |
+
+Snigel will provide all of these parameters to you.
 
 # Test
 
@@ -37,6 +41,8 @@ var adUnits = [
       {
         bidder: "snigel",
         params: {
+          accountId: "1000",
+          site: "test.com",
           placement: "prebid_test_placement",
         },
       },

package/modules/topicsFpdModule.js

@@ -12,6 +12,7 @@ import {MODULE_TYPE_BIDDER} from '../src/activities/modules.js';
 
 const MODULE_NAME = 'topicsFpd';
 const DEFAULT_EXPIRATION_DAYS = 21;
+const DEFAULT_FETCH_RATE_IN_DAYS = 1;
 let LOAD_TOPICS_INITIALISE = false;
 
 export function reset() {
@@ -85,6 +86,7 @@ export function getTopicsData(name, topics, taxonomies = TAXONOMIES) {
           if (name != null) {
             datum.name = name;
           }
+
           return datum;
         })
     );
@@ -96,6 +98,7 @@ function isTopicsSupported(doc = document) {
 
 export function getTopics(doc = document) {
   let topics = null;
+
   try {
     if (isTopicsSupported(doc)) {
       topics = GreedyPromise.resolve(doc.browsingTopics());
@@ -106,6 +109,7 @@ export function getTopics(doc = document) {
   if (topics == null) {
     topics = GreedyPromise.resolve([]);
   }
+
   return topics;
 }
 
@@ -165,7 +169,7 @@ export function receiveMessage(evt) {
       let data = safeJSONParse(evt.data);
       if (includes(getLoadedIframeURL(), evt.origin) && data && data.segment && !isEmpty(data.segment.topics)) {
         const {domain, topics, bidder} = data.segment;
-        const iframeTopicsData = getTopicsData(domain, topics)[0];
+        const iframeTopicsData = getTopicsData(domain, topics);
         iframeTopicsData && storeInLocalStorage(bidder, iframeTopicsData);
       }
     } catch (err) { }
@@ -178,13 +182,15 @@ Function to store Topics data recieved from iframe in storage(name: "prebid:topi
 */
 export function storeInLocalStorage(bidder, topics) {
   const storedSegments = new Map(safeJSONParse(coreStorage.getDataFromLocalStorage(topicStorageName)));
-  if (storedSegments.has(bidder)) {
-    storedSegments.get(bidder)[topics['ext']['segclass']] = topics;
-    storedSegments.get(bidder)[lastUpdated] = new Date().getTime();
-    storedSegments.set(bidder, storedSegments.get(bidder));
-  } else {
-    storedSegments.set(bidder, {[topics.ext.segclass]: topics, [lastUpdated]: new Date().getTime()})
-  }
+  const topicsObj = {
+    [lastUpdated]: new Date().getTime()
+  };
+
+  topics.forEach((topic) => {
+    topicsObj[topic.ext.segclass] = topic;
+  });
+
+  storedSegments.set(bidder, topicsObj);
   coreStorage.setDataInLocalStorage(topicStorageName, JSON.stringify([...storedSegments]));
 }
 
@@ -215,10 +221,11 @@ function listenMessagesFromTopicIframe() {
 export function loadTopicsForBidders(doc = document) {
   if (!isTopicsSupported(doc)) return;
   const topics = config.getConfig('userSync.topics') || bidderIframeList;
+
   if (topics) {
     listenMessagesFromTopicIframe();
     const randomBidders = getRandomBidders(topics.bidders || [], topics.maxTopicCaller || 1)
-    randomBidders && randomBidders.forEach(({ bidder, iframeURL }) => {
+    randomBidders && randomBidders.forEach(({ bidder, iframeURL, fetchUrl, fetchRate }) => {
       if (bidder && iframeURL) {
         let ifrm = doc.createElement('iframe');
         ifrm.name = 'ifrm_'.concat(bidder);
@@ -227,6 +234,25 @@ export function loadTopicsForBidders(doc = document) {
         setLoadedIframeURL(new URL(iframeURL).origin);
         iframeURL && doc.documentElement.appendChild(ifrm);
       }
+
+      if (bidder && fetchUrl) {
+        let storedSegments = new Map(safeJSONParse(coreStorage.getDataFromLocalStorage(topicStorageName)));
+        const bidderLsEntry = storedSegments.get(bidder);
+
+        if (!bidderLsEntry || (bidderLsEntry && isCachedDataExpired(bidderLsEntry[lastUpdated], fetchRate || DEFAULT_FETCH_RATE_IN_DAYS))) {
+          window.fetch(`${fetchUrl}?bidder=${bidder}`, {browsingTopics: true})
+            .then(response => {
+              return response.json();
+            })
+            .then(data => {
+              if (data && data.segment && !isEmpty(data.segment.topics)) {
+                const {domain, topics, bidder} = data.segment;
+                const fetchTopicsData = getTopicsData(domain, topics);
+                fetchTopicsData && storeInLocalStorage(bidder, fetchTopicsData);
+              }
+            });
+        }
+      }
     })
   } else {
     logWarn(`Topics config not defined under userSync Object`);

package/modules/visxBidAdapter.js

@@ -3,6 +3,7 @@ import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { config } from '../src/config.js';
 import { BANNER, VIDEO } from '../src/mediaTypes.js';
 import { INSTREAM as VIDEO_INSTREAM } from '../src/video.js';
+import {getStorageManager} from '../src/storageManager.js';
 const BIDDER_CODE = 'visx';
 const GVLID = 154;
 const BASE_URL = 'https://t.visx.net';
@@ -29,6 +30,7 @@ const LOG_ERROR_MESS = {
   videoMissing: 'Bid request videoType property is missing - '
 };
 const currencyWhiteList = ['EUR', 'USD', 'GBP', 'PLN'];
+export const storage = getStorageManager({bidderCode: BIDDER_CODE});
 export const spec = {
   code: BIDDER_CODE,
   gvlid: GVLID,
@@ -117,10 +119,13 @@ export const spec = {
         ...(payloadSchain && { schain: payloadSchain })
       }
     };
+
+    const vads = _getUserId();
     const user = {
       ext: {
         ...(payloadUserEids && { eids: payloadUserEids }),
-        ...(payload.gdpr_consent && { consent: payload.gdpr_consent })
+        ...(payload.gdpr_consent && { consent: payload.gdpr_consent }),
+        ...(vads && { vads })
       }
     };
     const regs = ('gdpr_applies' in payload) && {
@@ -382,4 +387,49 @@ function _isAdSlotExists(adUnitCode) {
   return false;
 }
 
+// Generate user id (25 chars) with NanoID
+// https://github.com/ai/nanoid/
+function _generateUserId() {
+  for (
+    var t = 'useandom-26T198340PX75pxJACKVERYMINDBUSHWOLF_GQZbfghjklqvwyzrict',
+      e = new Date().getTime() % 1073741824,
+      i = '',
+      o = 0;
+    o < 5;
+    o++
+  ) {
+    i += t[e % 64];
+    e = Math.floor(e / 64);
+  }
+  for (o = 20; o--;) i += t[(64 * Math.random()) | 0];
+  return i;
+}
+
+function _getUserId() {
+  const USER_ID_KEY = '__vads';
+  let vads;
+
+  if (storage.cookiesAreEnabled()) {
+    vads = storage.getCookie(USER_ID_KEY);
+  } else if (storage.localStorageIsEnabled()) {
+    vads = storage.getDataFromLocalStorage(USER_ID_KEY);
+  }
+
+  if (vads && vads.length) {
+    return vads;
+  }
+
+  vads = _generateUserId();
+  if (storage.cookiesAreEnabled()) {
+    const expires = new Date(Date.now() + 2592e6).toUTCString();
+    storage.setCookie(USER_ID_KEY, vads, expires);
+    return vads;
+  } else if (storage.localStorageIsEnabled()) {
+    storage.setDataInLocalStorage(USER_ID_KEY, vads);
+    return vads;
+  }
+
+  return null;
+}
+
 registerBidder(spec);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prebid.js",
-  "version": "8.7.0",
+  "version": "8.9.0",
   "description": "Header Bidding Management Library",
   "main": "src/prebid.js",
   "scripts": {
@@ -132,7 +132,7 @@
     "express": "^4.15.4",
     "fun-hooks": "^0.9.9",
     "just-clone": "^1.0.2",
-    "live-connect-js": "^5.0.0"
+    "live-connect-js": "^6.0.0"
   },
   "optionalDependencies": {
     "fsevents": "^2.3.2"

package/src/adapters/bidderFactory.js

@@ -25,7 +25,7 @@ import {useMetrics} from '../utils/perfMetrics.js';
 import {isActivityAllowed} from '../activities/rules.js';
 import {activityParams} from '../activities/activityParams.js';
 import {MODULE_TYPE_BIDDER} from '../activities/modules.js';
-import {ACTIVITY_TRANSMIT_TID} from '../activities/activities.js';
+import {ACTIVITY_TRANSMIT_TID, ACTIVITY_TRANSMIT_UFPD} from '../activities/activities.js';
 
 /**
  * This file aims to support Adapters during the Prebid 0.x -> 1.x transition.
@@ -454,6 +454,15 @@ export const processBidderRequests = hook('sync', function (spec, bids, bidderRe
     onRequest(request);
 
     const networkDone = requestMetrics.startTiming('net');
+
+    function getOptions(defaults) {
+      const ro = request.options;
+      return Object.assign(defaults, ro, {
+        browsingTopics: ro?.hasOwnProperty('browsingTopics') && !ro.browsingTopics
+          ? false
+          : isActivityAllowed(ACTIVITY_TRANSMIT_UFPD, activityParams(MODULE_TYPE_BIDDER, spec.code))
+      })
+    }
     switch (request.method) {
       case 'GET':
         ajax(
@@ -463,10 +472,10 @@ export const processBidderRequests = hook('sync', function (spec, bids, bidderRe
             error: onFailure
           },
           undefined,
-          Object.assign({
+          getOptions({
             method: 'GET',
             withCredentials: true
-          }, request.options)
+          })
         );
         break;
       case 'POST':
@@ -477,11 +486,11 @@ export const processBidderRequests = hook('sync', function (spec, bids, bidderRe
             error: onFailure
           },
           typeof request.data === 'string' ? request.data : JSON.stringify(request.data),
-          Object.assign({
+          getOptions({
             method: 'POST',
             contentType: 'text/plain',
             withCredentials: true
-          }, request.options)
+          })
         );
         break;
       default:

package/src/adloader.js

@@ -26,6 +26,7 @@ const _approvedLoadExternalJSList = [
   'airgrid',
   'clean.io',
   'a1Media',
+  'geoedge',
 ]
 
 /**

package/src/ajax.js

@@ -1,99 +1,138 @@
-import { config } from './config.js';
-import { logMessage, logError, parseUrl, buildUrl, _each } from './utils.js';
+import {config} from './config.js';
+import {buildUrl, logError, parseUrl} from './utils.js';
 
-const XHR_DONE = 4;
+export const dep = {
+  fetch: window.fetch.bind(window),
+  makeRequest: (r, o) => new Request(r, o),
+  timeout(timeout, resource) {
+    const ctl = new AbortController();
+    let cancelTimer = setTimeout(() => {
+      ctl.abort();
+      logError(`Request timeout after ${timeout}ms`, resource);
+      cancelTimer = null;
+    }, timeout);
+    return {
+      signal: ctl.signal,
+      done() {
+        cancelTimer && clearTimeout(cancelTimer)
+      }
+    }
+  }
+}
+
+const GET = 'GET';
+const POST = 'POST';
+const CTYPE = 'Content-Type';
 
 /**
- * Simple IE9+ and cross-browser ajax request function
- * Note: x-domain requests in IE9 do not support the use of cookies
- *
- * @param url string url
- * @param callback {object | function} callback
- * @param data mixed data
- * @param options object
+ * transform legacy `ajax` parameters into a fetch request.
+ * @returns {Request}
  */
-export const ajax = ajaxBuilder();
-
-export function ajaxBuilder(timeout = 3000, {request, done} = {}) {
-  return function(url, callback, data, options = {}) {
-    try {
-      let x;
-      let method = options.method || (data ? 'POST' : 'GET');
-      let parser = document.createElement('a');
-      parser.href = url;
-
-      let callbacks = typeof callback === 'object' && callback !== null ? callback : {
-        success: function() {
-          logMessage('xhr success');
-        },
-        error: function(e) {
-          logError('xhr error', null, e);
-        }
-      };
+export function toFetchRequest(url, data, options = {}) {
+  const method = options.method || (data ? POST : GET);
+  if (method === GET && data) {
+    const urlInfo = parseUrl(url, options);
+    Object.assign(urlInfo.search, data);
+    url = buildUrl(urlInfo);
+  }
+  const headers = new Headers(options.customHeaders);
+  headers.set(CTYPE, options.contentType || 'text/plain');
+  const rqOpts = {
+    method,
+    headers
+  }
+  if (method !== GET && data) {
+    rqOpts.body = data;
+  }
+  if (options.withCredentials) {
+    rqOpts.credentials = 'include';
+  }
+  if (options.browsingTopics && isSecureContext) {
+    // the Request constructor will throw an exception if the browser supports topics
+    // but we're not in a secure context
+    rqOpts.browsingTopics = true;
+  }
+  return dep.makeRequest(url, rqOpts);
+}
 
-      if (typeof callback === 'function') {
-        callbacks.success = callback;
-      }
+/**
+ * Return a version of `fetch` that automatically cancels requests after `timeout` milliseconds.
+ *
+ * If provided, `request` and `done` should be functions accepting a single argument.
+ * `request` is invoked at the beginning of each request, and `done` at the end; both are passed its origin.
+ *
+ * @returns {function(*, {}?): Promise<Response>}
+ */
+export function fetcherFactory(timeout = 3000, {request, done} = {}) {
+  let fetcher = (resource, options) => {
+    let to;
+    if (timeout != null && options?.signal == null && !config.getConfig('disableAjaxTimeout')) {
+      to = dep.timeout(timeout, resource);
+      options = Object.assign({signal: to.signal}, options);
+    }
+    let pm = dep.fetch(resource, options);
+    if (to?.done != null) pm = pm.finally(to.done);
+    return pm;
+  };
 
-      x = new window.XMLHttpRequest();
+  if (request != null || done != null) {
+    fetcher = ((fetch) => function (resource, options) {
+      const origin = new URL(resource?.url == null ? resource : resource.url, document.location).origin;
+      let req = fetch(resource, options);
+      request && request(origin);
+      if (done) req = req.finally(() => done(origin));
+      return req;
+    })(fetcher);
+  }
+  return fetcher;
+}
 
-      x.onreadystatechange = function () {
-        if (x.readyState === XHR_DONE) {
-          if (typeof done === 'function') {
-            done(parser.origin);
-          }
-          let status = x.status;
-          if ((status >= 200 && status < 300) || status === 304) {
-            callbacks.success(x.responseText, x);
-          } else {
-            callbacks.error(x.statusText, x);
-          }
+function toXHR({status, statusText = '', headers, url}, responseText) {
+  let xml = 0;
+  return {
+    readyState: XMLHttpRequest.DONE,
+    status,
+    statusText,
+    responseText,
+    response: responseText,
+    responseType: '',
+    responseURL: url,
+    get responseXML() {
+      if (xml === 0) {
+        try {
+          xml = new DOMParser().parseFromString(responseText, headers?.get(CTYPE)?.split(';')?.[0])
+        } catch (e) {
+          xml = null;
+          logError(e);
         }
-      };
-
-      // Disabled timeout temporarily to avoid xhr failed requests. https://github.com/prebid/Prebid.js/issues/2648
-      if (!config.getConfig('disableAjaxTimeout')) {
-        x.ontimeout = function () {
-          logError('  xhr timeout after ', x.timeout, 'ms');
-        };
       }
+      return xml;
+    },
+    getResponseHeader: (header) => headers?.has(header) ? headers.get(header) : null,
+  }
+}
 
-      if (method === 'GET' && data) {
-        let urlInfo = parseUrl(url, options);
-        Object.assign(urlInfo.search, data);
-        url = buildUrl(urlInfo);
-      }
-
-      x.open(method, url, true);
-      // IE needs timeout to be set after open - see #1410
-      // Disabled timeout temporarily to avoid xhr failed requests. https://github.com/prebid/Prebid.js/issues/2648
-      if (!config.getConfig('disableAjaxTimeout')) {
-        x.timeout = timeout;
-      }
-
-      if (options.withCredentials) {
-        x.withCredentials = true;
-      }
-      _each(options.customHeaders, (value, header) => {
-        x.setRequestHeader(header, value);
-      });
-      if (options.preflight) {
-        x.setRequestHeader('X-Requested-With', 'XMLHttpRequest');
-      }
-      x.setRequestHeader('Content-Type', options.contentType || 'text/plain');
-
-      if (typeof request === 'function') {
-        request(parser.origin);
-      }
+/**
+ * attach legacy `ajax` callbacks to a fetch promise.
+ */
+export function attachCallbacks(fetchPm, callback) {
+  const {success, error} = typeof callback === 'object' && callback != null ? callback : {
+    success: typeof callback === 'function' ? callback : () => null,
+    error: (e, x) => logError('Network error', e, x)
+  };
+  fetchPm.then(response => response.text().then((responseText) => [response, responseText]))
+    .then(([response, responseText]) => {
+      const xhr = toXHR(response, responseText);
+      response.ok || response.status === 304 ? success(responseText, xhr) : error(response.statusText, xhr);
+    }, () => error('', toXHR({status: 0}, '')));
+}
 
-      if (method === 'POST' && data) {
-        x.send(data);
-      } else {
-        x.send();
-      }
-    } catch (error) {
-      logError('xhr construction', error);
-      typeof callback === 'object' && callback !== null && callback.error(error);
-    }
-  }
+export function ajaxBuilder(timeout = 3000, {request, done} = {}) {
+  const fetcher = fetcherFactory(timeout, {request, done});
+  return function (url, callback, data, options = {}) {
+    attachCallbacks(fetcher(toFetchRequest(url, data, options)), callback);
+  };
 }
+
+export const ajax = ajaxBuilder();
+export const fetch = fetcherFactory();