Merge player with video, use extraction in helpers

Author: blakeembrey

package.json

@@ -60,7 +60,7 @@
     "arrify": "^1.0.1",
     "concat-stream": "^1.5.2",
     "content-type": "^1.0.2",
-    "exif-date": "^2.0.0",
+    "exif-date": "^2.0.1",
     "exiftool2": "0.0.4",
     "getvalue": "^1.1.0",
     "htmlmetaparser": "^1.2.0",

src/extract/helpers/icon-selector.ts

@@ -3,6 +3,7 @@ import { Icon } from 'htmlmetaparser'
 import { ScrapeResult, scrapeResponse } from '../../scrape'
 import { Snippet, ImageSnippet } from '../interfaces'
 import { Response, makeRequest as defaultMakeRequest } from '../../scrape/support'
+import { extract } from '../'
 
 export interface Options {
   preferredSize?: number
@@ -28,19 +29,8 @@ export default function (options: Options = {}) {
     if (icons.length === 0 && options.fallbackOnFavicon !== false) {
       const url = resolve(result.url, '/favicon.ico')
       const response = await makeRequest(url)
-      const { exifData } = await scrapeResponse(response)
-
-      if (!exifData) {
-        return snippet
-      }
-
-      const icon: ImageSnippet = {
-        type: 'image',
-        url,
-        width: exifData.ImageWidth,
-        height: exifData.ImageHeight,
-        encodingFormat: exifData.MIMEType
-      }
+      const iconResult = await scrapeResponse(response)
+      const icon = await extract(iconResult) as ImageSnippet
 
       return Object.assign(snippet, { icon })
     }

src/extract/helpers/image-size.ts

@@ -1,6 +1,7 @@
 import { scrapeResponse } from '../../scrape'
-import { Snippet } from '../interfaces'
+import { Snippet, ImageSnippet } from '../interfaces'
 import { Response, makeRequest as defaultMakeRequest } from '../../scrape/support'
+import { extract } from '../'
 
 export interface Options {
   makeRequest?: (url: string) => Promise<Response>
@@ -19,22 +20,11 @@ export default function (options: Options = {}) {
 
     snippet.image = await Promise.all(snippet.image.map(async (image) => {
       try {
-        const response = await makeRequest(image.secureUrl || image.url)
-        const { exifData } = await scrapeResponse(response)
+        const url = image.secureUrl || image.url
+        const response = await makeRequest(url)
+        const result = await scrapeResponse(response)
 
-        if (!exifData) {
-          return image // Skip when we failed to get exif data.
-        }
-
-        return {
-          type: 'image' as 'image',
-          url: image.url,
-          secureUrl: image.secureUrl,
-          caption: image.caption,
-          encodingFormat: exifData.MIMEType || image.encodingFormat,
-          width: exifData.ImageWidth || image.width,
-          height: exifData.ImageHeight || image.height
-        }
+        return await extract(result) as ImageSnippet
       } catch (e) {
         return image // Ignore bad requests.
       }

src/extract/interfaces.ts

@@ -21,14 +21,6 @@ export interface SnippetLocale {
   alternate?: string[]
 }
 
-export interface SnippetPlayer {
-  url: string
-  width: number
-  height: number
-  streamUrl?: string
-  streamContentType?: string
-}
-
 export interface SnippetTwitter {
   siteId?: string
   siteHandle?: string
@@ -82,7 +74,6 @@ export interface HtmlSnippet extends BaseSnippet {
   image?: ImageSnippet[]
   video?: VideoSnippet[]
   audio?: AudioSnippet[]
-  player?: SnippetPlayer
   headline?: string
   description?: string
   tags?: string[]

src/extract/snippet/html.ts

@@ -10,7 +10,6 @@ import {
   SnippetAppLink,
   SnippetApps,
   SnippetLocale,
-  SnippetPlayer,
   SnippetTwitter
 } from '../interfaces'
 
@@ -31,7 +30,6 @@ export default function (result: ScrapeResult): HtmlSnippet {
     image: getImage(result),
     video: getVideo(result),
     audio: getAudio(result),
-    player: getPlayer(result),
     entity: getEntity(result),
     url: result.url,
     canonicalUrl: getCanonicalUrl(result),
@@ -289,6 +287,22 @@ function getVideo (result: ScrapeResult): VideoSnippet[] {
     addVideos(ogpVideos, ogpSecureUrls, ogpTypes, ogpWidths, ogpHeights)
   }
 
+  if (getValue(result, ['twitter', 'card']) === 'player') {
+    const embedUrl = getValue(result, ['twitter', 'player'])
+    const width = toNumber(getValue(result, ['twitter', 'player:width']))
+    const height = toNumber(getValue(result, ['twitter', 'player:height']))
+    const url = getValue(result, ['twitter', 'player:stream'])
+    const encodingFormat = getValue(result, ['twitter', 'player:stream:content_type'])
+
+    if (embedUrl && width && height) {
+      addVideo({ type: 'video', url: embedUrl, encodingFormat: 'text/html', width, height })
+    }
+
+    if (url) {
+      addVideo({ type: 'video', url, encodingFormat, width, height })
+    }
+  }
+
   return videos
 }
 
@@ -531,35 +545,6 @@ function getTtl (result: ScrapeResult): number | undefined {
     toNumber(getValue(result, ['oembed', 'cache_age']))
 }
 
-/**
- * Retrieve a URL for embedding an interactive widget.
- */
-function getPlayer (result: ScrapeResult): SnippetPlayer | undefined {
-  const isPlayer = getValue(result, ['twitter', 'card']) === 'player'
-
-  if (!isPlayer) {
-    return
-  }
-
-  const url = getValue(result, ['twitter', 'player'])
-  const width = toNumber(getValue(result, ['twitter', 'player:width']))
-  const height = toNumber(getValue(result, ['twitter', 'player:height']))
-  const streamUrl = getValue(result, ['twitter', 'player:stream'])
-  const streamContentType = getValue(result, ['twitter', 'player:stream:content_type'])
-
-  if (url && width && height) {
-    return {
-      url,
-      width,
-      height,
-      streamUrl,
-      streamContentType
-    }
-  }
-
-  return
-}
-
 /**
  * Extract HTML page content types.
  */