Add temporary DaemonDatArchive.getInfo() method

Author: pfrazee

crawler/util.js

@@ -53,7 +53,7 @@ exports.doCrawl = async function (archive, crawlSource, crawlDataset, crawlDatas
   }
 
   // fetch current archive version
-  var archiveInfo = {}// TODO await dat.library.getDaemon().getArchiveInfo(archive.key)
+  var archiveInfo = await archive.getInfo()
   var version = archiveInfo ? archiveInfo.version : 0
 
   // fetch change log

dat/daemon.js

@@ -23,6 +23,7 @@ const DAEMON_PORT = 3101
 * @prop {function(): Promise<void>} session.close
 * @prop {function(): Promise<void>} session.publish
 * @prop {function(): Promise<void>} session.unpublish
+* @prop {function(): Promise<Object>} getInfo
 * @prop {function(string, Object=, Function=): any} readFile
 * @prop {function(string, any, Object=, Function=): void} writeFile
 * @prop {function(string, Object=, Function=): void} readdir
@@ -108,6 +109,15 @@ exports.createDatArchiveSession = async function (opts) {
       }
     },
 
+    async getInfo () {
+      // TODO pull from daemon
+      return {
+        version: 0,
+        size: 0,
+        peers: 0,
+        networkStats: {}
+      }
+    },
     stat: (...args) => {
       // wrap the callback with a method which fixes the stat object output
       var cb = args.pop()

dat/debugging.js

@@ -17,9 +17,6 @@ exports.archivesDebugPage = function () {
             <tr><td>Content DKey</td><td>${a.content.discoveryKey.toString('hex')}</td></tr>
             <tr><td>Meta Key</td><td>${a.key.toString('hex')}</td></tr>
             <tr><td>Content Key</td><td>${a.content.key.toString('hex')}</td></tr>
-            ${a.replicationStreams.map((s, i) => `
-              <tr><td>Peer ${i}</td><td>${s.peerInfo.type} ${s.peerInfo.host}:${s.peerInfo.port}</td></tr>
-            `).join('')}
           </table>
         </div>`
   }).join('')}

dat/library.js

@@ -477,15 +477,13 @@ exports.queryArchives = async function queryArchives (query) {
   await Promise.all(archiveInfos.map(async (archiveInfo) => {
     var archive = getArchive(archiveInfo.key)
     if (archive) {
-      var info = {}//await daemon.getArchiveInfo(archiveInfo.key) TODO
+      var info = await archive.getInfo()
       archiveInfo.isSwarmed = archiveInfo.userSettings.networked
       archiveInfo.size = info.size
       archiveInfo.peers = info.peers
-      archiveInfo.peerHistory = info.peerHistory
     } else {
       archiveInfo.isSwarmed = false
       archiveInfo.peers = 0
-      archiveInfo.peerHistory = []
     }
   }))
   return isArray ? archiveInfos : archiveInfos[0]
@@ -501,7 +499,7 @@ exports.getArchiveInfo = async function getArchiveInfo (key) {
     archivesDb.getMeta(key),
     archivesDb.getUserSettings(0, key),
     archive.pda.readManifest().catch(_ => {}),
-    {} // TODO daemon.getArchiveInfo(key)
+    archive.getInfo()
   ])
   manifest = manifest || {}
   meta.key = key
@@ -522,8 +520,6 @@ exports.getArchiveInfo = async function getArchiveInfo (key) {
     previewMode: userSettings.previewMode
   }
   meta.peers = archiveInfo.peers
-  meta.peerInfo = archiveInfo.peerInfo
-  meta.peerHistory = archiveInfo.peerHistory
   meta.networkStats = archiveInfo.networkStats
 
   return meta

web-apis/bg/dat-archive.js

@@ -232,7 +232,7 @@ module.exports = {
       var reverse = opts.reverse === true
       var {start, end} = opts
       var {archive, checkoutFS, isPreview} = await lookupArchive(this.sender, url, opts)
-      var archiveInfo = {} // TODO await datLibrary.getDaemon().getArchiveInfo(archive.key)
+      var archiveInfo = await archive.getInfo()
 
       if (isPreview) {
         // dont use the checkout FS in previews, it has no history() api