replaced internal isUrl with node module to resolve bug using IP address as sourceUrl

Author: John Doherty

lib/node-iframe-replacement.js

@@ -1,6 +1,7 @@
 'use strict';
 
-var cheerio = require('cheerio'),           // used to convert raw html into jQuery style object to we can use css selectors
+var isUrl = require('is-url'),              // module use to verify the sourceUrl is an actual URL
+    cheerio = require('cheerio'),           // used to convert raw html into jQuery style object to we can use css selectors
     request = require('request-promise'),   // promise based request object
     NodeCache = require( "node-cache" ),    // auto expiring in memory caching collection
     cache = new NodeCache({ stdTTL: 300 }); // cache source HTML for 5 minutes, after which we fetch a new version
@@ -77,7 +78,7 @@ function resolveTemplate(sourceUrl){
     return new Promise(function(resolve, reject){
 
         // if its a url and we have the contents in cache
-        if (sourceUrl.isUrl() && cache.get(sourceUrl)){
+        if (isUrl(sourceUrl) && cache.get(sourceUrl)){
 
             // get source html from cache
             var html = cache.get(sourceUrl);
@@ -88,7 +89,7 @@ function resolveTemplate(sourceUrl){
             // return source as a jquery style object
             resolve($);
         }
-        else if (sourceUrl.isUrl()){
+        else if (isUrl(sourceUrl)){
 
             // request the source url
             return request({ uri: sourceUrl }).then(function(html){
@@ -116,9 +117,4 @@ function resolveTemplate(sourceUrl){
             resolve(sourceUrl);
         }
     });
-}
-
-// helper function to allow us to determine if the template is a url
-String.prototype.isUrl = function(){ 
-    return /^http[s]?:\/\/([\w-]+\.)+[\w-]+([\w-./?%&=]*)?$/i.test(this);
-}
+};

package.json

@@ -33,10 +33,11 @@
   },
   "dependencies": {
     "cheerio": "^0.20.0",
-    "node-cache": "^3.2.1",
-    "request-promise": "^3.0.0",
     "express": "^4.14.0",
-    "express-handlebars": "^3.0.0"
+    "express-handlebars": "^3.0.0",
+    "is-url": "^1.2.2",
+    "node-cache": "^3.2.1",
+    "request-promise": "^3.0.0"
   },
   "devDependencies": {
     "jasmine-node": "^1.14.5",