Merge pull request #13142 from NejcZdovc/feature/#13139-twitch

Adds twitch support

app/browser/api/ledger.js

@@ -317,6 +317,7 @@ const getPublisherData = (result, scorekeeper) => {
     verified: result.options.verified || false,
     exclude: result.options.exclude || false,
     publisherKey: result.publisherKey,
+    providerName: result.providerName,
     siteName: result.publisherKey,
     views: result.visits,
     duration: duration,
@@ -1391,7 +1392,7 @@ const roundtrip = (params, options, callback) => {
     : typeof params.server !== 'undefined' ? params.server
       : typeof options.server === 'string' ? urlParse(options.server) : options.server
   const binaryP = options.binaryP
-  const rawP = binaryP || options.rawP
+  const rawP = binaryP || options.rawP || options.scrapeP
 
   if (!params.method) params.method = 'GET'
   parts = underscore.extend(underscore.pick(parts, ['protocol', 'hostname', 'port']),
@@ -2397,10 +2398,15 @@ const onMediaRequest = (state, xhr, type, tabId) => {
 
   const parsed = ledgerUtil.getMediaData(xhr, type)
   const mediaId = ledgerUtil.getMediaId(parsed, type)
+
+  if (mediaId == null) {
+    return state
+  }
+
   const mediaKey = ledgerUtil.getMediaKey(mediaId, type)
-  let duration = ledgerUtil.getMediaDuration(parsed, type)
+  let duration = ledgerUtil.getMediaDuration(state, parsed, mediaKey, type)
 
-  if (mediaId == null || duration == null || mediaKey == null) {
+  if (duration == null || mediaKey == null) {
     return state
   }
 
@@ -2420,9 +2426,14 @@ const onMediaRequest = (state, xhr, type, tabId) => {
     currentMediaKey = mediaKey
   }
 
+  const stateData = ledgerUtil.generateMediaCacheData(parsed, type)
   const cache = ledgerVideoCache.getDataByVideoId(state, mediaKey)
 
   if (!cache.isEmpty()) {
+    if (!stateData.isEmpty()) {
+      state = ledgerVideoCache.mergeCacheByVideoId(state, mediaKey, stateData)
+    }
+
     const publisherKey = cache.get('publisher')
     const publisher = ledgerState.getPublisher(state, publisherKey)
     if (!publisher.isEmpty() && publisher.has('providerName')) {
@@ -2434,6 +2445,10 @@ const onMediaRequest = (state, xhr, type, tabId) => {
     }
   }
 
+  if (!stateData.isEmpty()) {
+    state = ledgerVideoCache.setCacheByVideoId(state, mediaKey, stateData)
+  }
+
   const options = underscore.extend({roundtrip: module.exports.roundtrip}, clientOptions)
   const mediaProps = {
     mediaId,
@@ -2511,7 +2526,7 @@ const onMediaPublisher = (state, mediaKey, response, duration, revisited) => {
     .set('publisher', publisherKey)
 
   // Add to cache
-  state = ledgerVideoCache.setCacheByVideoId(state, mediaKey, cacheObject)
+  state = ledgerVideoCache.mergeCacheByVideoId(state, mediaKey, cacheObject)
 
   state = module.exports.saveVisit(state, publisherKey, {
     duration,

app/common/cache/ledgerVideoCache.js

@@ -33,7 +33,24 @@ const setCacheByVideoId = (state, key, data) => {
   return state.setIn(['cache', 'ledgerVideos', key], data)
 }
 
+const mergeCacheByVideoId = (state, key, data) => {
+  state = validateState(state)
+
+  if (key == null || data == null) {
+    return state
+  }
+
+  data = makeImmutable(data)
+
+  if (data.isEmpty()) {
+    return state
+  }
+
+  return state.mergeIn(['cache', 'ledgerVideos', key], data)
+}
+
 module.exports = {
   getDataByVideoId,
-  setCacheByVideoId
+  setCacheByVideoId,
+  mergeCacheByVideoId
 }

app/common/constants/ledgerMediaProviders.js

@@ -3,7 +3,8 @@
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 const providers = {
-  YOUTUBE: 'youtube'
+  YOUTUBE: 'youtube',
+  TWITCH: 'twitch'
 }
 
 module.exports = providers

app/common/constants/twitchEvents.js

@@ -0,0 +1,12 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+const events = {
+  MINUTE_WATCHED: 'minute-watched',
+  START: 'video-play',
+  PLAY_PAUSE: 'player_click_playpause',
+  SEEK: 'vod_seek'
+}
+
+module.exports = events