perf(desktop): default final macOS ZIP compression to level 3
This commit is contained in:
1 parent
51b324a198
commit
df12de44bb
13 files changed
+58
-10
No files matched your search
@@ -14,6 +14,7 @@ DOWNLOAD_TEST_RELEASE_ID=
|
||||
|
||||
# Workspace tarball workers; omit to use 4. Must be a positive integer.
|
||||
DSH_DESKTOP_MACOS_PACK_CONCURRENCY=4
|
||||
DSH_DESKTOP_MACOS_ZIP_COMPRESSION_LEVEL=3
|
||||
# Optional independent proxy origins; empty values preserve inherited networking.
|
||||
# Downloads: HTTP/HTTPS proxy for Electron, runtime assets, pnpm and builder downloads.
|
||||
DSH_DESKTOP_MACOS_DOWNLOAD_PROXY=
|
||||
|
||||
@@ -3,6 +3,7 @@ DSH_DESKTOP_APP_ID=com.deepseek.harness
|
||||
DSH_DESKTOP_AUTO_UPDATE_ENV=production
|
||||
DSH_DESKTOP_MANDATORY_UPDATE_PROD_ORIGIN=
|
||||
DSH_DESKTOP_MACOS_PACK_CONCURRENCY=4
|
||||
DSH_DESKTOP_MACOS_ZIP_COMPRESSION_LEVEL=3
|
||||
DSH_DESKTOP_MACOS_DOWNLOAD_PROXY=
|
||||
DSH_DESKTOP_MACOS_NOTARIZATION_PROXY=
|
||||
# Optional absolute private directory; setup fills this in for machine presets. Omit to use checkout-local storage.
|
||||
|
||||
@@ -7,6 +7,7 @@ DOWNLOAD_TEST_ORIGIN=
|
||||
# Generate a 32-character lowercase hexadecimal release ID; retain it for upgrade testing.
|
||||
DOWNLOAD_TEST_RELEASE_ID=
|
||||
DSH_DESKTOP_MACOS_PACK_CONCURRENCY=4
|
||||
DSH_DESKTOP_MACOS_ZIP_COMPRESSION_LEVEL=3
|
||||
DSH_DESKTOP_MACOS_DOWNLOAD_PROXY=
|
||||
# Temporarily changes the active network service's system HTTP/HTTPS proxies.
|
||||
DSH_DESKTOP_MACOS_NOTARIZATION_PROXY=
|
||||
|
||||
@@ -36,8 +36,8 @@
|
||||
en: 2feaa0412247d81f
|
||||
zh: 461dde8e13fd4734
|
||||
/desktop-packaging/macos-release-signing-and-diagnostics:
|
||||
en: f4a2b14da34ba883
|
||||
zh: 6292f3a7b4038213
|
||||
en: be48e5f7205fc058
|
||||
zh: 3be2e0bf2180d413
|
||||
/desktop-packaging/directory-builds-and-preparation:
|
||||
en: 5860c306375ddd63
|
||||
zh: a76e3cdbbe25c79e
|
||||
|
||||
@@ -186,6 +186,7 @@ Mac packaging reads three tuning fields from `.env.macos`:
|
||||
| Setting | Default | Scope |
|
||||
|---|---|---|
|
||||
| `DSH_DESKTOP_MACOS_PACK_CONCURRENCY` | `4` | Workers for first-party and vendor workspace tarballs; requires a positive integer. |
|
||||
| `DSH_DESKTOP_MACOS_ZIP_COMPRESSION_LEVEL` | `3` | Final update ZIP compression, integer `0`–`9`; lower levels trade larger downloads for shorter builds. App notarization archives and DMG compression are unchanged. |
|
||||
| `DSH_DESKTOP_MACOS_DOWNLOAD_PROXY` | Empty | HTTP/HTTPS proxy origin for Electron, runtime assets, pnpm installation and builder downloads. |
|
||||
| `DSH_DESKTOP_MACOS_NOTARIZATION_PROXY` | Empty | HTTP proxy origin for Apple tools through temporary system proxy settings. |
|
||||
|
||||
|
||||
@@ -186,6 +186,7 @@ Mac 打包从 `.env.macos` 读取三个调优字段:
|
||||
| 设置 | 默认值 | 作用范围 |
|
||||
|---|---|---|
|
||||
| `DSH_DESKTOP_MACOS_PACK_CONCURRENCY` | `4` | 第一方与 vendor workspace tarball 的打包 worker 数;必须是正整数。 |
|
||||
| `DSH_DESKTOP_MACOS_ZIP_COMPRESSION_LEVEL` | `3` | 最终更新 ZIP 的压缩等级,整数 `0`–`9`;较低等级以更大的下载体积换取更短的构建时间。App 公证归档和 DMG 压缩不变。 |
|
||||
| `DSH_DESKTOP_MACOS_DOWNLOAD_PROXY` | 空 | Electron、运行时资源、pnpm 安装及 builder 下载使用的 HTTP/HTTPS 代理 origin。 |
|
||||
| `DSH_DESKTOP_MACOS_NOTARIZATION_PROXY` | 空 | 通过临时系统代理设置供 Apple 工具使用的 HTTP 代理 origin。 |
|
||||
|
||||
|
||||
@@ -17,7 +17,7 @@ import { resolveDesktopTargetBuildPaths } from './desktop-build-paths.mjs'
|
||||
const APP_ROOT = fileURLToPath(new URL('..', import.meta.url))
|
||||
const SHARED_SETTING = /^(?:DSH_DESKTOP_(?:APP_ID|AUTO_UPDATE_ENV|NPM_REGISTRY|MANDATORY_UPDATE_(?:CONFIG|(?:TEST|PROD)_ORIGIN))|DOWNLOAD_TEST_RELEASE_ID|DOWNLOAD_(?:TEST|PROD)_(?:ORIGIN|COS_BUCKET|COS_SECRET_ID|COS_SECRET_KEY))$/u
|
||||
const WINDOWS_SETTING = /^DSH_DESKTOP_WINDOWS_(?:CER_FILE|SIGNTOOL|KEY_CONTAINER|TOKEN_PIN|SIGNATURE_CACHE_DIR|SIGNATURE_CACHE_CONCURRENCY|PACK_CONCURRENCY)$/u
|
||||
const MACOS_SETTING = /^(?:DSH_DESKTOP_MACOS_(?:SIGNING_IDENTITY|TEAM_ID|SIGNATURE_CACHE_DIR|PACK_CONCURRENCY|DOWNLOAD_PROXY|NOTARIZATION_PROXY)|APPLE_(?:API_KEY|API_KEY_ID|API_ISSUER|ID|APP_SPECIFIC_PASSWORD|TEAM_ID|KEYCHAIN|KEYCHAIN_PROFILE)|CSC_(?:LINK|KEY_PASSWORD))$/u
|
||||
const MACOS_SETTING = /^(?:DSH_DESKTOP_MACOS_(?:SIGNING_IDENTITY|TEAM_ID|SIGNATURE_CACHE_DIR|PACK_CONCURRENCY|ZIP_COMPRESSION_LEVEL|DOWNLOAD_PROXY|NOTARIZATION_PROXY)|APPLE_(?:API_KEY|API_KEY_ID|API_ISSUER|ID|APP_SPECIFIC_PASSWORD|TEAM_ID|KEYCHAIN|KEYCHAIN_PROFILE)|CSC_(?:LINK|KEY_PASSWORD))$/u
|
||||
const AMBIENT_RELEASE_SETTING = /^(?:DSH_DESKTOP_(?:APP_ID|AUTO_UPDATE_ENV|MANDATORY_UPDATE_.*|WINDOWS_.*|MACOS_.*)|APPLE_.*|(?:WIN_)?CSC_.*|DOWNLOAD_(?:TEST|PROD)_.*)$/iu
|
||||
const FILE_SETTINGS = ['DSH_DESKTOP_WINDOWS_CER_FILE', 'DSH_DESKTOP_WINDOWS_SIGNTOOL', 'APPLE_API_KEY', 'APPLE_KEYCHAIN', 'CSC_LINK']
|
||||
|
||||
@@ -55,7 +55,7 @@ export function loadDesktopPackageEnvironment(platform, environment = process.en
|
||||
const platformSetting = platform === 'win32' ? WINDOWS_SETTING : MACOS_SETTING
|
||||
const publicPlatformSetting = platform === 'win32'
|
||||
? /^DSH_DESKTOP_WINDOWS_(?:SIGNATURE_CACHE_(?:DIR|CONCURRENCY)|PACK_CONCURRENCY)$/u
|
||||
: /^DSH_DESKTOP_MACOS_(?:SIGNATURE_CACHE_DIR|PACK_CONCURRENCY|DOWNLOAD_PROXY|NOTARIZATION_PROXY)$/u
|
||||
: /^DSH_DESKTOP_MACOS_(?:SIGNATURE_CACHE_DIR|PACK_CONCURRENCY|ZIP_COMPRESSION_LEVEL|DOWNLOAD_PROXY|NOTARIZATION_PROXY)$/u
|
||||
const settings = readSettings(path, name => preset === undefined
|
||||
? SHARED_SETTING.test(name) || platformSetting.test(name)
|
||||
: /^(?:DSH_DESKTOP_(?:APP_ID|AUTO_UPDATE_ENV|NPM_REGISTRY|MANDATORY_UPDATE_(?:CONFIG|(?:TEST|PROD)_ORIGIN))|DOWNLOAD_TEST_(?:ORIGIN|RELEASE_ID))$/u.test(name) || publicPlatformSetting.test(name))
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
/** Validated settings shared by preflight and stage execution. */
|
||||
export interface MacOSPackageSettings {
|
||||
readonly packConcurrency: number
|
||||
readonly zipCompressionLevel: number
|
||||
readonly downloadProxy?: string
|
||||
readonly notarizationProxy?: string
|
||||
}
|
||||
|
||||
@@ -15,14 +15,19 @@ function proxy(environment, name, protocols) {
|
||||
/**
|
||||
* Validate tuning before any build or network operation.
|
||||
* @param {NodeJS.ProcessEnv} environment File-owned packaging settings.
|
||||
* @returns {{packConcurrency: number, downloadProxy?: string, notarizationProxy?: string}} Resolved settings; empty proxy fields preserve inherited networking.
|
||||
* @returns {{packConcurrency: number, zipCompressionLevel: number, downloadProxy?: string, notarizationProxy?: string}} Resolved settings; empty proxy fields preserve inherited networking.
|
||||
*/
|
||||
export function resolveMacOSPackageSettings(environment) {
|
||||
const concurrency = environment.DSH_DESKTOP_MACOS_PACK_CONCURRENCY ?? '4'
|
||||
if (!/^[1-9]\d*$/u.test(concurrency) || !Number.isSafeInteger(Number(concurrency))) {
|
||||
throw new Error('desktop package: DSH_DESKTOP_MACOS_PACK_CONCURRENCY must be a positive integer')
|
||||
}
|
||||
const compression = environment.DSH_DESKTOP_MACOS_ZIP_COMPRESSION_LEVEL ?? '3'
|
||||
if (!/^[0-9]$/u.test(compression)) {
|
||||
throw new Error('desktop package: DSH_DESKTOP_MACOS_ZIP_COMPRESSION_LEVEL must be an integer from 0 to 9')
|
||||
}
|
||||
return {
|
||||
zipCompressionLevel: Number(compression),
|
||||
packConcurrency: Number(concurrency),
|
||||
downloadProxy: proxy(environment, 'DSH_DESKTOP_MACOS_DOWNLOAD_PROXY', ['http:', 'https:']),
|
||||
notarizationProxy: proxy(environment, 'DSH_DESKTOP_MACOS_NOTARIZATION_PROXY', ['http:']),
|
||||
|
||||
@@ -380,7 +380,7 @@ async function main(): Promise<void> {
|
||||
await packagingStep(run.directory, 'toolchain', () => requireDesktopToolchain(target.platform, environment), secrets)
|
||||
if (target.platform === 'darwin') {
|
||||
const settings = resolveMacOSPackageSettings(environment)
|
||||
recordPackagingEvent(run.directory, { type: 'macos-settings', packConcurrency: settings.packConcurrency,
|
||||
recordPackagingEvent(run.directory, { type: 'macos-settings', packConcurrency: settings.packConcurrency, zipCompressionLevel: settings.zipCompressionLevel,
|
||||
downloadProxyConfigured: settings.downloadProxy !== undefined,
|
||||
notarizationProxyConfigured: settings.notarizationProxy !== undefined })
|
||||
await packagingStep(run.directory, 'macos-package', () => invocation.unsigned
|
||||
@@ -518,7 +518,9 @@ export async function packageTarget(
|
||||
version: resolveDesktopBuildVersion(environment, packageVersion(join(APP_ROOT, 'package.json'), 'desktop package')),
|
||||
artifactsRoot: buildPaths.artifacts,
|
||||
environment: electronBuilderEnv,
|
||||
}, artifact => execute(desktopElectronBuilderArguments(target, false, artifact), electronBuilderEnv)), undefined, undefined, proxyEvent)
|
||||
}, artifact => execute(desktopElectronBuilderArguments(target, false, artifact), artifact.format === 'zip'
|
||||
? { ...electronBuilderEnv, ELECTRON_BUILDER_COMPRESSION_LEVEL: String(mac?.zipCompressionLevel) }
|
||||
: electronBuilderEnv)), undefined, undefined, proxyEvent)
|
||||
} else if (target.platform === 'darwin' && !invocation.unsigned && !invocation.skipNotarization) {
|
||||
await execute([...desktopElectronBuilderArguments(target, true), '--config.mac.notarize=false'], electronBuilderEnv)
|
||||
await execute(['exec', 'tsx', 'scripts/smoke-packaged-runtime.ts'], targetEnv)
|
||||
|
||||
@@ -273,6 +273,17 @@ it('skips Apple credentials but still requires signing credentials for unnotariz
|
||||
})
|
||||
})
|
||||
|
||||
it('takes ZIP compression from the Mac file instead of ambient release settings', async () => {
|
||||
await withDirectory(async (directory) => {
|
||||
await writeFile(join(directory, '.env.macos'), 'DSH_DESKTOP_MACOS_ZIP_COMPRESSION_LEVEL=5\n')
|
||||
const loaded = loadDesktopPackageEnvironment('darwin', { DSH_DESKTOP_MACOS_ZIP_COMPRESSION_LEVEL: '9' }, directory)
|
||||
expect(loaded.DSH_DESKTOP_MACOS_ZIP_COMPRESSION_LEVEL).toBe('5')
|
||||
await writeFile(join(directory, '.env.macos'), '')
|
||||
expect(loadDesktopPackageEnvironment('darwin', { DSH_DESKTOP_MACOS_ZIP_COMPRESSION_LEVEL: '9' }, directory))
|
||||
.not.toHaveProperty('DSH_DESKTOP_MACOS_ZIP_COMPRESSION_LEVEL')
|
||||
})
|
||||
})
|
||||
|
||||
it.each(['', 'relative-cache'])('rejects invalid build cache paths during preflight (%s)', (cache) => {
|
||||
expect(() => { validateDesktopPackageEnvironment({ ...RELEASE, DSH_DESKTOP_PACKAGE_CACHE_DIR: cache }, MACOS, { unsigned: true }) })
|
||||
.toThrow('DSH_DESKTOP_PACKAGE_CACHE_DIR must be absolute')
|
||||
|
||||
@@ -2,12 +2,12 @@ import { expect, it } from 'vitest'
|
||||
import { macOSDownloadEnvironment, resolveMacOSPackageSettings } from '../scripts/macos-package-settings.mjs'
|
||||
|
||||
it('defaults to four workers and keeps download and Apple proxies independent', () => {
|
||||
expect(resolveMacOSPackageSettings({})).toEqual({ packConcurrency: 4 })
|
||||
expect(resolveMacOSPackageSettings({})).toEqual({ packConcurrency: 4, zipCompressionLevel: 3 })
|
||||
expect(resolveMacOSPackageSettings({ DSH_DESKTOP_MACOS_PACK_CONCURRENCY: '2',
|
||||
DSH_DESKTOP_MACOS_DOWNLOAD_PROXY: 'https://download.example:8080',
|
||||
DSH_DESKTOP_MACOS_NOTARIZATION_PROXY: 'http://apple.example:8081',
|
||||
})).toEqual({ packConcurrency: 2, downloadProxy: 'https://download.example:8080', notarizationProxy: 'http://apple.example:8081' })
|
||||
expect(resolveMacOSPackageSettings({ DSH_DESKTOP_MACOS_DOWNLOAD_PROXY: ' ', DSH_DESKTOP_MACOS_NOTARIZATION_PROXY: '' })).toEqual({ packConcurrency: 4 })
|
||||
})).toEqual({ packConcurrency: 2, zipCompressionLevel: 3, downloadProxy: 'https://download.example:8080', notarizationProxy: 'http://apple.example:8081' })
|
||||
expect(resolveMacOSPackageSettings({ DSH_DESKTOP_MACOS_DOWNLOAD_PROXY: ' ', DSH_DESKTOP_MACOS_NOTARIZATION_PROXY: '' })).toEqual({ packConcurrency: 4, zipCompressionLevel: 3 })
|
||||
})
|
||||
|
||||
it.each(['', '0', '-1', '1.5', '1e2', 'Infinity', '9007199254740992'])('rejects invalid concurrency %j', (value) => {
|
||||
@@ -32,3 +32,11 @@ it('overrides conflicting child proxy variables while preserving the parent and
|
||||
expect(parent.HTTPS_PROXY).toBe('http://old')
|
||||
expect(parent.NO_PROXY).toBe('*')
|
||||
})
|
||||
|
||||
it.each(['', '-1', '10', '3.5', '03', 'NaN'])('rejects invalid ZIP compression %j', (value) => {
|
||||
expect(() => resolveMacOSPackageSettings({ DSH_DESKTOP_MACOS_ZIP_COMPRESSION_LEVEL: value })).toThrow('ZIP_COMPRESSION_LEVEL')
|
||||
})
|
||||
|
||||
it.each(['0', '3', '7', '9'])('accepts ZIP compression %s', (value) => {
|
||||
expect(resolveMacOSPackageSettings({ DSH_DESKTOP_MACOS_ZIP_COMPRESSION_LEVEL: value }).zipCompressionLevel).toBe(Number(value))
|
||||
})
|
||||
@@ -271,3 +271,19 @@ it('fails debugging packages when runtime verification fails', async () => {
|
||||
expect(stages.at(-1)).toBe(failure)
|
||||
expect(writeFileSync).not.toHaveBeenCalled()
|
||||
})
|
||||
|
||||
it.each([undefined, '7'])('applies file-owned compression only to the final notarized ZIP (%s)', async (level) => {
|
||||
const { run } = supervisor()
|
||||
vi.mocked(packageMacOSArtifacts).mockImplementationOnce(async (_request, build) => {
|
||||
await build({ format: 'dmg', appPath: '/fixture/app', output: '/fixture/dmg' })
|
||||
await build({ format: 'zip', appPath: '/fixture/app', output: '/fixture/zip' })
|
||||
})
|
||||
const settings = { ...environment, ELECTRON_BUILDER_COMPRESSION_LEVEL: '9',
|
||||
...(level === undefined ? {} : { DSH_DESKTOP_MACOS_ZIP_COMPRESSION_LEVEL: level }) }
|
||||
await packageTarget(parseDesktopPackageInvocation(['mac-arm64'], 'darwin', 'arm64'), settings, run)
|
||||
const zip = run.run.mock.calls.find(call => call[0].includes('--mac zip'))
|
||||
const dmg = run.run.mock.calls.find(call => call[0].includes('--mac dmg'))
|
||||
expect(zip?.[3].env.ELECTRON_BUILDER_COMPRESSION_LEVEL).toBe(level ?? '3')
|
||||
expect(dmg?.[3].env.ELECTRON_BUILDER_COMPRESSION_LEVEL).toBe('9')
|
||||
expect(writeFileSync).toHaveBeenCalledOnce()
|
||||
})
|
||||
Reference in new issue
Block a user