Skip to content

Commit 0f7fe85

Browse files
committed
Lint & Pretty
1 parent 3d57904 commit 0f7fe85

File tree

3 files changed

+50
-32
lines changed

3 files changed

+50
-32
lines changed

.eslintrc

+3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
11
{
22
"extends": ["zavatta", "prettier"],
3+
"rules": {
4+
"id-length": 0
5+
}
36
}

src/http-client.js

+3-1
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,9 @@ const publicCall = ({ endpoints }) => (path, data, method = 'GET', headers = {})
115115
sendResult(
116116
fetch(
117117
`${
118-
!(path.includes('/fapi') || path.includes('/futures')) || path.includes('/sapi') ? endpoints.base : endpoints.futures
118+
!(path.includes('/fapi') || path.includes('/futures')) || path.includes('/sapi')
119+
? endpoints.base
120+
: endpoints.futures
119121
}${path}${makeQueryString(data)}`,
120122
{
121123
method,

src/websocket.js

+44-31
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,7 @@ const miniTicker = (payload, cb, transform = true) => {
291291
}
292292

293293
const allMiniTicker = (payload, cb, transform = true) => {
294-
const cache = (Array.isArray(payload) ? payload : [payload]).map(symbol => {
294+
const cache = (Array.isArray(payload) ? payload : [payload]).map(() => {
295295
const w = openWebSocket(`${endpoints.base}/!miniTicker@arr`)
296296

297297
w.onmessage = msg => {
@@ -610,7 +610,7 @@ export const userEventHandler = (cb, transform = true, variator) => msg => {
610610
}
611611

612612
const userErrorHandler = (cb, transform = true) => error => {
613-
cb({[transform ? 'eventType' : 'type']: 'error', error})
613+
cb({ [transform ? 'eventType' : 'type']: 'error', error })
614614
}
615615

616616
const STREAM_METHODS = ['get', 'keep', 'close']
@@ -635,7 +635,7 @@ const user = (opts, variator) => (cb, transform) => {
635635
let int = null
636636
let w = null
637637
let keepClosed = false
638-
let errorHandler = userErrorHandler(cb, transform)
638+
const errorHandler = userErrorHandler(cb, transform)
639639

640640
const keepAlive = isReconnecting => {
641641
if (currentListenKey) {
@@ -648,7 +648,9 @@ const user = (opts, variator) => (cb, transform) => {
648648
makeStream(true)
649649
}
650650

651-
opts.emitStreamErrors && errorHandler(err)
651+
if (opts.emitStreamErrors) {
652+
errorHandler(err)
653+
}
652654
})
653655
}
654656
}
@@ -671,34 +673,45 @@ const user = (opts, variator) => (cb, transform) => {
671673
}
672674

673675
const makeStream = isReconnecting => {
674-
return !keepClosed && getDataStream()
675-
.then(({ listenKey }) => {
676-
if (keepClosed) {
677-
return closeDataStream({ listenKey }).catch(f => f)
678-
}
679-
680-
w = openWebSocket(
681-
`${variator === 'futures' ? endpoints.futures : endpoints.base}/${listenKey}`,
682-
)
683-
w.onmessage = msg => userEventHandler(cb, transform, variator)(msg)
684-
opts.emitSocketErrors && (w.onerror = ({error}) => errorHandler(error))
685-
686-
currentListenKey = listenKey
687-
688-
int = setInterval(() => keepAlive(false), 50e3)
689-
690-
keepAlive(true)
676+
return (
677+
!keepClosed &&
678+
getDataStream()
679+
.then(({ listenKey }) => {
680+
if (keepClosed) {
681+
return closeDataStream({ listenKey }).catch(f => f)
682+
}
683+
684+
w = openWebSocket(
685+
`${variator === 'futures' ? endpoints.futures : endpoints.base}/${listenKey}`,
686+
)
687+
688+
w.onmessage = msg => userEventHandler(cb, transform, variator)(msg)
689+
if (opts.emitSocketErrors) {
690+
w.onerror = ({ error }) => errorHandler(error)
691+
}
692+
693+
currentListenKey = listenKey
694+
695+
int = setInterval(() => keepAlive(false), 50e3)
696+
697+
keepAlive(true)
698+
699+
return options => closeStream(options, false, true)
700+
})
701+
.catch(err => {
702+
if (isReconnecting) {
703+
if (!keepClosed) {
704+
setTimeout(() => makeStream(true), 30e3)
705+
}
691706

692-
return options => closeStream(options, false, true)
693-
})
694-
.catch(err => {
695-
if (isReconnecting) {
696-
!keepClosed && setTimeout(() => makeStream(true), 30e3)
697-
opts.emitStreamErrors && errorHandler(err)
698-
} else {
699-
throw err
700-
}
701-
})
707+
if (opts.emitStreamErrors) {
708+
errorHandler(err)
709+
}
710+
} else {
711+
throw err
712+
}
713+
})
714+
)
702715
}
703716

704717
return makeStream(false)

0 commit comments

Comments
 (0)