[ENH] More thorough image parsing, guaranteed to return images, bump version to 1.2

Author: ospfranco

__tests__/index.spec.js

@@ -14,8 +14,8 @@ describe('link preview', () => {
     //   videos: undefined }
 
     expect(linkInfo.url).to.be.equal('https://www.youtube.com/watch?v=wuClZjOdT30');
-    expect(linkInfo.title).to.be.equal('Geography Now! Germany - YouTube');
-    expect(linkInfo.description).to.be.equal('Gluten free vegetarians beware. Watch at your own risk. We now have a Public mailbox! Feel free to send anything via mail! Our public mailbox address is: 190...');
+    expect(linkInfo.title).to.be.equal('Geography Now! Germany');
+    expect(linkInfo.description).to.be.ok();
     expect(linkInfo.mediaType).to.be.equal('video');
     expect(linkInfo.images.length).to.be.equal(1);
     expect(linkInfo.images[0]).to.be.equal('https://i.ytimg.com/vi/wuClZjOdT30/maxresdefault.jpg');
@@ -32,8 +32,8 @@ describe('link preview', () => {
     //   videos: undefined }
 
     expect(linkInfo.url).to.be.equal('https://www.youtube.com/watch?v=wuClZjOdT30');
-    expect(linkInfo.title).to.be.equal('Geography Now! Germany - YouTube');
-    expect(linkInfo.description).to.be.equal('Gluten free vegetarians beware. Watch at your own risk. We now have a Public mailbox! Feel free to send anything via mail! Our public mailbox address is: 190...');
+    expect(linkInfo.title).to.be.equal('Geography Now! Germany');
+    expect(linkInfo.description).to.be.ok();
     expect(linkInfo.mediaType).to.be.equal('video');
     expect(linkInfo.images.length).to.be.equal(1);
     expect(linkInfo.images[0]).to.be.equal('https://i.ytimg.com/vi/wuClZjOdT30/maxresdefault.jpg');

index.js

@@ -1,8 +1,9 @@
 /**
- * @providesModule react-native-link-preview
- */
+* @providesModule react-native-link-preview
+*/
 
 const cheerio = require('cheerio-without-node-native');
+const urlObj = require('url');
 
 import { REGEX_VALID_URL } from './constants';
 
@@ -84,11 +85,45 @@ export default class LinkPreview {
   }
 
   static _getImages(doc, rootUrl) {
-    const images = [];
-    const nodes = doc('meta[property=\'og:image\']');
+    let images = [],
+      nodes,
+      src,
+      dic;
+
+    nodes = doc('meta[property=\'og:image\']');
+
+    if (nodes.length) {
+      nodes.each((index, node) => {
+        src = node.attribs.content;
+        if (src) {
+          src = urlObj.resolve(rootUrl, src);
+          images.push(src);
+        }
+      });
+    }
 
-    if (nodes.length > 0) {
-      nodes.each((index, node) => { images.push(node.attribs.content); });
+    if (images.length <= 0) {
+      src = doc('link[rel=image_src]').attr('href');
+      if (src) {
+        src = urlObj.resolve(rootUrl, src);
+        images = [src];
+      } else {
+        nodes = doc('img');
+
+        if (nodes.length) {
+          dic = {};
+          images = [];
+          nodes.each((index, node) => {
+            src = node.attribs.src;
+            if (src && !dic[src]) {
+              dic[src] = 1;
+              // width = node.attribs.width;
+              // height = node.attribs.height;
+              images.push(urlObj.resolve(rootUrl, src));
+            }
+          });
+        }
+      }
     }
 
     return images;

package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-link-preview",
-  "version": "1.1.2",
+  "version": "1.2.0",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -14,7 +14,8 @@
   "peerDependencies": {},
   "repository": "https://github.com/ospfranco/react-native-link-preview",
   "dependencies": {
-    "cheerio-without-node-native": "^0.20.1"
+    "cheerio-without-node-native": "^0.20.1",
+    "url": "^0.11.0"
   },
   "devDependencies": {
     "babel-core": "^6.22.1",

yarn.lock

@@ -160,10 +160,6 @@ asynckit@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
 
-autolinker@^1.2.0:
-  version "1.4.2"
-  resolved "https://registry.yarnpkg.com/autolinker/-/autolinker-1.4.2.tgz#bbd43341ee199b3ee50c5b0c48614ca5b95f0f92"
-
 aws-sign2@~0.6.0:
   version "0.6.0"
   resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.6.0.tgz#14342dd38dbcc94d0e5b87d763cd63612c0e794f"
@@ -2730,6 +2726,10 @@ prr@~0.0.0:
   version "0.0.0"
   resolved "https://registry.yarnpkg.com/prr/-/prr-0.0.0.tgz#1a84b85908325501411853d0081ee3fa86e2926a"
 
+punycode@1.3.2:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d"
+
 punycode@^1.4.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
@@ -2738,6 +2738,10 @@ qs@~6.4.0:
   version "6.4.0"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.4.0.tgz#13e26d28ad6b0ffaa91312cd3bf708ed351e7233"
 
+querystring@0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620"
+
 randomatic@^1.1.3:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/randomatic/-/randomatic-1.1.6.tgz#110dcabff397e9dcff7c0789ccc0a49adf1ec5bb"
@@ -3202,6 +3206,13 @@ uglify-to-browserify@~1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz#6e0924d6bda6b5afe349e39a6d632850a0f882b7"
 
+url@^0.11.0:
+  version "0.11.0"
+  resolved "https://registry.yarnpkg.com/url/-/url-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1"
+  dependencies:
+    punycode "1.3.2"
+    querystring "0.2.0"
+
 user-home@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/user-home/-/user-home-2.0.0.tgz#9c70bfd8169bc1dcbf48604e0f04b8b49cde9e9f"