Avoid potential racing condition

kibertoad · Feb 23, 2024 · 513659b · 513659b
1 parent c3553b0
commit 513659b
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 6 deletions.
diff --git a/packages/sns/lib/sns/AbstractSnsService.ts b/packages/sns/lib/sns/AbstractSnsService.ts
@@ -85,9 +85,13 @@ export abstract class AbstractSnsService<
   // @ts-ignore
   public topicArn: string
 
+  private isInitted: boolean
+  private initPromise?: Promise<void>
+
   constructor(dependencies: DependenciesType, options: SNSOptionsType) {
     super(dependencies, options)
 
+    this.isInitted = false
     this.snsClient = dependencies.snsClient
   }
 
@@ -98,6 +102,7 @@ export abstract class AbstractSnsService<
 
     const initResult = await initSns(this.snsClient, this.locatorConfig, this.creationConfig)
     this.topicArn = initResult.topicArn
+    this.isInitted = true
   }
 
   // eslint-disable-next-line @typescript-eslint/require-await
@@ -108,9 +113,13 @@ export abstract class AbstractSnsService<
     messageSchema: ZodSchema<MessagePayloadType>,
     options: SNSMessageOptions = {},
   ): Promise<void> {
-    if (this.topicArn === undefined) {
-      // Lazy loading
-      await this.init()
+    // If it's not initted yet, do the lazy init
+    if (!this.isInitted) {
+      // avoid multiple concurrent inits
+      if (!this.initPromise) {
+        this.initPromise = this.init()
+      }
+      await this.initPromise
     }
 
     try {

diff --git a/packages/sqs/lib/sqs/AbstractSqsService.ts b/packages/sqs/lib/sqs/AbstractSqsService.ts
@@ -53,9 +53,13 @@ export abstract class AbstractSqsService<
   // @ts-ignore
   public queueArn: string
 
+  private isInitted: boolean
+  private initPromise?: Promise<void>
+
   constructor(dependencies: DependenciesType, options: SQSOptionsType) {
     super(dependencies, options)
 
+    this.isInitted = false
     this.sqsClient = dependencies.sqsClient
   }
 
@@ -72,16 +76,21 @@ export abstract class AbstractSqsService<
     this.queueArn = queueArn
     this.queueUrl = queueUrl
     this.queueName = queueName
+    this.isInitted = true
   }
 
   protected async internalPublish(
     message: MessagePayloadType,
     messageSchema: ZodSchema<MessagePayloadType>,
     options: SQSMessageOptions = {},
   ): Promise<void> {
-    if (!this.queueArn) {
-      // Lazy loading
-      await this.init()
+    // If it's not initted yet, do the lazy init
+    if (!this.isInitted) {
+      // avoid multiple concurrent inits
+      if (!this.initPromise) {
+        this.initPromise = this.init()
+      }
+      await this.initPromise
     }
 
     try {