fix(log): prevent thowing on failed to get caller location (#2157)

* Fix failed to get caller location throws * Add change file * typo * build * Bump log rs * typo * early return instead of using ?
tauri-apps · Dec 7, 2024 · 69d508e · 69d508e
1 parent fe610d6
commit 69d508e
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/.changes/log-caller-location-throw.md b/.changes/log-caller-location-throw.md
@@ -0,0 +1,6 @@
+---
+"log": patch
+"log-js": patch
+---
+
+Make log functions omit caller location when failed to parse it instead of throwing
diff --git a/plugins/log/api-iife.js b/plugins/log/api-iife.js
diff --git a/plugins/log/guest-js/index.ts b/plugins/log/guest-js/index.ts
@@ -60,7 +60,10 @@ function getCallerLocation(stack?: string) {
 
     const lines = stack.split('\n')
     // Find the third line (caller's caller of the current location)
-    const callerLine = lines[3].trim()
+    const callerLine = lines[3]?.trim()
+    if (!callerLine) {
+      return
+    }
 
     const regex =
       /at\s+(?<functionName>.*?)\s+\((?<fileName>.*?):(?<lineNumber>\d+):(?<columnNumber>\d+)\)/
@@ -103,7 +106,7 @@ function getCallerLocation(stack?: string) {
       return name.length > 0 && location !== '[native code]'
     })
     // Find the third line (caller's caller of the current location)
-    return filtered[2].filter((v) => v.length > 0).join('@')
+    return filtered[2]?.filter((v) => v.length > 0).join('@')
   }
 }