Updated tests.

Fix some minor logic.

js/modules/loki_p2p_api.js

@@ -39,7 +39,7 @@ class LokiP2pAPI extends EventEmitter {
       isOnline: false,
     };
 
-    const contactExists = isEmpty(baseDetails);
+    const contactExists = !isEmpty(baseDetails);
     const { isOnline } = baseDetails;
     const detailsChanged =
       baseDetails.address !== address || baseDetails.port !== port;
@@ -70,7 +70,8 @@ class LokiP2pAPI extends EventEmitter {
   }
 
   getContactP2pDetails(pubKey) {
-    return this.contactP2pDetails[pubKey] || null;
+    if (!this.contactP2pDetails[pubKey]) return null;
+    return { ...this.contactP2pDetails[pubKey] };
   }
 
   isContactOnline(pubKey) {

libloki/test/node/loki_p2p_api_test.js

@@ -6,6 +6,14 @@ describe('LokiP2pAPI', () => {
   const usedAddress = 'anAddress';
   const usedPort = 'aPort';
 
+  const usedDetails = {
+    address: usedAddress,
+    port: usedPort,
+    timerDuration: 100,
+    pingTimer: null,
+    isOnline: false,
+  };
+
   beforeEach(() => {
     this.lokiP2pAPI = new LokiP2pAPI();
   });
@@ -14,79 +22,207 @@ describe('LokiP2pAPI', () => {
     this.lokiP2pAPI.reset();
   });
 
-  it("Should not emit a pingContact event if that contact doesn't exits", () => {
-    this.lokiP2pAPI.on('pingContact', () => {
-      assert.fail();
+  describe('getContactP2pDetails', () => {
+    it('Should return null if no contact details exist', () => {
+      const details = this.lokiP2pAPI.getContactP2pDetails(usedKey);
+      assert.isNull(details);
+    })
+
+    it('Should return the exact same object if contact details exist', () => {
+      this.lokiP2pAPI.contactP2pDetails[usedKey] = usedDetails;
+      const details = this.lokiP2pAPI.getContactP2pDetails(usedKey);
+      assert.deepEqual(details, usedDetails);
     });
-    this.lokiP2pAPI.pingContact('not stored');
   });
 
-  it('Should emit an online event if the contact is online', done => {
-    this.lokiP2pAPI.on('online', pubKey => {
-      assert.strictEqual(pubKey, usedKey);
-      done();
+  describe('pingContact', () => {
+    it("Should not emit a pingContact event if that contact doesn't exits", () => {
+      this.lokiP2pAPI.on('pingContact', () => {
+        assert.fail();
+      });
+      this.lokiP2pAPI.pingContact('not stored');
     });
-    this.lokiP2pAPI.updateContactP2pDetails(
-      usedKey,
-      usedAddress,
-      usedPort,
-      true
-    );
-  }).timeout(1000);
-
-  it("Should send a pingContact event if the contact isn't online", done => {
-    this.lokiP2pAPI.on('pingContact', pubKey => {
-      assert.strictEqual(pubKey, usedKey);
-      done();
-    });
-    this.lokiP2pAPI.updateContactP2pDetails(
-      usedKey,
-      usedAddress,
-      usedPort,
-      false
-    );
-  }).timeout(1000);
-
-  it('Should store a contacts p2p details', () => {
-    this.lokiP2pAPI.updateContactP2pDetails(
-      usedKey,
-      usedAddress,
-      usedPort,
-      true
-    );
-    const p2pDetails = this.lokiP2pAPI.getContactP2pDetails(usedKey);
-    assert.strictEqual(usedAddress, p2pDetails.address);
-    assert.strictEqual(usedPort, p2pDetails.port);
   });
 
-  it('Should say if a contact is online', () => {
-    this.lokiP2pAPI.updateContactP2pDetails(
-      usedKey,
-      usedAddress,
-      usedPort,
-      false
-    );
-    assert.isFalse(this.lokiP2pAPI.isOnline(usedKey));
-    this.lokiP2pAPI.updateContactP2pDetails(
-      usedKey,
-      usedAddress,
-      usedPort,
-      true
-    );
-    assert.isTrue(this.lokiP2pAPI.isOnline(usedKey));
-  });
+  describe('updateContactP2pDetails', () => {
+    it("Shouldn't ping a contact if contact exists, p2p message was sent, contact was online and details didn't change", () => {
+      this.lokiP2pAPI.on('pingContact', () => {
+        assert.fail();
+      });
+
+      // contact exists
+      const details = { ...usedDetails };
+      // P2p message
+      const isP2P = true;
+      // Contact was online
+      details.isOnline = true;
+      // details were the same
+      const { address, port } = details;
+
+      this.lokiP2pAPI.contactP2pDetails[usedKey] = details;
+      this.lokiP2pAPI.updateContactP2pDetails(
+        usedKey,
+        address,
+        port,
+        isP2P
+      );
+
+      // They should also be marked as online
+      assert.isTrue(this.lokiP2pAPI.isOnline(usedKey));
+    });
+
+    it("Should ping a contact if we don't have details for it", done => {
+      this.lokiP2pAPI.on('pingContact', pubKey => {
+        assert.strictEqual(pubKey, usedKey);
+        assert.isFalse(this.lokiP2pAPI.isContactOnline(usedKey));
+        done();
+      });
+      this.lokiP2pAPI.updateContactP2pDetails(
+        usedKey,
+        usedAddress,
+        usedPort,
+        true
+      );
+    });
+
+    it("Should ping a contact if a P2P message wasn't received", done => {
+      // The precondition for this is that we had the contact stored
+      this.lokiP2pAPI.contactP2pDetails[usedKey] = { ...usedDetails };
+
+      this.lokiP2pAPI.on('pingContact', pubKey => {
+        assert.strictEqual(pubKey, usedKey);
+        assert.isFalse(this.lokiP2pAPI.isContactOnline(usedKey));
+        done();
+      });
+      this.lokiP2pAPI.updateContactP2pDetails(
+        usedKey,
+        usedAddress,
+        usedPort,
+        false // We didn't get a p2p message
+      );
+    });
+
+    it('Should ping a contact if they were marked as offline', done => {
+      // The precondition for this is that we had the contact stored
+      // And that p2p message was true
+      this.lokiP2pAPI.contactP2pDetails[usedKey] = { ...usedDetails };
+
+      this.lokiP2pAPI.on('pingContact', pubKey => {
+        assert.strictEqual(pubKey, usedKey);
+        assert.isFalse(this.lokiP2pAPI.isContactOnline(usedKey));
+        done();
+      });
+      this.lokiP2pAPI.updateContactP2pDetails(
+        usedKey,
+        usedAddress,
+        usedPort,
+        true // We got a p2p message
+      );
+    });
 
-  it('Should set a contact as offline', () => {
-    this.lokiP2pAPI.updateContactP2pDetails(
-      usedKey,
-      usedAddress,
-      usedPort,
-      true
-    );
-    let p2pDetails = this.lokiP2pAPI.getContactP2pDetails(usedKey);
-    assert.isTrue(p2pDetails.isOnline);
-    p2pDetails = this.lokiP2pAPI.getContactP2pDetails(usedKey);
-    this.lokiP2pAPI.setContactOffline(usedKey);
-    assert.isFalse(p2pDetails.isOnline);
+    it('Should ping a contact if the address was different', done => {
+      // The precondition for this is that we had the contact stored
+      // And that p2p message was true
+      // And that the user was online
+      this.lokiP2pAPI.contactP2pDetails[usedKey] = { ...usedDetails };
+      this.lokiP2pAPI.contactP2pDetails[usedKey].isOnline = true;
+
+      this.lokiP2pAPI.on('pingContact', pubKey => {
+        assert.strictEqual(pubKey, usedKey);
+        done();
+      });
+      this.lokiP2pAPI.updateContactP2pDetails(
+        usedKey,
+        'different address',
+        usedPort,
+        true // We got a p2p message
+      );
+    });
+
+    it('Should ping a contact if the port was different', done => {
+      // The precondition for this is that we had the contact stored
+      // And that p2p message was true
+      // And that the user was online
+      this.lokiP2pAPI.contactP2pDetails[usedKey] = { ...usedDetails };
+      this.lokiP2pAPI.contactP2pDetails[usedKey].isOnline = true;
+
+      this.lokiP2pAPI.on('pingContact', pubKey => {
+        assert.strictEqual(pubKey, usedKey);
+        done();
+      });
+      this.lokiP2pAPI.updateContactP2pDetails(
+        usedKey,
+        usedAddress,
+        'different port',
+        true // We got a p2p message
+      );
+    });
+
+    it('Should emit an online event if the contact is online', done => {
+      this.lokiP2pAPI.on('online', pubKey => {
+        assert.strictEqual(pubKey, usedKey);
+        done();
+      });
+      this.lokiP2pAPI.contactP2pDetails[usedKey] = { ...usedDetails };
+      this.lokiP2pAPI.setContactOnline(usedKey);
+    }).timeout(1000);
+
+    it('Should store a contacts p2p details', () => {
+      this.lokiP2pAPI.updateContactP2pDetails(
+        usedKey,
+        usedAddress,
+        usedPort,
+        true
+      );
+      const p2pDetails = this.lokiP2pAPI.getContactP2pDetails(usedKey);
+      assert.strictEqual(usedAddress, p2pDetails.address);
+      assert.strictEqual(usedPort, p2pDetails.port);
+    });
+
+    it('Should establish a proper p2p connection', done => {
+      // We assume that when we pinged a contact then it was successful
+      let pingCount = 0;
+
+      this.lokiP2pAPI.on('pingContact', pubKey => {
+        pingCount += 1;
+        assert.strictEqual(pingCount, 1);
+        assert.strictEqual(pubKey, usedKey);
+        this.lokiP2pAPI.setContactOnline(pubKey);
+
+        // The second message should work and the user should be online
+        this.lokiP2pAPI.updateContactP2pDetails(
+          usedKey,
+          usedAddress,
+          usedPort,
+          true
+        );
+        assert.isTrue(this.lokiP2pAPI.isOnline(usedKey));
+        done()
+      });
+
+      // The first message should ping
+      this.lokiP2pAPI.updateContactP2pDetails(
+        usedKey,
+        usedAddress,
+        usedPort,
+        false
+      );
+      assert.isFalse(this.lokiP2pAPI.isOnline(usedKey));
+    }).timeout(2000);
+
+    it('Should set a contact as offline and online', () => {
+      this.lokiP2pAPI.contactP2pDetails[usedKey] = { ...usedDetails };
+      let p2pDetails = this.lokiP2pAPI.getContactP2pDetails(usedKey);
+      assert.isNotNull(p2pDetails);
+      assert.isFalse(p2pDetails.isOnline);
+      this.lokiP2pAPI.setContactOnline(usedKey);
+
+      p2pDetails = this.lokiP2pAPI.getContactP2pDetails(usedKey);
+      assert.isTrue(p2pDetails.isOnline);
+      this.lokiP2pAPI.setContactOffline(usedKey);
+
+      p2pDetails = this.lokiP2pAPI.getContactP2pDetails(usedKey);
+      assert.isFalse(p2pDetails.isOnline);
+    });
   });
 });