wangjia/pangolin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 26 Wiki Activity

merge: iOS 端 PoC M3 + entitlement 申请 [tsk_F5r4Kt9m_wQU]

Browse Source 
解决合并冲突（原任务 tsk_nsobbj_rJdy0 分支 maestro/tsk_nsobbj_rJdy0）：
两分支修改文件集合无重叠，手动 apply iOS PoC commit (e129f09)。

变更内容：
- client/ios/PacketTunnel/PacketTunnelProvider.swift：完整 M3 实现
  （startTunnel/stopTunnel/handleAppMessage/LibboxPlatformInterface）
- client/ios/PacketTunnel/MemoryMonitor.swift：新增 NE 进程内存打点
- client/ios/PacketTunnel/PacketTunnel.entitlements：NE + App Group 权限
- client/ios/Runner/Runner.entitlements：主 App NE + App Group 权限
- client/ios/Runner/VpnManager.swift：红线词修复 + App Group 缓存 + NEVPNStatus 订阅
- client/ios/Runner/Info.plist：NSVPNUsageDescription 红线词修复
- client/ios/PacketTunnel/Info.plist：CFBundleDisplayName 红线词修复
- client/ios/Runner.xcodeproj/project.pbxproj：
  CODE_SIGN_ENTITLEMENTS 添加到全部 build config；MemoryMonitor 加入 Sources
- app/kernel/build-ios.sh：M3 内存裁剪决策记录
- doc/ne-entitlement-申请指引.md：新增 NE entitlement 申请完整指引

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
wangjia
2026-06-13 20:14:32 +08:00
parent 628440b3f9
commit 7a1715bd09
10 changed files with 889 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/ios/Runner.xcodeproj/project.pbxproj
+18
View File
@@ -21,6 +21,8 @@
CAFE000000000003000000AB /* Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = CAFE000000000003000000AA /* Info.plist */; };
/* PacketTunnel.appex embedded in Runner */
CAFE000000000004000000AB /* PacketTunnel.appex in Embed App Extensions */ = {isa = PBXBuildFile; fileRef = CAFE000000000004000000AA /* PacketTunnel.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
/* MemoryMonitor.swift in PacketTunnel Sources */
CAFE000000000006000000AC /* MemoryMonitor.swift in Sources */ = {isa = PBXBuildFile; fileRef = CAFE000000000006000000AB /* MemoryMonitor.swift */; };
/* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */
@@ -78,6 +80,12 @@
CAFE000000000003000000AA /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
/* PacketTunnel.appex product */
CAFE000000000004000000AA /* PacketTunnel.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = PacketTunnel.appex; sourceTree = BUILT_PRODUCTS_DIR; };
/* Runner.entitlements */
CAFE000000000005000000AA /* Runner.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.entitlements; path = Runner.entitlements; sourceTree = "<group>"; };
/* PacketTunnel.entitlements */
CAFE000000000006000000AA /* PacketTunnel.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.entitlements; path = PacketTunnel.entitlements; sourceTree = "<group>"; };
/* MemoryMonitor.swift (PacketTunnel) */
CAFE000000000006000000AB /* MemoryMonitor.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MemoryMonitor.swift; sourceTree = "<group>"; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
@@ -137,6 +145,7 @@
97C146F11CF9000F007C117D /* Info.plist */,
74858FAE1ED2DC5600515810 /* AppDelegate.swift */,
CAFE000000000001000000AA /* VpnManager.swift */,
CAFE000000000005000000AA /* Runner.entitlements */,
1498D2311E8E86230040F4C2 /* GeneratedPluginRegistrant.m */,
1771E259F7494EBC8BB1F97A /* GeneratedPluginRegistrant.h */,
);
@@ -147,6 +156,8 @@
isa = PBXGroup;
children = (
CAFE000000000002000000AA /* PacketTunnelProvider.swift */,
CAFE000000000006000000AB /* MemoryMonitor.swift */,
CAFE000000000006000000AA /* PacketTunnel.entitlements */,
CAFE000000000003000000AA /* Info.plist */,
);
path = PacketTunnel;
@@ -303,6 +314,7 @@
buildActionMask = 2147483647;
files = (
CAFE000000000002000000AB /* PacketTunnelProvider.swift in Sources */,
CAFE000000000006000000AC /* MemoryMonitor.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -373,6 +385,7 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
ENABLE_BITCODE = NO;
INFOPLIST_FILE = Runner/Info.plist;
@@ -502,6 +515,7 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
ENABLE_BITCODE = NO;
INFOPLIST_FILE = Runner/Info.plist;
@@ -524,6 +538,7 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
ENABLE_BITCODE = NO;
INFOPLIST_FILE = Runner/Info.plist;
@@ -544,6 +559,7 @@
isa = XCBuildConfiguration;
buildSettings = {
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = PacketTunnel/PacketTunnel.entitlements;
CODE_SIGN_IDENTITY = "iPhone Developer";
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
INFOPLIST_FILE = PacketTunnel/Info.plist;
@@ -567,6 +583,7 @@
isa = XCBuildConfiguration;
buildSettings = {
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = PacketTunnel/PacketTunnel.entitlements;
CODE_SIGN_IDENTITY = "iPhone Developer";
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
INFOPLIST_FILE = PacketTunnel/Info.plist;
@@ -590,6 +607,7 @@
isa = XCBuildConfiguration;
buildSettings = {
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = PacketTunnel/PacketTunnel.entitlements;
CODE_SIGN_IDENTITY = "iPhone Developer";
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
INFOPLIST_FILE = PacketTunnel/Info.plist;