Concert TrackContentUploadManager to typescript (#4251)

AudiusProject · Nov 2, 2022 · 6fa72ca · 6fa72ca
1 parent cc676ef
commit 6fa72ca
Show file tree

Hide file tree

Showing 12 changed files with 208 additions and 159 deletions.
diff --git a/creator-node/src/AsyncProcessingQueue.ts b/creator-node/src/AsyncProcessingQueue.ts
@@ -1,6 +1,7 @@
 import type { Job } from 'bullmq'
 import type { Request } from 'express'
 import type { SpanContext } from '@opentelemetry/api'
+import type { LogContext } from './apiHelpers'
 
 import { Queue, Worker } from 'bullmq'
 import { logger } from './logging'
@@ -41,7 +42,7 @@ export const ProcessStates = {
 } as const
 
 type AddTaskParams = {
-  logContext: { requestID: string }
+  logContext: LogContext
   task: string
   req: Request
   parentSpanContext?: SpanContext
@@ -95,7 +96,7 @@ export class AsyncProcessingQueue {
                 ]
               : [],
             attributes: {
-              requestID: logContext.requestID,
+              requestID: logContext.requestId,
               [tracing.CODE_FILEPATH]: __filename
             }
           }
@@ -250,7 +251,7 @@ export class AsyncProcessingQueue {
   async monitorProgress(
     task: string,
     func: (...args: any) => any,
-    { logContext, req }: { logContext: any; req: Request }
+    { logContext, req }: { logContext: LogContext; req: Request }
   ) {
     const uuid = logContext.requestID
     const redisKey = this.constructAsyncProcessingKey(uuid)

diff --git a/creator-node/src/ImageProcessingQueue.ts b/creator-node/src/ImageProcessingQueue.ts
@@ -1,5 +1,6 @@
 import type { PrometheusRegistry } from './services/prometheusMonitoring/prometheusRegistry'
 import type { ValuesOf } from './utils'
+import type { LogContext } from './apiHelpers'
 
 import { Queue, QueueEvents, Worker } from 'bullmq'
 import path from 'path'
@@ -74,10 +75,10 @@ export class ImageProcessingQueue {
 
   /**
    * Logs a status message and includes current queue info
-   * @param {object} logContext to create a logger.child(logContext) from
+   * @param {LogContext} logContext to create a logger.child(logContext) from
    * @param {string} message
    */
-  async logStatus(logContext: Object, message: string) {
+  async logStatus(logContext: LogContext, message: string) {
     const logger = genericLogger.child(logContext)
     const count = await this.queue.count()
     logger.info(`Image Processing Queue (count ${count}): ${message}`)
@@ -118,7 +119,7 @@ export class ImageProcessingQueue {
     fileName: string
     sizes: Record<string, number>
     square: boolean
-    logContext: Object
+    logContext: LogContext
   }) {
     const job = await this.queue.add(ProcessNames.resizeImage, {
       file,

diff --git a/creator-node/src/TranscodingQueue.js b/creator-node/src/TranscodingQueue.js
@@ -157,7 +157,7 @@ class TranscodingQueue {
    * @param {string} fileDir
    * @param {string} fileName
    * @param {Object} logContext to create a logger.child(logContext) from
-   * @returns {Object} response in the structure 
+   * @returns response in the structure 
     {
       segments: {
         fileNames: segmentFileNames {string[]}: the segment file names only, 
@@ -194,7 +194,7 @@ class TranscodingQueue {
    * @param {string} fileDir
    * @param {string} fileName
    * @param {Object} logContext to create a logger.child(logContext) from
-   * @returns {Object} { transcodeFilePath {string}: where the transcode exists in the fs }
+   * @returns { transcodeFilePath {string}: where the transcode exists in the fs }
    */
   async transcode320(fileDir, fileName, { logContext }) {
     this.logStatus(

diff --git a/creator-node/src/apiHelpers.ts b/creator-node/src/apiHelpers.ts
@@ -20,6 +20,10 @@ export type CustomRequest = Request & {
   normalizedPath?: string
 }
 
+export type LogContext = {
+  requestID: string
+}
+
 type ApiResponse = {
   statusCode: number
   object: {

diff --git a/creator-node/src/components/replicaSet/syncQueueComponentService.ts b/creator-node/src/components/replicaSet/syncQueueComponentService.ts
@@ -1,4 +1,5 @@
 import type { SpanContext } from '@opentelemetry/api'
+import type { LogContext } from '../../apiHelpers'
 
 /**
  * Enqueues sync operation into syncQueue for provided walletPublicKeys against provided creatorNodeEndpoint
@@ -18,7 +19,7 @@ export const enqueueSync = async (params: {
     wallet: string
   }
   forceWipe: boolean
-  logContext: Object
+  logContext: LogContext
   parentSpanContext: SpanContext
   serviceRegistry: any
 }) => {
@@ -45,7 +46,7 @@ export const processManualImmediateSync = async (params: {
     wallet: string
   }
   forceWipe: boolean
-  logContext: Object
+  logContext: LogContext
   parentSpanContext: SpanContext
   serviceRegistry: any
 }) => {