From 07272f5610cf9b15b6aa4619003ab2230cd76e47 Mon Sep 17 00:00:00 2001
From: wangjia <809946525@qq.com>
Date: Fri, 19 Jun 2026 13:50:51 +0800
Subject: [PATCH] =?UTF-8?q?fix(client/macos):=20P1=20=E9=AA=A8=E6=9E=B6?=
 =?UTF-8?q?=E4=BF=AE=E6=AD=A3=20=E2=80=94=20bundle=20id=20=E7=BB=9F?=
 =?UTF-8?q?=E4=B8=80=20PacketTunnel=20+=20Info.plist=20=E7=B2=BE=E7=AE=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- VpnChannel/Provider: 扩展 bundle id 统一为 com.pangolin.pangolin.PacketTunnel
  (对齐 Xcode 新建 target 的实际 id)
- PacketTunnel/Info.plist: 去掉重复 CFBundlePackageType + 多余 NEMachServiceName,
  只保留 NEProviderClasses(其余标准键由 GENERATE_INFOPLIST_FILE 合并)
- .gitignore: 忽略 Frameworks/Libbox.xcframework(204MB,build-libbox.sh 产出)

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
---
 client/macos/.gitignore                       |  3 +++
 client/macos/PacketTunnel/Info.plist          | 26 ++-----------------
 .../PacketTunnel/PacketTunnelProvider.swift   |  2 +-
 client/macos/Runner/VpnChannel.swift          |  2 +-
 4 files changed, 7 insertions(+), 26 deletions(-)

diff --git a/client/macos/.gitignore b/client/macos/.gitignore
index 746adbb..fb3122c 100644
--- a/client/macos/.gitignore
+++ b/client/macos/.gitignore
@@ -5,3 +5,6 @@
 # Xcode-related
 **/dgph
 **/xcuserdata/
+
+# libbox 嵌入式核心(204MB,scripts/build-libbox.sh 产出,不入 git)
+**/Frameworks/Libbox.xcframework/
diff --git a/client/macos/PacketTunnel/Info.plist b/client/macos/PacketTunnel/Info.plist
index 7b85c14..93bfb1c 100644
--- a/client/macos/PacketTunnel/Info.plist
+++ b/client/macos/PacketTunnel/Info.plist
@@ -2,37 +2,15 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>$(DEVELOPMENT_LANGUAGE)</string>
-	<key>CFBundleDisplayName</key>
-	<string>Pangolin Tunnel</string>
-	<key>CFBundleExecutable</key>
-	<string>$(EXECUTABLE_NAME)</string>
-	<key>CFBundleIdentifier</key>
-	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>$(PRODUCT_NAME)</string>
-	<key>CFBundlePackageType</key>
-	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
-	<key>CFBundleShortVersionString</key>
-	<string>$(MARKETING_VERSION)</string>
-	<key>CFBundleVersion</key>
-	<string>$(CURRENT_PROJECT_VERSION)</string>
-	<!-- System Extension 主体声明:NEPacketTunnelProvider。
-	     NetworkExtension 框架据此把扩展类与 packet-tunnel 类型绑定。 -->
+	<!-- 自定义键:声明 NEPacketTunnelProvider。其余标准 CFBundle* 键由
+	     GENERATE_INFOPLIST_FILE=YES 自动生成并合并,此处不重复写以免冲突。 -->
 	<key>NetworkExtension</key>
 	<dict>
-		<key>NEMachServiceName</key>
-		<string>$(TeamIdentifierPrefix)group.com.pangolin.pangolin</string>
 		<key>NEProviderClasses</key>
 		<dict>
 			<key>com.apple.networkextension.packet-tunnel</key>
 			<string>$(PRODUCT_MODULE_NAME).PacketTunnelProvider</string>
 		</dict>
 	</dict>
-	<key>CFBundlePackageType</key>
-	<string>XPC!</string>
 </dict>
 </plist>
diff --git a/client/macos/PacketTunnel/PacketTunnelProvider.swift b/client/macos/PacketTunnel/PacketTunnelProvider.swift
index b92fead..d7ce2a3 100644
--- a/client/macos/PacketTunnel/PacketTunnelProvider.swift
+++ b/client/macos/PacketTunnel/PacketTunnelProvider.swift
@@ -20,7 +20,7 @@ import NetworkExtension
 import os
 // import Libbox   // ← gomobile bind 产物;加入 xcframework 后解开
 
-private let log = Logger(subsystem: "com.pangolin.pangolin.tunnel", category: "provider")
+private let log = Logger(subsystem: "com.pangolin.pangolin.PacketTunnel", category: "provider")
 
 class PacketTunnelProvider: NEPacketTunnelProvider {
     // libbox 服务句柄(类型来自 Libbox 模块,加入 xcframework 后改为 LibboxBoxService)。
diff --git a/client/macos/Runner/VpnChannel.swift b/client/macos/Runner/VpnChannel.swift
index 15df2f7..e36ae2f 100644
--- a/client/macos/Runner/VpnChannel.swift
+++ b/client/macos/Runner/VpnChannel.swift
@@ -18,7 +18,7 @@ import os
 private let log = Logger(subsystem: "com.pangolin.pangolin", category: "vpn")
 
 final class VpnChannel: NSObject {
-    private static let tunnelBundleId = "com.pangolin.pangolin.tunnel"
+    private static let tunnelBundleId = "com.pangolin.pangolin.PacketTunnel"
 
     private var statusSink: FlutterEventSink?
     private var statsSink: FlutterEventSink?