fix timeout logic

segmentio · Nov 2, 2023 · c2c8e8c · c2c8e8c
1 parent 1a96986
commit c2c8e8c
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/packages/browser/src/plugins/remote-loader/index.ts b/packages/browser/src/plugins/remote-loader/index.ts
@@ -145,12 +145,14 @@ export class ActionDestination implements DestinationPlugin {
         `action_plugin_name:${this.action.name}`,
       ])
 
-      const ret = await pTimeout(
-        this.action.load(ctx, analytics),
-        this.type === 'destination' ? this.destinationTimeout : Infinity
-      )
+      const loadP = this.action.load(ctx, analytics)
+
+      const ret =
+        this.type === 'destination'
+          ? pTimeout(loadP, this.destinationTimeout)
+          : loadP
 
-      this.loadPromise.resolve(ret)
+      this.loadPromise.resolve(await ret)
       return ret
     } catch (error) {
       ctx.stats.increment('analytics_js.action_plugin.invoke.error', 1, [