diff --git a/app/views/main/home/tabs/connections.jade b/app/views/main/home/tabs/connections.jade
index efaa4af0c79612de02492f8b4b0c8189eb2874e5..402fb5c35682f9375fa8c2c5b6a55c44849cc67a 100644
--- a/app/views/main/home/tabs/connections.jade
+++ b/app/views/main/home/tabs/connections.jade
@@ -13,17 +13,20 @@
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 }}
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 {{ peer.ws2pid }}
td {{ peer.uid }}
td INCOMING
td {{ peer.handle }}
diff --git a/public/templates.js b/public/templates.js
index ecc0035ec1f821e08f939a4fc80b95d16aa48786..b08d550f247ab0584bc518b8e791343388765985 100644
--- a/public/templates.js
+++ b/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>WS2PID</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.ws2pid }}</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.ws2pid }}</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("");
};
if (typeof define === 'function' && define.amd) {
define([], function() {
diff --git a/server/controller/webmin.js b/server/controller/webmin.js
index 997ba25dfc28b61bca5ad3d801cdcc5ba3bab904..87c8c60da7435ce8f020dca3fa726144acc111ba 100644
--- a/server/controller/webmin.js
+++ b/server/controller/webmin.js
@@ -696,10 +696,12 @@ function WebAdmin (duniterServer, startServices, stopServices, listDuniterUIPlug
function ws2pConnectionToJSON(connection) {
return co(function*() {
const pubkey = connection.pubkey
+ const ws2pid = connection.uuid
const member = yield duniterServer.dal.getWrittenIdtyByPubkey(pubkey)
if (connection.ws._socket.server) {
return {
pubkey: connection.pubkey,
+ ws2pid: connection.uuid,
uid: member ? member.uid : '',
handle: connection.ws._socket.server._connectionKey.split(':').slice(1).join(':')
}
@@ -707,6 +709,7 @@ function WebAdmin (duniterServer, startServices, stopServices, listDuniterUIPlug
else {
return {
pubkey: connection.pubkey,
+ ws2pid: connection.uuid,
uid: member ? member.uid : '',
handle: [connection.ws._socket.remoteAddress, connection.ws._socket.remotePort].join(':')
}