From 331952a8f5825a9cb965079cfb07d87b10c24df3 Mon Sep 17 00:00:00 2001 From: coderaiser Date: Tue, 2 Oct 2018 13:11:51 +0300 Subject: [PATCH] chore(distribute) rm apply --- server/distribute/export.js | 6 +++++- server/distribute/import.js | 29 +++++++++++++++++------------ 2 files changed, 22 insertions(+), 13 deletions(-) diff --git a/server/distribute/export.js b/server/distribute/export.js index 504ca8ee..bebe8905 100644 --- a/server/distribute/export.js +++ b/server/distribute/export.js @@ -45,7 +45,11 @@ module.exports = (socket) => { const prefix = config('prefix'); const distributePrefix = `${prefix}/distribute`; - const onError = squad(logWraped(exportStr), getMessage); + const onError = squad( + logWraped(exportStr), + getMessage, + ); + const onConnectError = squad(logWraped(exportStr), getDescription); socket.of(distributePrefix) diff --git a/server/distribute/import.js b/server/distribute/import.js index f0af9477..7888d5c5 100644 --- a/server/distribute/import.js +++ b/server/distribute/import.js @@ -61,8 +61,6 @@ const emitAuth = wraptile((importUrl, socket) => { socket.emit('auth', config('importToken')); }); -const apply = (fn, args) => fn.apply(null, args); - module.exports = (options, fn) => { fn = fn || options; @@ -92,30 +90,30 @@ module.exports = (options, fn) => { const statusStore = fullstore(); const statusStoreWraped = wraptile(statusStore); - const onConfig = apply(squad, [ + const onConfig = squad( close, logWraped(importStr, `config received from ${colorUrl}`), statusStoreWraped('received'), forEachKey(config), - ]); + ); - const onError = apply(squad, [ + const onError = squad( superFn('error'), logWraped(importStr), addUrl(colorUrl), getMessage, - ]); + ); - const onConnectError = apply(squad, [ + const onConnectError = squad( superFn('connect_error'), logWraped(importStr), addUrl(colorUrl), getDescription, - ]); + ); const onConnect = emitAuth(importUrl, socket); const onAccept = logWraped(importStr,`${connectedStr} to ${colorUrl}`); - const onDisconnect = apply(squad, [ + const onDisconnect = squad( done(fn, statusStore), logWraped(importStr, `${disconnectedStr} from ${colorUrl}`), rmListeners(socket, { @@ -123,10 +121,17 @@ module.exports = (options, fn) => { onConnect, onConfig, }), - ]); + ); - const onChange = squad(logWraped(importStr), config); - const onReject = squad(superFn('reject'), logWraped(importStr, tokenRejectedStr)); + const onChange = squad( + logWraped(importStr), + config, + ); + + const onReject = squad( + superFn('reject'), + logWraped(importStr, tokenRejectedStr), + ); socket.on('connect', onConnect); socket.on('accept', onAccept);