distributed-drive 0.0.1 → 0.0.2

package/index.js

@@ -10,6 +10,7 @@ const { getEncoding } = require('./schema')
 const EntryResponse = getEncoding('@distributeddrive/entry-response')
 const ListResponse = getEncoding('@distributeddrive/list-response')
 const ReadRequest = getEncoding('@distributeddrive/read-request')
+const ReaddirResponse = getEncoding('@distributeddrive/readdir-response')
 
 const EMPTY = Buffer.alloc(0)
 const NOT_FOUND = { exists: false, entry: null }
@@ -18,6 +19,7 @@ const entryOpts = { requestEncoding: c.string, responseEncoding: EntryResponse }
 const getOpts = { requestEncoding: c.string }
 const readOpts = { requestEncoding: ReadRequest }
 const listOpts = { requestEncoding: c.string, responseEncoding: ListResponse }
+const readdirOpts = { requestEncoding: c.string, responseEncoding: ReaddirResponse }
 const invalidateOpts = { valueEncoding: c.string }
 
 class DistributedDrive extends ReadyResource {
@@ -188,6 +190,13 @@ class DistributedDrive extends ReadyResource {
     return null
   }
 
+  readdir(prefix) {
+    prefix = normalize(prefix || '/')
+    const rs = new Readable()
+    this._readdirInto(rs, prefix).catch((err) => rs.destroy(err))
+    return rs
+  }
+
   list(prefix, opts = {}) {
     prefix = normalize(prefix || '/')
     const rs = new Readable()
@@ -262,6 +271,42 @@ class DistributedDrive extends ReadyResource {
     rs.push(null)
   }
 
+  async _readdirInto(rs, prefix) {
+    const seen = new Set()
+
+    for (const drive of this.drives) {
+      try {
+        for await (const name of drive.readdir(prefix)) {
+          if (seen.has(name)) continue
+          seen.add(name)
+          rs.push(name)
+        }
+      } catch (err) {
+        safetyCatch(err)
+      }
+    }
+
+    const promises = [...this._peers].map((peer) =>
+      peer.rpcReaddir(prefix).catch((err) => {
+        safetyCatch(err)
+        return []
+      })
+    )
+
+    const results = await Promise.all(promises)
+
+    for (const names of results) {
+      if (!names) continue
+      for (const name of names) {
+        if (seen.has(name)) continue
+        seen.add(name)
+        rs.push(name)
+      }
+    }
+
+    rs.push(null)
+  }
+
   async _fanout(method, path) {
     const results = []
 
@@ -294,6 +339,7 @@ class Peer {
     this.rpc.respond('get', getOpts, (path) => this._onGet(path))
     this.rpc.respond('read', readOpts, (req) => this._onRead(req))
     this.rpc.respond('list', listOpts, (prefix) => this._onList(prefix))
+    this.rpc.respond('readdir', readdirOpts, (prefix) => this._onReaddir(prefix))
     this.rpc.respond('invalidate', invalidateOpts, (path) => this._onInvalidate(path))
   }
 
@@ -357,6 +403,25 @@ class Peer {
     return { entries }
   }
 
+  async _onReaddir(prefix) {
+    const names = []
+    const seen = new Set()
+
+    for (const drive of this.drive.drives) {
+      try {
+        for await (const name of drive.readdir(prefix)) {
+          if (seen.has(name)) continue
+          seen.add(name)
+          names.push(name)
+        }
+      } catch (err) {
+        safetyCatch(err)
+      }
+    }
+
+    return { names }
+  }
+
   async _onInvalidate(path) {
     this.drive._stale.add(path)
   }
@@ -386,6 +451,11 @@ class Peer {
     return response.entries
   }
 
+  async rpcReaddir(prefix) {
+    const response = await this.rpc.request('readdir', prefix, readdirOpts)
+    return response.names
+  }
+
   invalidate(path) {
     this.rpc.event('invalidate', path, invalidateOpts)
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "distributed-drive",
-  "version": "0.0.1",
+  "version": "0.0.2",
   "description": "Drive-compatible unified view across multiple peers and drives over RPC",
   "main": "index.js",
   "imports": {

package/schema/index.js

@@ -1,12 +1,12 @@
 // This file is autogenerated by the hyperschema compiler
-// Schema Version: 2
+// Schema Version: 3
 /* eslint-disable camelcase */
 /* eslint-disable quotes */
 /* eslint-disable space-before-function-paren */
 
 const { c } = require('hyperschema/runtime')
 
-const VERSION = 2
+const VERSION = 3
 
 // eslint-disable-next-line no-unused-vars
 let version = VERSION
@@ -170,6 +170,26 @@ const encoding5 = {
   }
 }
 
+// @distributeddrive/readdir-response.names
+const encoding6_0 = c.array(c.string)
+
+// @distributeddrive/readdir-response
+const encoding6 = {
+  preencode(state, m) {
+    encoding6_0.preencode(state, m.names)
+  },
+  encode(state, m) {
+    encoding6_0.encode(state, m.names)
+  },
+  decode(state) {
+    const r0 = encoding6_0.decode(state)
+
+    return {
+      names: r0
+    }
+  }
+}
+
 function setVersion(v) {
   version = v
 }
@@ -205,6 +225,8 @@ function getEncoding(name) {
       return encoding4
     case '@distributeddrive/read-request':
       return encoding5
+    case '@distributeddrive/readdir-response':
+      return encoding6
     default:
       throw new Error('Encoder not found ' + name)
   }

package/schema/schema.json

@@ -1,5 +1,5 @@
 {
-  "version": 2,
+  "version": 3,
   "schema": [
     {
       "name": "blob",
@@ -141,6 +141,21 @@
           "version": 2
         }
       ]
+    },
+    {
+      "name": "readdir-response",
+      "namespace": "distributeddrive",
+      "compact": false,
+      "flagsPosition": -1,
+      "fields": [
+        {
+          "name": "names",
+          "required": true,
+          "array": true,
+          "type": "string",
+          "version": 3
+        }
+      ]
     }
   ]
 }