@revolugo/common 7.0.1 → 7.1.0

package/src/utils/poller.ts

@@ -45,13 +45,14 @@ export class Poller<V extends IPollerResponse> {
     minCallCount: 1,
   }
 
-  private pollings: Record<string, string> = {}
   private events: TPollerEvents<V> = {
     complete: () => undefined,
     data: () => undefined,
     error: () => undefined,
   }
 
+  private pollings: Record<string, string> = {}
+
   static getInstance<R extends IPollerResponse>(): Poller<R> {
     if (!Poller.instance) {
       Poller.instance = new Poller<R>() as Poller<IPollerResponse>
@@ -60,6 +61,13 @@ export class Poller<V extends IPollerResponse> {
     return Poller.instance as Poller<R>
   }
 
+  on(
+    eventName: TPollerEventName,
+    eventCallback: TPollerEventCallback<V>,
+  ): void {
+    this.events[eventName] = eventCallback
+  }
+
   poll(request: TRequest<V>, options: TOptions<V>): Poller<V> {
     const buildedOptions = this.buildPollerOptions(options)
     this.storeCurrentPolling(buildedOptions)
@@ -75,13 +83,6 @@ export class Poller<V extends IPollerResponse> {
     return this
   }
 
-  on(
-    eventName: TPollerEventName,
-    eventCallback: TPollerEventCallback<V>,
-  ): void {
-    this.events[eventName] = eventCallback
-  }
-
   public stop(type: string): void {
     if (type && this.pollings[type]) {
       // eslint-disable-next-line @typescript-eslint/no-dynamic-delete
@@ -89,6 +90,25 @@ export class Poller<V extends IPollerResponse> {
     }
   }
 
+  private buildPollerOptions(options: TOptions<V>): TOptions<V> {
+    const compactedOptions = Object.entries(options).reduce<
+      Record<string, unknown>
+    >((acc, [key, value]) => {
+      if (value !== undefined) {
+        const tKey = key as keyof TOptions<V>
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        acc[tKey] = value as any
+      }
+
+      return acc
+    }, {}) as TOptions<V>
+
+    return {
+      ...this.defaultOptions,
+      ...compactedOptions,
+    }
+  }
+
   private dispatch(
     eventName: TPollerEventName,
     payload?: TPollerEventCallbackArg<V>,
@@ -96,6 +116,27 @@ export class Poller<V extends IPollerResponse> {
     this.events[eventName](payload)
   }
 
+  private isActivePoller(options: TOptions<V>): boolean {
+    if (options.type) {
+      return (
+        !!this.pollings[options.type] &&
+        this.pollings[options.type] === options.uuid
+      )
+    }
+
+    return true
+  }
+
+  private isInProgress(result: V): boolean {
+    return (result?.meta?.status ?? '') !== 'COMPLETE'
+  }
+
+  private onComplete(result: V, options: TOptions<V>) {
+    this.dispatch('data', result)
+    this.dispatch('complete', result)
+    this.removeCurrentPolling(options)
+  }
+
   private async onRequest(
     result: V,
     request: TRequest<V>,
@@ -148,53 +189,6 @@ export class Poller<V extends IPollerResponse> {
     }
   }
 
-  private onComplete(result: V, options: TOptions<V>) {
-    this.dispatch('data', result)
-    this.dispatch('complete', result)
-    this.removeCurrentPolling(options)
-  }
-
-  private isInProgress(result: V): boolean {
-    return (result?.meta?.status ?? '') !== 'COMPLETE'
-  }
-
-  private buildPollerOptions(options: TOptions<V>): TOptions<V> {
-    const compactedOptions = Object.entries(options).reduce<
-      Record<string, unknown>
-    >((acc, [key, value]) => {
-      if (value !== undefined) {
-        const tKey = key as keyof TOptions<V>
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        acc[tKey] = value as any
-      }
-
-      return acc
-    }, {}) as TOptions<V>
-
-    return {
-      ...this.defaultOptions,
-      ...compactedOptions,
-    }
-  }
-
-  private storeCurrentPolling(options: TOptions<V>): void {
-    if (options.type && !options.uuid) {
-      options.uuid = uuidv4()
-      this.pollings[options.type] = options.uuid
-    }
-  }
-
-  private isActivePoller(options: TOptions<V>): boolean {
-    if (options.type) {
-      return (
-        !!this.pollings[options.type] &&
-        this.pollings[options.type] === options.uuid
-      )
-    }
-
-    return true
-  }
-
   private pause(options: TOptions<V>): Promise<void> {
     return new Promise(resolve => {
       setTimeout(resolve, options.interval)
@@ -207,6 +201,13 @@ export class Poller<V extends IPollerResponse> {
       delete this.pollings[options.type]
     }
   }
+
+  private storeCurrentPolling(options: TOptions<V>): void {
+    if (options.type && !options.uuid) {
+      options.uuid = uuidv4()
+      this.pollings[options.type] = options.uuid
+    }
+  }
 }
 
 export type PollerReturn<R extends IPollerResponse = IPollerResponse> =