比较提交
19
次代码提交
| 作者 | SHA1 | 提交日期 | |
|---|---|---|---|
|
|
b5d842835c | ||
|
|
c95559936a | ||
|
|
e37330a4b5 | ||
|
|
a0f37578f7 | ||
|
|
30c8904003 | ||
|
|
55acdaa4b1 | ||
|
|
15d644c7e7 | ||
|
|
f453508be6 | ||
|
|
29bb7cdae4 | ||
|
|
c587163354 | ||
|
|
5d9a4ad707 | ||
|
|
7113e49fbb | ||
|
|
90d6022520 | ||
|
|
c664991aa1 | ||
|
|
0743c75a45 | ||
|
|
7bb14ea8da | ||
|
|
4e77cebd5e | ||
|
|
fd25de68fe | ||
|
|
46fb091479 |
没有与搜索条件相匹配的文件
@@ -0,0 +1,37 @@
|
||||
# 大鱼调色公测后端
|
||||
|
||||
LOCAL_PROJECT=/Users/mac/Downloads/dayumedia/dayu-color-beta
|
||||
NAS_ROOT=/Volumes/dayumedia (存储空间1)/wwwroot/dayu_media
|
||||
SOURCE_BACKUP=大鱼调色仓库 Backend/
|
||||
|
||||
映射:`wp-content/mu-plugins/dayu-color-beta.php` 和 `wp-content/uploads/dayu-color-beta/updates/beta.json` 均保持同相对路径。PKG 不进 Git,由产品 Release 与生产公测下载空间保存。专项工作副本只包含本产品文件,源码及脱敏记录保存到产品仓库。参考 `fcpx-qwen3-asr` 提交 `113069c74aff935db2082b5bcd8e1aa47fe1fbf2` 的更新校验、批次诊断和崩溃脱敏流程;共享会员鉴权代码未修改。
|
||||
|
||||
2026-11-02 初始盘点:目标 MU 插件不存在,本地专项工程新建。实际共享已确认来自 192.168.31.21、dayumedia (存储空间1)、smbfs 且可读写。单独建仓因令牌缺少 write:user 返回403,未扩大权限;改用现有产品仓库保存。
|
||||
|
||||
## 路由与查看
|
||||
|
||||
- 更新:`GET https://dayu.media/wp-json/dayu-color/v1/update?bundle_id=com.dayu.color&channel=beta¤t_build=45`。仅提供更高构建号的完整 PKG 更新,无强制安装。
|
||||
- 诊断:`POST https://dayu.media/wp-json/dayu-color/v1/diagnostics`,公测阶段不依赖账号。严格限定产品、字段、事件、UUID、批次大小及频率;匿名输入只作为排查证据,不作为授权凭据。
|
||||
- 日志后台:`https://dayu.media/wp-admin/tools.php?page=dayu-color-beta`,需要管理员。可按构建号、事件、完整报告标识筛选并翻页。GET 诊断接口同样要求 manage_options。
|
||||
- 数据保留30天,由 WordPress 每日计划清理;依赖站点 WP-Cron 正常运行。IP 仅用于短期频控哈希,不存入诊断表。
|
||||
|
||||
## 客户端
|
||||
|
||||
主 APP 检查更新与插件注册并行,检查结束且注册成功后显示3秒退出倒计时。发现更新则保留窗口;下载可取消,校验 SHA-256、字节数、Installer/App签名团队、Gatekeeper、包内 Bundle ID、版本、安装位置及模板。保存并退出 FCP/Motion 后打开系统安装器,不强杀宿主。下一次启动可记录已完成升级。
|
||||
|
||||
主 APP 与 XPC 共享随机安装标识及诊断开关。诊断默认开启,界面明确说明并可关闭;不上传素材、LUT、预设、用户路径、账号、硬件 UUID 或原始崩溃文件。后台私有队列最多256条/384KB,批次16条,网络超时并延迟重试,服务端按事件 UUID 去重。关闭后清除待发摘要并停止新请求;已经送达的数据按保留期清理。
|
||||
|
||||
采集进程启动、初始化、检查器创建/慢刷新、Metal 管线准备、首次渲染、渲染错误、超过6秒的疑似阻塞,以及本插件近7天系统崩溃报告的脱敏摘要。疑似阻塞不等于根因;整个进程被停止、网络不可用、主机强制断电时无法保证即时送达。不会拦截崩溃信号,也不采集整个 FCP 的报告。本轮保留调色与宿主回调逻辑,尚未修复偶发卡死。
|
||||
|
||||
## 验证与发布
|
||||
|
||||
```sh
|
||||
php Backend/tests/contract.php
|
||||
python3 Backend/verify_live.py
|
||||
python3 Backend/deploy.py --backend
|
||||
python3 Backend/deploy.py --package '/Volumes/备份/大鱼调色/发行包/大鱼调色-1.7.0.pkg'
|
||||
```
|
||||
|
||||
先从仓库审查、提交并推送,再由部署脚本同步到专项工程;脚本验证实际 SMB 挂载及基线。覆盖原文件前同目录旁路备份并核对字节,新增文件无需不存在的备份。只写明确列出的路径,不加载或输出生产配置。更新包签名、公证、票据与正式 APP 验收通过后才发布;同名包不同字节立即停止。发布后完整下载核对大小与 SHA-256,并核验较低/相同构建号的更新结果。
|
||||
|
||||
回滚:先备份当前文件,再恢复部署记录中对应旁路备份;禁止降低已有清单构建号来自动降级。撤下更新时备份并移走 beta.json,更新路由回到没有更新;历史安装包和诊断表保留。源代码可从产品远程仓库恢复,签名私钥及服务端数据库不属于 Git 备份。
|
||||
@@ -0,0 +1,87 @@
|
||||
#!/usr/bin/env python3
|
||||
# coding: utf-8
|
||||
"""Deploy only the Dayu Color beta namespace from the scoped local workspace."""
|
||||
from pathlib import Path
|
||||
import argparse,datetime,hashlib,json,os,re,shutil,subprocess,uuid
|
||||
ROOT=Path(__file__).resolve().parent.parent
|
||||
LOCAL=Path('/Users/mac/Downloads/dayumedia/dayu-color-beta')
|
||||
MOUNT=Path('/Volumes/dayumedia (存储空间1)')
|
||||
NAS=MOUNT/'wwwroot/dayu_media'
|
||||
REL=Path('wp-content/mu-plugins/dayu-color-beta.php')
|
||||
UPLOAD=Path('wp-content/uploads/dayu-color-beta/updates')
|
||||
STAMP=datetime.datetime.now().strftime('%Y%m%d%H%M')
|
||||
def sha(path):
|
||||
h=hashlib.sha256()
|
||||
with path.open('rb') as f:
|
||||
for part in iter(lambda:f.read(1024*1024),b''):h.update(part)
|
||||
return h.hexdigest()
|
||||
def write_json(path,data):
|
||||
path.parent.mkdir(parents=True,exist_ok=True);path.write_text(json.dumps(data,ensure_ascii=False,indent=2)+'\n')
|
||||
def check_mount():
|
||||
lines=subprocess.check_output(['/sbin/mount'],text=True).splitlines()
|
||||
match=[s for s in lines if f' on {MOUNT} (smbfs,' in s]
|
||||
assert len(match)==1 and '@192.168.31.21/dayumedia%' in match[0], '目标不是已确认的 NAS SMB 共享'
|
||||
assert NAS.is_dir() and os.access(NAS/'wp-content/mu-plugins',os.W_OK), '目标共享不可写'
|
||||
return match[0]
|
||||
def backup(path):
|
||||
target=path.with_name(f'{path.stem}-{STAMP}.{path.suffix[1:]}bak' if path.suffix else f'{path.name}-{STAMP}.bak')
|
||||
assert not target.exists(), '旁路备份重名,请换时间戳'
|
||||
shutil.copyfile(path,target);assert sha(target)==sha(path)
|
||||
return str(target)
|
||||
def deploy_file(source,target,allow_new=False,expected=None):
|
||||
target.parent.mkdir(parents=True,exist_ok=True);old=None
|
||||
if target.exists():
|
||||
if sha(target)==sha(source):return dict(path=str(target),sha256=sha(target),reused=True)
|
||||
assert expected and sha(target)==expected,'生产基线已变化,停止覆盖'
|
||||
old=backup(target)
|
||||
else:assert allow_new,'预期生产基线不存在'
|
||||
temp=target.with_name('.dayu-color-stage-'+uuid.uuid4().hex)
|
||||
try:
|
||||
shutil.copyfile(source,temp);temp.chmod(0o644);assert sha(temp)==sha(source);os.replace(temp,target)
|
||||
finally:
|
||||
if temp.exists():temp.unlink()
|
||||
assert sha(source)==sha(target) and os.access(target,os.R_OK)
|
||||
return dict(path=str(target),sha256=sha(target),backup=old,size=target.stat().st_size)
|
||||
def main():
|
||||
p=argparse.ArgumentParser(description=__doc__);p.add_argument('--backend',action='store_true');p.add_argument('--package',type=Path);args=p.parse_args()
|
||||
assert args.backend or args.package
|
||||
mount=check_mount();LOCAL.mkdir(parents=True,exist_ok=True)
|
||||
lock=LOCAL/'.deployment.lock';lock.mkdir();write_json(lock/'owner.json',dict(PID=os.getpid(),cwd=str(ROOT),started=STAMP))
|
||||
try:
|
||||
if args.backend:
|
||||
subprocess.run(['php','-l',str(ROOT/'Backend'/REL)],check=True)
|
||||
local=LOCAL/REL;local.parent.mkdir(parents=True,exist_ok=True)
|
||||
record=ROOT/'verification/BetaBackendDeployment.json'
|
||||
previous=json.loads(record.read_text()) if record.exists() else {}
|
||||
if local.exists() and sha(local)!=sha(ROOT/'Backend'/REL):
|
||||
assert previous.get('sha256')==sha(local),'本地专项工程有未部署改动,停止覆盖'
|
||||
shutil.copyfile(ROOT/'Backend'/REL,local)
|
||||
result=deploy_file(local,NAS/REL,allow_new=not previous,expected=previous.get('sha256'))
|
||||
result.update(timestamp=STAMP,mount=mount,localProject=str(LOCAL),sourceCommit=subprocess.check_output(['git','rev-parse','HEAD'],cwd=ROOT,text=True).strip())
|
||||
write_json(record,result);print(json.dumps(result,ensure_ascii=False))
|
||||
if args.package:
|
||||
package=args.package.resolve();report=json.loads((ROOT/'verification/Package.json').read_text());delivery=json.loads((ROOT/'verification/Delivery.json').read_text())
|
||||
assert report['notarization']['status']=='Accepted' and delivery['status']=='verified'
|
||||
# Independent final-container checks before uploading any bytes.
|
||||
subprocess.run(['pkgutil','--check-signature',str(package)],check=True,stdout=subprocess.DEVNULL)
|
||||
subprocess.run(['xcrun','stapler','validate',str(package)],check=True,stdout=subprocess.DEVNULL)
|
||||
subprocess.run(['spctl','--assess','--type','install',str(package)],check=True)
|
||||
version=delivery['version'];build=int(delivery['build']);digest=sha(package)
|
||||
assert report["sha256"]==digest, "发行包与验包记录不一致"
|
||||
filename=f'dayu-color-{version.replace(".","-")}-{build}.pkg';relative=UPLOAD/filename
|
||||
local=LOCAL/relative;local.parent.mkdir(parents=True,exist_ok=True)
|
||||
if not local.exists():shutil.copyfile(package,local)
|
||||
assert sha(local)==digest
|
||||
result=deploy_file(local,NAS/relative,allow_new=True)
|
||||
manifest=dict(bundle_id='com.dayu.color',channel='beta',version=version,build=build,package_type='pkg',install_mode='pkg_installer',
|
||||
size=package.stat().st_size,sha256=digest,download_url='https://dayu.media/'+str(relative),minimum_system_version='14.6',
|
||||
notes='公测版:接入自动更新与可关闭的云端诊断,记录插件加载耗时及错误摘要。请保存并退出 FCP / Motion 后安装。')
|
||||
dest=NAS/UPLOAD/'beta.json';old=json.loads(dest.read_text()) if dest.exists() else None
|
||||
if old:assert int(old['build'])<=build, '禁止更新通道倒退'
|
||||
localManifest=LOCAL/UPLOAD/'beta.json';write_json(localManifest,manifest)
|
||||
published=deploy_file(localManifest,dest,allow_new=True,expected=sha(dest) if old else None)
|
||||
result.update(manifest=published,version=version,build=build,downloadURL=manifest['download_url'],timestamp=STAMP)
|
||||
write_json(ROOT/'verification/BetaPublication.json',result);print(json.dumps(result,ensure_ascii=False))
|
||||
finally:
|
||||
(lock/'owner.json').unlink();lock.rmdir()
|
||||
if __name__=='__main__':main()
|
||||
@@ -0,0 +1,53 @@
|
||||
<?php
|
||||
// Product endpoint contracts; WordPress and DB are stubbed, never load production settings.
|
||||
error_reporting(E_ALL);
|
||||
set_error_handler(function($severity,$message,$file,$line){ throw new ErrorException($message,0,$severity,$file,$line); });
|
||||
define('ABSPATH',__DIR__.'/');define('MINUTE_IN_SECONDS',60);define('DAY_IN_SECONDS',86400);define('ARRAY_A','ARRAY_A');
|
||||
$testRoot=sys_get_temp_dir().'/dayu-color-contract-'.bin2hex(random_bytes(6));mkdir($testRoot,0700,true);
|
||||
function add_action(...$args){}
|
||||
function get_option($key){return '1';}
|
||||
function register_rest_route($namespace,$route,$args){$GLOBALS['routes'][$route]=$args;}
|
||||
function current_user_can($permission){return false;}
|
||||
function wp_upload_dir(...$args){return array('basedir'=>$GLOBALS['testRoot']);}
|
||||
function sanitize_textarea_field($value){return strip_tags($value);}
|
||||
function sanitize_text_field($value){return strip_tags($value);}
|
||||
function wp_salt($scheme){return 'test-only-not-production';}
|
||||
function get_transient($key){return 0;}
|
||||
function set_transient(...$args){}
|
||||
function wp_json_encode($value,$options=0){return json_encode($value,$options);}
|
||||
class WP_Error {public $code,$data;function __construct($code,$message,$data){$this->code=$code;$this->data=$data;}}
|
||||
class WP_REST_Response {public $data,$status;function __construct($data,$status,$headers){$this->data=$data;$this->status=$status;}}
|
||||
class WP_REST_Request {public $params,$body;function __construct($params=array(),$body=null){$this->params=$params;$this->body=$body;}function get_param($name){return $this->params[$name]??null;}function get_body(){return json_encode($this->body);}function get_json_params(){return $this->body;}}
|
||||
class FakeDB {public $prefix='wp_',$rows=array();function prepare($sql,...$args){return $args[0]??$sql;}function get_var($sql){return isset($this->rows[$sql])?$sql:null;}function insert($table,$row){$this->rows[$row['event_id']]=$row;return 1;}}
|
||||
$wpdb=new FakeDB;
|
||||
require dirname(__DIR__).'/wp-content/mu-plugins/dayu-color-beta.php';
|
||||
$checks=0;
|
||||
function check($value,$label){global $checks;if(!$value)throw new RuntimeException($label);$checks++;}
|
||||
function request($body){return new WP_REST_Request(array(),$body);}
|
||||
try {
|
||||
Dayu_Color_Beta::routes();
|
||||
check(($routes['/diagnostics'][1]['permission_callback'])()===false,'anonymous log reads denied');
|
||||
check(Dayu_Color_Beta::update(new WP_REST_Request(array('bundle_id'=>'other')))->data['status']===400,'product separation');
|
||||
$response=Dayu_Color_Beta::update(new WP_REST_Request(array('bundle_id'=>'com.dayu.color','current_build'=>44)));
|
||||
check($response->status===200 && !$response->data['update_available'],'empty feed is usable');
|
||||
$fields=Dayu_Color_Beta::clean_fields(array('frames'=>'/Users/test/secret.mov','error_domain'=>'token=not-a-token','arbitrary'=>'private','duration_ms'=>INF,'gpu'=>'M4'));
|
||||
check($fields['frames']==='[REDACTED]' && $fields['error_domain']==='[REDACTED]' && !isset($fields['arbitrary']) && !isset($fields['duration_ms']) && $fields['gpu']==='M4','allowlist and redaction');
|
||||
$id='12345678-1234-4234-8234-123456789012';
|
||||
$event=array('event_id'=>$id,'session_id'=>$id,'source'=>'plugin','version'=>'1.7.0','build'=>45,'event'=>'first_render','occurred_at'=>time(),'fields'=>array('duration_ms'=>1200));
|
||||
$body=array('bundle_id'=>'com.dayu.color','installation_id'=>$id,'events'=>array($event));
|
||||
$reply=Dayu_Color_Beta::ingest(request($body));
|
||||
check($reply->status===200 && $reply->data['accepted'] && count($wpdb->rows)===1,'valid event accepted');
|
||||
Dayu_Color_Beta::ingest(request($body));check(count($wpdb->rows)===1,'retry idempotency');
|
||||
foreach(array('version'=>array(),'build'=>array(),'event'=>'material_path','session_id'=>'bad','occurred_at'=>null) as $key=>$bad){$b=$body;$b['events'][0][$key]=$bad;check(Dayu_Color_Beta::ingest(request($b))->data['status']===400,'malformed '.$key);}
|
||||
$b=$body;$b['events']=array_fill(0,33,$event);check(Dayu_Color_Beta::ingest(request($b))->data['status']===400,'batch limit');
|
||||
$b=$body;$b['padding']=str_repeat('a',100000);check(Dayu_Color_Beta::ingest(request($b))->data['status']===413,'byte limit');
|
||||
$manifest=array('bundle_id'=>'com.dayu.color','channel'=>'beta','version'=>'1.7.0','build'=>45,'package_type'=>'pkg','install_mode'=>'pkg_installer','size'=>123,'sha256'=>str_repeat('a',64),'download_url'=>'https://dayu.media/wp-content/uploads/dayu-color-beta/updates/dayu-color-1-7-0-45.pkg');
|
||||
mkdir(dirname(Dayu_Color_Beta::manifest_path()),0700,true);file_put_contents(Dayu_Color_Beta::manifest_path(),json_encode($manifest));
|
||||
check(Dayu_Color_Beta::update(new WP_REST_Request(array('bundle_id'=>'com.dayu.color','current_build'=>44)))->data['update_available']===true,'older build sees update');
|
||||
check(Dayu_Color_Beta::update(new WP_REST_Request(array('bundle_id'=>'com.dayu.color','current_build'=>45)))->data['update_available']===false,'current build no downgrade');
|
||||
foreach(array('download_url'=>'https://other.example/evil.pkg','sha256'=>'bad','build'=>array(),'size'=>1073741825,'install_mode'=>'zip_replace') as $key=>$bad){$m=$manifest;$m[$key]=$bad;file_put_contents(Dayu_Color_Beta::manifest_path(),json_encode($m));check(Dayu_Color_Beta::manifest()===array(),'bad manifest '.$key);}
|
||||
echo json_encode(array('passed'=>true,'checks'=>$checks),JSON_PRETTY_PRINT)."\n";
|
||||
} finally {
|
||||
if(is_file(Dayu_Color_Beta::manifest_path()))unlink(Dayu_Color_Beta::manifest_path());
|
||||
@rmdir($testRoot.'/dayu-color-beta/updates');@rmdir($testRoot.'/dayu-color-beta');@rmdir($testRoot);
|
||||
}
|
||||
@@ -0,0 +1,24 @@
|
||||
#!/usr/bin/env python3
|
||||
"""Anonymous public-beta endpoint smoke test; no credentials or production settings."""
|
||||
import datetime,json,time,urllib.request,urllib.error,uuid
|
||||
from pathlib import Path
|
||||
ROOT=Path(__file__).resolve().parent.parent
|
||||
BASE='https://dayu.media/wp-json/dayu-color/v1/'
|
||||
def call(route,body=None):
|
||||
request=urllib.request.Request(BASE+route,data=json.dumps(body).encode() if body else None,headers={'Content-Type':'application/json'})
|
||||
try:
|
||||
with urllib.request.urlopen(request,timeout=15) as r:return r.status,json.load(r)
|
||||
except urllib.error.HTTPError as e:return e.code,json.load(e)
|
||||
def main():
|
||||
status,feed=call('update?bundle_id=com.dayu.color&channel=beta¤t_build=44');assert status==200 and feed['bundle_id']=='com.dayu.color'
|
||||
assert call('update?bundle_id=other&channel=beta')[0]==400
|
||||
assert call('diagnostics')[0] in (401,403)
|
||||
event_id=str(uuid.uuid4());installation=str(uuid.uuid4());session=str(uuid.uuid4())
|
||||
event=dict(event_id=event_id,session_id=session,source='app',version='1.7.0',build=45,event='diagnostic_summary',occurred_at=time.time(),fields={'status':'deployment_smoke_test','count':1})
|
||||
payload=dict(bundle_id='com.dayu.color',installation_id=installation,events=[event])
|
||||
for attempt in range(2):
|
||||
status,reply=call('diagnostics',payload);assert status==200 and reply['accepted'] and reply['event_ids']==[event_id],(status,reply)
|
||||
bad=dict(payload,bundle_id='other');assert call('diagnostics',bad)[0]==400
|
||||
record=dict(passed=True,checked_at=datetime.datetime.now(datetime.timezone.utc).isoformat(),checks=['update GET','product isolation','admin read denied anonymously','diagnostic stored ACK','retry same UUID ACK','foreign upload denied'],test_event_id=event_id,test_installation_id=installation,update=feed)
|
||||
(ROOT/'verification/BetaBackendLive.json').write_text(json.dumps(record,ensure_ascii=False,indent=2)+'\n');print(json.dumps(record,ensure_ascii=False))
|
||||
if __name__=='__main__':main()
|
||||
@@ -0,0 +1,179 @@
|
||||
<?php
|
||||
/** Plugin Name: 大鱼调色公测更新与诊断
|
||||
* Product-scoped beta endpoints. No changes to shared account/authentication code.
|
||||
*/
|
||||
defined('ABSPATH') || exit;
|
||||
|
||||
final class Dayu_Color_Beta {
|
||||
const SCHEMA = '1';
|
||||
const BUNDLE = 'com.dayu.color';
|
||||
const MAX_BODY = 98304;
|
||||
const MAX_BATCH = 32;
|
||||
const EVENTS = array('process_start','process_exit','plugin_init','inspector_create','inspector_refresh',
|
||||
'device_prepare','gpu_pipeline','first_render','render_error','main_thread_stall',
|
||||
'operation_stall','previous_session_pending','crash_summary','registration','host_confirmed',
|
||||
'update_check','update_download','update_validation','update_installer','diagnostic_summary');
|
||||
const FIELDS = array('phase','stage','pipeline','duration_ms','status','error_domain','error_code',
|
||||
'exception','signal','frames','report_time','count','pending','model','os_version','fcp_version',
|
||||
'cpu_cores','memory_gb','gpu','main_delay_ms','active_stages','source_version');
|
||||
|
||||
public static function boot() {
|
||||
add_action('rest_api_init', array(__CLASS__, 'routes'));
|
||||
add_action('admin_menu', function () {
|
||||
add_management_page('大鱼调色公测', '大鱼调色公测', 'manage_options', 'dayu-color-beta', array(__CLASS__, 'admin'));
|
||||
});
|
||||
add_action('dayu_color_beta_cleanup', array(__CLASS__, 'cleanup'));
|
||||
}
|
||||
private static function table() { global $wpdb; return $wpdb->prefix . 'dayu_color_beta_events'; }
|
||||
public static function ensure_schema() {
|
||||
if (get_option('dayu_color_beta_schema') === self::SCHEMA) return;
|
||||
global $wpdb;
|
||||
require_once ABSPATH . 'wp-admin/includes/upgrade.php';
|
||||
$table = self::table(); $collation = $wpdb->get_charset_collate();
|
||||
dbDelta("CREATE TABLE {$table} (
|
||||
event_id varchar(36) NOT NULL,
|
||||
installation_id varchar(36) NOT NULL,
|
||||
session_id varchar(36) NOT NULL,
|
||||
client_version varchar(32) NOT NULL,
|
||||
client_build bigint unsigned NOT NULL,
|
||||
source varchar(12) NOT NULL,
|
||||
event varchar(64) NOT NULL,
|
||||
fields_json text NOT NULL,
|
||||
occurred_at datetime NOT NULL,
|
||||
received_at datetime NOT NULL,
|
||||
PRIMARY KEY (event_id),
|
||||
KEY received_at (received_at),
|
||||
KEY client_event (client_build,event),
|
||||
KEY installation (installation_id)
|
||||
) {$collation};");
|
||||
if ($wpdb->get_var($wpdb->prepare('SHOW TABLES LIKE %s', $table)) === $table) {
|
||||
update_option('dayu_color_beta_schema', self::SCHEMA, false);
|
||||
if (!wp_next_scheduled('dayu_color_beta_cleanup')) wp_schedule_event(time()+3600, 'daily', 'dayu_color_beta_cleanup');
|
||||
}
|
||||
}
|
||||
public static function routes() {
|
||||
self::ensure_schema();
|
||||
register_rest_route('dayu-color/v1', '/update', array('methods'=>'GET', 'permission_callback'=>'__return_true', 'callback'=>array(__CLASS__,'update')));
|
||||
register_rest_route('dayu-color/v1', '/diagnostics', array(
|
||||
array('methods'=>'POST', 'permission_callback'=>'__return_true', 'callback'=>array(__CLASS__,'ingest')),
|
||||
array('methods'=>'GET', 'permission_callback'=>function(){ return current_user_can('manage_options'); }, 'callback'=>array(__CLASS__,'events'))
|
||||
));
|
||||
}
|
||||
public static function manifest_path() {
|
||||
$upload = wp_upload_dir(null, false);
|
||||
return rtrim($upload['basedir'], '/\\') . '/dayu-color-beta/updates/beta.json';
|
||||
}
|
||||
public static function manifest() {
|
||||
$path = self::manifest_path();
|
||||
if (!is_file($path) || filesize($path)>32768) return array();
|
||||
$value = json_decode((string)file_get_contents($path), true);
|
||||
if (!is_array($value) || ($value['bundle_id']??'')!==self::BUNDLE || ($value['channel']??'')!=='beta') return array();
|
||||
if (!is_string($value['download_url']??null) || !is_string($value['sha256']??null) || !is_string($value['version']??null) || !is_int($value['build']??null) || !is_int($value['size']??null) || ($value['package_type']??'')!=='pkg' || ($value['install_mode']??'')!=='pkg_installer') return array();
|
||||
$url = $value['download_url'];
|
||||
if (!preg_match('~^https://dayu\.media/wp-content/uploads/dayu-color-beta/updates/[A-Za-z0-9_-]+\.pkg$~D', $url)) return array();
|
||||
if (!preg_match('/^[a-f0-9]{64}$/D', (string)($value['sha256']??'')) || intval($value['size']??0)<=0 || intval($value['build']??0)<=0 || intval($value['size'])>1073741824) return array();
|
||||
return $value;
|
||||
}
|
||||
public static function update($request) {
|
||||
if (($request->get_param('bundle_id')??'')!==self::BUNDLE || ($request->get_param('channel')??'beta')!=='beta') {
|
||||
return new WP_Error('product_mismatch','此通道仅用于大鱼调色公测。',array('status'=>400));
|
||||
}
|
||||
$manifest = self::manifest();
|
||||
if (!$manifest) return new WP_REST_Response(array('bundle_id'=>self::BUNDLE,'channel'=>'beta','update_available'=>false,'message'=>'当前没有公测更新。'),200,array('Cache-Control'=>'no-store'));
|
||||
$current = max(0, intval($request->get_param('current_build')));
|
||||
$manifest['update_available'] = intval($manifest['build']) > $current;
|
||||
$manifest['checked_at'] = gmdate('c');
|
||||
return new WP_REST_Response($manifest,200,array('Cache-Control'=>'no-store'));
|
||||
}
|
||||
public static function clean_fields($input) {
|
||||
if (!is_array($input)) return array();
|
||||
$out = array();
|
||||
foreach (self::FIELDS as $key) {
|
||||
if (!array_key_exists($key,$input) || !is_scalar($input[$key])) continue;
|
||||
if (in_array($key,array('duration_ms','main_delay_ms','memory_gb','cpu_cores','count','pending','error_code'),true)) {
|
||||
if (is_numeric($input[$key]) && is_finite((float)$input[$key])) $out[$key]=max(-1000000,min(86400000,(float)$input[$key]));
|
||||
continue;
|
||||
}
|
||||
$value = sanitize_textarea_field((string)$input[$key]);
|
||||
$value = preg_replace('~(?:https?://\S+|(?:/Users/|/Volumes/|/private/|/var/)[^\r\n]*)~i','[REDACTED]',$value);
|
||||
$value = preg_replace('/(?:bearer\s+\S+|(?:token|api[_-]?key|secret|password)\s*[=:]\s*\S+)/i','[REDACTED]',$value);
|
||||
$limit = $key==='frames' ? 6000 : ($key==='active_stages' ? 1000 : 200);
|
||||
$out[$key] = function_exists('mb_substr') ? mb_substr($value,0,$limit,'UTF-8') : substr($value,0,$limit);
|
||||
}
|
||||
return $out;
|
||||
}
|
||||
private static function uuid($value) { return is_string($value) && preg_match('/^[a-f0-9]{8}-(?:[a-f0-9]{4}-){3}[a-f0-9]{12}$/iD',$value); }
|
||||
public static function ingest($request) {
|
||||
if (strlen($request->get_body())>self::MAX_BODY) return new WP_Error('body_too_large','诊断批次过大。',array('status'=>413));
|
||||
$body = $request->get_json_params();
|
||||
if (!is_array($body) || ($body['bundle_id']??'')!==self::BUNDLE || !self::uuid($body['installation_id']??null)
|
||||
|| !isset($body['events']) || !is_array($body['events']) || count($body['events'])<1 || count($body['events'])>self::MAX_BATCH) {
|
||||
return new WP_Error('invalid_batch','诊断批次无效。',array('status'=>400));
|
||||
}
|
||||
// Anonymous beta diagnostics are untrusted input, never an authorization proof.
|
||||
$ip = (string)($_SERVER['REMOTE_ADDR']??'unknown');
|
||||
$bucket = 'dayu_color_rate_' . substr(hash_hmac('sha256',$ip,wp_salt('nonce')),0,32);
|
||||
$count = intval(get_transient($bucket));
|
||||
if ($count>=300) return new WP_Error('rate_limit','请稍后重试。',array('status'=>429));
|
||||
set_transient($bucket,$count+1,10*MINUTE_IN_SECONDS);
|
||||
$normalized = array();
|
||||
foreach ($body['events'] as $event) {
|
||||
if (!is_array($event) || !self::uuid($event['event_id']??null) || !self::uuid($event['session_id']??null)
|
||||
|| !in_array($event['event']??'',self::EVENTS,true) || !in_array($event['source']??'',array('app','plugin'),true)
|
||||
|| !is_string($event['version']??null) || strlen($event['version'])>32 || !preg_match('/^[0-9]+(?:\.[0-9A-Za-z_-]+){1,3}$/D',$event['version'])
|
||||
|| !is_int($event['build']??null) || $event['build']<1 || $event['build']>999999999
|
||||
|| !is_numeric($event['occurred_at']??null) || !is_finite((float)$event['occurred_at']) || abs((float)$event['occurred_at']-time())>366*DAY_IN_SECONDS) return new WP_Error('invalid_event','诊断事件无效。',array('status'=>400));
|
||||
$normalized[] = array('event_id'=>strtolower($event['event_id']),'installation_id'=>strtolower($body['installation_id']),
|
||||
'session_id'=>strtolower($event['session_id']),'client_version'=>substr($event['version'],0,32),
|
||||
'client_build'=>intval($event['build']),'source'=>$event['source'],'event'=>$event['event'],
|
||||
'fields_json'=>wp_json_encode(self::clean_fields($event['fields']??array()),JSON_UNESCAPED_UNICODE),
|
||||
'occurred_at'=>gmdate('Y-m-d H:i:s',(int)$event['occurred_at']), 'received_at'=>gmdate('Y-m-d H:i:s'));
|
||||
}
|
||||
global $wpdb; $table=self::table(); $accepted=array();
|
||||
foreach ($normalized as $row) {
|
||||
// Idempotent event IDs permit bounded retry after an ambiguous connection loss.
|
||||
if ($wpdb->get_var($wpdb->prepare("SELECT event_id FROM {$table} WHERE event_id=%s",$row['event_id']))) { $accepted[]=$row['event_id']; continue; }
|
||||
if ($wpdb->insert($table,$row)===false && !$wpdb->get_var($wpdb->prepare("SELECT event_id FROM {$table} WHERE event_id=%s",$row['event_id']))) return new WP_Error('storage_failed','诊断存储失败,请稍后重试。',array('status'=>503));
|
||||
$accepted[]=$row['event_id'];
|
||||
}
|
||||
return new WP_REST_Response(array('accepted'=>true,'event_ids'=>$accepted,'received_at'=>gmdate('c')),200,array('Cache-Control'=>'no-store'));
|
||||
}
|
||||
public static function cleanup() {
|
||||
global $wpdb; $table=self::table();
|
||||
$wpdb->query($wpdb->prepare("DELETE FROM {$table} WHERE received_at < %s",gmdate('Y-m-d H:i:s',time()-30*DAY_IN_SECONDS)));
|
||||
}
|
||||
public static function events($request) {
|
||||
global $wpdb; $table=self::table(); $where='1=1'; $values=array();
|
||||
foreach (array('build'=>'client_build','event'=>'event','installation'=>'installation_id') as $param=>$column) {
|
||||
$raw=$request->get_param($param);$value = is_scalar($raw)?sanitize_text_field((string)$raw):'';
|
||||
if ($value!=='') { $where.=" AND {$column}=%s"; $values[]=$value; }
|
||||
}
|
||||
$page=max(1,min(1000,intval($request->get_param('page'))));
|
||||
$sql="SELECT event_id,installation_id,session_id,client_version,client_build,source,event,fields_json,occurred_at,received_at FROM {$table} WHERE {$where} ORDER BY received_at DESC LIMIT 50 OFFSET " . (($page-1)*50);
|
||||
$rows=$wpdb->get_results($values?$wpdb->prepare($sql,$values):$sql,ARRAY_A);
|
||||
return array('events'=>$rows?:array(),'page'=>$page,'retention_days'=>30);
|
||||
}
|
||||
public static function admin() {
|
||||
if (!current_user_can('manage_options')) return;
|
||||
self::ensure_schema(); global $wpdb; $table=self::table();
|
||||
$request = new WP_REST_Request('GET');
|
||||
foreach (array('build','event','installation') as $key) $request->set_param($key,is_string($_GET[$key]??null)?sanitize_text_field(wp_unslash($_GET[$key])):'');
|
||||
$request->set_param('page',max(1,intval($_GET['paged']??1)));
|
||||
$result=self::events($request);$manifest=self::manifest();
|
||||
$devices=intval($wpdb->get_var($wpdb->prepare("SELECT COUNT(DISTINCT installation_id) FROM {$table} WHERE received_at >= %s",gmdate('Y-m-d H:i:s',time()-7*DAY_IN_SECONDS))));
|
||||
echo '<div class="wrap"><h1>大鱼调色公测</h1><p>近7天报告设备:<strong>'.esc_html($devices).'</strong> · 诊断保留30天。匿名公测标识用于关联问题,不代表账号或设备授权。</p>';
|
||||
echo '<h2>公测更新</h2><p>'.($manifest?'当前版本:'.esc_html($manifest['version']).'('.esc_html($manifest['build']).')':'尚未发布更新包').'</p>';
|
||||
echo '<h2>诊断事件</h2><form method="get"><input type="hidden" name="page" value="dayu-color-beta">';
|
||||
foreach (array('build'=>'构建号','event'=>'事件','installation'=>'完整报告标识') as $key=>$label) echo '<label>'.esc_html($label).' <input name="'.esc_attr($key).'" value="'.esc_attr($request->get_param($key)).'"></label> ';
|
||||
echo '<button class="button">筛选</button></form><table class="widefat striped"><thead><tr><th>时间(UTC)</th><th>版本</th><th>报告标识</th><th>来源/事件</th><th>内容</th></tr></thead><tbody>';
|
||||
foreach ($result['events'] as $row) {
|
||||
echo '<tr><td>'.esc_html($row['occurred_at']).'<br>送达 '.esc_html($row['received_at']).'</td><td>'.esc_html($row['client_version'].' ('.$row['client_build'].')').'</td><td><code>'.esc_html($row['installation_id']).'</code><br>会话 '.esc_html(substr($row['session_id'],0,8)).'</td><td>'.esc_html($row['source'].' / '.$row['event']).'</td><td><pre style="white-space:pre-wrap;max-width:760px">'.esc_html(wp_json_encode(json_decode($row['fields_json'],true),JSON_PRETTY_PRINT|JSON_UNESCAPED_UNICODE)).'</pre></td></tr>';
|
||||
}
|
||||
echo '</tbody></table><p>';
|
||||
$base=array('page'=>'dayu-color-beta','build'=>$request->get_param('build'),'event'=>$request->get_param('event'),'installation'=>$request->get_param('installation'));
|
||||
if ($result['page']>1) echo '<a class="button" href="'.esc_url(add_query_arg(array_merge($base,array('paged'=>$result['page']-1)),admin_url('tools.php'))).'">上一页</a> ';
|
||||
if (count($result['events'])===50) echo '<a class="button" href="'.esc_url(add_query_arg(array_merge($base,array('paged'=>$result['page']+1)),admin_url('tools.php'))).'">下一页</a>';
|
||||
echo '</p><p>仅包含产品版本、环境、阶段耗时、错误代码及本插件崩溃摘要,不接收素材、预设、硬件UUID或账户凭据。</p></div>';
|
||||
}
|
||||
}
|
||||
Dayu_Color_Beta::boot();
|
||||
@@ -0,0 +1,15 @@
|
||||
# 大鱼调色 1.6.1(44)
|
||||
|
||||
主 APP 改为深色产品介绍界面,发布地址 https://dayu.media 位于顶部。展示完整调色、LUT、胶片和局部蒙版/叠层特色。
|
||||
|
||||
启动自动检查并提交 PluginKit 注册,核对实际内嵌组件路径。成功后在状态卡显示清晰的3→2→1秒倒计时再退出;查看功能介绍可保留窗口。打开 FCP 检查会保留窗口,由用户确认画面和调节后点击“已确认正常,退出”。注册状态与宿主功能确认分开。
|
||||
|
||||
按用户要求关闭外层 APP 沙盒。保留 Developer ID、Hardened Runtime、可信时间戳、公证及票据。本轮未加入登录、授权、加密、自动更新或后端模块,调色/渲染/Metal/模板未改。
|
||||
|
||||
Apple Silicon,macOS14.6或更新。正式安装位置 /Library/Plug-Ins/FxPlug/大鱼调色.app,主/服务ID为com.dayu.color、com.dayu.color.XPC,团队B3W25FX5H5。实际编译源码90d6022520c59ea34f42b511daee85ac2936cfd9。
|
||||
|
||||
正式路径395项原生检查通过;已有登记、缺失登记重建、精确唯一路径回读、3秒退出、保留介绍和重复检查通过。FCP实际使用按主APP指引由用户确认,本说明不将登记成功等同渲染验收。安装包已展开核验,本轮未再次运行系统安装器。
|
||||
|
||||
APP公证23d7b69c-5585-435d-ad07-faee061e0ccb Accepted;PKG公证7315225d-a350-4c65-9e87-5784035ea018 Accepted。最终PKG由Developer ID Installer签署,签名、票据及Gatekeeper通过。
|
||||
|
||||
安装包 大鱼调色-1.6.1.pkg,40,854,422字节;SHA-256 `d075373d672b8f0146b98f3151c9f74cd6b97e8a1081e0d0796f53af7f291da0`。包含正式APP和既有FCP模板,不含用户媒体、LUT库或预设。
|
||||
@@ -0,0 +1,19 @@
|
||||
# 大鱼调色 1.7.0(45)公测
|
||||
|
||||
加入主 APP 自动更新检查与云端公测诊断。启动时并行检查插件注册和新版本;注册成功且检查结束后显示3秒退出倒计时,发现更新则保留窗口。完整 PKG 更新由用户确认下载,验证 SHA-256、大小、签名团队、公证评估、产品/版本/安装位置及 FCP 模板;保存并退出 FCP/Motion 后打开系统安装器。
|
||||
|
||||
公测诊断默认开启,可在主 APP 随时关闭。主 APP 与插件共用随机报告标识,后台限量排队、离线重试、事件去重。采集版本和系统环境、插件/检查器/Metal 管线/首次渲染耗时、错误代码、疑似阻塞及本插件崩溃摘要;不上传素材、LUT、预设、账号、硬件 UUID、用户路径或原始崩溃文件。云端保留30天,管理页面需管理员登录。
|
||||
|
||||
本轮用于收集偶发 FCP 加载卡死证据,保留既有调色及宿主回调逻辑,未宣称修复卡死。暂未加入登录、授权或业务加密模块。共享会员后台不变,公测使用独立产品路由与日志表。主 APP 启动时检查更新,插件使用期间不会自动替换正在运行的组件。
|
||||
|
||||
要求 Apple Silicon、macOS 14.6 或更新。固定安装位置 `/Library/Plug-Ins/FxPlug/大鱼调色.app`;主/插件 ID 为 `com.dayu.color`、`com.dayu.color.XPC`。APP 实际编译源码 `a0f37578f73d7f8faa872d9a81009e2d6586a858`。Metal 与模板 SHA 与1.6.1一致。
|
||||
|
||||
395项原生检查通过;正式路径 UI、诊断关闭/恢复/手动发送、3秒退出、FCP 12.4 界面与曝光调整/还原通过,云端已实际收到插件首次渲染记录。另有66项更新/隐私/完整签名安装包检查、20项后端契约检查,以及线上接收与去重验证。单次本机加载正常不能证明偶发卡死已经解决。
|
||||
|
||||
APP 公证 `777a5c05-4936-4b14-b8e8-0c789c1df05c` Accepted;PKG 公证 `04082e26-663d-4408-85da-63736d079aa2` Accepted;签名、票据、Gatekeeper 和展开验包通过。本轮正式 APP 已直接安装及宿主验收,PKG 已验包,未重复执行系统安装脚本。
|
||||
|
||||
发行包 `大鱼调色-1.7.0.pkg`,40,898,751字节;SHA-256 `a3578ee95aa7333e64d556061173fb73a42be0e45442ae844c94147b421d34bb`。
|
||||
|
||||
公测下载:https://dayu.media/wp-content/uploads/dayu-color-beta/updates/dayu-color-1-7-0-45.pkg
|
||||
|
||||
日志后台:https://dayu.media/wp-admin/tools.php?page=dayu-color-beta (管理员)。反馈用户可附主 APP 显示的报告标识和发生时间,便于关联同一次加载过程。
|
||||
+2
-2
@@ -76,8 +76,8 @@ def main():
|
||||
appearance=dict(title="大鱼调色", subtitle="适用于 Final Cut Pro 与 Motion 的原生调色效果",
|
||||
badgeImage=str(ROOT / "design/dayu-color-app-icon-v1.png"), authorContact="https://dayu.media"),
|
||||
pages=dict(welcome="安装大鱼调色 " + version + ",包含原生 FxPlug 调色插件和 Final Cut Pro 效果入口。",
|
||||
readme="系统要求:macOS 14.6 或更高版本。本发行构建适用于 Apple Silicon Mac。\n\n安装内容:\n/Library/Plug-Ins/FxPlug/大鱼调色.app\n登录用户“影片/Motion Templates/Effects/大鱼调色”中的效果模板与预览图。\n\n重新打开 Final Cut Pro 后,在“效果 → 大鱼调色”中应用;Motion 中可选择原生滤镜。\n本安装包不包含用户自选 LUT、预设或媒体文件。",
|
||||
license="", conclusion="大鱼调色已安装。请完成插件 APP 的系统提示,随后退出并重新打开 Final Cut Pro / Motion。\n如果效果未出现,可在访达打开 /Library/Plug-Ins/FxPlug/大鱼调色.app 后再次启动宿主。"))
|
||||
readme="系统要求:macOS 14.6 或更高版本。本发行构建适用于 Apple Silicon Mac。\n\n安装内容:\n/Library/Plug-Ins/FxPlug/大鱼调色.app\n登录用户“影片/Motion Templates/Effects/大鱼调色”中的效果模板与预览图。\n\n重新打开 Final Cut Pro 后,在“效果 → 大鱼调色”中应用;Motion 中可选择原生滤镜。\n本安装包不包含用户自选 LUT、预设或媒体文件。\n\n公测诊断默认开启,可在主 APP 关闭。仅发送版本、系统环境、加载耗时与本插件错误摘要到 dayu.media;不发送素材、预设或账号,保留30天。主 APP 启动时检查更新,新版由用户确认安装。",
|
||||
license="", conclusion="大鱼调色已安装。主 APP 自动注册插件,成功后显示3秒倒计时退出。可点击“打开 FCP 检查”保留窗口,并在宿主中实际检查效果。"))
|
||||
manifest_path = CACHE / "dayu-color-package-manifest.json"
|
||||
manifest_path.write_text(json.dumps(manifest, ensure_ascii=False, indent=2) + "\n")
|
||||
command = ["/usr/bin/python3", str(skill / "package_fxplug.py"), "--repo", str(forge), "--manifest", str(manifest_path)]
|
||||
|
||||
@@ -1,9 +1,11 @@
|
||||
# 大鱼调色
|
||||
|
||||
原生 FxPlug 4 调色器,当前正式安装版本 **1.6.0(39)**。唯一安装位置为 `/Library/Plug-Ins/FxPlug/大鱼调色.app`;Final Cut Pro 中从“效果 → 大鱼调色”添加。
|
||||
原生 FxPlug 4 调色器,当前正式安装版本 **1.6.1(44)**。唯一安装位置为 `/Library/Plug-Ins/FxPlug/大鱼调色.app`;Final Cut Pro 中从“效果 → 大鱼调色”添加。
|
||||
|
||||
交接与恢复入口:[大鱼调色FxPlug4交接.md](大鱼调色FxPlug4交接.md)。
|
||||
|
||||
主 APP 已改为深色产品介绍界面,发布地址置顶;启动自动注册并回读系统登记,成功后在状态卡显示3秒倒计时退出。查看介绍或打开FCP检查可保留窗口;FCP中的实际效果由用户确认。外层沙盒按用户要求关闭,登录、授权、加密、自动更新及后端暂未接入。见[本轮说明](research/MainApp1.6.1.md)与[主APP验证](verification/MainApp1.6.1.json);后续账号工作仍参考[原交接](大鱼调色主APP开发交接.md)。
|
||||
|
||||
## 胶片模拟与通道混合器
|
||||
|
||||
新增可重复的胶片模拟和通道混合器,现有调色、蒙版、区域跟踪和相邻叠层保留。每个新工具都有独立眼睛、折叠、复位、蒙版、数量标记和“再加一层”;新增层从默认值开始。
|
||||
@@ -101,6 +103,6 @@ LUT 缩略图浏览器使用宿主的独立可调整窗口:拖动标题栏移
|
||||
|
||||
正式发行包由 PKG 工坊技能生成,包含 APP 与 FCP 模板,不含用户 LUT、预设或媒体。安装与发布证据分别保存在 [Package.json](verification/Package.json) 和 [Release.json](verification/Release.json);以其中记录的版本和成功状态为准。
|
||||
|
||||
正式发行包:[大鱼调色-1.6.0.pkg](../发行包/大鱼调色-1.6.0.pkg)。当前安装、公证、验包与Release下载结果分别以[Delivery](verification/Delivery.json)、[Package](verification/Package.json)、[Release](verification/Release.json)为准。[1.6.0 Release](https://dayu.media/git/dayu/dayu-color/releases/tag/v1.6.0-print-looks-20261102)用于保存最终发行包。历史[1.5.0 Release](https://dayu.media/git/dayu/dayu-color/releases/tag/v1.5.0-film-mixer-20261102)及更早标签和发行包保留。
|
||||
当前发行包:[大鱼调色-1.6.1.pkg](../发行包/大鱼调色-1.6.1.pkg),主APP与注册验证见[1.6.1记录](verification/MainApp1.6.1.json)。 [1.6.1 Release](https://dayu.media/git/dayu/dayu-color/releases/tag/v1.6.1-main-app-20261102)已发布(Release374 / 附件19),草稿和正式链接完整下载均核对40,854,422字节和SHA-256一致;发行标签304文件逐字节独立恢复、102个APP/工程文件与实际编译节点一致,已清理本轮生成副本。FCP实际使用已由用户于2026-11-02明确确认正常,见[用户验收记录](verification/HostUserConfirmation1.6.1.json)。历史发行包:[大鱼调色-1.6.0.pkg](../发行包/大鱼调色-1.6.0.pkg)。当前安装、公证、验包与Release下载结果分别以[Delivery](verification/Delivery.json)、[Package](verification/Package.json)、[Release](verification/Release.json)为准。[1.6.0 Release](https://dayu.media/git/dayu/dayu-color/releases/tag/v1.6.0-print-looks-20261102)已发布(Release373 / 附件18),草稿正常浏览器下载和发布后完整下载均校验40,833,847字节及SHA-256一致。标签296个文件远端逐字节恢复核验通过,本轮恢复/下载及生成APP副本已清理,见[标签恢复](verification/PrintLooksReleaseRecovery.json)与[清理记录](verification/PrintLooksCleanup.json)。历史[1.5.0 Release](https://dayu.media/git/dayu/dayu-color/releases/tag/v1.5.0-film-mixer-20261102)及更早标签和发行包保留。
|
||||
|
||||
1.3.1 的历史验收包含 Sony 默认、可见复位、浮动浏览器、系统窗口缩放、两种布局、最近排序与关闭重开。原生检查单独覆盖几何/布局持久化和鼠标事件;当时自动化没有独立确认自由标题栏/边缘拖动。1.4.0 另在独立合成工程中完成上文的宿主检查,用户确认中心拖动后保留其试调状态。
|
||||
+11
-1
@@ -2,7 +2,15 @@
|
||||
|
||||
当前交接:[大鱼调色FxPlug4交接.md](大鱼调色FxPlug4交接.md)。
|
||||
|
||||
## 当前1.6.0(39):八种印片、低版本模板与默认映射
|
||||
## 当前1.6.1(44):主 APP 界面与自动注册
|
||||
|
||||
远程 https://dayu.media/git/dayu/dayu-color.git ,main。实际编译源码 `90d6022520c59ea34f42b511daee85ac2936cfd9`,签名团队B3W25FX5H5,唯一正式位置 `/Library/Plug-Ins/FxPlug/大鱼调色.app`。主/服务Bundle ID维持com.dayu.color、com.dayu.color.XPC,Apple Silicon / macOS14.6或更新。Xcode27.1、FxPlugSDK4.3.5;无LFS或子模块。
|
||||
|
||||
主界面、显式注册、精确路径回读和3秒倒计时通过;独立用户FCP确认单独记录,不把登记当作渲染验收。调色/Metal/模板未改,395项正式原生检查通过。证书、私钥和公证凭据需独立恢复,不在Git中;准备本机签名身份与profile后用tools/deliver.py进行Release构建和正式交付。
|
||||
|
||||
通过克隆仓库并 `git switch --detach 90d6022520c59ea34f42b511daee85ac2936cfd9` 可恢复实际编译节点;`verification/Delivery.json`、MainApp1.6.1.json、MainAppRecovery1.6.1.json分别记录安装、UI/登记及远端恢复。正式PKG `大鱼调色-1.6.1.pkg`,40,854,422字节,SHA-256 `d075373d672b8f0146b98f3151c9f74cd6b97e8a1081e0d0796f53af7f291da0`;PKG公证7315225d-a350-4c65-9e87-5784035ea018 Accepted,20项展开检查通过。未再次执行系统安装器。发行标签 `v1.6.1-main-app-20261102` 对应完整提交 `5d9a4ad7072c1d30f9f8d589719939e2efbcd53c`,[Release374](https://dayu.media/git/dayu/dayu-color/releases/tag/v1.6.1-main-app-20261102) / 附件19已发布;正常浏览器草稿下载及发布后的完整下载均核对大小、SHA-256一致,附件URL见verification/Release.json。独立恢复304文件逐字节核对、full/strict fsck通过,102个APP/工程文件与实际编译节点90d6022520c59ea34f42b511daee85ac2936cfd9一致。临时回滚APP、下载和恢复副本已清理,历史发行包及用户QA资料保留,见MainAppCleanup1.6.1.json;FCP实际使用已由用户于2026-11-02明确回复“已确认正常”,详见verification/HostUserConfirmation1.6.1.json;APP、安装包及发行标签未改变。
|
||||
|
||||
## 历史1.6.0(39):八种印片、低版本模板与默认映射
|
||||
|
||||
远程 `https://dayu.media/git/dayu/dayu-color.git`,main;发行标签 `v1.6.0-print-looks-20261102`。APP实际编译源码 `e5affd3f097fc96f87f41be8e1a3f131ed01daeb`,公证 `5d74c04c-8a30-47e9-822d-4f616dfdee56` Accepted。APP和内部XPC固定ID、唯一正式路径与签名团队不变。正式395项自检、独立原版136项印片对照、FCP12.4八外观/叠层/蒙版100键跟踪/三个完整导出与冷重开通过,见 `verification/HostPrintLooks1.6.0.json`。
|
||||
|
||||
@@ -288,3 +296,5 @@ python3 Packaging/build_pkg.py --pkg-forge-repo /实际/PKG工坊源码目录 --
|
||||
文档整理前 main 为 `bbdd47d1d74e241f1f144bb2c245204e86973b3f`。交接标签 `handoff-mask-tracking-tools-20261101` 保存最新 `大鱼调色FxPlug4交接.md` 及 `research/MaskTrackingAndToolStack.md`,区分正式 1.3.1(19)与尚未实现的多个独立 HSL、每实例蒙版和跟踪。本文档提交未重新构建、安装或发布 APP/PKG,不移动原发行标签;父级“大鱼调色盘”只读参考。接续时保护用户当前窗口、布局、LUT 选择和工程。
|
||||
|
||||
正式PKG `大鱼调色-1.6.0.pkg`,40833847字节,SHA-256 `13821631b5d54f1b9c1934c513a9cc7e92641208e20219839a63e23865f21cca`;PKG公证 `4716e3c7-8199-4dc1-940c-2376dd647e9b` Accepted,签名、票据、Gatekeeper和20项展开验包通过。发行包未再次运行系统安装器。
|
||||
|
||||
最终[Release373](https://dayu.media/git/dayu/dayu-color/releases/tag/v1.6.0-print-looks-20261102) / 附件18已发布并回读确认。标签 `v1.6.0-print-looks-20261102` 对应完整SHA `0cc51149a6f21ebe09465b4fd7130451bedd57bb`;草稿正常浏览器下载与发布后完整下载均校验40,833,847字节及SHA-256一致。发行标签296文件逐字节恢复和full/strict fsck通过,与实际编译SHA的程序源码完全一致。恢复clone、独立构建和下载副本清理完成;已知相关位置仅正式39版APP,历史发行包和私人验收数据保留。记录见 `verification/Release.json`、`ReleaseDraftDownload1.6.0.json`、`PrintLooksReleaseRecovery.json`、`PrintLooksCleanup.json`。
|
||||
@@ -0,0 +1,33 @@
|
||||
# 主 APP 1.6.1(44)
|
||||
|
||||
本轮只改现有主 APP 的产品介绍、系统插件注册及退出体验。按用户最新说明,发布地址位于最顶部,关闭外层 APP 沙盒;登录、授权、加密、自动更新及后端均未接入。调色、渲染、参数、Uniform、预设、Metal 和 FCP 模板保持原样。
|
||||
|
||||
## 最终界面与交互
|
||||
|
||||
沿用 Objective-C/AppKit、Nib 连线和手动内存管理。采用 standard 档原生交互,深色静态渐变、圆角彩色卡片和胶囊按钮呼应参考图。比较单列介绍、左右双栏、状态+使用指引+双列特色三种结构后,选择第三种:顶部可点击的发布地址 https://dayu.media,随后产品名称/版本、插件注册与宿主检查,最后四张完整调色、LUT、胶片、蒙版叠层特色卡。默认920×850,最小760×620,纵向滚动。
|
||||
|
||||
每次启动:检查内嵌组件 → 提交注册 → 系统回读确认。成功后在注册卡片内清晰显示3→2→1秒倒计时并退出,取消了旧版底部难以看到的提示。查看介绍/⌘I取消本次自动退出;⌘R可重新检查,工作期间防止重复提交;⌘W关闭窗口、⌘Q退出。失败时保留窗口和重试入口。
|
||||
|
||||
“打开FCP检查”会保留本窗口,并按Bundle ID打开Final Cut Pro。用户在FCP内将大鱼调色应用到片段,确认画面与调节正常后,可点击“已确认正常,退出”。系统注册成功与宿主功能确认分开记录;自动化不代替用户点击确认。Motion也有明确入口,覆盖正式及历史两种宿主Bundle ID。
|
||||
|
||||
## 系统登记与权限
|
||||
|
||||
外层AppDelegate拥有唯一注册状态:checking → registering → ready/failed。PluginKit操作在后台队列,UI在主线程。先验证精确内嵌组件的Bundle ID、当前构建号、FxPlug协议及登记版本1.1,再向/usr/bin/pluginkit提交独立路径参数;查询返回的标识/协议/完整路径必须匹配。1.1是登记协议版本,不是APP版本。不使用shell字符串、不需管理员提权、不改变其他插件的用户选择。
|
||||
|
||||
40/41候选发现沙盒允许注册却拒绝CLI的PKDiscoverAll查询,即使不带-A也会失败,不能把它解释为“插件未注册”。用户随后明确允许关闭沙盒。最终移除主APP的app-sandbox entitlement,查询可直接回读;不采用42候选的应答降级。内嵌服务原本未启用该沙盒,Developer ID、Hardened Runtime、可信时间戳、公证、票据及Gatekeeper要求保持。
|
||||
|
||||
本机诊断写入 ~/Library/Application Support/com.dayu.color/Registration.json,记录登记应答、实际路径、版本、进程、退出原因及用户确认,不联网、不含凭据。--show-introduction可保留介绍,仍执行真实注册流程。
|
||||
|
||||
## 视觉与无障碍
|
||||
|
||||
使用原生按钮、可访问文本、键盘快捷键、焦点环和状态播报。不使用透明采样、模糊、着色器或装饰性动画;增强对比度加粗边界,进度采用系统控件。实际测试、未覆盖的VoiceOver/系统显示选项及暂定评分以verification/MainApp1.6.1.json为准,不仅凭截图宣称90分质量。
|
||||
|
||||
## 来源、身份与交付
|
||||
|
||||
只读参考用户指定的 https://dayu.media/git/dayu/fcpx-qwen3-asr.git ,提交113069c74aff935db2082b5bcd8e1aa47fe1fbf2中的ContentView.swift、LicenseViewModel.swift;借鉴配色和层级,没有引入其会员、计费或识别业务代码。
|
||||
|
||||
唯一正式路径 /Library/Plug-Ins/FxPlug/大鱼调色.app;主/服务Bundle ID为com.dayu.color、com.dayu.color.XPC,版本同步1.6.1(44)。实际编译源码90d6022520c59ea34f42b511daee85ac2936cfd9。40/41/43是本轮定位或界面候选,42未安装,均不发布安装包;历史已发布版本及用户验收媒体/预设保留。
|
||||
|
||||
APP签名、公证、票据、正式安装、自检见verification/Delivery.json和InstalledSelfTest.json;主界面/注册验证见MainApp1.6.1.json;安装包、Release及独立恢复见Package.json、Release.json和MainAppRecovery1.6.1.json。以各记录的实际状态为准,不将系统登记等同于用户已确认宿主功能。
|
||||
|
||||
2026-11-02:用户针对正式1.6.1(44)在FCP中应用插件、检查画面和调节的验收问题明确回复“已确认正常”。本轮宿主用户验收已完成,证据见verification/HostUserConfirmation1.6.1.json。此后仅补录验收文档,不重编译、增加构建号或重发安装包。
|
||||
@@ -57,3 +57,5 @@ APP模板ozml5.11 / Motion5.4.5的当前FCP12.4加载、渲染及清洁界面通
|
||||
稳定原生注册默认0保持原API合同,但实机证明它不能冻结FCP关联模板的旧默认:三组已保存印片主效果也从0跟随新模板到1。对比仅此用户要求的默认变化,其余277项值及paths/spider/tools完整载荷不变,主效果eye在这些印片夹具中原本关闭,印片渲染链不受该开关变化影响。不得把原生模拟宿主的旧默认0检查等同于旧FCP主效果逐字节不变。实际新手动关闭能保存,冷重开结果已证实。旧独立一级层省略值保留0的兼容逻辑仍有效。
|
||||
|
||||
最终Metal SHA `6ec98b85aeb841f9988a4b66e3e5fba9e34d5ab3d7542c9205b0480c77f9ac6d` 与候选36及独立136项原版印片对照完全相同;最后两次补充只修改参数默认和原生界面/叠层跳过逻辑,没有修改八种印片数学。最终交付结合Build36完整八外观/100键跟踪/导出证据及Build39完整载荷对比、默认/链接/保存/当前导出证据,不将旧构建的界面操作冒充最终构建重复执行。
|
||||
|
||||
最终1.6.0(39)PKG公证 `4716e3c7-8199-4dc1-940c-2376dd647e9b` Accepted,20项展开验包通过。Release373/附件18发布,草稿与正式完整下载40,833,847字节和SHA `13821631b5d54f1b9c1934c513a9cc7e92641208e20219839a63e23865f21cca` 一致;标签0cc51149a6f21ebe09465b4fd7130451bedd57bb已独立恢复296文件,程序源码与编译节点e5affd3一致。当前APP和资源在固定位置;恢复构建、下载及生成APP副本已清理。
|
||||
@@ -0,0 +1,39 @@
|
||||
#import <AppKit/AppKit.h>
|
||||
#import "../大鱼调色/Shared/DYBetaDiagnostics.h"
|
||||
#import "../大鱼调色/Wrapper Application/DYBetaUpdater.h"
|
||||
static NSUInteger checks;
|
||||
static void check(BOOL pass,NSString *name){if(!pass){fprintf(stderr,"FAIL %s\n",name.UTF8String);exit(1);}checks++;}
|
||||
int main(int argc,char **argv){@autoreleasepool{
|
||||
if(argc==2&&!strcmp(argv[1],"--live-update")){
|
||||
DYBetaUpdater *updater=[DYBetaUpdater new];NSMutableArray *phases=[NSMutableArray array];__block BOOL done=NO,passed=NO,started=NO;
|
||||
updater.changed=^(NSDictionary *state){NSString *phase=state[@"phase"];[phases addObject:phase];
|
||||
if([phase isEqual:@"available"]){if(started){done=YES;fprintf(stderr,"%s\n",[state description].UTF8String);}else{started=YES;dispatch_async(dispatch_get_main_queue(),^{[updater download];});}}
|
||||
if([phase isEqual:@"ready"]){done=YES;passed=YES;}
|
||||
if([phase isEqual:@"failed"]||[phase isEqual:@"latest"]){done=YES;fprintf(stderr,"%s\n",[state description].UTF8String);}
|
||||
};
|
||||
[updater check];NSDate *deadline=[NSDate dateWithTimeIntervalSinceNow:360];
|
||||
while(!done&&deadline.timeIntervalSinceNow>0)[NSRunLoop.currentRunLoop runUntilDate:[NSDate dateWithTimeIntervalSinceNow:.1]];
|
||||
NSDictionary *result=@{@"passed":@(passed),@"phases":phases,@"source":@"production HTTPS beta endpoint and download",@"installation_performed":@NO};
|
||||
printf("%s\n",[[[NSString alloc]initWithData:[NSJSONSerialization dataWithJSONObject:result options:0 error:nil] encoding:NSUTF8StringEncoding]autorelease].UTF8String);
|
||||
updater.changed=nil;[updater cancel];return passed?0:1;
|
||||
}
|
||||
NSString *base=@"https://dayu.media/wp-content/uploads/dayu-color-beta/updates/";
|
||||
NSMutableDictionary *manifest=[@{@"bundle_id":@"com.dayu.color",@"channel":@"beta",@"version":@"1.7.0",@"build":@45,@"size":@123,
|
||||
@"sha256":[@"a" stringByPaddingToLength:64 withString:@"a" startingAtIndex:0],@"package_type":@"pkg",@"install_mode":@"pkg_installer",@"download_url":[base stringByAppendingString:@"dayu-color-1-7-0-45.pkg"]}mutableCopy];
|
||||
check([DYBetaUpdater validateManifest:manifest error:nil],@"valid manifest");
|
||||
for(NSString *key in manifest.allKeys){for(id bad in @[[NSNull null],@[],@{},@YES,@"",@(-1)]){NSMutableDictionary *changed=[[manifest mutableCopy]autorelease];changed[key]=bad;
|
||||
check(![DYBetaUpdater validateManifest:changed error:nil],[NSString stringWithFormat:@"reject %@ %@",key,bad]);}}
|
||||
check(![DYBetaUpdater validateManifest:(id)@[] error:nil],@"non dictionary manifest");
|
||||
for(NSString *bad in @[@"http://dayu.media/wp-json/dayu-color/v1/update",@"https://dayu.media.evil.test/wp-json/dayu-color/v1/update",@"https://dayu.media:444/wp-json/dayu-color/v1/update",@"https://user@dayu.media/wp-json/dayu-color/v1/update",@"https://dayu.media/wp-json/other/v1/update",@"https://dayu.media/wp-json/dayu-color/v1/../other"])
|
||||
check(!DYBetaAllowedURL([NSURL URLWithString:bad],NO),@"reject foreign URL");
|
||||
NSDictionary *safe=DYBetaSafeFields(@{@"phase":@"end",@"frames":@"/Users/test/secret.mov",@"error_domain":@"token=secret",@"email":@"private@example.invalid",@"duration_ms":@(NAN)});
|
||||
check([safe[@"frames"]isEqual:@"[REDACTED]"]&&[safe[@"error_domain"]isEqual:@"[REDACTED]"]&&!safe[@"email"]&&!safe[@"duration_ms"],@"privacy allowlist and redaction");
|
||||
check(DYBetaSafeFields((id)@[]).count==0,@"bad fields do not crash");
|
||||
if(argc==3){NSData *data=[NSData dataWithContentsOfFile:[NSString stringWithUTF8String:argv[2]]];NSDictionary *real=[NSJSONSerialization JSONObjectWithData:data options:0 error:nil];NSError *error=nil;
|
||||
BOOL verified=[DYBetaUpdater validatePackage:[NSURL fileURLWithPath:[NSString stringWithUTF8String:argv[1]]] manifest:real error:&error];
|
||||
if(!verified)fprintf(stderr,"%s\n",error.localizedDescription.UTF8String);check(verified,@"signed notarized full product package");
|
||||
NSMutableDictionary *wrong=[[real mutableCopy]autorelease];wrong[@"sha256"]=[@"0" stringByPaddingToLength:64 withString:@"0" startingAtIndex:0];
|
||||
check(![DYBetaUpdater validatePackage:[NSURL fileURLWithPath:[NSString stringWithUTF8String:argv[1]]] manifest:wrong error:nil],@"corrupt checksum refused before install");
|
||||
}
|
||||
printf("{\"passed\":true,\"checks\":%lu}\n",(unsigned long)checks);[manifest release];
|
||||
}return 0;}
|
||||
@@ -0,0 +1,10 @@
|
||||
{
|
||||
"path": "/Volumes/dayumedia (存储空间1)/wwwroot/dayu_media/wp-content/mu-plugins/dayu-color-beta.php",
|
||||
"sha256": "d2b73816e871765bc2f7d1604a1beda98b99e2d9ac4f62039de7bf3a81107593",
|
||||
"backup": "/Volumes/dayumedia (存储空间1)/wwwroot/dayu_media/wp-content/mu-plugins/dayu-color-beta-202611021738.phpbak",
|
||||
"size": 14220,
|
||||
"timestamp": "202611021738",
|
||||
"mount": "//dayu@192.168.31.21/dayumedia%20%28%E5%AD%98%E5%82%A8%E7%A9%BA%E9%97%B41%29 on /Volumes/dayumedia (存储空间1) (smbfs, nodev, nosuid, mounted by mac)",
|
||||
"localProject": "/Users/mac/Downloads/dayumedia/dayu-color-beta",
|
||||
"sourceCommit": "e37330a4b5a1ad8c10a05fbc6cd3c37be87dc530"
|
||||
}
|
||||
@@ -0,0 +1,29 @@
|
||||
{
|
||||
"passed": true,
|
||||
"checked_at": "2026-11-02T09:40:25.115993+00:00",
|
||||
"checks": [
|
||||
"update GET",
|
||||
"product isolation",
|
||||
"admin read denied anonymously",
|
||||
"diagnostic stored ACK",
|
||||
"retry same UUID ACK",
|
||||
"foreign upload denied"
|
||||
],
|
||||
"test_event_id": "fe84a41b-84a4-41f8-ba22-afd62655506e",
|
||||
"test_installation_id": "c1f91498-dda9-4219-bb86-decaba573e18",
|
||||
"update": {
|
||||
"bundle_id": "com.dayu.color",
|
||||
"channel": "beta",
|
||||
"version": "1.7.0",
|
||||
"build": 45,
|
||||
"package_type": "pkg",
|
||||
"install_mode": "pkg_installer",
|
||||
"size": 40898751,
|
||||
"sha256": "a3578ee95aa7333e64d556061173fb73a42be0e45442ae844c94147b421d34bb",
|
||||
"download_url": "https://dayu.media/wp-content/uploads/dayu-color-beta/updates/dayu-color-1-7-0-45.pkg",
|
||||
"minimum_system_version": "14.6",
|
||||
"notes": "公测版:接入自动更新与可关闭的云端诊断,记录插件加载耗时及错误摘要。请保存并退出 FCP / Motion 后安装。",
|
||||
"update_available": true,
|
||||
"checked_at": "2026-11-02T09:40:23+00:00"
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,4 @@
|
||||
{
|
||||
"passed": true,
|
||||
"checks": 20
|
||||
}
|
||||
@@ -0,0 +1,22 @@
|
||||
{
|
||||
"version": "1.7.0",
|
||||
"build": 45,
|
||||
"checkedAt": "2026-11-02T09:38:49.424288+00:00",
|
||||
"formalApp": "/Library/Plug-Ins/FxPlug/大鱼调色.app",
|
||||
"nativeChecks": 395,
|
||||
"inspector": "FCP 12.4 UI shows 1.7.0; exposure changed 0.00 -> 0.35 and restored 0.00; image responds",
|
||||
"diagnosticsToggle": "off disables upload/manual button; on restores; manual summary acknowledged",
|
||||
"cloudEvidence": {
|
||||
"installationID": "113ffef4-5e7e-482b-a451-abd2dc6af83a",
|
||||
"pluginSessionPrefix": "ec3d4c05",
|
||||
"event": "first_render",
|
||||
"durationMS": 111.8215833330396,
|
||||
"status": "passed",
|
||||
"observedInAdmin": true
|
||||
},
|
||||
"limitations": [
|
||||
"Single local FCP run does not establish intermittent hang root cause",
|
||||
"Previous explicit user confirmation applied to build44; build45 host check performed by agent"
|
||||
],
|
||||
"startupCountdown": "AX observed 3-second countdown in build45; process subsequently exited normally with registration-succeeded; plugin XPC remained running in FCP"
|
||||
}
|
||||
@@ -0,0 +1 @@
|
||||
{"passed":true,"checks":66}
|
||||
@@ -0,0 +1,16 @@
|
||||
{
|
||||
"path": "/Volumes/dayumedia (存储空间1)/wwwroot/dayu_media/wp-content/uploads/dayu-color-beta/updates/dayu-color-1-7-0-45.pkg",
|
||||
"sha256": "a3578ee95aa7333e64d556061173fb73a42be0e45442ae844c94147b421d34bb",
|
||||
"backup": null,
|
||||
"size": 40898751,
|
||||
"manifest": {
|
||||
"path": "/Volumes/dayumedia (存储空间1)/wwwroot/dayu_media/wp-content/uploads/dayu-color-beta/updates/beta.json",
|
||||
"sha256": "30c92debf91de7ab8215b35dc64a4ddb764e53450c327ae53fb41a4c2f7a26c0",
|
||||
"backup": null,
|
||||
"size": 558
|
||||
},
|
||||
"version": "1.7.0",
|
||||
"build": 45,
|
||||
"downloadURL": "https://dayu.media/wp-content/uploads/dayu-color-beta/updates/dayu-color-1-7-0-45.pkg",
|
||||
"timestamp": "202611021740"
|
||||
}
|
||||
@@ -0,0 +1,17 @@
|
||||
{
|
||||
"passed": true,
|
||||
"source": "production HTTPS beta endpoint and download",
|
||||
"phases": [
|
||||
"checking",
|
||||
"available",
|
||||
"downloading",
|
||||
"validating",
|
||||
"ready"
|
||||
],
|
||||
"installation_performed": false,
|
||||
"bytes": 40898751,
|
||||
"sha256": "a3578ee95aa7333e64d556061173fb73a42be0e45442ae844c94147b421d34bb",
|
||||
"downloadURL": "https://dayu.media/wp-content/uploads/dayu-color-beta/updates/dayu-color-1-7-0-45.pkg",
|
||||
"sameBuildHasNoUpdate": true,
|
||||
"lowerBuildHasUpdate": true
|
||||
}
|
||||
@@ -2,18 +2,15 @@
|
||||
"status": "verified",
|
||||
"path": "/Library/Plug-Ins/FxPlug/大鱼调色.app",
|
||||
"bundleID": "com.dayu.color",
|
||||
"version": "1.6.0",
|
||||
"build": "39",
|
||||
"version": "1.7.0",
|
||||
"build": "45",
|
||||
"team": "B3W25FX5H5",
|
||||
"notaryID": "5d74c04c-8a30-47e9-822d-4f616dfdee56",
|
||||
"notaryID": "777a5c05-4936-4b14-b8e8-0c789c1df05c",
|
||||
"notaryStatus": "Accepted",
|
||||
"gatekeeper": "/Library/Plug-Ins/FxPlug/大鱼调色.app: accepted\nsource=Notarized Developer ID",
|
||||
"sourceCommit": "e5affd3f097fc96f87f41be8e1a3f131ed01daeb",
|
||||
"sourceCommit": "a0f37578f73d7f8faa872d9a81009e2d6586a858",
|
||||
"templatePath": "/Users/mac/Movies/Motion Templates.localized/Effects.localized/大鱼调色/大鱼调色/大鱼调色.moef",
|
||||
"templateSHA256": "fe6b9ed9a59e1e00de7bcad4526bc98fa2d5fde5cab490fd65ec999835ab2250",
|
||||
"shaderSHA256": "6ec98b85aeb841f9988a4b66e3e5fba9e34d5ab3d7542c9205b0480c77f9ac6d",
|
||||
"hostVerification": "verification/HostPrintLooks1.6.0.json",
|
||||
"additionalHostVerification": "verification/HostPrimaryDefaults1.6.0.json",
|
||||
"nativeChecks": 395,
|
||||
"printReferenceChecks": 136
|
||||
"hostVerification": "verification/BetaClientQA.json"
|
||||
}
|
||||
@@ -0,0 +1,14 @@
|
||||
{
|
||||
"passResult": true,
|
||||
"status": "user-confirmed",
|
||||
"version": "1.6.1",
|
||||
"build": "44",
|
||||
"formalPath": "/Library/Plug-Ins/FxPlug/大鱼调色.app",
|
||||
"host": "Final Cut Pro",
|
||||
"confirmedOn": "2026-11-02",
|
||||
"timezone": "Asia/Shanghai",
|
||||
"source": "Explicit user reply in this Codex chat",
|
||||
"question": "1.6.1(44)已安装,3 秒倒计时已验证,也已打开 Final Cut Pro。请在 FCP 中应用“大鱼调色”检查画面和调节;检查结果如何?",
|
||||
"answer": "已确认正常",
|
||||
"scope": "User confirmation of actual FCP use. This record adds acceptance evidence without changing the APP, package, release tag or previous test snapshots."
|
||||
}
|
||||
@@ -12,7 +12,7 @@
|
||||
"error": "未提供错误信息",
|
||||
"name": "runtime-directory",
|
||||
"pass": true,
|
||||
"path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/81DF4064-2BBA-4E89-AC85-020D7F1270BC"
|
||||
"path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/61A2F5D2-1190-46A7-8858-E5E4C3DD406F"
|
||||
},
|
||||
{
|
||||
"descriptors": 278,
|
||||
@@ -820,7 +820,7 @@
|
||||
"error": "未提供错误信息",
|
||||
"name": "renderer-export-33cube",
|
||||
"pass": true,
|
||||
"path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/81DF4064-2BBA-4E89-AC85-020D7F1270BC/diagnostic-export.cube"
|
||||
"path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/61A2F5D2-1190-46A7-8858-E5E4C3DD406F/diagnostic-export.cube"
|
||||
},
|
||||
{
|
||||
"bytes": 1186074,
|
||||
@@ -840,7 +840,7 @@
|
||||
},
|
||||
{
|
||||
"heartbeats": 0,
|
||||
"maximumGapMS": 96.47729154676199,
|
||||
"maximumGapMS": 106.65116666677932,
|
||||
"name": "external-activation-main-loop-responsive",
|
||||
"pass": true
|
||||
},
|
||||
@@ -2067,6 +2067,6 @@
|
||||
"pass": true
|
||||
}
|
||||
],
|
||||
"runtimePath": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/81DF4064-2BBA-4E89-AC85-020D7F1270BC",
|
||||
"runtimePath": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/61A2F5D2-1190-46A7-8858-E5E4C3DD406F",
|
||||
"scope": "Native model and renderer integration with real Metal/IOSurface textures and fake FxPlug host selectors; no GUI or live host document."
|
||||
}
|
||||
@@ -0,0 +1,112 @@
|
||||
{
|
||||
"passResult": true,
|
||||
"version": "1.6.1",
|
||||
"build": "44",
|
||||
"formalPath": "/Library/Plug-Ins/FxPlug/大鱼调色.app",
|
||||
"compiledSource": "90d6022520c59ea34f42b511daee85ac2936cfd9",
|
||||
"existingRegistrationStartup": {
|
||||
"before": {
|
||||
"output": " com.dayu.color.XPC(1.1)\tB4382CC6-0A29-4014-95DF-17FF12BD426A\t2026-11-02 08:19:21 +0000\t/Library/Plug-Ins/FxPlug/大鱼调色.app/Contents/PlugIns/大鱼调色 XPC Service.pluginkit\n (1 plug-in)\n",
|
||||
"code": 0
|
||||
},
|
||||
"submissionAccepted": true,
|
||||
"submission": {
|
||||
"output": "",
|
||||
"code": 0
|
||||
},
|
||||
"plugin": "/Library/Plug-Ins/FxPlug/大鱼调色.app/Contents/PlugIns/大鱼调色 XPC Service.pluginkit",
|
||||
"version": "1.6.1",
|
||||
"terminationReason": "registration-succeeded",
|
||||
"executable": "/Library/Plug-Ins/FxPlug/大鱼调色.app/Contents/MacOS/大鱼调色",
|
||||
"registered": true,
|
||||
"hostVerification": "awaiting-user-confirmation",
|
||||
"bundleID": "com.dayu.color",
|
||||
"confirmationMethod": "exact-path-discovery",
|
||||
"after": {
|
||||
"output": " com.dayu.color.XPC(1.1)\t46C65B43-DF7C-4DEF-A159-4C46E0C6F2E3\t2026-11-02 08:19:22 +0000\t/Library/Plug-Ins/FxPlug/大鱼调色.app/Contents/PlugIns/大鱼调色 XPC Service.pluginkit\n (1 plug-in)\n",
|
||||
"code": 0
|
||||
},
|
||||
"pid": 1957,
|
||||
"discoveryVerified": true,
|
||||
"status": "registered",
|
||||
"build": "44"
|
||||
},
|
||||
"sandboxDisabled": true,
|
||||
"nativeChecks": 395,
|
||||
"hostVerification": "verification/HostUserConfirmation1.6.1.json",
|
||||
"registryAfterRemoval": " (no matches)\n",
|
||||
"externalRegistryAfterRepair": " com.dayu.color.XPC(1.1)\t7594B515-4788-4BD2-8F31-DA38C23CFF88\t2026-11-02 08:20:00 +0000\t/Library/Plug-Ins/FxPlug/大鱼调色.app/Contents/PlugIns/大鱼调色 XPC Service.pluginkit\n (1 plug-in)\n",
|
||||
"keyboardShortcuts": [
|
||||
"Command-I preserved introduction",
|
||||
"Command-R repeated three times without re-entry failure"
|
||||
],
|
||||
"visualReview": [
|
||||
"top publication link is clickable",
|
||||
"successful registration state matches registry",
|
||||
"four feature cards and FCP confirmation controls visible"
|
||||
],
|
||||
"uiProfile": "standard",
|
||||
"swiftUIAudit": "not applicable: Objective-C/AppKit; audit reports no Swift files",
|
||||
"unverified": [
|
||||
"VoiceOver spoken reading and system accessibility display settings",
|
||||
"Full runtime resize matrix"
|
||||
],
|
||||
"appleFidelityProvisional": {
|
||||
"total": 84,
|
||||
"platform": 14,
|
||||
"layout": 13,
|
||||
"semantics": 13,
|
||||
"interaction": 18,
|
||||
"motion": 13,
|
||||
"accessibility": 5,
|
||||
"implementation": 8,
|
||||
"evidenceCap": "Assistive technology and reduced-effects settings not fully exercised; no 90-point quality claim."
|
||||
},
|
||||
"countdownSeconds": 3,
|
||||
"countdownVisibleInRegistrationCard": true,
|
||||
"automaticExitVerified": true,
|
||||
"automaticExitProcessAbsent": true,
|
||||
"registrationRepairPreviousBuild": "43: same registration implementation; only countdown/UI placement changed in44",
|
||||
"priorBuild43MissingRegistrationEvidence": "Missing registration was repaired and externally verified on43 before countdown-only change.",
|
||||
"missingRegistrationRepaired": {
|
||||
"before": {
|
||||
"output": " (no matches)\n",
|
||||
"code": 0
|
||||
},
|
||||
"submissionAccepted": true,
|
||||
"submission": {
|
||||
"output": "",
|
||||
"code": 0
|
||||
},
|
||||
"plugin": "/Library/Plug-Ins/FxPlug/大鱼调色.app/Contents/PlugIns/大鱼调色 XPC Service.pluginkit",
|
||||
"version": "1.6.1",
|
||||
"executable": "/Library/Plug-Ins/FxPlug/大鱼调色.app/Contents/MacOS/大鱼调色",
|
||||
"registered": true,
|
||||
"hostVerification": "awaiting-user-confirmation",
|
||||
"bundleID": "com.dayu.color",
|
||||
"confirmationMethod": "exact-path-discovery",
|
||||
"after": {
|
||||
"output": " com.dayu.color.XPC(1.1)\t7594B515-4788-4BD2-8F31-DA38C23CFF88\t2026-11-02 08:20:00 +0000\t/Library/Plug-Ins/FxPlug/大鱼调色.app/Contents/PlugIns/大鱼调色 XPC Service.pluginkit\n (1 plug-in)\n",
|
||||
"code": 0
|
||||
},
|
||||
"pid": 2000,
|
||||
"discoveryVerified": true,
|
||||
"status": "registered",
|
||||
"build": "44"
|
||||
},
|
||||
"finalEntitlements": {},
|
||||
"actualProcessPaths": [
|
||||
"2000 /Library/Plug-Ins/FxPlug/大鱼调色.app/Contents/MacOS/大鱼调色",
|
||||
"2040 /Applications/Final Cut Pro.app/Contents/MacOS/Final Cut Pro",
|
||||
"2048 /Library/Plug-Ins/FxPlug/大鱼调色盘.app/Contents/PlugIns/DayuColorService.pluginkit/Contents/MacOS/DayuColorService",
|
||||
"2050 /Library/Plug-Ins/FxPlug/大鱼调色.app/Contents/PlugIns/大鱼调色 XPC Service.pluginkit/Contents/MacOS/大鱼调色 XPC Service"
|
||||
],
|
||||
"shaderSHA256": "6ec98b85aeb841f9988a4b66e3e5fba9e34d5ab3d7542c9205b0480c77f9ac6d",
|
||||
"renderingSourceUnchanged": true,
|
||||
"finalRelease": "https://dayu.media/git/dayu/dayu-color/releases/tag/v1.6.1-main-app-20261102",
|
||||
"cleanupRecord": "verification/MainAppCleanup1.6.1.json",
|
||||
"releaseRecoveryRecord": "verification/MainAppRecovery1.6.1.json",
|
||||
"finalPackageSHA256": "d075373d672b8f0146b98f3151c9f74cd6b97e8a1081e0d0796f53af7f291da0",
|
||||
"kernelIdenticalToPreviousFormalBuild": true,
|
||||
"hostVerificationStatus": "user-confirmed"
|
||||
}
|
||||
@@ -0,0 +1,22 @@
|
||||
{
|
||||
"passResult": true,
|
||||
"version": "1.6.1",
|
||||
"build": "44",
|
||||
"formalPath": "/Library/Plug-Ins/FxPlug/大鱼调色.app",
|
||||
"removed": [
|
||||
"/Library/Plug-Ins/FxPlug/.dayu-color-previous-b287e77bfb9f4efea6d46f3443137d3e.app",
|
||||
"/Library/Plug-Ins/FxPlug/.dayu-color-previous-69e5f09f71bd4afcbd3a8b0420c1e8b7.app",
|
||||
"/Library/Plug-Ins/FxPlug/.dayu-color-previous-67588f17dd924918bbb4f44feb8585d4.app",
|
||||
"/Volumes/备份/大鱼调色-1.6.1.pkg",
|
||||
"/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/recovery-main-app-1.6.1"
|
||||
],
|
||||
"productRegistry": [
|
||||
"com.dayu.color.XPC(1.1)\t7594B515-4788-4BD2-8F31-DA38C23CFF88\t2026-11-02 08:20:00 +0000\t/Library/Plug-Ins/FxPlug/大鱼调色.app/Contents/PlugIns/大鱼调色 XPC Service.pluginkit"
|
||||
],
|
||||
"generatedBuildAppAndLoosePluginAbsent": true,
|
||||
"submissionZIPAbsent": true,
|
||||
"retainedCurrentPackage": "/Volumes/备份/大鱼调色/发行包/大鱼调色-1.6.1.pkg",
|
||||
"retainedHistoricalPackages": true,
|
||||
"privateQAMediaAndPresetsRetained": true,
|
||||
"scope": "Task build cache, task rollback candidates, task recovery clone, verified browser download and known install locations; no whole-disk uniqueness claim."
|
||||
}
|
||||
@@ -0,0 +1,17 @@
|
||||
{
|
||||
"passResult": true,
|
||||
"remote": "https://dayu.media/git/dayu/dayu-color.git",
|
||||
"compiledSource": "90d6022520c59ea34f42b511daee85ac2936cfd9",
|
||||
"recoveredFiles": 301,
|
||||
"contentByteComparison": true,
|
||||
"gitFsck": "full strict passed",
|
||||
"LFS": false,
|
||||
"submodules": false,
|
||||
"scope": "Compiled source and final release tag independently recovered from the remote; every file byte-compared and full/strict fsck passed.",
|
||||
"releaseTag": "v1.6.1-main-app-20261102",
|
||||
"releaseTagCommit": "5d9a4ad7072c1d30f9f8d589719939e2efbcd53c",
|
||||
"releaseRecoveredFiles": 304,
|
||||
"releaseEveryFileByteCompared": true,
|
||||
"appSourceMatchesCompiledNode": true,
|
||||
"appSourceFilesCompared": 102
|
||||
}
|
||||
+14
-14
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"package": "/Volumes/备份/大鱼调色/发行包/大鱼调色-1.6.0.pkg",
|
||||
"sha256": "13821631b5d54f1b9c1934c513a9cc7e92641208e20219839a63e23865f21cca",
|
||||
"bytes": 40833847,
|
||||
"package": "/Volumes/备份/大鱼调色/发行包/大鱼调色-1.7.0.pkg",
|
||||
"sha256": "a3578ee95aa7333e64d556061173fb73a42be0e45442ae844c94147b421d34bb",
|
||||
"bytes": 40898751,
|
||||
"testUnsigned": false,
|
||||
"installationExecuted": false,
|
||||
"checks": [
|
||||
@@ -31,27 +31,27 @@
|
||||
"source": "/Library/Plug-Ins/FxPlug/大鱼调色.app",
|
||||
"payload": "Library/Plug-Ins/FxPlug/大鱼调色.app",
|
||||
"bundleID": "com.dayu.color",
|
||||
"version": "1.6.0",
|
||||
"build": "39"
|
||||
"version": "1.7.0",
|
||||
"build": "45"
|
||||
},
|
||||
{
|
||||
"source": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/pkg-inputs/大鱼调色",
|
||||
"payload": "Library/Application Support/PKGForge/Payload/com.dayu.color.installer.1d4fcfd5-b44e-4f28-bb22-fd0a728c6a8d/861AF1AF-F5D1-4FD8-A600-71EA2956FFE3/大鱼调色"
|
||||
"payload": "Library/Application Support/PKGForge/Payload/com.dayu.color.installer.a7af5728-7c8e-4c75-8287-7dea3951d96e/8E2A2143-25CD-4AE6-97CF-C14DB05D6847/大鱼调色"
|
||||
}
|
||||
],
|
||||
"signature": "Package \"大鱼调色-1.6.0.pkg\":\n Status: signed by a developer certificate issued by Apple for distribution\n Notarization: trusted by the Apple notary service\n Signed with a trusted timestamp on: 2026-11-02 07:28:07 +0000\n Certificate Chain:\n 1. Developer ID Installer: zhong luo (B3W25FX5H5)\n Expires: 2027-02-01 22:12:15 +0000\n SHA256 Fingerprint:\n C0 19 01 3C 67 88 8F 34 65 56 C5 91 3C E5 B6 12 4C 5D A6 DA F9 D8 \n DA 00 37 52 DF F0 F3 E6 00 B4\n ------------------------------------------------------------------------\n 2. Developer ID Certification Authority\n Expires: 2027-02-01 22:12:15 +0000\n SHA256 Fingerprint:\n 7A FC 9D 01 A6 2F 03 A2 DE 96 37 93 6D 4A FE 68 09 0D 2D E1 8D 03 \n F2 9C 88 CF B0 B1 BA 63 58 7F\n ------------------------------------------------------------------------\n 3. Apple Root CA\n Expires: 2035-02-09 21:40:36 +0000\n SHA256 Fingerprint:\n B0 B1 73 0E CB C7 FF 45 05 14 2C 49 F1 29 5E 6E DA 6B CA ED 7E 2C \n 68 C5 BE 91 B5 A1 10 01 F0 24",
|
||||
"gatekeeper": "/Volumes/备份/大鱼调色/发行包/大鱼调色-1.6.0.pkg: accepted\nsource=Notarized Developer ID",
|
||||
"signature": "Package \"大鱼调色-1.7.0.pkg\":\n Status: signed by a developer certificate issued by Apple for distribution\n Notarization: trusted by the Apple notary service\n Signed with a trusted timestamp on: 2026-11-02 09:39:06 +0000\n Certificate Chain:\n 1. Developer ID Installer: zhong luo (B3W25FX5H5)\n Expires: 2027-02-01 22:12:15 +0000\n SHA256 Fingerprint:\n C0 19 01 3C 67 88 8F 34 65 56 C5 91 3C E5 B6 12 4C 5D A6 DA F9 D8 \n DA 00 37 52 DF F0 F3 E6 00 B4\n ------------------------------------------------------------------------\n 2. Developer ID Certification Authority\n Expires: 2027-02-01 22:12:15 +0000\n SHA256 Fingerprint:\n 7A FC 9D 01 A6 2F 03 A2 DE 96 37 93 6D 4A FE 68 09 0D 2D E1 8D 03 \n F2 9C 88 CF B0 B1 BA 63 58 7F\n ------------------------------------------------------------------------\n 3. Apple Root CA\n Expires: 2035-02-09 21:40:36 +0000\n SHA256 Fingerprint:\n B0 B1 73 0E CB C7 FF 45 05 14 2C 49 F1 29 5E 6E DA 6B CA ED 7E 2C \n 68 C5 BE 91 B5 A1 10 01 F0 24",
|
||||
"gatekeeper": "/Volumes/备份/大鱼调色/发行包/大鱼调色-1.7.0.pkg: accepted\nsource=Notarized Developer ID",
|
||||
"pass": true,
|
||||
"scope": "Expanded package structural and payload verification only; no installer scripts executed and no host quit or registration performed.",
|
||||
"notarization": {
|
||||
"createdDate": "2026-11-02T09:39:07.500Z",
|
||||
"id": "04082e26-663d-4408-85da-63736d079aa2",
|
||||
"status": "Accepted",
|
||||
"id": "4716e3c7-8199-4dc1-940c-2376dd647e9b",
|
||||
"name": "大鱼调色-1.6.0.pkg",
|
||||
"createdDate": "2026-11-02T07:28:08.543Z",
|
||||
"name": "大鱼调色-1.7.0.pkg",
|
||||
"message": "Successfully received submission info"
|
||||
},
|
||||
"appCompiledSource": "e5affd3f097fc96f87f41be8e1a3f131ed01daeb",
|
||||
"appBuild": "39",
|
||||
"appCompiledSource": "a0f37578f73d7f8faa872d9a81009e2d6586a858",
|
||||
"appBuild": "45",
|
||||
"packageBuilderRemote": "https://dayu.media/git/dayu/pkg-forge.git",
|
||||
"packageBuilderCommit": "eb53707c0e67d8ddeab8c1270bb079f1050cfafe",
|
||||
"templateSHA256": {
|
||||
@@ -59,6 +59,6 @@
|
||||
"large.png": "ab12611e8801cff86332ccc505a4cffa0c1120541c2efb9bb9908be2c9fe631a",
|
||||
"small.png": "41fec3138aee904fc39d6982e6fde809243ffec55298dbfe966f4f48d89caf8a"
|
||||
},
|
||||
"installedAppHostAcceptance": "verification/HostPrintLooks1.6.0.json",
|
||||
"installedAppHostAcceptance": "verification/BetaClientQA.json",
|
||||
"installScope": "本轮仅生成并验包,未再次执行系统安装;正式 APP 已有独立宿主验收。"
|
||||
}
|
||||
@@ -0,0 +1,28 @@
|
||||
{
|
||||
"passResult": true,
|
||||
"version": "1.6.0",
|
||||
"build": "39",
|
||||
"formalPath": "/Library/Plug-Ins/FxPlug/大鱼调色.app",
|
||||
"onlyMatchingInstalledAppInCheckedLocations": [
|
||||
"/Library/Plug-Ins/FxPlug/大鱼调色.app"
|
||||
],
|
||||
"productRegistry": [
|
||||
"com.dayu.color.XPC(1.1)\t0FFF5BF4-DF9D-4769-B3E0-CEF0B697EA9D\t2026-11-02 07:21:24 +0000\t/Library/Plug-Ins/FxPlug/大鱼调色.app/Contents/PlugIns/大鱼调色 XPC Service.pluginkit"
|
||||
],
|
||||
"removed": [
|
||||
"/Users/mac/Library/Caches/CodexRecovery/dayu-color-print-1.6.0",
|
||||
"/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/RecoveryDerivedData",
|
||||
"/Volumes/备份/大鱼调色-1.6.0.pkg",
|
||||
"/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/print-recovered-template.moef",
|
||||
"/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/print-recovered-template38.moef",
|
||||
"/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/print-recovered-template39.moef"
|
||||
],
|
||||
"generatedBuildAppAndLoosePluginAbsent": true,
|
||||
"submissionZIPAbsent": true,
|
||||
"previousCandidatesRemoved": true,
|
||||
"retainedCurrentPackage": "/Volumes/备份/大鱼调色/发行包/大鱼调色-1.6.0.pkg",
|
||||
"retainedHistoricalPackages": true,
|
||||
"privateQAMediaAndPresetsRetained": true,
|
||||
"scope": "Task cache, task recovery clone, project generated roots and known installation/Desktop/Downloads locations; no whole-disk uniqueness claim.",
|
||||
"completed": "2026-11-02T07:34:06.072844+00:00"
|
||||
}
|
||||
@@ -17,5 +17,6 @@
|
||||
"generatedAppsRemoved": [
|
||||
"/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/RecoveryDerivedData/Build/Products/Release/大鱼调色.app",
|
||||
"/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/RecoveryDerivedData/Build/Products/Release/大鱼调色 XPC Service.pluginkit"
|
||||
]
|
||||
],
|
||||
"recoveryCloneRemovedAfterVerification": true
|
||||
}
|
||||
@@ -0,0 +1,16 @@
|
||||
{
|
||||
"passResult": true,
|
||||
"tag": "v1.6.0-print-looks-20261102",
|
||||
"tagCommit": "0cc51149a6f21ebe09465b4fd7130451bedd57bb",
|
||||
"compiledSource": "e5affd3f097fc96f87f41be8e1a3f131ed01daeb",
|
||||
"sourceCodeIdenticalBetweenCompileAndTag": true,
|
||||
"remote": "https://dayu.media/git/dayu/dayu-color.git",
|
||||
"clone": "/Users/mac/Library/Caches/CodexRecovery/dayu-color-print-1.6.0",
|
||||
"filesByteCompared": 296,
|
||||
"fsck": "full/strict passed",
|
||||
"compiledSourceRecovery": "verification/PrintLooksRecovery.json",
|
||||
"releaseBuildNativeChecks": 395,
|
||||
"lfs": false,
|
||||
"submodules": false,
|
||||
"recoveryCloneRemovedAfterVerification": true
|
||||
}
|
||||
+10
-18
@@ -3,24 +3,16 @@
|
||||
"repository": "dayu/dayu-color",
|
||||
"repositoryID": 52,
|
||||
"private": false,
|
||||
"tag": "v1.5.0-film-mixer-20261102",
|
||||
"releaseCommit": "85b6590944c4fb64825cf45f61c5280d4ffaa824",
|
||||
"releaseID": 372,
|
||||
"releaseURL": "https://dayu.media/git/dayu/dayu-color/releases/tag/v1.5.0-film-mixer-20261102",
|
||||
"assetID": 17,
|
||||
"assetName": "大鱼调色-1.5.0.pkg",
|
||||
"downloadURL": "https://dayu.media/git/dayu/dayu-color/releases/download/v1.5.0-film-mixer-20261102/%E5%A4%A7%E9%B1%BC%E8%B0%83%E8%89%B2-1.5.0.pkg",
|
||||
"bytes": 14380104,
|
||||
"sha256": "3ecabc7a8bfd675b228a5f00016aa17a35b65b544055e57793ec3bff3d7e0294",
|
||||
"tag": "v1.6.1-main-app-20261102",
|
||||
"releaseCommit": "5d9a4ad7072c1d30f9f8d589719939e2efbcd53c",
|
||||
"releaseID": 374,
|
||||
"releaseURL": "https://dayu.media/git/dayu/dayu-color/releases/tag/v1.6.1-main-app-20261102",
|
||||
"assetID": 19,
|
||||
"assetName": "大鱼调色-1.6.1.pkg",
|
||||
"downloadURL": "https://dayu.media/git/dayu/dayu-color/releases/download/v1.6.1-main-app-20261102/%E5%A4%A7%E9%B1%BC%E8%B0%83%E8%89%B2-1.6.1.pkg",
|
||||
"bytes": 40854422,
|
||||
"sha256": "d075373d672b8f0146b98f3151c9f74cd6b97e8a1081e0d0796f53af7f291da0",
|
||||
"existingAssetReused": true,
|
||||
"verification": "Authenticated full download SHA-256 and byte count, then release/asset read-back.",
|
||||
"credentialSource": "macOS Keychain: dayu-git-api",
|
||||
"status": "published-and-fully-verified",
|
||||
"version": "1.5.0",
|
||||
"build": "34",
|
||||
"appCompiledSource": "06d531c443b0bb2f179022a4e64148394f5d0690",
|
||||
"draftDownloadVerification": "verification/ReleaseDraftDownload1.5.0.json",
|
||||
"repositoryVisibilityUnchanged": true,
|
||||
"hostVerification": "verification/HostFilmMixer1.5.0.json",
|
||||
"temporaryDownloadCleaned": true
|
||||
"credentialSource": "macOS Keychain: dayu-git-api"
|
||||
}
|
||||
@@ -0,0 +1,15 @@
|
||||
{
|
||||
"id": 374,
|
||||
"tag_name": "v1.6.1-main-app-20261102",
|
||||
"draft": true,
|
||||
"html_url": "https://dayu.media/git/dayu/dayu-color/releases/tag/v1.6.1-main-app-20261102",
|
||||
"target_commitish": "5d9a4ad7072c1d30f9f8d589719939e2efbcd53c",
|
||||
"assets": [
|
||||
{
|
||||
"id": 19,
|
||||
"name": "大鱼调色-1.6.1.pkg",
|
||||
"size": 40854422,
|
||||
"browser_download_url": "https://dayu.media/git/dayu/dayu-color/releases/download/v1.6.1-main-app-20261102/%E5%A4%A7%E9%B1%BC%E8%B0%83%E8%89%B2-1.6.1.pkg"
|
||||
}
|
||||
]
|
||||
}
|
||||
@@ -0,0 +1,18 @@
|
||||
{
|
||||
"status": "verified",
|
||||
"releaseID": 373,
|
||||
"assetID": 18,
|
||||
"releaseURL": "https://dayu.media/git/dayu/dayu-color/releases/tag/v1.6.0-print-looks-20261102",
|
||||
"downloadURL": "https://dayu.media/git/dayu/dayu-color/releases/download/v1.6.0-print-looks-20261102/%E5%A4%A7%E9%B1%BC%E8%B0%83%E8%89%B2-1.6.0.pkg",
|
||||
"expectedBytes": 40833847,
|
||||
"expectedSHA256": "13821631b5d54f1b9c1934c513a9cc7e92641208e20219839a63e23865f21cca",
|
||||
"localPackage": "/Volumes/备份/大鱼调色/发行包/大鱼调色-1.6.0.pkg",
|
||||
"tag": "v1.6.0-print-looks-20261102",
|
||||
"tagCommit": "0cc51149a6f21ebe09465b4fd7130451bedd57bb",
|
||||
"passResult": true,
|
||||
"actualDownloadedPath": "/Volumes/备份/大鱼调色-1.6.0.pkg",
|
||||
"actualBytes": 40833847,
|
||||
"actualSHA256": "13821631b5d54f1b9c1934c513a9cc7e92641208e20219839a63e23865f21cca",
|
||||
"verifiedAt": "2026-11-02T07:32:32.753960+00:00",
|
||||
"verification": "Actual authenticated Edge download completed; independent downloaded file byte count and SHA-256 matched before publishing."
|
||||
}
|
||||
@@ -0,0 +1,13 @@
|
||||
{
|
||||
"passResult": true,
|
||||
"releaseID": 374,
|
||||
"assetID": 19,
|
||||
"downloadURL": "https://dayu.media/git/dayu/dayu-color/releases/download/v1.6.1-main-app-20261102/%E5%A4%A7%E9%B1%BC%E8%B0%83%E8%89%B2-1.6.1.pkg",
|
||||
"downloadedFile": "/Volumes/备份/大鱼调色-1.6.1.pkg",
|
||||
"bytes": 40854422,
|
||||
"sha256": "d075373d672b8f0146b98f3151c9f74cd6b97e8a1081e0d0796f53af7f291da0",
|
||||
"download": "Normal authenticated Microsoft Edge session; completed UI download independently hashed",
|
||||
"browserSourceMetadata": [
|
||||
"https://dayu.media/git/dayu/dayu-color/releases/download/v1.6.1-main-app-20261102/%E5%A4%A7%E9%B1%BC%E8%B0%83%E8%89%B2-1.6.1.pkg"
|
||||
]
|
||||
}
|
||||
@@ -123,6 +123,7 @@
|
||||
Plugin/Resources/InputLUTs/sony_slog3_sgamut3cine_to_rec709.dylut,
|
||||
"Plugin/Resources/THIRD-PARTY-NOTICES.txt",
|
||||
"Wrapper Application/AppDelegate.m",
|
||||
"Wrapper Application/DYBetaUpdater.mm",
|
||||
"Wrapper Application/Info.plist",
|
||||
"Wrapper Application/main.m",
|
||||
"Wrapper Application/Resources/DayuColor.icns",
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
#import "DYInspector.h"
|
||||
#import "../Shared/DYBetaDiagnostics.h"
|
||||
#import "DYModel.h"
|
||||
#import "DYToolState.h"
|
||||
#import "DYAutoGrade.h"
|
||||
@@ -447,6 +448,7 @@ static NSImage *DYWheelImage(void) {
|
||||
return [self initWithAPIManager:manager renderer:nil];
|
||||
}
|
||||
- (instancetype)initWithAPIManager:(id<PROAPIAccessing>)manager renderer:(DYRenderer *)renderer {
|
||||
uint64_t beta=DYBetaSpanBegin(@"inspector_create",nil);
|
||||
if((self=[super initWithFrame:NSMakeRect(0,0,360,780)])) {
|
||||
_assetLoads=[NSMutableDictionary new];_assetLoadIDs=[NSMutableDictionary new];_manager=manager; _renderer=[renderer retain];_library=[DYLUTLibrary new];_tabs=[NSMutableDictionary new];_visibleLooks=1;
|
||||
_embedded=[manager isKindOfClass:DYToolManager.class];if(_embedded)[(id)_manager retain];
|
||||
@@ -491,7 +493,7 @@ static NSImage *DYWheelImage(void) {
|
||||
[self setAccessibilityLabel:@"大鱼调色检查器"];
|
||||
[self setNeedsLayout:YES];
|
||||
}
|
||||
return self;
|
||||
DYBetaSpanEnd(beta,nil);return self;
|
||||
}
|
||||
- (void)dealloc {
|
||||
[self graphicGesture:NO title:nil];_spiderPanel.delegate=nil;
|
||||
@@ -754,6 +756,7 @@ static NSImage *DYWheelImage(void) {
|
||||
if(_refreshing||!_manager)return;
|
||||
id<FxCustomParameterActionAPI_v4> action=[self actionAPI]; if(!action)return;
|
||||
_refreshing=YES;
|
||||
uint64_t beta=DYBetaSpanBegin(@"inspector_refresh",nil);
|
||||
BOOL groupingChanged=NO;
|
||||
[action startAction:self];
|
||||
@try {
|
||||
@@ -813,6 +816,7 @@ static NSImage *DYWheelImage(void) {
|
||||
// Remote layout/accessibility can re-enter the host. Let the parameter
|
||||
// action and current callback unwind before notifying the remote view.
|
||||
if(!_embedded)[self synchronizeTools];
|
||||
DYBetaSpanEnd(beta,nil);
|
||||
if(groupingChanged)dispatch_async(dispatch_get_main_queue(),^{NSAccessibilityPostNotification(self,NSAccessibilityLayoutChangedNotification);});
|
||||
}
|
||||
- (void)postChanged { [[NSNotificationCenter defaultCenter] postNotificationName:@"DYModelChanged" object:_embedded?[(DYToolManager*)_manager host]:_manager]; }
|
||||
|
||||
+4
-2
@@ -1,4 +1,5 @@
|
||||
#import "DYPlugIn.h"
|
||||
#import "../Shared/DYBetaDiagnostics.h"
|
||||
#import "DYModel.h"
|
||||
#import "DYRenderer.h"
|
||||
#import "DYInspector.h"
|
||||
@@ -15,10 +16,11 @@
|
||||
@implementation DYPlugIn {
|
||||
DYRenderer *_renderer;
|
||||
BOOL _copyAnalyzed;
|
||||
std::atomic_bool _betaFirstRenderStarted;
|
||||
#include "DYToolHostIvars.inc.h"
|
||||
}
|
||||
#include "DYToolHostMethods.inc.h"
|
||||
- (instancetype)initWithAPIManager:(id<PROAPIAccessing>)manager{if((self=[super init])){_apiManager=manager;_renderer=[DYRenderer new];[self initializeToolHost];NSNotificationCenter*n=NSNotificationCenter.defaultCenter;[n addObserver:self selector:@selector(exportRequested:) name:@"DYExportLUT" object:manager];[n addObserver:self selector:@selector(autoRequested:) name:@"DYAutoGrade" object:manager];[n addObserver:self selector:@selector(autoRequested:) name:@"DYAutoWhiteBalance" object:manager];[n addObserver:self selector:@selector(whiteBalanceRequested:) name:@"DYWhiteBalanceColor" object:manager];}return self;}
|
||||
- (instancetype)initWithAPIManager:(id<PROAPIAccessing>)manager{uint64_t beta=DYBetaSpanBegin(@"plugin_init",nil);if((self=[super init])){_betaFirstRenderStarted.store(false);_apiManager=manager;_renderer=[DYRenderer new];[self initializeToolHost];NSNotificationCenter*n=NSNotificationCenter.defaultCenter;[n addObserver:self selector:@selector(exportRequested:) name:@"DYExportLUT" object:manager];[n addObserver:self selector:@selector(autoRequested:) name:@"DYAutoGrade" object:manager];[n addObserver:self selector:@selector(autoRequested:) name:@"DYAutoWhiteBalance" object:manager];[n addObserver:self selector:@selector(whiteBalanceRequested:) name:@"DYWhiteBalanceColor" object:manager];}DYBetaSpanEnd(beta,nil);return self;}
|
||||
- (void)dealloc{[self tearDownToolHost];[NSNotificationCenter.defaultCenter removeObserver:self];[_renderer release];[super dealloc];}
|
||||
- (BOOL)properties:(NSDictionary**)p error:(NSError**)e{*p=@{kFxPropertyKey_MayRemapTime:@NO,kFxPropertyKey_PixelTransformSupport:@(kFxPixelTransform_ScaleTranslate),kFxPropertyKey_VariesWhenParamsAreStatic:@YES,kFxPropertyKey_DesiredProcessingColorInfo:@(kFxImageColorInfo_RGB_LINEAR),kFxPropertyKey_NeedsFullBuffer:@YES};return YES;}
|
||||
- (BOOL)addParametersWithError:(NSError**)e{return DYCreateParameters(_apiManager,e);}
|
||||
@@ -31,7 +33,7 @@
|
||||
- (BOOL)destinationImageRect:(FxRect*)rect sourceImages:(NSArray<FxImageTile*>*)src destinationImage:(FxImageTile*)dst pluginState:(NSData*)s atTime:(CMTime)t error:(NSError**)e{if(!src.count)return NO;*rect=src[0].imagePixelBounds;return YES;}
|
||||
- (BOOL)sourceTileRect:(FxRect*)rect sourceImageIndex:(NSUInteger)i sourceImages:(NSArray<FxImageTile*>*)src destinationTileRect:(FxRect)dstRect destinationImage:(FxImageTile*)dst pluginState:(NSData*)s atTime:(CMTime)t error:(NSError**)e{if(i>=src.count)return NO;*rect=src[i].imagePixelBounds;return YES;}
|
||||
- (BOOL)renderDestinationImage:(FxImageTile*)dst sourceImages:(NSArray<FxImageTile*>*)src pluginState:(NSData*)s atTime:(CMTime)t error:(NSError**)e{
|
||||
if(!src.count||!src[0].ioSurface||!dst.ioSurface||!s.length)return NO;NSDictionary*p=[NSPropertyListSerialization propertyListWithData:s options:NSPropertyListImmutable format:NULL error:e];if(![p isKindOfClass:NSDictionary.class])return NO;NSData*b=p[@"uniforms"];if(![@[@1,@2]containsObject:p[@"schema"]]||![b isKindOfClass:NSData.class]||b.length!=sizeof(DYUniforms)||![p[@"paths"]isKindOfClass:NSDictionary.class])return NO;DYUniforms u;[b getBytes:&u length:sizeof(u)];BOOL ok=[_renderer renderSource:src[0] destination:dst uniforms:u paths:p[@"paths"] spider:p[@"spider"] tools:p[@"tools"] error:e];if(ok){if(_toolCaptureEnabled&&!_trackingActive.load()){dy::GrayFrame frame=[self toolGrayFrame:src[0] error:nil];if(frame.valid()){@synchronized(self){_toolSourceFrame=std::move(frame);_toolSourceTime=t;}}}BOOL analyze=NO;@synchronized(self){if(![p[@"copyAuto"]boolValue])_copyAnalyzed=NO;else if(!_copyAnalyzed){_copyAnalyzed=YES;analyze=YES;}}if(analyze){NSDictionary*values=DYAutoGrade([_renderer preview]);if(values)dispatch_async(dispatch_get_main_queue(),^{[self applyValues:values];});}}return ok;
|
||||
if(!src.count||!src[0].ioSurface||!dst.ioSurface||!s.length)return NO;NSDictionary*p=[NSPropertyListSerialization propertyListWithData:s options:NSPropertyListImmutable format:NULL error:e];if(![p isKindOfClass:NSDictionary.class])return NO;NSData*b=p[@"uniforms"];if(![@[@1,@2]containsObject:p[@"schema"]]||![b isKindOfClass:NSData.class]||b.length!=sizeof(DYUniforms)||![p[@"paths"]isKindOfClass:NSDictionary.class])return NO;DYUniforms u;[b getBytes:&u length:sizeof(u)];uint64_t beta=!_betaFirstRenderStarted.exchange(true)?DYBetaSpanBegin(@"first_render",nil):0;BOOL ok=[_renderer renderSource:src[0] destination:dst uniforms:u paths:p[@"paths"] spider:p[@"spider"] tools:p[@"tools"] error:e];DYBetaSpanEnd(beta,@{@"status":ok?@"passed":@"failed"});if(!ok)DYBetaEvent(@"render_error",@{@"error_domain":(e&&*e)?(*e).domain:@"unknown",@"error_code":@((e&&*e)?(*e).code:0)});if(ok){if(_toolCaptureEnabled&&!_trackingActive.load()){dy::GrayFrame frame=[self toolGrayFrame:src[0] error:nil];if(frame.valid()){@synchronized(self){_toolSourceFrame=std::move(frame);_toolSourceTime=t;}}}BOOL analyze=NO;@synchronized(self){if(![p[@"copyAuto"]boolValue])_copyAnalyzed=NO;else if(!_copyAnalyzed){_copyAnalyzed=YES;analyze=YES;}}if(analyze){NSDictionary*values=DYAutoGrade([_renderer preview]);if(values)dispatch_async(dispatch_get_main_queue(),^{[self applyValues:values];});}}return ok;
|
||||
}
|
||||
- (void)alert:(NSString*)message{dispatch_async(dispatch_get_main_queue(),^{NSAlert*a=[NSAlert new];a.messageText=@"大鱼调色";a.informativeText=message?:@"操作未完成";[a runModal];[a release];});}
|
||||
- (void)exportRequested:(NSNotification*)n{
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
#import "DYRenderer.h"
|
||||
#import "../Shared/DYBetaDiagnostics.h"
|
||||
#import "DYModel.h"
|
||||
#include "DYSpiderState.h"
|
||||
#include "DYToolGPU.h"
|
||||
@@ -99,15 +100,17 @@ static void bypassIdleSkin(DYUniforms *u){
|
||||
- (NSData*)lookLUTPreview{@synchronized(_previewLock){return [[_lookLUTPreview retain]autorelease];}}
|
||||
- (NSMutableDictionary*)device:(uint64_t)registry error:(NSError**)err{
|
||||
NSNumber*k=@(registry);NSMutableDictionary*entry=_devices[k];if(entry)return entry;
|
||||
uint64_t beta=DYBetaSpanBegin(@"device_prepare",nil);@try{
|
||||
id<MTLDevice>d=nil;NSArray*all=MTLCopyAllDevices();for(id<MTLDevice>candidate in all)if(candidate.registryID==registry||!registry){d=[candidate retain];break;}[all release];if(!d){fail(err,@"宿主的 Metal 设备不可用");return nil;}
|
||||
NSURL*url=[[NSBundle bundleForClass:self.class]URLForResource:@"default" withExtension:@"metallib"];
|
||||
id<MTLLibrary>lib=[d newLibraryWithURL:url error:err];if(!lib){[d release];return nil;}
|
||||
id<MTLCommandQueue>q=[d newCommandQueue];entry=[NSMutableDictionary dictionaryWithDictionary:@{@"device":d,@"library":lib,@"queue":q,@"pipelines":[NSMutableDictionary dictionary]}];
|
||||
for(NSString*fn in @[@"dyUnpremultiply",@"dyWhitesSceneStatistics",@"dyLUTExportKernel",@"dyInputAnalysis",@"dyColorManagement",@"dyToolBlend",@"dyToolSkin",@"dyFilmPoint",@"dyFilmNoise",@"dyFilmSparseBlur",@"dyFilmBloomEdges",@"dyFilmMix",@"dyFilmPrint"]){id<MTLFunction>f=[lib newFunctionWithName:fn];if(!f){fail(err,[fn stringByAppendingString:@" 缺失"]);[lib release];[q release];[d release];return nil;}id<MTLComputePipelineState>p=[d newComputePipelineStateWithFunction:f error:err];[f release];if(!p){[lib release];[q release];[d release];return nil;}entry[fn]=p;[p release];}
|
||||
for(NSString*fn in @[@"dyUnpremultiply",@"dyWhitesSceneStatistics",@"dyLUTExportKernel",@"dyInputAnalysis",@"dyColorManagement",@"dyToolBlend",@"dyToolSkin",@"dyFilmPoint",@"dyFilmNoise",@"dyFilmSparseBlur",@"dyFilmBloomEdges",@"dyFilmMix",@"dyFilmPrint"]){id<MTLFunction>f=[lib newFunctionWithName:fn];if(!f){fail(err,[fn stringByAppendingString:@" 缺失"]);[lib release];[q release];[d release];return nil;}uint64_t pipelineSpan=DYBetaSpanBegin(@"gpu_pipeline",@{@"pipeline":fn,@"gpu":d.name?:@"unknown"});id<MTLComputePipelineState>p=[d newComputePipelineStateWithFunction:f error:err];DYBetaSpanEnd(pipelineSpan,@{@"status":p?@"passed":@"failed"});[f release];if(!p){[lib release];[q release];[d release];return nil;}entry[fn]=p;[p release];}
|
||||
float identity[32];for(int z=0;z<2;z++)for(int y=0;y<2;y++)for(int x=0;x<2;x++){int i=((z*2+y)*2+x)*4;identity[i]=x;identity[i+1]=y;identity[i+2]=z;identity[i+3]=1;}id<MTLTexture>neutral=texture3D(d,identity,2);if(!neutral){fail(err,@"无法分配中性 LUT");return nil;}entry[@"identity"]=neutral;
|
||||
// Preparing before the first frame may use registry 0. Reuse those pipelines
|
||||
// when the host subsequently supplies that device's actual registry ID.
|
||||
_devices[k]=entry;_devices[@(d.registryID)]=entry;[d release];[lib release];[q release];return entry;
|
||||
}@finally{DYBetaSpanEnd(beta,nil);}
|
||||
}
|
||||
- (id<MTLTexture>)lut:(NSString*)path entry:(NSDictionary*)e error:(NSError**)err{
|
||||
if(!path.length)return e[@"identity"];
|
||||
|
||||
+3
-3
@@ -17,9 +17,9 @@
|
||||
<key>CFBundlePackageType</key>
|
||||
<string>XPC!</string>
|
||||
<key>CFBundleShortVersionString</key>
|
||||
<string>1.6.0</string>
|
||||
<string>1.7.0</string>
|
||||
<key>CFBundleVersion</key>
|
||||
<string>39</string>
|
||||
<string>45</string>
|
||||
<key>NSHumanReadableCopyright</key>
|
||||
<string></string>
|
||||
<key>PlugInKit</key>
|
||||
@@ -71,7 +71,7 @@
|
||||
<key>uuid</key>
|
||||
<string>1C17B73B-F229-4C09-A434-EAF6DFF5F22A</string>
|
||||
<key>version</key>
|
||||
<string>1.6.0</string>
|
||||
<string>1.7.0</string>
|
||||
</dict>
|
||||
<dict>
|
||||
<key>className</key>
|
||||
|
||||
+2
-1
@@ -1,4 +1,5 @@
|
||||
#import <FxPlug/FxPlugSDK.h>
|
||||
#import "DYDiagnostics.h"
|
||||
#import "../Shared/DYBetaDiagnostics.h"
|
||||
#include <string.h>
|
||||
int main(int argc,const char*argv[]){@autoreleasepool{if(argc==2&&strcmp(argv[1],"--self-test")==0)return DYRunDiagnostics();[FxPrincipal startServicePrincipal];return 0;}}
|
||||
int main(int argc,const char*argv[]){@autoreleasepool{if(argc==2&&strcmp(argv[1],"--self-test")==0)return DYRunDiagnostics();DYBetaStart();[FxPrincipal startServicePrincipal];DYBetaStop();return 0;}}
|
||||
@@ -0,0 +1,15 @@
|
||||
#import <Foundation/Foundation.h>
|
||||
#include <stdint.h>
|
||||
|
||||
FOUNDATION_EXPORT NSString *const DYBetaDiagnosticsChanged;
|
||||
FOUNDATION_EXPORT void DYBetaStart(void);
|
||||
FOUNDATION_EXPORT void DYBetaStop(void);
|
||||
FOUNDATION_EXPORT void DYBetaEvent(NSString *event, NSDictionary *fields);
|
||||
FOUNDATION_EXPORT uint64_t DYBetaSpanBegin(NSString *stage, NSDictionary *fields);
|
||||
FOUNDATION_EXPORT void DYBetaSpanEnd(uint64_t token, NSDictionary *fields);
|
||||
FOUNDATION_EXPORT NSDictionary *DYBetaSafeFields(NSDictionary *fields);
|
||||
FOUNDATION_EXPORT BOOL DYBetaEnabled(void);
|
||||
FOUNDATION_EXPORT void DYBetaSetEnabled(BOOL enabled);
|
||||
FOUNDATION_EXPORT NSDictionary *DYBetaStatus(void);
|
||||
FOUNDATION_EXPORT void DYBetaSendSummary(void);
|
||||
FOUNDATION_EXPORT BOOL DYBetaAllowedURL(NSURL *url, BOOL download);
|
||||
@@ -0,0 +1,233 @@
|
||||
#import "DYBetaDiagnostics.h"
|
||||
#import <AppKit/AppKit.h>
|
||||
#include <atomic>
|
||||
#include <cmath>
|
||||
#include <sys/sysctl.h>
|
||||
#include <sys/stat.h>
|
||||
#include <signal.h>
|
||||
#include <fcntl.h>
|
||||
#include <unistd.h>
|
||||
|
||||
NSString *const DYBetaDiagnosticsChanged = @"DYBetaDiagnosticsChanged";
|
||||
static NSString *const DYBetaPreferenceDomain = @"com.dayu.color.preferences";
|
||||
static std::atomic_bool gEnabled(true);
|
||||
static std::atomic_uint_fast64_t gSpan(0);
|
||||
static std::atomic<double> gMainReply(0);
|
||||
static NSObject *gSpanLock, *gStatusLock;
|
||||
static NSMutableDictionary *gActive;
|
||||
static NSDictionary *gStatus;
|
||||
static BOOL gProduct;
|
||||
|
||||
BOOL DYBetaAllowedURL(NSURL *url, BOOL download) {
|
||||
if (![url.scheme.lowercaseString isEqual:@"https"] || ![url.host.lowercaseString isEqual:@"dayu.media"] ||
|
||||
url.user.length || url.password.length || (url.port && url.port.integerValue!=443)) return NO;
|
||||
NSString *prefix=download?@"/wp-content/uploads/dayu-color-beta/updates/":@"/wp-json/dayu-color/v1/";
|
||||
return [url.path hasPrefix:prefix] && ![url.path.pathComponents containsObject:@".."];
|
||||
}
|
||||
NSDictionary *DYBetaSafeFields(NSDictionary *fields) {
|
||||
static NSSet *allowed; static dispatch_once_t once;
|
||||
dispatch_once(&once,^{allowed=[[NSSet alloc]initWithArray:@[@"phase",@"stage",@"pipeline",@"duration_ms",@"status",@"error_domain",@"error_code",@"exception",@"signal",@"frames",@"report_time",@"count",@"pending",@"model",@"os_version",@"fcp_version",@"cpu_cores",@"memory_gb",@"gpu",@"main_delay_ms",@"active_stages",@"source_version"]];});
|
||||
NSMutableDictionary *out=[NSMutableDictionary dictionary];
|
||||
if(![fields isKindOfClass:NSDictionary.class])return @{};
|
||||
for (NSString *key in fields) {
|
||||
if (![allowed containsObject:key]) continue;
|
||||
id value=fields[key];
|
||||
if ([value isKindOfClass:NSNumber.class]) { if (std::isfinite([value doubleValue])) out[key]=value; continue; }
|
||||
if (![value isKindOfClass:NSString.class]) continue;
|
||||
NSString *text=value;
|
||||
for (NSString *pattern in @[@"(?:https?://\\S+|(?:/Users/|/Volumes/|/private/|/var/)[^\\r\\n]*)",@"(?i)(?:bearer\\s+\\S+|(?:token|api[_-]?key|secret|password)\\s*[=:]\\s*\\S+)"])
|
||||
text=[text stringByReplacingOccurrencesOfString:pattern withString:@"[REDACTED]" options:NSRegularExpressionSearch range:NSMakeRange(0,text.length)];
|
||||
NSUInteger limit=[key isEqual:@"frames"]?6000:[key isEqual:@"active_stages"]?1000:200;
|
||||
out[key]=text.length>limit?[text substringToIndex:limit]:text;
|
||||
}
|
||||
return out;
|
||||
}
|
||||
|
||||
@interface DYBetaTransport : NSObject <NSURLSessionTaskDelegate> {
|
||||
@public
|
||||
dispatch_queue_t queue;
|
||||
dispatch_source_t timer;
|
||||
NSMutableArray *pending;
|
||||
NSMutableSet *seenCrashes;
|
||||
NSMutableDictionary *lastEvents;
|
||||
NSURLSession *session;
|
||||
NSURLSessionDataTask *sending;
|
||||
NSString *sessionID, *installationID, *source, *version;
|
||||
NSNumber *build;
|
||||
NSURL *folder, *journal;
|
||||
NSDictionary *environment;
|
||||
NSTimeInterval nextAttempt, lastTick, lastStall;
|
||||
BOOL ready;
|
||||
}
|
||||
- (void)enqueue:(NSString *)event fields:(NSDictionary *)fields;
|
||||
- (void)drain;
|
||||
- (void)persist;
|
||||
- (void)scanCrashSummaries;
|
||||
@end
|
||||
static DYBetaTransport *transport;
|
||||
static void publishStatus(NSDictionary *values) {
|
||||
@synchronized(gStatusLock) { [gStatus release]; gStatus=[values copy]; }
|
||||
dispatch_async(dispatch_get_main_queue(),^{[NSNotificationCenter.defaultCenter postNotificationName:DYBetaDiagnosticsChanged object:nil];});
|
||||
}
|
||||
static NSDictionary *statusSnapshot(void) { @synchronized(gStatusLock) { return [[gStatus copy]autorelease]?:@{}; } }
|
||||
static NSUserDefaults *preferences(void) { return [[[NSUserDefaults alloc]initWithSuiteName:DYBetaPreferenceDomain]autorelease]; }
|
||||
static NSString *sysctlString(const char *key) {
|
||||
char buffer[256]={};size_t size=sizeof(buffer);if(sysctlbyname(key,buffer,&size,NULL,0))return @"unknown";
|
||||
return [NSString stringWithUTF8String:buffer]?:@"unknown";
|
||||
}
|
||||
@implementation DYBetaTransport
|
||||
- (instancetype)init {
|
||||
if((self=[super init])) {
|
||||
queue=dispatch_queue_create("com.dayu.color.beta-diagnostics",DISPATCH_QUEUE_SERIAL);
|
||||
pending=[NSMutableArray new];seenCrashes=[NSMutableSet new];lastEvents=[NSMutableDictionary new];sessionID=[NSUUID.UUID.UUIDString.lowercaseString copy];
|
||||
source=[([NSBundle.mainBundle.bundleIdentifier isEqual:@"com.dayu.color.XPC"]?@"plugin":@"app")copy];
|
||||
version=[[NSBundle.mainBundle objectForInfoDictionaryKey:@"CFBundleShortVersionString"]copy];build=@([[NSBundle.mainBundle objectForInfoDictionaryKey:@"CFBundleVersion"]integerValue]);[build retain];
|
||||
dispatch_async(queue,^{@autoreleasepool{[self prepare];}});
|
||||
}return self;
|
||||
}
|
||||
- (void)prepare {
|
||||
NSUserDefaults *prefs=preferences();[prefs registerDefaults:@{@"betaDiagnosticsEnabled":@YES}];gEnabled.store([prefs boolForKey:@"betaDiagnosticsEnabled"]);
|
||||
folder=[[[NSFileManager.defaultManager URLsForDirectory:NSApplicationSupportDirectory inDomains:NSUserDomainMask].firstObject URLByAppendingPathComponent:@"com.dayu.color/Beta" isDirectory:YES]retain];
|
||||
[NSFileManager.defaultManager createDirectoryAtURL:folder withIntermediateDirectories:YES attributes:@{NSFilePosixPermissions:@0700} error:nil];
|
||||
// O_EXCL gives the APP and XPC one random installation ID without hardware UUIDs.
|
||||
NSURL *identity=[folder URLByAppendingPathComponent:@"installation.txt"];
|
||||
NSString *newID=NSUUID.UUID.UUIDString.lowercaseString;
|
||||
int fd=open(identity.fileSystemRepresentation,O_WRONLY|O_CREAT|O_EXCL,0600);
|
||||
if(fd>=0){NSData *data=[newID dataUsingEncoding:NSUTF8StringEncoding];write(fd,data.bytes,data.length);close(fd);}
|
||||
for(int attempt=0;attempt<20;attempt++) {
|
||||
[installationID release];installationID=[[[NSString stringWithContentsOfURL:identity encoding:NSUTF8StringEncoding error:nil]stringByTrimmingCharactersInSet:NSCharacterSet.whitespaceAndNewlineCharacterSet]copy];
|
||||
if([[[NSUUID alloc]initWithUUIDString:installationID]autorelease])break;
|
||||
[NSThread sleepForTimeInterval:.01];
|
||||
}
|
||||
if(![[[NSUUID alloc]initWithUUIDString:installationID]autorelease]){gEnabled.store(false);return;}
|
||||
NSURLSessionConfiguration *config=NSURLSessionConfiguration.ephemeralSessionConfiguration;
|
||||
config.timeoutIntervalForRequest=8;config.timeoutIntervalForResource=12;config.HTTPShouldSetCookies=NO;config.URLCache=nil;
|
||||
session=[[NSURLSession sessionWithConfiguration:config delegate:self delegateQueue:nil]retain];
|
||||
uint64_t memory=0;size_t length=sizeof(memory);sysctlbyname("hw.memsize",&memory,&length,NULL,0);
|
||||
NSString *fcp=@"not-installed";
|
||||
for(NSString *ID in @[@"com.apple.FinalCut",@"com.apple.FinalCutApp"]){NSURL *url=[NSWorkspace.sharedWorkspace URLForApplicationWithBundleIdentifier:ID];if(url){fcp=[[NSBundle bundleWithURL:url]objectForInfoDictionaryKey:@"CFBundleShortVersionString"]?:@"unknown";break;}}
|
||||
environment=[@{@"model":sysctlString("hw.model"),@"os_version":NSProcessInfo.processInfo.operatingSystemVersionString,@"fcp_version":fcp,@"cpu_cores":@(NSProcessInfo.processInfo.processorCount),@"memory_gb":@(double(memory)/(1024*1024*1024))}copy];
|
||||
journal=[[folder URLByAppendingPathComponent:[NSString stringWithFormat:@"pending-%d-%@.json",getpid(),sessionID]]retain];
|
||||
NSArray *files=[NSFileManager.defaultManager contentsOfDirectoryAtURL:folder includingPropertiesForKeys:@[NSURLContentModificationDateKey] options:NSDirectoryEnumerationSkipsHiddenFiles error:nil];
|
||||
NSUInteger recovered=0;
|
||||
for(NSURL *url in files){if(![url.lastPathComponent hasPrefix:@"pending-"]||![url.pathExtension isEqual:@"json"])continue;
|
||||
NSNumber *bytes=nil;[url getResourceValue:&bytes forKey:NSURLFileSizeKey error:nil];if(bytes.unsignedLongLongValue>384*1024)continue;
|
||||
NSDictionary *old=[NSJSONSerialization JSONObjectWithData:[NSData dataWithContentsOfURL:url]?:[NSData data] options:0 error:nil];if(![old isKindOfClass:NSDictionary.class])continue;
|
||||
if(![old[@"pid"]isKindOfClass:NSNumber.class])continue;int pid=[old[@"pid"]intValue];if(pid>0&&kill(pid,0)==0)continue;
|
||||
NSDate *date=nil;[url getResourceValue:&date forKey:NSURLContentModificationDateKey error:nil];
|
||||
if(gEnabled.load()&&date.timeIntervalSinceNow> -7*86400&&[old[@"events"]isKindOfClass:NSArray.class])for(NSDictionary *event in old[@"events"]){if(pending.count>=256)break;
|
||||
if(![event isKindOfClass:NSDictionary.class]||![event[@"event_id"]isKindOfClass:NSString.class]||![event[@"session_id"]isKindOfClass:NSString.class]||
|
||||
![[[NSUUID alloc]initWithUUIDString:event[@"event_id"]]autorelease]||![[[NSUUID alloc]initWithUUIDString:event[@"session_id"]]autorelease]||
|
||||
![event[@"version"]isKindOfClass:NSString.class]||![event[@"build"]isKindOfClass:NSNumber.class]||![event[@"event"]isKindOfClass:NSString.class]||
|
||||
![@[@"app",@"plugin"]containsObject:event[@"source"]]||![event[@"fields"]isKindOfClass:NSDictionary.class]||![event[@"occurred_at"]isKindOfClass:NSNumber.class])continue;
|
||||
NSMutableDictionary *safe=[[event mutableCopy]autorelease];safe[@"fields"]=DYBetaSafeFields(event[@"fields"]);[pending addObject:safe];recovered++;}
|
||||
[NSFileManager.defaultManager removeItemAtURL:url error:nil];
|
||||
}
|
||||
ready=YES;gMainReply.store(NSProcessInfo.processInfo.systemUptime);lastTick=gMainReply.load();
|
||||
[self enqueue:@"process_start" fields:environment];if(recovered)[self enqueue:@"previous_session_pending" fields:@{@"count":@(recovered)}];
|
||||
publishStatus(@{@"installation_id":installationID,@"enabled":@(gEnabled.load()),@"pending":@(pending.count)});
|
||||
timer=dispatch_source_create(DISPATCH_SOURCE_TYPE_TIMER,0,0,queue);
|
||||
dispatch_source_set_timer(timer,dispatch_time(DISPATCH_TIME_NOW,2*NSEC_PER_SEC),3*NSEC_PER_SEC,NSEC_PER_SEC/4);
|
||||
dispatch_source_set_event_handler(timer,^{@autoreleasepool{[self tick];}});dispatch_resume(timer);
|
||||
[NSDistributedNotificationCenter.defaultCenter addObserver:self selector:@selector(settingsChanged:) name:@"com.dayu.color.beta.preferences" object:nil];
|
||||
if([source isEqual:@"app"])[self scanCrashSummaries];
|
||||
}
|
||||
- (void)enqueue:(NSString *)event fields:(NSDictionary *)fields {
|
||||
if(!ready||!gEnabled.load())return;
|
||||
// A bad render must not turn diagnostics into per-frame disk writes.
|
||||
if([@[@"render_error",@"inspector_refresh"]containsObject:event]){
|
||||
double now=NSProcessInfo.processInfo.systemUptime;if(now-[lastEvents[event]doubleValue]<5)return;lastEvents[event]=@(now);
|
||||
}
|
||||
if(pending.count>=256)[pending removeObjectsInRange:NSMakeRange(0,32)];
|
||||
[pending addObject:@{@"event_id":NSUUID.UUID.UUIDString.lowercaseString,@"session_id":sessionID,@"source":source,@"version":version?:@"0.0",@"build":build?:@1,@"event":event,@"occurred_at":@(NSDate.date.timeIntervalSince1970),@"fields":DYBetaSafeFields(fields?:@{})}];
|
||||
[self persist];
|
||||
}
|
||||
- (void)persist {
|
||||
if(!journal)return;
|
||||
NSData *data=[NSJSONSerialization dataWithJSONObject:@{@"pid":@(getpid()),@"events":pending} options:0 error:nil];
|
||||
if(data.length>384*1024){while(pending.count>64)[pending removeObjectAtIndex:0];data=[NSJSONSerialization dataWithJSONObject:@{@"pid":@(getpid()),@"events":pending} options:0 error:nil];}
|
||||
[data writeToURL:journal options:NSDataWritingAtomic error:nil];chmod(journal.fileSystemRepresentation,0600);
|
||||
}
|
||||
- (void)drain {
|
||||
if(!ready||!gEnabled.load()||sending||!pending.count||NSDate.date.timeIntervalSince1970<nextAttempt)return;
|
||||
NSArray *batch=[[pending subarrayWithRange:NSMakeRange(0,MIN((NSUInteger)16,pending.count))]copy];
|
||||
NSData *data=[NSJSONSerialization dataWithJSONObject:@{@"bundle_id":@"com.dayu.color",@"installation_id":installationID,@"events":batch} options:0 error:nil];
|
||||
if(data.length>98304){[pending removeObjectAtIndex:0];[batch release];[self persist];return;}
|
||||
NSMutableURLRequest *request=[NSMutableURLRequest requestWithURL:[NSURL URLWithString:@"https://dayu.media/wp-json/dayu-color/v1/diagnostics"]];request.HTTPMethod=@"POST";request.HTTPBody=data;[request setValue:@"application/json" forHTTPHeaderField:@"Content-Type"];
|
||||
sending=[[session dataTaskWithRequest:request completionHandler:^(NSData *body,NSURLResponse *response,NSError *error){
|
||||
dispatch_async(self->queue,^{@autoreleasepool{
|
||||
NSDictionary *reply=body?[NSJSONSerialization JSONObjectWithData:body options:0 error:nil]:nil;if(![reply isKindOfClass:NSDictionary.class])reply=nil;
|
||||
NSSet *accepted=[reply[@"event_ids"]isKindOfClass:NSArray.class]?[NSSet setWithArray:reply[@"event_ids"]]:[NSSet set];
|
||||
NSSet *expected=[NSSet setWithArray:[batch valueForKey:@"event_id"]];
|
||||
BOOL ok=!error&&[(NSHTTPURLResponse*)response statusCode]==200&&[reply[@"accepted"]isKindOfClass:NSNumber.class]&&[reply[@"accepted"]boolValue]&&[accepted isEqualToSet:expected];
|
||||
if(ok){NSIndexSet *remove=[self->pending indexesOfObjectsPassingTest:^BOOL(NSDictionary *event,NSUInteger i,BOOL *stop){return [accepted containsObject:event[@"event_id"]];}];[self->pending removeObjectsAtIndexes:remove];self->nextAttempt=0;
|
||||
publishStatus(@{@"installation_id":self->installationID,@"enabled":@(gEnabled.load()),@"pending":@(self->pending.count),@"last_upload":@([NSDate.date timeIntervalSince1970])});
|
||||
}else self->nextAttempt=NSDate.date.timeIntervalSince1970+30;
|
||||
[self->sending release];self->sending=nil;[batch release];[self persist];
|
||||
}});
|
||||
}]retain];[sending resume];
|
||||
}
|
||||
- (void)tick {
|
||||
double now=NSProcessInfo.processInfo.systemUptime;
|
||||
if(now-lastTick>15)gMainReply.store(now); // Sleep/wake and timer coalescing are not proof of a hang.
|
||||
lastTick=now;
|
||||
if(gEnabled.load()&&now-gMainReply.load()>6&&now-lastStall>30){lastStall=now;[self enqueue:@"main_thread_stall" fields:@{@"status":@"suspected",@"main_delay_ms":@((now-gMainReply.load())*1000),@"active_stages":[self activeStages:now]}];}
|
||||
else if(gEnabled.load()&&now-lastStall>30){NSString *stages=[self activeStages:now];if(stages.length){lastStall=now;[self enqueue:@"operation_stall" fields:@{@"status":@"suspected",@"active_stages":stages}];}}
|
||||
dispatch_async(dispatch_get_main_queue(),^{gMainReply.store(NSProcessInfo.processInfo.systemUptime);});
|
||||
[self drain];
|
||||
}
|
||||
- (NSString *)activeStages:(double)now {
|
||||
NSArray *values;@synchronized(gSpanLock){values=[[gActive.allValues copy]autorelease];}
|
||||
NSMutableArray *slow=[NSMutableArray array];for(NSDictionary *span in values)if(now-[span[@"start"]doubleValue]>6)[slow addObject:[NSString stringWithFormat:@"%@: %.0fms",span[@"stage"],(now-[span[@"start"]doubleValue])*1000]];
|
||||
return [slow componentsJoinedByString:@"; "];
|
||||
}
|
||||
- (void)settingsChanged:(NSNotification *)note {
|
||||
dispatch_async(queue,^{@autoreleasepool{NSUserDefaults *prefs=preferences();[prefs synchronize];gEnabled.store([prefs objectForKey:@"betaDiagnosticsEnabled"]?[prefs boolForKey:@"betaDiagnosticsEnabled"]:YES);
|
||||
if(!gEnabled.load()){[self->sending cancel];[self->pending removeAllObjects];[self persist];}
|
||||
publishStatus(@{@"installation_id":self->installationID?:@"",@"enabled":@(gEnabled.load()),@"pending":@(self->pending.count)});
|
||||
}});
|
||||
}
|
||||
- (void)URLSession:(NSURLSession *)s task:(NSURLSessionTask *)task willPerformHTTPRedirection:(NSHTTPURLResponse *)response newRequest:(NSURLRequest *)request completionHandler:(void (^)(NSURLRequest *))completionHandler {
|
||||
completionHandler(DYBetaAllowedURL(request.URL,NO)?request:nil);
|
||||
}
|
||||
- (void)scanCrashSummaries {
|
||||
if(!gEnabled.load())return;
|
||||
NSURL *reports=[NSFileManager.defaultManager.homeDirectoryForCurrentUser URLByAppendingPathComponent:@"Library/Logs/DiagnosticReports"];
|
||||
NSArray *files=[NSFileManager.defaultManager contentsOfDirectoryAtURL:reports includingPropertiesForKeys:@[NSURLContentModificationDateKey,NSURLFileSizeKey] options:NSDirectoryEnumerationSkipsHiddenFiles error:nil];
|
||||
NSUInteger count=0;
|
||||
for(NSURL *url in files){if(count>=12)break;if(![url.pathExtension isEqual:@"ips"])continue;
|
||||
NSNumber *size=nil;[url getResourceValue:&size forKey:NSURLFileSizeKey error:nil];if(size.unsignedLongLongValue>8*1024*1024)continue;
|
||||
NSDate *date=nil;[url getResourceValue:&date forKey:NSURLContentModificationDateKey error:nil];if(date.timeIntervalSinceNow< -7*86400)continue;
|
||||
NSFileHandle *handle=[NSFileHandle fileHandleForReadingFromURL:url error:nil];NSData *head=[handle readDataUpToLength:8192 error:nil];[handle closeFile];
|
||||
if(!head.length)continue;NSString *prefix=[[[NSString alloc]initWithData:head encoding:NSUTF8StringEncoding]autorelease];NSRange first=[prefix rangeOfString:@"\n"];if(!prefix||first.location==NSNotFound)continue;
|
||||
NSDictionary *header=[NSJSONSerialization JSONObjectWithData:[[prefix substringToIndex:first.location]dataUsingEncoding:NSUTF8StringEncoding] options:0 error:nil];if(![header isKindOfClass:NSDictionary.class]||![header[@"bundleID"]isEqual:@"com.dayu.color.XPC"])continue;
|
||||
NSData *data=[NSData dataWithContentsOfURL:url options:NSDataReadingMappedIfSafe error:nil];if(!data.length)continue;NSString *text=[[[NSString alloc]initWithData:data encoding:NSUTF8StringEncoding]autorelease];NSRange newline=[text rangeOfString:@"\n"];if(!text||newline.location==NSNotFound)continue;
|
||||
NSString *key=header[@"incident_id"];if(![key isKindOfClass:NSString.class]||![[[NSUUID alloc]initWithUUIDString:key]autorelease])continue;if([seenCrashes containsObject:key])continue;[seenCrashes addObject:key];
|
||||
NSDictionary *body=[NSJSONSerialization JSONObjectWithData:[[text substringFromIndex:newline.location+1]dataUsingEncoding:NSUTF8StringEncoding] options:0 error:nil];
|
||||
if(![body isKindOfClass:NSDictionary.class])continue;NSDictionary *exception=[body[@"exception"]isKindOfClass:NSDictionary.class]?body[@"exception"]:@{};
|
||||
NSInteger fault=[body[@"faultingThread"]isKindOfClass:NSNumber.class]?[body[@"faultingThread"]integerValue]:-1;NSArray *threads=body[@"threads"];NSMutableArray *frames=[NSMutableArray array];
|
||||
if([threads isKindOfClass:NSArray.class]&&fault>=0&&fault<threads.count&&[threads[fault]isKindOfClass:NSDictionary.class]&&[threads[fault][@"frames"]isKindOfClass:NSArray.class])for(NSDictionary *frame in threads[fault][@"frames"]){if(frames.count>=30)break;if(![frame isKindOfClass:NSDictionary.class])continue;NSString *symbol=frame[@"symbol"];if([symbol isKindOfClass:NSString.class]&&![symbol containsString:@"/"])[frames addObject:symbol];}
|
||||
[self enqueue:@"crash_summary" fields:@{@"source_version":header[@"app_version"]?:@"unknown",@"report_time":header[@"timestamp"]?:@"unknown",@"exception":exception[@"type"]?:@"unknown",@"signal":exception[@"signal"]?:@"unknown",@"frames":[frames componentsJoinedByString:@"\n"]}];
|
||||
if(pending.count){NSMutableDictionary *event=[[pending.lastObject mutableCopy]autorelease];event[@"event_id"]=key.lowercaseString;[pending replaceObjectAtIndex:pending.count-1 withObject:event];[self persist];}count++;
|
||||
}
|
||||
}
|
||||
@end
|
||||
|
||||
void DYBetaStart(void) {
|
||||
static dispatch_once_t once;dispatch_once(&once,^{
|
||||
NSString *ID=NSBundle.mainBundle.bundleIdentifier;
|
||||
gProduct=([ID isEqual:@"com.dayu.color"]||[ID isEqual:@"com.dayu.color.XPC"])&&![NSProcessInfo.processInfo.arguments containsObject:@"--self-test"];
|
||||
gSpanLock=[NSObject new];gStatusLock=[NSObject new];gActive=[NSMutableDictionary new];
|
||||
if(gProduct)transport=[DYBetaTransport new];
|
||||
});
|
||||
}
|
||||
BOOL DYBetaEnabled(void){DYBetaStart();return gEnabled.load();}
|
||||
void DYBetaSetEnabled(BOOL enabled){DYBetaStart();gEnabled.store(enabled);NSUserDefaults *prefs=preferences();[prefs setBool:enabled forKey:@"betaDiagnosticsEnabled"];[prefs synchronize];[NSDistributedNotificationCenter.defaultCenter postNotificationName:@"com.dayu.color.beta.preferences" object:nil userInfo:nil deliverImmediately:YES];}
|
||||
NSDictionary *DYBetaStatus(void){DYBetaStart();return statusSnapshot();}
|
||||
void DYBetaEvent(NSString *event,NSDictionary *fields){DYBetaStart();if(!gProduct||!gEnabled.load())return;NSDictionary *safe=DYBetaSafeFields(fields?:@{});dispatch_async(transport->queue,^{@autoreleasepool{[transport enqueue:event fields:safe];}});}
|
||||
uint64_t DYBetaSpanBegin(NSString *stage,NSDictionary *fields){DYBetaStart();if(!gProduct||!gEnabled.load())return 0;uint64_t token=++gSpan;NSDictionary *value=@{@"stage":stage,@"start":@(NSProcessInfo.processInfo.systemUptime),@"fields":DYBetaSafeFields(fields?:@{})};@synchronized(gSpanLock){if(gActive.count>=128)return 0;gActive[@(token)]=value;}
|
||||
if(![stage isEqual:@"inspector_refresh"]){NSMutableDictionary *begin=[[value[@"fields"]mutableCopy]autorelease];begin[@"phase"]=@"begin";DYBetaEvent(stage,begin);}return token;
|
||||
}
|
||||
void DYBetaSpanEnd(uint64_t token,NSDictionary *fields){if(!token)return;NSDictionary *span;@synchronized(gSpanLock){span=[[gActive[@(token)]retain]autorelease];[gActive removeObjectForKey:@(token)];}if(!span)return;double elapsed=(NSProcessInfo.processInfo.systemUptime-[span[@"start"]doubleValue])*1000;if([span[@"stage"]isEqual:@"inspector_refresh"]&&elapsed<100)return;NSMutableDictionary *result=[[span[@"fields"]mutableCopy]autorelease];[result addEntriesFromDictionary:fields?:@{}];result[@"duration_ms"]=@(elapsed);result[@"phase"]=@"end";DYBetaEvent(span[@"stage"],result);}
|
||||
void DYBetaStop(void){DYBetaEvent(@"process_exit",@{@"status":@"normal"});}
|
||||
void DYBetaSendSummary(void){DYBetaStart();if(!gProduct)return;dispatch_async(transport->queue,^{@autoreleasepool{[transport enqueue:@"diagnostic_summary" fields:transport->environment];[transport scanCrashSummaries];[transport drain];}});}
|
||||
@@ -1,15 +1,441 @@
|
||||
#import "AppDelegate.h"
|
||||
#import "DYBetaUpdater.h"
|
||||
#import "../Shared/DYBetaDiagnostics.h"
|
||||
|
||||
static NSString *const DYPluginID = @"com.dayu.color.XPC";
|
||||
static NSString *const DYReleaseAddress = @"https://dayu.media";
|
||||
static NSColor *DYColor(CGFloat r, CGFloat g, CGFloat b) { return [NSColor colorWithSRGBRed:r green:g blue:b alpha:1]; }
|
||||
static NSColor *DYBlue(void) { return DYColor(.36,.65,1); }
|
||||
static NSColor *DYGreen(void) { return DYColor(.26,.86,.53); }
|
||||
static NSColor *DYSecondary(void) { return DYColor(.70,.74,.81); }
|
||||
|
||||
// Static opaque surfaces preserve the reference palette without expensive blur or motion.
|
||||
@interface DYSurface : NSView
|
||||
@property(retain) NSColor *tint;
|
||||
@property BOOL backdrop;
|
||||
@end
|
||||
@implementation DYSurface
|
||||
- (BOOL)isFlipped { return YES; }
|
||||
- (void)drawRect:(NSRect)dirty {
|
||||
BOOL contrast = NSWorkspace.sharedWorkspace.accessibilityDisplayShouldIncreaseContrast;
|
||||
NSBezierPath *shape = [NSBezierPath bezierPathWithRoundedRect:NSInsetRect(self.bounds,1,1) xRadius:self.backdrop ? 0 : 22 yRadius:self.backdrop ? 0 : 22];
|
||||
NSColor *base = DYColor(.105,.115,.14);
|
||||
NSColor *start = self.backdrop ? DYColor(.105,.14,.20) : [base blendedColorWithFraction:.17 ofColor:self.tint];
|
||||
NSColor *end = self.backdrop ? DYColor(.105,.115,.115) : base;
|
||||
NSGradient *gradient = [[[NSGradient alloc] initWithStartingColor:start endingColor:end] autorelease];
|
||||
[gradient drawInBezierPath:shape angle:35];
|
||||
if (!self.backdrop) {
|
||||
[[self.tint blendedColorWithFraction:contrast ? .15 : .62 ofColor:base] setStroke];
|
||||
shape.lineWidth = contrast ? 2 : 1; [shape stroke];
|
||||
}
|
||||
}
|
||||
- (void)dealloc { [_tint release]; [super dealloc]; }
|
||||
@end
|
||||
|
||||
@interface DYActionButton : NSButton
|
||||
@property(retain) NSColor *tint;
|
||||
@property BOOL prominent;
|
||||
@end
|
||||
@implementation DYActionButton
|
||||
- (void)drawRect:(NSRect)dirty {
|
||||
NSRect rect = NSInsetRect(self.bounds,2,2);
|
||||
NSBezierPath *shape = [NSBezierPath bezierPathWithRoundedRect:rect xRadius:rect.size.height/2 yRadius:rect.size.height/2];
|
||||
NSColor *base = self.prominent ? self.tint : [DYColor(.10,.12,.16) blendedColorWithFraction:.18 ofColor:self.tint];
|
||||
if (self.highlighted) base = [base blendedColorWithFraction:.2 ofColor:NSColor.blackColor];
|
||||
[base setFill]; [shape fill];
|
||||
[[self.tint blendedColorWithFraction:.35 ofColor:NSColor.whiteColor] setStroke];
|
||||
shape.lineWidth = NSWorkspace.sharedWorkspace.accessibilityDisplayShouldIncreaseContrast ? 2 : 1; [shape stroke];
|
||||
NSColor *text = self.enabled ? (self.prominent ? NSColor.whiteColor : self.tint) : DYSecondary();
|
||||
NSDictionary *attrs = @{NSFontAttributeName:[NSFont systemFontOfSize:13 weight:NSFontWeightSemibold],NSForegroundColorAttributeName:text};
|
||||
NSSize size = [self.title sizeWithAttributes:attrs];
|
||||
[self.title drawAtPoint:NSMakePoint((NSWidth(self.bounds)-size.width)/2,(NSHeight(self.bounds)-size.height)/2) withAttributes:attrs];
|
||||
}
|
||||
- (void)drawFocusRingMask { [[NSBezierPath bezierPathWithRoundedRect:NSInsetRect(self.bounds,2,2) xRadius:20 yRadius:20] fill]; }
|
||||
- (NSRect)focusRingMaskBounds { return self.bounds; }
|
||||
- (void)dealloc { [_tint release]; [super dealloc]; }
|
||||
@end
|
||||
|
||||
static NSTextField *DYLabel(NSString *text, CGFloat size, NSFontWeight weight, NSColor *color) {
|
||||
NSTextField *label = [NSTextField wrappingLabelWithString:text];
|
||||
label.font = [NSFont systemFontOfSize:size weight:weight]; label.textColor = color;
|
||||
label.translatesAutoresizingMaskIntoConstraints = NO;
|
||||
[label setContentCompressionResistancePriority:NSLayoutPriorityRequired forOrientation:NSLayoutConstraintOrientationVertical];
|
||||
return label;
|
||||
}
|
||||
static NSStackView *DYStack(NSArray *views, NSUserInterfaceLayoutOrientation orientation, CGFloat spacing) {
|
||||
NSStackView *stack = [NSStackView stackViewWithViews:views];
|
||||
stack.orientation = orientation; stack.spacing = spacing;
|
||||
stack.alignment = orientation == NSUserInterfaceLayoutOrientationVertical ? NSLayoutAttributeLeading : NSLayoutAttributeTop;
|
||||
stack.translatesAutoresizingMaskIntoConstraints = NO;
|
||||
if (orientation == NSUserInterfaceLayoutOrientationHorizontal) stack.distribution = NSStackViewDistributionFillEqually;
|
||||
return stack;
|
||||
}
|
||||
static void DYPin(NSView *child, NSView *parent, CGFloat inset) {
|
||||
child.translatesAutoresizingMaskIntoConstraints = NO; [parent addSubview:child];
|
||||
[NSLayoutConstraint activateConstraints:@[
|
||||
[child.leadingAnchor constraintEqualToAnchor:parent.leadingAnchor constant:inset],
|
||||
[child.trailingAnchor constraintEqualToAnchor:parent.trailingAnchor constant:-inset],
|
||||
[child.topAnchor constraintEqualToAnchor:parent.topAnchor constant:inset],
|
||||
[child.bottomAnchor constraintEqualToAnchor:parent.bottomAnchor constant:-inset]]];
|
||||
}
|
||||
static DYActionButton *DYButton(NSString *title, NSColor *tint, BOOL prominent, id target, SEL action) {
|
||||
DYActionButton *button = [DYActionButton buttonWithTitle:title target:target action:action];
|
||||
button.tint = tint; button.prominent = prominent; button.bordered = NO;
|
||||
button.translatesAutoresizingMaskIntoConstraints = NO;
|
||||
[button.heightAnchor constraintEqualToConstant:42].active = YES;
|
||||
[button.widthAnchor constraintGreaterThanOrEqualToConstant:124].active = YES;
|
||||
return button;
|
||||
}
|
||||
static DYSurface *DYCard(NSColor *tint, NSStackView *content) {
|
||||
DYSurface *card = [[[DYSurface alloc] initWithFrame:NSZeroRect] autorelease];
|
||||
card.tint = tint; card.translatesAutoresizingMaskIntoConstraints = NO; DYPin(content,card,22);
|
||||
for (NSView *view in content.arrangedSubviews) [view.widthAnchor constraintEqualToAnchor:content.widthAnchor].active = YES;
|
||||
return card;
|
||||
}
|
||||
static NSTextField *DYHeading(NSString *symbol, NSString *text, NSColor *color) {
|
||||
NSTextField *label = DYLabel(text,15,NSFontWeightSemibold,color);
|
||||
NSImage *image = [NSImage imageWithSystemSymbolName:symbol accessibilityDescription:nil];
|
||||
if (image) {
|
||||
NSTextAttachment *attachment = [[[NSTextAttachment alloc] init] autorelease];
|
||||
attachment.image = image; attachment.bounds = NSMakeRect(0,-3,18,18);
|
||||
NSMutableAttributedString *value = [[[NSMutableAttributedString alloc] initWithAttributedString:[NSAttributedString attributedStringWithAttachment:attachment]] autorelease];
|
||||
[value appendAttributedString:[[[NSAttributedString alloc] initWithString:[@" " stringByAppendingString:text]
|
||||
attributes:@{NSFontAttributeName:label.font,NSForegroundColorAttributeName:color}] autorelease]];
|
||||
label.attributedStringValue = value; label.accessibilityLabel = text;
|
||||
}
|
||||
return label;
|
||||
}
|
||||
|
||||
typedef NS_ENUM(NSInteger,DYRegistrationState) { DYChecking, DYRegistering, DYReady, DYFailed };
|
||||
@interface AppDelegate ()
|
||||
@property(weak) IBOutlet NSWindow *window;
|
||||
@property(assign) NSTextField *statusTitle, *statusDetail, *exitDetail;
|
||||
@property(assign) DYActionButton *retryButton, *keepButton, *confirmationButton;
|
||||
@property(assign) NSProgressIndicator *progress;
|
||||
@property(assign) DYSurface *registrationCard;
|
||||
@property DYRegistrationState registrationState;
|
||||
@property BOOL keepOpen, terminating;
|
||||
@property NSInteger secondsRemaining;
|
||||
@property(retain) NSTimer *exitTimer;
|
||||
@property(retain) NSMutableDictionary *diagnostics;
|
||||
@property(retain) DYBetaUpdater *updater;
|
||||
@property(assign) NSTextField *updateTitle, *updateDetail, *diagnosticDetail, *reportID;
|
||||
@property(assign) DYActionButton *updateCheckButton, *updateInstallButton, *updateCancelButton, *sendSummaryButton;
|
||||
@property(assign) NSButton *diagnosticToggle;
|
||||
@property(assign) NSProgressIndicator *updateProgress;
|
||||
@property(retain) NSTimer *updateProgressTimer;
|
||||
@property BOOL updateCheckDone;
|
||||
@end
|
||||
|
||||
@implementation AppDelegate
|
||||
- (void)applicationDidFinishLaunching:(NSNotification*)n{
|
||||
self.window.title=@"大鱼调色";[self.window setContentSize:NSMakeSize(540,280)];[self.window center];
|
||||
NSView*v=[[[NSView alloc]initWithFrame:NSMakeRect(0,0,540,280)]autorelease];v.wantsLayer=YES;v.layer.backgroundColor=[NSColor colorWithSRGBRed:.025 green:.08 blue:.13 alpha:1].CGColor;self.window.contentView=v;
|
||||
NSTextField*title=[NSTextField labelWithString:@"大鱼调色"];title.font=[NSFont boldSystemFontOfSize:28];title.textColor=[NSColor colorWithSRGBRed:.3 green:.75 blue:1 alpha:1];title.frame=NSMakeRect(32,212,460,42);[v addSubview:title];
|
||||
NSTextField*body=[NSTextField wrappingLabelWithString:@"已安装原生 FxPlug 调色效果。\n\n在 Final Cut Pro 的「效果 → 大鱼调色」中应用,或在 Motion 的滤镜中选择「大鱼调色」。\n\n输入转换、光影、曲线、HSL、色轮与 LUT 均在宿主检查器中编辑。"];body.font=[NSFont systemFontOfSize:14];body.textColor=[NSColor colorWithWhite:.86 alpha:1];body.frame=NSMakeRect(34,65,470,140);[v addSubview:body];
|
||||
NSButton*b=[NSButton buttonWithTitle:@"打开 Final Cut Pro" target:self action:@selector(openHost:)];b.frame=NSMakeRect(30,20,170,32);[v addSubview:b];[self.window makeKeyAndOrderFront:nil];
|
||||
- (void)applicationDidFinishLaunching:(NSNotification *)notification {
|
||||
self.keepOpen = [NSProcessInfo.processInfo.arguments containsObject:@"--show-introduction"];
|
||||
self.window.title = @"大鱼调色";
|
||||
self.window.appearance = [NSAppearance appearanceNamed:NSAppearanceNameDarkAqua];
|
||||
self.window.titlebarAppearsTransparent = YES; self.window.backgroundColor = DYColor(.105,.14,.20);
|
||||
self.window.contentMinSize = NSMakeSize(760,620); [self.window setContentSize:NSMakeSize(920,850)]; [self.window center];
|
||||
DYBetaStart();
|
||||
[self buildInterface]; [self buildMenu];
|
||||
[NSNotificationCenter.defaultCenter addObserver:self selector:@selector(refreshDiagnostics:) name:DYBetaDiagnosticsChanged object:nil];
|
||||
self.updater = [[[DYBetaUpdater alloc] init] autorelease];
|
||||
__block AppDelegate *owner = self;
|
||||
self.updater.changed = ^(NSDictionary *state) { [owner updateChanged:state]; };
|
||||
self.updateProgressTimer = [NSTimer scheduledTimerWithTimeInterval:.2 target:self selector:@selector(refreshUpdateProgress:) userInfo:nil repeats:YES];
|
||||
NSInteger expected=[NSUserDefaults.standardUserDefaults integerForKey:@"betaPendingUpdateBuild"];
|
||||
if(expected>0 && [NSBundle.mainBundle.infoDictionary[@"CFBundleVersion"]integerValue]>=expected){
|
||||
DYBetaEvent(@"update_installer",@{@"status":@"completed",@"count":@(expected)});
|
||||
[NSUserDefaults.standardUserDefaults removeObjectForKey:@"betaPendingUpdateBuild"];
|
||||
}
|
||||
[NSWorkspace.sharedWorkspace.notificationCenter addObserver:self selector:@selector(accessibilityChanged:)
|
||||
name:NSWorkspaceAccessibilityDisplayOptionsDidChangeNotification object:nil];
|
||||
[self.window makeKeyAndOrderFront:nil]; [self refreshDiagnostics:nil]; [self checkRegistration:nil]; [self.updater check];
|
||||
}
|
||||
- (void)openHost:(id)sender{NSURL*u=[NSWorkspace.sharedWorkspace URLForApplicationWithBundleIdentifier:@"com.apple.FinalCut"];if(u)[NSWorkspace.sharedWorkspace openApplicationAtURL:u configuration:NSWorkspaceOpenConfiguration.configuration completionHandler:nil];}
|
||||
- (BOOL)applicationShouldTerminateAfterLastWindowClosed:(NSApplication*)app{return YES;}
|
||||
- (void)buildMenu {
|
||||
NSMenu *menu = [[[NSMenu alloc] initWithTitle:@"大鱼调色"] autorelease];
|
||||
NSMenuItem *root = [[[NSMenuItem alloc] initWithTitle:@"大鱼调色" action:NULL keyEquivalent:@""] autorelease]; [menu addItem:root];
|
||||
NSMenu *app = [[[NSMenu alloc] initWithTitle:@"大鱼调色"] autorelease]; root.submenu = app;
|
||||
for (NSArray *entry in @[@[@"关于大鱼调色",NSStringFromSelector(@selector(orderFrontStandardAboutPanel:)),@""],
|
||||
@[@"查看功能介绍",NSStringFromSelector(@selector(keepIntroduction:)),@"i"],
|
||||
@[@"重新检查插件",NSStringFromSelector(@selector(checkRegistration:)),@"r"],
|
||||
@[@"检查公测更新",NSStringFromSelector(@selector(checkUpdate:)),@"u"],
|
||||
@[@"访问发布地址",NSStringFromSelector(@selector(openWebsite:)),@""],
|
||||
@[@"关闭窗口",NSStringFromSelector(@selector(closeWindow:)),@"w"],
|
||||
@[@"退出大鱼调色",NSStringFromSelector(@selector(terminate:)),@"q"]]) {
|
||||
NSMenuItem *item = [[[NSMenuItem alloc] initWithTitle:entry[0] action:NSSelectorFromString(entry[1]) keyEquivalent:entry[2]] autorelease];
|
||||
item.target = [entry[0] isEqualToString:@"退出大鱼调色"] || [entry[0] isEqualToString:@"关于大鱼调色"] ? NSApp : self; [app addItem:item];
|
||||
}
|
||||
NSApp.mainMenu = menu;
|
||||
}
|
||||
- (void)buildInterface {
|
||||
DYSurface *backdrop = [[[DYSurface alloc] initWithFrame:NSZeroRect] autorelease]; backdrop.backdrop = YES; self.window.contentView = backdrop;
|
||||
NSScrollView *scroll = [[[NSScrollView alloc] initWithFrame:NSZeroRect] autorelease];
|
||||
scroll.drawsBackground = NO; scroll.hasVerticalScroller = YES; scroll.autohidesScrollers = YES; DYPin(scroll,backdrop,0);
|
||||
DYSurface *document = [[[DYSurface alloc] initWithFrame:NSZeroRect] autorelease];
|
||||
document.backdrop = YES; document.translatesAutoresizingMaskIntoConstraints = NO; scroll.documentView = document;
|
||||
[NSLayoutConstraint activateConstraints:@[
|
||||
[document.leadingAnchor constraintEqualToAnchor:scroll.contentView.leadingAnchor],
|
||||
[document.topAnchor constraintEqualToAnchor:scroll.contentView.topAnchor],
|
||||
[document.widthAnchor constraintEqualToAnchor:scroll.contentView.widthAnchor]]];
|
||||
NSButton *website = [NSButton buttonWithTitle:@"发布地址 https://dayu.media ↗" target:self action:@selector(openWebsite:)];
|
||||
website.bordered = NO; website.translatesAutoresizingMaskIntoConstraints = NO;
|
||||
website.attributedTitle = [[[NSAttributedString alloc] initWithString:website.title attributes:@{
|
||||
NSFontAttributeName:[NSFont systemFontOfSize:13 weight:NSFontWeightMedium],NSForegroundColorAttributeName:DYBlue()}] autorelease];
|
||||
[website.heightAnchor constraintEqualToConstant:28].active = YES;
|
||||
NSDictionary *info = NSBundle.mainBundle.infoDictionary;
|
||||
NSArray *heroLabels = @[DYLabel(@"FINAL CUT PRO / MOTION",11,NSFontWeightSemibold,DYBlue()),
|
||||
DYLabel(@"大鱼调色",42,NSFontWeightBold,NSColor.whiteColor),
|
||||
DYLabel(@"从色彩还原到胶片质感,让每一次调色更从容。",15,NSFontWeightRegular,DYSecondary()),
|
||||
DYLabel([NSString stringWithFormat:@"v%@ · 构建 %@ / 原生 FxPlug 4 · Apple Silicon",info[@"CFBundleShortVersionString"],info[@"CFBundleVersion"]],11,NSFontWeightMedium,DYSecondary())];
|
||||
NSStackView *hero = DYStack(heroLabels,NSUserInterfaceLayoutOrientationVertical,8);
|
||||
for (NSTextField *label in heroLabels) { label.alignment = NSTextAlignmentCenter; [label.widthAnchor constraintEqualToAnchor:hero.widthAnchor].active = YES; }
|
||||
self.statusTitle = DYLabel(@"正在检查插件…",22,NSFontWeightSemibold,NSColor.whiteColor);
|
||||
self.statusDetail = DYLabel(@"正在检查本机插件登记,随后自动提交注册。",13,NSFontWeightRegular,DYSecondary());
|
||||
[self.statusDetail.heightAnchor constraintGreaterThanOrEqualToConstant:42].active = YES;
|
||||
self.progress = [[[NSProgressIndicator alloc] initWithFrame:NSZeroRect] autorelease];
|
||||
self.progress.style = NSProgressIndicatorStyleBar; self.progress.indeterminate = YES; self.progress.translatesAutoresizingMaskIntoConstraints = NO;
|
||||
self.retryButton = DYButton(@"检查中…",DYBlue(),NO,self,@selector(checkRegistration:));
|
||||
self.keepButton = DYButton(@"查看功能介绍",DYColor(.20,.46,.94),YES,self,@selector(keepIntroduction:));
|
||||
self.exitDetail = DYLabel(@"注册成功后,将显示 3 秒退出倒计时。",15,NSFontWeightSemibold,DYGreen());
|
||||
[self.exitDetail.heightAnchor constraintGreaterThanOrEqualToConstant:38].active = YES;
|
||||
NSStackView *registration = DYStack(@[DYHeading(@"puzzlepiece.extension",@"插件连接",DYBlue()),self.statusTitle,self.statusDetail,self.progress,
|
||||
self.exitDetail,DYStack(@[self.retryButton,self.keepButton],NSUserInterfaceLayoutOrientationHorizontal,8)],NSUserInterfaceLayoutOrientationVertical,13);
|
||||
self.registrationCard = DYCard(DYBlue(),registration);
|
||||
self.confirmationButton = DYButton(@"已确认正常,退出",DYGreen(),NO,self,@selector(confirmHost:));
|
||||
self.confirmationButton.enabled = NO;
|
||||
self.confirmationButton.toolTip = @"请先在 Final Cut Pro 中应用大鱼调色并确认效果正常,再点击此按钮。";
|
||||
NSStackView *host = DYStack(@[DYHeading(@"play.rectangle",@"在 Final Cut Pro 中检查",DYGreen()),
|
||||
DYLabel(@"调色,留在时间线里。",22,NSFontWeightSemibold,NSColor.whiteColor),
|
||||
DYLabel(@"Final Cut Pro:效果 → 大鱼调色\n将效果应用到片段,确认画面与调节正常。\n打开宿主检查会保留本窗口,等待你确认。",13,NSFontWeightRegular,DYSecondary()),
|
||||
DYStack(@[DYButton(@"打开 FCP 检查",DYColor(.20,.46,.94),YES,self,@selector(openFinalCut:)),DYButton(@"打开 Motion",DYGreen(),NO,self,@selector(openMotion:))],NSUserInterfaceLayoutOrientationHorizontal,8),
|
||||
self.confirmationButton],NSUserInterfaceLayoutOrientationVertical,13);
|
||||
DYSurface *hostCard = DYCard(DYGreen(),host);
|
||||
NSStackView *top = DYStack(@[self.registrationCard,hostCard],NSUserInterfaceLayoutOrientationHorizontal,14);
|
||||
[self.registrationCard.heightAnchor constraintEqualToAnchor:hostCard.heightAnchor].active = YES;
|
||||
self.updateTitle = DYLabel(@"公测更新",20,NSFontWeightSemibold,NSColor.whiteColor);
|
||||
self.updateDetail = DYLabel(@"启动时自动检查,新版本由你确认安装。",13,NSFontWeightRegular,DYSecondary());
|
||||
[self.updateDetail.heightAnchor constraintGreaterThanOrEqualToConstant:42].active = YES;
|
||||
self.updateProgress = [[[NSProgressIndicator alloc] initWithFrame:NSZeroRect] autorelease];
|
||||
self.updateProgress.style=NSProgressIndicatorStyleBar; self.updateProgress.indeterminate=NO;
|
||||
self.updateProgress.minValue=0; self.updateProgress.maxValue=1; self.updateProgress.translatesAutoresizingMaskIntoConstraints=NO;
|
||||
self.updateCheckButton=DYButton(@"检查更新",DYBlue(),NO,self,@selector(checkUpdate:));
|
||||
self.updateInstallButton=DYButton(@"下载更新",DYColor(.20,.46,.94),YES,self,@selector(installUpdate:));
|
||||
self.updateInstallButton.enabled=NO;
|
||||
self.updateCancelButton=DYButton(@"取消下载",DYBlue(),NO,self,@selector(cancelUpdate:)); self.updateCancelButton.hidden=YES;
|
||||
DYSurface *updateCard=DYCard(DYBlue(),DYStack(@[DYHeading(@"arrow.triangle.2.circlepath",@"持续改进,及时更新",DYBlue()),self.updateTitle,self.updateDetail,self.updateProgress,
|
||||
DYStack(@[self.updateCheckButton,self.updateInstallButton],NSUserInterfaceLayoutOrientationHorizontal,8),self.updateCancelButton],NSUserInterfaceLayoutOrientationVertical,10));
|
||||
self.diagnosticToggle=[NSButton checkboxWithTitle:@"参与公测诊断" target:self action:@selector(toggleDiagnostics:)];
|
||||
self.diagnosticToggle.font=[NSFont systemFontOfSize:16 weight:NSFontWeightSemibold]; self.diagnosticToggle.state=DYBetaEnabled()?NSControlStateValueOn:NSControlStateValueOff;
|
||||
self.diagnosticDetail=DYLabel(@"诊断准备中…",12,NSFontWeightRegular,DYSecondary());
|
||||
self.reportID=DYLabel(@"报告标识准备中…",10,NSFontWeightRegular,DYSecondary());self.reportID.selectable=YES;
|
||||
self.sendSummaryButton=DYButton(@"发送诊断摘要",DYColor(.67,.59,1),NO,self,@selector(sendSummary:));
|
||||
DYSurface *diagnosticCard=DYCard(DYColor(.67,.59,1),DYStack(@[DYHeading(@"waveform.path.ecg",@"一起完善大鱼调色",DYColor(.67,.59,1)),self.diagnosticToggle,
|
||||
DYLabel(@"仅发送版本、系统环境、加载耗时和本插件错误摘要;不发送素材、预设或账号。可随时关闭,诊断保留 30 天。",12,NSFontWeightRegular,DYSecondary()),
|
||||
self.reportID,self.diagnosticDetail,self.sendSummaryButton],NSUserInterfaceLayoutOrientationVertical,10));
|
||||
NSStackView *beta=DYStack(@[updateCard,diagnosticCard],NSUserInterfaceLayoutOrientationHorizontal,14);
|
||||
[updateCard.heightAnchor constraintEqualToAnchor:diagnosticCard.heightAnchor].active=YES;
|
||||
NSArray *features = @[
|
||||
@[@"slider.horizontal.3",@"完整调色",@"精准还原,自由塑造",@"CST 色彩管理、光影与曲线\nHSL、色轮、蜘蛛盘与白平衡",DYBlue()],
|
||||
@[@"square.grid.2x2",@"LUT 与风格",@"灵感,所见即所得",@"LUT 缩略图浏览与实时预览\n快速收藏,管理常用风格",DYColor(.67,.59,1)],
|
||||
@[@"film",@"胶片质感",@"让画面更有温度",@"八种印片外观、颗粒与晕光\n辉光、暗角及通道混合器",DYColor(1,.67,.30)],
|
||||
@[@"square.on.circle",@"局部与叠层",@"每个细节,都有层次",@"独立工具层、逐层蒙版\n画面控件与关键帧跟踪",DYGreen()]];
|
||||
NSMutableArray *cards = [NSMutableArray array];
|
||||
for (NSArray *feature in features) [cards addObject:DYCard(feature[4],DYStack(@[DYHeading(feature[0],feature[1],feature[4]),
|
||||
DYLabel(feature[2],17,NSFontWeightSemibold,NSColor.whiteColor),DYLabel(feature[3],13,NSFontWeightRegular,DYSecondary())],NSUserInterfaceLayoutOrientationVertical,12))];
|
||||
NSStackView *row1 = DYStack(@[cards[0],cards[1]],NSUserInterfaceLayoutOrientationHorizontal,14);
|
||||
NSStackView *row2 = DYStack(@[cards[2],cards[3]],NSUserInterfaceLayoutOrientationHorizontal,14);
|
||||
[((NSView *)cards[0]).heightAnchor constraintEqualToAnchor:((NSView *)cards[1]).heightAnchor].active = YES;
|
||||
[((NSView *)cards[2]).heightAnchor constraintEqualToAnchor:((NSView *)cards[3]).heightAnchor].active = YES;
|
||||
NSStackView *content = DYStack(@[website,hero,top,beta,DYHeading(@"sparkles",@"一套工具,完成你的色彩表达",NSColor.whiteColor),row1,row2],NSUserInterfaceLayoutOrientationVertical,18);
|
||||
DYPin(content,document,30);
|
||||
for (NSView *view in content.arrangedSubviews) [view.widthAnchor constraintEqualToAnchor:content.widthAnchor].active = YES;
|
||||
[document.heightAnchor constraintGreaterThanOrEqualToAnchor:scroll.contentView.heightAnchor].active = YES;
|
||||
}
|
||||
|
||||
// PluginKit runs on a worker queue. Arguments are never interpreted as shell commands.
|
||||
- (NSDictionary *)runPluginKit:(NSArray *)arguments {
|
||||
NSTask *task = [[[NSTask alloc] init] autorelease]; task.executableURL = [NSURL fileURLWithPath:@"/usr/bin/pluginkit"]; task.arguments = arguments;
|
||||
NSPipe *pipe = [NSPipe pipe]; task.standardOutput = pipe; task.standardError = pipe;
|
||||
NSError *error = nil;
|
||||
if (![task launchAndReturnError:&error]) return @{@"code":@(-1),@"output":error.localizedDescription ?: @"无法启动插件登记服务"};
|
||||
NSDate *deadline = [NSDate dateWithTimeIntervalSinceNow:8];
|
||||
while (task.running && deadline.timeIntervalSinceNow > 0) [NSThread sleepForTimeInterval:.05];
|
||||
if (task.running) { [task terminate]; return @{@"code":@(-2),@"output":@"插件登记服务响应超时"}; }
|
||||
NSData *data = [pipe.fileHandleForReading readDataToEndOfFile];
|
||||
NSString *output = [[[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding] autorelease] ?: @"";
|
||||
return @{@"code":@(task.terminationStatus),@"output":output};
|
||||
}
|
||||
- (BOOL)registry:(NSDictionary *)query containsPlugin:(NSString *)path {
|
||||
if ([query[@"code"] intValue] != 0) return NO;
|
||||
for (NSString *line in [query[@"output"] componentsSeparatedByCharactersInSet:NSCharacterSet.newlineCharacterSet]) {
|
||||
NSArray *fields = [line componentsSeparatedByString:@"\t"]; if (fields.count < 4) continue;
|
||||
NSString *identity = [fields[0] stringByTrimmingCharactersInSet:NSCharacterSet.whitespaceCharacterSet];
|
||||
if ([identity hasPrefix:@"+"]) identity = [[identity substringFromIndex:1] stringByTrimmingCharactersInSet:NSCharacterSet.whitespaceCharacterSet];
|
||||
NSString *registered = [[fields lastObject] stringByTrimmingCharactersInSet:NSCharacterSet.whitespaceCharacterSet];
|
||||
// 1.1 is the registration protocol, not the APP version.
|
||||
NSString *expected = [DYPluginID stringByAppendingString:@"(1.1)"];
|
||||
if ([identity isEqualToString:expected] &&
|
||||
[registered.stringByResolvingSymlinksInPath isEqualToString:path.stringByResolvingSymlinksInPath]) return YES;
|
||||
}
|
||||
return NO;
|
||||
}
|
||||
- (void)checkRegistration:(id)sender {
|
||||
if (self.diagnostics && (self.registrationState == DYChecking || self.registrationState == DYRegistering)) return;
|
||||
[self.exitTimer invalidate]; self.exitTimer = nil; self.registrationState = DYChecking;
|
||||
self.retryButton.enabled = NO; self.retryButton.title = @"检查中…";
|
||||
self.statusTitle.stringValue = @"正在检查插件…"; self.statusTitle.textColor = NSColor.whiteColor;
|
||||
self.statusDetail.stringValue = @"正在检查本机插件登记,随后自动提交注册。";
|
||||
self.progress.indeterminate = YES; [self.progress startAnimation:nil];
|
||||
NSString *path = [NSBundle.mainBundle.bundlePath stringByAppendingPathComponent:@"Contents/PlugIns/大鱼调色 XPC Service.pluginkit"];
|
||||
self.diagnostics = [NSMutableDictionary dictionaryWithDictionary:@{
|
||||
@"bundleID":NSBundle.mainBundle.bundleIdentifier,@"version":[NSBundle.mainBundle objectForInfoDictionaryKey:@"CFBundleShortVersionString"],
|
||||
@"build":[NSBundle.mainBundle objectForInfoDictionaryKey:@"CFBundleVersion"],@"executable":NSBundle.mainBundle.executablePath,
|
||||
@"pid":@(NSProcessInfo.processInfo.processIdentifier),@"plugin":path,@"status":@"checking"}];
|
||||
dispatch_async(dispatch_get_global_queue(QOS_CLASS_USER_INITIATED,0), ^{
|
||||
@autoreleasepool {
|
||||
NSBundle *plugin = [NSBundle bundleWithPath:path];
|
||||
NSDictionary *attributes = [plugin objectForInfoDictionaryKey:@"PlugInKit"][@"Attributes"];
|
||||
BOOL validComponent = [plugin.bundleIdentifier isEqualToString:DYPluginID] &&
|
||||
[[plugin objectForInfoDictionaryKey:@"CFBundleVersion"] isEqual:[NSBundle.mainBundle objectForInfoDictionaryKey:@"CFBundleVersion"]] &&
|
||||
[attributes[@"com.apple.protocol"] isEqual:@"FxPlug"] && [attributes[@"com.apple.version"] isEqual:@"1.1"];
|
||||
if (!validComponent) {
|
||||
dispatch_async(dispatch_get_main_queue(), ^{ [self finishRegistration:NO details:@"未找到完整的插件组件。请从发布地址重新安装大鱼调色。" results:@{}]; }); return;
|
||||
}
|
||||
// The stand-alone wrapper can inspect the registry directly. Registration
|
||||
// and actual host rendering remain separate states; the user confirms FCP.
|
||||
NSDictionary *before = [self runPluginKit:@[@"-m",@"-v",@"-i",DYPluginID]];
|
||||
dispatch_async(dispatch_get_main_queue(), ^{
|
||||
self.registrationState = DYRegistering; self.statusTitle.stringValue = @"正在注册插件…";
|
||||
self.statusDetail.stringValue = @"正在向系统提交插件注册,并核对当前安装位置。";
|
||||
});
|
||||
NSDictionary *add = [self runPluginKit:@[@"-a",path]];
|
||||
NSDictionary *after = nil; BOOL registered = NO;
|
||||
for (NSInteger attempt=0; attempt<4; attempt++) {
|
||||
if (attempt) [NSThread sleepForTimeInterval:.35];
|
||||
after = [self runPluginKit:@[@"-m",@"-v",@"-i",DYPluginID]];
|
||||
registered = [self registry:after containsPlugin:path]; if (registered) break;
|
||||
}
|
||||
BOOL submissionAccepted = [add[@"code"] intValue] == 0;
|
||||
NSString *message = registered ?
|
||||
@"已确认当前插件登记。请在 Final Cut Pro 中实际应用并确认效果正常;若宿主已打开,请保存后重新打开。" :
|
||||
@"插件注册尚未完成。请点击“重新检查”,或重新安装后再试。窗口将保持打开。";
|
||||
NSDictionary *results = @{@"before":before,@"submission":add,@"after":after ?: @{},@"registered":@(registered),
|
||||
@"discoveryVerified":@(registered),@"submissionAccepted":@(submissionAccepted),@"hostVerification":@"awaiting-user-confirmation",
|
||||
@"confirmationMethod":registered ? @"exact-path-discovery" : @"unconfirmed"};
|
||||
dispatch_async(dispatch_get_main_queue(), ^{ [self finishRegistration:registered details:message results:results]; });
|
||||
}
|
||||
});
|
||||
}
|
||||
- (void)finishRegistration:(BOOL)success details:(NSString *)details results:(NSDictionary *)results {
|
||||
if (self.terminating) return;
|
||||
self.registrationState = success ? DYReady : DYFailed;
|
||||
[self.progress stopAnimation:nil]; self.progress.indeterminate = NO; self.progress.doubleValue = success ? 100 : 0;
|
||||
self.registrationCard.tint = success ? DYGreen() : DYColor(1,.67,.30); [self.registrationCard setNeedsDisplay:YES];
|
||||
self.statusTitle.stringValue = success ? @"✓ 插件注册成功" : @"需要重新检查";
|
||||
self.statusTitle.textColor = success ? DYGreen() : DYColor(1,.75,.4); self.statusDetail.stringValue = details;
|
||||
self.retryButton.title = @"重新检查"; self.retryButton.enabled = YES;
|
||||
self.confirmationButton.enabled = success;
|
||||
[self.diagnostics addEntriesFromDictionary:results]; self.diagnostics[@"status"] = success ? @"registered" : @"failed"; [self writeDiagnostics];
|
||||
NSAccessibilityPostNotificationWithUserInfo(self.window,NSAccessibilityAnnouncementRequestedNotification,
|
||||
@{NSAccessibilityAnnouncementKey:self.statusTitle.stringValue,NSAccessibilityPriorityKey:@(NSAccessibilityPriorityHigh)});
|
||||
DYBetaEvent(@"registration",@{@"status":success?@"registered":@"failed"});
|
||||
if(success)[self maybeStartCountdown];
|
||||
else self.exitDetail.stringValue=@"注册尚未完成,应用会保留此窗口以便重试。";
|
||||
}
|
||||
- (void)maybeStartCountdown {
|
||||
if(self.terminating || self.registrationState!=DYReady)return;
|
||||
if(self.keepOpen){self.exitDetail.stringValue=@"插件已就绪。关闭此窗口后,可继续在宿主中使用。";return;}
|
||||
if(!self.updateCheckDone){self.exitDetail.stringValue=@"注册成功,正在检查公测更新…";return;}
|
||||
if(self.exitTimer)return;
|
||||
self.secondsRemaining=3;[self updateCountdown];
|
||||
self.exitTimer=[NSTimer scheduledTimerWithTimeInterval:1 target:self selector:@selector(exitTick:) userInfo:nil repeats:YES];
|
||||
}
|
||||
- (void)updateChanged:(NSDictionary *)state {
|
||||
if(self.terminating)return;
|
||||
NSString *phase=state[@"phase"];
|
||||
BOOL busy=[@[@"checking",@"downloading",@"validating"]containsObject:phase];
|
||||
BOOL available=[@[@"available",@"ready",@"host_wait",@"installer"]containsObject:phase];
|
||||
if(![phase isEqual:@"checking"]){self.updateCheckDone=YES;if(available)[self keepIntroduction:nil];}
|
||||
self.updateTitle.stringValue=[phase isEqual:@"available"]?state[@"message"]:@"公测更新";
|
||||
self.updateDetail.stringValue=state[@"message"]?:@"";
|
||||
self.updateCheckButton.enabled=!busy;
|
||||
self.updateInstallButton.enabled=[@[@"available",@"ready",@"host_wait",@"installer"]containsObject:phase];
|
||||
self.updateInstallButton.title=[phase isEqual:@"available"]?@"下载更新":@"安装更新";
|
||||
self.updateCancelButton.hidden=![phase isEqual:@"downloading"];
|
||||
self.updateProgress.indeterminate=[@[@"checking",@"validating"]containsObject:phase];
|
||||
if(self.updateProgress.indeterminate)[self.updateProgress startAnimation:nil];else [self.updateProgress stopAnimation:nil];
|
||||
self.updateProgress.doubleValue=[@[@"ready",@"host_wait",@"installer"]containsObject:phase]?1:0;
|
||||
[self maybeStartCountdown];
|
||||
}
|
||||
- (void)refreshUpdateProgress:(NSTimer *)timer {
|
||||
if([self.updater.state[@"phase"]isEqual:@"downloading"])self.updateProgress.doubleValue=self.updater.downloadFraction;
|
||||
}
|
||||
- (void)checkUpdate:(id)sender { [self keepIntroduction:nil]; [self.updater check]; }
|
||||
- (void)installUpdate:(id)sender {
|
||||
[self keepIntroduction:nil];NSString *phase=self.updater.state[@"phase"];
|
||||
if([phase isEqual:@"available"])[self.updater download];else [self.updater install];
|
||||
}
|
||||
- (void)cancelUpdate:(id)sender { [self keepIntroduction:nil];[self.updater cancel]; }
|
||||
- (void)refreshDiagnostics:(NSNotification *)note {
|
||||
NSDictionary *state=DYBetaStatus();BOOL enabled=DYBetaEnabled();self.diagnosticToggle.state=enabled?NSControlStateValueOn:NSControlStateValueOff;
|
||||
self.sendSummaryButton.enabled=enabled;
|
||||
self.reportID.stringValue=[NSString stringWithFormat:@"报告标识:%@",state[@"installation_id"]?:@"准备中…"];
|
||||
NSNumber *uploaded=state[@"last_upload"];
|
||||
if(!enabled)self.diagnosticDetail.stringValue=@"诊断已关闭。不会继续上传,待发送摘要已清除。";
|
||||
else if(uploaded){NSDateFormatter *format=[[[NSDateFormatter alloc]init]autorelease];format.dateFormat=@"HH:mm:ss";
|
||||
self.diagnosticDetail.stringValue=[NSString stringWithFormat:@"最近送达 %@ · 待发送 %@ 条",[format stringFromDate:[NSDate dateWithTimeIntervalSince1970:uploaded.doubleValue]],state[@"pending"]?:@0];}
|
||||
else self.diagnosticDetail.stringValue=@"诊断将在后台发送,离线时暂存并稍后重试。";
|
||||
}
|
||||
- (void)toggleDiagnostics:(id)sender { [self keepIntroduction:nil];DYBetaSetEnabled(self.diagnosticToggle.state==NSControlStateValueOn);[self refreshDiagnostics:nil]; }
|
||||
- (void)sendSummary:(id)sender { [self keepIntroduction:nil];DYBetaSendSummary();self.diagnosticDetail.stringValue=@"已加入后台发送队列,送达后会显示时间。"; }
|
||||
- (void)updateCountdown { self.exitDetail.stringValue = [NSString stringWithFormat:@"%ld 秒后自动退出\n点击“查看功能介绍”可保留窗口",(long)self.secondsRemaining]; }
|
||||
- (void)exitTick:(NSTimer *)timer {
|
||||
if (--self.secondsRemaining <= 0) {
|
||||
[timer invalidate]; self.exitTimer = nil; self.diagnostics[@"terminationReason"] = @"registration-succeeded"; [self writeDiagnostics]; [NSApp terminate:nil];
|
||||
} else [self updateCountdown];
|
||||
}
|
||||
- (void)keepIntroduction:(id)sender {
|
||||
self.keepOpen = YES; [self.exitTimer invalidate]; self.exitTimer = nil;
|
||||
self.keepButton.title = @"正在浏览介绍"; self.keepButton.enabled = NO;
|
||||
self.exitDetail.stringValue = @"已保留功能介绍窗口。插件可独立在宿主中使用。";
|
||||
}
|
||||
- (void)confirmHost:(id)sender {
|
||||
if (self.registrationState != DYReady) return;
|
||||
DYBetaEvent(@"host_confirmed",@{@"status":@"user_confirmed"});
|
||||
self.diagnostics[@"hostVerification"] = @"user-confirmed";
|
||||
self.diagnostics[@"terminationReason"] = @"user-confirmed-host";
|
||||
[self writeDiagnostics]; [NSApp terminate:nil];
|
||||
}
|
||||
- (void)writeDiagnostics {
|
||||
NSURL *base = [NSFileManager.defaultManager URLsForDirectory:NSApplicationSupportDirectory inDomains:NSUserDomainMask].firstObject;
|
||||
NSURL *folder = [base URLByAppendingPathComponent:@"com.dayu.color" isDirectory:YES];
|
||||
[NSFileManager.defaultManager createDirectoryAtURL:folder withIntermediateDirectories:YES attributes:nil error:nil];
|
||||
NSData *data = [NSJSONSerialization dataWithJSONObject:self.diagnostics options:NSJSONWritingPrettyPrinted error:nil];
|
||||
[data writeToURL:[folder URLByAppendingPathComponent:@"Registration.json"] options:NSDataWritingAtomic error:nil];
|
||||
}
|
||||
- (void)openHostWithIdentifiers:(NSArray *)identifiers name:(NSString *)name {
|
||||
[self keepIntroduction:nil]; NSURL *url = nil;
|
||||
for (NSString *identifier in identifiers) { url = [NSWorkspace.sharedWorkspace URLForApplicationWithBundleIdentifier:identifier]; if (url) break; }
|
||||
if (!url) { [self showMessage:[@"未找到 " stringByAppendingString:name] detail:@"请先安装宿主应用,再从效果或滤镜中使用大鱼调色。"]; return; }
|
||||
[NSWorkspace.sharedWorkspace openApplicationAtURL:url configuration:NSWorkspaceOpenConfiguration.configuration completionHandler:^(NSRunningApplication *app,NSError *error) {
|
||||
if (error) dispatch_async(dispatch_get_main_queue(), ^{ [self showMessage:@"无法打开宿主" detail:error.localizedDescription]; });
|
||||
}];
|
||||
}
|
||||
- (void)openFinalCut:(id)sender { [self openHostWithIdentifiers:@[@"com.apple.FinalCut",@"com.apple.FinalCutApp"] name:@"Final Cut Pro"]; }
|
||||
- (void)openMotion:(id)sender { [self openHostWithIdentifiers:@[@"com.apple.motionapp",@"com.apple.motionappApp"] name:@"Motion"]; }
|
||||
- (void)openWebsite:(id)sender { [self keepIntroduction:nil]; if (![NSWorkspace.sharedWorkspace openURL:[NSURL URLWithString:DYReleaseAddress]]) [self showMessage:@"无法打开发布地址" detail:DYReleaseAddress]; }
|
||||
- (void)showMessage:(NSString *)title detail:(NSString *)detail {
|
||||
NSAlert *alert = [[[NSAlert alloc] init] autorelease]; alert.messageText = title; alert.informativeText = detail;
|
||||
[alert addButtonWithTitle:@"好"]; [alert beginSheetModalForWindow:self.window completionHandler:nil];
|
||||
}
|
||||
- (void)closeWindow:(id)sender { [self.window performClose:sender]; }
|
||||
- (void)accessibilityChanged:(NSNotification *)note { [self.window.contentView setNeedsDisplay:YES]; }
|
||||
- (BOOL)applicationShouldTerminateAfterLastWindowClosed:(NSApplication *)app { return YES; }
|
||||
- (void)applicationWillTerminate:(NSNotification *)note {
|
||||
self.terminating = YES; [self.exitTimer invalidate]; self.exitTimer = nil;
|
||||
self.updater.changed=nil; [self.updater cancel];DYBetaStop();
|
||||
[self.updateProgressTimer invalidate];self.updateProgressTimer=nil;
|
||||
[NSNotificationCenter.defaultCenter removeObserver:self];
|
||||
[NSWorkspace.sharedWorkspace.notificationCenter removeObserver:self];
|
||||
}
|
||||
- (void)dealloc { [_exitTimer invalidate]; [_exitTimer release]; [_diagnostics release]; [_updater release]; [_updateProgressTimer invalidate]; [_updateProgressTimer release]; [super dealloc]; }
|
||||
@end
|
||||
@@ -0,0 +1,12 @@
|
||||
#import <Foundation/Foundation.h>
|
||||
@interface DYBetaUpdater : NSObject <NSURLSessionTaskDelegate>
|
||||
@property(copy) void (^changed)(NSDictionary *state);
|
||||
@property(readonly,copy) NSDictionary *state;
|
||||
@property(readonly) double downloadFraction;
|
||||
- (void)check;
|
||||
- (void)download;
|
||||
- (void)install;
|
||||
- (void)cancel;
|
||||
+ (BOOL)validateManifest:(NSDictionary *)manifest error:(NSError **)error;
|
||||
+ (BOOL)validatePackage:(NSURL *)package manifest:(NSDictionary *)manifest error:(NSError **)error;
|
||||
@end
|
||||
@@ -0,0 +1,178 @@
|
||||
#import "DYBetaUpdater.h"
|
||||
#import "../Shared/DYBetaDiagnostics.h"
|
||||
#import <AppKit/AppKit.h>
|
||||
#import <CommonCrypto/CommonDigest.h>
|
||||
#include <atomic>
|
||||
#include <signal.h>
|
||||
#include <errno.h>
|
||||
|
||||
static NSError *DYUpdateError(NSString *message) { return [NSError errorWithDomain:@"com.dayu.color.update" code:1 userInfo:@{NSLocalizedDescriptionKey:message}]; }
|
||||
static NSURL *updateFolder(void) {
|
||||
NSURL *folder=[[NSFileManager.defaultManager URLsForDirectory:NSCachesDirectory inDomains:NSUserDomainMask].firstObject URLByAppendingPathComponent:@"com.dayu.color/Updates" isDirectory:YES];
|
||||
[NSFileManager.defaultManager createDirectoryAtURL:folder withIntermediateDirectories:YES attributes:@{NSFilePosixPermissions:@0700} error:nil];return folder;
|
||||
}
|
||||
static NSString *digest(NSURL *url) {
|
||||
NSFileHandle *file=[NSFileHandle fileHandleForReadingFromURL:url error:nil];if(!file)return nil;
|
||||
CC_SHA256_CTX context;CC_SHA256_Init(&context);for(;;){NSData *data=[file readDataUpToLength:1024*1024 error:nil];if(!data.length)break;CC_SHA256_Update(&context,data.bytes,(CC_LONG)data.length);}[file closeFile];
|
||||
unsigned char bytes[CC_SHA256_DIGEST_LENGTH];CC_SHA256_Final(bytes,&context);NSMutableString *text=[NSMutableString string];for(int i=0;i<CC_SHA256_DIGEST_LENGTH;i++)[text appendFormat:@"%02x",bytes[i]];return text;
|
||||
}
|
||||
static NSString *command(NSString *path,NSArray *arguments,NSError **error) {
|
||||
NSTask *task=[[[NSTask alloc]init]autorelease];task.executableURL=[NSURL fileURLWithPath:path];task.arguments=arguments;
|
||||
NSPipe *output=[NSPipe pipe];task.standardOutput=output;task.standardError=output;
|
||||
if(![task launchAndReturnError:error])return nil;NSDate *deadline=[NSDate dateWithTimeIntervalSinceNow:40];
|
||||
while(task.running&&deadline.timeIntervalSinceNow>0)[NSThread sleepForTimeInterval:.05];
|
||||
if(task.running){[task terminate];if(error)*error=DYUpdateError(@"更新包验证超时,请稍后重试。");return nil;}
|
||||
NSData *data=[output.fileHandleForReading readDataToEndOfFile];NSString *value=[[[NSString alloc]initWithData:data encoding:NSUTF8StringEncoding]autorelease]?:@"";
|
||||
if(task.terminationStatus!=0){if(error)*error=DYUpdateError(@"更新包未通过系统签名或完整性验证。");return nil;}return value;
|
||||
}
|
||||
@interface DYBetaUpdater () {
|
||||
NSURLSession *_session;
|
||||
NSURLSessionTask *_task;
|
||||
NSURL *_package;
|
||||
NSDictionary *_state,*_manifest;
|
||||
std::atomic_uint _generation;
|
||||
}
|
||||
- (void)emit:(NSString *)phase message:(NSString *)message;
|
||||
@end
|
||||
@implementation DYBetaUpdater
|
||||
- (instancetype)init {
|
||||
if((self=[super init])){_generation.store(0);NSURLSessionConfiguration *config=NSURLSessionConfiguration.ephemeralSessionConfiguration;
|
||||
config.timeoutIntervalForRequest=6;config.timeoutIntervalForResource=300;config.HTTPShouldSetCookies=NO;config.URLCache=nil;
|
||||
_session=[[NSURLSession sessionWithConfiguration:config delegate:self delegateQueue:nil]retain];_state=[@{@"phase":@"idle",@"message":@"启动时自动检查公测更新。"}copy];
|
||||
// Reclaim only abandoned validation folders, never another running updater's work.
|
||||
dispatch_async(dispatch_get_global_queue(QOS_CLASS_UTILITY,0),^{
|
||||
for(NSURL *url in [NSFileManager.defaultManager contentsOfDirectoryAtURL:updateFolder() includingPropertiesForKeys:@[NSURLContentModificationDateKey] options:0 error:nil]){
|
||||
NSArray *parts=[url.lastPathComponent componentsSeparatedByString:@"-"];
|
||||
if(parts.count<3||![parts[0]isEqual:@"inspection"]||[parts[1]rangeOfString:@"^[0-9]+$" options:NSRegularExpressionSearch].location==NSNotFound)continue;
|
||||
int pid=[parts[1]intValue];NSDate *date=nil;[url getResourceValue:&date forKey:NSURLContentModificationDateKey error:nil];
|
||||
if(pid>0&&kill(pid,0)!=0&&errno==ESRCH&&date&&date.timeIntervalSinceNow< -600)[NSFileManager.defaultManager removeItemAtURL:url error:nil];
|
||||
}
|
||||
});
|
||||
}return self;
|
||||
}
|
||||
- (void)dealloc {[_session invalidateAndCancel];[_session release];[_task release];[_package release];[_state release];[_manifest release];[_changed release];[super dealloc];}
|
||||
- (NSDictionary *)state { return [[_state copy]autorelease]; }
|
||||
- (double)downloadFraction {int64_t expected=[_manifest[@"size"]longLongValue];return expected>0?MIN(1.,double(_task.countOfBytesReceived)/expected):0;}
|
||||
- (void)emit:(NSString *)phase message:(NSString *)message {
|
||||
if(!NSThread.isMainThread){dispatch_async(dispatch_get_main_queue(),^{[self emit:phase message:message];});return;}
|
||||
[_state release];_state=[@{@"phase":phase,@"message":message?:@"",@"version":_manifest[@"version"]?:@""}copy];if(self.changed)self.changed(_state);
|
||||
}
|
||||
+ (BOOL)validateManifest:(NSDictionary *)manifest error:(NSError **)error {
|
||||
if(![manifest isKindOfClass:NSDictionary.class]){if(error)*error=DYUpdateError(@"公测更新清单格式错误。");return NO;}
|
||||
id build=manifest[@"build"],size=manifest[@"size"];
|
||||
BOOL numbers=[build isKindOfClass:NSNumber.class]&&[size isKindOfClass:NSNumber.class]&&
|
||||
CFGetTypeID((CFTypeRef)build)!=CFBooleanGetTypeID()&&CFGetTypeID((CFTypeRef)size)!=CFBooleanGetTypeID();
|
||||
BOOL valid=numbers&&[manifest[@"bundle_id"]isEqual:@"com.dayu.color"]&&[manifest[@"channel"]isEqual:@"beta"]&&
|
||||
[manifest[@"version"]isKindOfClass:NSString.class]&&[manifest[@"version"]length]>0&&[manifest[@"version"]length]<33&&
|
||||
[build doubleValue]==[build longLongValue]&&[build longLongValue]>0&&[build longLongValue]<1000000000&&
|
||||
[manifest[@"package_type"]isEqual:@"pkg"]&&[manifest[@"install_mode"]isEqual:@"pkg_installer"]&&
|
||||
[size doubleValue]==[size longLongValue]&&[size longLongValue]>0&&[size longLongValue]<=1024LL*1024*1024;
|
||||
NSString *hash=[manifest[@"sha256"]isKindOfClass:NSString.class]?manifest[@"sha256"]:@"";
|
||||
valid=valid&&hash.length==64&&[hash rangeOfString:@"^[a-f0-9]{64}$" options:NSRegularExpressionSearch].location!=NSNotFound;
|
||||
NSURL *url=[manifest[@"download_url"]isKindOfClass:NSString.class]?[NSURL URLWithString:manifest[@"download_url"]]:nil;
|
||||
valid=valid&&DYBetaAllowedURL(url,YES)&&[url.pathExtension.lowercaseString isEqual:@"pkg"];
|
||||
if(!valid&&error)*error=DYUpdateError(@"公测更新清单不完整或不属于大鱼调色。");return valid;
|
||||
}
|
||||
+ (BOOL)validatePackage:(NSURL *)package manifest:(NSDictionary *)manifest error:(NSError **)error {
|
||||
if(![self validateManifest:manifest error:error])return NO;
|
||||
NSDictionary *attributes=[NSFileManager.defaultManager attributesOfItemAtPath:package.path error:error];
|
||||
if(!attributes||[attributes[NSFileSize]longLongValue]!=[manifest[@"size"]longLongValue]||![[digest(package)lowercaseString]isEqual:manifest[@"sha256"]]){if(error)*error=DYUpdateError(@"更新包大小或 SHA-256 不匹配,未打开安装程序。");return NO;}
|
||||
NSString *signature=command(@"/usr/sbin/pkgutil",@[@"--check-signature",package.path],error);
|
||||
if(!signature||![signature containsString:@"Developer ID Installer:"]||![signature containsString:@"(B3W25FX5H5)"]){if(error)*error=DYUpdateError(@"更新包签名团队不匹配。");return NO;}
|
||||
if(!command(@"/usr/sbin/spctl",@[@"--assess",@"--type",@"install",@"--verbose=2",package.path],error))return NO;
|
||||
NSURL *inspection=[updateFolder() URLByAppendingPathComponent:[NSString stringWithFormat:@"inspection-%d-%@",getpid(),NSUUID.UUID.UUIDString]];
|
||||
@try {
|
||||
if(!command(@"/usr/sbin/pkgutil",@[@"--expand-full",package.path,inspection.path],error))return NO;
|
||||
NSMutableArray *apps=[NSMutableArray array];NSUInteger entries=0;
|
||||
NSDirectoryEnumerator *iterator=[NSFileManager.defaultManager enumeratorAtURL:inspection includingPropertiesForKeys:@[NSURLIsSymbolicLinkKey] options:0 errorHandler:nil];
|
||||
for(NSURL *url in iterator){if(++entries>50000){if(error)*error=DYUpdateError(@"更新包文件数量异常。");return NO;}
|
||||
if([url.pathExtension isEqual:@"app"]){[apps addObject:url];[iterator skipDescendants];}
|
||||
}
|
||||
if(apps.count!=1){if(error)*error=DYUpdateError(@"更新包必须包含一个完整的大鱼调色 APP。");return NO;}
|
||||
NSURL *app=apps.firstObject;NSDictionary *info=[NSDictionary dictionaryWithContentsOfURL:[app URLByAppendingPathComponent:@"Contents/Info.plist"]];
|
||||
NSDictionary *plugin=[NSDictionary dictionaryWithContentsOfURL:[app URLByAppendingPathComponent:@"Contents/PlugIns/大鱼调色 XPC Service.pluginkit/Contents/Info.plist"]];
|
||||
if(![info[@"CFBundleIdentifier"]isEqual:@"com.dayu.color"]||![plugin[@"CFBundleIdentifier"]isEqual:@"com.dayu.color.XPC"]||
|
||||
[info[@"CFBundleVersion"]integerValue]!=[manifest[@"build"]integerValue]||[plugin[@"CFBundleVersion"]integerValue]!=[manifest[@"build"]integerValue]||
|
||||
![info[@"CFBundleShortVersionString"]isEqual:manifest[@"version"]]){if(error)*error=DYUpdateError(@"更新包产品或版本与清单不一致。");return NO;}
|
||||
if(!command(@"/usr/bin/codesign",@[@"--verify",@"--deep",@"--strict",app.path],error))return NO;
|
||||
NSString *identity=command(@"/usr/bin/codesign",@[@"-dvvv",app.path],error);
|
||||
if(![identity containsString:@"TeamIdentifier=B3W25FX5H5"]){if(error)*error=DYUpdateError(@"包内 APP 签名团队不匹配。");return NO;}
|
||||
// Product PKGs install the wrapper at its fixed FxPlug location and carry templates.
|
||||
BOOL appTarget=NO,templates=NO;
|
||||
for(NSURL *url in [NSFileManager.defaultManager enumeratorAtURL:inspection includingPropertiesForKeys:nil options:0 errorHandler:nil]){
|
||||
if([url.lastPathComponent isEqual:@"PackageInfo"]){NSString *xml=[NSString stringWithContentsOfURL:url encoding:NSUTF8StringEncoding error:nil];
|
||||
NSXMLDocument *document=[[[NSXMLDocument alloc]initWithXMLString:xml options:0 error:nil]autorelease];
|
||||
NSXMLElement *root=document.rootElement;NSString *identifier=[[root attributeForName:@"identifier"]stringValue];
|
||||
NSString *location=[[root attributeForName:@"install-location"]stringValue]?:@"/";
|
||||
NSString *relative=[location isEqual:@"/"]?@"Payload/Library/Plug-Ins/FxPlug/大鱼调色.app":([location isEqual:@"/Library/Plug-Ins/FxPlug"]?@"Payload/大鱼调色.app":nil);
|
||||
if(relative&&[[[[url.URLByDeletingLastPathComponent URLByAppendingPathComponent:relative]path]stringByStandardizingPath]isEqual:app.path.stringByStandardizingPath])appTarget=YES;
|
||||
if(![identifier hasPrefix:@"com.dayu.color.installer."]){if(error)*error=DYUpdateError(@"更新包含不属于本产品的安装组件。");return NO;}
|
||||
}
|
||||
if([url.lastPathComponent isEqual:@"大鱼调色.moef"])templates=YES;
|
||||
}
|
||||
if(!appTarget||!templates){if(error)*error=DYUpdateError(@"更新包缺少正确的插件安装位置或 FCP 模板。");return NO;}
|
||||
return YES;
|
||||
} @finally {[NSFileManager.defaultManager removeItemAtURL:inspection error:nil];}
|
||||
}
|
||||
- (void)check {
|
||||
NSString *phase=_state[@"phase"];if([@[@"checking",@"downloading",@"validating"]containsObject:phase])return;
|
||||
unsigned generation=++_generation;[self emit:@"checking" message:@"正在检查公测更新…"];
|
||||
NSString *url=[NSString stringWithFormat:@"https://dayu.media/wp-json/dayu-color/v1/update?bundle_id=com.dayu.color&channel=beta¤t_build=%@",([NSBundle.mainBundle objectForInfoDictionaryKey:@"CFBundleVersion"]?:@"0")];
|
||||
NSMutableURLRequest *request=[NSMutableURLRequest requestWithURL:[NSURL URLWithString:url] cachePolicy:NSURLRequestReloadIgnoringLocalCacheData timeoutInterval:6];
|
||||
[_task release];_task=[[_session dataTaskWithRequest:request completionHandler:^(NSData *data,NSURLResponse *response,NSError *error){@autoreleasepool{
|
||||
NSDictionary *value=data.length<=32768?[NSJSONSerialization JSONObjectWithData:data?:[NSData data] options:0 error:nil]:nil;
|
||||
if(![value isKindOfClass:NSDictionary.class])value=nil;
|
||||
BOOL ok=!error&&[(NSHTTPURLResponse*)response statusCode]==200&&[value[@"bundle_id"]isEqual:@"com.dayu.color"]&&[value[@"channel"]isEqual:@"beta"]&&[value[@"update_available"]isKindOfClass:NSNumber.class]&&CFGetTypeID((CFTypeRef)value[@"update_available"])==CFBooleanGetTypeID();
|
||||
if(ok&&[value[@"update_available"]boolValue])ok=[DYBetaUpdater validateManifest:value error:&error];
|
||||
NSDictionary *result=[[value copy]autorelease];
|
||||
dispatch_async(dispatch_get_main_queue(),^{if(generation!=self->_generation.load())return;
|
||||
if(!ok){[self emit:@"failed" message:@"暂时无法检查更新,不影响插件使用。"];
|
||||
DYBetaEvent(@"update_check",@{@"status":@"failed",@"error_code":@(error.code)});return;}
|
||||
[self->_manifest release];self->_manifest=[result copy];
|
||||
BOOL newer=[result[@"update_available"]boolValue]&&[result[@"build"]integerValue]>[[NSBundle.mainBundle objectForInfoDictionaryKey:@"CFBundleVersion"]integerValue];
|
||||
[self emit:newer?@"available":@"latest" message:newer?[NSString stringWithFormat:@"发现公测版 %@(%@)",result[@"version"],result[@"build"]]:@"当前已是最新公测版。"];
|
||||
DYBetaEvent(@"update_check",@{@"status":newer?@"available":@"latest"});
|
||||
});
|
||||
}}]retain];[_task resume];
|
||||
}
|
||||
- (void)download {
|
||||
if(![_state[@"phase"]isEqual:@"available"])return;NSError *error=nil;
|
||||
if(![DYBetaUpdater validateManifest:_manifest error:&error]){[self emit:@"failed" message:error.localizedDescription];return;}
|
||||
if([_manifest[@"build"]integerValue]<=[[NSBundle.mainBundle objectForInfoDictionaryKey:@"CFBundleVersion"]integerValue])return;
|
||||
unsigned generation=++_generation;NSDictionary *manifest=[[_manifest copy]autorelease];[self emit:@"downloading" message:@"正在下载公测更新,可随时取消。"];
|
||||
NSMutableURLRequest *request=[NSMutableURLRequest requestWithURL:[NSURL URLWithString:manifest[@"download_url"]]];request.timeoutInterval=30;
|
||||
[_task release];_task=[[_session downloadTaskWithRequest:request completionHandler:^(NSURL *temporary,NSURLResponse *response,NSError *failure){@autoreleasepool{
|
||||
if(generation!=self->_generation.load())return;
|
||||
NSError *error=failure;NSURL *destination=[updateFolder() URLByAppendingPathComponent:[NSString stringWithFormat:@"dayu-color-update-%@.pkg",manifest[@"build"]]];
|
||||
if(!error&&[(NSHTTPURLResponse*)response statusCode]==200&&DYBetaAllowedURL(response.URL,YES)){
|
||||
[NSFileManager.defaultManager removeItemAtURL:destination error:nil];
|
||||
if([NSFileManager.defaultManager moveItemAtURL:temporary toURL:destination error:&error]){
|
||||
[self emit:@"validating" message:@"正在验证完整性、签名、公证和插件版本…"];
|
||||
BOOL valid=[DYBetaUpdater validatePackage:destination manifest:manifest error:&error];
|
||||
if(!valid&&!error)error=DYUpdateError(@"更新包未通过验证。");
|
||||
}
|
||||
}else if(!error)error=DYUpdateError(@"更新包下载失败。");
|
||||
if(generation!=self->_generation.load()){[NSFileManager.defaultManager removeItemAtURL:destination error:nil];return;}
|
||||
if(error)[NSFileManager.defaultManager removeItemAtURL:destination error:nil];
|
||||
dispatch_async(dispatch_get_main_queue(),^{if(generation!=self->_generation.load())return;
|
||||
if(error){[self emit:@"available" message:error.localizedDescription];DYBetaEvent(@"update_download",@{@"status":@"failed",@"error_code":@(error.code)});}
|
||||
else{[self->_package release];self->_package=[destination retain];[self emit:@"ready" message:@"更新包已通过校验。保存并退出 FCP / Motion 后可安装。"];
|
||||
DYBetaEvent(@"update_validation",@{@"status":@"passed"});}
|
||||
});
|
||||
}}]retain];[_task resume];
|
||||
}
|
||||
- (void)install {
|
||||
if(![@[@"ready",@"host_wait",@"installer"]containsObject:_state[@"phase"]])return;
|
||||
for(NSString *ID in @[@"com.apple.FinalCut",@"com.apple.FinalCutApp",@"com.apple.motionapp",@"com.apple.motionappApp"])
|
||||
if([NSRunningApplication runningApplicationsWithBundleIdentifier:ID].count){[self emit:@"host_wait" message:@"请先保存并正常退出 FCP / Motion,再点击安装更新。不会强制退出宿主。"];
|
||||
DYBetaEvent(@"update_installer",@{@"status":@"waiting_for_host"});return;}
|
||||
if(_package&&[NSWorkspace.sharedWorkspace openURL:_package]){
|
||||
[NSUserDefaults.standardUserDefaults setObject:_manifest[@"build"] forKey:@"betaPendingUpdateBuild"];[self emit:@"installer" message:@"已打开系统安装程序,请按提示授权并完成安装。"];
|
||||
DYBetaEvent(@"update_installer",@{@"status":@"system_installer_opened"});}
|
||||
else [self emit:@"failed" message:@"无法打开系统安装程序,请重试。"];
|
||||
}
|
||||
- (void)cancel {++_generation;[_task cancel];BOOL newer=[_manifest[@"build"]integerValue]>[[NSBundle.mainBundle objectForInfoDictionaryKey:@"CFBundleVersion"]integerValue];[self emit:newer?@"available":@"idle" message:@"已取消,不影响当前插件。"];}
|
||||
- (void)URLSession:(NSURLSession *)session task:(NSURLSessionTask *)task willPerformHTTPRedirection:(NSHTTPURLResponse *)response newRequest:(NSURLRequest *)request completionHandler:(void (^)(NSURLRequest *))completion {
|
||||
BOOL download=[task isKindOfClass:NSURLSessionDownloadTask.class];completion(DYBetaAllowedURL(request.URL,download)?request:nil);
|
||||
}
|
||||
@end
|
||||
@@ -17,9 +17,9 @@
|
||||
<key>CFBundlePackageType</key>
|
||||
<string>APPL</string>
|
||||
<key>CFBundleShortVersionString</key>
|
||||
<string>1.6.0</string>
|
||||
<string>1.7.0</string>
|
||||
<key>CFBundleVersion</key>
|
||||
<string>39</string>
|
||||
<string>45</string>
|
||||
<key>LSMinimumSystemVersion</key>
|
||||
<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
|
||||
<key>NSHumanReadableCopyright</key>
|
||||
|
||||
@@ -1,8 +1,5 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
|
||||
<plist version="1.0">
|
||||
<dict>
|
||||
<key>com.apple.security.app-sandbox</key>
|
||||
<true/>
|
||||
</dict>
|
||||
<dict/>
|
||||
</plist>
|
||||
@@ -1,5 +1,7 @@
|
||||
# 大鱼调色 FxPlug4 交接
|
||||
|
||||
后续主 APP 优化入口:[大鱼调色主APP开发交接.md](/Volumes/备份/大鱼调色/大鱼调色/大鱼调色主APP开发交接.md),包含自动更新、登录验证、生产接口只读盘点与待定产品规则;这些新功能尚未实施。
|
||||
|
||||
2026-11-02,最终正式版 **1.6.0(39)**。本次完成Color Finale本机胶片五组、通道混合器及用户补充的全部八种印片;去掉MOEF作者/网站两行、降低模板格式,并追加一级自动映射默认开启和主标题链接。
|
||||
|
||||
## 正式身份与恢复
|
||||
@@ -41,3 +43,5 @@ FCP新效果、新加一级层及全部还原的自动映射为开启;主标
|
||||
历史35/37/38候选未发布;36的已验PKG在新需求到达后移除,未上传。37公证等待中停止了本地等待,保留ID查询,未重新上传相同产物。38正式验收发现FCP默认行为,39已记录实际边界。既有历史发行包与标签保留。1.5完整交接归档见 `research/handoffs/DayuColorThrough1.5.0-20261102.md`。
|
||||
|
||||
正式PKG `大鱼调色-1.6.0.pkg`,40833847字节,SHA-256 `13821631b5d54f1b9c1934c513a9cc7e92641208e20219839a63e23865f21cca`;PKG公证 `4716e3c7-8199-4dc1-940c-2376dd647e9b` Accepted,签名、票据、Gatekeeper和20项展开验包通过。发行包未再次运行系统安装器。
|
||||
|
||||
最终[Release373](https://dayu.media/git/dayu/dayu-color/releases/tag/v1.6.0-print-looks-20261102) / 附件18已发布并回读确认。标签 `v1.6.0-print-looks-20261102` 对应完整SHA `0cc51149a6f21ebe09465b4fd7130451bedd57bb`;草稿正常浏览器下载与发布后完整下载均校验40,833,847字节及SHA-256一致。发行标签296文件逐字节恢复和full/strict fsck通过,与实际编译SHA的程序源码完全一致。恢复clone、独立构建和下载副本清理完成;已知相关位置仅正式39版APP,历史发行包和私人验收数据保留。记录见 `verification/Release.json`、`ReleaseDraftDownload1.6.0.json`、`PrintLooksReleaseRecovery.json`、`PrintLooksCleanup.json`。
|
||||
+172
@@ -0,0 +1,172 @@
|
||||
# 大鱼调色主 APP 开发交接
|
||||
|
||||
> 2026-11-02接续:主APP UI与自动注册已在1.6.1(44)实现,发布地址置顶、注册成功3秒倒计时、FCP由用户确认,外层沙盒按用户明确要求关闭。登录/授权/加密/更新及后端未实现;本文原接口盘点仍作为后续参考。最新行为见[本轮说明](research/MainApp1.6.1.md),交付状态见verification/Delivery.json与MainApp1.6.1.json。
|
||||
|
||||
交接日期:2026-11-02(Asia/Shanghai)。下一阶段目标:优化现有主 APP,加入自动更新、登录验证及相应的账号与版本管理界面。本次只整理交接和只读盘点,尚未实现这些功能,未修改正式 APP、后台源码、账号绑定或线上更新清单。
|
||||
|
||||
## 1. 接手位置与可恢复基线
|
||||
|
||||
| 项目 | 已核实内容 |
|
||||
| --- | --- |
|
||||
| 项目根目录 | `/Volumes/备份/大鱼调色/大鱼调色` |
|
||||
| 工程与方案 | `大鱼调色.xcodeproj`;`Wrapper Application`,Release |
|
||||
| 源码远程 | `https://dayu.media/git/dayu/dayu-color.git`,`main`;保持现有可见性 |
|
||||
| 本次盘点前的已推送节点 | `46fb091479ef24c86c3706bdf36ca97e2597edd9`,已回读远程确认 |
|
||||
| 正式版本 | **1.6.0(39)**,实际编译源码 `e5affd3f097fc96f87f41be8e1a3f131ed01daeb` |
|
||||
| 发行标签 | `v1.6.0-print-looks-20261102`,提交 `0cc51149a6f21ebe09465b4fd7130451bedd57bb` |
|
||||
| 唯一正式安装 | `/Library/Plug-Ins/FxPlug/大鱼调色.app` |
|
||||
| 外层 APP / 内部服务 ID | `com.dayu.color` / `com.dayu.color.XPC` |
|
||||
| 环境 | Apple Silicon,macOS 14.6 或更新;上一轮 FCP 12.4 实测通过 |
|
||||
| 固定构建缓存 | `/Users/mac/Library/Caches/CodexBuilds/com.dayu.color` |
|
||||
|
||||
“主 APP”指现有 FxPlug 外层包装 APP。它与嵌套的插件一起交付,后续将这个现有窗口扩展成产品入口。继续保持产品名称、Bundle ID 和正式安装位置,避免另建一个 `/Applications/大鱼调色.app` 与插件包装 APP 并存。
|
||||
|
||||
程序源码、标签、安装包与交付记录是不同节点。文档后续提交不会改变上述实际编译 SHA,也不需要仅为本次交接重编译、增加构建号或重新发布安装包。
|
||||
|
||||
## 2. 主 APP 当前实际实现
|
||||
|
||||
外层是 Objective-C / AppKit,手动内存管理;`main.m` 调用 `NSApplicationMain`,`MainMenu.xib` 创建窗口和代理。窗口内容在 `AppDelegate.m` 中以代码构建,目前为 540×280:产品名、安装说明和“打开 Final Cut Pro”按钮。最后一个窗口关闭后退出 APP。
|
||||
|
||||
| 文件入口 | 用途与接手注意点 |
|
||||
| --- | --- |
|
||||
| [AppDelegate.m](</Volumes/备份/大鱼调色/大鱼调色/大鱼调色/Wrapper Application/AppDelegate.m>) | 当前完整主窗口;扩展账号、版本、更新和插件状态的直接入口 |
|
||||
| [main.m](</Volumes/备份/大鱼调色/大鱼调色/大鱼调色/Wrapper Application/main.m>) | APP 启动入口 |
|
||||
| [MainMenu.xib](</Volumes/备份/大鱼调色/大鱼调色/大鱼调色/Wrapper Application/Base.lproj/MainMenu.xib>) | 主菜单、窗口及 AppDelegate 连线 |
|
||||
| [APP Info.plist](</Volumes/备份/大鱼调色/大鱼调色/大鱼调色/Wrapper Application/Info.plist>) | 版本 1.6.0 / 39,主 Nib 与身份 |
|
||||
| [APP entitlements](</Volumes/备份/大鱼调色/大鱼调色/大鱼调色/Wrapper Application/SandboxEntitlements.entitlements>) | 当前仅有 `com.apple.security.app-sandbox = true`;正式安装 APP 实际签名也核对为此配置 |
|
||||
| [Xcode 工程](/Volumes/备份/大鱼调色/大鱼调色/大鱼调色.xcodeproj/project.pbxproj) | 外层 APP 和 `XPC Service` 两个目标;同时更新它们的身份与版本约定 |
|
||||
| [插件入口](/Volumes/备份/大鱼调色/大鱼调色/大鱼调色/Plugin/DYPlugIn.mm) | 宿主状态冻结与渲染;当前没有接入账号授权 |
|
||||
| [插件检查器](/Volumes/备份/大鱼调色/大鱼调色/大鱼调色/Plugin/DYInspector.mm) | 现有调色面板和网站链接;主 APP 的控制中心不应搬走这些调色控件 |
|
||||
|
||||
当前未发现产品已有的网络账号服务、Keychain 会话管理、主 APP / XPC 共享授权收据、更新客户端、Sparkle/appcast 配置或自有安装更新助手。不能把已有“更多插件访问 https://dayu.media”链接当作登录接入。
|
||||
|
||||
`openHost:` 当前只查找 `com.apple.FinalCut`。后续优化启动与宿主状态识别时,应覆盖打包指南中的四个 FCP/Motion 标识,并处理未安装、运行中和打开失败;不要用模糊应用名启动不明副本。
|
||||
|
||||
## 3. 后端现状:已只读查看生产源
|
||||
|
||||
2026-11-02 已核对目标共享由 `smbfs` 挂载,生产目录可读:
|
||||
|
||||
```text
|
||||
NAS_SERVER = 192.168.31.21
|
||||
SMB_SHARE = dayumedia (存储空间1)
|
||||
NAS_ROOT = /Volumes/dayumedia (存储空间1)/wwwroot/dayu_media
|
||||
LOCAL_CONTEXT = /Users/mac/Downloads/dayumedia
|
||||
```
|
||||
|
||||
`LOCAL_CONTEXT` 是有范围的专项工作资料,不是完整生产镜像。NAS 的 `AGENTS.md` 保留旧电脑 `/Users/dayu` 路径,执行时按本机全局规则适配,不能照搬旧路径。
|
||||
|
||||
本轮只读源码与公开接口形状,没有调用登录/授权接口、创建会话、读取数据库、签名私钥、设备记录或客户凭据。下面是生产源码盘点,**不等同于“大鱼调色”已完成接口联调或已配置专属产品**。
|
||||
|
||||
### 通用登录、权限与更新
|
||||
|
||||
主要生产文件:
|
||||
|
||||
[macos-app-auth.php](</Volumes/dayumedia (存储空间1)/wwwroot/dayu_media/wp-content/plugins/macos-app-auth/macos-app-auth.php>)
|
||||
|
||||
本轮源码 SHA-256:`8a4cb46bf33a88501da5cf48fa4059244dcffb5cfac55c7ecdf66152204cf493`。约 12,518 行;下一次接手重新读取最新生产源,行号只作定位。
|
||||
|
||||
| 现有入口 | 本轮源码确认的行为 |
|
||||
| --- | --- |
|
||||
| `POST https://dayu.media/wp-json/dayu-app/v1/login/session` | `app_create_login_session`,约 6458 行;接收 `device_uuid`、`app_name`、`client_version`、`client_build`、`client_bundle` 等,返回临时会话、登录 URL、二维码和到期时间;使用现有微信登录 |
|
||||
| `GET https://dayu.media/wp-json/dayu-app/v1/login/session/{session_key}` | `app_get_login_session`,约 6546 行;通用接口返回状态、说明和到期时间,不能假定这里直接返回访问令牌 |
|
||||
| `https://dayu.media/wp-admin/admin-ajax.php`,`action=app_device_login` | `app_device_login`,约 510 行;按已绑定的标准 Mac 硬件 UUID 登录,返回账号、token、refresh_token 等;会记录登录及绑定状态,不是无副作用探针 |
|
||||
| 同一 AJAX 入口,`action=app_refresh_token` | 刷新令牌,约 1490 行;具体请求与失败码接手时重新核对 |
|
||||
| `POST https://dayu.media/wp-json/dayu-app/v1/access` | `rest_check_access`,约 1440 行;验证 token,结合文章购买/会员查询权限,满足条件可附带签名设备授权 |
|
||||
| 同一 AJAX 入口,`action=app_check_update` | 约 1181 行;校验登录 token,按应用和 stable 等通道读取更新清单;接受当前版本/构建号,返回是否更新、目标版本/构建、包类型、安装方式、大小和 SHA-256 等 |
|
||||
| 同一 AJAX 入口,`action=app_download_update` | 约 1272 行;下载对应应用云空间的更新包;认证、重定向及请求参数仍需在下一阶段逐项联调 |
|
||||
|
||||
源码中已有 RS256 的 `DAYU-OFFLINE-DEVICE` 凭证:登录得到的 `scope=device_binding` 只表示设备身份;资源授权查询可生成 `scope=app_access`,并包含文章、权限原因、是否永久及到期信息。方法入口约 2200、2379、2413 行。**不能用“已登录”“设备已绑定”或响应中自带的公钥,直接证明拥有本产品使用权。**
|
||||
|
||||
通用源码中未发现 `com.dayu.color` / `DayuColor` / `dayu-color` 的字面定义;本轮没有检查数据库中的产品配置或创建专属更新空间,因此不能断言线上已有或没有相应配置。接续时核实稳定的产品标识、文章 ID、授权策略与更新通道,不使用缺省 `default-app`。
|
||||
|
||||
### 可参考但不能当作本产品接口的部分
|
||||
|
||||
- [dayu-downloader-auth.php](</Volumes/dayumedia (存储空间1)/wwwroot/dayu_media/wp-content/mu-plugins/dayu-downloader-auth.php>):身份、试用和 `/dayu-downloader/v1/update`。当前硬绑定 `DayuDownie`、`DayuDownie.DayuDownie`、文章 14922 及其更新目录,不能给大鱼调色直接调用。
|
||||
- [dayu-downloader-licenses.php](</Volumes/dayumedia (存储空间1)/wwwroot/dayu_media/wp-content/mu-plugins/dayu-downloader-licenses.php>):另一产品的注册码与授权桥接,不继承其试用期、设备限制和商业规则。
|
||||
- [dayu-template-app-session.php](</Volumes/dayumedia (存储空间1)/wwwroot/dayu_media/wp-content/mu-plugins/dayu-template-app-session.php>):模板工作区已有 APP 身份换取网站会话的独立实现;不是本产品已完成登录的证据。
|
||||
- 本机 `/Users/mac/Downloads/dayumedia/permission-fix` 有购买授权修复记录与测试,可参考历史陷阱;使用前先与生产源比较。大鱼 Git 的登录令牌只用于代码仓库,不能打包成普通产品用户的账号凭据。
|
||||
|
||||
## 4. 下一阶段的实现拆分
|
||||
|
||||
### 主 APP 界面
|
||||
|
||||
在现有外层 APP 内组织产品信息、账号状态、更新状态、打开宿主、网站/帮助入口。账号区区分未登录、登录中、已登录但未授权、已授权、到期和离线;更新区区分检查、下载、校验、等待宿主退出、安装及失败。窗口保持可调整、中文信息清楚,技术日志放在单独诊断入口。
|
||||
|
||||
可以沿用 AppKit 或评估逐步引入 SwiftUI;本轮未选定 UI 框架、第三方更新库或新最低系统版本。重构时保留 Nib 启动与既有 Objective-C 生命周期,避免只替换窗口而漏掉应用代理或目标成员关系。
|
||||
|
||||
### 登录、授权与插件进程
|
||||
|
||||
1. 先核实网站产品策略:固定产品名/slug、文章 ID、会员或单独购买条件;由可信配置约束产品与权限对应关系,不接受任意客户端文章 ID 就当作“大鱼调色授权”。
|
||||
2. 对照现有通用流程实现会话创建、默认浏览器/二维码登录、状态轮询、设备登录、token 刷新和退出。支持过期、取消、网络失败及重复点击;日志不记录临时会话 URL、令牌、完整设备 UUID。
|
||||
3. 在线 token / refresh token 使用 Keychain。当前 APP 仅有沙盒权限,需按实际联网、Keychain 与跨进程方案配置权限;不要假定现有签名已开放网络访问。
|
||||
4. APP 和插件是不同进程,外层关闭后 FCP 仍可启动服务。若用户要限制插件使用,需要设计 XPC 也能验证的产品授权收据与状态更新机制;只在主 APP 上挡一个登录页面不足以限制插件。
|
||||
5. 核实服务器签名凭证的产品、scope、设备、文章、期限和可信公钥合同。客户端只携带验证公钥,私钥留在服务器。响应随附的任意公钥不能自行成为信任根;轮换须有明确的可信路径。
|
||||
6. 凭据共享方式尚未决定。当前没有 App Group / Keychain Access Group 配置,需要核对外层、服务的实际权限与部署要求,再选共享位置;禁止把长期令牌塞进 MOEF、用户预设或时间线载荷。
|
||||
7. 网络检查和账号刷新放在渲染之外。帧渲染/跟踪任务只读取已经验证的状态快照,不逐帧联网或等待主 APP 窗口。
|
||||
|
||||
### 自动更新
|
||||
|
||||
本产品外层 APP 在 `/Library/Plug-Ins/FxPlug`,PKG 还安装用户模板与预览图。先复用完整的正式 PKG 路径设计更新流程,不能只下载 APP 替换而漏掉模板、内部服务登记或旧进程。
|
||||
|
||||
实现顺序:检查专属通道 → 比较版本与构建 → 后台下载 → 校验大小/SHA-256 → 核验包签名、团队和预期产品 → 等待宿主与用户任务安全退出 → 通过系统授权安装 → 核对固定路径、版本与 PluginKit → 正常重开并报告结果。客户端自己退出后谁负责完成安装、接收取消/失败结果及重新启动,也需要明确实现。
|
||||
|
||||
更新过程中不能强杀 FCP/Motion;沙盒 APP 不应尝试直接静默覆盖 `/Library`。系统安装授权、用户取消、宿主未保存、磁盘不足、断线续传、损坏包、安装失败和重启恢复应有明确状态。先核实当前 macOS 与安装机制的官方文档再实现特权/辅助进程,不因要“自动更新”而取消签名、公证或系统授权。
|
||||
|
||||
现有 [Release373](https://dayu.media/git/dayu/dayu-color/releases/tag/v1.6.0-print-looks-20261102) 是发行包归档,不是已接入的 APP 更新源。后台专属更新清单尚未部署。新增 feed 时保持 APP、模板、最终 PKG、网站更新清单与 Git Release 关联同一发布记录;更新清单不能指向另一候选构建。
|
||||
|
||||
## 5. 尚待确定的产品规则
|
||||
|
||||
这些是后续实际开发前需要确定的业务条件,本交接不替用户决定,也不因此阻止当前文档交付:
|
||||
|
||||
- 登录只服务账号与更新,还是也决定插件可否渲染;未登录、到期后新实例和已保存工程分别如何表现。
|
||||
- 大鱼调色对应的商品文章 ID、产品 slug、会员/单购关系;是否提供试用、试用期限及设备数。
|
||||
- 离线使用期限、联网复核周期、会员到期、设备解绑、退出账号的生效方式;不得照搬其它产品的永久/24 小时试用策略。
|
||||
- 自动更新的检查/下载默认设置、稳定或测试通道、是否允许降级;维护主 APP 与插件完整包的一致性。
|
||||
|
||||
“到期后把老工程变黑/加水印”或“永远离线放行”都不是用户已经确认的要求,不应在实现时自行加入。
|
||||
|
||||
## 6. 必须保留的现有产品行为
|
||||
|
||||
完整调色、CST、蜘蛛盘、LUT 浏览、胶片六页(含八种印片)、通道混合器、独立叠层、蒙版与轨迹都继续使用当前实现。不得为账号/更新 UI 重排旧参数 ID、改变 Uniform 布局或清空用户设置。
|
||||
|
||||
当前完整 Uniform 为 1312 字节;八印片追加前 1296 字节前缀保留。完整预设 v6 读取 v1–v5,工具状态、LUT 路径、蜘蛛盘与蒙版轨迹另有归档合同。
|
||||
|
||||
MOEF 目前为 5.11 / Motion 5.4.5,作者和网站两行已移除,主标题内保留用户要求的可点击网站链接。不要恢复旧版权 Rig。全局技能检查器对 5.11 的版本 guard 不支持,项目级原生样本检查及当前宿主通过;不能把 guard 结果伪造成技能检查通过,也不能为此随意升高模板版本。
|
||||
|
||||
自动映射的新 FCP 效果、全部还原及新独立一级层默认开启。FCP 沿用模板默认的旧主效果也会跟随开启;手动关闭可保存并冷重开保持。后续不得再把“修改默认值”当作一定不会改变旧工程的无风险操作。详情见现有 [FxPlug 交接](/Volumes/备份/大鱼调色/大鱼调色/大鱼调色FxPlug4交接.md)。
|
||||
|
||||
## 7. 构建、发布与验收入口
|
||||
|
||||
| 入口 | 当前作用 |
|
||||
| --- | --- |
|
||||
| [tools/deliver.py](/Volumes/备份/大鱼调色/大鱼调色/tools/deliver.py) | Release 构建、逐层签名、公证、票据、唯一安装、正式路径自检和等待宿主验收;验收成功后输入 `complete` |
|
||||
| [Packaging/build_pkg.py](/Volumes/备份/大鱼调色/大鱼调色/Packaging/build_pkg.py) | 从已验证正式安装生成完整 FxPlug PKG,调用 PKG 工坊签名/公证及展开验包 |
|
||||
| [Packaging/publish_release.py](/Volumes/备份/大鱼调色/大鱼调色/Packaging/publish_release.py) | 对已推送标签上传最终包,草稿及正式完整下载校验 |
|
||||
| [tools/build_template.py](/Volumes/备份/大鱼调色/大鱼调色/tools/build_template.py) | 仅在模型确有变更时重新导出参数/模板;变更后同步静态检查和摘要 |
|
||||
| [tools/checkpoint.py](/Volumes/备份/大鱼调色/大鱼调色/tools/checkpoint.py) | 对已审查的明确文件提交、推送和回读 SHA,使用仓库锁 |
|
||||
|
||||
正式身份:`Developer ID Application: zhong luo (B3W25FX5H5)` 与对应 Installer 身份,公证 profile `codex-dayu-notary-B3W25FX5H5`。每次发布重新验证有效性,不复制私钥/账户专用密码。正式 APP 公证 ID `5d74c04c-8a30-47e9-822d-4f616dfdee56`;PKG 公证 ID `4716e3c7-8199-4dc1-940c-2376dd647e9b`,均 Accepted。
|
||||
|
||||
当前正式 PKG:`/Volumes/备份/大鱼调色/发行包/大鱼调色-1.6.0.pkg`,40,833,847 字节,SHA-256 `13821631b5d54f1b9c1934c513a9cc7e92641208e20219839a63e23865f21cca`。Release373 / 附件18已完成真实完整下载核对,标签296文件独立恢复通过。当前无 LFS/子模块。
|
||||
|
||||
产品交付锁 `/Users/mac/.codex/app-delivery-locks/com.dayu.color.lock` 覆盖最终构建到清理。仓库锁按全局规范使用远程 URL 的 SHA-256。不要在已持有同一把锁时嵌套调用会自行取锁的工具。
|
||||
|
||||
后续验收至少覆盖:
|
||||
|
||||
- 主 APP:未安装/运行中的宿主、账号所有状态、二维码到期取消、重开恢复、退出与设备解绑,以及窗口缩放与基础无障碍操作。
|
||||
- 授权:登录但未购买、会员到期、单购、离线与伪造/错产品/错设备凭证;APP 关闭后从 FCP 直接启动插件仍得到正确结果。
|
||||
- 更新:同版本不同构建、无更新、损坏或错误团队/产品包、下载中断、用户取消安装、宿主未保存、安装失败及完成后正常重开;唯一正式 APP 和模板版本一致。
|
||||
- 调色回归:既有395项原生检查按变更运行、关键旧预设与轨迹保存、FCP 实际加载和导出;复用136项印片对照结果的前提是相关数学/Metal确实未改变。
|
||||
- 交付:正式路径的已签名、公证、粘附版本;PKG 验包、Release完整下载;按本轮范围清理生成 APP,保留媒体、用户 LUT/预设和历史发行包。
|
||||
|
||||
原有验收证据集中在 [verification](/Volumes/备份/大鱼调色/大鱼调色/verification):`Delivery.json`、`InstalledSelfTest.json`、`HostPrintLooks1.6.0.json`、`HostPrimaryDefaults1.6.0.json`、`Package.json`、`Release.json`、`PrintLooksReleaseRecovery.json`。
|
||||
|
||||
## 8. 若需修改线上接口
|
||||
|
||||
下一阶段若确有后端改动,先在 `/Users/mac/Downloads/dayumedia` 下确定本专项的最小本地工程,记录 `LOCAL_PROJECT`、`NAS_ROOT` 和文件相对路径映射;比较并保护本地未部署改动,再从生产同步目标文件、保存基线、本地修改和测试。部署前在原文件同目录创建分钟时间戳旁路备份、逐字节核对后才覆盖,最后核对生产文件及实际接口。
|
||||
|
||||
本轮没有创建这个后端专项工作副本,没有部署文件,也没有把 NAS 源码或密钥复制进大鱼调色仓库。不要在 SMB 上直接改源码、跑依赖或构建,不上传整份 dayumedia 目录;不要把产品 Git Release 上传误认为网站更新源已经发布。
|
||||
|
||||
## 9. 可直接用于下一段聊天的接续说明
|
||||
|
||||
> 阅读 `/Volumes/备份/大鱼调色/大鱼调色/大鱼调色主APP开发交接.md` 和现有 FxPlug 交接,从当前正式 1.6.0(39)接续优化现有主 APP,加入自动更新、登录验证和账号/版本界面。先核实生产通用接口与本产品的文章、产品标识、授权范围及离线策略,再实现;保留已有调色、蒙版、跟踪、叠层和低版本 MOEF。保持唯一安装位置和 Bundle ID,按本机规则完成正式交付、宿主验收、PKG Release 与远程备份。主 APP 窗口与插件授权是不同层面,不把登录成功等同于产品使用权,不在渲染回调联网。
|
||||
在新工单中引用
屏蔽一个用户