Remove asyncawait dependency from OrbitDB completely

src/OrbitDB.js

@@ -3,8 +3,6 @@
 const Lazy         = require('lazy.js');
 const EventEmitter = require('events').EventEmitter;
 const Promise      = require('bluebird');
-const async        = require('asyncawait/async');
-const await        = require('asyncawait/await');
 const logger       = require('orbit-common/lib/logger')("orbit-db.OrbitDB");
 const Log          = require('ipfs-log');
 const DBOperation  = require('./db/Operation');
@@ -38,30 +36,21 @@ class OrbitDB {
   }
 
   sync(channel, hash) {
-    console.log("--> Head:", hash)
+    // console.log("--> Head:", hash)
     if(hash && hash !== this.lastWrite && this._logs[channel]) {
       this.events[channel].emit('load', 'sync', channel);
       const oldCount = this._logs[channel].items.length;
       Log.fromIpfsHash(this._ipfs, hash).then((other) => {
         this._logs[channel].join(other).then(() => {
           // Only emit the event if something was added
-          const joinedCount = (this._logs[channel].items.length - oldCount);
+          const joinedCount = this._logs[channel].items.length - oldCount;
-          console.log("JOIN", joinedCount);
           if(joinedCount > 0) {
             this.events[channel].emit('sync', channel, hash);
             Cache.set(channel, hash);
-
             // Cache the payloads
-            const payloadHashes = other.items.map((f) => f.payload);
+            this._cacheOperations(other)
-            Promise.map(payloadHashes, (f) => {
+              .then(() => this.events[channel].emit('loaded', 'sync', channel))
-              return OrbitDB.fetchPayload(this._ipfs, f);
+              .catch((e) => this.events[channel].emit('error', e.message));
-            }, { concurrency: 1 }).then((r) => {
-              r.forEach((f) => this._cached.push(f));
-              this.events[channel].emit('loaded', 'sync', channel);
-            }).catch((e) => {
-              this.events[channel].emit('error', e.message);
-            });
-
           } else {
             this.events[channel].emit('loaded', 'sync', channel);
           }
@@ -82,17 +71,7 @@ class OrbitDB {
 
     if(!this._cached) this._cached = [];
 
-    const operations = Lazy(this._logs[channel].items)
+    const operations = Lazy(this._logs[channel].items);
-      // .map((f) => {
-      //   let res = Lazy(this._cached).findWhere({ hash: f.payload });
-      //   if(!res) {
-      //     const payload = await(OrbitDB.fetchPayload(this._ipfs, f.payload));
-      //     this._cached.push(payload);
-      //     res = payload;
-      //   }
-      //   return res;
-      // })
-
     const amount = opts.limit ? (opts.limit > -1 ? opts.limit : this._logs[channel].items.length) : 1; // Return 1 if no limit is provided
 
     let result = [];
@@ -101,13 +80,16 @@ class OrbitDB {
       // Key-Value, search latest key first
       result = this._read(operations.reverse(), opts.key, 1, true).map((f) => f.value);
     } else if(opts.gt || opts.gte) {
+      // console.log(1)
       // Greater than case
       result = this._read(operations, opts.gt ? opts.gt : opts.gte, amount, opts.gte ? opts.gte : false)
     } else {
+      // console.log(2)
       // Lower than and lastN case, search latest first by reversing the sequence
       result = this._read(operations.reverse(), opts.lt ? opts.lt : opts.lte, amount, opts.lte || !opts.lt).reverse()
     }
 
+    // console.log("++", result.toArray())
     if(opts.reverse) result.reverse();
     const res = result.toArray();
     // console.log("--> Found", res.length, "items");
@@ -145,6 +127,7 @@ class OrbitDB {
     // Last-Write-Wins, ie. use only the first occurance of the key
     let handled = [];
     const _createLWWSet = (item) => {
+      // console.log("-->", item, handled)
       if(Lazy(handled).indexOf(item.key) === -1) {
         handled.push(item.key);
         if(DBOperation.Types.isInsert(item.op))
@@ -154,9 +137,17 @@ class OrbitDB {
     };
 
     // Find the items from the sequence (list of operations)
+    // console.log("333", this._cached)
     return sequence
-      // .map((f) => await(OrbitDB.fetchPayload(this._ipfs, f.payload))) // IO - fetch the actual OP from ipfs. consider merging with LL.
+      .map((f) => Lazy(this._cached).find((e) => {
+        // console.log("e", e, f)
+        return e.hash === f.payload
+      }))
       .skipWhile((f) => key && f.key !== key) // Drop elements until we have the first one requested
+      .map((f) => {
+        // console.log("f", f, "key", key);
+        return f;
+      })
       .map(_createLWWSet) // Return items as LWW (ignore values after the first found)
       .compact() // Remove nulls
       .drop(inclusive ? 0 : 1) // Drop the 'gt/lt' item, include 'gte/lte' item
@@ -185,6 +176,19 @@ class OrbitDB {
     });
   }
 
+  // Cache DB operation entries in memory from a log
+  _cacheOperations(log) {
+    return new Promise((resolve, reject) => {
+      const payloadHashes = log.items.map((f) => f.payload);
+      Promise.map(payloadHashes, (f) => OrbitDB.fetchPayload(this._ipfs, f), { concurrency: 4 })
+        .then((payloads) => {
+          payloads.forEach((f) => this._cached.push(f));
+          resolve();
+        })
+        .catch(reject);
+    });
+  }
+
   static fetchPayload(ipfs, hash) {
     return new Promise((resolve, reject) => {
       ipfs.object.get(hash)

test/orbit-db.test.js

@@ -12,7 +12,7 @@ const OrbitDB    = require('../src/OrbitDB');
 const Log        = require('ipfs-log');
 
 // Mute logging
-// require('log4js').setGlobalLogLevel('ERROR');
+require('log4js').setGlobalLogLevel('ERROR');
 
 // Orbit
 const username = 'testrunner';
@@ -152,8 +152,6 @@ describe('OrbitDB', function() {
       }));
 
       it('doesn\'t emit \'sync\' event if items weren\'t merged', async((done) => {
-        const h1 = await(Log.getIpfsHash(ipfs, log));
-        console.log(h1, otherLogHash)
         db._logs[channel] = log;
         db.events[channel].on('sync', (channelName, hash) => {
           assert.equal(false, true);
@@ -165,7 +163,7 @@ describe('OrbitDB', function() {
     });
 
     describe('cache payloads', function() {
-      it('caches payloads', (done) => {
+      it('fetches payloads', (done) => {
         assert.equal(db._cached.length, 0);
         db.events[channel].on('loaded', (src, channelName) => {
           assert.equal(db._cached.length, 3);