mirror of
https://github.com/openclaw/openclaw.git
synced 2026-08-12 21:53:00 -06:00
0dbdf994b3
* feat(macos): isolate named app profiles * refactor(macos): isolate profile launch ownership * fix(macos): avoid overlapping approvals socket access * fix(macos): declare profile defaults concurrency ownership * fix(macos): return profiled node launch arguments * chore(i18n): refresh macOS profile source inventory * fix(macos): gate profile startup before services * test(macos): evaluate profile state before assertions * fix(daemon): skip absent launchd deactivation * fix(macos): fail closed on profile port conflicts * chore(i18n): refresh profile conflict inventory * fix(macos): ignore non-gateway launch agent claims * test(macos): stabilize profile lifecycle timing * fix(macos): remove stale dashboard URL * chore(macos): refresh native source baseline
118 lines
5.0 KiB
Swift
118 lines
5.0 KiB
Swift
import Foundation
|
|
|
|
enum GatewayDiscoveryPreferences {
|
|
private static let preferredStableIDKey = "gateway.preferredStableID"
|
|
private static let legacyPreferredStableIDKey = "bridge.preferredStableID"
|
|
private static let preferredRouteBindingKey = "gateway.preferredStableIDRouteBinding.v1"
|
|
|
|
static func preferredStableID() -> String? {
|
|
let defaults = AppDefaults.standard
|
|
let raw = defaults.string(forKey: self.preferredStableIDKey)
|
|
?? defaults.string(forKey: self.legacyPreferredStableIDKey)
|
|
let trimmed = raw?.trimmingCharacters(in: .whitespacesAndNewlines)
|
|
return trimmed?.isEmpty == false ? trimmed : nil
|
|
}
|
|
|
|
static func setPreferredStableID(_ stableID: String?) {
|
|
// A caller without an endpoint binding cannot prove that a prior binding
|
|
// belongs to this id. The bound overload installs a fresh one below.
|
|
AppDefaults.standard.removeObject(forKey: self.preferredRouteBindingKey)
|
|
let trimmed = stableID?.trimmingCharacters(in: .whitespacesAndNewlines)
|
|
if let trimmed, !trimmed.isEmpty {
|
|
AppDefaults.standard.set(trimmed, forKey: self.preferredStableIDKey)
|
|
AppDefaults.standard.removeObject(forKey: self.legacyPreferredStableIDKey)
|
|
} else {
|
|
AppDefaults.standard.removeObject(forKey: self.preferredStableIDKey)
|
|
AppDefaults.standard.removeObject(forKey: self.legacyPreferredStableIDKey)
|
|
}
|
|
}
|
|
|
|
static func preferredRouteBinding() -> String? {
|
|
let raw = AppDefaults.standard.string(forKey: self.preferredRouteBindingKey)
|
|
let trimmed = raw?.trimmingCharacters(in: .whitespacesAndNewlines)
|
|
return trimmed?.isEmpty == false ? trimmed : nil
|
|
}
|
|
|
|
static func setPreferredStableID(_ stableID: String?, routeBinding: String?) {
|
|
self.setPreferredStableID(stableID)
|
|
guard self.preferredStableID() != nil,
|
|
let routeBinding = self.normalized(routeBinding)
|
|
else {
|
|
AppDefaults.standard.removeObject(forKey: self.preferredRouteBindingKey)
|
|
return
|
|
}
|
|
AppDefaults.standard.set(routeBinding, forKey: self.preferredRouteBindingKey)
|
|
}
|
|
|
|
/// Discovery ids name one concrete Gateway. Persist the non-secret fallback
|
|
/// route beside the id so an app-off config edit cannot reuse its receipts.
|
|
static func routeBinding(
|
|
connectionMode: AppState.ConnectionMode,
|
|
remoteTransport: AppState.RemoteTransport,
|
|
remoteURL: String,
|
|
remoteTarget: String) -> String?
|
|
{
|
|
guard connectionMode == .remote else { return nil }
|
|
let defaultRemotePort = GatewayEnvironment.gatewayPort()
|
|
let sshRemotePort: Int = if remoteTransport == .ssh {
|
|
RemotePortTunnel.resolveRemotePortOverride(
|
|
defaultRemotePort: defaultRemotePort,
|
|
for: CommandResolver.parseSSHTarget(remoteTarget)?.host ?? "") ?? defaultRemotePort
|
|
} else {
|
|
defaultRemotePort
|
|
}
|
|
return OnboardingSystemAgentResumeStore.routeIdentity(
|
|
connectionMode: .remote,
|
|
preferredGatewayID: nil,
|
|
remoteTransport: remoteTransport,
|
|
remoteURL: remoteURL,
|
|
remoteTarget: remoteTarget,
|
|
sshRemotePort: sshRemotePort)
|
|
}
|
|
|
|
/// Stable, non-secret owner for credentials issued by one selected route.
|
|
/// This intentionally ignores discovery ids: manual direct/SSH selections
|
|
/// must still isolate device tokens before discovery has identified them.
|
|
static func deviceAuthGatewayID(
|
|
connectionMode: AppState.ConnectionMode,
|
|
remoteTransport: AppState.RemoteTransport,
|
|
remoteURL: String,
|
|
remoteTarget: String) -> String?
|
|
{
|
|
if connectionMode == .remote {
|
|
return self.routeBinding(
|
|
connectionMode: connectionMode,
|
|
remoteTransport: remoteTransport,
|
|
remoteURL: remoteURL,
|
|
remoteTarget: remoteTarget)
|
|
}
|
|
return OnboardingSystemAgentResumeStore.routeIdentity(
|
|
connectionMode: connectionMode,
|
|
preferredGatewayID: nil,
|
|
remoteTransport: remoteTransport,
|
|
remoteURL: remoteURL,
|
|
remoteTarget: remoteTarget)
|
|
}
|
|
|
|
@discardableResult
|
|
static func clearPreferredStableIDIfRouteBindingMismatch(_ currentRouteBinding: String?) -> Bool {
|
|
guard self.preferredStableID() != nil else {
|
|
AppDefaults.standard.removeObject(forKey: self.preferredRouteBindingKey)
|
|
return false
|
|
}
|
|
guard let stored = self.preferredRouteBinding(),
|
|
let current = self.normalized(currentRouteBinding),
|
|
stored == current
|
|
else {
|
|
self.setPreferredStableID(nil, routeBinding: nil)
|
|
return true
|
|
}
|
|
return false
|
|
}
|
|
|
|
private static func normalized(_ value: String?) -> String? {
|
|
let trimmed = value?.trimmingCharacters(in: .whitespacesAndNewlines)
|
|
return trimmed?.isEmpty == false ? trimmed : nil
|
|
}
|
|
}
|