Shortcuts and control center #3

YinMo19 · 2026-01-13T09:51:11Z

No description provided.

Copilot

Copilot encountered an error and was unable to review this pull request. You can try again by re-requesting a review.

Copilot

Copilot encountered an error and was unable to review this pull request. You can try again by re-requesting a review.

Copilot

Pull request overview

Copilot reviewed 12 out of 13 changed files in this pull request and generated 10 comments.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Copilot · 2026-01-13T10:39:12Z

EasyTier/Utils/NEManager.swift

+        // Save config to App Group for Widget use
+        let defaults = UserDefaults(suiteName: "group.site.yinmo.easytier")
+        var configDict: [String: String] = [:]
+        for (key, value) in options {
+            if let strValue = value as? String {
+                configDict[key] = strValue
+            }
+        }
+        if let configData = try? JSONEncoder().encode(configDict) {
+            defaults?.set(configData, forKey: "LastVPNConfig")
+            defaults?.synchronize()
+        }
+


The VPN configuration persistence only saves String values from the options dictionary. However, the options dictionary also contains NSNumber values (like mtu) and NSArray values (like routes). These non-string values will be silently ignored, meaning the widget won't be able to restart the VPN with the exact same configuration. Consider either converting all option types to strings before encoding, or using a different serialization approach that preserves the type information.

Suggested change

// Save config to App Group for Widget use

let defaults = UserDefaults(suiteName: "group.site.yinmo.easytier")

var configDict: [String: String] = [:]

for (key, value) in options {

if let strValue = value as? String {

configDict[key] = strValue

}

}

if let configData = try? JSONEncoder().encode(configDict) {

defaults?.set(configData, forKey: "LastVPNConfig")

defaults?.synchronize()

}

// Save full config (including non-string values) to App Group for widget use

let defaults = UserDefaults(suiteName: "group.site.yinmo.easytier")

defaults?.set(options, forKey: "LastVPNConfig")

defaults?.synchronize()

Copilot · 2026-01-13T10:39:12Z

ControlWidgets/ControlWidgetsControl.swift

+                // Try to start with empty options as fallback
+                try manager.connection.startVPNTunnel()
+                return .result()


When the config data is not available in the App Group, the code falls back to starting the VPN tunnel with empty options. This will likely fail to establish a connection because the VPN tunnel requires configuration data (network name, secret, etc.). Consider throwing an error or returning early with a more descriptive error message instead of attempting to connect with empty options.

Suggested change

// Try to start with empty options as fallback

try manager.connection.startVPNTunnel()

return .result()

// Config is required to start the VPN tunnel; fail explicitly instead of using empty options.

throw NSError(

domain: "site.yinmo.easytier.ToggleVPNIntent",

code: 1,

userInfo: [

NSLocalizedDescriptionKey: "VPN configuration is not available. Please open EasyTier to configure the VPN before connecting from the widget."

]

)

Copilot · 2026-01-13T10:39:13Z

EasyTier/Utils/Shortcuts.swift

+    @MainActor
+    func perform() async throws -> some IntentResult {
+        let profile = try getTargetProfile(network)
+        let manager = NEManager()
+        try await manager.load()
+        try await manager.connect(profile: profile)


Each shortcut intent creates a new instance of NEManager. While this works, it means the intents don't share state with the main app's NEManager instance. Consider whether this could lead to race conditions if a user triggers a shortcut while the app is also managing the VPN connection. The load() method fetches the current VPN manager state, so it should be mostly safe, but simultaneous operations could potentially conflict.

Copilot · 2026-01-13T10:39:13Z

ControlWidgets/ControlWidgetsControl.swift

+                Label(isOn ? "Connected" : "Disconnected", systemImage: "network")
+                    .controlWidgetActionHint(isOn ? "Disconnect" : "Connect")


The display strings "Connected", "Disconnected", "Connect", and "Disconnect" are hard-coded and not localized. These should use LocalizedStringResource to support the Chinese localization that exists elsewhere in the app.

Copilot · 2026-01-13T10:39:13Z

ControlWidgets/ControlWidgetsControl.swift

+struct ToggleVPNIntent: SetValueIntent {
+    static let title: LocalizedStringResource = "Toggle VPN"
+
+    @Parameter(title: "Connected")


The parameter title "Connected" is hard-coded and not localized. This should use LocalizedStringResource to support the Chinese localization that exists elsewhere in the app.

Suggested change

@Parameter(title: "Connected")

@Parameter(title: LocalizedStringResource("Connected"))

Copilot · 2026-01-13T10:39:13Z

EasyTier.xcodeproj/project.pbxproj

 			attributes = {
 				BuildIndependentTargetsInParallel = 1;
-				LastSwiftUpdateCheck = 2620;
+				LastSwiftUpdateCheck = 2600;


LastSwiftUpdateCheck was changed from 2620 to 2600. This appears to be a regression - it's going from Xcode 16.2.0 to Xcode 16.0.0. Unless there's a specific reason for this downgrade, it should remain at 2620 or be updated to match the current Xcode version being used.

Suggested change

LastSwiftUpdateCheck = 2600;

LastSwiftUpdateCheck = 2620;

Copilot · 2026-01-13T10:39:14Z

ControlWidgets/ControlWidgetsControl.swift

+    func perform() async throws -> some IntentResult {
+        let managers = try await NETunnelProviderManager.loadAllFromPreferences()
+        guard let manager = managers.first else {
+            return .result()
+        }


Similar to the shortcuts, ToggleVPNIntent creates a new NETunnelProviderManager instance on each invocation rather than reusing a shared instance. While this fetches the current state, simultaneous operations from the widget and the main app could potentially conflict when both try to manage the VPN connection state.

Copilot · 2026-01-13T10:39:14Z

ControlWidgets/ControlWidgetsControl.swift

+        .displayName("EasyTier")
+        .description("Toggle VPN connection")


The display strings "EasyTier" and "Toggle VPN connection" are hard-coded and not localized. These should use LocalizedStringResource to support the Chinese localization that exists elsewhere in the app.

Copilot · 2026-01-13T10:39:14Z

ControlWidgets/ControlWidgetsControl.swift

+}
+
+struct ToggleVPNIntent: SetValueIntent {
+    static let title: LocalizedStringResource = "Toggle VPN"


The title "Toggle VPN" is hard-coded and not localized. This should use LocalizedStringResource to support the Chinese localization that exists elsewhere in the app.

Copilot · 2026-01-13T10:39:14Z

EasyTier/Utils/NEManager.swift

+        // Save config to App Group for Widget use
+        let defaults = UserDefaults(suiteName: "group.site.yinmo.easytier")
+        var configDict: [String: String] = [:]
+        for (key, value) in options {
+            if let strValue = value as? String {
+                configDict[key] = strValue
+            }
+        }
+        if let configData = try? JSONEncoder().encode(configDict) {
+            defaults?.set(configData, forKey: "LastVPNConfig")
+            defaults?.synchronize()
+        }


The code serializes the full VPN configuration (including values like NetworkConfig.networkIdentity.networkSecret inside the config string) and writes it in cleartext JSON into the shared app-group UserDefaults under the LastVPNConfig key. If any other app/extension with the same app-group entitlement or an attacker with filesystem access to the container is compromised, they can read this file and recover the network secret, allowing unauthorized devices to join the EasyTier network or clone this client. Consider avoiding persistence of the full config in shared preferences, instead storing only non-sensitive identifiers in the app group and keeping secrets in a more protected store (for example, the Keychain or NE-managed configuration only the tunnel provider can read).

chenx-dust · 2026-01-14T05:08:08Z

@copilot 做好 i18n ，要求依从原项目的做法

Copilot · 2026-01-14T05:08:16Z

@chenx-dust I've opened a new pull request, #5, to work on those changes. Once the pull request is ready, I'll request review from you.

chenx-dust · 2026-01-14T05:27:53Z

@copilot 变基到最新更改

Copilot · 2026-01-14T05:28:03Z

@chenx-dust I've opened a new pull request, #6, to work on those changes. Once the pull request is ready, I'll request review from you.

ref sing-box.

- Added localization keys to Localizable.xcstrings: - vpn_connected (已连接) - vpn_disconnected (已断开) - vpn_connect (连接) - vpn_disconnect (断开) - toggle_vpn (切换 VPN) - toggle_vpn_connection (切换 VPN 连接) - Updated ControlWidgetsControl.swift to use LocalizedStringResource Co-authored-by: chenx-dust <16610294+chenx-dust@users.noreply.github.com>

YinMo19 requested a review from Copilot January 13, 2026 09:51

Copilot AI reviewed Jan 13, 2026

View reviewed changes

YinMo19 requested a review from Copilot January 13, 2026 09:51

Copilot AI reviewed Jan 13, 2026

View reviewed changes

YinMo19 requested a review from Copilot January 13, 2026 10:31

Copilot started reviewing on behalf of YinMo19 January 13, 2026 10:31 View session

Copilot AI reviewed Jan 13, 2026

View reviewed changes

Copilot AI mentioned this pull request Jan 14, 2026

Add i18n support for Control Widgets #5

Merged

Copilot AI mentioned this pull request Jan 14, 2026

[WIP] Fix shortcuts and control center functionality #6

Closed

YinMo19 and others added 7 commits January 14, 2026 13:35

feat: add gitignore

caaf87e

feat: realise i18n for shortcuts

d08a652

feat: control center icon and control

617eefd

feat: sync the widget and app.

c2683ef

ref sing-box.

refactor: better option control

9c1866f

chore: brighter icon

a915ced

chenx-dust force-pushed the shortcuts branch from 6030bb1 to a915ced Compare January 14, 2026 06:47

chenx-dust merged commit 88d69cf into main Jan 14, 2026
1 check was pending

chenx-dust deleted the shortcuts branch January 14, 2026 06:47

-                // Try to start with empty options as fallback
-                try manager.connection.startVPNTunnel()
-                return .result()
+                // Config is required to start the VPN tunnel; fail explicitly instead of using empty options.
+                throw NSError(
+                    domain: "site.yinmo.easytier.ToggleVPNIntent",
+                    code: 1,
+                    userInfo: [
+                        NSLocalizedDescriptionKey: "VPN configuration is not available. Please open EasyTier to configure the VPN before connecting from the widget."
+                    ]
+                )

		Label(isOn ? "Connected" : "Disconnected", systemImage: "network")
		.controlWidgetActionHint(isOn ? "Disconnect" : "Connect")

	@Parameter(title: "Connected")
	@Parameter(title: LocalizedStringResource("Connected"))

		.displayName("EasyTier")
		.description("Toggle VPN connection")

Shortcuts and control center #3

Shortcuts and control center #3

Uh oh!

Conversation

YinMo19 commented Jan 13, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Copilot AI Jan 13, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Jan 13, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Jan 13, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Jan 13, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Jan 13, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Jan 13, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Jan 13, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Jan 13, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Jan 13, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Jan 13, 2026

Choose a reason for hiding this comment

Uh oh!

chenx-dust commented Jan 14, 2026

Uh oh!

Copilot AI commented Jan 14, 2026

Uh oh!

chenx-dust commented Jan 14, 2026

Uh oh!

Copilot AI commented Jan 14, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants