@watchforge/browser 0.1.17 → 0.1.20

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@watchforge/browser",
-  "version": "0.1.17",
+  "version": "0.1.20",
   "main": "./src/index.js",
   "types": "./src/index.d.ts",
   "description": "WatchForge JavaScript SDK for browser JavaScript, Next.js, React, Node.js, and Express.js",

package/src/stacktrace.js

@@ -139,7 +139,7 @@ function isJsonParseError(message) {
 
 function isUriError(message) {
   if (!message || typeof message !== "string") return false;
-  return /URI(?:Error| malformed)/i.test(message) || /decodeURIComponent/i.test(message);
+  return /URI\s+malformed/i.test(message) || /URIError/i.test(message);
 }
 
 function isInvalidArrayLengthError(message) {
@@ -717,13 +717,19 @@ function resolveFrameLine(frame, lines) {
   return lineno;
 }
 
+function applyResolvedSourceContext(frame, sourceLines) {
+  if (!sourceLines?.length) return false;
+  const lineno = resolveFrameLine(frame, sourceLines);
+  applySourceContext(frame, sourceLines, lineno);
+  return Boolean(frame.context_line);
+}
+
 async function enrichFrameWithNodeSource(frame) {
   if (!frame.in_app || !frame.lineno) return;
   const lines = await readNodeSourceLines(frame.raw_abs_path || frame.abs_path);
   if (!lines) return;
 
-  const lineno = resolveFrameLine(frame, lines);
-  applySourceContext(frame, lines, lineno);
+  applyResolvedSourceContext(frame, lines);
 }
 
 function getBrowserSourceFetchCandidates(absPath, rawAbsPath) {
@@ -917,12 +923,10 @@ function applyOriginalSourceFrameContext(frame, sourceMap) {
 
   const sourceContent = getSourceMapContentForFrame(frame, sourceMap);
   if (!sourceContent?.lines?.length) return false;
-  if (frame.lineno > sourceContent.lines.length) return false;
 
   frame.abs_path = sourceContent.source;
   frame.filename = normalizeSourcePath(sourceContent.source).split("/").pop() || frame.filename;
-  applySourceContext(frame, sourceContent.lines, frame.lineno);
-  return Boolean(frame.context_line);
+  return applyResolvedSourceContext(frame, sourceContent.lines);
 }
 
 async function findSourceMapForFrame(frame) {
@@ -1081,12 +1085,9 @@ function getWebpackFrameArtifacts(frame) {
 async function enrichFrameWithBrowserSource(frame) {
   if (!frame.in_app || !frame.lineno) return;
 
-  if (isOriginalSourceFrame(frame)) {
-    const lines = await fetchBrowserSourceLines(frame.abs_path, frame.raw_abs_path);
-    if (lines) {
-      applySourceContext(frame, lines, frame.lineno);
-      if (frame.context_line) return;
-    }
+  const lines = await fetchBrowserSourceLines(frame.abs_path, frame.raw_abs_path);
+  if (lines && applyResolvedSourceContext(frame, lines)) {
+    return;
   }
 
   const webpackArtifacts = getWebpackFrameArtifacts(frame);
@@ -1096,16 +1097,7 @@ async function enrichFrameWithBrowserSource(frame) {
   }
 
   if (webpackArtifacts?.lines && !webpackArtifacts?.sourceMap) {
-    const lineno = resolveFrameLine(frame, webpackArtifacts.lines);
-    applySourceContext(frame, webpackArtifacts.lines, lineno);
-    if (frame.context_line) return;
-  }
-
-  const lines = await fetchBrowserSourceLines(frame.abs_path, frame.raw_abs_path);
-  if (lines) {
-    const lineno = resolveFrameLine(frame, lines);
-    applySourceContext(frame, lines, lineno);
-    if (frame.context_line) return;
+    if (applyResolvedSourceContext(frame, webpackArtifacts.lines)) return;
   }
 
   await enrichFrameWithSourceMap(frame);