Fix IP addresses being treated as Base64 (#102)

Author: eddiezane

package.json

@@ -17,7 +17,8 @@
   "dependencies": {
     "axios": "0.11.1",
     "form-data": "0.2.0",
-    "promise": "7.1.1"
+    "promise": "7.1.1",
+    "valid-url": "^1.0.9"
   },
   "devDependencies": {
     "babel-eslint": "^6.1.2",

src/constants.js

@@ -1,6 +1,5 @@
 const MAX_BATCH_SIZE = 128;
 const GEO_LIMIT_TYPES = ['withinMiles', 'withinKilometers', 'withinRadians', 'withinDegrees'];
-const URL_REGEX = /https?:\/\/(www\.)?[-a-zA-Z0-9@:%._\+~#=]{2,256}\.[a-z]{2,6}\b([-a-zA-Z0-9@:%_\+.~#?&//=]*)/i;
 const SYNC_TIMEOUT = 240000;
 const MODEL_QUEUED_FOR_TRAINING = '21103';
 const MODEL_TRAINING = '21101';
@@ -67,7 +66,6 @@ module.exports = {
   },
   GEO_LIMIT_TYPES,
   MAX_BATCH_SIZE,
-  URL_REGEX,
   SYNC_TIMEOUT,
   POLLTIME
 };

src/utils.js

@@ -1,5 +1,6 @@
 let Promise = require('promise');
-let {URL_REGEX, GEO_LIMIT_TYPES, ERRORS} = require('./constants');
+let validUrl = require('valid-url');
+let {GEO_LIMIT_TYPES, ERRORS} = require('./constants');
 let {checkType, clone} = require('./helpers');
 let {version: VERSION} = require('./../package.json');
 
@@ -86,7 +87,7 @@ module.exports = {
   formatMediaPredict: (data, type = 'image') => {
     let media;
     if (checkType(/String/, data)) {
-      if (URL_REGEX.test(data) === true) {
+      if (validUrl.isWebUri(data)) {
         media = {
           url: data
         };