fix #1

Author: abluchet

index.js

@@ -2,7 +2,7 @@ var axios = require('axios')
 var randomAccess = require('random-access-storage')
 var logger = require('./lib/logger')
 var isNode = require('./lib/is-node')
-var validUrl = require('./lib/valid-url')
+var {validUrl, prependUrlProtocol} = require('./lib/url')
 
 var defaultOptions = {
   responseType: 'arraybuffer',
@@ -12,10 +12,15 @@ var defaultOptions = {
 }
 
 var randomAccessHttp = function (filename, options) {
-  var url = options && options.url
+  if (!options) options = {}
+
+  var url = prependUrlProtocol(options.url)
+
+  if (!url) filename = prependUrlProtocol(filename)
   if (!filename || (!validUrl(filename) && !validUrl(url))) {
     throw new Error('Expect first argument to be a valid URL or a relative path, with url set in options')
   }
+
   var axiosConfig = Object.assign({}, defaultOptions)
   if (isNode) {
     var http = require('http')

lib/url.js

@@ -0,0 +1,22 @@
+var url = require('url')
+
+module.exports.validUrl = function (str) {
+  if (typeof str !== 'string') return false
+  var parsed = url.parse(str)
+  return ~['http:', 'https:'].indexOf(parsed.protocol)
+}
+
+module.exports.prependUrlProtocol = function (str) {
+  if (typeof str !== 'string') return false
+  var parsed = url.parse(str)
+
+  if (parsed.protocol === null) {
+    parsed.protocol = 'http:'
+    var parts = parsed.href.split('/')
+    parsed.slashes = true
+    parsed.hostname = parsed.host = parts[0]
+    parsed.pathname = parsed.path = parts.slice(1).join('/')
+  }
+
+  return url.format(parsed)
+}

lib/valid-url.js

@@ -1,5 +1,21 @@
 var test = require('tape')
-var validUrl = require('../lib/valid-url')
+var {validUrl, prependUrlProtocol} = require('../lib/url')
+
+test('prependUrlProtocol assumes http without path', (t) => {
+  t.same(prependUrlProtocol('example.com'), 'http://example.com')
+  t.end()
+})
+
+test('prependUrlProtocol assumes http with path', (t) => {
+  t.same(prependUrlProtocol('example.com/foo/bar.html'), 'http://example.com/foo/bar.html')
+  t.end()
+})
+
+test('prependUrlProtocol doesn\'t change protocol if given', (t) => {
+  t.same(prependUrlProtocol('https://example.com/foo/bar.html'), 'https://example.com/foo/bar.html')
+  t.same(prependUrlProtocol('ftp://example.com/foo/bar.html'), 'ftp://example.com/foo/bar.html')
+  t.end()
+})
 
 test('validUrl returns false if url is not a string', (t) => {
   t.notOk(validUrl())