Expire peers +_protect namespace if already exists when creating

License: MIT
Signed-off-by: Victor Bjelkholm <[email protected]>

src/server/store/immutable/index.js

@@ -38,7 +38,13 @@ const setNamespaces = (store, value) => {
 
 // Creates a peer table within a store
 const createPeerTable = (store, name) => {
-  return setNamespaces(store, getNamespaces(store).set(name, Map({})))
+  // Check if namespace already exists
+  if (getNamespaces(store).get(name)) {
+    return store
+  } else {
+    // Didn't exists, let's create it with a empty Map
+    return setNamespaces(store, getNamespaces(store).set(name, Map({})))
+  }
 }
 
 // Adds a peer to a peer table within a namespace
@@ -82,7 +88,7 @@ const clearExpired = (store, peerTableName, currentTime) => {
     expiresAt.setSeconds(expiresAt.getSeconds() + v.get('ttl'))
 
     // Get amount of seconds diff with current time
-    const diffInSeconds = (receivedAt - expiresAt) / 1000
+    const diffInSeconds = (expiresAt - currentTime) / 1000
 
     // If it's less than zero, peer has expired and we should remove it
     if (diffInSeconds < 0) {

test/store.spec.js

@@ -71,7 +71,16 @@ describe('immutable store', () => {
     assertNumberOfNamespaces(store, 1)
     assertNumberOfPeers(store, 'my-app', 0)
   })
-  xit('add duplicate namespace wont clear existing peers')
+  it('add duplicate namespace wont clear existing peers', () => {
+    const peer = createPeer()
+    let store = createNamespace(createStore(), 'my-app')
+    store = addPeer(store, 'my-app', peer)
+    store = createNamespace(store, 'my-app')
+
+    assertRevisionNumber(store, 1)
+    assertNumberOfNamespaces(store, 1)
+    assertNumberOfPeers(store, 'my-app', 1)
+  })
   it('can add peer', () => {
     const peer = createPeer()
     let store = createNamespace(createStore(), 'my-app')
@@ -106,8 +115,8 @@ describe('immutable store', () => {
     const peer = createPeer()
     let store = createNamespace(createStore(), 'my-app')
     store = addPeer(store, 'my-app', peer)
-    const dateAfterExpired = new Date('2018-05-17T13:00:15.000Z')
-    store = clearExpired(store, 'my-app', dateAfterExpired)
+    const dateBeforeExpired = new Date('2018-05-17T13:00:00.000Z')
+    store = clearExpired(store, 'my-app', dateBeforeExpired)
 
     assertRevisionNumber(store, 1)
     assertNumberOfNamespaces(store, 1)