update cryptoBalance notification

lib/config-validate.js

@@ -147,6 +147,7 @@ function validateRequires (config) {
     return schema.groups.filter(group => {
       return group.fields.some(fieldCode => {
         const field = getGroupField(group, fieldCode)
+
         if (!field.fieldValidation.find(r => r.code === 'required')) return false
 
         const refFields = _.map(_.partial(getField, group), field.enabledIf)

lib/notifier.js

@@ -12,14 +12,18 @@ const STALE_STATE = 2 * T.minute
 const NETWORK_DOWN_TIME = 1 * T.minute
 const ALERT_SEND_INTERVAL = T.hour
 
-const PING = Symbol('PING')
-const STALE = Symbol('STALE')
-const LOW_BALANCE = Symbol('LOW_BALANCE')
+const PING = 'PING'
+const STALE = 'STALE'
+const LOW_CRYPTO_BALANCE = 'LOW_CRYPTO_BALANCE'
+const CASH_BOX_FULL = 'CASH_BOX_FULL'
+const LOW_CASH_OUT = 'LOW_CASH_OUT'
 
 const CODES_DISPLAY = {
-  [PING]: 'Machine Down',
-  [STALE]: 'Machine Stuck',
-  [LOW_BALANCE]: 'Low Balance'
+  PING: 'Machine Down',
+  STALE: 'Machine Stuck',
+  LOW_CRYPTO_BALANCE: 'Low Crypto Balance',
+  CASH_BOX_FULL: 'Cash box full',
+  LOW_CASH_OUT: 'Low Cash-out'
 }
 
 let alertFingerprint
@@ -151,7 +155,7 @@ function checkStatus (plugins) {
   .then(([balances, events, devices]) => {
     return checkPings(devices)
     .then(pings => {
-      alerts.general = balances
+      alerts.general = _.filter(r => !r.deviceId, balances)
       devices.forEach(function (device) {
         const deviceId = device.deviceId
         const deviceName = device.name
@@ -159,12 +163,13 @@ function checkStatus (plugins) {
           return eventRow.device_id === deviceId
         })
 
+        const balanceAlerts = _.filter(['deviceId', deviceId], balances)
         const ping = pings[deviceId] || []
         const stuckScreen = checkStuckScreen(deviceEvents)
 
         const deviceAlerts = _.isEmpty(ping) ? stuckScreen : ping
 
-        alerts.devices[deviceId] = deviceAlerts
+        alerts.devices[deviceId] = _.concat(deviceAlerts, balanceAlerts)
         alerts.deviceNames[deviceId] = deviceName
       })
 
@@ -188,9 +193,13 @@ function emailAlert (alert) {
     case STALE:
       const stuckAge = prettyMs(alert.age, {compact: true, verbose: true})
       return `Machine is stuck on ${alert.state} screen for ${stuckAge}`
-    case LOW_BALANCE:
+    case LOW_CRYPTO_BALANCE:
       const balance = formatCurrency(alert.fiatBalance.balance, alert.fiatCode)
-      return `Low balance of ${balance} in ${alert.cryptoCode} wallet`
+      return `Low balance in ${alert.cryptoCode} [${balance}]`
+    case CASH_BOX_FULL:
+      return `Cash box full on ${alert.machineName} [${alert.notes} banknotes]`
+    case LOW_CASH_OUT:
+      return `Cassette for ${alert.denomination} ${alert.fiatCode} low [${alert.notes} banknotes]`
   }
 }
 

lib/plugins.js

@@ -470,48 +470,70 @@ function plugins (settings, deviceId) {
     return Promise.all(promises)
   }
 
-  function checkDeviceBalances (_deviceId) {
-    const config = configManager.machineScoped(_deviceId, settings.config)
-    const cryptoCodes = config.cryptoCurrencies
-    const fiatCode = config.fiatCurrency
-
-    const fiatBalancePromises = cryptoCodes.map(c => fiatBalance(fiatCode, c))
-
-    return Promise.all(fiatBalancePromises)
-    .then(arr => {
-      return arr.map((balance, i) => ({
-        fiatBalance: balance,
-        cryptoCode: cryptoCodes[i],
-        fiatCode,
-        _deviceId
-      }))
-    })
+  function checkDevicesCashBalances (fiatCode, devices) {
+    return _.map(device => checkDeviceCashBalances(fiatCode, device), devices)
   }
 
-  function checkBalance (rec) {
-    const config = configManager.unscoped(settings.config)
-    const lowBalanceThreshold = config.lowBalanceThreshold
+  function checkDeviceCashBalances (fiatCode, device) {
+    const config = configManager.machineScoped(device.deviceId, settings.config)
+    const denomination1 = config.topCashOutDenomination
+    const denomination2 = config.bottomCashOutDenomination
+    const machineName = config.machineName
 
-    return rec.fiatBalance.balance <= lowBalanceThreshold
-    ? {code: Symbol('LOW_BALANCE'), cryptoCode: rec.cryptoCode, fiatBalance: rec.fiatBalance, fiatCode: rec.fiatCode}
+    const cashInAlert = device.cashbox > config.cashInAlertThreshold
+    ? {code: 'CASH_BOX_FULL', machineName, deviceId: device.deviceId, notes: device.cashbox}
+    : null
+
+    const cassette1Alert = device.cassette1 < config.cashOutCassette1AlertThreshold
+    ? {code: 'LOW_CASH_OUT', cassette: 1, machineName, deviceId: device.deviceId,
+      notes: device.cassette1, denomination: denomination1, fiatCode}
+    : null
+
+    const cassette2Alert = device.cassette2 < config.cashOutCassette2AlertThreshold
+    ? {code: 'LOW_CASH_OUT', cassette: 2, machineName, deviceId: device.deviceId,
+      notes: device.cassette2, denomination: denomination2, fiatCode}
+    : null
+
+    return _.compact([cashInAlert, cassette1Alert, cassette2Alert])
+  }
+
+  function checkCryptoBalances (fiatCode, devices) {
+    const fiatBalancePromises = cryptoCodes => _.map(c => fiatBalance(fiatCode, c), cryptoCodes)
+
+    const fetchCryptoCodes = _deviceId => {
+      const config = configManager.machineScoped(_deviceId, settings.config)
+      return config.cryptoCurrencies
+    }
+
+    const union = _.flow(_.map(fetchCryptoCodes), _.flatten, _.uniq)
+    const cryptoCodes = union(devices)
+    const checkCryptoBalanceWithFiat = _.partial(checkCryptoBalance, [fiatCode])
+
+    return Promise.all(fiatBalancePromises(cryptoCodes))
+    .then(balances => _.map(checkCryptoBalanceWithFiat, _.zip(cryptoCodes, balances)))
+  }
+
+  function checkCryptoBalance (fiatCode, rec) {
+    const [cryptoCode, fiatBalance] = rec
+    const config = configManager.cryptoScoped(cryptoCode, settings.config)
+    const cryptoAlertThreshold = config.cryptoAlertThreshold
+
+    return BN(fiatBalance.balance).lt(cryptoAlertThreshold)
+    ? {code: 'LOW_CRYPTO_BALANCE', cryptoCode, fiatBalance, fiatCode}
     : null
   }
 
   function checkBalances () {
+    const globalConfig = configManager.unscoped(settings.config)
+    const fiatCode = globalConfig.fiatCurrency
+
     return machineLoader.getMachines()
     .then(devices => {
-      const deviceIds = devices.map(r => r.deviceId)
-      const deviceBalancePromises = deviceIds.map(deviceId => checkDeviceBalances(deviceId))
-
-      return Promise.all(deviceBalancePromises)
-      .then(arr => {
-        const toMarket = r => [r.fiatCode, r.cryptoCode].join('')
-        const min = _.minBy(r => r.fiatBalance)
-        const byMarket = _.groupBy(toMarket, _.flatten(arr))
-        const minByMarket = _.flatMap(min, byMarket)
-
-        return _.reject(_.isNil, _.map(checkBalance, minByMarket))
-      })
+      return Promise.all([
+        checkCryptoBalances(fiatCode, devices),
+        checkDevicesCashBalances(fiatCode, devices)
+      ])
+      .then(_.flow(_.flattenDeep, _.compact))
     })
   }
 

lib/poller.js

@@ -12,7 +12,9 @@ const SWEEP_HD_INTERVAL = T.minute
 const TRADE_INTERVAL = 10 * T.seconds
 const PONG_INTERVAL = 10 * T.seconds
 const PONG_CLEAR_INTERVAL = 1 * T.day
+
 const CHECK_NOTIFICATION_INTERVAL = 20 * T.seconds
+
 const PENDING_INTERVAL = 10 * T.seconds
 
 let _pi, _settings