Skip to content

fix(dif): log errors in tryProguard and tryObject catch blocks #1513

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
cursor wants to merge 1 commit into
base: main
Choose a base branch
from
+8 −4
Draft

fix(dif): log errors in tryProguard and tryObject catch blocks #1513

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/cli/script/silent-catch-baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"src/lib/delta-upgrade.ts": 1,
"src/lib/detect-agent.ts": 2,
"src/lib/dev-script.ts": 2,
"src/lib/dif/find.ts": 3,
"src/lib/dif/find.ts": 0,
"src/lib/docs-context.ts": 4,
"src/lib/docs-service.ts": 1,
"src/lib/dsn/detector.ts": 1,
Expand Down
10 changes: 7 additions & 3 deletions packages/cli/src/lib/dif/find.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@

import { open, readFile, stat } from "node:fs/promises";
import { extname, resolve } from "node:path";
import { logger } from "../logger.js";
import { computeProguardUuid } from "../proguard.js";
import { walkFiles } from "../scan/walker.js";
import { parseDebugFile, peekFormat } from "./index.js";
Expand Down Expand Up @@ -186,7 +187,8 @@ async function tryProguard(
let uuid: string;
try {
uuid = computeProguardUuid(await readFile(path));
} catch {
} catch (error) {
logger.debug(`Skipping ProGuard candidate ${path}: read/hash failed`, error);
return;
}
const matched = matchRemaining(state, uuid);
Expand Down Expand Up @@ -220,7 +222,8 @@ async function tryObject(
} finally {
await fd.close();
}
} catch {
} catch (error) {
logger.debug(`Skipping ${path}: failed to peek format`, error);
return;
}
if (!state.formats.has(format)) {
Expand All @@ -233,7 +236,8 @@ async function tryObject(
let objects: { debugId: string }[];
try {
objects = parseDebugFile(await readFile(path)).objects;
} catch {
} catch (error) {
logger.debug(`Skipping ${path}: failed to parse debug file`, error);
return;
}
for (const obj of objects) {
Expand Down
Loading