diff --git a/package-lock.json b/package-lock.json index 76f9116..ea975ee 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4,15 +4,6 @@ "lockfileVersion": 1, "requires": true, "dependencies": { - "@types/bignumber.js": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/@types/bignumber.js/-/bignumber.js-5.0.0.tgz", - "integrity": "sha512-0DH7aPGCClywOFaxxjE6UwpN2kQYe9LwuDQMv+zYA97j5GkOMo8e66LYT+a8JYU7jfmUFRZLa9KycxHDsKXJCA==", - "dev": true, - "requires": { - "bignumber.js": "6.0.0" - } - }, "@types/body-parser": { "version": "1.16.8", "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.16.8.tgz", @@ -2011,6 +2002,19 @@ "resolved": "https://registry.npmjs.org/github-from-package/-/github-from-package-0.0.0.tgz", "integrity": "sha1-l/tdlr/eiXMxPyDoKI75oWf6ZM4=" }, + "glob": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz", + "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==", + "requires": { + "fs.realpath": "1.0.0", + "inflight": "1.0.6", + "inherits": "2.0.3", + "minimatch": "3.0.4", + "once": "1.4.0", + "path-is-absolute": "1.0.1" + } + }, "growl": { "version": "1.10.3", "resolved": "https://registry.npmjs.org/growl/-/growl-1.10.3.tgz", @@ -4832,4 +4836,4 @@ "dev": true } } -} \ No newline at end of file +} diff --git a/package.json b/package.json index 4de020c..47904a2 100644 --- a/package.json +++ b/package.json @@ -13,9 +13,9 @@ "rm": "rimraf dist", "format": "prettier --config .prettierrc --write \"src/**/*.ts\" \"test/**/*.ts\"", "tsc": "npm run rm && tsc -p tsconfig.development.json", - "start": "npm run prepare && node dist/src/lib/bin/start.js", - "start:dev": "node dist/src/lib/bin/start.js", - "ws": "node dist/src/lib/bin/ws.js", + "start": "npm run prepare && node runner.js", + "start:dev": "node runner.js", + "ws": "node runner.js ws", "tslint": "tslint --project ./tslint.json", "db:serv": "node dist/test/pouchdb/serv.js", "db:clie": "node dist/test/pouchdb/clie.js", @@ -33,6 +33,7 @@ "cross-env": "^5.1.3", "execution-time": "^1.2.0", "express": "^4.16.2", + "glob": "^7.1.2", "moment": "^2.20.1", "pouchdb": "^6.4.3", "pouchdb-find": "^6.4.3", @@ -42,7 +43,6 @@ "winston": "^3.0.0-rc1" }, "devDependencies": { - "@types/bignumber.js": "^5.0.0", "@types/config": "0.0.33", "@types/express": "^4.11.1", "@types/mocha": "^2.2.41", @@ -60,4 +60,4 @@ "tslint": "^5.6.0", "typescript": "^2.6.1" } -} \ No newline at end of file +} diff --git a/runner.js b/runner.js new file mode 100644 index 0000000..938f68c --- /dev/null +++ b/runner.js @@ -0,0 +1,12 @@ +const glob = require("glob"); +const path = require( 'path' ); + +var args = process.argv.splice(2); +let name = 'start'; +if(args.length != 0) { + name = args[0]; +} + +glob.sync(`dist/**/${name}.js`).forEach( function( file ) { + require(path.resolve(file)); +}); \ No newline at end of file diff --git a/src/lib/arbitrage.ts b/src/lib/arbitrage.ts index 1ff0aa8..bb65dac 100644 --- a/src/lib/arbitrage.ts +++ b/src/lib/arbitrage.ts @@ -2,7 +2,7 @@ import { logger, Helper } from './common'; import { Event } from './event'; import { Engine } from './engine'; import { Aggregator } from './aggregator'; -import { BigNumber } from 'BigNumber.js'; +import { BigNumber } from 'bignumber.js'; import * as types from './type'; const clc = require('cli-color'); diff --git a/src/lib/common/helper.ts b/src/lib/common/helper.ts index 01b2660..39f4c89 100644 --- a/src/lib/common/helper.ts +++ b/src/lib/common/helper.ts @@ -1,5 +1,5 @@ import * as types from '../type'; -import { BigNumber } from 'BigNumber.js'; +import { BigNumber } from 'bignumber.js'; import * as bitbank from 'bitbank-handler'; const ccxt = require('ccxt'); diff --git a/src/lib/trading.ts b/src/lib/trading.ts index 2022f6a..182ec8a 100644 --- a/src/lib/trading.ts +++ b/src/lib/trading.ts @@ -1,5 +1,5 @@ import { logger, Helper } from './common'; -import { BigNumber } from 'BigNumber.js'; +import { BigNumber } from 'bignumber.js'; import { Bitbank } from 'bitbank-handler'; import * as types from './type';