[enh] ws2p head v2 nodes/typescript/duniter#1177

app/views/main/home/tabs/connections.jade

@@ -13,12 +13,14 @@
             thead
               tr
                 th Pubkey
+                th WS2PID
                 th Member
                 th Type
                 th Connection
             tbody
               tr(ng-repeat="peer in info.connections.level1 track by $index" ng-class="{ privileged: peer.privileged, prefered: peer.prefered }")
                 td {{ peer.pubkey.slice(0, 20) }}
+                td {{ peer.ws2pid }}
                 td {{ peer.uid }}
                 td OUTCOMING
                 td {{ peer.handle }}
@@ -35,17 +37,21 @@
           table.bordered.connections
             thead
               tr
+                th API
                 th Pubkey
                 th WS2PID
                 th Member
                 th HEAD
                 th Software
                 th Prefix
+                th Free Rooms
             tbody
               tr(ng-repeat="head in heads | orderBy:'-blockstamp' track by $index ")
+                td {{ head.api }}
                 td {{ head.pubkey.slice(0, 20) }}
                 td {{ head.ws2pId }}
                 td {{ head.uid }}
                 td {{ head.blockstamp.slice(0, 30) }}
                 td {{ head.software }} {{ head.softVersion }}
                 td {{ head.prefix }}
+                td {{ head.freeRooms }}
\ No newline at end of file

public/templates.js

@@ -533,7 +533,7 @@ var buf = [];
 var jade_mixins = {};
 var jade_interp;
 
-buf.push("<div class=\"container\"><div class=\"row\"><div class=\"col s12\"><div class=\"card\"><div class=\"card-action\"><div ng-if=\"searching\" class=\"center\"><div class=\"preloader-wrapper active\"><div class=\"spinner-layer spinner-blue-only\"><div class=\"circle-clipper left\"><div class=\"circle\"></div></div></div></div></div><h5 translate=\"home.tabs.connections.title.connections\"></h5><table class=\"bordered connections\"><thead><tr><th>Pubkey</th><th>Member</th><th>Type</th><th>Connection</th></tr></thead><tbody><tr ng-repeat=\"peer in info.connections.level1 track by $index\" ng-class=\"{ privileged: peer.privileged, prefered: peer.prefered }\"><td>{{ peer.pubkey.slice(0, 20) }}</td><td>{{ peer.uid }}</td><td>OUTCOMING</td><td>{{ peer.handle }}</td></tr><tr ng-repeat=\"peer in info.connections.level2 track by $index\" ng-class=\"{ privileged: peer.privileged, prefered: peer.prefered }\"><td>{{ peer.pubkey.slice(0, 20) }}</td><td>{{ peer.uid }}</td><td>INCOMING</td><td>{{ peer.handle }}</td></tr></tbody></table><div class=\"legend\"><h5 translate=\"home.tabs.connections.legend.title\"></h5><span translate=\"home.tabs.connections.legend.prefered\" class=\"prefered\"></span><span translate=\"home.tabs.connections.legend.privileged\" class=\"privileged\"></span></div><h5 translate=\"home.tabs.connections.title.network\"></h5><table class=\"bordered connections\"><thead><tr><th>Pubkey</th><th>WS2PID</th><th>Member</th><th>HEAD</th><th>Software</th><th>Prefix</th></tr></thead><tbody><tr ng-repeat=\"head in heads | orderBy:'-blockstamp' track by $index \"><td>{{ head.pubkey.slice(0, 20) }}</td><td>{{ head.ws2pId }}</td><td>{{ head.uid }}</td><td>{{ head.blockstamp.slice(0, 30) }}</td><td>{{ head.software }} {{ head.softVersion }}</td><td>{{ head.prefix }}</td></tr></tbody></table></div></div></div></div></div>");;return buf.join("");
+buf.push("<div class=\"container\"><div class=\"row\"><div class=\"col s12\"><div class=\"card\"><div class=\"card-action\"><div ng-if=\"searching\" class=\"center\"><div class=\"preloader-wrapper active\"><div class=\"spinner-layer spinner-blue-only\"><div class=\"circle-clipper left\"><div class=\"circle\"></div></div></div></div></div><h5 translate=\"home.tabs.connections.title.connections\"></h5><table class=\"bordered connections\"><thead><tr><th>Pubkey</th><th>Member</th><th>Type</th><th>Connection</th></tr></thead><tbody><tr ng-repeat=\"peer in info.connections.level1 track by $index\" ng-class=\"{ privileged: peer.privileged, prefered: peer.prefered }\"><td>{{ peer.pubkey.slice(0, 20) }}</td><td>{{ peer.uid }}</td><td>OUTCOMING</td><td>{{ peer.handle }}</td></tr><tr ng-repeat=\"peer in info.connections.level2 track by $index\" ng-class=\"{ privileged: peer.privileged, prefered: peer.prefered }\"><td>{{ peer.pubkey.slice(0, 20) }}</td><td>{{ peer.uid }}</td><td>INCOMING</td><td>{{ peer.handle }}</td></tr></tbody></table><div class=\"legend\"><h5 translate=\"home.tabs.connections.legend.title\"></h5><span translate=\"home.tabs.connections.legend.prefered\" class=\"prefered\"></span><span translate=\"home.tabs.connections.legend.privileged\" class=\"privileged\"></span></div><h5 translate=\"home.tabs.connections.title.network\"></h5><table class=\"bordered connections\"><thead><tr><th>API</th><th>Pubkey</th><th>WS2PID</th><th>Member</th><th>HEAD</th><th>Software</th><th>Prefix</th><th>Free Rooms</th></tr></thead><tbody><tr ng-repeat=\"head in heads | orderBy:'-blockstamp' track by $index \"><td>{{ head.api }}</td><td>{{ head.pubkey.slice(0, 20) }}</td><td>{{ head.ws2pId }}</td><td>{{ head.uid }}</td><td>{{ head.blockstamp.slice(0, 30) }}</td><td>{{ head.software }} {{ head.softVersion }}</td><td>{{ head.prefix }}</td><td>{{ head.freeRooms }}</td></tr></tbody></table></div></div></div></div></div>");;return buf.join("");
 };
 if (typeof define === 'function' && define.amd) {
   define([], function() {

server/controller/webmin.js

@@ -655,10 +655,14 @@ function WebAdmin (duniterServer, startServices, stopServices, listDuniterUIPlug
       const heads = yield server.ws2pCluster.getKnownHeads()
       for (const head of heads) {
         let posPubkey = 3;
-        // Gestion de l'ancien format
+        // Gestion des anciens formats
+        if (!head.message.match(/:2:/)) {
+          posPubkey = 3;
           if (!head.message.match(/:1:/)) {
             posPubkey = 2;
           }
+        }
+        
         const member = yield duniterServer.dal.getWrittenIdtyByPubkey(head.message.split(':')[posPubkey])
         head.uid = member && member.uid || ''
       }

server/lib/routes.js

@@ -157,10 +157,14 @@ module.exports = {
                         if (data.ws2p === 'heads') {
                           for (const head of data.added) {
                             let posPubkey = 3;
-                            // Gestion de l'ancien format
+                            // Gestion des anciens formats
+                            if (!head.message.match(/:2:/)) {
+                                posPubkey = 3;
                                 if (!head.message.match(/:1:/)) {
                                     posPubkey = 2;
                                 }
+                            }
+                            
                             const member = yield server.dal.getWrittenIdtyByPubkey(head.message.split(':')[posPubkey])
                             head.uid = member && member.uid || ''
                           }