node/browser: fix browser build.
This commit is contained in:
parent
10b73f697d
commit
db0567fc01
@ -226,8 +226,6 @@ function formatWallet(wallet) {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
bcoin.workerpool.enable();
|
|
||||||
|
|
||||||
node = new bcoin.fullnode({
|
node = new bcoin.fullnode({
|
||||||
hash: true,
|
hash: true,
|
||||||
query: true,
|
query: true,
|
||||||
@ -236,14 +234,11 @@ node = new bcoin.fullnode({
|
|||||||
db: 'leveldb',
|
db: 'leveldb',
|
||||||
coinCache: 30000000,
|
coinCache: 30000000,
|
||||||
logConsole: true,
|
logConsole: true,
|
||||||
|
workers: true,
|
||||||
logger: logger
|
logger: logger
|
||||||
});
|
});
|
||||||
|
|
||||||
wdb = node.use(bcoin.walletplugin);
|
wdb = node.use(bcoin.wallet.plugin);
|
||||||
|
|
||||||
node.on('error', function(err) {
|
|
||||||
;
|
|
||||||
});
|
|
||||||
|
|
||||||
node.chain.on('block', addItem);
|
node.chain.on('block', addItem);
|
||||||
node.mempool.on('tx', addItem);
|
node.mempool.on('tx', addItem);
|
||||||
|
|||||||
@ -3,7 +3,6 @@
|
|||||||
const HTTPBase = require('../lib/http/base');
|
const HTTPBase = require('../lib/http/base');
|
||||||
const WSProxy = require('./wsproxy');
|
const WSProxy = require('./wsproxy');
|
||||||
const fs = require('fs');
|
const fs = require('fs');
|
||||||
const server, proxy;
|
|
||||||
|
|
||||||
const index = fs.readFileSync(`${__dirname}/index.html`);
|
const index = fs.readFileSync(`${__dirname}/index.html`);
|
||||||
const indexjs = fs.readFileSync(`${__dirname}/index.js`);
|
const indexjs = fs.readFileSync(`${__dirname}/index.js`);
|
||||||
@ -11,18 +10,22 @@ const bcoin = fs.readFileSync(`${__dirname}/bcoin.js`);
|
|||||||
const master = fs.readFileSync(`${__dirname}/bcoin-master.js`);
|
const master = fs.readFileSync(`${__dirname}/bcoin-master.js`);
|
||||||
const worker = fs.readFileSync(`${__dirname}/bcoin-worker.js`);
|
const worker = fs.readFileSync(`${__dirname}/bcoin-worker.js`);
|
||||||
|
|
||||||
proxy = new WSProxy({
|
let proxy = new WSProxy({
|
||||||
pow: process.argv.indexOf('--pow') !== -1,
|
pow: process.argv.indexOf('--pow') !== -1,
|
||||||
ports: [8333, 18333, 18444, 28333, 28901]
|
ports: [8333, 18333, 18444, 28333, 28901]
|
||||||
});
|
});
|
||||||
|
|
||||||
|
let server = new HTTPBase({
|
||||||
|
port: +process.argv[2] || 8080,
|
||||||
|
sockets: false
|
||||||
|
});
|
||||||
|
|
||||||
proxy.on('error', (err) => {
|
proxy.on('error', (err) => {
|
||||||
console.error(err.stack + '');
|
console.error(err.stack + '');
|
||||||
});
|
});
|
||||||
|
|
||||||
server = new HTTPBase({
|
server.on('error', (err) => {
|
||||||
port: +process.argv[2] || 8080,
|
console.error(err.stack + '');
|
||||||
sockets: false
|
|
||||||
});
|
});
|
||||||
|
|
||||||
server.get('/favicon.ico', (req, res) => {
|
server.get('/favicon.ico', (req, res) => {
|
||||||
@ -49,10 +52,6 @@ server.get('/bcoin-worker.js', (req, res) => {
|
|||||||
res.send(200, worker, 'js');
|
res.send(200, worker, 'js');
|
||||||
});
|
});
|
||||||
|
|
||||||
server.on('error', (err) => {
|
|
||||||
console.error(err.stack + '');
|
|
||||||
});
|
|
||||||
|
|
||||||
proxy.attach(server.server);
|
proxy.attach(server.server);
|
||||||
|
|
||||||
server.open();
|
server.open();
|
||||||
|
|||||||
@ -5,10 +5,6 @@
|
|||||||
#
|
#
|
||||||
|
|
||||||
# network: main
|
# network: main
|
||||||
use-workers: true
|
|
||||||
# max-workers: 4
|
|
||||||
# worker-timeout: 5000
|
|
||||||
# sigcache-size: 50000
|
|
||||||
|
|
||||||
#
|
#
|
||||||
# Node
|
# Node
|
||||||
@ -19,6 +15,14 @@ db: leveldb
|
|||||||
max-files: 64
|
max-files: 64
|
||||||
cache-size: 100
|
cache-size: 100
|
||||||
|
|
||||||
|
#
|
||||||
|
# Workers
|
||||||
|
#
|
||||||
|
|
||||||
|
workers: true
|
||||||
|
# workers-size: 4
|
||||||
|
# workers-timeout: 5000
|
||||||
|
|
||||||
#
|
#
|
||||||
# Logger
|
# Logger
|
||||||
#
|
#
|
||||||
@ -33,7 +37,8 @@ log-file: true
|
|||||||
|
|
||||||
prune: false
|
prune: false
|
||||||
checkpoints: true
|
checkpoints: true
|
||||||
coin-cache: 40
|
coin-cache: 0
|
||||||
|
entry-cache: 5000
|
||||||
index-tx: false
|
index-tx: false
|
||||||
index-address: false
|
index-address: false
|
||||||
|
|
||||||
@ -83,6 +88,9 @@ identity-key: 74b4147957813b62cc8987f2b711ddb31f8cb46dcbf71502033da66053c8780a
|
|||||||
# Always try to connect to these nodes.
|
# Always try to connect to these nodes.
|
||||||
# nodes: 127.0.0.1,127.0.0.2
|
# nodes: 127.0.0.1,127.0.0.2
|
||||||
|
|
||||||
|
# Only try to connect to these nodes.
|
||||||
|
# only: 127.0.0.1,127.0.0.2
|
||||||
|
|
||||||
#
|
#
|
||||||
# Miner
|
# Miner
|
||||||
#
|
#
|
||||||
@ -103,7 +111,13 @@ http-host: ::
|
|||||||
# ssl: true
|
# ssl: true
|
||||||
# ssl-cert: @/ssl/cert.crt
|
# ssl-cert: @/ssl/cert.crt
|
||||||
# ssl-key: @/ssl/priv.key
|
# ssl-key: @/ssl/priv.key
|
||||||
service-key: bikeshed
|
|
||||||
api-key: bikeshed
|
api-key: bikeshed
|
||||||
wallet-auth: false
|
|
||||||
# no-auth: false
|
# no-auth: false
|
||||||
|
|
||||||
|
#
|
||||||
|
# Wallet
|
||||||
|
#
|
||||||
|
|
||||||
|
wallet-witness: false
|
||||||
|
wallet-checkpoints: true
|
||||||
|
wallet-auth: false
|
||||||
|
|||||||
@ -263,7 +263,6 @@ bcoin.wallet = require('./wallet');
|
|||||||
bcoin.path = require('./wallet/path');
|
bcoin.path = require('./wallet/path');
|
||||||
bcoin.walletkey = require('./wallet/walletkey');
|
bcoin.walletkey = require('./wallet/walletkey');
|
||||||
bcoin.walletdb = require('./wallet/walletdb');
|
bcoin.walletdb = require('./wallet/walletdb');
|
||||||
bcoin.walletplugin = require('./wallet/plugin');
|
|
||||||
|
|
||||||
// Workers
|
// Workers
|
||||||
bcoin.workers = require('./workers');
|
bcoin.workers = require('./workers');
|
||||||
|
|||||||
@ -296,7 +296,6 @@ bcoin.define('wallet', './wallet');
|
|||||||
bcoin.define('path', './wallet/path');
|
bcoin.define('path', './wallet/path');
|
||||||
bcoin.define('walletkey', './wallet/walletkey');
|
bcoin.define('walletkey', './wallet/walletkey');
|
||||||
bcoin.define('walletdb', './wallet/walletdb');
|
bcoin.define('walletdb', './wallet/walletdb');
|
||||||
bcoin.define('walletplugin', './wallet/plugin');
|
|
||||||
|
|
||||||
// Workers
|
// Workers
|
||||||
bcoin.define('workers', './workers');
|
bcoin.define('workers', './workers');
|
||||||
|
|||||||
@ -86,7 +86,7 @@ Node.prototype.initOptions = function initOptions() {
|
|||||||
this.logger = logger.context('node');
|
this.logger = logger.context('node');
|
||||||
|
|
||||||
this.workers = new WorkerPool({
|
this.workers = new WorkerPool({
|
||||||
enabled: config.str('workers-enabled'),
|
enabled: config.bool('workers'),
|
||||||
size: config.num('workers-size'),
|
size: config.num('workers-size'),
|
||||||
timeout: config.num('workers-timeout')
|
timeout: config.num('workers-timeout')
|
||||||
});
|
});
|
||||||
|
|||||||
@ -22,7 +22,7 @@ module.exports = {
|
|||||||
module: {
|
module: {
|
||||||
rules: [{
|
rules: [{
|
||||||
test: /\.js$/,
|
test: /\.js$/,
|
||||||
exclude: /node_modules\/(bn.js|elliptic|n64)/,
|
exclude: /node_modules\/(?!bcoin|elliptic|bn\.js|n64)/,
|
||||||
loader: 'babel-loader'
|
loader: 'babel-loader'
|
||||||
}]
|
}]
|
||||||
},
|
},
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user