Various typing and build fixes to enable CI

2022-06-27 21:28:21 -07:00
parent 5bb595fbc7
commit 76dbda0a3e
8 changed files with 98 additions and 49 deletions
--- a/backend/package-lock.json
+++ b/backend/package-lock.json
@@ -10,6 +10,7 @@
      "license": "GNU Affero General Public License v3.0",
      "dependencies": {
        "@mempool/electrum-client": "^1.1.7",
+        "@types/node": "^16.11.41",
        "axios": "~0.27.2",
        "bitcoinjs-lib": "6.0.1",
        "crypto-js": "^4.0.0",
@@ -119,10 +120,9 @@
      "dev": true
    },
    "node_modules/@types/node": {
-      "version": "14.14.20",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.20.tgz",
-      "integrity": "sha512-Y93R97Ouif9JEOWPIUyU+eyIdyRqQR0I8Ez1dzku4hDx34NWh4HbtIc3WNzwB1Y9ULvNGeu5B8h8bVL5cAk4/A==",
-      "dev": true
+      "version": "16.11.41",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-16.11.41.tgz",
+      "integrity": "sha512-mqoYK2TnVjdkGk8qXAVGc/x9nSaTpSrFaGFm43BUH3IdoBV0nta6hYaGmdOvIMlbHJbUEVen3gvwpwovAZKNdQ=="
    },
    "node_modules/@types/qs": {
      "version": "6.9.7",
@@ -1647,10 +1647,9 @@
      "dev": true
    },
    "@types/node": {
-      "version": "14.14.20",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.20.tgz",
-      "integrity": "sha512-Y93R97Ouif9JEOWPIUyU+eyIdyRqQR0I8Ez1dzku4hDx34NWh4HbtIc3WNzwB1Y9ULvNGeu5B8h8bVL5cAk4/A==",
-      "dev": true
+      "version": "16.11.41",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-16.11.41.tgz",
+      "integrity": "sha512-mqoYK2TnVjdkGk8qXAVGc/x9nSaTpSrFaGFm43BUH3IdoBV0nta6hYaGmdOvIMlbHJbUEVen3gvwpwovAZKNdQ=="
    },
    "@types/qs": {
      "version": "6.9.7",
--- a/backend/package.json
+++ b/backend/package.json
@@ -20,7 +20,6 @@
  ],
  "main": "index.ts",
  "scripts": {
-    "ng": "./node_modules/@angular/cli/bin/ng",
    "tsc": "./node_modules/typescript/bin/tsc",
    "build": "npm run tsc",
    "start": "node --max-old-space-size=2048 dist/index.js",
@@ -29,6 +28,7 @@
  },
  "dependencies": {
    "@mempool/electrum-client": "^1.1.7",
+    "@types/node": "^16.11.41",
    "axios": "~0.27.2",
    "bitcoinjs-lib": "6.0.1",
    "crypto-js": "^4.0.0",
@@ -41,8 +41,8 @@
  },
  "devDependencies": {
    "@types/compression": "^1.7.2",
-    "@types/ws": "~8.5.3",
    "@types/express": "^4.17.13",
+    "@types/ws": "~8.5.3",
    "tslint": "^6.1.0"
  }
 }
--- a/backend/src/api/bitcoin/electrum-api.ts
+++ b/backend/src/api/bitcoin/electrum-api.ts
@@ -1,10 +1,10 @@
 import config from '../../config';
+import Client from '@mempool/electrum-client';
 import { AbstractBitcoinApi } from './bitcoin-api-abstract-factory';
 import { IEsploraApi } from './esplora-api.interface';
 import { IElectrumApi } from './electrum-api.interface';
 import BitcoinApi from './bitcoin-api';
 import logger from '../../logger';
-import * as ElectrumClient from '@mempool/electrum-client';
 import * as sha256 from 'crypto-js/sha256';
 import * as hexEnc from 'crypto-js/enc-hex';
 import loadingIndicators from '../loading-indicators';
@@ -26,7 +26,7 @@ class BitcoindElectrsApi extends BitcoinApi implements AbstractBitcoinApi {
      onLog: (str) => { logger.debug(str); },
    };

-    this.electrumClient = new ElectrumClient(
+    this.electrumClient = new Client(
      config.ELECTRUM.PORT,
      config.ELECTRUM.HOST,
      config.ELECTRUM.TLS_ENABLED ? 'tls' : 'tcp',
@@ -35,7 +35,7 @@ class BitcoindElectrsApi extends BitcoinApi implements AbstractBitcoinApi {
    );

    this.electrumClient.initElectrum(electrumConfig, electrumPersistencePolicy)
-      .then(() => {})
+      .then(() => { })
      .catch((err) => {
        logger.err(`Error connecting to Electrum Server at ${config.ELECTRUM.HOST}:${config.ELECTRUM.PORT}`);
      });
@@ -95,7 +95,7 @@ class BitcoindElectrsApi extends BitcoinApi implements AbstractBitcoinApi {
  async $getAddressTransactions(address: string, lastSeenTxId: string): Promise<IEsploraApi.Transaction[]> {
    const addressInfo = await this.bitcoindClient.validateAddress(address);
    if (!addressInfo || !addressInfo.isvalid) {
-     return [];
+      return [];
    }

    try {
--- a/backend/src/api/disk-cache.ts
+++ b/backend/src/api/disk-cache.ts
@@ -1,6 +1,6 @@
 import * as fs from 'fs';
 const fsPromises = fs.promises;
-import * as cluster from 'cluster';
+import cluster from 'cluster';
 import memPool from './mempool';
 import blocks from './blocks';
 import logger from '../logger';
@@ -19,7 +19,7 @@ class DiskCache {
  constructor() { }

  async $saveCacheToDisk(): Promise<void> {
-    if (!cluster.isMaster) {
+    if (!cluster.isPrimary) {
      return;
    }
    if (this.isWritingCache) {
@@ -46,12 +46,12 @@ class DiskCache {
        blockSummaries: blocks.getBlockSummaries(),
        mempool: {},
        mempoolArray: mempoolArray.splice(0, chunkSize),
-      }), {flag: 'w'});
+      }), { flag: 'w' });
      for (let i = 1; i < DiskCache.CHUNK_FILES; i++) {
        await fsPromises.writeFile(DiskCache.FILE_NAMES.replace('{number}', i.toString()), JSON.stringify({
          mempool: {},
          mempoolArray: mempoolArray.splice(0, chunkSize),
-        }), {flag: 'w'});
+        }), { flag: 'w' });
      }
      logger.debug('Mempool and blocks data saved to disk cache');
      this.isWritingCache = false;
@@ -67,7 +67,7 @@ class DiskCache {
      fs.unlinkSync(DiskCache.FILE_NAMES.replace('{number}', i.toString()));
    }
  }
-  
+
  loadMempoolCache() {
    if (!fs.existsSync(DiskCache.FILE_NAME)) {
      return;
--- a/backend/src/index.ts
+++ b/backend/src/index.ts
@@ -1,8 +1,8 @@
-import { Express, Request, Response, NextFunction } from 'express';
-import * as express from 'express';
+import express from "express";
+import { Application, Request, Response, NextFunction, Express } from 'express';
 import * as http from 'http';
 import * as WebSocket from 'ws';
-import * as cluster from 'cluster';
+import cluster from 'cluster';
 import axios from 'axios';

 import DB from './database';
@@ -32,7 +32,7 @@ import priceUpdater from './tasks/price-updater';
 class Server {
  private wss: WebSocket.Server | undefined;
  private server: http.Server | undefined;
-  private app: Express;
+  private app: Application;
  private currentBackendRetryInterval = 5;

  constructor() {
@@ -43,7 +43,7 @@ class Server {
      return;
    }

-    if (cluster.isMaster) {
+    if (cluster.isPrimary) {
      logger.notice(`Mempool Server (Master) is running on port ${config.MEMPOOL.HTTP_PORT} (${backendInfo.getShortCommitHash()})`);

      const numCPUs = config.MEMPOOL.SPAWN_CLUSTER_PROCS;
@@ -77,7 +77,7 @@ class Server {
      })
      .use(express.urlencoded({ extended: true }))
      .use(express.text())
-    ;
+      ;

    this.server = http.createServer(this.app);
    this.wss = new WebSocket.Server({ server: this.server });
@@ -105,7 +105,7 @@ class Server {
      }
    }

-    if (config.STATISTICS.ENABLED && config.DATABASE.ENABLED && cluster.isMaster) {
+    if (config.STATISTICS.ENABLED && config.DATABASE.ENABLED && cluster.isPrimary) {
      statistics.startStatistics();
    }

@@ -260,7 +260,7 @@ class Server {
          res.status(500).end();
        }
      })
-    ;
+      ;

    if (config.STATISTICS.ENABLED && config.DATABASE.ENABLED) {
      this.app
@@ -290,7 +290,7 @@ class Server {
        .get(config.MEMPOOL.API_URL_PREFIX + 'mining/blocks/rewards/:interval', routes.$getHistoricalBlockRewards)
        .get(config.MEMPOOL.API_URL_PREFIX + 'mining/blocks/fee-rates/:interval', routes.$getHistoricalBlockFeeRates)
        .get(config.MEMPOOL.API_URL_PREFIX + 'mining/blocks/sizes-weights/:interval', routes.$getHistoricalBlockSizeAndWeight)
-      ;
+        ;
    }

    if (config.BISQ.ENABLED) {
@@ -340,7 +340,7 @@ class Server {
        .get(config.MEMPOOL.API_URL_PREFIX + 'address/:address/txs', routes.getAddressTransactions)
        .get(config.MEMPOOL.API_URL_PREFIX + 'address/:address/txs/chain/:txId', routes.getAddressTransactions)
        .get(config.MEMPOOL.API_URL_PREFIX + 'address-prefix/:prefix', routes.getAddressPrefix)
-      ;
+        ;
    }

    if (Common.isLiquid()) {
@@ -349,13 +349,13 @@ class Server {
        .get(config.MEMPOOL.API_URL_PREFIX + 'assets/featured', routes.$getAllFeaturedLiquidAssets)
        .get(config.MEMPOOL.API_URL_PREFIX + 'asset/:assetId/icon', routes.getLiquidIcon)
        .get(config.MEMPOOL.API_URL_PREFIX + 'assets/group/:id', routes.$getAssetGroup)
-      ;
+        ;
    }

    if (Common.isLiquid() && config.DATABASE.ENABLED) {
      this.app
        .get(config.MEMPOOL.API_URL_PREFIX + 'liquid/pegs/month', routes.$getElementsPegsByMonth)
-      ;
+        ;
    }
  }
 }
--- a/backend/tsconfig.json
+++ b/backend/tsconfig.json
@@ -1,5 +1,6 @@
 {
  "compilerOptions": {
+    "types": ["node"],
    "module": "commonjs",
    "target": "esnext",
    "lib": ["es2019", "dom"],
@@ -11,7 +12,8 @@
    "typeRoots": [
      "node_modules/@types"
    ],
-    "allowSyntheticDefaultImports": true
+    "allowSyntheticDefaultImports": true,
+    "esModuleInterop": true
  },
  "include": [
    "src/**/*.ts"