Merge pull request #2 from joehand/well-known

add .well-known resolution

Author: Joe Hand

index.js

@@ -1,6 +1,8 @@
 var assert = require('assert')
 var stringKey = require('dat-encoding').toStr
 var nets = require('nets')
+var parseUrl = require('node-parse-url')
+var datDns = require('dat-dns')()
 var debug = require('debug')('dat-link-resolve')
 
 module.exports = resolve
@@ -22,30 +24,40 @@ function resolve (link, cb) {
 
   function lookup () {
     var url = link.indexOf('http') > -1 ? link : 'http://' + link
-
-    // TODO: if TLD, check .well-known first
-
-    debug('lookup()', url)
-    nets({ url: url, json: true }, function (err, resp, body) {
-      if (err) return cb(err)
-      if (resp.statusCode !== 200) return cb(body.message)
-
-      // first check if key is in header response
-      key = resp.headers['hyperdrive-key'] || resp.headers['dat-key']
-      if (key) {
-        debug('Received key from http header:', key)
-        return cb(null, key)
-      }
-
-      // else fall back to parsing the body
-      try {
-        key = stringKey(body.url)
-        debug('Received key via json:', key)
-        if (key) return cb(null, key)
-      } catch (e) {
-        cb(new Error(e))
-      }
-      cb(new Error('Unable to lookup key from http link.'))
+    var parsed = parseUrl(url)
+    debug('parsed url', parsed)
+    if (parsed.path && parsed.path !== '/') return resolveKey()
+
+    // If no path, check .well-known first
+    url = parsed.subdomain ? `${parsed.subdomain}.${parsed.domain}` : parsed.domain
+    datDns.resolveName(parsed.domain, function (err, key) {
+      if (key) return cb(null, key)
+      if (err) debug('datDns.resolveName() error', err)
+      resolveKey()
     })
+
+    function resolveKey () {
+      nets({ url: url, json: true }, function (err, resp, body) {
+        if (err) return cb(err)
+        if (resp.statusCode !== 200) return cb(body.message)
+
+        // first check if key is in header response
+        key = resp.headers['hyperdrive-key'] || resp.headers['dat-key']
+        if (key) {
+          debug('Received key from http header:', key)
+          return cb(null, key)
+        }
+
+        // else fall back to parsing the body
+        try {
+          key = stringKey(body.url)
+          debug('Received key via json:', key)
+          if (key) return cb(null, key)
+        } catch (e) {
+          cb(new Error(e))
+        }
+        cb(new Error('Unable to lookup key from http link.'))
+      })
+    }
   }
 }

package.json

@@ -25,8 +25,10 @@
     "test": "standard && tape test/*.js | tap-spec"
   },
   "dependencies": {
+    "dat-dns": "^1.1.0",
     "dat-encoding": "^4.0.2",
     "debug": "^2.6.6",
-    "nets": "^3.2.0"
+    "nets": "^3.2.0",
+    "node-parse-url": "^3.0.0"
   }
 }

test/index.js

@@ -14,7 +14,7 @@ var stringKeys = [
 ]
 
 test('resolve key without http', function (t) {
-  t.plan(3 * 7) // 5 tests for 7 keys
+  t.plan(3 * 7) // 3 tests for 7 keys
   stringKeys.forEach(function (key) {
     datResolve(key.key, function (err, newKey) {
       t.error(err, 'no error')
@@ -23,3 +23,11 @@ test('resolve key without http', function (t) {
     })
   })
 })
+
+test('resolve beaker browser', function (t) {
+  datResolve('beakerbrowser.com', function (err, key) {
+    t.error(err, 'no error')
+    t.ok(key, 'got key')
+    t.end()
+  })
+})