Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: debounce polling of session info #675

Merged
merged 2 commits into from
Oct 12, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 12 additions & 7 deletions src/context/ServiceInfoContext.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import { useCurrentWallet, useClearCurrentWallet } from './WalletContext'
import { useWebsocket } from './WebsocketContext'
import { clearSession } from '../session'
import { CJ_STATE_TAKER_RUNNING, CJ_STATE_MAKER_RUNNING } from '../constants/config'
import { toSemVer, UNKNOWN_VERSION } from '../utils'
import { noop, setIntervalDebounced, toSemVer, UNKNOWN_VERSION } from '../utils'

import * as Api from '../libs/JmWalletApi'

Expand Down Expand Up @@ -224,16 +224,21 @@ const ServiceInfoProvider = ({ children }: PropsWithChildren<{}>) => {
useEffect(() => {
const abortCtrl = new AbortController()

const refreshSession = () => {
reloadServiceInfo({ signal: abortCtrl.signal }).catch((err) => {
if (abortCtrl.signal.aborted) return
console.error(err)
})
const refreshSession = (): Promise<void> => {
return reloadServiceInfo({ signal: abortCtrl.signal })
.then(noop)
.catch((err) => {
if (!abortCtrl.signal.aborted) {
console.error(err)
}
})
}

refreshSession()

const interval = setInterval(refreshSession, SESSION_REQUEST_INTERVAL)
let interval: NodeJS.Timer
setIntervalDebounced(refreshSession, SESSION_REQUEST_INTERVAL, (timerId) => (interval = timerId))

return () => {
clearInterval(interval)
abortCtrl.abort()
Expand Down
15 changes: 9 additions & 6 deletions src/context/WalletContext.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import * as Api from '../libs/JmWalletApi'
import { WalletBalanceSummary, toBalanceSummary } from './BalanceSummary'
import { JM_API_AUTH_TOKEN_EXPIRY } from '../constants/config'
import { isDevMode } from '../constants/debugFeatures'
import { walletDisplayName } from '../utils'
import { setIntervalDebounced, walletDisplayName } from '../utils'

const API_AUTH_TOKEN_RENEW_INTERVAL: Milliseconds = isDevMode()
? 60 * 1_000
Expand Down Expand Up @@ -318,14 +318,14 @@ const WalletProvider = ({ children }: PropsWithChildren<any>) => {

const abortCtrl = new AbortController()

const renewToken = () => {
const renewToken = async () => {
const session = getSession()
if (!session?.auth?.refresh_token) {
console.warn('Cannot renew auth token - no refresh_token available.')
return
}

Api.postToken(
return Api.postToken(
{ token: session.auth.token, signal: abortCtrl.signal },
{
grant_type: 'refresh_token',
Expand All @@ -341,12 +341,15 @@ const WalletProvider = ({ children }: PropsWithChildren<any>) => {
console.debug('Successfully renewed auth token.')
})
.catch((err) => {
if (abortCtrl.signal.aborted) return
console.error(err)
if (!abortCtrl.signal.aborted) {
console.error(err)
}
})
}

const interval = setInterval(renewToken, API_AUTH_TOKEN_RENEW_INTERVAL)
let interval: NodeJS.Timer
setIntervalDebounced(renewToken, API_AUTH_TOKEN_RENEW_INTERVAL, (timerId) => (interval = timerId))

return () => {
clearInterval(interval)
abortCtrl.abort()
Expand Down
7 changes: 4 additions & 3 deletions src/context/WebsocketContext.jsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import React, { createContext, useEffect, useState, useContext } from 'react'
import { createContext, useEffect, useState, useContext } from 'react'

import { useCurrentWallet } from './WalletContext'
import { noop } from '../utils'
import { isDevMode } from '../constants/debugFeatures'

const WEBSOCKET_RECONNECT_DELAY_STEP = 1_000
const WEBSOCKET_RECONNECT_MAX_DELAY = 10_000
Expand All @@ -23,8 +25,7 @@ const connectionRetryDelayLinear = (attempt = 0) => {
// path that will be proxied to the backend server
const WEBSOCKET_ENDPOINT_PATH = `${window.JM.PUBLIC_PATH}/jmws`

const NOOP = () => {}
const logToDebugConsoleInDevMode = process.env.NODE_ENV === 'development' ? console.debug : NOOP
const logToDebugConsoleInDevMode = isDevMode() ? console.debug : noop

const createWebSocket = () => {
const { protocol, host } = window.location
Expand Down
17 changes: 17 additions & 0 deletions src/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -94,3 +94,20 @@ export const toSemVer = (raw?: string): SemVer => {
}

export const scrollToTop = () => window.scrollTo({ top: 0, left: 0, behavior: 'smooth' })

export const noop = () => {}

export const setIntervalDebounced = (
callback: () => Promise<void>,
delay: Milliseconds,
onTimerIdChanged: (timerId: NodeJS.Timer) => void,
) => {
;(function loop() {
onTimerIdChanged(
setTimeout(async () => {
await callback()
loop()
}, delay),
)
})()
}