fix(timeline): error tolerant promising checking

nuxt · Jul 20, 2023 · 762a669 · 762a669
1 parent 414ad1c
commit 762a669
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/packages/devtools-kit/src/_types/timeline-metrics.ts b/packages/devtools-kit/src/_types/timeline-metrics.ts
@@ -9,6 +9,7 @@ export interface TimelineEventFunction {
   args?: any[]
   result?: any
   stacktrace?: StackFrame[]
+  isPromise?: boolean
 }
 
 export interface TimelineEventRoute {

diff --git a/packages/devtools/src/runtime/function-metrics-helpers.ts b/packages/devtools/src/runtime/function-metrics-helpers.ts
@@ -67,14 +67,18 @@ export function __nuxtTimelineWrap(name: string, fn: any) {
     metrics.events.push(event)
     const result = fn.apply(this, args)
     // handle promises
-    if (result && 'then' in result && typeof result.then === 'function') {
-      return result
-        .then((i: any) => i)
-        .finally(() => {
-          event.end = Date.now()
-          return result
-        })
+    try {
+      if (result && typeof result.then === 'function') {
+        event.isPromise = true
+        return result
+          .then((i: any) => i)
+          .finally(() => {
+            event.end = Date.now()
+            return result
+          })
+      }
     }
+    catch (e) {}
     event.end = Date.now()
     return result
   }