Skip to content
This repository was archived by the owner on Jun 11, 2020. It is now read-only.

Commit c6a833e

Browse files
committed
fix: dont use 'this' in root anon function
License: MIT Signed-off-by: Jacob Heun <[email protected]>
1 parent 091f65c commit c6a833e

File tree

1 file changed

+14
-15
lines changed

1 file changed

+14
-15
lines changed

src/routes.js

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ module.exports = (config, http) => {
3131

3232
log('create new server', config)
3333

34-
this._peers = {}
34+
const _peers = {}
3535
const nonces = {}
3636

3737
const peersMetric = config.metrics ? new client.Gauge({ name: 'rendezvous_peers', help: 'peers online now' }) : fake.gauge
@@ -42,13 +42,10 @@ module.exports = (config, http) => {
4242
const joinsFailureTotal = config.metrics ? new client.Counter({ name: 'rendezvous_joins_total_failure', help: 'failed joins since server started' }) : fake.counter
4343
const joinsTotal = config.metrics ? new client.Counter({ name: 'rendezvous_joins_total', help: 'all joins since server started' }) : fake.counter
4444

45-
const getPeers = () => this._peers // it's a function because, and I'm not kidding, the value of that var is different for every peer that has joined
46-
const refreshMetrics = () => peersMetric.set(Object.keys(getPeers()).length)
47-
48-
this.peers = () => getPeers()
45+
const refreshMetrics = () => peersMetric.set(Object.keys(_peers).length)
4946

5047
function safeEmit (addr, event, arg) {
51-
const peer = getPeers()[addr]
48+
const peer = _peers[addr]
5249
if (!peer) {
5350
log('trying to emit %s but peer is gone', event)
5451
return
@@ -130,7 +127,7 @@ module.exports = (config, http) => {
130127

131128
function joinFinalize (socket, multiaddr, cb) {
132129
const log = getConfig().log.bind(getConfig().log, '[' + socket.id + ']')
133-
getPeers()[multiaddr] = socket
130+
_peers[multiaddr] = socket
134131
if (!socket.stopSendingPeersIntv) socket.stopSendingPeersIntv = {}
135132
joinsSuccessTotal.inc()
136133
refreshMetrics()
@@ -146,7 +143,7 @@ module.exports = (config, http) => {
146143
sendPeers()
147144

148145
function sendPeers () {
149-
const list = Object.keys(getPeers())
146+
const list = Object.keys(_peers)
150147
log(multiaddr, 'sending', (list.length - 1).toString(), 'peer(s)')
151148
list.forEach((mh) => {
152149
if (mh === multiaddr) {
@@ -167,14 +164,14 @@ module.exports = (config, http) => {
167164

168165
socket.stopSendingPeersIntv[multiaddr] = stopSendingPeers
169166

170-
const otherPeers = Object.keys(getPeers()).filter(mh => mh !== multiaddr)
167+
const otherPeers = Object.keys(_peers).filter(mh => mh !== multiaddr)
171168
cb(null, null, otherPeers)
172169
}
173170

174171
function leave (socket, multiaddr) {
175-
if (getPeers()[multiaddr] && getPeers()[multiaddr].id === socket.id) {
172+
if (_peers[multiaddr] && _peers[multiaddr].id === socket.id) {
176173
socket.log('leaving', multiaddr)
177-
delete getPeers()[multiaddr]
174+
delete _peers[multiaddr]
178175
socket.addrs = socket.addrs.filter(m => m !== multiaddr)
179176
if (socket.stopSendingPeersIntv[multiaddr]) {
180177
socket.stopSendingPeersIntv[multiaddr]()
@@ -186,8 +183,8 @@ module.exports = (config, http) => {
186183

187184
function disconnect (socket) {
188185
socket.log('disconnected')
189-
Object.keys(getPeers()).forEach((mh) => {
190-
if (getPeers()[mh].id === socket.id) {
186+
Object.keys(_peers).forEach((mh) => {
187+
if (_peers[mh].id === socket.id) {
191188
leave(socket, mh)
192189
}
193190
})
@@ -205,7 +202,7 @@ module.exports = (config, http) => {
205202
}
206203

207204
log(from, 'is dialing', to)
208-
const peer = getPeers()[to]
205+
const peer = _peers[to]
209206

210207
if (!peer) {
211208
dialsFailureTotal.inc()
@@ -226,5 +223,7 @@ module.exports = (config, http) => {
226223
})
227224
}
228225

229-
return this
226+
return {
227+
peers: () => _peers
228+
}
230229
}

0 commit comments

Comments
 (0)