feat(node): dependency injection / config

Injecting dependencies via constructor and disabling services from config Wallet exports different now Multi-sig script Removing config reloading option Remove debug code
nitsujlangston · Dec 26, 2018 · 640310c · 640310c
1 parent 35a0b15
commit 640310c
Show file tree

Hide file tree

Showing 34 changed files with 397 additions and 175 deletions.
diff --git a/packages/bitcore-client/bin/multi-sig/wallet-derive-address b/packages/bitcore-client/bin/multi-sig/wallet-derive-address
@@ -3,7 +3,7 @@
 const fs = require('fs');
 const bitcoreLib = require('bitcore-lib');
 const program = require('commander');
-const Wallet = require('../../lib/wallet');
+const { Wallet } = require('../../lib/wallet');
 const promptly = require('promptly');
 
 program

diff --git a/packages/bitcore-client/bin/wallet-balance b/packages/bitcore-client/bin/wallet-balance
@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
 const program = require('../ts_build/program');
-const Wallet = require('../ts_build/wallet');
+const { Wallet } = require('../ts_build/wallet');
 
 try {
   program

diff --git a/packages/bitcore-client/bin/wallet-broadcast b/packages/bitcore-client/bin/wallet-broadcast
@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
 const program = require('../ts_build/program');
-const Wallet = require('../ts_build/wallet');
+const { Wallet } = require('../ts_build/wallet');
 
 program
   .version(require('../package.json').version)

diff --git a/packages/bitcore-client/bin/wallet-create b/packages/bitcore-client/bin/wallet-create
@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
 const program = require('../ts_build/program');
-const Wallet = require('../ts_build/wallet');
+const { Wallet } = require('../ts_build/wallet');
 const promptly = require('promptly');
 
 program

diff --git a/packages/bitcore-client/bin/wallet-decrypt b/packages/bitcore-client/bin/wallet-decrypt
@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
 const program = require('../ts_build/program');
-const Wallet = require('../ts_build/wallet');
+const { Wallet } = require('../ts_build/wallet');
 const promptly = require('promptly');
 
 program

diff --git a/packages/bitcore-client/bin/wallet-derive b/packages/bitcore-client/bin/wallet-derive
@@ -5,7 +5,7 @@ const bitcoreLibs = {
   BCH: require('bitcore-lib-cash')
 };
 const program = require('../ts_build/program');
-const Wallet = require('../ts_build/wallet');
+const { Wallet } = require('../ts_build/wallet');
 const promptly = require('promptly');
 
 program

diff --git a/packages/bitcore-client/bin/wallet-import b/packages/bitcore-client/bin/wallet-import
@@ -2,7 +2,7 @@
 
 const fs = require('fs');
 const program = require('../ts_build/program');
-const Wallet = require('../ts_build/wallet');
+const { Wallet } = require('../ts_build/wallet');
 const promptly = require('promptly');
 
 program

diff --git a/packages/bitcore-client/bin/wallet-list b/packages/bitcore-client/bin/wallet-list
@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 'use strict';
 
-const Storage = require('../ts_build/storage');
+const { Storage } = require('../ts_build/storage');
 const program = require('../ts_build/program');
 
 program

diff --git a/packages/bitcore-client/bin/wallet-register b/packages/bitcore-client/bin/wallet-register
@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
 const program = require('../ts_build/program');
-const Wallet = require('../ts_build/wallet');
+const { Wallet } = require('../ts_build/wallet');
 
 program
   .version(require('../package.json').version)

diff --git a/packages/bitcore-client/bin/wallet-sign b/packages/bitcore-client/bin/wallet-sign
@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
 const program = require('../ts_build/program');
-const Wallet = require('../ts_build/wallet');
+const { Wallet } = require('../ts_build/wallet');
 const promptly = require('promptly');
 
 program

diff --git a/packages/bitcore-client/bin/wallet-transaction-list b/packages/bitcore-client/bin/wallet-transaction-list
@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
 const program = require('../ts_build/program');
-const Wallet = require('../ts_build/wallet');
+const { Wallet } = require('../ts_build/wallet');
 
 program
   .version(require('../package.json').version)

diff --git a/packages/bitcore-client/bin/wallet-tx b/packages/bitcore-client/bin/wallet-tx
@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
 const program = require('../ts_build/program');
-const Wallet = require('../ts_build/wallet');
+const { Wallet } = require('../ts_build/wallet');
 
 program
   .version(require('../package.json').version)

diff --git a/packages/bitcore-client/bin/wallet-utxos b/packages/bitcore-client/bin/wallet-utxos
@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
 const program = require('../ts_build/program');
-const Wallet = require('../ts_build/wallet');
+const { Wallet } = require('../ts_build/wallet');
 
 program
   .version(require('../package.json').version)

diff --git a/packages/bitcore-node/src/config.ts b/packages/bitcore-node/src/config.ts
@@ -1,6 +1,6 @@
 import { homedir, cpus } from 'os';
 import parseArgv from './utils/parseArgv';
-import ConfigType from './types/Config';
+import { ConfigType } from "./types/Config";
 let program = parseArgv([], ['config']);
 
 function findConfig(): ConfigType | undefined {
@@ -57,18 +57,31 @@ const Config = function(): ConfigType {
     dbName: process.env.DB_NAME || 'bitcore',
     dbPort: process.env.DB_PORT || '27017',
     numWorkers: cpus().length,
-    api: {
-      rateLimiter: {
-        whitelist: [
-          '::ffff:127.0.0.1'
-        ]
+    chains: {},
+    services: {
+      api: {
+        enabled: true,
+        rateLimiter: {
+          whitelist: ['::ffff:127.0.0.1']
+        },
+        wallets: {
+          allowCreationBeforeCompleteSync: false,
+          allowUnauthenticatedCalls: false
+        }
+      },
+      event: {
+        enabled: true
+      },
+      p2p: {
+        enabled: true
       },
-      wallets: {
-        allowCreationBeforeCompleteSync: false,
-        allowUnauthenticatedCalls: false
+      socket: {
+        enabled: true
+      },
+      storage: {
+        enabled: true
       }
-    },
-    chains: {}
+    }
   };
 
   let foundConfig = findConfig();

diff --git a/packages/bitcore-node/src/models/base.ts b/packages/bitcore-node/src/models/base.ts
@@ -13,15 +13,15 @@ export abstract class BaseModel<T> {
     key: keyof T;
   }>;
 
-  constructor(private collectionName: string) {
+  constructor(private collectionName: string, private storageService = Storage) {
     this.handleConnection();
   }
 
   private async handleConnection() {
-    Storage.connection.on('CONNECTED', async () => {
-      if (Storage.db != undefined) {
+    this.storageService.connection.on('CONNECTED', async () => {
+      if (this.storageService.db != undefined) {
         this.connected = true;
-        this.db = Storage.db;
+        this.db = this.storageService.db;
         await this.onConnect();
       }
     });
@@ -30,8 +30,8 @@ export abstract class BaseModel<T> {
   abstract async onConnect();
 
   get collection(): Collection<MongoBound<T>> {
-    if (Storage.db) {
-      return Storage.db.collection(this.collectionName);
+    if (this.storageService.db) {
+      return this.storageService.db.collection(this.collectionName);
     } else {
       throw new Error('Not connected to the database yet');
     }

diff --git a/packages/bitcore-node/src/models/block.ts b/packages/bitcore-node/src/models/block.ts
@@ -11,13 +11,14 @@ import { SpentHeightIndicators } from '../types/Coin';
 import { EventModel } from './events';
 import config from '../config';
 import { Event } from '../services/event';
+import { StorageService } from "../services/storage";
 
 export { IBlock };
 
 @LoggifyClass
-export class Block extends BaseModel<IBlock> {
-  constructor() {
-    super('blocks');
+export class BlockSchema extends BaseModel<IBlock> {
+  constructor(storage?: StorageService) {
+    super('blocks', storage);
   }
 
   chainTips: Mapping<Mapping<IBlock>> = {};
@@ -227,4 +228,4 @@ export class Block extends BaseModel<IBlock> {
   }
 }
 
-export let BlockModel = new Block();
+export let BlockModel = new BlockSchema();
diff --git a/packages/bitcore-node/src/models/coin.ts b/packages/bitcore-node/src/models/coin.ts
@@ -3,6 +3,7 @@ import { BaseModel, MongoBound } from './base';
 import { ObjectID } from 'mongodb';
 import { SpentHeightIndicators, CoinJSON } from '../types/Coin';
 import { valueOrDefault } from '../utils/check';
+import { StorageService } from '../services/storage';
 
 export type ICoin = {
   network: string;
@@ -21,9 +22,9 @@ export type ICoin = {
 };
 
 @LoggifyClass
-class Coin extends BaseModel<ICoin> {
-  constructor() {
-    super('coins');
+class CoinSchema extends BaseModel<ICoin> {
+  constructor(storage?: StorageService) {
+    super('coins', storage);
   }
 
   allowedPaging = [
@@ -166,4 +167,4 @@ class Coin extends BaseModel<ICoin> {
     return JSON.stringify(transform);
   }
 }
-export let CoinModel = new Coin();
+export let CoinModel = new CoinSchema();
diff --git a/packages/bitcore-node/src/models/events.ts b/packages/bitcore-node/src/models/events.ts
@@ -2,6 +2,7 @@ import { BaseModel } from './base';
 import { ITransaction } from './transaction';
 import { IBlock } from '../types/Block';
 import { ICoin } from './coin';
+import { StorageService } from '../services/storage';
 
 export namespace IEvent {
   export type BlockEvent = IBlock;
@@ -13,9 +14,9 @@ interface IEvent {
   type: 'block' | 'tx' | 'coin';
   emitTime: Date;
 }
-class Event extends BaseModel<IEvent> {
-  constructor() {
-    super('events');
+export class EventSchema extends BaseModel<IEvent> {
+  constructor(storage?: StorageService) {
+    super('events', storage);
   }
 
   allowedPaging = [];
@@ -53,4 +54,4 @@ class Event extends BaseModel<IEvent> {
     return this.collection.find({ type: 'coin', emitTime: { $gte: lastSeen } }).addCursorFlag('noCursorTimeout', true);
   }
 }
-export const EventModel = new Event();
+export const EventModel = new EventSchema();
diff --git a/packages/bitcore-node/src/models/rateLimit.ts b/packages/bitcore-node/src/models/rateLimit.ts
@@ -1,5 +1,6 @@
 import { BaseModel } from './base';
 import { ObjectID } from 'mongodb';
+import { StorageService } from '../services/storage';
 
 export type IRateLimit = {
   _id?: ObjectID;
@@ -11,9 +12,9 @@ export type IRateLimit = {
   expireAt?: Date;
 };
 
-export class RateLimit extends BaseModel<IRateLimit> {
-  constructor() {
-    super('ratelimits');
+export class RateLimitSchema extends BaseModel<IRateLimit> {
+  constructor(storage?: StorageService) {
+    super('ratelimits', storage);
   }
   allowedPaging = [];
 
@@ -25,9 +26,9 @@ export class RateLimit extends BaseModel<IRateLimit> {
   incrementAndCheck(identifier: string, method: string) {
     return Promise.all([
       this.collection.findOneAndUpdate(
-        { identifier, method, period: 'second', time: {$gt: new Date(Date.now() - 1000)} },
+        { identifier, method, period: 'second', time: { $gt: new Date(Date.now() - 1000) } },
         {
-          $setOnInsert: { time: new Date(), expireAt: new Date(Date.now() + 10 * 1000)  },
+          $setOnInsert: { time: new Date(), expireAt: new Date(Date.now() + 10 * 1000) },
           $inc: { count: 1 }
         },
         { upsert: true, returnOriginal: false }
@@ -47,9 +48,9 @@ export class RateLimit extends BaseModel<IRateLimit> {
           $inc: { count: 1 }
         },
         { upsert: true, returnOriginal: false }
-      ),
+      )
     ]);
   }
 }
 
-export let RateLimitModel = new RateLimit();
+export let RateLimitModel = new RateLimitSchema();
diff --git a/packages/bitcore-node/src/models/state.ts b/packages/bitcore-node/src/models/state.ts
@@ -1,3 +1,4 @@
+import { StorageService } from '../services/storage';
 import { BaseModel } from './base';
 import { ObjectID } from 'mongodb';
 
@@ -6,13 +7,13 @@ export type IState = {
   initialSyncComplete: any;
 };
 
-export class State extends BaseModel<IState> {
-  constructor() {
-    super('state');
+export class StateSchema extends BaseModel<IState> {
+  constructor(storage?: StorageService) {
+    super('state', storage);
   }
   allowedPaging = [];
 
   onConnect() {}
 }
 
-export let StateModel = new State();
+export let StateModel = new StateSchema();