Merge branch 'development'

index.js

@@ -28,13 +28,14 @@ class Group extends Base {
 
     this.masterKey = opts.masterKey || crypto.masterKey()
 
-    this.encryptionKey = opts.encryptionKey
-      ? crypto.encryptionKey(opts.encryptionKey)
-      : this._loadEncryptionKey() || crypto.encryptionKey()
-    assert(this._saveEncryptionKey(), 'Problem writing encryptionKey')
-
+    this.encryptionKey = crypto.encryptionKey(opts.encryptionKey)
     if (!crypto.isKey(this.encryptionKey)) throw new Error('invalid: encryption key format')
 
+    // this.encryptionKey = opts.encryptionKey
+    //   ? crypto.encryptionKey(opts.encryptionKey)
+    //   : this._loadEncryptionKey() || crypto.encryptionKey()
+    // assert(this._saveEncryptionKey(), 'Problem writing encryptionKey')
+
     var groupOpts = this.config.groups.get(this.address)
     this.name = opts.name || (groupOpts && groupOpts.name)
     this.db = {}
@@ -123,14 +124,41 @@ class Group extends Base {
     return location
   }
 
+  async ls (subdir = '/') {
+    assert(typeof subdir === 'string', 'Path must be a string')
+    assert(this.drive._isReady, 'Drive must be ready')
+
+    const files = await new Promise((resolve, reject) => {
+      this.drive.readdir(subdir, (err, files) => {
+        if (err) reject(err)
+        resolve(files)
+      })
+    })
+
+    const stats = await Promise.all(files.map((file) => {
+      return new Promise((resolve, reject) => {
+        this.drive.lstat(file, (err, statObj) => {
+          if (err) reject(err)
+          resolve(statObj)
+        })
+      })
+    }))
+
+    return stats.reduce((acc, cur, i) => {
+      acc[files[i]] = cur
+      return acc
+    }, {})
+  }
+
   save () {
     this.config.groups.set(this.address, {
       address: this.address,
-      // encryptionKey: this.encryptionKey,
+      encryptionKey: this.encryptionKey,
       name: this.name
     })
 
-    return this._saveEncryptionKey() && this.config.save()
+    // return this._saveEncryptionKey() && this.config.save()
+    return this.config.save()
   }
 
   // ------------------------------ PRIVATE FUNCTIONS ------------------------------
@@ -182,29 +210,29 @@ class Group extends Base {
     this.db.network.put(peer, payload, callback)
   }
 
-  _saveEncryptionKey () {
-    const encryptionKeyPath = path.join(this.config.root, 'groups', this.address.toString('hex'), 'encryption_key')
-    try {
-      if (!fs.existsSync(encryptionKeyPath)) {
-        mkdirp.sync(path.dirname(encryptionKeyPath))
-        fs.writeFileSync(encryptionKeyPath, this.encryptionKey, { mode: fs.constants.S_IRUSR })
-      }
-    } catch (err) {
-      return false
-    }
-    return true
-  }
-
-  _loadEncryptionKey () {
-    const encryptionKeyPath = path.join(this.config.root, 'groups', this.address.toString('hex'), 'encryption_key')
-    let encryptionKey
-    try {
-      encryptionKey = fs.readFileSync(encryptionKeyPath)
-    } catch (err) {
-      return false
-    }
-    return encryptionKey
-  }
+  // _saveEncryptionKey () {
+  //   const encryptionKeyPath = path.join(this.config.root, 'groups', this.address.toString('hex'), 'encryption_key')
+  //   try {
+  //     if (!fs.existsSync(encryptionKeyPath)) {
+  //       mkdirp.sync(path.dirname(encryptionKeyPath))
+  //       fs.writeFileSync(encryptionKeyPath, this.encryptionKey, { mode: fs.constants.S_IRUSR })
+  //     }
+  //   } catch (err) {
+  //     return false
+  //   }
+  //   return true
+  // }
+  //
+  // _loadEncryptionKey () {
+  //   const encryptionKeyPath = path.join(this.config.root, 'groups', this.address.toString('hex'), 'encryption_key')
+  //   let encryptionKey
+  //   try {
+  //     encryptionKey = fs.readFileSync(encryptionKeyPath)
+  //   } catch (err) {
+  //     return false
+  //   }
+  //   return encryptionKey
+  // }
 }
 
 function setupLevel (levelPath) {

test/index.test.js

@@ -37,37 +37,38 @@ describe('basic', (context) => {
     cleanup(storage, next)
   })
 
-  context('Group stores encryption key', (assert, next) => {
-    const config = Config(storage)
-    const address = crypto.address()
-    const encryptionKey = crypto.encryptionKey()
-    const group = Group(storage, address, { config, encryptionKey })
-    assert.ok(group, 'group loaded')
-    const encryptionKeyPath = path.join(config.root, 'groups', address.toString('hex'), 'encryption_key')
-    assert.equal(
-      fs.readFileSync(encryptionKeyPath).toString('hex'),
-      encryptionKey.toString('hex'),
-      'encryption key stored correctly'
-    )
-    cleanup(storage, next)
-  })
+  // context('Group stores encryption key', (assert, next) => {
+  //   const config = Config(storage)
+  //   const address = crypto.address()
+  //   const encryptionKey = crypto.encryptionKey()
+  //   const group = Group(storage, address, { config, encryptionKey })
+  //   assert.ok(group, 'group loaded')
+  //   const encryptionKeyPath = path.join(config.root, 'groups', address.toString('hex'), 'encryption_key')
+  //   assert.equal(
+  //     fs.readFileSync(encryptionKeyPath).toString('hex'),
+  //     encryptionKey.toString('hex'),
+  //     'encryption key stored correctly'
+  //   )
+  //   cleanup(storage, next)
+  // })
+  //
+  // context('Group loads encryption key', (assert, next) => {
+  //   const config = Config(storage)
+  //   const address = crypto.address()
+  //   const encryptionKey = crypto.encryptionKey()
+  //   const encryptionKeyPath = path.join(config.root, 'groups', address.toString('hex'), 'encryption_key')
+  //   mkdirp.sync(path.dirname(encryptionKeyPath))
+  //   fs.writeFileSync(encryptionKeyPath, encryptionKey, { mode: fs.constants.S_IRUSR })
+  //   const group = Group(storage, address, { config })
+  //   assert.ok(group, 'group loaded')
+  //   assert.equal(
+  //     group.encryptionKey.toString('hex'),
+  //     encryptionKey.toString('hex'),
+  //     'encryption key retrieved correctly'
+  //   )
+  //   cleanup(storage, next)
+  // })
 
-  context('Group loads encryption key', (assert, next) => {
-    const config = Config(storage)
-    const address = crypto.address()
-    const encryptionKey = crypto.encryptionKey()
-    const encryptionKeyPath = path.join(config.root, 'groups', address.toString('hex'), 'encryption_key')
-    mkdirp.sync(path.dirname(encryptionKeyPath))
-    fs.writeFileSync(encryptionKeyPath, encryptionKey, { mode: fs.constants.S_IRUSR })
-    const group = Group(storage, address, { config })
-    assert.ok(group, 'group loaded')
-    assert.equal(
-      group.encryptionKey.toString('hex'),
-      encryptionKey.toString('hex'),
-      'encryption key retrieved correctly'
-    )
-    cleanup(storage, next)
-  })
   context('returns a name', (assert, next) => {
     var config = Config(storage)
     var address = crypto.address()
@@ -169,6 +170,26 @@ describe('basic', (context) => {
       })
     })
   })
+
+  context('ls drive', (assert, next) => {
+    const config = Config(storage)
+    const address = crypto.address()
+    const group = Group(storage, address, { config })
+    assert.ok(group, 'group loaded')
+    group.ready(() => {
+      group.drive.writeFile('/hello.txt', 'world', (err) => {
+        assert.error(err, 'no error on writeFile')
+        group.ls().then((dirObj) => {
+          assert.equal(Object.keys(dirObj)[0], 'hello.txt', 'lists file')
+          assert.true(dirObj['hello.txt'].mtime > 10000, 'file has a timestamp')
+          cleanup(storage, next)
+        }, (err) => {
+          assert.error(err, 'no error')
+          cleanup(storage, next)
+        })
+      })
+    })
+  })
 })
 
 describe('connection', (context) => {
@@ -269,6 +290,7 @@ describe('connection', (context) => {
       }
     })
   })
+  
 })
 
 describe('replication', (context) => {

test/mock.js

@@ -61,6 +61,31 @@ class Group {
   save () {
     return true
   }
+
+  async ls (subdir) {
+    return {
+      'hello.txt': {
+        dev: 0,
+        nlink: 1,
+        rdev: 0,
+        blksize: 0,
+        ino: 0,
+        mode: 33188,
+        uid: 0,
+        gid: 0,
+        size: 45,
+        offset: 0,
+        byteOffset: 0,
+        blocks: 1,
+        atime: 1576081505941,
+        mtime: 1576081505923,
+        ctime: 1576081505923,
+        linkname: null,
+        mount: null,
+        metadata: {}
+      }
+    }
+  }
 }
 
 async function noop () {}