machankura/mempool
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Using two watchers to monitor Bisq data top and sub directory, and added more error handling.

Browse Source
This commit is contained in:
softsimon 2020-07-21 10:23:21 +07:00
parent 85d0deb239
commit 62d2fc8113
No known key found for this signature in database
GPG Key ID: 488D7DCFB5A430D7
1 changed files with 35 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
backend/src/api/bisq.ts
View File

@ -5,6 +5,7 @@ import { BisqBlocks, BisqBlock, BisqTransaction, BisqStats, BisqTrade } from '..
import { Common } from './common'; import { Common } from './common';
class Bisq { class Bisq {
private static BLOCKS_JSON_FILE_PATH = '/all/blocks.json';
private latestBlockHeight = 0; private latestBlockHeight = 0;
private blocks: BisqBlock[] = []; private blocks: BisqBlock[] = [];
private transactions: BisqTransaction[] = []; private transactions: BisqTransaction[] = [];
@ -20,16 +21,18 @@ class Bisq {
}; };
private price: number = 0; private price: number = 0;
private priceUpdateCallbackFunction: ((price: number) => void) | undefined; private priceUpdateCallbackFunction: ((price: number) => void) | undefined;
private topDirectoryWatcher: fs.FSWatcher | undefined;
private subdirectoryWatcher: fs.FSWatcher | undefined; private subdirectoryWatcher: fs.FSWatcher | undefined;
constructor() {} constructor() {}
startBisqService(): void { startBisqService(): void {
this.checkForBisqDataFolder();
this.loadBisqDumpFile(); this.loadBisqDumpFile();
setInterval(this.updatePrice.bind(this), 1000 * 60 * 60); setInterval(this.updatePrice.bind(this), 1000 * 60 * 60);
this.updatePrice(); this.updatePrice();
this.startTopLevelDirectoryWatcher(); this.startTopDirectoryWatcher();
this.restartSubDirectoryWatcher(); this.startSubDirectoryWatcher();
} }
getTransaction(txId: string): BisqTransaction | undefined { getTransaction(txId: string): BisqTransaction | undefined {
@ -64,27 +67,45 @@ class Bisq {
return this.latestBlockHeight; return this.latestBlockHeight;
} }
private startTopLevelDirectoryWatcher() { private checkForBisqDataFolder() {
if (!fs.existsSync(config.BSQ_BLOCKS_DATA_PATH + Bisq.BLOCKS_JSON_FILE_PATH)) {
console.log(config.BSQ_BLOCKS_DATA_PATH + Bisq.BLOCKS_JSON_FILE_PATH + ` doesn't exist. Make sure Bisq is running and the config is correct before starting the server.`);
return process.exit(1);
}
}
private startTopDirectoryWatcher() {
if (this.topDirectoryWatcher) {
this.topDirectoryWatcher.close();
}
let fsWait: NodeJS.Timeout | null = null; let fsWait: NodeJS.Timeout | null = null;
fs.watch(config.BSQ_BLOCKS_DATA_PATH, () => { this.topDirectoryWatcher = fs.watch(config.BSQ_BLOCKS_DATA_PATH, () => {
if (fsWait) { if (fsWait) {
clearTimeout(fsWait); clearTimeout(fsWait);
} }
if (this.subdirectoryWatcher) {
this.subdirectoryWatcher.close();
}
fsWait = setTimeout(() => { fsWait = setTimeout(() => {
console.log(`Bisq restart detected. Resetting inner watcher in 3 minutes.`); console.log(`Bisq restart detected. Resetting both watchers in 3 minutes.`);
setTimeout(() => { setTimeout(() => {
this.restartSubDirectoryWatcher(); this.startTopDirectoryWatcher();
this.startSubDirectoryWatcher();
this.loadBisqDumpFile(); this.loadBisqDumpFile();
}, 180000); }, 180000);
}, 15000); }, 15000);
}); });
} }
private restartSubDirectoryWatcher() { private startSubDirectoryWatcher() {
if (this.subdirectoryWatcher) { if (this.subdirectoryWatcher) {
this.subdirectoryWatcher.close(); this.subdirectoryWatcher.close();
} }
if (!fs.existsSync(config.BSQ_BLOCKS_DATA_PATH + Bisq.BLOCKS_JSON_FILE_PATH)) {
console.log(config.BSQ_BLOCKS_DATA_PATH + Bisq.BLOCKS_JSON_FILE_PATH + ` doesn't exist. Trying to restart sub directory watcher again in 3 minutes.`);
setTimeout(() => this.startSubDirectoryWatcher(), 180000);
return;
}
let fsWait: NodeJS.Timeout | null = null; let fsWait: NodeJS.Timeout | null = null;
this.subdirectoryWatcher = fs.watch(config.BSQ_BLOCKS_DATA_PATH + '/all', () => { this.subdirectoryWatcher = fs.watch(config.BSQ_BLOCKS_DATA_PATH + '/all', () => {
if (fsWait) { if (fsWait) {
@ -202,14 +223,14 @@ class Bisq {
private async loadBisqBlocksDump(cacheData: string): Promise<void> { private async loadBisqBlocksDump(cacheData: string): Promise<void> {
const start = new Date().getTime(); const start = new Date().getTime();
if (cacheData && cacheData.length !== 0) { if (cacheData && cacheData.length !== 0) {
console.log('Loading Bisq data from dump...'); console.log('Processing Bisq data dump...');
const data: BisqBlocks = JSON.parse(cacheData); const data: BisqBlocks = JSON.parse(cacheData);
if (data.blocks && data.blocks.length !== this.blocks.length) { if (data.blocks && data.blocks.length !== this.blocks.length) {
this.blocks = data.blocks.filter((block) => block.txs.length > 0); this.blocks = data.blocks.filter((block) => block.txs.length > 0);
this.blocks.reverse(); this.blocks.reverse();
this.latestBlockHeight = data.chainHeight; this.latestBlockHeight = data.chainHeight;
const time = new Date().getTime() - start; const time = new Date().getTime() - start;
console.log('Bisq dump loaded in ' + time + ' ms'); console.log('Bisq dump processed in ' + time + ' ms');
} else { } else {
throw new Error(`Bisq dump didn't contain any blocks`); throw new Error(`Bisq dump didn't contain any blocks`);
} }
@ -218,7 +239,10 @@ class Bisq {
private loadData(): Promise<string> { private loadData(): Promise<string> {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
fs.readFile(config.BSQ_BLOCKS_DATA_PATH + '/all/blocks.json', 'utf8', (err, data) => { if (!fs.existsSync(config.BSQ_BLOCKS_DATA_PATH + Bisq.BLOCKS_JSON_FILE_PATH)) {
return reject(Bisq.BLOCKS_JSON_FILE_PATH + ` doesn't exist`);
}
fs.readFile(config.BSQ_BLOCKS_DATA_PATH + Bisq.BLOCKS_JSON_FILE_PATH, 'utf8', (err, data) => {
if (err) { if (err) {
reject(err); reject(err);
} }