Skip to content

Formerly KrillinAI, VideoTranslation and Dubbing Tool for 120+ Languages. Open-source AI workspace for creators, powered by Codex. Video downloader, video translation, create videos, images, audios, and edits with Agents in one place. For your Social Media like YouTube, TikTok, Instagram, etc.

Retry transient Apple notarization ticket network failures

Leggetta570f64b2147
diff --git a/apps/desktop/scripts/apple-notarization.mjs b/apps/desktop/scripts/apple-notarization.mjs
index bd2ed993..d7c749fc 100644
--- a/apps/desktop/scripts/apple-notarization.mjs
+++ b/apps/desktop/scripts/apple-notarization.mjs
@@ -2,6 +2,47 @@ import { spawnSync } from 'node:child_process';
const defaultPollIntervalMs = 15_000;
const defaultMaxPolls = 120;
+const staplerRetryDelaysMs = [15_000, 30_000, 60_000, 60_000];
+const transientNetworkCodes = new Set([-1001, -1003, -1004, -1005, -1006, -1009]);
+
+export async function runStapler(action, filePath, options = {}) {
+ if (action !== 'staple' && action !== 'validate') {
+ throw new Error(`Unsupported stapler action: ${action}`);
+ }
+ const run = options.run ?? spawnSync;
+ const wait = options.delay ?? delay;
+ const logger = options.logger ?? console.log;
+ for (let attempt = 0; attempt <= staplerRetryDelaysMs.length; attempt += 1) {
+ const result = run('xcrun', ['stapler', action, filePath], {
+ encoding: 'utf8',
+ maxBuffer: 20 * 1024 * 1024,
+ timeout: 2 * 60_000
+ });
+ const output = [result.stdout, result.stderr].filter(Boolean).join('\n').trim();
+ if (!result.error && result.status === 0) {
+ if (output) logger(output);
+ return;
+ }
+
+ // Error 68 also covers permanent ticket failures; retry only explicit
+ // network errors, never a missing/invalid ticket or a rejected signature.
+ const networkFailure = result.error?.code === 'ETIMEDOUT'
+ || [...output.matchAll(/\b(?:NSURLErrorDomain|kCFErrorDomainCFNetwork)\s+Code=(-\d+)\b/g)]
+ .some(match => transientNetworkCodes.has(Number(match[1])));
+ if (!networkFailure || attempt === staplerRetryDelaysMs.length) {
+ if (result.error) throw result.error;
+ throw new Error(
+ `Apple stapler ${action} failed with exit ${String(result.status)}: ${output}`
+ );
+ }
+ const waitMs = staplerRetryDelaysMs[attempt];
+ logger(
+ `[desktop-package] Apple 票据服务网络错误,${waitMs / 1000} 秒后重试 `
+ + `${action} (${attempt + 1}/${staplerRetryDelaysMs.length}):${output || result.error.message}`
+ );
+ await wait(waitMs);
+ }
+}
export async function submitAndWaitForNotarization(
filePath,
diff --git a/apps/desktop/scripts/notarize-after-sign.mjs b/apps/desktop/scripts/notarize-after-sign.mjs
index 9149b33d..3a058dbc 100644
--- a/apps/desktop/scripts/notarize-after-sign.mjs
+++ b/apps/desktop/scripts/notarize-after-sign.mjs
@@ -11,7 +11,7 @@ import {
} from 'node:path';
import { spawnSync } from 'node:child_process';
import { resolveNotarizationCredentials } from './mac-signing.mjs';
-import { submitAndWaitForNotarization } from './apple-notarization.mjs';
+import { runStapler, submitAndWaitForNotarization } from './apple-notarization.mjs';
export async function afterSign(context) {
if (process.env.OPENCREATOR_NOTARIZE_MAC_APP !== '1') return;
@@ -47,8 +47,8 @@ export async function afterSign(context) {
timeout: 15 * 60_000
});
await submitAndWaitForNotarization(archivePath, credentials.args);
- runCommand('xcrun', ['stapler', 'staple', appPath]);
- runCommand('xcrun', ['stapler', 'validate', appPath]);
+ await runStapler('staple', appPath);
+ await runStapler('validate', appPath);
runCommand('spctl', [
'--assess',
'--type',
diff --git a/apps/desktop/scripts/package-release.mjs b/apps/desktop/scripts/package-release.mjs
index d87150fb..a5681ea0 100644
--- a/apps/desktop/scripts/package-release.mjs
+++ b/apps/desktop/scripts/package-release.mjs
@@ -25,7 +25,7 @@ import {
configureMacReleaseSigning,
withMacSigningKeychain
} from './mac-signing.mjs';
-import { submitAndWaitForNotarization } from './apple-notarization.mjs';
+import { runStapler, submitAndWaitForNotarization } from './apple-notarization.mjs';
import { prepareElectronBuilderCache } from './electron-builder-cache.mjs';
import { runParallelStages, runStage } from './script-utils.mjs';
import { stageReleaseAssets } from './release-assets.mjs';
@@ -515,18 +515,8 @@ async function finalizeMacReleaseArtifacts(artifacts, notarizationArgs) {
{ cwd: releaseDir, timeoutMs: 5 * 60_000 }
);
await submitAndWaitForNotarization(artifact, notarizationArgs);
- await runStage(
- `写入 DMG 公证票据:${basename(artifact)}`,
- 'xcrun',
- ['stapler', 'staple', artifact],
- { cwd: releaseDir, timeoutMs: 5 * 60_000 }
- );
- await runStage(
- `验证 DMG 公证票据:${basename(artifact)}`,
- 'xcrun',
- ['stapler', 'validate', artifact],
- { cwd: releaseDir, timeoutMs: 5 * 60_000 }
- );
+ await runStapler('staple', artifact);
+ await runStapler('validate', artifact);
await runStage(
`验证 DMG Gatekeeper:${basename(artifact)}`,
'spctl',
diff --git a/apps/desktop/scripts/verify-package.mjs b/apps/desktop/scripts/verify-package.mjs
index 3dbb82ea..119bea8b 100644
--- a/apps/desktop/scripts/verify-package.mjs
+++ b/apps/desktop/scripts/verify-package.mjs
@@ -41,6 +41,7 @@ import {
verifyStickmanBuildBinding
} from './package-content-contract.mjs';
import { verifyMacAppIcon } from './mac-app-icon.mjs';
+import { runStapler } from './apple-notarization.mjs';
const scriptDir = dirname(fileURLToPath(import.meta.url));
const desktopDir = resolve(scriptDir, '..');
@@ -126,7 +127,7 @@ assertSize('Codex Runtime', codexRuntimeDir, 450 * 1024 * 1024);
assertSize('Stickman assets', join(daemonDir, 'runtime', 'stickman-assets'), 16 * 1024 * 1024);
assertSize('Desktop package', packageRoot, 1600 * 1024 * 1024);
await assertFuseConfiguration();
-verifyMacPackageMetadata();
+await verifyMacPackageMetadata();
console.log(JSON.stringify({
ok: true,
@@ -820,7 +821,7 @@ async function assertFuseConfiguration() {
}
}
-function verifyMacPackageMetadata() {
+async function verifyMacPackageMetadata() {
if (process.platform !== 'darwin') return;
const signature = spawnSync('codesign', [
'--verify',
@@ -847,11 +848,7 @@ function verifyMacPackageMetadata() {
'A notarized macOS package must also require Developer ID verification'
);
}
- runMacVerification(
- 'macOS notarization ticket',
- 'xcrun',
- ['stapler', 'validate', packageRoot]
- );
+ await runStapler('validate', packageRoot);
runMacVerification(
'macOS Gatekeeper assessment',
'spctl',
diff --git a/apps/desktop/test/apple-notarization.test.mjs b/apps/desktop/test/apple-notarization.test.mjs
index 2774c155..97738161 100644
--- a/apps/desktop/test/apple-notarization.test.mjs
+++ b/apps/desktop/test/apple-notarization.test.mjs
@@ -1,5 +1,61 @@
import { describe, expect, it, vi } from 'vitest';
-import { submitAndWaitForNotarization } from '../scripts/apple-notarization.mjs';
+import { runStapler, submitAndWaitForNotarization } from '../scripts/apple-notarization.mjs';
+
+describe('Apple notarization tickets', () => {
+ const connectionLost = {
+ status: 68,
+ stdout: 'Processing: /tmp/OpenCreator.app',
+ stderr: 'Error Domain=NSURLErrorDomain Code=-1005 "The network connection was lost."'
+ };
+
+ it.each(['staple', 'validate'])('retries a transient network failure during %s', async action => {
+ const run = vi.fn()
+ .mockReturnValueOnce(connectionLost)
+ .mockReturnValue({ status: 0, stdout: 'The action worked!' });
+ const delay = vi.fn();
+ await runStapler(action, '/tmp/OpenCreator.app', { run, delay, logger: vi.fn() });
+ expect(run).toHaveBeenCalledTimes(2);
+ expect(run).toHaveBeenLastCalledWith('xcrun', [
+ 'stapler', action, '/tmp/OpenCreator.app'
+ ], expect.objectContaining({ timeout: 120_000 }));
+ expect(delay).toHaveBeenCalledExactlyOnceWith(15_000);
+ });
+
+ it('stops after bounded retries and retains the final diagnostic', async () => {
+ const run = vi.fn().mockReturnValue(connectionLost);
+ const delay = vi.fn();
+ await expect(runStapler('staple', '/tmp/OpenCreator.dmg', {
+ run, delay, logger: vi.fn()
+ })).rejects.toThrow(/exit 68:[\s\S]*Processing:[\s\S]*network connection was lost/);
+ expect(run).toHaveBeenCalledTimes(5);
+ expect(delay.mock.calls).toEqual([[15_000], [30_000], [60_000], [60_000]]);
+ });
+
+ it.each([
+ { status: 65, stdout: 'The validate action failed! Error 65. No ticket found.' },
+ { status: 68, stderr: 'Could not validate ticket. The staple and validate action failed! Error 68.' },
+ { status: 1, stderr: 'Error Domain=NSURLErrorDomain Code=-1202 "Certificate is untrusted."' },
+ { status: null, error: Object.assign(new Error('xcrun missing'), { code: 'ENOENT' }) }
+ ])('fails immediately for a permanent validation or tooling error: %j', async result => {
+ const run = vi.fn().mockReturnValue(result);
+ const delay = vi.fn();
+ await expect(runStapler('validate', '/tmp/OpenCreator.app', {
+ run, delay, logger: vi.fn()
+ })).rejects.toThrow();
+ expect(run).toHaveBeenCalledOnce();
+ expect(delay).not.toHaveBeenCalled();
+ });
+
+ it('retries an actual command timeout without accepting a partial result', async () => {
+ const run = vi.fn()
+ .mockReturnValueOnce({ status: null, error: Object.assign(new Error('Timed out'), { code: 'ETIMEDOUT' }) })
+ .mockReturnValue({ status: 0 });
+ const delay = vi.fn();
+ await runStapler('validate', '/tmp/OpenCreator.app', { run, delay, logger: vi.fn() });
+ expect(run).toHaveBeenCalledTimes(2);
+ expect(delay).toHaveBeenCalledOnce();
+ });
+});
describe('Apple notarization polling', () => {
it('waits for an accepted submission without relying on --wait output', async () => {