diff --git a/packages/neuron-wallet/src/controllers/networks/index.ts b/packages/neuron-wallet/src/controllers/networks/index.ts index 6e39bd9666..4a48ba6f19 100644 --- a/packages/neuron-wallet/src/controllers/networks/index.ts +++ b/packages/neuron-wallet/src/controllers/networks/index.ts @@ -1,13 +1,13 @@ import { dialog } from 'electron' import { t } from 'i18next' import env from 'env' -import { skip, distinctUntilChanged, debounceTime } from 'rxjs/operators' +import { distinctUntilChanged, skip } from 'rxjs/operators' import { NetworkType, Network } from 'models/network' import NetworksService from 'services/networks' import NodeService from 'services/node' import { ResponseCode } from 'utils/const' import { IsRequired, InvalidName, NetworkNotFound, CurrentNetworkNotSet } from 'exceptions' -import { switchToNetwork } from 'block-sync-renderer' +import { resetSyncTaskQueue, switchToNetwork } from 'block-sync-renderer' import { CurrentNetworkIDSubject, NetworkListSubject } from 'models/subjects/networks' import ChainInfo from './chain-info' import logger from 'utils/logger' @@ -18,7 +18,7 @@ export default class NetworksController { public async start() { NodeService.getInstance() .connectionStatusSubject // TODO: find out the redundant message and remove skip - .pipe(distinctUntilChanged(), debounceTime(3000), skip(1)) + .pipe(distinctUntilChanged(), skip(1)) .subscribe(async (connected: boolean) => { if (connected) { await networksService.update(networksService.getCurrentID(), {}) @@ -26,6 +26,7 @@ export default class NetworksController { await this.connectToNetwork(true) } else { logger.debug('Network:\tconnection dropped') + resetSyncTaskQueue.push(false) } }) diff --git a/packages/neuron-wallet/src/main.ts b/packages/neuron-wallet/src/main.ts index e3eea64fae..d9f8c57179 100644 --- a/packages/neuron-wallet/src/main.ts +++ b/packages/neuron-wallet/src/main.ts @@ -10,12 +10,14 @@ const appController = AppController.getInstance() const singleInstanceLock = app.requestSingleInstanceLock() if (singleInstanceLock) { app.on('ready', async () => { + logger.info('App:\tNeuron is starting') changeLanguage(SettingsService.getInstance().locale) appController.start() }) app.on('before-quit', async () => { + logger.info('App:\tNeuron will exist') await appController.end() }) diff --git a/packages/neuron-wallet/src/services/ckb-runner.ts b/packages/neuron-wallet/src/services/ckb-runner.ts index e8c07f814a..20c24d05df 100644 --- a/packages/neuron-wallet/src/services/ckb-runner.ts +++ b/packages/neuron-wallet/src/services/ckb-runner.ts @@ -6,7 +6,6 @@ import process from 'process' import logger from 'utils/logger' import SettingsService from './settings' import MigrateSubject from 'models/subjects/migrate-subject' -import { resetSyncTaskQueue } from 'block-sync-renderer' import IndexerService from './indexer' const platform = (): string => { @@ -126,14 +125,12 @@ export const startCkbNode = async () => { isLookingValidTarget = false ckb = null }) - resetSyncTaskQueue.push(true) removeOldIndexerIfRunSuccess() } export const stopCkbNode = () => { return new Promise(resolve => { - resetSyncTaskQueue.push(false) if (ckb) { logger.info('CKB:\tkilling node') ckb.once('close', () => resolve())