fix: Correctly log aggregated errors

Voxelum · Dec 30, 2023 · a5bfed6 · a5bfed6
1 parent 6a50b52
commit a5bfed6
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 9 deletions.
diff --git a/xmcl-runtime/logger/pluginLogConsumer.ts b/xmcl-runtime/logger/pluginLogConsumer.ts
@@ -16,8 +16,8 @@ function baseTransform(tag: string) { return new Transform({ transform(c, e, cb)
 
 function getMessageFromError(e: Error): string {
   let message = e.stack ?? e.message
-  if (e instanceof AggregateError) {
-    message = e.errors.map(getMessageFromError).join('\n')
+  if (e instanceof AggregateError || ('errors' in e && Array.isArray(e.errors))) {
+    message = (e as any).errors.map(getMessageFromError).join('\n')
   }
   if (e.cause && e.cause instanceof Error) {
     return `${message}\nCaused by: ${getMessageFromError(e.cause)}`

diff --git a/xmcl-runtime/telemetry/pluginTelemetry.ts b/xmcl-runtime/telemetry/pluginTelemetry.ts
@@ -71,20 +71,24 @@ export const pluginTelemetry: LauncherAppPlugin = async (app) => {
     return d
   }
 
+  const handleException = (exception: Contracts.ExceptionData, e: Error) => {
+    if (e.cause instanceof Error) {
+      exception.exceptions.push(createExceptionDetails(e.cause.message, e.cause.name, e.cause.stack))
+    } else if (e instanceof AggregateError || (Array.isArray((e as any).errors))) {
+      for (const cause of (e as any).errors) {
+        handleException(exception, cause)
+      }
+    }
+  }
+
   const client = appInsight.defaultClient
 
   client.addTelemetryProcessor((envelope, contextObjects) => {
     if (contextObjects?.error) {
       const exception = envelope.data.baseData as Contracts.ExceptionData
       const e = contextObjects?.error
       if (e instanceof Error) {
-        if (e.cause instanceof Error) {
-          exception.exceptions.push(createExceptionDetails(e.cause.message, e.cause.name, e.cause.stack))
-        } else if (e instanceof AggregateError) {
-          for (const cause of e.errors) {
-            exception.exceptions.push(createExceptionDetails(cause.message, cause.name, cause.stack))
-          }
-        }
+        handleException(exception, e)
       }
     }
     return true