Skip to content
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

fix: Brittle response parsing from notarytool #191

Merged
merged 8 commits into from
May 14, 2024
Merged

fix: Brittle response parsing from notarytool #191

Changes from 2 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
853570d
fix: Brittle response parsing from notarytool
Apr 30, 2024
a7698ef
fix: Fixes result.code check blocking notarytool log diagnostics
Apr 30, 2024
514cb3d
fix: Concat notarytool error with notarytool log result
May 8, 2024
77eda12
clean: Cleanup unused import
May 8, 2024
195de70
refact: Simplified notary error handling logic
May 8, 2024
ba33a3d
chore: bump electronjs/node in .circleci/config.yml to 2.2.2 (#195)
electron-roller[bot] May 10, 2024
fe55db4
Merge branch 'fix/print-notarize-error' of github.com:connorgmeehan/n…
MarshallOfSound May 14, 2024
7b49573
fix: ensure status is Accepted
MarshallOfSound May 14, 2024
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
9 changes: 7 additions & 2 deletions src/notarytool.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,9 +83,14 @@ export async function notarizeAndWaitForNotaryTool(opts: NotaryToolStartOptions)
];

const result = await spawn('xcrun', notarizeArgs);
const parsed = JSON.parse(result.output.trim());
let parsed: any;
try {
parsed = JSON.parse(result.output.trim());
} catch (err) {
throw new Error(`Failed to notarize via notarytool\n\nCould not parse output as JSON\n\n${result.output.trim()}`);
}

if (result.code !== 0 || !parsed.status || parsed.status !== 'Accepted') {
if (!parsed.status || parsed.status !== 'Accepted') {
connorgmeehan marked this conversation as resolved.
Show resolved Hide resolved
try {
if (parsed && parsed.id) {
const logResult = await spawn('xcrun', [
Expand Down