@@ -277,19 +277,19 @@ module.exports = function (ctx) {
277
277
} )
278
278
}
279
279
280
- const pollPeers = ( ) => {
280
+ const fetchPeers = ( ) => {
281
281
// If the daemon is running, send a request to retrieve the number
282
- // of connected peers. Emit 'peersPolled ' event upon retrieval.
282
+ // of connected peers. Emit 'peerCountFetched ' event upon retrieval.
283
283
if ( state . status === STATUS . STARTING_FINISHED && ctx . getIpfsd ) {
284
284
ctx . getIpfsd ( ) . then ( ( daemon ) => {
285
285
daemon . api . swarm . peers ( ) . then ( ( value ) => {
286
286
if ( value . length ) {
287
- ipcMain . emit ( 'peersPolled ' , value . length )
287
+ ipcMain . emit ( 'peerCountFetched ' , value . length )
288
288
}
289
289
} )
290
290
} )
291
291
} else {
292
- ipcMain . emit ( 'peersPolled ' , 0 )
292
+ ipcMain . emit ( 'peerCountFetched ' , 0 )
293
293
}
294
294
}
295
295
@@ -362,6 +362,12 @@ module.exports = function (ctx) {
362
362
}
363
363
}
364
364
365
+ ipcMain . on ( 'menubar-will-open' , ( ) => {
366
+ fetchPeers ( )
367
+ setupMenu ( )
368
+ updateMenu ( )
369
+ } )
370
+
365
371
ipcMain . on ( 'ipfsd' , status => {
366
372
state . status = status
367
373
updateMenu ( )
@@ -387,26 +393,21 @@ module.exports = function (ctx) {
387
393
updateMenu ( )
388
394
} )
389
395
390
- ipcMain . on ( 'peersPolled ' , peerCount => {
396
+ ipcMain . on ( 'peerCountFetched ' , peerCount => {
391
397
// When a new peer count is retrieved, rebuild the menu and update
392
398
// the tray tooltip with the new number if necessary.
393
399
if ( peerCount !== state . peerCount ) {
394
400
state . peerCount = peerCount
395
- menu = buildMenu ( ctx , state . peerCount )
396
- menu . on ( 'menu-will-show' , ( ) => { ipcMain . emit ( 'menubar-will-open' ) } )
397
- menu . on ( 'menu-will-close' , ( ) => { ipcMain . emit ( 'menubar-will-close' ) } )
398
- tray . setContextMenu ( menu )
399
401
tray . setToolTip ( state . peerCount . toString ( ) + ' ' + i18n . t ( 'peerCount' ) )
400
- updateMenu ( )
401
402
}
402
403
} )
403
404
404
405
ipcMain . on ( 'configUpdated' , ( ) => { updateMenu ( ) } )
405
406
ipcMain . on ( 'languageUpdated' , ( ) => { setupMenu ( ) } )
406
407
407
408
setupMenu ( )
408
- setInterval ( pollPeers , 60000 )
409
409
410
+ tray . on ( 'mouse-move' , ( ) => { fetchPeers ( ) } )
410
411
ctx . tray = tray
411
412
logger . info ( '[tray] started' )
412
413
}
0 commit comments