WIP: Implement persistence leadership

sim/javascripts/index.js

@@ -66,9 +66,9 @@ async function init() {
   })
 
   let electionStart = Date.now()
-  network.on('leader removed', () => {
+  network.on('leader removed', p => {
     electionStart = Date.now()
-    infoBox.addMessage(null, 'Leader removed')
+    infoBox.addMessage(p, 'Leader removed', false)
   })
   network.on('leader elected', p => {
     const elapsed = (Date.now() - electionStart) / 1000

sim/javascripts/network.js

@@ -5,6 +5,7 @@ const DiasSet = require('../../src/common/dias-peer-set')
 const Membership = require('../../src/collaboration/membership')
 const { decode } = require('delta-crdts-msgpack-codec')
 const Color = require('./color')
+const Options = require('../../src/common/options')
 
 class Network extends EventEmitter {
   constructor(options) {
@@ -23,7 +24,7 @@ class Network extends EventEmitter {
       this.messages.set(id, { id, message, from, to, duration, start: Date.now() })
       this.emit('gossip send', id, message, from, to, duration)
       setTimeout(() => {
-        to.membership.deliverRemoteMembership(message[1])
+        to.membership.deliverGossipMessage(message)
         this.messages.delete(id)
         this.emit('gossip arrive', id, message, from, to, duration)
       }, duration)
@@ -70,6 +71,10 @@ class Network extends EventEmitter {
       name: 'my collab',
       typeName: 'rga'
     }
+    const replicationMock = {
+      sent() {},
+      received() {}
+    }
     const connectionManagerMock = Object.assign(new EventEmitter(), {
       start() {},
       stop() {}
@@ -79,7 +84,7 @@ class Network extends EventEmitter {
       peerInfo,
       b58: peerInfo.id.toB58String(),
       diasSet: DiasSet(this.options.peerIdByteCount, peerInfo, this.options.preambleByteCount),
-      membership: new Membership(ipfsMock, null, appMock, collaborationMock, null, null, Object.assign({}, this.options, {
+      membership: new Membership(ipfsMock, null, appMock, collaborationMock, null, null, null, Options.merge(this.options, {
         connectionManager: connectionManagerMock
       })),
       getMemberPeers() {
@@ -92,8 +97,8 @@ class Network extends EventEmitter {
         }))
       },
       getLeader() {
-        // return this.membership._leadership._leader
-        return (this.membership._leadership || {})._leader
+        const leadership = this.membership.leadership
+        return leadership && leadership.getLeader()
       },
       shutdown() {
         this.membership.stop()
@@ -119,10 +124,11 @@ class Network extends EventEmitter {
 
     setTimeout(async () => {
       await peer.membership.start()
-      // peer.membership._leadership.on('leader', () => {
-      //   this.emit('peer chose leader', peer)
-      //   this.checkLeaderElected()
-      // })
+      const leadership = peer.membership.leadership
+      leadership && leadership.on('leader', () => {
+        this.emit('peer chose leader', peer)
+        this.checkLeaderElected()
+      })
       peer.membership.on('changed', () => this.checkMembershipConverged())
       peer.running = true
       peer.log('started')
@@ -135,7 +141,7 @@ class Network extends EventEmitter {
     p.shutdown()
     this.peers = this.peers.filter(i => i !== p)
     this.emit('peer removed', p)
-    // this.checkLeaderRemoved(p)
+    this.checkLeaderRemoved(p)
   }
 
   checkMembershipConverged() {
@@ -168,7 +174,9 @@ class Network extends EventEmitter {
       if (p.getLeader() !== leader) return
     }
     this.leader = this.peers.find(p => p.b58 === leader)
-    this.emit('leader elected', this.leader)
+    if (leader) {
+      this.emit('leader elected', this.leader)
+    }
   }
 }
 

sim/javascripts/options.js

@@ -10,14 +10,16 @@ const OptionDefaults = {
   // These are specific to the simulator
   avgNetworkDelay: 400,
   avgPeerStartTime: 500,
-  initialPeerCount: 1
+  initialPeerCount: 1,
+  leadershipMaxIdleTickCount: 3
 }
 // Not configurable
 const options = {
   preambleByteCount: 2,
   peerIdByteCount: 32,
   nodeRadius: 10,
-  paddingY: 20
+  paddingY: 20,
+  leadershipEnabled: true
 }
 
 function localStorageKey(name) {