use parse dat url, closes #11

Author: joehand

.travis.yml

@@ -1,8 +1,9 @@
 language: node_js
 node_js:
-  - '6'
   - '8'
   - '10'
+  - 'latest'
+  - 'lts/*'
 cache:
   directories:
     - node_modules

index.js

@@ -1,6 +1,7 @@
 const assert = require('assert')
 const stringKey = require('dat-encoding').toStr
 const get = require('simple-get')
+const parseUrl = require('parse-dat-url')
 const datDns = require('dat-dns')()
 const debug = require('debug')('dat-link-resolve')
 
@@ -14,6 +15,7 @@ function resolve (link) {
   try {
     // validates + removes dat://
     // also works for http urls with keys in them
+
     key = stringKey(link)
   } catch (e) { } // needs lookup
 
@@ -28,29 +30,17 @@ function resolve (link) {
 
   function lookup () {
     return new Promise((resolve, reject) => {
-      // if it starts with http or dat: use as is, otherwise prepend http://
-      const urlLink = (link.indexOf('http') && link.indexOf('dat:')) ? ('http://' + link) : link
-
-      function resolveName () {
-        debug('resolveName', urlLink)
-        datDns.resolveName(urlLink).then((key) => {
-          debug('resolved', key)
-          if (key) return resolve(key)
-        }).catch((err) => {
-          if (err) debug('datDns.resolveName() error')
-          reject(err)
-        })
-      }
+      const urlp = parseUrl(link)
 
-      debug('resolveKey', link, urlLink)
+      debug('resolveKey', link, urlp)
       get({
-        url: urlLink.replace('dat://', 'http://'),
+        url: `https://${urlp.host}${urlp.path}`,
         json: true,
         timeout: 1500
       }, function (err, resp, body) {
-        // no ressource at given URL
+        // no resource at given URL
         if (err || resp.statusCode !== 200) {
-          return resolveName()
+          return resolveDns()
         }
 
         // first check if key is in header response
@@ -65,11 +55,21 @@ function resolve (link) {
           key = stringKey(body.url)
           debug('Received key via json:', key, typeof body, body && typeof body.url)
           if (key) resolve(key)
-        } catch (e) {
-          // fall back to datDns
-          resolveName()
-        }
+        } catch (e) { }
+        // fall back to datDns
+        resolveDns()
       })
+
+      async function resolveDns () {
+        debug('resolveDns', urlp.host)
+        try {
+          key = await datDns.resolveName(urlp.host)
+          resolve(key)
+        } catch (err) {
+          if (err) debug('datDns.resolveName() error')
+          reject(err)
+        }
+      }
     })
   }
 }

package.json

@@ -27,6 +27,7 @@
     "dat-dns": "^3.2.1",
     "dat-encoding": "^5.0.1",
     "debug": "^4.1.1",
+    "parse-dat-url": "^3.0.1",
     "simple-get": "^3.0.3"
   }
 }

test/index.js

@@ -48,6 +48,26 @@ test('resolve dat hostname with path', async function (t) {
   t.end()
 })
 
+test('resolve dat hostname with path and version', async function (t) {
+  try {
+    const newKey = await datResolve('dat://beakerbrowser.com/path+5')
+    t.ok(newKey, 'is a key')
+  } catch (err) {
+    t.err(err, 'not expected error')
+  }
+  t.end()
+})
+
+test('resolve dat hostname with version', async function (t) {
+  try {
+    const newKey = await datResolve('dat://beakerbrowser.com+5')
+    t.ok(newKey, 'is a key')
+  } catch (err) {
+    t.err(err, 'not expected error')
+  }
+  t.end()
+})
+
 test('resolve hostname with path', async function (t) {
   try {
     const newKey = await datResolve('beakerbrowser.com/path')