moony/blinksocks
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

core: fix sequence between calling .on() and .init() of relay

Browse Source
This commit is contained in:
Micooz 2018-04-11 14:37:44 +08:00
parent 29375b2f48
commit 65dd04ca75
2 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/core/hub.js
View File

@ -332,19 +332,15 @@ export class Hub {
}
}
relay.init({ proxyRequest });
relay.on('_error', (err) => {
updateConnStatus('error', err.message);
});
relay.on('_connect', (targetAddress) => {
updateConnStatus('target', targetAddress);
});
relay.on('_error', (err) => updateConnStatus('error', err.message));
relay.on('_connect', (targetAddress) => updateConnStatus('target', targetAddress));
relay.on('_read', (size) => this._totalRead += size);
relay.on('_write', (size) => this._totalWritten += size);
relay.on('close', () => {
updateConnStatus('close');
this._tcpRelays.delete(relay.id);
});
relay.init({ proxyRequest });
this._tcpRelays.set(relay.id, relay);
};
@ -360,12 +356,8 @@ export class Hub {
this._updateConnStatus(event, sourceAddress, extra);
};
muxRelay = this._createRelay(context, true);
muxRelay.on('_error', (err) => {
updateConnStatus('error', err.message);
});
muxRelay.on('_connect', (targetAddress) => {
updateConnStatus('target', targetAddress);
});
muxRelay.on('_error', (err) => updateConnStatus('error', err.message));
muxRelay.on('_connect', (targetAddress) => updateConnStatus('target', targetAddress));
muxRelay.on('_read', (size) => this._totalRead += size);
muxRelay.on('_write', (size) => this._totalWritten += size);
muxRelay.on('close', () => {

2
src/core/relay.js
View File

@ -215,7 +215,7 @@ export class Relay extends EventEmitter {
// 1. update preset list
this.updatePresets(this.preparePresets([
...suite.presets,
{ 'name': 'auto-conf' }
{ 'name': 'auto-conf' },
]));
// 2. initialize newly created presets
const proxyRequest = this._proxyRequest;