Skip to content
TypeScript

fix(client-runtime): sanitized error stacks keep line and column for URLs with a query (#30726)

TheGuyWithHAT00d1a828aba5
diff --git a/packages/client-runtime/src/errors/safeLog.test.ts b/packages/client-runtime/src/errors/safeLog.test.ts
index c696b5f4431..1e4fc4a993c 100644
--- a/packages/client-runtime/src/errors/safeLog.test.ts
+++ b/packages/client-runtime/src/errors/safeLog.test.ts
@@ -13,6 +13,8 @@ describe("safeErrorLogAttributes", () => {
error.stack = [
"ProjectRemovalError: outer-error-secret-sentinel",
" at removeProject (https://user:[email protected]/project.ts?token=secret#fragment)",
+ " at loadSettings (http://localhost:5173/src/useSettings.ts?t=1730700000000:162:7)",
+ "removeAll@https://example.com/app.js?token=secret:12:5",
].join("\n");
const attributes = safeErrorLogAttributes(error);
@@ -22,7 +24,11 @@ describe("safeErrorLogAttributes", () => {
errorName: "Error",
errorTag: "ProjectRemovalError",
traceId: "trace-safe-123",
- stack: " at removeProject (https://example.com/project.ts)",
+ stack: [
+ " at removeProject (https://example.com/project.ts)",
+ " at loadSettings (http://localhost:5173/src/useSettings.ts:162:7)",
+ "removeAll@https://example.com/app.js:12:5",
+ ].join("\n"),
});
const diagnosticText = Object.values(attributes).map(String).join("\n");
expect(diagnosticText).not.toContain("outer-error-secret-sentinel");
diff --git a/packages/client-runtime/src/errors/safeLog.ts b/packages/client-runtime/src/errors/safeLog.ts
index 60730d4d35c..2f2015b30bf 100644
--- a/packages/client-runtime/src/errors/safeLog.ts
+++ b/packages/client-runtime/src/errors/safeLog.ts
@@ -18,11 +18,13 @@ function readSafeLabel(value: unknown): string | undefined {
function sanitizeStackUrl(value: string): string {
try {
const url = new URL(value);
+ // A frame's trailing :line:column parses as part of the query or fragment when one is present.
+ const position = /(?::\d+){1,2}$/.exec(url.hash || url.search)?.[0] ?? "";
url.username = "";
url.password = "";
url.search = "";
url.hash = "";
- return url.toString();
+ return url.toString() + position;
} catch {
return value;
}