[fix] #1114 Remove peers with no endpoints

app/lib/dal/fileDAL.ts

@@ -566,6 +566,10 @@ export class FileDAL {
     return peer;
   }
 
+  async removePeerByPubkey(pubkey:string) {
+    return this.peerDAL.removePeerByPubkey(pubkey)
+  }
+
   async findAllPeersNEWUPBut(pubkeys:string[]) {
     const peers = await this.listAllPeers();
     return peers.filter((peer:DBPeer) => pubkeys.indexOf(peer.pubkey) == -1

app/lib/dal/sqliteDAL/PeerDAL.ts

@@ -101,6 +101,10 @@ export class PeerDAL extends AbstractSQLite<DBPeer> {
     return this.saveEntity(peer)
   }
 
+  removePeerByPubkey(pubkey:string) {
+    return this.exec('DELETE FROM peer WHERE pubkey LIKE \'' + pubkey + '\'')
+  }
+
   async removeAll() {
     await this.sqlDeleteAll()
   }

app/service/PeeringService.ts

@@ -9,7 +9,6 @@ import {dos2unix} from "../lib/common-libs/dos2unix"
 import {rawer} from "../lib/common-libs/index"
 import {Server} from "../../server"
 import {GlobalFifoPromise} from "./GlobalFifoPromise"
-import {server} from "../../test/integration/tools/toolbox"
 
 const util           = require('util');
 const _              = require('underscore');
@@ -109,7 +108,16 @@ export class PeeringService {
         thePeer.statusTS = sigTime;
         let found = await this.dal.getPeerOrNull(thePeer.pubkey);
         let peerEntityOld = PeerDTO.fromJSONObject(found || thePeer)
-        if(found){
+        if(!found && thePeerDTO.endpoints.length === 0){
+          throw 'Peer with zero endpoints that is not already known'
+        }
+        if(found && thePeerDTO.endpoints.length === 0){
+          // This peer is saying "I'm no more joinable"
+          // ==> Remove it from the database
+          await this.dal.removePeerByPubkey(thePeerDTO.pubkey)
+          return thePeerDTO
+        }
+        else if(found){
           // Already existing peer
           const sp2 = found.block.split('-');
           const previousBlockNumber = parseInt(sp2[0]);
@@ -193,8 +201,9 @@ export class PeeringService {
       block: '0-E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855',
       endpoints: []
     };
-    if (peers.length != 0 && peers[0]) {
-      p1 = _(peers[0]).extend({version: constants.DOCUMENTS_VERSION, currency: currency});
+    const currentSelfPeer = peers[0]
+    if (peers.length != 0 && currentSelfPeer) {
+      p1 = _(currentSelfPeer).extend({version: constants.DOCUMENTS_VERSION, currency: currency});
     }
     const localEndpoints = await this.server.getEndpoints()
     const otherPotentialEndpoints = this.getOtherEndpoints(p1.endpoints, localEndpoints)
@@ -211,6 +220,16 @@ export class PeeringService {
       logger.error('$ duniter restart');
       return new Promise(() => null);
     }
+    const endpointsToDeclare = localEndpoints.concat(toConserve).concat(this.conf.endpoints || [])
+    if (currentSelfPeer && endpointsToDeclare.length === 0 && currentSelfPeer.endpoints.length === 0) {
+      /*********************
+       * Conserver peer document
+       *********************/
+      return currentSelfPeer
+    } else {
+      /*********************
+       * Renew peer document
+       *********************/
       // Choosing next based-block for our peer record: we basically want the most distant possible from current
       let minBlock = current ? current.number - 30 : 0;
       if (p1) {
@@ -225,10 +244,13 @@ export class PeeringService {
         currency: currency,
         pubkey: this.selfPubkey,
         block: targetBlock ? [targetBlock.number, targetBlock.hash].join('-') : constants.PEER.SPECIAL_BLOCK,
-      endpoints: _.uniq(localEndpoints.concat(toConserve).concat(this.conf.endpoints || []))
+        endpoints: _.uniq(endpointsToDeclare)
       };
       const raw2 = dos2unix(PeerDTO.fromJSONObject(p2).getRaw());
-    logger.info('External access:', PeerDTO.fromJSONObject(p2).getURL())
+      const bmaAccess = PeerDTO.fromJSONObject(p2).getURL()
+      if (bmaAccess) {
+        logger.info('BMA access:', bmaAccess)
+      }
       logger.debug('Generating server\'s peering entry based on block#%s...', p2.block.split('-')[0]);
       p2.signature = await this.server.sign(raw2);
       p2.pubkey = this.selfPubkey;
@@ -247,7 +269,8 @@ export class PeeringService {
       if (signalTimeInterval) {
         logger.info("Next peering signal in %s min", signalTimeInterval / 1000 / 60)
       }
-    return selfPeer;
+      return selfPeer
+    }
   }
 
   private getOtherEndpoints(endpoints:string[], localEndpoints:string[]) {

test/integration/http_api.js

@@ -87,6 +87,8 @@ describe("HTTP API", function() {
     const b1 = yield commit({ time: now + 120 });
     yield server2.writeBlock(b0)
     yield server2.writeBlock(b1)
+    server.addEndpointsDefinitions(() => Promise.resolve('SOME_FAKE_ENDPOINT_P1'))
+    server2.addEndpointsDefinitions(() => Promise.resolve('SOME_FAKE_ENDPOINT_P2'))
     const p1 = yield server.PeeringService.generateSelfPeer(server.conf)
     yield server2.PeeringService.generateSelfPeer(server2.conf)
     yield server2.writePeer(p1)