only new endpoint (#239)

Author: imnutz

STREAMING_INGESTION.md

@@ -2,11 +2,6 @@
 
 ## Configurations
 
-We introduce a new option to opt-in our new JavaScript endpoint, named `useNewJavaScriptEndpoint`, which has a `true` or `false` value.
-When you enable this option, you need to change the `host` configuration as well, so that it will point to our new endpoint
-
-:information_source: This new feature won't impact the server side cookie and the personalization features
-
 The `host` configuration will have the following values, depending on which environment you want to ingest data.
 
 - AP02 Region
@@ -21,16 +16,12 @@ The `host` configuration will have the following values, depending on which envi
 - EU01 Region
   - **eu01.records.in.treasuredata.com**
 
-When you opt-out of this feature by either setting the `useNewJavaScriptEndpoint` to `false` or not setting it, please make sure that
-you update the host to the old configuration, as mentioned in [this section](README.md#api)
-
 Example:
 
 ```javascript
   var foo = new Treasure({
     database: 'foo',
     writeKey: 'your_write_only_key',
-    useNewJavaScriptEndpoint: true,
     host: 'us01.records.in.treasuredata.com'
   });
 ```

bin/build.sh

@@ -6,7 +6,7 @@ ROOT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )/.." && pwd )"
 VERSION=$(cat $ROOT_DIR/package.json | jq -r '.version')
 HOST='in.treasuredata.com'
 DATABASE=""
-PATHNAME="/js/v3/event/"
+PATHNAME="/"
 GLOBAL="Treasure"
 FILENAME="td"
 TO_VERSION=$(echo $VERSION | sed 's/\.[-a-zA-Z0-9]*$//g')

lib/config.js

@@ -3,5 +3,5 @@ module.exports = {
   VERSION: '3.1.2',
   HOST: 'in.treasuredata.com',
   DATABASE: '',
-  PATHNAME: '/js/v3/event/'
+  PATHNAME: '/'
 }

lib/configurator.js

@@ -45,7 +45,6 @@ var defaultSSCCookieDomain = function () {
 exports.DEFAULT_CONFIG = {
   database: config.DATABASE,
   development: false,
-  useNewJavaScriptEndpoint: false,
   globalIdCookie: '_td_global',
   host: config.HOST,
   logging: true,
@@ -87,10 +86,6 @@ exports.configure = function configure (options) {
 
   validateOptions(this.client)
 
-  if (this.client.useNewJavaScriptEndpoint) {
-    this.client.pathname = '/'
-  }
-
   if (!this.client.endpoint) {
     this.client.endpoint = 'https://' + this.client.host + this.client.pathname
   }

lib/plugins/globalid.js

@@ -93,24 +93,17 @@ function fetchGlobalID (success, error, forceFetch, options) {
     options.sameSite = 'None'
   }
 
-  var url = 'https://' + this.client.host + '/js/v3/enable_global_id'
+  var url = 'https://' + this.client.host
   var requestHeaders = {}
-  var ignoreDefaultHeaders = false
 
-  if (this.client.useNewJavaScriptEndpoint) {
-    url = 'https://' + this.client.host
-
-    requestHeaders['Authorization'] = 'TD1 ' + this.client.writeKey
-    requestHeaders['User-Agent'] = navigator.userAgent
-    requestHeaders['Content-Type'] = misc.globalIdAdlHeaders['Content-Type']
-    requestHeaders['Accept'] = misc.globalIdAdlHeaders['Accept']
-    ignoreDefaultHeaders = true
-  }
+  requestHeaders['Authorization'] = 'TD1 ' + this.client.writeKey
+  requestHeaders['User-Agent'] = navigator.userAgent
+  requestHeaders['Content-Type'] = misc.globalIdAdlHeaders['Content-Type']
+  requestHeaders['Accept'] = misc.globalIdAdlHeaders['Accept']
 
   api.get(url,
     {
-      headers: requestHeaders,
-      ignoreDefaultHeaders: ignoreDefaultHeaders
+      headers: requestHeaders
     })
     .then(function (res) {
       var cachedId = cacheSuccess(res, cookieName, options)

lib/plugins/personalization.js

@@ -87,7 +87,6 @@ function fetchUserSegments (tokenOrConfig, successCallback, errorCallback) {
 
   api
     .get(url, {
-      ignoreDefaultHeaders: true,
       headers: {
         'Content-Type': 'application/json'
       }

lib/plugins/servercookie.js

@@ -59,9 +59,7 @@ function fetchServerCookie (success, error, forceFetch) {
     }, 0)
   }
 
-  api.get(url, {
-    ignoreDefaultHeaders: true
-  })
+  api.get(url)
     .then(function (res) {
       success(res.td_ssc_id)
     })

lib/plugins/track.js

@@ -296,12 +296,5 @@ exports.getTrackValues = function getTrackValues () {
     }
   })
 
-  if (!this.client.useNewJavaScriptEndpoint) {
-    result['td_ip'] = 'td_ip'
-    result['td_browser'] = 'td_browser'
-    result['td_browser_version'] = 'td_browser_version'
-    result['td_os'] = 'td_os'
-    result['td_os_version'] = 'td_os_version'
-  }
   return result
 }

lib/record.js

@@ -194,28 +194,20 @@ exports._sendRecord = function _sendRecord (request, success, error, blockedEven
 
   var requestHeaders = {}
   var payload
-  var ignoreDefaultHeaders = false
 
-  if (this.client.useNewJavaScriptEndpoint) {
-    requestHeaders['Authorization'] = 'TD1 ' + request.apikey
-    requestHeaders['User-Agent'] = navigator.userAgent
+  requestHeaders['Authorization'] = 'TD1 ' + request.apikey
+  requestHeaders['User-Agent'] = navigator.userAgent
 
-    if (this.isGlobalIdEnabled()) {
-      requestHeaders['Content-Type'] = misc.globalIdAdlHeaders['Content-Type']
-      requestHeaders['Accept'] = misc.globalIdAdlHeaders['Accept']
-    } else {
-      requestHeaders['Content-Type'] = misc.adlHeaders['Content-Type']
-      requestHeaders['Accept'] = misc.adlHeaders['Accept']
-    }
-
-    ignoreDefaultHeaders = true
-
-    payload = {
-      events: [request.record]
-    }
+  if (this.isGlobalIdEnabled()) {
+    requestHeaders['Content-Type'] = misc.globalIdAdlHeaders['Content-Type']
+    requestHeaders['Accept'] = misc.globalIdAdlHeaders['Accept']
   } else {
-    requestHeaders['X-TD-Write-Key'] = request.apikey
-    payload = request.record
+    requestHeaders['Content-Type'] = misc.adlHeaders['Content-Type']
+    requestHeaders['Accept'] = misc.adlHeaders['Accept']
+  }
+
+  payload = {
+    events: [request.record]
   }
 
   if (window.fetch && (this._windowBeingUnloaded || isClickedLink)) {
@@ -228,7 +220,6 @@ exports._sendRecord = function _sendRecord (request, success, error, blockedEven
           method: 'POST',
           keepalive: true,
           credentials: 'include',
-          ignoreDefaultHeaders: ignoreDefaultHeaders,
           headers: requestHeaders
         }
       )
@@ -240,7 +231,6 @@ exports._sendRecord = function _sendRecord (request, success, error, blockedEven
         url,
         payload,
         {
-          ignoreDefaultHeaders: ignoreDefaultHeaders,
           headers: requestHeaders
         }
       )

lib/utils/xhr.js

@@ -1,16 +1,10 @@
 // (C) Treasure Data 2020
 /* global XMLHttpRequest fetch */
 var win = require('global/window')
-var assign = require('./lodash').assign
 
 var OK_STATUS = 200
 var NOT_MODIFIED = 304
 
-var defaultHeaders = {
-  'Content-Type': 'application/json',
-  'X-TD-Fetch-Api': 'true'
-}
-
 var FETCH_CREDENTIALS = {
   'same-origin': 'same-origin',
   include: 'include',
@@ -33,26 +27,10 @@ function toJSON (text) {
   return result
 }
 
-function getHeaders (headers, ignoreDefaultHeaders) {
-  headers = headers || {}
-
-  if (ignoreDefaultHeaders) {
-    return assign({}, headers)
-  }
-
-  return assign({}, defaultHeaders, headers)
-}
-
 function isFetchSupported () {
   return 'fetch' in win
 }
 
-function isDefaultHeadersIgnored (options) {
-  options = options || {}
-
-  return options.ignoreDefaultHeaders || false
-}
-
 function getCredentials (options) {
   options = options || {}
 
@@ -66,7 +44,7 @@ function postWithFetch (url, body, options) {
 
   return fetch(url, {
     method: 'POST',
-    headers: getHeaders(headers, isDefaultHeadersIgnored(options)),
+    headers: headers,
     credentials: getCredentials(options),
     body: JSON.stringify(body)
   }).then(function (response) {
@@ -76,9 +54,7 @@ function postWithFetch (url, body, options) {
     return response.text()
   })
     .then(function (text) {
-      if (!text) return {}
-
-      return JSON.parse(text)
+      return toJSON(text)
     })
 }
 
@@ -89,7 +65,7 @@ function getWithFetch (url, options) {
 
   return fetch(url, {
     method: method,
-    headers: getHeaders(headers, isDefaultHeadersIgnored(options)),
+    headers: headers,
     credentials: getCredentials(options)
   })
     .then(function (response) {
@@ -100,9 +76,7 @@ function getWithFetch (url, options) {
       return response.text()
     })
     .then(function (text) {
-      if (!text) return {}
-
-      return JSON.parse(text)
+      return toJSON(text)
     })
 }
 
@@ -127,7 +101,6 @@ function createXHR (method, url, options) {
 
   xhr.withCredentials = Boolean(getCredentials(options))
 
-  headers = getHeaders(options.headers, isDefaultHeadersIgnored(options))
   var headerKey
   for (headerKey in headers) {
     if (headers.hasOwnProperty(headerKey)) {
@@ -150,10 +123,6 @@ function postWithTimeout (url, body, milliseconds, options) {
   if (window.AbortController) {
     var controller = new window.AbortController()
 
-    var headers = getHeaders(options.headers, isDefaultHeadersIgnored(options))
-
-    options.headers = headers
-
     var promise = window.fetch(url, Object.assign({}, options, {signal: controller.signal}))
     var timeoutId = setTimeout(function () {
       controller.abort()