AudiusProject · SidSethi · Jul 13, 2022 · Jul 13, 2022 · Jul 13, 2022 · Jul 13, 2022
diff --git a/creator-node/src/components/tracks/TrackTranscodeHandoffManager.js b/creator-node/src/components/tracks/TrackTranscodeHandoffManager.js
@@ -5,6 +5,7 @@ const FormData = require('form-data')
 
 const config = require('../../config.js')
 const Utils = require('../../utils')
+const asyncRetry = require('../../utils/asyncRetry')
 const { logger: genericLogger } = require('../../logging')
 const {
  generateTimestampAndSignatureForSPVerification
@@ -202,7 +203,7 @@ class TrackTranscodeHandoffManager {
  `Polling for transcode and segments with uuid=${uuid}...`
  )
 
- return Utils.asyncRetry({
+ return asyncRetry({
  logger: TrackTranscodeHandoffManager.logger,
  asyncFn: async (bail, num) => {
  if (num === 50) {
@@ -593,7 +594,7 @@ class TrackTranscodeHandoffManager {
  return resp
  }
 
- return Utils.asyncRetry({ logger, asyncFn, logLabel, options })
+ return asyncRetry({ logger, asyncFn, logLabel, options })
  }
 }
 

diff --git a/creator-node/src/redis.js b/creator-node/src/redis.js
@@ -6,7 +6,7 @@ const Redis = require('ioredis')
 
 const config = require('./config.js')
 const { logger: genericLogger } = require('./logging')
-const { asyncRetry } = require('./utils')
+const asyncRetry = require('./utils/asyncRetry')
 
 const redisClient = new Redis(config.get('redisPort'), config.get('redisHost'))
 

diff --git a/creator-node/src/services/stateMachineManager/stateMonitoring/stateMonitoringUtils.js b/creator-node/src/services/stateMachineManager/stateMonitoring/stateMonitoringUtils.js
@@ -1,10 +1,9 @@
 const _ = require('lodash')
 const axios = require('axios')
 const { CancelToken } = axios
-const retry = require('async-retry')
 
 const config = require('../../../config')
-const Utils = require('../../../utils')
+const asyncRetry = require('../../../utils/asyncRetry')
 const { logger } = require('../../../logging')
 
 const { isPrimaryHealthy } = require('../CNodeHealthManager')
@@ -35,7 +34,7 @@ const getLatestUserIdFromDiscovery = async (discoveryNodeEndpoint) => {
  let latestUserId = 0
  try {
  // Request all users that have this node as a replica (either primary or secondary)
- const resp = await Utils.asyncRetry({
+ const resp = await asyncRetry({
  logLabel: 'fetch the ID of the newest user on Audius',
  asyncFn: async () => {
  return axios({
@@ -89,7 +88,7 @@ const getNodeUsers = async (
  )
 
  // Request all users that have this node as a replica (either primary or secondary)
- const resp = await Utils.asyncRetry({
+ const resp = await asyncRetry({
  logLabel: 'fetch all users with this node in replica',
  asyncFn: async () => {
  return axios({
@@ -459,7 +458,7 @@ const computeSyncModeForUserAndReplica = async ({
  let primaryFilesHashForRange
  try {
  // Throws error if fails after all retries
- primaryFilesHashForRange = await Utils.asyncRetry({
+ primaryFilesHashForRange = await asyncRetry({
  asyncFn: async () =>
  DBManager.fetchFilesHashFromDB({
  lookupKey: { lookupWallet: wallet },

diff --git a/creator-node/src/snapbackSM/peerSetManager.js b/creator-node/src/snapbackSM/peerSetManager.js
@@ -2,7 +2,7 @@ const axios = require('axios')
 const { CancelToken } = axios
 
 const config = require('../config')
-const Utils = require('../utils')
+const asyncRetry = require('../utils/asyncRetry')
 const { logger } = require('../logging')
 const {
  GET_NODE_USERS_TIMEOUT_MS,
@@ -145,7 +145,7 @@ class PeerSetManager {
  )
 
  // Request all users that have this node as a replica (either primary or secondary)
- const resp = await Utils.asyncRetry({
+ const resp = await asyncRetry({
  logLabel: 'fetch all users with this node in replica',
  asyncFn: async () => {
  return axios({

diff --git a/creator-node/src/snapbackSM/snapbackSM.js b/creator-node/src/snapbackSM/snapbackSM.js
@@ -4,6 +4,7 @@ const _ = require('lodash')
 const retry = require('async-retry')
 
 const Utils = require('../utils')
+const asyncRetry = require('../utils/asyncRetry')
 const models = require('../models')
 const { logger } = require('../logging')
 const redis = require('../redis.js')
@@ -1998,7 +1999,7 @@ class SnapbackSM {
  let latestUserId = 0
  try {
  // Request all users that have this node as a replica (either primary or secondary)
- const resp = await Utils.asyncRetry({
+ const resp = await asyncRetry({
  logLabel: 'fetch all users with this node in replica',
  asyncFn: async () => {
  return axios({

diff --git a/creator-node/src/utils.js b/creator-node/src/utils.js
@@ -4,7 +4,6 @@ const path = require('path')
 const axios = require('axios')
 const spawn = require('child_process').spawn
 const stream = require('stream')
-const retry = require('async-retry')
 const { promisify } = require('util')
 const pipeline = promisify(stream.pipeline)
 const { logger: genericLogger } = require('./logging.js')
@@ -351,48 +350,6 @@ function currentNodeShouldHandleTranscode({
  return currentNodeShouldHandleTranscode
 }
 
-/**
- * Wrapper around async-retry API.
- *
- * options described here https://github.com/tim-kos/node-retry#retrytimeoutsoptions
- * @param {Object} param
- * @param {func} param.asyncFn the fn to asynchronously retry
- * @param {Object} param.options optional options. defaults to the params listed below if not explicitly passed in
- * @param {number} [param.options.factor=2] the exponential factor
- * @param {number} [param.options.retries=5] the max number of retries. defaulted to 5
- * @param {number} [param.options.minTimeout=1000] minimum number of ms to wait after first retry. defaulted to 1000ms
- * @param {number} [param.options.maxTimeout=5000] maximum number of ms between two retries. defaulted to 5000ms
- * @param {func} [param.options.onRetry] fn that gets called per retry
- * @param {Object} param.logger
- * @param {Boolean} param.log enables/disables logging
- * @param {string?} param.logLabel
- * @returns the fn response if success, or throws an error
- */
-function asyncRetry({
- asyncFn,
- options = {},
- logger = genericLogger,
- log = true,
- logLabel = null
-}) {
- options = {
- retries: 5,
- factor: 2,
- minTimeout: 1000,
- maxTimeout: 5000,
- onRetry: (err, i) => {
- if (err && log) {
- const logPrefix =
- (logLabel ? `[${logLabel}] ` : '') + `[asyncRetry] [attempt #${i}]`
- logger.warn(`${logPrefix}: `, err.message || err)
- }
- },
- ...options
- }
-
- return retry(asyncFn, options)
-}
-
 module.exports = Utils
 module.exports.validateStateForImageDirCIDAndReturnFileUUID =
  validateStateForImageDirCIDAndReturnFileUUID
@@ -402,4 +359,3 @@ module.exports.findCIDInNetwork = findCIDInNetwork
 module.exports.runShellCommand = runShellCommand
 module.exports.currentNodeShouldHandleTranscode =
  currentNodeShouldHandleTranscode
-module.exports.asyncRetry = asyncRetry
diff --git a/creator-node/src/utils/asyncRetry.js b/creator-node/src/utils/asyncRetry.js
@@ -0,0 +1,45 @@
+const retry = require('async-retry')
+
+const { logger: genericLogger } = require('../logging')
+
+/**
+ * Wrapper around async-retry API.
+ *
+ * options described here https://github.com/tim-kos/node-retry#retrytimeoutsoptions
+ * @param {Object} param
+ * @param {func} param.asyncFn the fn to asynchronously retry
+ * @param {Object} param.options optional options. defaults to the params listed below if not explicitly passed in
+ * @param {number} [param.options.factor=2] the exponential factor
+ * @param {number} [param.options.retries=5] the max number of retries. defaulted to 5
+ * @param {number} [param.options.minTimeout=1000] minimum number of ms to wait after first retry. defaulted to 1000ms
+ * @param {number} [param.options.maxTimeout=5000] maximum number of ms between two retries. defaulted to 5000ms
+ * @param {func} [param.options.onRetry] fn that gets called per retry
+ * @param {Object} param.logger
+ * @param {Boolean} param.log enables/disables logging
+ * @param {string?} param.logLabel
+ * @returns the fn response if success, or throws an error
+ */
+module.exports = function asyncRetry({
+ asyncFn,
+ options = {},
+ logger = genericLogger,
+ log = true,
+ logLabel = null
+}) {
+ options = {
+ retries: 5,
+ factor: 2,
+ minTimeout: 1000,
+ maxTimeout: 5000,
+ onRetry: (err, i) => {
+ if (err && log) {
+ const logPrefix =
+ (logLabel ? `[${logLabel}] ` : '') + `[asyncRetry] [attempt #${i}]`
+ logger.warn(`${logPrefix}: `, err.message || err)
+ }
+ },
+ ...options
+ }
+
+ return retry(asyncFn, options)
+}
diff --git a/creator-node/test/utils.test.js b/creator-node/test/utils.test.js
@@ -6,6 +6,7 @@ const { logger: genericLogger } = require('../src/logging')
 
 // Module under test
 const Utils = require('../src/utils')
+const asyncRetry = require('../src/utils/asyncRetry')
 
 // Partially tested test file!!
 
@@ -47,7 +48,7 @@ describe('test src/utils.js', () => {
 
  let didRetry = false
  try {
- await Utils.asyncRetry({
+ await asyncRetry({
  logger: genericLogger,
  asyncFn: async () => {
  return axios({ url: 'https://content_node.com/404', method: 'get' })
@@ -76,7 +77,7 @@ describe('test src/utils.js', () => {
 
  let didRetry = false
  try {
- await Utils.asyncRetry({
+ await asyncRetry({
  logger: genericLogger,
  asyncFn: async () => {
  return axios({
@@ -107,7 +108,7 @@ describe('test src/utils.js', () => {
 
  let didRetry = false
  try {
- const resp = await Utils.asyncRetry({
+ const resp = await asyncRetry({
  logger: genericLogger,
  asyncFn: async () => {
  return axios({