Fix bugs with viewing an archive consistently

client/js/pages/archive/index.js

@@ -21,6 +21,7 @@ const archivePage = (state, prev, send) => {
   var err = state.archive.error
   if (err) {
     if (err.message === 'Block not downloaded') err.message = 'timed out'
+    if (!module.parent) send('archive:getMetadata', {timeout: 60000})
     if (!state.archive.entries.length) {
       var props = ARCHIVE_ERRORS[err.message]
       if (props) {
@@ -36,7 +37,6 @@ const archivePage = (state, prev, send) => {
       err.message = 'Looking for dat.json metadata...'
     }
   }
-  if (!module.parent) send('archive:getMetadata', {timeout: 60000})
   var peers = Math.max(state.archive.peers - 1, 0) // we don't count
   var size = state.archive.size
   var meta = state.archive.metadata

server/dats.js

@@ -44,32 +44,33 @@ Dats.prototype.metadata = function (archive, opts, cb) {
 
   var timeout = setTimeout(function () {
     var msg = 'timed out'
-    if (cancelled) return
-    cancelled = true
-    return cb(new Error(msg), dat)
-  }, opts.timeout)
+    return done(new Error(msg), dat)
+  }, parseInt(opts.timeout))
 
   function done (err, dat) {
     clearTimeout(timeout)
     if (cancelled) return
     cancelled = true
     return cb(err, dat)
   }
+  archive.metadata.update()
   archive.tree.list('/', {nodes: true}, function (err, entries) {
     if (err) {
       return archive.metadata.update(function () {
+        if (cancelled) return
         cancelled = true
         self.metadata(archive, opts, cb)
       })
     }
+    if (cancelled) return done(null, dat)
+
     for (var i in entries) {
       var entry = entries[i]
       entries[i] = entry.value
       entries[i].name = entry.name
       entries[i].type = 'file'
     }
     dat.entries = entries
-    if (cancelled) return done(null, dat)
     var filename = 'dat.json'
     archive.stat(filename, function (err, entry) {
       if (err || cancelled) return done(null, dat)