From 1a4c802322bd203f8dd152535d2a00f473a2184a Mon Sep 17 00:00:00 2001 From: mac Date: Wed, 11 Nov 2026 22:29:12 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A1=AE=E8=AE=A4133=E5=AE=8C=E6=95=B4?= =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E4=B8=94AppleAccepted=EF=BC=8C=E4=BB=A3?= =?UTF-8?q?=E7=90=86=E5=8E=9F=E5=AD=97=E8=8A=82=E6=81=A2=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- verification/DebugDelivery1.22.1.json | 5 ++-- verification/UnifiedLUTNotaryDirect133.json | 14 +++++++-- .../UnifiedLUTNotaryResubmission133.json | 30 +++++++++++++++++++ verification/UnifiedLUTNotaryResume133.json | 29 +++++++++++++++--- 开发交接.md | 16 ++++------ 5 files changed, 74 insertions(+), 20 deletions(-) create mode 100644 verification/UnifiedLUTNotaryResubmission133.json diff --git a/verification/DebugDelivery1.22.1.json b/verification/DebugDelivery1.22.1.json index c5035fc..b00ad4e 100644 --- a/verification/DebugDelivery1.22.1.json +++ b/verification/DebugDelivery1.22.1.json @@ -9,10 +9,11 @@ "sourceCommit": "7f833757da243f2a4610c23c36ec278b44c80ad4", "path": "/Library/Plug-Ins/FxPlug/大鱼调色.app", "formalRollback": "/Library/Plug-Ins/FxPlug/.dayu-color-formal-before-debug-8c17779060fb4b7a9b346754e5792616.app", - "pendingReleaseNotary": "0a1d2d49-1a03-4cd4-acbe-ba37f1fee42d", + "pendingReleaseNotary": "ae55bcd2-d131-4ef2-8733-405e28d92f7e", "signatureVerified": true, "pluginKitUniquePath": true, "cleanup": "Remove this temporary Debug APP when user testing ends or replace with the notarized Release; preserve the formal rollback until then.", "userConfirmation": "我已测试可行", - "hostObserved": "FCP shows 1233 online LUTs, populated effect thumbnails, original/styled comparison, unified sidebar and second-level local categories." + "hostObserved": "FCP shows 1233 online LUTs, populated effect thumbnails, original/styled comparison, unified sidebar and second-level local categories.", + "releaseNotaryStatus": "Accepted" } diff --git a/verification/UnifiedLUTNotaryDirect133.json b/verification/UnifiedLUTNotaryDirect133.json index e5f8758..916baef 100644 --- a/verification/UnifiedLUTNotaryDirect133.json +++ b/verification/UnifiedLUTNotaryDirect133.json @@ -1,7 +1,6 @@ { "userAuthorization": "允许临时直连并恢复", "scope": "Only the two official Apple S3 upload hostnames; no global proxy mode/toggle changes.", - "phase": "uploading", "domains": [ "notary-submissions-prod.s3.us-west-2.amazonaws.com", "notary-submissions-prod.s3-accelerate.amazonaws.com" @@ -12,10 +11,19 @@ "submittedZIPBytes": 43344165, "uploadStartedUTC": "2026-11-11T14:21:08.717106+00:00", "uploaderPID": 7658, - "profileRestored": false, - "liveProxyRestored": false, + "uploadCompleted": true, + "newNotaryID": "ae55bcd2-d131-4ef2-8733-405e28d92f7e", + "submitExitCode": 0, + "profileRestored": true, + "liveProxyRestored": true, + "profileOriginalBytesRestored": true, "editorNormalizationProtectionTriggered": true, "editorNormalizationReverted": true, + "temporaryUploadCopyRemoved": true, + "privateBackupRemovedAfterVerifiedRestore": true, + "phase": "accepted-and-proxy-restored", + "notaryStatus": "Accepted", + "uploadCompletedUTC": "2026-11-11T14:25:12.259402+00:00", "effectiveAppleOnlyBypassVerified": true, "otherProxyAddressesRemainProxied": true, "restorationMetadataLocalOnly": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/notary-direct-133-state.json" diff --git a/verification/UnifiedLUTNotaryResubmission133.json b/verification/UnifiedLUTNotaryResubmission133.json new file mode 100644 index 0000000..916baef --- /dev/null +++ b/verification/UnifiedLUTNotaryResubmission133.json @@ -0,0 +1,30 @@ +{ + "userAuthorization": "允许临时直连并恢复", + "scope": "Only the two official Apple S3 upload hostnames; no global proxy mode/toggle changes.", + "domains": [ + "notary-submissions-prod.s3.us-west-2.amazonaws.com", + "notary-submissions-prod.s3-accelerate.amazonaws.com" + ], + "sourceCommit": "7f833757da243f2a4610c23c36ec278b44c80ad4", + "submittedFilename": "dayu-color-1.22.1-build133-direct-20261111222108.zip", + "submittedZIP_SHA256": "7b3a0c068482834f1db96162c84d84af1419cb74429bb3a17edc10b3af85156a", + "submittedZIPBytes": 43344165, + "uploadStartedUTC": "2026-11-11T14:21:08.717106+00:00", + "uploaderPID": 7658, + "uploadCompleted": true, + "newNotaryID": "ae55bcd2-d131-4ef2-8733-405e28d92f7e", + "submitExitCode": 0, + "profileRestored": true, + "liveProxyRestored": true, + "profileOriginalBytesRestored": true, + "editorNormalizationProtectionTriggered": true, + "editorNormalizationReverted": true, + "temporaryUploadCopyRemoved": true, + "privateBackupRemovedAfterVerifiedRestore": true, + "phase": "accepted-and-proxy-restored", + "notaryStatus": "Accepted", + "uploadCompletedUTC": "2026-11-11T14:25:12.259402+00:00", + "effectiveAppleOnlyBypassVerified": true, + "otherProxyAddressesRemainProxied": true, + "restorationMetadataLocalOnly": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/notary-direct-133-state.json" +} diff --git a/verification/UnifiedLUTNotaryResume133.json b/verification/UnifiedLUTNotaryResume133.json index e7ab19e..7e6b5d2 100644 --- a/verification/UnifiedLUTNotaryResume133.json +++ b/verification/UnifiedLUTNotaryResume133.json @@ -2,12 +2,33 @@ "version": "1.22.1", "build": 133, "sourceCommit": "7f833757da243f2a4610c23c36ec278b44c80ad4", - "notaryID": "0a1d2d49-1a03-4cd4-acbe-ba37f1fee42d", - "notaryStatus": "In Progress", - "waitCommandInterrupted": true, + "notaryID": "ae55bcd2-d131-4ef2-8733-405e28d92f7e", + "notaryStatus": "Accepted", + "waitCommandInterrupted": false, "submittedZIP_SHA256": "7b3a0c068482834f1db96162c84d84af1419cb74429bb3a17edc10b3af85156a", "preflightPassed": true, "preflightChecks": 1028, "installed": false, - "resume": "tools/deliver.py --resume-notary --submitted-zip-sha256 --compiled-source " + "resume": "tools/deliver.py --resume-notary --submitted-zip-sha256 --compiled-source ", + "previousSubmissions": [ + { + "notaryID": "0a1d2d49-1a03-4cd4-acbe-ba37f1fee42d", + "lastKnownStatus": "In Progress", + "uploadCompletionVerified": false + }, + { + "notaryID": "e2aba6a4-a3c3-4fd8-a955-80991aff65d1", + "uploadCompleted": false, + "error": "S3 upload aborted, completedParts=[], deadlineExceeded" + }, + { + "notaryID": "fec84478-43a1-4644-961d-c29558e583ee", + "uploadCompleted": false, + "error": "S3 upload aborted, completedParts=[], deadlineExceeded" + } + ], + "uploadCompleted": true, + "resubmissionAuthorization": "用户要求重新发起公证,并批准Apple上传地址临时直连后恢复", + "resubmissionRecord": "verification/UnifiedLUTNotaryResubmission133.json", + "proxyRestored": true } diff --git a/开发交接.md b/开发交接.md index 7a0d79b..8ae4905 100644 --- a/开发交接.md +++ b/开发交接.md @@ -14,25 +14,19 @@ 旧公证 1.22.0(131)的回滚副本:`/Library/Plug-Ins/FxPlug/.dayu-color-formal-before-debug-8c17779060fb4b7a9b346754e5792616.app`。保留至正式 Release 安装验收完成;届时清理当前临时 Debug APP 和旧回滚副本,不保留额外安装。 -### 2026-11-11 重新发起公证:上传链路受阻 +### 重新公证已通过,代理已恢复 -用户明确要求“重新发起公证”。已核对保留的 Release 1.22.1(133)签名与原 ZIP 摘要一致,没有修改已验收功能,当前 Debug 持续可用。 +按用户明确要求重新发起,并获“允许临时直连并恢复”授权。加速和普通通道之前都因 S3 分片上传超时失败(仅编号不等于已上传);使用代理配置中仅两个官方 Apple S3 地址的临时直连,经原生热重载生效后完整上传成功。新编号 **`ae55bcd2-d131-4ef2-8733-405e28d92f7e`** 已经 Apple 回读为 **Accepted**。原始 Release ZIP 为 43,344,165 字节,SHA-256 `7b3a0c068482834f1db96162c84d84af1419cb74429bb3a17edc10b3af85156a`,未重编或重签 APP。 -两次新请求均得到编号,但**均未完成文件上传**:加速通道 `e2aba6a4-a3c3-4fd8-a955-80991aff65d1`、普通通道 `fec84478-43a1-4644-961d-c29558e583ee`。客户端都明确报 `abortedUpload / HTTPClientError.deadlineExceeded` 且 `completedParts=[]`。只有编号和 In Progress 不能证明上传完成,不应继续把这些请求当成已上传的公证任务等待。[加速失败](verification/UnifiedLUTNotaryResubmission133-attempt1.json) · [普通通道失败](verification/UnifiedLUTNotaryResubmission133-attempt2.json)。Apple DTS 对先分配编号、再等待二进制上传的行为有[官方说明](https://developer.apple.com/forums/thread/847500);普通上传端点依据 [Apple 文档](https://developer.apple.com/documentation/security/customizing-the-notarization-workflow)。 - -用户已明确批准“允许临时直连并恢复”。系统网络偏好中的例外不能覆盖 SFM 的 VPN 生效设置,第一次尝试已原样恢复。当前仅在活动代理配置中为两个 Apple S3 域名加入 HTTP 代理例外与直连路由,再通过重新选择当前配置触发原生热重载;没有关闭整个代理或切换全局模式,实际 notarytool 上传连接已直接连到 Apple S3,其他地址仍走原代理。 - -**当前上传进行中,上传结束必须立刻恢复。** 原配置完整字节备份保留在代理应用的受保护目录,恢复位置由本机 `/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/notary-direct-133-state.json` 记录;私有配置未入 Git。初次使用编辑器“格式化”会重写单项字段结构,严格保护检查已拦截并撤回,未发起额外上传;现使用原始配置直接生成仅两地址差异,不再经编辑器保存。恢复时必须写回原始字节,重新选择相同的当前配置热重载,核对两个 Apple 例外已撤销、原 SHA-256 一致,再清理私有备份。[直连进度](verification/UnifiedLUTNotaryDirect133.json)。 - -原始 Release APP、原 ZIP、当前 Debug 和 131 回滚全部保留。当前目标是拿到真正的上传完成回执与新编号,恢复代理后再查询公证;Accepted 后推进票据、正式安装、PKG 和 Git Release。 +上传完成后已写回代理原始配置并热重载,完整字节摘要一致、临时域名例外消失、原代理继续开启;私有配置备份和上传临时 ZIP 已清理,私有配置没有进入 Git。[上传、Accepted 与恢复](verification/UnifiedLUTNotaryResubmission133.json)。当前继续票据、正式安装、Release 宿主验收、PKG 与 Git Release;正式替换前 Debug 和 131 回滚仍保留。 ### 原公证与正式发行 -APP 实际编译源码 `7f833757da243f2a4610c23c36ec278b44c80ad4`,从独立 HTTPS 干净检出构建,921 个跟踪文件逐字节核对。原提交 **`0a1d2d49-1a03-4cd4-acbe-ba37f1fee42d`** 仍待最终结果;等待命令曾异常退出,之后曾按同一编号查询;当前按用户最新明确要求重新提交,进展见上节。132 为未安装、未发行的候选,诊断记录保留。 +APP 实际编译源码 `7f833757da243f2a4610c23c36ec278b44c80ad4`,从独立 HTTPS 干净检出构建,921 个跟踪文件逐字节核对。旧编号 `0a1d2d49-1a03-4cd4-acbe-ba37f1fee42d` 未核实原始上传完成,已由上节真正上传并 Accepted 的新编号取代,不再作为等待目标。132 为未安装、未发行的候选,诊断记录保留。 Release APP 与原提交 ZIP 保留在 `/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/`。原 ZIP 摘要与恢复参数见 [恢复记录](verification/UnifiedLUTNotaryResume133.json)。`tools/deliver.py --resume-notary … --submitted-zip-sha256 … --compiled-source …` 会逐文件/符号链接核对已提交 APP,只查询原提交并在 Accepted 后粘附、安装,不重编或重签。恢复安装前需先正常退出当前 Debug 主 APP 与 FCP,保留用户内容;取得交付锁后继续,完成后清理 Debug 及已不再需要的 131 回滚。 -**尚未完成:** 正式 APP 公证/票据、替换 Debug、Release 宿主验收、PKG 和 Git Release 下载核验。无后端部署。站点文章和更新通道仍为 1.21.8(126)。下一步先处理上节已确认的上传链路问题;在获得上传完成回执后再等待公证最终状态,获 Accepted 后完成正式交付。源码及本地测试记录已推送;本地验收标签 `debug/v1.22.1-build133-20261111` 指向 `46d7ff7bbc9de3cf3bec63f1f8fe39fcbdbe0b67`,独立 HTTPS 检出逐字节核对 927 个文件、Git 完整性及 APP 编译输入一致,[恢复核验](verification/DebugRecovery1.22.1.json)。既有工程 Security 引用排序差异保留,未纳入本轮提交。 +**尚未完成:** 正式 APP 公证/票据、替换 Debug、Release 宿主验收、PKG 和 Git Release 下载核验。无后端部署。站点文章和更新通道仍为 1.21.8(126)。APP 已获 Accepted,下一步从相同产物粘附票据并替换 Debug,继续正式交付。源码及本地测试记录已推送;本地验收标签 `debug/v1.22.1-build133-20261111` 指向 `46d7ff7bbc9de3cf3bec63f1f8fe39fcbdbe0b67`,独立 HTTPS 检出逐字节核对 927 个文件、Git 完整性及 APP 编译输入一致,[恢复核验](verification/DebugRecovery1.22.1.json)。既有工程 Security 引用排序差异保留,未纳入本轮提交。 131 的既有正式发行见 [此前交接](research/OnlineLUTRelease131Handoff.md)、[发行](verification/Release1.22.0.json)、[恢复](verification/Recovery1.22.0.json)。