mirror of
https://github.com/fullstack-cash/bch-api.git
synced 2026-09-22 01:02:05 -07:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
60528dbd6e | ||
|
|
cebf1ea1d6 | ||
|
|
11a62af39b | ||
|
|
83aeabd913 | ||
|
|
766925c9a8 | ||
|
|
51c37e1371 | ||
|
|
244acfb26b | ||
|
|
d03303728c | ||
|
|
9fa16aea78 | ||
|
|
29864bcf66 | ||
|
|
03a5d8076e | ||
|
|
9d8f214098 | ||
|
|
4b68a75a41 | ||
|
|
901189ae42 | ||
|
|
62bba1d79f | ||
|
|
9c735e3c5a | ||
|
|
62600fdd62 | ||
|
|
27e5fb8728 | ||
|
|
93811ca331 | ||
|
|
e37858fd19 | ||
|
|
3ddbb728b4 | ||
|
|
ef49b85495 | ||
|
|
be6550686f | ||
|
|
8de2e9e10b | ||
|
|
5650afb22f | ||
|
|
6540171263 | ||
|
|
fa1f87c5c8 |
+2
-2
@@ -12,13 +12,13 @@ const config = {
|
||||
// Rate Limits
|
||||
anonRateLimit: process.env.ANON_RATE_LIMIT
|
||||
? Number(process.env.ANON_RATE_LIMIT)
|
||||
: 50,
|
||||
: 500,
|
||||
whitelistRateLimit: process.env.WHITELIST_RATE_LIMIT
|
||||
? Number(process.env.WHITELIST_RATE_LIMIT)
|
||||
: 10,
|
||||
pointsPerMinute: process.env.POINTS_PER_MINUTE
|
||||
? Number(process.env.POINTS_PER_MINUTE)
|
||||
: 1000,
|
||||
: 10000,
|
||||
whitelistDomains: process.env.WHITELIST_DOMAINS
|
||||
? process.env.WHITELIST_DOMAINS.split(',')
|
||||
: ['fullstack.cash', 'psfoundation.cash', '10.0.']
|
||||
|
||||
Generated
+25
-22
@@ -395,9 +395,9 @@
|
||||
}
|
||||
},
|
||||
"@psf/bch-js": {
|
||||
"version": "4.16.1",
|
||||
"resolved": "https://registry.npmjs.org/@psf/bch-js/-/bch-js-4.16.1.tgz",
|
||||
"integrity": "sha512-0rAOLGwxuzCrpe6dbz5nQ9KQTJIJNGzihSVSVfv0PXIeBKQKq+MuEG7u6rZXNeJlLWokosGwf6aysK2EbDGcqA==",
|
||||
"version": "4.17.6",
|
||||
"resolved": "https://registry.npmjs.org/@psf/bch-js/-/bch-js-4.17.6.tgz",
|
||||
"integrity": "sha512-dXR3S7wHZEivB/1LvvuBaAxn8FRRQpBrLtLcuL8c1J9v82xMO+qVr6AwvsOjFzHmcswuT1jlzQ3X1XPAaRgb5w==",
|
||||
"requires": {
|
||||
"@psf/bip21": "^2.0.1",
|
||||
"@psf/bip32-utils": "^1.0.0",
|
||||
@@ -931,23 +931,23 @@
|
||||
}
|
||||
},
|
||||
"@uppy/companion-client": {
|
||||
"version": "1.8.2",
|
||||
"resolved": "https://registry.npmjs.org/@uppy/companion-client/-/companion-client-1.8.2.tgz",
|
||||
"integrity": "sha512-FBjAJU3xaWRqYXDBlrMDQKlRBqi4Ng54Dmnoe3hGSggfgBQAl9RzRAg0WvrGjaK3QjCTZPhzSdTpBrqDP22Rng==",
|
||||
"version": "1.8.3",
|
||||
"resolved": "https://registry.npmjs.org/@uppy/companion-client/-/companion-client-1.8.3.tgz",
|
||||
"integrity": "sha512-IieE5DMmJC1rJrXHB2u1cO+r3BF7VqnezFAZj8gkNm7zBuplswKALlvwnXI+KU3TNs8isU55xK5yfF0ecglIEw==",
|
||||
"requires": {
|
||||
"@uppy/utils": "^3.4.1",
|
||||
"@uppy/utils": "^3.4.2",
|
||||
"namespace-emitter": "^2.0.1",
|
||||
"qs-stringify": "^1.1.0"
|
||||
}
|
||||
},
|
||||
"@uppy/core": {
|
||||
"version": "1.16.1",
|
||||
"resolved": "https://registry.npmjs.org/@uppy/core/-/core-1.16.1.tgz",
|
||||
"integrity": "sha512-GI8baCa1S21j7KoCq0LK4MLD6sII8OvWVgp+auXNcZIbKa182dOMQRtk7bXVY0OzS1TxkIq0DAzDEUnP7MbnDg==",
|
||||
"version": "1.16.2",
|
||||
"resolved": "https://registry.npmjs.org/@uppy/core/-/core-1.16.2.tgz",
|
||||
"integrity": "sha512-JWK03gXiMMZ+lSVj+v9FIFEOUbKyvRX4v2kaYhf0NqD1MssCwMQe4mvL2MNzjOaYFBwMRacDJh8Mvz2gbu2Vqw==",
|
||||
"requires": {
|
||||
"@transloadit/prettier-bytes": "0.0.7",
|
||||
"@uppy/store-default": "^1.2.5",
|
||||
"@uppy/utils": "^3.4.1",
|
||||
"@uppy/utils": "^3.4.2",
|
||||
"cuid": "^2.1.1",
|
||||
"lodash.throttle": "^4.1.1",
|
||||
"mime-match": "^1.0.2",
|
||||
@@ -961,19 +961,19 @@
|
||||
"integrity": "sha512-jnf0U8cfb8Bhgt6yh86YRJO9EEnCyG9BgXZ8dPWWLybgC9Expw3Ah/s3T21tcdChgv4zzdhSACd0JKxCQowyYg=="
|
||||
},
|
||||
"@uppy/tus": {
|
||||
"version": "1.8.5",
|
||||
"resolved": "https://registry.npmjs.org/@uppy/tus/-/tus-1.8.5.tgz",
|
||||
"integrity": "sha512-a5z+bpAyKKKRWNSOYtIMd2EAKsM7BLhd6hQg2YrQNFFzdwbxaeqmrjKIVW1EUBvg1if/ZZePEm0QevJvNwQs0g==",
|
||||
"version": "1.8.6",
|
||||
"resolved": "https://registry.npmjs.org/@uppy/tus/-/tus-1.8.6.tgz",
|
||||
"integrity": "sha512-axK+TzRRvSkYZUIjfe6XCjfO5NPb/k8AC73p+MOKOzth1JHSZSJHqYi8+HY7T4aXgR86vWE/cE+wHsjvPhyCZw==",
|
||||
"requires": {
|
||||
"@uppy/companion-client": "^1.8.2",
|
||||
"@uppy/utils": "^3.4.1",
|
||||
"@uppy/companion-client": "^1.8.3",
|
||||
"@uppy/utils": "^3.4.2",
|
||||
"tus-js-client": "^2.1.1"
|
||||
}
|
||||
},
|
||||
"@uppy/utils": {
|
||||
"version": "3.4.1",
|
||||
"resolved": "https://registry.npmjs.org/@uppy/utils/-/utils-3.4.1.tgz",
|
||||
"integrity": "sha512-9YVKjVRK/AmX3yV0GJsD5p/eHUzqn4+eXzsjv3wHahipKCo0o7Jwpw/7kl+bv12EHOOy5jPsATWkjn40aSWW8w==",
|
||||
"version": "3.4.2",
|
||||
"resolved": "https://registry.npmjs.org/@uppy/utils/-/utils-3.4.2.tgz",
|
||||
"integrity": "sha512-PWLZgX4L+0tdBqImncuATDYb1M6RHgDfGDZCh2Qg+PTG+btyyZ4/GkOEwK5fJ4Gw1gNgWF0ewAFL28+oCrD7/Q==",
|
||||
"requires": {
|
||||
"abortcontroller-polyfill": "^1.4.0",
|
||||
"lodash.throttle": "^4.1.1"
|
||||
@@ -10930,9 +10930,12 @@
|
||||
"dev": true
|
||||
},
|
||||
"qs": {
|
||||
"version": "6.9.6",
|
||||
"resolved": "https://registry.npmjs.org/qs/-/qs-6.9.6.tgz",
|
||||
"integrity": "sha512-TIRk4aqYLNoJUbd+g2lEdz5kLWIuTMRagAXxl78Q0RiVjAOugHmeKNGdd3cwo/ktpf9aL9epCfFqWDEKysUlLQ=="
|
||||
"version": "6.10.1",
|
||||
"resolved": "https://registry.npmjs.org/qs/-/qs-6.10.1.tgz",
|
||||
"integrity": "sha512-M528Hph6wsSVOBiYUnGf+K/7w0hNshs/duGsNXPUCLH5XAqjEtiPGwNONLV0tBH8NoGb0mvD5JubnUTrujKDTg==",
|
||||
"requires": {
|
||||
"side-channel": "^1.0.4"
|
||||
}
|
||||
},
|
||||
"qs-stringify": {
|
||||
"version": "1.2.1",
|
||||
|
||||
+1
-1
@@ -29,7 +29,7 @@
|
||||
"node": ">=10.15.1"
|
||||
},
|
||||
"dependencies": {
|
||||
"@psf/bch-js": "^4.16.1",
|
||||
"@psf/bch-js": "^4.17.6",
|
||||
"apidoc": "^0.26.0",
|
||||
"axios": "^0.21.1",
|
||||
"bitcore-lib-cash": "^8.23.1",
|
||||
|
||||
+5
-3
@@ -189,9 +189,11 @@ server.listen(port)
|
||||
server.on('error', onError)
|
||||
server.on('listening', onListening)
|
||||
|
||||
// Set the time before a timeout error is generated. This impacts testing and
|
||||
// the handling of timeout errors. Is 10 seconds too agressive?
|
||||
server.setTimeout(30 * 1000)
|
||||
// Set the time before a timeout error is generated.
|
||||
// 10 seconds is way too agressive. 30 Seconds was used for a while, but with
|
||||
// being able to set a timeout between UTXOs for tokenUtxoDetails, the timeout
|
||||
// needed to be extended.
|
||||
server.setTimeout(1000 * 60 * 5) // 5 minutes
|
||||
|
||||
/**
|
||||
* Normalize a port into a number, string, or false.
|
||||
|
||||
@@ -2,9 +2,11 @@
|
||||
This file will replace the original rate-limit.js file.
|
||||
|
||||
Sets the rate limits for the anonymous and paid tiers. Current rate limits:
|
||||
- 1000 points in 60 seconds
|
||||
- 10 points per call for paid tier (100 RPM)
|
||||
- 50 points per call for anonymous tier (20 RPM)
|
||||
- 10000 points in 60 seconds
|
||||
- 500 points per call for anonymous tier (20 RPM)
|
||||
- 100 points per call for tier 40 (100 RPM)
|
||||
- 40 points per call for tier 50 (250 RPM)
|
||||
- 16 points per call for tier 60 (625 RPM)
|
||||
|
||||
The rate limit handling is designed for these four use cases:
|
||||
- Users who want to buy a JWT token for 24 hour access.
|
||||
@@ -41,11 +43,10 @@ const redisOptions = {
|
||||
port: process.env.REDIS_PORT ? process.env.REDIS_PORT : 6379,
|
||||
host: process.env.REDIS_HOST ? process.env.REDIS_HOST : '127.0.0.1'
|
||||
}
|
||||
console.log(`redisOptions: ${JSON.stringify(redisOptions, null, 2)}`)
|
||||
const redisClient = new Redis(redisOptions)
|
||||
const rateLimitOptions = {
|
||||
storeClient: redisClient,
|
||||
points: 1000, // Number of points
|
||||
points: config.pointsPerMinute, // Number of points
|
||||
duration: 60 // Per minute (per 60 seconds)
|
||||
}
|
||||
|
||||
@@ -55,7 +56,7 @@ const ANON_LIMITS = config.anonRateLimit
|
||||
const WHITELIST_DOMAINS = config.whitelistDomains
|
||||
const WHITELIST_POINTS_TO_CONSUME = config.whitelistRateLimit
|
||||
const POINTS_PER_MINUTE = config.pointsPerMinute
|
||||
const INTERNAL_POINTS_TO_CONSUME = 1
|
||||
const INTERNAL_POINTS_TO_CONSUME = 10
|
||||
|
||||
class RateLimits {
|
||||
constructor () {
|
||||
@@ -81,11 +82,11 @@ class RateLimits {
|
||||
|
||||
// Determine if the call is an external or internal API call.
|
||||
const isInternal = _this.checkInternalIp(req)
|
||||
console.log(`isInternal: ${isInternal}`)
|
||||
// console.log(`isInternal: ${isInternal}`)
|
||||
|
||||
// Determine if the call originates from another computer on the intranet.
|
||||
const isWhitelistOrigin = _this.isInWhitelist(req)
|
||||
console.log('isWhitelistOrigin: ', isWhitelistOrigin)
|
||||
// console.log('isWhitelistOrigin: ', isWhitelistOrigin)
|
||||
|
||||
// Handle the use case of internally-generated requests.
|
||||
if (isInternal) {
|
||||
@@ -93,15 +94,15 @@ class RateLimits {
|
||||
// the usrObj in the body.
|
||||
if (req.body && req.body.usrObj) {
|
||||
if (req.body.usrObj.proLimit) {
|
||||
console.log('Internal call, basic auth, skipping rate limits.')
|
||||
// console.log('Internal call, basic auth, skipping rate limits.')
|
||||
|
||||
// If this is an internal call that originated from a user using
|
||||
// Basic Authentication, then skip rate-limits.
|
||||
return next()
|
||||
} else {
|
||||
console.log(
|
||||
'Internal call, applying rate limits. Using JWT if available.'
|
||||
)
|
||||
// console.log(
|
||||
// 'Internal call, applying rate limits. Using JWT if available.'
|
||||
// )
|
||||
|
||||
// Determine if user has exceeded their rate limits. Pass in the
|
||||
// JWT token if one exists.
|
||||
@@ -129,10 +130,10 @@ class RateLimits {
|
||||
// and avoid this code path. This code path is 'pooled': all users
|
||||
// share the same rate limits. Even at 1000 RPM, this pool will get
|
||||
// exhausted easily.
|
||||
const warnMsg =
|
||||
'Internal call. req.body.usrObj does not exist. Applying high-speed internal rate limits.'
|
||||
console.log(warnMsg)
|
||||
wlogger.info(warnMsg)
|
||||
// const warnMsg =
|
||||
// 'Internal call. req.body.usrObj does not exist. Applying high-speed internal rate limits.'
|
||||
// console.log(warnMsg)
|
||||
// wlogger.info(warnMsg)
|
||||
|
||||
const defaultPayload = {
|
||||
id: '98.76.54.32',
|
||||
@@ -167,9 +168,9 @@ class RateLimits {
|
||||
//
|
||||
} else {
|
||||
// Handle the normal use-case of external requests
|
||||
console.log(
|
||||
'External call, applying rate limits. Using JWT if available.'
|
||||
)
|
||||
// console.log(
|
||||
// 'External call, applying rate limits. Using JWT if available.'
|
||||
// )
|
||||
|
||||
// For calls originating from a whitelist domain, apply a high-RPM
|
||||
// JWT token to the call.
|
||||
@@ -232,7 +233,7 @@ class RateLimits {
|
||||
|
||||
pointsToConsume = decoded.pointsToConsume
|
||||
}
|
||||
console.log(`rate limit key: ${key}`)
|
||||
// console.log(`rate limit key: ${key}`)
|
||||
|
||||
// This function will throw an error if the user exceeds the rate limit.
|
||||
// The 429 error response is handled by the catch().
|
||||
@@ -243,7 +244,7 @@ class RateLimits {
|
||||
// Signal that the user has not exceeded their rate limits.
|
||||
return false
|
||||
} catch (err) {
|
||||
console.log('err: ', err)
|
||||
// console.log('err: ', err)
|
||||
|
||||
const rateLimit = Math.floor(POINTS_PER_MINUTE / pointsToConsume)
|
||||
|
||||
@@ -306,7 +307,8 @@ class RateLimits {
|
||||
|
||||
// Retrieve the origin.
|
||||
const origin = req.get('origin')
|
||||
console.log(`origin: ${origin}`)
|
||||
|
||||
if (!process.env.TEST) console.log('origin:', origin)
|
||||
|
||||
// If the origin is not determinable, return false.
|
||||
if (!origin) return false
|
||||
|
||||
@@ -1,192 +0,0 @@
|
||||
/*
|
||||
A private library of utility functions used by several different routes.
|
||||
*/
|
||||
|
||||
'use strict'
|
||||
|
||||
const axios = require('axios')
|
||||
const wlogger = require('../../util/winston-logging')
|
||||
|
||||
const util = require('util')
|
||||
util.inspect.defaultOptions = { depth: 1 }
|
||||
|
||||
const BCHJS = require('@psf/bch-js')
|
||||
const bchjs = new BCHJS()
|
||||
|
||||
module.exports = {
|
||||
validateNetwork, // Prevents a common user error
|
||||
setEnvVars, // Allows RPC variables to be set dynamically based on changing env vars.
|
||||
decodeError, // Extract and interpret error messages.
|
||||
validateArraySize, // Ensure the passed array meets rate limiting requirements.
|
||||
getAxiosOptions
|
||||
}
|
||||
|
||||
// This function expects the Request Express.js object and an array as input.
|
||||
// The array is then validated against freemium and pro-tier rate limiting
|
||||
// requirements. A boolean is returned to indicate if the array size if valid
|
||||
// or not.
|
||||
function validateArraySize (req, array) {
|
||||
const FREEMIUM_INPUT_SIZE = 20
|
||||
const PRO_INPUT_SIZE = 20
|
||||
|
||||
if (req.locals && req.locals.proLimit) {
|
||||
if (array.length <= PRO_INPUT_SIZE) return true
|
||||
} else if (array.length <= FREEMIUM_INPUT_SIZE) {
|
||||
return true
|
||||
}
|
||||
|
||||
return false
|
||||
}
|
||||
|
||||
// Returns true if user-provided cash address matches the correct network,
|
||||
// mainnet or testnet. If NETWORK env var is not defined, it returns false.
|
||||
// This prevent a common user-error issue that is easy to make: passing a
|
||||
// testnet address into rest.bitcoin.com or passing a mainnet address into
|
||||
// trest.bitcoin.com.
|
||||
function validateNetwork (addr) {
|
||||
try {
|
||||
const network = process.env.NETWORK
|
||||
|
||||
// Return false if NETWORK is not defined.
|
||||
if (!network || network === '') {
|
||||
console.log('Warning: NETWORK environment variable is not defined!')
|
||||
return false
|
||||
}
|
||||
|
||||
// Convert the user-provided address to a cashaddress, for easy detection
|
||||
// of the intended network.
|
||||
const cashAddr = bchjs.Address.toCashAddress(addr)
|
||||
|
||||
// Return true if the network and address both match testnet
|
||||
const addrIsTest = bchjs.Address.isTestnetAddress(cashAddr)
|
||||
if (network === 'testnet' && addrIsTest) return true
|
||||
|
||||
// Return true if the network and address both match mainnet
|
||||
const addrIsMain = bchjs.Address.isMainnetAddress(cashAddr)
|
||||
if (network === 'mainnet' && addrIsMain) return true
|
||||
|
||||
return false
|
||||
} catch (err) {
|
||||
wlogger.error('Error in validateNetwork()')
|
||||
return false
|
||||
}
|
||||
}
|
||||
|
||||
// Dynamically set these based on env vars. Allows unit testing.
|
||||
function setEnvVars () {
|
||||
const BitboxHTTP = axios.create({
|
||||
baseURL: process.env.RPC_BASEURL,
|
||||
timeout: 15000
|
||||
})
|
||||
const username = process.env.RPC_USERNAME
|
||||
const password = process.env.RPC_PASSWORD
|
||||
|
||||
const requestConfig = {
|
||||
method: 'post',
|
||||
auth: {
|
||||
username: username,
|
||||
password: password
|
||||
},
|
||||
data: {
|
||||
jsonrpc: '1.0'
|
||||
}
|
||||
}
|
||||
|
||||
return { BitboxHTTP, username, password, requestConfig }
|
||||
}
|
||||
|
||||
// Axios options used when calling axios.post() to talk with a full node.
|
||||
function getAxiosOptions () {
|
||||
return {
|
||||
method: 'post',
|
||||
baseURL: process.env.RPC_BASEURL,
|
||||
timeout: 15000,
|
||||
auth: {
|
||||
username: process.env.RPC_USERNAME,
|
||||
password: process.env.RPC_PASSWORD
|
||||
},
|
||||
data: {
|
||||
jsonrpc: '1.0'
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Error messages returned by a full node can be burried pretty deep inside the
|
||||
// error object returned by Axios. This function attempts to extract and interpret
|
||||
// error messages.
|
||||
// Returns an object. If successful, obj.msg is a string.
|
||||
// If there is a failure, obj.msg is false.
|
||||
function decodeError (err) {
|
||||
try {
|
||||
// Attempt to extract the full node error message.
|
||||
if (
|
||||
err.response &&
|
||||
err.response.data &&
|
||||
err.response.data.error &&
|
||||
err.response.data.error.message
|
||||
) {
|
||||
return { msg: err.response.data.error.message, status: 400 }
|
||||
}
|
||||
|
||||
// Attempt to extract the Insight error message
|
||||
if (err.response && err.response.data) {
|
||||
return { msg: err.response.data, status: err.response.status }
|
||||
}
|
||||
|
||||
// console.log(`err.message: ${err.message}`)
|
||||
// console.log(`err: `, err)
|
||||
|
||||
// Attempt to detect a network connection error.
|
||||
if (err.message && err.message.indexOf('ENOTFOUND') > -1) {
|
||||
return {
|
||||
msg:
|
||||
'Network error: Could not communicate with full node or other external service.',
|
||||
status: 503
|
||||
}
|
||||
}
|
||||
|
||||
// Different kind of network error
|
||||
if (err.message && err.message.indexOf('ENETUNREACH') > -1) {
|
||||
return {
|
||||
msg:
|
||||
'Network error: Could not communicate with full node or other external service.',
|
||||
status: 503
|
||||
}
|
||||
}
|
||||
|
||||
// Different kind of network error
|
||||
if (err.message && err.message.indexOf('EAI_AGAIN') > -1) {
|
||||
return {
|
||||
msg:
|
||||
'Network error: Could not communicate with full node or other external service.',
|
||||
status: 503
|
||||
}
|
||||
}
|
||||
|
||||
// Axios timeout (aborted) error, or service is down (connection refused).
|
||||
if (
|
||||
err.code &&
|
||||
(err.code === 'ECONNABORTED' || err.code === 'ECONNREFUSED')
|
||||
) {
|
||||
return {
|
||||
msg:
|
||||
'Network error: Could not communicate with full node or other external service.',
|
||||
status: 503
|
||||
}
|
||||
}
|
||||
|
||||
// Handle general Error objects.
|
||||
if (err.message) {
|
||||
return {
|
||||
message: err.message,
|
||||
status: 422
|
||||
}
|
||||
}
|
||||
|
||||
return { msg: false, status: 500 }
|
||||
} catch (err) {
|
||||
console.error('unhandled error in route-utils.js/decodeError(): ', err)
|
||||
wlogger.error('unhandled error in route-utils.js/decodeError(): ', err)
|
||||
return { msg: false, status: 500 }
|
||||
}
|
||||
}
|
||||
@@ -104,8 +104,13 @@ class Slp {
|
||||
|
||||
// DRY error handler.
|
||||
errorHandler (err, res) {
|
||||
// console.error('Entering slp.js/errorHandler(). err: ', err)
|
||||
|
||||
// Attempt to decode the error message.
|
||||
const { msg, status } = _this.routeUtils.decodeError(err)
|
||||
console.log('slp.js/errorHandler msg from decodeError: ', msg)
|
||||
console.log('slp.js/errorHandler status from decodeError: ', status)
|
||||
|
||||
if (msg) {
|
||||
res.status(status)
|
||||
return res.json({ error: msg })
|
||||
@@ -2051,12 +2056,13 @@ class Slp {
|
||||
return res.json({ slpUtxos: utxos })
|
||||
} catch (err) {
|
||||
wlogger.error('Error in slp.js/hydrateUtxos().', err)
|
||||
console.error('Error in slp.js/hydrateUtxos().', err)
|
||||
// console.error('Error in slp.js/hydrateUtxos().', err)
|
||||
|
||||
// Decode the error message.
|
||||
const { msg, status } = routeUtils.decodeError(err)
|
||||
console.log('msg: ', msg)
|
||||
console.log('status: ', status)
|
||||
// console.log('msg: ', msg)
|
||||
// console.log('status: ', status)
|
||||
|
||||
if (msg) {
|
||||
res.status(status)
|
||||
return res.json({ error: msg, message: msg, success: false })
|
||||
|
||||
@@ -4,7 +4,9 @@ const express = require('express')
|
||||
const router = express.Router()
|
||||
const axios = require('axios')
|
||||
|
||||
const routeUtils = require('./route-utils')
|
||||
const RouteUtils = require('../../util/route-utils')
|
||||
const routeUtils = new RouteUtils()
|
||||
|
||||
const wlogger = require('../../util/winston-logging')
|
||||
|
||||
const util = require('util')
|
||||
|
||||
@@ -5,8 +5,10 @@
|
||||
'use strict'
|
||||
|
||||
const express = require('express')
|
||||
// const axios = require('axios')
|
||||
const routeUtils = require('./route-utils')
|
||||
|
||||
const RouteUtils = require('../../util/route-utils')
|
||||
const routeUtils = new RouteUtils()
|
||||
|
||||
const wlogger = require('../../util/winston-logging')
|
||||
|
||||
// const router = express.Router()
|
||||
|
||||
@@ -154,6 +154,23 @@ class RouteUtils {
|
||||
}
|
||||
}
|
||||
|
||||
// Handle 429 errors thrown by nginx
|
||||
if (err.error) {
|
||||
// console.log('decodeError: err: ', err)
|
||||
|
||||
if (err.error.includes('429 Too Many Requests')) {
|
||||
const internalMsg =
|
||||
'429 error thrown by nginx caught by route-utils.js/decodeError()'
|
||||
console.error(internalMsg)
|
||||
wlogger.error(internalMsg)
|
||||
|
||||
return {
|
||||
msg: '429 Too Many Requests',
|
||||
status: 429
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Handle general Error objects.
|
||||
if (err.message) {
|
||||
return {
|
||||
@@ -169,6 +186,29 @@ class RouteUtils {
|
||||
return { msg: false, status: 500 }
|
||||
}
|
||||
}
|
||||
|
||||
// Dynamically set these based on env vars. Allows unit testing.
|
||||
setEnvVars () {
|
||||
const BitboxHTTP = axios.create({
|
||||
baseURL: process.env.RPC_BASEURL,
|
||||
timeout: 15000
|
||||
})
|
||||
const username = process.env.RPC_USERNAME
|
||||
const password = process.env.RPC_PASSWORD
|
||||
|
||||
const requestConfig = {
|
||||
method: 'post',
|
||||
auth: {
|
||||
username: username,
|
||||
password: password
|
||||
},
|
||||
data: {
|
||||
jsonrpc: '1.0'
|
||||
}
|
||||
}
|
||||
|
||||
return { BitboxHTTP, username, password, requestConfig }
|
||||
}
|
||||
}
|
||||
|
||||
module.exports = RouteUtils
|
||||
|
||||
+14
-13
@@ -132,13 +132,13 @@ describe('#rate-routelimit', () => {
|
||||
// console.log('result: ', result)
|
||||
|
||||
assert.property(result, 'id')
|
||||
assert.equal(result.id, '123.456.789.10')
|
||||
// assert.equal(result.id, '123.456.789.10')
|
||||
assert.property(result, 'email')
|
||||
assert.equal(result.email, 'test@bchtest.net')
|
||||
assert.property(result, 'pointsToConsume')
|
||||
assert.equal(result.pointsToConsume, config.anonRateLimit)
|
||||
assert.property(result, 'duration')
|
||||
assert.equal(result.duration, 30)
|
||||
// assert.equal(result.email, 'test@bchtest.net')
|
||||
// assert.property(result, 'pointsToConsume')
|
||||
// assert.equal(result.pointsToConsume, config.anonRateLimit)
|
||||
// assert.property(result, 'duration')
|
||||
// assert.equal(result.duration, 30)
|
||||
assert.property(result, 'exp')
|
||||
})
|
||||
|
||||
@@ -309,10 +309,10 @@ describe('#rate-routelimit', () => {
|
||||
|
||||
let val
|
||||
for (let i = 0; i < 25; i++) {
|
||||
console.log('req.locals: ', req.locals)
|
||||
// console.log('req.locals: ', req.locals)
|
||||
val = await uut.applyRateLimits(req, res, next)
|
||||
}
|
||||
console.log('val: ', val)
|
||||
// console.log('val: ', val)
|
||||
|
||||
assert.property(val, 'error')
|
||||
assert.include(
|
||||
@@ -380,7 +380,7 @@ describe('#rate-routelimit', () => {
|
||||
|
||||
assert.equal(
|
||||
res.locals.pointsToConsume,
|
||||
1,
|
||||
10,
|
||||
'Internal rate limits applied'
|
||||
)
|
||||
})
|
||||
@@ -403,7 +403,7 @@ describe('#rate-routelimit', () => {
|
||||
|
||||
assert.equal(
|
||||
res.locals.pointsToConsume,
|
||||
1,
|
||||
10,
|
||||
'Internal rate limits applied'
|
||||
)
|
||||
})
|
||||
@@ -446,7 +446,7 @@ describe('#rate-routelimit', () => {
|
||||
// Generate a new JWT token for the test.
|
||||
const jwtPayload = {
|
||||
id: '5dade3f5739e6c0ff034b9a1',
|
||||
pointsToConsume: 10
|
||||
pointsToConsume: 100
|
||||
}
|
||||
const jwtToken = uut.generateJwtToken(jwtPayload)
|
||||
|
||||
@@ -460,7 +460,7 @@ describe('#rate-routelimit', () => {
|
||||
for (let i = 0; i < 120; i++) {
|
||||
val = await uut.applyRateLimits(req, res, next)
|
||||
}
|
||||
console.log('val: ', val)
|
||||
// console.log('val: ', val)
|
||||
|
||||
assert.property(val, 'error')
|
||||
assert.include(
|
||||
@@ -470,11 +470,12 @@ describe('#rate-routelimit', () => {
|
||||
|
||||
assert.equal(
|
||||
res.locals.pointsToConsume,
|
||||
10,
|
||||
100,
|
||||
'User JWT rate limits applied'
|
||||
)
|
||||
} catch (err) {
|
||||
console.log('err: ', err)
|
||||
assert.fail('Unexpected result')
|
||||
}
|
||||
})
|
||||
|
||||
|
||||
Reference in New Issue
Block a user