Merge pull request #8 from polarityio/develop

Add support for URLs without a leading scheme

config/config.js

@@ -23,8 +23,13 @@ module.exports = {
    * @type String
    * @optional
    */
-  description: 'Unshorten.me is a free service to Un-Shorten the URLs created by URL shortening services.',
-  entityTypes: ['url'],
+  description: 'Un-Shorten URLs created by URL shortening services using the unshorten.me API.',
+  customTypes: [
+    {
+      key: 'domain-url',
+      regex: /((https|http)?:\/\/)?([a-zA-Z0-9-]{1,256})\.([a-z]{2,10})\b([-a-zA-Z0-9@:%_\+.~#?&//=]*)/
+    }
+  ],
   defaultColor: 'light-gray',
   /**
    * Provide custom component logic and template for rendering the integration details block.  If you do not
@@ -58,7 +63,7 @@ module.exports = {
     ca: '',
     // An HTTP proxy to be used. Supports proxy Auth with Basic Auth, identical to support for
     // the url parameter (by embedding the auth info in the uri)
-    proxy: ""
+    proxy: ''
   },
   logging: {
     level: 'info' //trace, debug, info, warn, error, fatal

config/config.json

@@ -3,8 +3,13 @@
   "name": "Unshorten.me",
   "acronym": "UME",
   "onDemandOnly": true,
-  "description": "Unshorten.me is a free service to Un-Shorten the URLs created by URL shortening services.",
-  "entityTypes": ["url"],
+  "description": "Un-Shorten URLs created by URL shortening services using the unshorten.me API.",
+  "customTypes": [
+    {
+      "key": "domain-url",
+      "regex": "((https|http)?:\\\\/\\\\/)?([a-zA-Z0-9-]{1,256})\\\\.([a-z]{2,10})\\\\b([-a-zA-Z0-9@:%_\\\\+.~#?&//=]*)"
+    }
+  ],
   "defaultColor": "light-gray",
   "block": {
     "component": {
@@ -36,4 +41,4 @@
       "adminOnly": true
     }
   ]
-}
+}

integration.js

@@ -70,14 +70,7 @@ function _getUrlShortener(url) {
   let tokens = urlWithoutSchema.split('/');
 
   // If something goes wrong so just return an empty string
-  return tokens.length > 0 ? 
-    tokens[0]
-      .trim()
-      .toLowerCase() 
-      .split('.')
-      .slice(-2)
-      .join('.') : 
-    '';
+  return tokens.length > 0 ? tokens[0].trim().toLowerCase().split('.').slice(-2).join('.') : '';
 }
 
 function doLookup(entities, options, cb) {
@@ -128,8 +121,8 @@ function doLookup(entities, options, cb) {
 
     Logger.trace({ uri: requestOptions }, 'Request URI');
 
-    tasks.push(function(done) {
-      requestWithDefaults(requestOptions, function(error, res, body) {
+    tasks.push(function (done) {
+      requestWithDefaults(requestOptions, function (error, res, body) {
         if (error) {
           return done({
             detail: 'HTTP Request Error',

package.json

@@ -1,14 +1,14 @@
 {
   "name": "Unshorten.me",
-  "version": "3.0.5",
+  "version": "3.1.0",
   "main": "./integration.js",
   "private": true,
   "scripts": {
     "update:urls": "node -e \"require('./lib/update-lists').run()\""
   },
   "dependencies": {
-    "async": "^2.6",
+    "async": "^3.2.4",
     "node-schedule": "^1.3.2",
-    "postman-request": "^2.88.1-postman.31"
+    "postman-request": "^2.88.1-postman.33"
   }
-}
+}