Refactor to MVVM architecture
This commit is contained in:
@@ -1,30 +1,23 @@
|
|||||||
import Libbox
|
|
||||||
import Library
|
import Library
|
||||||
import SwiftUI
|
import SwiftUI
|
||||||
|
|
||||||
@MainActor
|
@MainActor
|
||||||
public struct ConnectionListView: View {
|
public struct ConnectionListView: View {
|
||||||
@Environment(\.scenePhase) private var scenePhase
|
@Environment(\.scenePhase) private var scenePhase
|
||||||
@State private var isLoading = true
|
@StateObject private var viewModel = ConnectionListViewModel()
|
||||||
@StateObject private var commandClient = CommandClient(.connections)
|
|
||||||
@State private var connections: [Connection] = []
|
|
||||||
@State private var searchText = ""
|
|
||||||
@State private var alert: Alert?
|
|
||||||
|
|
||||||
public init() {}
|
public init() {}
|
||||||
public var body: some View {
|
public var body: some View {
|
||||||
VStack {
|
VStack {
|
||||||
if isLoading {
|
if viewModel.isLoading {
|
||||||
Text("Loading...")
|
Text("Loading...")
|
||||||
} else {
|
} else {
|
||||||
if connections.isEmpty {
|
if viewModel.connections.isEmpty {
|
||||||
Text("Empty connections")
|
Text("Empty connections")
|
||||||
} else {
|
} else {
|
||||||
ScrollView {
|
ScrollView {
|
||||||
LazyVGrid(columns: [GridItem(.flexible())], alignment: .leading) {
|
LazyVGrid(columns: [GridItem(.flexible())], alignment: .leading) {
|
||||||
ForEach(connections.filter { it in
|
ForEach(viewModel.filteredConnections(), id: \.hashValue) { it in
|
||||||
searchText == "" || it.performSearch(searchText)
|
|
||||||
}, id: \.hashValue) { it in
|
|
||||||
ConnectionView(it)
|
ConnectionView(it)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -37,24 +30,20 @@ public struct ConnectionListView: View {
|
|||||||
.toolbar {
|
.toolbar {
|
||||||
ToolbarItem {
|
ToolbarItem {
|
||||||
Menu {
|
Menu {
|
||||||
Picker("State", selection: $commandClient.connectionStateFilter) {
|
Picker("State", selection: $viewModel.connectionStateFilter) {
|
||||||
ForEach(ConnectionStateFilter.allCases) { state in
|
ForEach(ConnectionStateFilter.allCases) { state in
|
||||||
Text(state.name)
|
Text(state.name)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Picker("Sort By", selection: $commandClient.connectionSort) {
|
Picker("Sort By", selection: $viewModel.connectionSort) {
|
||||||
ForEach(ConnectionSort.allCases, id: \.self) { sortBy in
|
ForEach(ConnectionSort.allCases, id: \.self) { sortBy in
|
||||||
Text(sortBy.name)
|
Text(sortBy.name)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Button("Close All Connections", role: .destructive) {
|
Button("Close All Connections", role: .destructive) {
|
||||||
do {
|
viewModel.closeAllConnections()
|
||||||
try LibboxNewStandaloneCommandClient()!.closeConnections()
|
|
||||||
} catch {
|
|
||||||
alert = Alert(error)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
} label: {
|
} label: {
|
||||||
Label("Filter", systemImage: "line.3.horizontal.circle")
|
Label("Filter", systemImage: "line.3.horizontal.circle")
|
||||||
@@ -63,40 +52,22 @@ public struct ConnectionListView: View {
|
|||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
#if os(macOS)
|
#if os(macOS)
|
||||||
.searchable(text: $searchText)
|
.searchable(text: $viewModel.searchText)
|
||||||
#endif
|
#endif
|
||||||
.alertBinding($alert)
|
.alertBinding($viewModel.alert)
|
||||||
.onAppear {
|
.onAppear {
|
||||||
connect()
|
viewModel.connect()
|
||||||
}
|
}
|
||||||
.onDisappear {
|
.onDisappear {
|
||||||
commandClient.disconnect()
|
viewModel.disconnect()
|
||||||
}
|
}
|
||||||
.onChangeCompat(of: scenePhase) { newValue in
|
.onChangeCompat(of: scenePhase) { newValue in
|
||||||
if newValue == .active {
|
if newValue == .active {
|
||||||
commandClient.connect()
|
viewModel.connect()
|
||||||
} else {
|
} else {
|
||||||
commandClient.disconnect()
|
viewModel.disconnect()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
.onChangeCompat(of: commandClient.connectionStateFilter) { it in
|
|
||||||
commandClient.filterConnectionsNow()
|
|
||||||
Task {
|
|
||||||
await SharedPreferences.connectionStateFilter.set(it.rawValue)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
.onChangeCompat(of: commandClient.connectionSort) { it in
|
|
||||||
commandClient.filterConnectionsNow()
|
|
||||||
Task {
|
|
||||||
await SharedPreferences.connectionSort.set(it.rawValue)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
.onReceive(commandClient.$connections, perform: { connections in
|
|
||||||
if let connections {
|
|
||||||
self.connections = convertConnections(connections)
|
|
||||||
isLoading = false
|
|
||||||
}
|
|
||||||
})
|
|
||||||
.frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .center)
|
.frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .center)
|
||||||
#if os(iOS)
|
#if os(iOS)
|
||||||
.background(Color(uiColor: .systemGroupedBackground))
|
.background(Color(uiColor: .systemGroupedBackground))
|
||||||
@@ -112,50 +83,4 @@ public struct ConnectionListView: View {
|
|||||||
return Color(uiColor: .black)
|
return Color(uiColor: .black)
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
private func connect() {
|
|
||||||
if ApplicationLibrary.inPreview {
|
|
||||||
isLoading = false
|
|
||||||
} else {
|
|
||||||
commandClient.connect()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private func convertConnections(_ goConnections: [LibboxConnection]) -> [Connection] {
|
|
||||||
var connections = [Connection]()
|
|
||||||
for goConnection in goConnections {
|
|
||||||
if goConnection.outboundType == "dns" {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
var closedAt: Date?
|
|
||||||
if goConnection.closedAt > 0 {
|
|
||||||
closedAt = Date(timeIntervalSince1970: Double(goConnection.closedAt) / 1000)
|
|
||||||
}
|
|
||||||
connections.append(Connection(
|
|
||||||
id: goConnection.id_,
|
|
||||||
inbound: goConnection.inbound,
|
|
||||||
inboundType: goConnection.inboundType,
|
|
||||||
ipVersion: goConnection.ipVersion,
|
|
||||||
network: goConnection.network,
|
|
||||||
source: goConnection.source,
|
|
||||||
destination: goConnection.destination,
|
|
||||||
domain: goConnection.domain,
|
|
||||||
displayDestination: goConnection.displayDestination(),
|
|
||||||
protocolName: goConnection.protocol,
|
|
||||||
user: goConnection.user,
|
|
||||||
fromOutbound: goConnection.fromOutbound,
|
|
||||||
createdAt: Date(timeIntervalSince1970: Double(goConnection.createdAt) / 1000),
|
|
||||||
closedAt: closedAt,
|
|
||||||
upload: goConnection.uplink,
|
|
||||||
download: goConnection.downlink,
|
|
||||||
uploadTotal: goConnection.uplinkTotal,
|
|
||||||
downloadTotal: goConnection.downlinkTotal,
|
|
||||||
rule: goConnection.rule,
|
|
||||||
outbound: goConnection.outbound,
|
|
||||||
outboundType: goConnection.outboundType,
|
|
||||||
chain: goConnection.chain()!.toArray()
|
|
||||||
))
|
|
||||||
}
|
|
||||||
return connections
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,141 @@
|
|||||||
|
import Combine
|
||||||
|
import Libbox
|
||||||
|
import Library
|
||||||
|
import SwiftUI
|
||||||
|
|
||||||
|
@MainActor
|
||||||
|
public class ConnectionListViewModel: ObservableObject {
|
||||||
|
@Published public var isLoading = true
|
||||||
|
@Published public var connections: [Connection] = []
|
||||||
|
@Published public var searchText = ""
|
||||||
|
@Published public var alert: Alert?
|
||||||
|
@Published public var connectionStateFilter: ConnectionStateFilter {
|
||||||
|
didSet {
|
||||||
|
commandClient.connectionStateFilter = connectionStateFilter
|
||||||
|
commandClient.filterConnectionsNow()
|
||||||
|
saveStateFilterTask?.cancel()
|
||||||
|
saveStateFilterTask = Task {
|
||||||
|
await SharedPreferences.connectionStateFilter.set(connectionStateFilter.rawValue)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Published public var connectionSort: ConnectionSort {
|
||||||
|
didSet {
|
||||||
|
commandClient.connectionSort = connectionSort
|
||||||
|
commandClient.filterConnectionsNow()
|
||||||
|
saveSortTask?.cancel()
|
||||||
|
saveSortTask = Task {
|
||||||
|
await SharedPreferences.connectionSort.set(connectionSort.rawValue)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private let commandClient = CommandClient(.connections)
|
||||||
|
private var cancellables = Set<AnyCancellable>()
|
||||||
|
private var connectTask: Task<Void, Never>?
|
||||||
|
private var saveStateFilterTask: Task<Void, Never>?
|
||||||
|
private var saveSortTask: Task<Void, Never>?
|
||||||
|
|
||||||
|
public init() {
|
||||||
|
connectionStateFilter = .active
|
||||||
|
connectionSort = .byDate
|
||||||
|
|
||||||
|
commandClient.$connections
|
||||||
|
.compactMap { $0 }
|
||||||
|
.sink { [weak self] goConnections in
|
||||||
|
self?.setConnections(goConnections)
|
||||||
|
}
|
||||||
|
.store(in: &cancellables)
|
||||||
|
}
|
||||||
|
|
||||||
|
public func connect() {
|
||||||
|
if ApplicationLibrary.inPreview {
|
||||||
|
isLoading = false
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
connectTask?.cancel()
|
||||||
|
connectTask = Task { @MainActor [weak self] in
|
||||||
|
guard let self else { return }
|
||||||
|
await self.loadPreferences()
|
||||||
|
if Task.isCancelled { return }
|
||||||
|
self.commandClient.connect()
|
||||||
|
self.connectTask = nil
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private func loadPreferences() async {
|
||||||
|
let filter = await ConnectionStateFilter(rawValue: SharedPreferences.connectionStateFilter.get()) ?? .active
|
||||||
|
let sort = await ConnectionSort(rawValue: SharedPreferences.connectionSort.get()) ?? .byDate
|
||||||
|
connectionStateFilter = filter
|
||||||
|
connectionSort = sort
|
||||||
|
}
|
||||||
|
|
||||||
|
public func disconnect() {
|
||||||
|
connectTask?.cancel()
|
||||||
|
connectTask = nil
|
||||||
|
saveStateFilterTask?.cancel()
|
||||||
|
saveStateFilterTask = nil
|
||||||
|
saveSortTask?.cancel()
|
||||||
|
saveSortTask = nil
|
||||||
|
commandClient.disconnect()
|
||||||
|
}
|
||||||
|
|
||||||
|
public func closeAllConnections() {
|
||||||
|
do {
|
||||||
|
try LibboxNewStandaloneCommandClient()!.closeConnections()
|
||||||
|
} catch {
|
||||||
|
alert = Alert(error)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public func filteredConnections() -> [Connection] {
|
||||||
|
connections.filter { connection in
|
||||||
|
searchText == "" || connection.performSearch(searchText)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private func setConnections(_ goConnections: [LibboxConnection]) {
|
||||||
|
connections = convertConnections(goConnections)
|
||||||
|
isLoading = false
|
||||||
|
}
|
||||||
|
|
||||||
|
private func convertConnections(_ goConnections: [LibboxConnection]) -> [Connection] {
|
||||||
|
var connections = [Connection]()
|
||||||
|
for goConnection in goConnections {
|
||||||
|
if goConnection.outboundType == "dns" {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
var closedAt: Date?
|
||||||
|
if goConnection.closedAt > 0 {
|
||||||
|
closedAt = Date(timeIntervalSince1970: Double(goConnection.closedAt) / 1000)
|
||||||
|
}
|
||||||
|
connections.append(Connection(
|
||||||
|
id: goConnection.id_,
|
||||||
|
inbound: goConnection.inbound,
|
||||||
|
inboundType: goConnection.inboundType,
|
||||||
|
ipVersion: goConnection.ipVersion,
|
||||||
|
network: goConnection.network,
|
||||||
|
source: goConnection.source,
|
||||||
|
destination: goConnection.destination,
|
||||||
|
domain: goConnection.domain,
|
||||||
|
displayDestination: goConnection.displayDestination(),
|
||||||
|
protocolName: goConnection.protocol,
|
||||||
|
user: goConnection.user,
|
||||||
|
fromOutbound: goConnection.fromOutbound,
|
||||||
|
createdAt: Date(timeIntervalSince1970: Double(goConnection.createdAt) / 1000),
|
||||||
|
closedAt: closedAt,
|
||||||
|
upload: goConnection.uplink,
|
||||||
|
download: goConnection.downlink,
|
||||||
|
uploadTotal: goConnection.uplinkTotal,
|
||||||
|
downloadTotal: goConnection.downlinkTotal,
|
||||||
|
rule: goConnection.rule,
|
||||||
|
outbound: goConnection.outbound,
|
||||||
|
outboundType: goConnection.outboundType,
|
||||||
|
chain: goConnection.chain()!.toArray()
|
||||||
|
))
|
||||||
|
}
|
||||||
|
return connections
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -9,20 +9,17 @@ public struct ActiveDashboardView: View {
|
|||||||
@Environment(\.selection) private var parentSelection
|
@Environment(\.selection) private var parentSelection
|
||||||
@EnvironmentObject private var environments: ExtensionEnvironments
|
@EnvironmentObject private var environments: ExtensionEnvironments
|
||||||
@EnvironmentObject private var profile: ExtensionProfile
|
@EnvironmentObject private var profile: ExtensionProfile
|
||||||
@State private var isLoading = true
|
@StateObject private var viewModel = ActiveDashboardViewModel()
|
||||||
@State private var profileList: [ProfilePreview] = []
|
|
||||||
@State private var selectedProfileID: Int64 = 0
|
|
||||||
@State private var alert: Alert?
|
|
||||||
@State private var selection = DashboardPage.overview
|
|
||||||
@State private var systemProxyAvailable = false
|
|
||||||
@State private var systemProxyEnabled = false
|
|
||||||
|
|
||||||
public init() {}
|
public init() {}
|
||||||
public var body: some View {
|
public var body: some View {
|
||||||
if isLoading {
|
if viewModel.isLoading {
|
||||||
ProgressView().onAppear {
|
ProgressView().onAppear {
|
||||||
|
viewModel.onEmptyProfilesChange = { isEmpty in
|
||||||
|
environments.emptyProfiles = isEmpty
|
||||||
|
}
|
||||||
Task {
|
Task {
|
||||||
await doReload()
|
await viewModel.reload()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
@@ -32,13 +29,13 @@ public struct ActiveDashboardView: View {
|
|||||||
body1
|
body1
|
||||||
.onAppear {
|
.onAppear {
|
||||||
Task {
|
Task {
|
||||||
await doReloadSystemProxy()
|
await viewModel.reloadSystemProxy()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
.onChangeCompat(of: profile.status) { newStatus in
|
.onChangeCompat(of: profile.status) { newStatus in
|
||||||
if newStatus == .connected {
|
if newStatus == .connected {
|
||||||
Task {
|
Task {
|
||||||
await doReloadSystemProxy()
|
await viewModel.reloadSystemProxy()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -50,7 +47,7 @@ public struct ActiveDashboardView: View {
|
|||||||
VStack {
|
VStack {
|
||||||
#if os(iOS) || os(tvOS)
|
#if os(iOS) || os(tvOS)
|
||||||
if ApplicationLibrary.inPreview || profile.status.isConnectedStrict {
|
if ApplicationLibrary.inPreview || profile.status.isConnectedStrict {
|
||||||
Picker("Page", selection: $selection) {
|
Picker("Page", selection: $viewModel.selection) {
|
||||||
ForEach(DashboardPage.enabledCases()) { page in
|
ForEach(DashboardPage.enabledCases()) { page in
|
||||||
page.label
|
page.label
|
||||||
}
|
}
|
||||||
@@ -60,9 +57,9 @@ public struct ActiveDashboardView: View {
|
|||||||
.padding([.leading, .trailing])
|
.padding([.leading, .trailing])
|
||||||
.navigationBarTitleDisplayMode(.inline)
|
.navigationBarTitleDisplayMode(.inline)
|
||||||
#endif
|
#endif
|
||||||
TabView(selection: $selection) {
|
TabView(selection: $viewModel.selection) {
|
||||||
ForEach(DashboardPage.enabledCases()) { page in
|
ForEach(DashboardPage.enabledCases()) { page in
|
||||||
page.contentView($profileList, $selectedProfileID, $systemProxyAvailable, $systemProxyEnabled)
|
page.contentView($viewModel.profileList, $viewModel.selectedProfileID, $viewModel.systemProxyAvailable, $viewModel.systemProxyEnabled)
|
||||||
.tag(page)
|
.tag(page)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -71,75 +68,25 @@ public struct ActiveDashboardView: View {
|
|||||||
#endif
|
#endif
|
||||||
.tabViewStyle(.page(indexDisplayMode: .never))
|
.tabViewStyle(.page(indexDisplayMode: .never))
|
||||||
} else {
|
} else {
|
||||||
OverviewView($profileList, $selectedProfileID, $systemProxyAvailable, $systemProxyEnabled)
|
OverviewView($viewModel.profileList, $viewModel.selectedProfileID, $viewModel.systemProxyAvailable, $viewModel.systemProxyEnabled)
|
||||||
}
|
}
|
||||||
#elseif os(macOS)
|
#elseif os(macOS)
|
||||||
OverviewView($profileList, $selectedProfileID, $systemProxyAvailable, $systemProxyEnabled)
|
OverviewView($viewModel.profileList, $viewModel.selectedProfileID, $viewModel.systemProxyAvailable, $viewModel.systemProxyEnabled)
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
.onReceive(environments.profileUpdate) { _ in
|
.onReceive(environments.profileUpdate) { _ in
|
||||||
Task {
|
Task {
|
||||||
await doReload()
|
await viewModel.reload()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
.onReceive(environments.selectedProfileUpdate) { _ in
|
.onReceive(environments.selectedProfileUpdate) { _ in
|
||||||
Task {
|
Task {
|
||||||
selectedProfileID = await SharedPreferences.selectedProfileID.get()
|
await viewModel.updateSelectedProfile()
|
||||||
if profile.status.isConnected {
|
if profile.status.isConnected {
|
||||||
await doReloadSystemProxy()
|
await viewModel.reloadSystemProxy()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
.alertBinding($alert)
|
.alertBinding($viewModel.alert)
|
||||||
}
|
|
||||||
|
|
||||||
private func doReload() async {
|
|
||||||
defer {
|
|
||||||
isLoading = false
|
|
||||||
}
|
|
||||||
if ApplicationLibrary.inPreview {
|
|
||||||
profileList = [
|
|
||||||
ProfilePreview(Profile(id: 0, name: "profile local", type: .local, path: "")),
|
|
||||||
ProfilePreview(Profile(id: 1, name: "profile remote", type: .remote, path: "", lastUpdated: Date(timeIntervalSince1970: 0))),
|
|
||||||
]
|
|
||||||
systemProxyAvailable = true
|
|
||||||
systemProxyEnabled = true
|
|
||||||
selectedProfileID = 0
|
|
||||||
|
|
||||||
} else {
|
|
||||||
do {
|
|
||||||
profileList = try await ProfileManager.list().map { ProfilePreview($0) }
|
|
||||||
if profileList.isEmpty {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
selectedProfileID = await SharedPreferences.selectedProfileID.get()
|
|
||||||
if profileList.filter({ profile in
|
|
||||||
profile.id == selectedProfileID
|
|
||||||
})
|
|
||||||
.isEmpty {
|
|
||||||
selectedProfileID = profileList[0].id
|
|
||||||
await SharedPreferences.selectedProfileID.set(selectedProfileID)
|
|
||||||
}
|
|
||||||
|
|
||||||
} catch {
|
|
||||||
alert = Alert(error)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
}
|
|
||||||
environments.emptyProfiles = profileList.isEmpty
|
|
||||||
}
|
|
||||||
|
|
||||||
private nonisolated func doReloadSystemProxy() async {
|
|
||||||
do {
|
|
||||||
let status = try LibboxNewStandaloneCommandClient()!.getSystemProxyStatus()
|
|
||||||
await MainActor.run {
|
|
||||||
systemProxyAvailable = status.available
|
|
||||||
systemProxyEnabled = status.enabled
|
|
||||||
}
|
|
||||||
} catch {
|
|
||||||
await MainActor.run {
|
|
||||||
alert = Alert(error)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,72 @@
|
|||||||
|
import Foundation
|
||||||
|
import Libbox
|
||||||
|
import Library
|
||||||
|
import SwiftUI
|
||||||
|
|
||||||
|
@MainActor
|
||||||
|
final class ActiveDashboardViewModel: ObservableObject {
|
||||||
|
@Published var isLoading = true
|
||||||
|
@Published var profileList: [ProfilePreview] = []
|
||||||
|
@Published var selectedProfileID: Int64 = 0
|
||||||
|
@Published var alert: Alert?
|
||||||
|
@Published var selection = DashboardPage.overview
|
||||||
|
@Published var systemProxyAvailable = false
|
||||||
|
@Published var systemProxyEnabled = false
|
||||||
|
|
||||||
|
var onEmptyProfilesChange: ((Bool) -> Void)?
|
||||||
|
|
||||||
|
func reload() async {
|
||||||
|
defer {
|
||||||
|
isLoading = false
|
||||||
|
}
|
||||||
|
if ApplicationLibrary.inPreview {
|
||||||
|
profileList = [
|
||||||
|
ProfilePreview(Profile(id: 0, name: "profile local", type: .local, path: "")),
|
||||||
|
ProfilePreview(Profile(id: 1, name: "profile remote", type: .remote, path: "", lastUpdated: Date(timeIntervalSince1970: 0))),
|
||||||
|
]
|
||||||
|
systemProxyAvailable = true
|
||||||
|
systemProxyEnabled = true
|
||||||
|
selectedProfileID = 0
|
||||||
|
|
||||||
|
} else {
|
||||||
|
do {
|
||||||
|
profileList = try await ProfileManager.list().map { ProfilePreview($0) }
|
||||||
|
if profileList.isEmpty {
|
||||||
|
onEmptyProfilesChange?(true)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
selectedProfileID = await SharedPreferences.selectedProfileID.get()
|
||||||
|
if profileList.filter({ profile in
|
||||||
|
profile.id == selectedProfileID
|
||||||
|
})
|
||||||
|
.isEmpty {
|
||||||
|
selectedProfileID = profileList[0].id
|
||||||
|
await SharedPreferences.selectedProfileID.set(selectedProfileID)
|
||||||
|
}
|
||||||
|
|
||||||
|
} catch {
|
||||||
|
alert = Alert(error)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
onEmptyProfilesChange?(profileList.isEmpty)
|
||||||
|
}
|
||||||
|
|
||||||
|
nonisolated func reloadSystemProxy() async {
|
||||||
|
do {
|
||||||
|
let status = try LibboxNewStandaloneCommandClient()!.getSystemProxyStatus()
|
||||||
|
await MainActor.run {
|
||||||
|
systemProxyAvailable = status.available
|
||||||
|
systemProxyEnabled = status.enabled
|
||||||
|
}
|
||||||
|
} catch {
|
||||||
|
await MainActor.run {
|
||||||
|
alert = Alert(error)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func updateSelectedProfile() async {
|
||||||
|
selectedProfileID = await SharedPreferences.selectedProfileID.get()
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -5,57 +5,38 @@ import SwiftUI
|
|||||||
@MainActor
|
@MainActor
|
||||||
public struct ClashModeView: View {
|
public struct ClashModeView: View {
|
||||||
@Environment(\.scenePhase) private var scenePhase
|
@Environment(\.scenePhase) private var scenePhase
|
||||||
@StateObject private var commandClient = CommandClient(.clashMode)
|
@StateObject private var viewModel = ClashModeViewModel()
|
||||||
@State private var clashMode = ""
|
|
||||||
@State private var alert: Alert?
|
|
||||||
|
|
||||||
public init() {}
|
public init() {}
|
||||||
public var body: some View {
|
public var body: some View {
|
||||||
VStack {
|
VStack {
|
||||||
if commandClient.clashModeList.count > 1 {
|
if viewModel.shouldShowPicker {
|
||||||
Picker("", selection: Binding(get: {
|
Picker("", selection: Binding(get: {
|
||||||
clashMode
|
viewModel.clashMode
|
||||||
}, set: { newMode in
|
}, set: { newMode in
|
||||||
clashMode = newMode
|
viewModel.clashMode = newMode
|
||||||
Task {
|
Task {
|
||||||
await setClashMode(newMode)
|
await viewModel.setClashMode(newMode)
|
||||||
}
|
}
|
||||||
}), content: {
|
}), content: {
|
||||||
ForEach(commandClient.clashModeList, id: \.self) { it in
|
ForEach(viewModel.clashModeList, id: \.self) { mode in
|
||||||
Text(it)
|
Text(mode)
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
.pickerStyle(.segmented)
|
.pickerStyle(.segmented)
|
||||||
.padding([.top], 8)
|
.padding([.top], 8)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
.onReceive(commandClient.$clashMode) { newMode in
|
|
||||||
clashMode = newMode
|
|
||||||
}
|
|
||||||
.padding([.leading, .trailing])
|
.padding([.leading, .trailing])
|
||||||
.onAppear {
|
.onAppear {
|
||||||
commandClient.connect()
|
viewModel.connect()
|
||||||
}
|
}
|
||||||
.onDisappear {
|
.onDisappear {
|
||||||
commandClient.disconnect()
|
viewModel.disconnect()
|
||||||
}
|
}
|
||||||
.onChangeCompat(of: scenePhase) { newValue in
|
.onChangeCompat(of: scenePhase) { newValue in
|
||||||
if newValue == .active {
|
viewModel.handleScenePhase(newValue)
|
||||||
commandClient.connect()
|
|
||||||
} else {
|
|
||||||
commandClient.disconnect()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
.alertBinding($alert)
|
|
||||||
}
|
|
||||||
|
|
||||||
private nonisolated func setClashMode(_ newMode: String) async {
|
|
||||||
do {
|
|
||||||
try LibboxNewStandaloneCommandClient()!.setClashMode(newMode)
|
|
||||||
} catch {
|
|
||||||
await MainActor.run {
|
|
||||||
alert = Alert(error)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
.alertBinding($viewModel.alert)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,50 @@
|
|||||||
|
import Libbox
|
||||||
|
import Library
|
||||||
|
import SwiftUI
|
||||||
|
|
||||||
|
@MainActor
|
||||||
|
final class ClashModeViewModel: ObservableObject {
|
||||||
|
@Published var clashMode = ""
|
||||||
|
@Published var alert: Alert?
|
||||||
|
|
||||||
|
private let commandClient = CommandClient(.clashMode)
|
||||||
|
|
||||||
|
var clashModeList: [String] {
|
||||||
|
commandClient.clashModeList
|
||||||
|
}
|
||||||
|
|
||||||
|
var shouldShowPicker: Bool {
|
||||||
|
commandClient.clashModeList.count > 1
|
||||||
|
}
|
||||||
|
|
||||||
|
init() {
|
||||||
|
commandClient.$clashMode
|
||||||
|
.assign(to: &$clashMode)
|
||||||
|
}
|
||||||
|
|
||||||
|
func connect() {
|
||||||
|
commandClient.connect()
|
||||||
|
}
|
||||||
|
|
||||||
|
func disconnect() {
|
||||||
|
commandClient.disconnect()
|
||||||
|
}
|
||||||
|
|
||||||
|
func handleScenePhase(_ phase: ScenePhase) {
|
||||||
|
if phase == .active {
|
||||||
|
connect()
|
||||||
|
} else {
|
||||||
|
disconnect()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
nonisolated func setClashMode(_ newMode: String) async {
|
||||||
|
do {
|
||||||
|
try LibboxNewStandaloneCommandClient()!.setClashMode(newMode)
|
||||||
|
} catch {
|
||||||
|
await MainActor.run {
|
||||||
|
alert = Alert(error)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -6,8 +6,7 @@ import SwiftUI
|
|||||||
public struct DashboardView: View {
|
public struct DashboardView: View {
|
||||||
#if os(macOS)
|
#if os(macOS)
|
||||||
@Environment(\.controlActiveState) private var controlActiveState
|
@Environment(\.controlActiveState) private var controlActiveState
|
||||||
@State private var isLoading = true
|
@StateObject private var viewModel = DashboardViewModel()
|
||||||
@State private var systemExtensionInstalled = true
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
public init() {}
|
public init() {}
|
||||||
@@ -16,10 +15,10 @@ public struct DashboardView: View {
|
|||||||
#if os(macOS)
|
#if os(macOS)
|
||||||
if Variant.useSystemExtension {
|
if Variant.useSystemExtension {
|
||||||
viewBuilder {
|
viewBuilder {
|
||||||
if !systemExtensionInstalled {
|
if !viewModel.systemExtensionInstalled {
|
||||||
FormView {
|
FormView {
|
||||||
InstallSystemExtensionButton {
|
InstallSystemExtensionButton {
|
||||||
await reload()
|
await viewModel.reload()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
@@ -27,7 +26,7 @@ public struct DashboardView: View {
|
|||||||
}
|
}
|
||||||
}.onAppear {
|
}.onAppear {
|
||||||
Task {
|
Task {
|
||||||
await reload()
|
await viewModel.reload()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
@@ -41,9 +40,9 @@ public struct DashboardView: View {
|
|||||||
.onChangeCompat(of: controlActiveState) { newValue in
|
.onChangeCompat(of: controlActiveState) { newValue in
|
||||||
if newValue != .inactive {
|
if newValue != .inactive {
|
||||||
if Variant.useSystemExtension {
|
if Variant.useSystemExtension {
|
||||||
if !isLoading {
|
if !viewModel.isLoading {
|
||||||
Task {
|
Task {
|
||||||
await reload()
|
await viewModel.reload()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -52,16 +51,6 @@ public struct DashboardView: View {
|
|||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
#if os(macOS)
|
|
||||||
private nonisolated func reload() async {
|
|
||||||
let systemExtensionInstalled = await SystemExtension.isInstalled()
|
|
||||||
await MainActor.run {
|
|
||||||
self.systemExtensionInstalled = systemExtensionInstalled
|
|
||||||
isLoading = false
|
|
||||||
}
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
struct DashboardView0: View {
|
struct DashboardView0: View {
|
||||||
@EnvironmentObject private var environments: ExtensionEnvironments
|
@EnvironmentObject private var environments: ExtensionEnvironments
|
||||||
|
|
||||||
@@ -86,146 +75,21 @@ public struct DashboardView: View {
|
|||||||
@Environment(\.openURL) var openURL
|
@Environment(\.openURL) var openURL
|
||||||
@EnvironmentObject private var environments: ExtensionEnvironments
|
@EnvironmentObject private var environments: ExtensionEnvironments
|
||||||
@EnvironmentObject private var profile: ExtensionProfile
|
@EnvironmentObject private var profile: ExtensionProfile
|
||||||
@State private var alert: Alert?
|
@StateObject private var viewModel = DashboardViewModel()
|
||||||
@State private var notStarted = false
|
|
||||||
|
|
||||||
var body: some View {
|
var body: some View {
|
||||||
VStack {
|
VStack {
|
||||||
ActiveDashboardView()
|
ActiveDashboardView()
|
||||||
}
|
}
|
||||||
.alertBinding($alert)
|
.alertBinding($viewModel.alert)
|
||||||
|
.onAppear {
|
||||||
|
viewModel.setOpenURL { url in
|
||||||
|
openURL(url)
|
||||||
|
}
|
||||||
|
}
|
||||||
.onChangeCompat(of: profile.status) { newValue in
|
.onChangeCompat(of: profile.status) { newValue in
|
||||||
if newValue == .connected {
|
viewModel.handleStatusChange(newValue, profile: profile)
|
||||||
notStarted = false
|
|
||||||
}
|
|
||||||
if newValue == .disconnecting || newValue == .connected {
|
|
||||||
Task {
|
|
||||||
await checkServiceError()
|
|
||||||
if newValue == .connected {
|
|
||||||
await checkDeprecatedNotes()
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else if newValue == .connecting {
|
|
||||||
notStarted = true
|
|
||||||
} else if newValue == .disconnected {
|
|
||||||
if #available(iOS 16.0, macOS 13.0, tvOS 17.0, *) {
|
|
||||||
if notStarted {
|
|
||||||
Task {
|
|
||||||
await checkLastDisconnectError()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private nonisolated func checkDeprecatedNotes() async {
|
|
||||||
if await SharedPreferences.disableDeprecatedWarnings.get() {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
do {
|
|
||||||
let reports = try LibboxNewStandaloneCommandClient()!.getDeprecatedNotes()
|
|
||||||
if reports.hasNext() {
|
|
||||||
await MainActor.run {
|
|
||||||
loopShowDeprecateNotes(reports)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} catch {
|
|
||||||
await MainActor.run {
|
|
||||||
alert = Alert(error)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@MainActor
|
|
||||||
private func loopShowDeprecateNotes(_ reports: any LibboxDeprecatedNoteIteratorProtocol) {
|
|
||||||
if reports.hasNext() {
|
|
||||||
let report = reports.next()!
|
|
||||||
if report.migrationLink.isEmpty {
|
|
||||||
alert = Alert(
|
|
||||||
title: Text("Deprecated Warning"),
|
|
||||||
message: Text(report.message()),
|
|
||||||
dismissButton: .cancel(Text("Ok")) {
|
|
||||||
Task.detached {
|
|
||||||
try await Task.sleep(nanoseconds: 300 * NSEC_PER_MSEC)
|
|
||||||
await loopShowDeprecateNotes(reports)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
)
|
|
||||||
} else {
|
|
||||||
alert = Alert(
|
|
||||||
title: Text("Deprecated Warning"),
|
|
||||||
message: Text(report.message()),
|
|
||||||
primaryButton: .default(Text("Documentation")) {
|
|
||||||
openURL(URL(string: report.migrationLink)!)
|
|
||||||
Task.detached {
|
|
||||||
try await Task.sleep(nanoseconds: 300 * NSEC_PER_MSEC)
|
|
||||||
await loopShowDeprecateNotes(reports)
|
|
||||||
}
|
|
||||||
},
|
|
||||||
secondaryButton: .cancel(Text("Ok")) {
|
|
||||||
Task.detached {
|
|
||||||
try await Task.sleep(nanoseconds: 300 * NSEC_PER_MSEC)
|
|
||||||
await loopShowDeprecateNotes(reports)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private nonisolated func checkServiceError() async {
|
|
||||||
var error: NSError?
|
|
||||||
let message = LibboxReadServiceError(&error)
|
|
||||||
if error != nil {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
await MainActor.run {
|
|
||||||
alert = Alert(title: Text("Service Error"), message: Text(message!.value))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@available(iOS 16.0, macOS 13.0, tvOS 17.0, *)
|
|
||||||
private nonisolated func checkLastDisconnectError() async {
|
|
||||||
var myError: NSError
|
|
||||||
do {
|
|
||||||
try await profile.fetchLastDisconnectError()
|
|
||||||
return
|
|
||||||
} catch {
|
|
||||||
myError = error as NSError
|
|
||||||
}
|
|
||||||
#if os(macOS)
|
|
||||||
if myError.domain == "Library.FullDiskAccessPermissionRequired" {
|
|
||||||
await MainActor.run {
|
|
||||||
alert = Alert(
|
|
||||||
title: Text("Full Disk Access permission is required"),
|
|
||||||
message: Text("Please grant the permission for **SFMExtension**, then we can continue."),
|
|
||||||
primaryButton: .default(Text("Authorize"), action: openFDASettings),
|
|
||||||
secondaryButton: .cancel()
|
|
||||||
)
|
|
||||||
}
|
|
||||||
return
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
let message = myError.localizedDescription
|
|
||||||
await MainActor.run {
|
|
||||||
alert = Alert(title: Text("Service Error"), message: Text(message))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#if os(macOS)
|
|
||||||
|
|
||||||
private func openFDASettings() {
|
|
||||||
if NSWorkspace.shared.open(URL(string: "x-apple.systempreferences:com.apple.preference.security?Privacy_AllFiles")!) {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
if #available(macOS 13, *) {
|
|
||||||
NSWorkspace.shared.open(URL(fileURLWithPath: "/System/Applications/System Settings.app"))
|
|
||||||
} else {
|
|
||||||
NSWorkspace.shared.open(URL(fileURLWithPath: "/System/Applications/System Preferences.app"))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,161 @@
|
|||||||
|
import Libbox
|
||||||
|
import Library
|
||||||
|
import NetworkExtension
|
||||||
|
import SwiftUI
|
||||||
|
|
||||||
|
@MainActor
|
||||||
|
class DashboardViewModel: ObservableObject {
|
||||||
|
#if os(macOS)
|
||||||
|
@Published var isLoading = true
|
||||||
|
@Published var systemExtensionInstalled = true
|
||||||
|
#endif
|
||||||
|
|
||||||
|
@Published var alert: Alert?
|
||||||
|
@Published var notStarted = false
|
||||||
|
|
||||||
|
private var openURL: ((URL) -> Void)?
|
||||||
|
|
||||||
|
func setOpenURL(_ openURL: @escaping (URL) -> Void) {
|
||||||
|
self.openURL = openURL
|
||||||
|
}
|
||||||
|
|
||||||
|
#if os(macOS)
|
||||||
|
nonisolated func reload() async {
|
||||||
|
let systemExtensionInstalled = await SystemExtension.isInstalled()
|
||||||
|
await MainActor.run {
|
||||||
|
self.systemExtensionInstalled = systemExtensionInstalled
|
||||||
|
self.isLoading = false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
func handleStatusChange(_ status: NEVPNStatus, profile: ExtensionProfile) {
|
||||||
|
if status == .connected {
|
||||||
|
notStarted = false
|
||||||
|
}
|
||||||
|
if status == .disconnecting || status == .connected {
|
||||||
|
Task {
|
||||||
|
await checkServiceError()
|
||||||
|
if status == .connected {
|
||||||
|
await checkDeprecatedNotes()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else if status == .connecting {
|
||||||
|
notStarted = true
|
||||||
|
} else if status == .disconnected {
|
||||||
|
if #available(iOS 16.0, macOS 13.0, tvOS 17.0, *) {
|
||||||
|
if notStarted {
|
||||||
|
Task {
|
||||||
|
await checkLastDisconnectError(profile: profile)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
nonisolated func checkDeprecatedNotes() async {
|
||||||
|
if await SharedPreferences.disableDeprecatedWarnings.get() {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
do {
|
||||||
|
let reports = try LibboxNewStandaloneCommandClient()!.getDeprecatedNotes()
|
||||||
|
if reports.hasNext() {
|
||||||
|
await MainActor.run {
|
||||||
|
loopShowDeprecateNotes(reports)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} catch {
|
||||||
|
await MainActor.run {
|
||||||
|
alert = Alert(error)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private func loopShowDeprecateNotes(_ reports: any LibboxDeprecatedNoteIteratorProtocol) {
|
||||||
|
if reports.hasNext() {
|
||||||
|
let report = reports.next()!
|
||||||
|
if report.migrationLink.isEmpty {
|
||||||
|
alert = Alert(
|
||||||
|
title: Text("Deprecated Warning"),
|
||||||
|
message: Text(report.message()),
|
||||||
|
dismissButton: .cancel(Text("Ok")) {
|
||||||
|
Task.detached { [weak self] in
|
||||||
|
try await Task.sleep(nanoseconds: 300 * NSEC_PER_MSEC)
|
||||||
|
await self?.loopShowDeprecateNotes(reports)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
)
|
||||||
|
} else {
|
||||||
|
alert = Alert(
|
||||||
|
title: Text("Deprecated Warning"),
|
||||||
|
message: Text(report.message()),
|
||||||
|
primaryButton: .default(Text("Documentation")) {
|
||||||
|
self.openURL?(URL(string: report.migrationLink)!)
|
||||||
|
Task.detached { [weak self] in
|
||||||
|
try await Task.sleep(nanoseconds: 300 * NSEC_PER_MSEC)
|
||||||
|
await self?.loopShowDeprecateNotes(reports)
|
||||||
|
}
|
||||||
|
},
|
||||||
|
secondaryButton: .cancel(Text("Ok")) {
|
||||||
|
Task.detached { [weak self] in
|
||||||
|
try await Task.sleep(nanoseconds: 300 * NSEC_PER_MSEC)
|
||||||
|
await self?.loopShowDeprecateNotes(reports)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
nonisolated func checkServiceError() async {
|
||||||
|
var error: NSError?
|
||||||
|
let message = LibboxReadServiceError(&error)
|
||||||
|
if error != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
await MainActor.run {
|
||||||
|
alert = Alert(title: Text("Service Error"), message: Text(message!.value))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@available(iOS 16.0, macOS 13.0, tvOS 17.0, *)
|
||||||
|
nonisolated func checkLastDisconnectError(profile: ExtensionProfile) async {
|
||||||
|
var myError: NSError
|
||||||
|
do {
|
||||||
|
try await profile.fetchLastDisconnectError()
|
||||||
|
return
|
||||||
|
} catch {
|
||||||
|
myError = error as NSError
|
||||||
|
}
|
||||||
|
#if os(macOS)
|
||||||
|
if myError.domain == "Library.FullDiskAccessPermissionRequired" {
|
||||||
|
await MainActor.run {
|
||||||
|
alert = Alert(
|
||||||
|
title: Text("Full Disk Access permission is required"),
|
||||||
|
message: Text("Please grant the permission for **SFMExtension**, then we can continue."),
|
||||||
|
primaryButton: .default(Text("Authorize"), action: openFDASettings),
|
||||||
|
secondaryButton: .cancel()
|
||||||
|
)
|
||||||
|
}
|
||||||
|
return
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
let message = myError.localizedDescription
|
||||||
|
await MainActor.run {
|
||||||
|
alert = Alert(title: Text("Service Error"), message: Text(message))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#if os(macOS)
|
||||||
|
private func openFDASettings() {
|
||||||
|
if NSWorkspace.shared.open(URL(string: "x-apple.systempreferences:com.apple.preference.security?Privacy_AllFiles")!) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if #available(macOS 13, *) {
|
||||||
|
NSWorkspace.shared.open(URL(fileURLWithPath: "/System/Applications/System Settings.app"))
|
||||||
|
} else {
|
||||||
|
NSWorkspace.shared.open(URL(fileURLWithPath: "/System/Applications/System Preferences.app"))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
}
|
||||||
@@ -12,14 +12,13 @@ public struct OverviewView: View {
|
|||||||
@Binding private var selectedProfileID: Int64
|
@Binding private var selectedProfileID: Int64
|
||||||
@Binding private var systemProxyAvailable: Bool
|
@Binding private var systemProxyAvailable: Bool
|
||||||
@Binding private var systemProxyEnabled: Bool
|
@Binding private var systemProxyEnabled: Bool
|
||||||
@State private var alert: Alert?
|
@StateObject private var viewModel = OverviewViewModel()
|
||||||
@State private var reasserting = false
|
|
||||||
|
|
||||||
private var selectedProfileIDLocal: Binding<Int64> {
|
private var selectedProfileIDLocal: Binding<Int64> {
|
||||||
$selectedProfileID.withSetter { newValue in
|
$selectedProfileID.withSetter { newValue in
|
||||||
reasserting = true
|
viewModel.reasserting = true
|
||||||
Task { [self] in
|
Task { [self] in
|
||||||
await switchProfile(newValue)
|
await viewModel.switchProfile(newValue, profile: profile, environments: environments)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -47,7 +46,7 @@ public struct OverviewView: View {
|
|||||||
Toggle("HTTP Proxy", isOn: $systemProxyEnabled)
|
Toggle("HTTP Proxy", isOn: $systemProxyEnabled)
|
||||||
.onChangeCompat(of: systemProxyEnabled) { newValue in
|
.onChangeCompat(of: systemProxyEnabled) { newValue in
|
||||||
Task {
|
Task {
|
||||||
await setSystemProxyEnabled(newValue)
|
await viewModel.setSystemProxyEnabled(newValue, profile: profile)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -64,7 +63,7 @@ public struct OverviewView: View {
|
|||||||
Toggle("HTTP Proxy", isOn: $systemProxyEnabled)
|
Toggle("HTTP Proxy", isOn: $systemProxyEnabled)
|
||||||
.onChangeCompat(of: systemProxyEnabled) { newValue in
|
.onChangeCompat(of: systemProxyEnabled) { newValue in
|
||||||
Task {
|
Task {
|
||||||
await setSystemProxyEnabled(newValue)
|
await viewModel.setSystemProxyEnabled(newValue, profile: profile)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -80,55 +79,7 @@ public struct OverviewView: View {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
.alertBinding($alert)
|
.alertBinding($viewModel.alert)
|
||||||
.disabled(!ApplicationLibrary.inPreview && (!profile.status.isSwitchable || reasserting))
|
.disabled(!ApplicationLibrary.inPreview && (!profile.status.isSwitchable || viewModel.reasserting))
|
||||||
}
|
|
||||||
|
|
||||||
private func switchProfile(_ newProfileID: Int64) async {
|
|
||||||
await SharedPreferences.selectedProfileID.set(newProfileID)
|
|
||||||
environments.selectedProfileUpdate.send()
|
|
||||||
if profile.status.isConnected {
|
|
||||||
do {
|
|
||||||
try await serviceReload()
|
|
||||||
} catch {
|
|
||||||
alert = Alert(error)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
reasserting = false
|
|
||||||
}
|
|
||||||
|
|
||||||
private nonisolated func serviceReload() async throws {
|
|
||||||
try LibboxNewStandaloneCommandClient()!.serviceReload()
|
|
||||||
}
|
|
||||||
|
|
||||||
private nonisolated func setSystemProxyEnabled(_ isEnabled: Bool) async {
|
|
||||||
do {
|
|
||||||
await SharedPreferences.systemProxyEnabled.set(isEnabled)
|
|
||||||
if isEnabled {
|
|
||||||
try LibboxNewStandaloneCommandClient()!.setSystemProxyEnabled(isEnabled)
|
|
||||||
} else {
|
|
||||||
// Apple BUG: HTTP Proxy cannot be disabled via setTunnelNetworkSettings, so we can only restart the Network Extension
|
|
||||||
await MainActor.run {
|
|
||||||
reasserting = true
|
|
||||||
}
|
|
||||||
try await profile.stop()
|
|
||||||
var waitSeconds = 0
|
|
||||||
while await profile.status != .disconnected {
|
|
||||||
try await Task.sleep(nanoseconds: NSEC_PER_SEC)
|
|
||||||
waitSeconds += 1
|
|
||||||
if waitSeconds >= 5 {
|
|
||||||
throw NSError(domain: "Restart service timeout", code: 0)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
try await profile.start()
|
|
||||||
await MainActor.run {
|
|
||||||
reasserting = false
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} catch {
|
|
||||||
await MainActor.run {
|
|
||||||
alert = Alert(error)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,60 @@
|
|||||||
|
import Foundation
|
||||||
|
import Libbox
|
||||||
|
import Library
|
||||||
|
import SwiftUI
|
||||||
|
|
||||||
|
@MainActor
|
||||||
|
public final class OverviewViewModel: ObservableObject {
|
||||||
|
@Published var alert: Alert?
|
||||||
|
@Published var reasserting = false
|
||||||
|
|
||||||
|
public init() {}
|
||||||
|
|
||||||
|
func switchProfile(_ newProfileID: Int64, profile: ExtensionProfile, environments: ExtensionEnvironments) async {
|
||||||
|
await SharedPreferences.selectedProfileID.set(newProfileID)
|
||||||
|
environments.selectedProfileUpdate.send()
|
||||||
|
if profile.status.isConnected {
|
||||||
|
do {
|
||||||
|
try await serviceReload()
|
||||||
|
} catch {
|
||||||
|
alert = Alert(error)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
reasserting = false
|
||||||
|
}
|
||||||
|
|
||||||
|
nonisolated func serviceReload() async throws {
|
||||||
|
try LibboxNewStandaloneCommandClient()!.serviceReload()
|
||||||
|
}
|
||||||
|
|
||||||
|
nonisolated func setSystemProxyEnabled(_ isEnabled: Bool, profile: ExtensionProfile) async {
|
||||||
|
do {
|
||||||
|
await SharedPreferences.systemProxyEnabled.set(isEnabled)
|
||||||
|
if isEnabled {
|
||||||
|
try LibboxNewStandaloneCommandClient()!.setSystemProxyEnabled(isEnabled)
|
||||||
|
} else {
|
||||||
|
// Apple BUG: HTTP Proxy cannot be disabled via setTunnelNetworkSettings, so we can only restart the Network Extension
|
||||||
|
await MainActor.run {
|
||||||
|
reasserting = true
|
||||||
|
}
|
||||||
|
try await profile.stop()
|
||||||
|
var waitSeconds = 0
|
||||||
|
while await profile.status != .disconnected {
|
||||||
|
try await Task.sleep(nanoseconds: NSEC_PER_SEC)
|
||||||
|
waitSeconds += 1
|
||||||
|
if waitSeconds >= 5 {
|
||||||
|
throw NSError(domain: "Restart service timeout", code: 0)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
try await profile.start()
|
||||||
|
await MainActor.run {
|
||||||
|
reasserting = false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} catch {
|
||||||
|
await MainActor.run {
|
||||||
|
alert = Alert(error)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,22 +1,19 @@
|
|||||||
import Libbox
|
|
||||||
import Library
|
import Library
|
||||||
import SwiftUI
|
import SwiftUI
|
||||||
|
|
||||||
public struct GroupListView: View {
|
public struct GroupListView: View {
|
||||||
@Environment(\.scenePhase) private var scenePhase
|
@Environment(\.scenePhase) private var scenePhase
|
||||||
@State private var isLoading = true
|
@StateObject private var viewModel = GroupListViewModel()
|
||||||
@StateObject private var commandClient = CommandClient(.groups)
|
|
||||||
@State private var groups: [OutboundGroup] = []
|
|
||||||
|
|
||||||
public init() {}
|
public init() {}
|
||||||
public var body: some View {
|
public var body: some View {
|
||||||
VStack {
|
VStack {
|
||||||
if isLoading {
|
if viewModel.isLoading {
|
||||||
Text("Loading...")
|
Text("Loading...")
|
||||||
} else if !groups.isEmpty {
|
} else if !viewModel.groups.isEmpty {
|
||||||
ScrollView {
|
ScrollView {
|
||||||
VStack {
|
VStack {
|
||||||
ForEach(groups, id: \.hashValue) { it in
|
ForEach(viewModel.groups, id: \.hashValue) { it in
|
||||||
GroupView(it)
|
GroupView(it)
|
||||||
}
|
}
|
||||||
}.padding()
|
}.padding()
|
||||||
@@ -26,56 +23,17 @@ public struct GroupListView: View {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
.onAppear {
|
.onAppear {
|
||||||
connect()
|
viewModel.connect()
|
||||||
}
|
}
|
||||||
.onDisappear {
|
.onDisappear {
|
||||||
commandClient.disconnect()
|
viewModel.disconnect()
|
||||||
}
|
}
|
||||||
.onChangeCompat(of: scenePhase) { newValue in
|
.onChangeCompat(of: scenePhase) { newValue in
|
||||||
if newValue == .active {
|
if newValue == .active {
|
||||||
commandClient.connect()
|
viewModel.connect()
|
||||||
} else {
|
} else {
|
||||||
commandClient.disconnect()
|
viewModel.disconnect()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
.onReceive(commandClient.$groups, perform: { groups in
|
|
||||||
if let groups {
|
|
||||||
setGroups(groups)
|
|
||||||
}
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
private func connect() {
|
|
||||||
if ApplicationLibrary.inPreview {
|
|
||||||
groups = [
|
|
||||||
OutboundGroup(tag: "my_group", type: "selector", selected: "server", selectable: true, isExpand: true, items: [
|
|
||||||
OutboundGroupItem(tag: "server", type: "Shadowsocks", urlTestTime: .now, urlTestDelay: 12),
|
|
||||||
OutboundGroupItem(tag: "server2", type: "WireGuard", urlTestTime: .now, urlTestDelay: 34),
|
|
||||||
OutboundGroupItem(tag: "auto", type: "URLTest", urlTestTime: .now, urlTestDelay: 100),
|
|
||||||
]),
|
|
||||||
OutboundGroup(tag: "group2", type: "urltest", selected: "client", selectable: true, isExpand: false, items:
|
|
||||||
(0 ..< 234).map { index in
|
|
||||||
OutboundGroupItem(tag: "client\(index)", type: "Shadowsocks", urlTestTime: .now, urlTestDelay: UInt16(100 + index * 10))
|
|
||||||
}),
|
|
||||||
]
|
|
||||||
isLoading = false
|
|
||||||
} else {
|
|
||||||
commandClient.connect()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private func setGroups(_ goGroups: [LibboxOutboundGroup]) {
|
|
||||||
var groups = [OutboundGroup]()
|
|
||||||
for goGroup in goGroups {
|
|
||||||
var items = [OutboundGroupItem]()
|
|
||||||
let itemIterator = goGroup.getItems()!
|
|
||||||
while itemIterator.hasNext() {
|
|
||||||
let goItem = itemIterator.next()!
|
|
||||||
items.append(OutboundGroupItem(tag: goItem.tag, type: goItem.type, urlTestTime: Date(timeIntervalSince1970: Double(goItem.urlTestTime)), urlTestDelay: UInt16(goItem.urlTestDelay)))
|
|
||||||
}
|
|
||||||
groups.append(OutboundGroup(tag: goGroup.tag, type: goGroup.type, selected: goGroup.selected, selectable: goGroup.selectable, isExpand: goGroup.isExpand, items: items))
|
|
||||||
}
|
|
||||||
self.groups = groups
|
|
||||||
isLoading = false
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,60 @@
|
|||||||
|
import Combine
|
||||||
|
import Libbox
|
||||||
|
import Library
|
||||||
|
import SwiftUI
|
||||||
|
|
||||||
|
@MainActor
|
||||||
|
public class GroupListViewModel: ObservableObject {
|
||||||
|
@Published public var isLoading = true
|
||||||
|
@Published public var groups: [OutboundGroup] = []
|
||||||
|
|
||||||
|
private let commandClient = CommandClient(.groups)
|
||||||
|
private var cancellables = Set<AnyCancellable>()
|
||||||
|
|
||||||
|
public init() {
|
||||||
|
commandClient.$groups
|
||||||
|
.compactMap { $0 }
|
||||||
|
.sink { [weak self] goGroups in
|
||||||
|
self?.setGroups(goGroups)
|
||||||
|
}
|
||||||
|
.store(in: &cancellables)
|
||||||
|
}
|
||||||
|
|
||||||
|
public func connect() {
|
||||||
|
if ApplicationLibrary.inPreview {
|
||||||
|
groups = [
|
||||||
|
OutboundGroup(tag: "my_group", type: "selector", selected: "server", selectable: true, isExpand: true, items: [
|
||||||
|
OutboundGroupItem(tag: "server", type: "Shadowsocks", urlTestTime: .now, urlTestDelay: 12),
|
||||||
|
OutboundGroupItem(tag: "server2", type: "WireGuard", urlTestTime: .now, urlTestDelay: 34),
|
||||||
|
OutboundGroupItem(tag: "auto", type: "URLTest", urlTestTime: .now, urlTestDelay: 100),
|
||||||
|
]),
|
||||||
|
OutboundGroup(tag: "group2", type: "urltest", selected: "client", selectable: true, isExpand: false, items:
|
||||||
|
(0 ..< 234).map { index in
|
||||||
|
OutboundGroupItem(tag: "client\(index)", type: "Shadowsocks", urlTestTime: .now, urlTestDelay: UInt16(100 + index * 10))
|
||||||
|
}),
|
||||||
|
]
|
||||||
|
isLoading = false
|
||||||
|
} else {
|
||||||
|
commandClient.connect()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public func disconnect() {
|
||||||
|
commandClient.disconnect()
|
||||||
|
}
|
||||||
|
|
||||||
|
private func setGroups(_ goGroups: [LibboxOutboundGroup]) {
|
||||||
|
var groups = [OutboundGroup]()
|
||||||
|
for goGroup in goGroups {
|
||||||
|
var items = [OutboundGroupItem]()
|
||||||
|
let itemIterator = goGroup.getItems()!
|
||||||
|
while itemIterator.hasNext() {
|
||||||
|
let goItem = itemIterator.next()!
|
||||||
|
items.append(OutboundGroupItem(tag: goItem.tag, type: goItem.type, urlTestTime: Date(timeIntervalSince1970: Double(goItem.urlTestTime)), urlTestDelay: UInt16(goItem.urlTestDelay)))
|
||||||
|
}
|
||||||
|
groups.append(OutboundGroup(tag: goGroup.tag, type: goGroup.type, selected: goGroup.selected, selectable: goGroup.selectable, isExpand: goGroup.isExpand, items: items))
|
||||||
|
}
|
||||||
|
self.groups = groups
|
||||||
|
isLoading = false
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,36 +1,31 @@
|
|||||||
import Libbox
|
|
||||||
import Library
|
import Library
|
||||||
import SwiftUI
|
import SwiftUI
|
||||||
|
|
||||||
@MainActor
|
@MainActor
|
||||||
public struct GroupView: View {
|
public struct GroupView: View {
|
||||||
@State private var group: OutboundGroup
|
@StateObject private var viewModel: GroupViewModel
|
||||||
@State private var geometryWidth: CGFloat = 300
|
@State private var geometryWidth: CGFloat = 300
|
||||||
@State private var alert: Alert?
|
|
||||||
|
|
||||||
public init(_ group: OutboundGroup) {
|
public init(_ group: OutboundGroup) {
|
||||||
_group = State(initialValue: group)
|
_viewModel = StateObject(wrappedValue: GroupViewModel(group: group))
|
||||||
}
|
}
|
||||||
|
|
||||||
private var title: some View {
|
private var title: some View {
|
||||||
HStack {
|
HStack {
|
||||||
Text(group.tag)
|
Text(viewModel.group.tag)
|
||||||
.font(.headline)
|
.font(.headline)
|
||||||
Text(group.displayType)
|
Text(viewModel.group.displayType)
|
||||||
.font(.subheadline)
|
.font(.subheadline)
|
||||||
.foregroundColor(.secondary)
|
.foregroundColor(.secondary)
|
||||||
Text("\(group.items.count)")
|
Text("\(viewModel.group.items.count)")
|
||||||
.font(.subheadline)
|
.font(.subheadline)
|
||||||
.padding(EdgeInsets(top: 2, leading: 4, bottom: 2, trailing: 4))
|
.padding(EdgeInsets(top: 2, leading: 4, bottom: 2, trailing: 4))
|
||||||
.background(Color.gray.opacity(0.5))
|
.background(Color.gray.opacity(0.5))
|
||||||
.cornerRadius(4)
|
.cornerRadius(4)
|
||||||
Button {
|
Button {
|
||||||
group.isExpand = !group.isExpand
|
viewModel.toggleExpand()
|
||||||
Task {
|
|
||||||
await setGroupExpand()
|
|
||||||
}
|
|
||||||
} label: {
|
} label: {
|
||||||
if group.isExpand {
|
if viewModel.group.isExpand {
|
||||||
Image(systemName: "arrow.down.to.line")
|
Image(systemName: "arrow.down.to.line")
|
||||||
} else {
|
} else {
|
||||||
Image(systemName: "arrow.up.to.line")
|
Image(systemName: "arrow.up.to.line")
|
||||||
@@ -40,9 +35,7 @@ public struct GroupView: View {
|
|||||||
.buttonStyle(.plain)
|
.buttonStyle(.plain)
|
||||||
#endif
|
#endif
|
||||||
Button {
|
Button {
|
||||||
Task {
|
viewModel.performURLTest()
|
||||||
await doURLTest()
|
|
||||||
}
|
|
||||||
} label: {
|
} label: {
|
||||||
Image(systemName: "bolt.fill")
|
Image(systemName: "bolt.fill")
|
||||||
}
|
}
|
||||||
@@ -50,19 +43,19 @@ public struct GroupView: View {
|
|||||||
.buttonStyle(.plain)
|
.buttonStyle(.plain)
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
.alertBinding($alert)
|
.alertBinding($viewModel.alert)
|
||||||
.padding([.top, .bottom], 8)
|
.padding([.top, .bottom], 8)
|
||||||
.animation(.easeInOut, value: group.isExpand)
|
.animation(.easeInOut, value: viewModel.group.isExpand)
|
||||||
}
|
}
|
||||||
|
|
||||||
public var body: some View {
|
public var body: some View {
|
||||||
Section {
|
Section {
|
||||||
if group.isExpand {
|
if viewModel.group.isExpand {
|
||||||
LazyVGrid(columns: Array(repeating: GridItem(.flexible()),
|
LazyVGrid(columns: Array(repeating: GridItem(.flexible()),
|
||||||
count: explandColumnCount()))
|
count: explandColumnCount()))
|
||||||
{
|
{
|
||||||
ForEach(group.items, id: \.tag) { it in
|
ForEach(viewModel.group.items, id: \.tag) { it in
|
||||||
GroupItemView($group, it)
|
GroupItemView($viewModel.group, it)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
@@ -73,7 +66,7 @@ public struct GroupView: View {
|
|||||||
ZStack {
|
ZStack {
|
||||||
Rectangle()
|
Rectangle()
|
||||||
.fill(it.delayColor)
|
.fill(it.delayColor)
|
||||||
if it.tag == group.selected {
|
if it.tag == viewModel.group.selected {
|
||||||
Rectangle()
|
Rectangle()
|
||||||
.fill(Color.white)
|
.fill(Color.white)
|
||||||
#if !os(tvOS)
|
#if !os(tvOS)
|
||||||
@@ -120,9 +113,9 @@ public struct GroupView: View {
|
|||||||
count = Int(Int(geometryWidth) / 20)
|
count = Int(Int(geometryWidth) / 20)
|
||||||
#endif
|
#endif
|
||||||
if count == 0 {
|
if count == 0 {
|
||||||
return [group.items]
|
return [viewModel.group.items]
|
||||||
} else {
|
} else {
|
||||||
return group.items.chunked(
|
return viewModel.group.items.chunked(
|
||||||
into: count
|
into: count
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
@@ -138,26 +131,6 @@ public struct GroupView: View {
|
|||||||
return standardCount < 1 ? 1 : standardCount
|
return standardCount < 1 ? 1 : standardCount
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
private nonisolated func doURLTest() async {
|
|
||||||
do {
|
|
||||||
try await LibboxNewStandaloneCommandClient()!.urlTest(group.tag)
|
|
||||||
} catch {
|
|
||||||
await MainActor.run {
|
|
||||||
alert = Alert(error)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private nonisolated func setGroupExpand() async {
|
|
||||||
do {
|
|
||||||
try await LibboxNewStandaloneCommandClient()!.setGroupExpand(group.tag, isExpand: group.isExpand)
|
|
||||||
} catch {
|
|
||||||
await MainActor.run {
|
|
||||||
alert = Alert(error)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private extension Array {
|
private extension Array {
|
||||||
|
|||||||
@@ -0,0 +1,46 @@
|
|||||||
|
import Libbox
|
||||||
|
import Library
|
||||||
|
import SwiftUI
|
||||||
|
|
||||||
|
@MainActor
|
||||||
|
public class GroupViewModel: ObservableObject {
|
||||||
|
@Published public var group: OutboundGroup
|
||||||
|
@Published public var alert: Alert?
|
||||||
|
|
||||||
|
public init(group: OutboundGroup) {
|
||||||
|
self.group = group
|
||||||
|
}
|
||||||
|
|
||||||
|
public func toggleExpand() {
|
||||||
|
group.isExpand = !group.isExpand
|
||||||
|
Task {
|
||||||
|
await setGroupExpand()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public func performURLTest() {
|
||||||
|
Task {
|
||||||
|
await doURLTest()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private nonisolated func doURLTest() async {
|
||||||
|
do {
|
||||||
|
try await LibboxNewStandaloneCommandClient()!.urlTest(group.tag)
|
||||||
|
} catch {
|
||||||
|
await MainActor.run {
|
||||||
|
alert = Alert(error)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private nonisolated func setGroupExpand() async {
|
||||||
|
do {
|
||||||
|
try await LibboxNewStandaloneCommandClient()!.setGroupExpand(group.tag, isExpand: group.isExpand)
|
||||||
|
} catch {
|
||||||
|
await MainActor.run {
|
||||||
|
alert = Alert(error)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -10,42 +10,34 @@
|
|||||||
public let readOnly: Bool
|
public let readOnly: Bool
|
||||||
}
|
}
|
||||||
|
|
||||||
private let profileID: Int64?
|
|
||||||
private let readOnly: Bool
|
private let readOnly: Bool
|
||||||
|
@StateObject private var viewModel: EditProfileContentViewModel
|
||||||
|
|
||||||
public init(_ context: Context?) {
|
public init(_ context: Context?) {
|
||||||
profileID = context?.profileID
|
|
||||||
readOnly = context?.readOnly == true
|
readOnly = context?.readOnly == true
|
||||||
|
_viewModel = StateObject(wrappedValue: EditProfileContentViewModel(profileID: context?.profileID))
|
||||||
}
|
}
|
||||||
|
|
||||||
@Environment(\.dismiss) private var dismiss
|
@Environment(\.dismiss) private var dismiss
|
||||||
|
|
||||||
@State private var isLoading = true
|
|
||||||
@State private var profile: Profile!
|
|
||||||
@State private var profileContent = ""
|
|
||||||
@State private var isChanged = false
|
|
||||||
@State private var alert: Alert?
|
|
||||||
|
|
||||||
public var body: some View {
|
public var body: some View {
|
||||||
viewBuilder {
|
viewBuilder {
|
||||||
if isLoading {
|
if viewModel.isLoading {
|
||||||
ProgressView().onAppear {
|
ProgressView().onAppear {
|
||||||
Task {
|
Task {
|
||||||
await loadContent()
|
await viewModel.loadContent()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
viewBuilder {
|
viewBuilder {
|
||||||
if readOnly {
|
if readOnly {
|
||||||
TextEditor(text: .constant(profileContent))
|
TextEditor(text: .constant(viewModel.profileContent))
|
||||||
} else {
|
} else {
|
||||||
TextEditor(text: $profileContent)
|
TextEditor(text: $viewModel.profileContent)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
.font(Font.system(.caption2, design: .monospaced))
|
.font(Font.system(.caption2, design: .monospaced))
|
||||||
.autocorrectionDisabled(true)
|
.autocorrectionDisabled(true)
|
||||||
// https://stackoverflow.com/questions/66721935/swiftui-how-to-disable-the-smart-quotes-in-texteditor
|
|
||||||
// https://stackoverflow.com/questions/74034171/textfield-with-autocorrectiondisabled-still-shows-predictive-text-bar
|
|
||||||
.textContentType(.init(rawValue: ""))
|
.textContentType(.init(rawValue: ""))
|
||||||
#if os(iOS)
|
#if os(iOS)
|
||||||
.keyboardType(.asciiCapable)
|
.keyboardType(.asciiCapable)
|
||||||
@@ -54,12 +46,12 @@
|
|||||||
#elseif os(macOS)
|
#elseif os(macOS)
|
||||||
.padding()
|
.padding()
|
||||||
#endif
|
#endif
|
||||||
.onChangeCompat(of: profileContent) {
|
.onChangeCompat(of: viewModel.profileContent) {
|
||||||
isChanged = true
|
viewModel.markAsChanged()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
.alertBinding($alert)
|
.alertBinding($viewModel.alert)
|
||||||
.navigationTitle(navigationTitle)
|
.navigationTitle(navigationTitle)
|
||||||
#if os(macOS)
|
#if os(macOS)
|
||||||
.toolbar {
|
.toolbar {
|
||||||
@@ -67,15 +59,15 @@
|
|||||||
if !readOnly {
|
if !readOnly {
|
||||||
Button {
|
Button {
|
||||||
Task {
|
Task {
|
||||||
await saveContent()
|
await viewModel.saveContent()
|
||||||
}
|
}
|
||||||
} label: {
|
} label: {
|
||||||
Label("Save", image: "save")
|
Label("Save", image: "save")
|
||||||
}
|
}
|
||||||
.disabled(!isChanged)
|
.disabled(!viewModel.isChanged)
|
||||||
} else {
|
} else {
|
||||||
Button {
|
Button {
|
||||||
NSPasteboard.general.setString(profileContent, forType: .fileContents)
|
NSPasteboard.general.setString(viewModel.profileContent, forType: .fileContents)
|
||||||
} label: {
|
} label: {
|
||||||
Label("Copy", systemImage: "clipboard.fill")
|
Label("Copy", systemImage: "clipboard.fill")
|
||||||
}
|
}
|
||||||
@@ -88,12 +80,12 @@
|
|||||||
if !readOnly {
|
if !readOnly {
|
||||||
Button("Save") {
|
Button("Save") {
|
||||||
Task {
|
Task {
|
||||||
await saveContent()
|
await viewModel.saveContent()
|
||||||
}
|
}
|
||||||
}.disabled(!isChanged)
|
}.disabled(!viewModel.isChanged)
|
||||||
} else {
|
} else {
|
||||||
Button("Copy") {
|
Button("Copy") {
|
||||||
UIPasteboard.general.string = profileContent
|
UIPasteboard.general.string = viewModel.profileContent
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -109,46 +101,6 @@
|
|||||||
return String(localized: "Edit Content")
|
return String(localized: "Edit Content")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private func loadContent() async {
|
|
||||||
do {
|
|
||||||
try await loadContentBackground()
|
|
||||||
} catch {
|
|
||||||
alert = Alert(error)
|
|
||||||
}
|
|
||||||
isLoading = false
|
|
||||||
}
|
|
||||||
|
|
||||||
private nonisolated func loadContentBackground() async throws {
|
|
||||||
guard let profileID else {
|
|
||||||
throw NSError(domain: "Context destroyed", code: 0)
|
|
||||||
}
|
|
||||||
guard let profile = try await ProfileManager.get(profileID) else {
|
|
||||||
throw NSError(domain: "Profile missing", code: 0)
|
|
||||||
}
|
|
||||||
let profileContent = try profile.read()
|
|
||||||
await MainActor.run {
|
|
||||||
self.profile = profile
|
|
||||||
self.profileContent = profileContent
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private func saveContent() async {
|
|
||||||
guard let profile else {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
do {
|
|
||||||
try await saveContentBackground(profile)
|
|
||||||
} catch {
|
|
||||||
alert = Alert(error)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
isChanged = false
|
|
||||||
}
|
|
||||||
|
|
||||||
private nonisolated func saveContentBackground(_ profile: Profile) async throws {
|
|
||||||
try await profile.write(profileContent)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
@@ -0,0 +1,66 @@
|
|||||||
|
#if os(iOS) || os(macOS)
|
||||||
|
import Foundation
|
||||||
|
import Library
|
||||||
|
import SwiftUI
|
||||||
|
|
||||||
|
@MainActor
|
||||||
|
public final class EditProfileContentViewModel: ObservableObject {
|
||||||
|
@Published public var isLoading = true
|
||||||
|
@Published public var profile: Profile?
|
||||||
|
@Published public var profileContent = ""
|
||||||
|
@Published public var isChanged = false
|
||||||
|
@Published public var alert: Alert?
|
||||||
|
|
||||||
|
private let profileID: Int64?
|
||||||
|
|
||||||
|
public init(profileID: Int64?) {
|
||||||
|
self.profileID = profileID
|
||||||
|
}
|
||||||
|
|
||||||
|
public func markAsChanged() {
|
||||||
|
isChanged = true
|
||||||
|
}
|
||||||
|
|
||||||
|
public func loadContent() async {
|
||||||
|
do {
|
||||||
|
try await loadContentBackground()
|
||||||
|
} catch {
|
||||||
|
alert = Alert(error)
|
||||||
|
}
|
||||||
|
isLoading = false
|
||||||
|
}
|
||||||
|
|
||||||
|
private nonisolated func loadContentBackground() async throws {
|
||||||
|
guard let profileID else {
|
||||||
|
throw NSError(domain: "Context destroyed", code: 0)
|
||||||
|
}
|
||||||
|
guard let profile = try await ProfileManager.get(profileID) else {
|
||||||
|
throw NSError(domain: "Profile missing", code: 0)
|
||||||
|
}
|
||||||
|
let profileContent = try profile.read()
|
||||||
|
await MainActor.run {
|
||||||
|
self.profile = profile
|
||||||
|
self.profileContent = profileContent
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public func saveContent() async {
|
||||||
|
guard let profile else {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
do {
|
||||||
|
try await saveContentBackground(profile)
|
||||||
|
} catch {
|
||||||
|
alert = Alert(error)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
isChanged = false
|
||||||
|
}
|
||||||
|
|
||||||
|
private nonisolated func saveContentBackground(_ profile: Profile) async throws {
|
||||||
|
let profileContent = await profileContent
|
||||||
|
try profile.write(profileContent)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#endif
|
||||||
@@ -7,12 +7,7 @@ public struct EditProfileView: View {
|
|||||||
@EnvironmentObject private var environments: ExtensionEnvironments
|
@EnvironmentObject private var environments: ExtensionEnvironments
|
||||||
@Environment(\.dismiss) private var dismiss
|
@Environment(\.dismiss) private var dismiss
|
||||||
@EnvironmentObject private var profile: Profile
|
@EnvironmentObject private var profile: Profile
|
||||||
|
@StateObject private var viewModel = EditProfileViewModel()
|
||||||
@State private var isLoading = false
|
|
||||||
@State private var isChanged = false
|
|
||||||
@State private var alert: Alert?
|
|
||||||
@State private var shareLinkPresented = false
|
|
||||||
@State private var shareLinkText: String?
|
|
||||||
|
|
||||||
public init() {}
|
public init() {}
|
||||||
public var body: some View {
|
public var body: some View {
|
||||||
@@ -80,19 +75,19 @@ public struct EditProfileView: View {
|
|||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
FormButton {
|
FormButton {
|
||||||
isLoading = true
|
viewModel.isLoading = true
|
||||||
Task {
|
Task {
|
||||||
await updateProfile()
|
await viewModel.updateProfile(profile, environments: environments)
|
||||||
}
|
}
|
||||||
} label: {
|
} label: {
|
||||||
Label("Update", systemImage: "arrow.clockwise")
|
Label("Update", systemImage: "arrow.clockwise")
|
||||||
}
|
}
|
||||||
.foregroundColor(.accentColor)
|
.foregroundColor(.accentColor)
|
||||||
.disabled(isLoading)
|
.disabled(viewModel.isLoading)
|
||||||
}
|
}
|
||||||
FormButton(role: .destructive) {
|
FormButton(role: .destructive) {
|
||||||
Task {
|
Task {
|
||||||
await deleteProfile()
|
await viewModel.deleteProfile(profile, environments: environments, dismiss: dismiss)
|
||||||
}
|
}
|
||||||
} label: {
|
} label: {
|
||||||
Label("Delete", systemImage: "trash.fill")
|
Label("Delete", systemImage: "trash.fill")
|
||||||
@@ -101,84 +96,42 @@ public struct EditProfileView: View {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
.onChangeCompat(of: profile.name) {
|
.onChangeCompat(of: profile.name) {
|
||||||
isChanged = true
|
viewModel.markAsChanged()
|
||||||
}
|
}
|
||||||
.onChangeCompat(of: profile.remoteURL) {
|
.onChangeCompat(of: profile.remoteURL) {
|
||||||
isChanged = true
|
viewModel.markAsChanged()
|
||||||
}
|
}
|
||||||
.onChangeCompat(of: profile.autoUpdate) {
|
.onChangeCompat(of: profile.autoUpdate) {
|
||||||
isChanged = true
|
viewModel.markAsChanged()
|
||||||
}
|
}
|
||||||
.disabled(isLoading)
|
.disabled(viewModel.isLoading)
|
||||||
#if os(macOS)
|
#if os(macOS)
|
||||||
.toolbar {
|
.toolbar {
|
||||||
ToolbarItemGroup(placement: .navigation) {
|
ToolbarItemGroup(placement: .navigation) {
|
||||||
Button {
|
Button {
|
||||||
isLoading = true
|
viewModel.isLoading = true
|
||||||
Task {
|
Task {
|
||||||
await saveProfile()
|
await viewModel.saveProfile(profile, environments: environments)
|
||||||
}
|
}
|
||||||
} label: {
|
} label: {
|
||||||
Image("save", bundle: ApplicationLibrary.bundle, label: Text("Save"))
|
Image("save", bundle: ApplicationLibrary.bundle, label: Text("Save"))
|
||||||
}
|
}
|
||||||
.disabled(isLoading || !isChanged)
|
.disabled(viewModel.isLoading || !viewModel.isChanged)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#elseif os(iOS)
|
#elseif os(iOS)
|
||||||
.toolbar {
|
.toolbar {
|
||||||
ToolbarItem(placement: .navigationBarTrailing) {
|
ToolbarItem(placement: .navigationBarTrailing) {
|
||||||
Button("Save") {
|
Button("Save") {
|
||||||
isLoading = true
|
viewModel.isLoading = true
|
||||||
Task {
|
Task {
|
||||||
await saveProfile()
|
await viewModel.saveProfile(profile, environments: environments)
|
||||||
}
|
}
|
||||||
}.disabled(!isChanged)
|
}.disabled(!viewModel.isChanged)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
.alertBinding($alert)
|
.alertBinding($viewModel.alert)
|
||||||
.navigationTitle("Edit Profile")
|
.navigationTitle("Edit Profile")
|
||||||
}
|
}
|
||||||
|
|
||||||
private func updateProfile() async {
|
|
||||||
defer {
|
|
||||||
isLoading = false
|
|
||||||
}
|
|
||||||
do {
|
|
||||||
try await Task.sleep(nanoseconds: UInt64(100 * Double(NSEC_PER_MSEC)))
|
|
||||||
try await profile.updateRemoteProfile()
|
|
||||||
environments.profileUpdate.send()
|
|
||||||
} catch {
|
|
||||||
alert = Alert(error)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private func deleteProfile() async {
|
|
||||||
do {
|
|
||||||
try await ProfileManager.delete(profile)
|
|
||||||
} catch {
|
|
||||||
alert = Alert(error)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
environments.profileUpdate.send()
|
|
||||||
dismiss()
|
|
||||||
}
|
|
||||||
|
|
||||||
private func saveProfile() async {
|
|
||||||
do {
|
|
||||||
_ = try await ProfileManager.update(profile)
|
|
||||||
#if os(iOS) || os(tvOS)
|
|
||||||
try UIProfileUpdateTask.configure()
|
|
||||||
#else
|
|
||||||
try await ProfileUpdateTask.configure()
|
|
||||||
#endif
|
|
||||||
try await profile.onProfileUpdated()
|
|
||||||
} catch {
|
|
||||||
alert = Alert(error)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
isChanged = false
|
|
||||||
isLoading = false
|
|
||||||
environments.profileUpdate.send()
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,60 @@
|
|||||||
|
import Libbox
|
||||||
|
import Library
|
||||||
|
import SwiftUI
|
||||||
|
|
||||||
|
@MainActor
|
||||||
|
public final class EditProfileViewModel: ObservableObject {
|
||||||
|
@Published public var isLoading = false
|
||||||
|
@Published public var isChanged = false
|
||||||
|
@Published public var alert: Alert?
|
||||||
|
@Published public var shareLinkPresented = false
|
||||||
|
@Published public var shareLinkText: String?
|
||||||
|
|
||||||
|
public init() {}
|
||||||
|
|
||||||
|
public func markAsChanged() {
|
||||||
|
isChanged = true
|
||||||
|
}
|
||||||
|
|
||||||
|
public func updateProfile(_ profile: Profile, environments: ExtensionEnvironments) async {
|
||||||
|
defer {
|
||||||
|
isLoading = false
|
||||||
|
}
|
||||||
|
do {
|
||||||
|
try await Task.sleep(nanoseconds: UInt64(100 * Double(NSEC_PER_MSEC)))
|
||||||
|
try await profile.updateRemoteProfile()
|
||||||
|
environments.profileUpdate.send()
|
||||||
|
} catch {
|
||||||
|
alert = Alert(error)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public func deleteProfile(_ profile: Profile, environments: ExtensionEnvironments, dismiss: DismissAction) async {
|
||||||
|
do {
|
||||||
|
try await ProfileManager.delete(profile)
|
||||||
|
} catch {
|
||||||
|
alert = Alert(error)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
environments.profileUpdate.send()
|
||||||
|
dismiss()
|
||||||
|
}
|
||||||
|
|
||||||
|
public func saveProfile(_ profile: Profile, environments: ExtensionEnvironments) async {
|
||||||
|
do {
|
||||||
|
_ = try await ProfileManager.update(profile)
|
||||||
|
#if os(iOS) || os(tvOS)
|
||||||
|
try UIProfileUpdateTask.configure()
|
||||||
|
#else
|
||||||
|
try await ProfileUpdateTask.configure()
|
||||||
|
#endif
|
||||||
|
try await profile.onProfileUpdated()
|
||||||
|
} catch {
|
||||||
|
alert = Alert(error)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
isChanged = false
|
||||||
|
isLoading = false
|
||||||
|
environments.profileUpdate.send()
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -9,19 +9,12 @@
|
|||||||
public struct ImportProfileView: View {
|
public struct ImportProfileView: View {
|
||||||
@EnvironmentObject private var environments: ExtensionEnvironments
|
@EnvironmentObject private var environments: ExtensionEnvironments
|
||||||
@Environment(\.dismiss) private var dismiss
|
@Environment(\.dismiss) private var dismiss
|
||||||
|
@StateObject private var viewModel = ImportProfileViewModel()
|
||||||
@State private var isLoading = false
|
|
||||||
@State private var selected = false
|
|
||||||
@State private var alert: Alert?
|
|
||||||
@State private var connection: NWConnection?
|
|
||||||
@State private var socket: NWSocket?
|
|
||||||
@State private var profiles: [LibboxProfilePreview]?
|
|
||||||
@State private var isImporting = false
|
|
||||||
|
|
||||||
public init() {}
|
public init() {}
|
||||||
public var body: some View {
|
public var body: some View {
|
||||||
VStack(alignment: .center) {
|
VStack(alignment: .center) {
|
||||||
if !selected {
|
if !viewModel.selected {
|
||||||
Form {
|
Form {
|
||||||
Section {
|
Section {
|
||||||
EmptyView()
|
EmptyView()
|
||||||
@@ -32,9 +25,9 @@
|
|||||||
DevicePicker(
|
DevicePicker(
|
||||||
.applicationService(name: "sing-box:profile"))
|
.applicationService(name: "sing-box:profile"))
|
||||||
{ endpoint in
|
{ endpoint in
|
||||||
selected = true
|
viewModel.selected = true
|
||||||
Task {
|
Task {
|
||||||
await handleEndpoint(endpoint)
|
await viewModel.handleEndpoint(endpoint, environments: environments, dismiss: dismiss)
|
||||||
}
|
}
|
||||||
} label: {
|
} label: {
|
||||||
Text("Select Device")
|
Text("Select Device")
|
||||||
@@ -44,7 +37,7 @@
|
|||||||
.applicationService
|
.applicationService
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else if let profiles {
|
} else if let profiles = viewModel.profiles {
|
||||||
Form {
|
Form {
|
||||||
Section {
|
Section {
|
||||||
EmptyView()
|
EmptyView()
|
||||||
@@ -53,12 +46,12 @@
|
|||||||
}
|
}
|
||||||
ForEach(profiles, id: \.profileID) { profile in
|
ForEach(profiles, id: \.profileID) { profile in
|
||||||
Button(profile.name) {
|
Button(profile.name) {
|
||||||
isLoading = true
|
viewModel.isLoading = true
|
||||||
Task {
|
Task {
|
||||||
selectProfile(profileID: profile.profileID)
|
viewModel.selectProfile(profileID: profile.profileID)
|
||||||
isLoading = false
|
viewModel.isLoading = false
|
||||||
}
|
}
|
||||||
}.disabled(isLoading || isImporting)
|
}.disabled(viewModel.isLoading || viewModel.isImporting)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
@@ -66,145 +59,9 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
.focusSection()
|
.focusSection()
|
||||||
.alertBinding($alert)
|
.alertBinding($viewModel.alert)
|
||||||
.navigationTitle("Import Profile")
|
.navigationTitle("Import Profile")
|
||||||
}
|
}
|
||||||
|
|
||||||
private func reset() {
|
|
||||||
if let connection {
|
|
||||||
connection.stateUpdateHandler = nil
|
|
||||||
connection.cancel()
|
|
||||||
self.connection = nil
|
|
||||||
}
|
|
||||||
if let socket {
|
|
||||||
socket.cancel()
|
|
||||||
self.socket = nil
|
|
||||||
}
|
|
||||||
selected = false
|
|
||||||
profiles = nil
|
|
||||||
}
|
|
||||||
|
|
||||||
private func handleEndpoint(_ endpoint: NWEndpoint) async {
|
|
||||||
let connection = NWConnection(to: endpoint, using: NWParameters.applicationService)
|
|
||||||
self.connection = connection
|
|
||||||
socket = NWSocket(connection)
|
|
||||||
connection.stateUpdateHandler = { state in
|
|
||||||
switch state {
|
|
||||||
case let .failed(error):
|
|
||||||
DispatchQueue.main.async { [self] in
|
|
||||||
reset()
|
|
||||||
alert = Alert(error)
|
|
||||||
}
|
|
||||||
default: break
|
|
||||||
}
|
|
||||||
}
|
|
||||||
connection.start(queue: .global())
|
|
||||||
do {
|
|
||||||
try await loopMessages()
|
|
||||||
} catch {
|
|
||||||
alert = Alert(error)
|
|
||||||
reset()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private nonisolated func loopMessages() async throws {
|
|
||||||
guard let socket = await socket else {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
var message: Data
|
|
||||||
while true {
|
|
||||||
do {
|
|
||||||
message = try socket.read()
|
|
||||||
} catch {
|
|
||||||
throw NSError(domain: "read from connection: \(error.localizedDescription)", code: 0)
|
|
||||||
}
|
|
||||||
var error: NSError?
|
|
||||||
switch Int64(message[0]) {
|
|
||||||
case LibboxMessageTypeError:
|
|
||||||
let message = LibboxDecodeErrorMessage(message, &error)
|
|
||||||
if let error {
|
|
||||||
throw error
|
|
||||||
}
|
|
||||||
if let message {
|
|
||||||
throw NSError(domain: "remote error: \(message.message)", code: 0)
|
|
||||||
}
|
|
||||||
case LibboxMessageTypeProfileList:
|
|
||||||
let decoder = LibboxProfileDecoder()
|
|
||||||
try decoder.decode(message)
|
|
||||||
let iterator = decoder.iterator()!
|
|
||||||
var profiles = [LibboxProfilePreview]()
|
|
||||||
while iterator.hasNext() {
|
|
||||||
let profile = iterator.next()!
|
|
||||||
if profile.type == LibboxProfileTypeiCloud {
|
|
||||||
// not supported on tvOS
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
profiles.append(profile)
|
|
||||||
}
|
|
||||||
await MainActor.run { [self, profiles] in
|
|
||||||
self.profiles = profiles
|
|
||||||
isImporting = false
|
|
||||||
}
|
|
||||||
case LibboxMessageTypeProfileContent:
|
|
||||||
let content = LibboxDecodeProfileContent(message, &error)
|
|
||||||
if let error {
|
|
||||||
throw error
|
|
||||||
}
|
|
||||||
try await importProfile(content!)
|
|
||||||
return
|
|
||||||
default:
|
|
||||||
throw NSError(domain: "unknown message type \(message[0])", code: 0)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private func selectProfile(profileID: Int64) {
|
|
||||||
guard let connection else {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
guard let socket else {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
connection.stateUpdateHandler = nil
|
|
||||||
let request = LibboxProfileContentRequest()
|
|
||||||
request.profileID = profileID
|
|
||||||
do {
|
|
||||||
try socket.write(request.encode())
|
|
||||||
isImporting = true
|
|
||||||
} catch {
|
|
||||||
alert = Alert(error)
|
|
||||||
reset()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private nonisolated func importProfile(_ content: LibboxProfileContent) async throws {
|
|
||||||
var type: ProfileType = .local
|
|
||||||
switch content.type {
|
|
||||||
case LibboxProfileTypeLocal:
|
|
||||||
type = .local
|
|
||||||
case LibboxProfileTypeiCloud:
|
|
||||||
type = .icloud
|
|
||||||
case LibboxProfileTypeRemote:
|
|
||||||
type = .remote
|
|
||||||
default:
|
|
||||||
break
|
|
||||||
}
|
|
||||||
let nextProfileID = try await ProfileManager.nextID()
|
|
||||||
let profileConfigDirectory = FilePath.sharedDirectory.appendingPathComponent("configs", isDirectory: true)
|
|
||||||
try FileManager.default.createDirectory(at: profileConfigDirectory, withIntermediateDirectories: true)
|
|
||||||
let profileConfig = profileConfigDirectory.appendingPathComponent("config_\(nextProfileID).json")
|
|
||||||
try content.config.write(to: profileConfig, atomically: true, encoding: .utf8)
|
|
||||||
var lastUpdated: Date?
|
|
||||||
if content.lastUpdated > 0 {
|
|
||||||
lastUpdated = Date(timeIntervalSince1970: Double(content.lastUpdated))
|
|
||||||
}
|
|
||||||
try await ProfileManager.create(Profile(name: content.name, type: type, path: profileConfig.relativePath, remoteURL: content.remotePath, autoUpdate: content.autoUpdate, lastUpdated: lastUpdated))
|
|
||||||
await reset()
|
|
||||||
await MainActor.run {
|
|
||||||
environments.profileUpdate.send()
|
|
||||||
dismiss()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
@@ -0,0 +1,157 @@
|
|||||||
|
#if os(tvOS)
|
||||||
|
|
||||||
|
import DeviceDiscoveryUI
|
||||||
|
import Libbox
|
||||||
|
import Library
|
||||||
|
import Network
|
||||||
|
import SwiftUI
|
||||||
|
|
||||||
|
@MainActor
|
||||||
|
public final class ImportProfileViewModel: ObservableObject {
|
||||||
|
@Published public var isLoading = false
|
||||||
|
@Published public var selected = false
|
||||||
|
@Published public var alert: Alert?
|
||||||
|
@Published public var connection: NWConnection?
|
||||||
|
@Published public var socket: NWSocket?
|
||||||
|
@Published public var profiles: [LibboxProfilePreview]?
|
||||||
|
@Published public var isImporting = false
|
||||||
|
|
||||||
|
public init() {}
|
||||||
|
|
||||||
|
public func reset() {
|
||||||
|
if let connection {
|
||||||
|
connection.stateUpdateHandler = nil
|
||||||
|
connection.cancel()
|
||||||
|
self.connection = nil
|
||||||
|
}
|
||||||
|
if let socket {
|
||||||
|
socket.cancel()
|
||||||
|
self.socket = nil
|
||||||
|
}
|
||||||
|
selected = false
|
||||||
|
profiles = nil
|
||||||
|
}
|
||||||
|
|
||||||
|
public func handleEndpoint(_ endpoint: NWEndpoint, environments: ExtensionEnvironments, dismiss: DismissAction) async {
|
||||||
|
let connection = NWConnection(to: endpoint, using: NWParameters.applicationService)
|
||||||
|
self.connection = connection
|
||||||
|
socket = NWSocket(connection)
|
||||||
|
connection.stateUpdateHandler = { state in
|
||||||
|
switch state {
|
||||||
|
case let .failed(error):
|
||||||
|
DispatchQueue.main.async { [self] in
|
||||||
|
reset()
|
||||||
|
alert = Alert(error)
|
||||||
|
}
|
||||||
|
default: break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
connection.start(queue: .global())
|
||||||
|
do {
|
||||||
|
try await loopMessages(environments: environments, dismiss: dismiss)
|
||||||
|
} catch {
|
||||||
|
alert = Alert(error)
|
||||||
|
reset()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private nonisolated func loopMessages(environments: ExtensionEnvironments, dismiss: DismissAction) async throws {
|
||||||
|
guard let socket = await socket else {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
var message: Data
|
||||||
|
while true {
|
||||||
|
do {
|
||||||
|
message = try socket.read()
|
||||||
|
} catch {
|
||||||
|
throw NSError(domain: "read from connection: \(error.localizedDescription)", code: 0)
|
||||||
|
}
|
||||||
|
var error: NSError?
|
||||||
|
switch Int64(message[0]) {
|
||||||
|
case LibboxMessageTypeError:
|
||||||
|
let message = LibboxDecodeErrorMessage(message, &error)
|
||||||
|
if let error {
|
||||||
|
throw error
|
||||||
|
}
|
||||||
|
if let message {
|
||||||
|
throw NSError(domain: "remote error: \(message.message)", code: 0)
|
||||||
|
}
|
||||||
|
case LibboxMessageTypeProfileList:
|
||||||
|
let decoder = LibboxProfileDecoder()
|
||||||
|
try decoder.decode(message)
|
||||||
|
let iterator = decoder.iterator()!
|
||||||
|
var profiles = [LibboxProfilePreview]()
|
||||||
|
while iterator.hasNext() {
|
||||||
|
let profile = iterator.next()!
|
||||||
|
if profile.type == LibboxProfileTypeiCloud {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
profiles.append(profile)
|
||||||
|
}
|
||||||
|
await MainActor.run { [self, profiles] in
|
||||||
|
self.profiles = profiles
|
||||||
|
isImporting = false
|
||||||
|
}
|
||||||
|
case LibboxMessageTypeProfileContent:
|
||||||
|
let content = LibboxDecodeProfileContent(message, &error)
|
||||||
|
if let error {
|
||||||
|
throw error
|
||||||
|
}
|
||||||
|
try await importProfile(content!, environments: environments, dismiss: dismiss)
|
||||||
|
return
|
||||||
|
default:
|
||||||
|
throw NSError(domain: "unknown message type \(message[0])", code: 0)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public func selectProfile(profileID: Int64) {
|
||||||
|
guard let connection else {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
guard let socket else {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
connection.stateUpdateHandler = nil
|
||||||
|
let request = LibboxProfileContentRequest()
|
||||||
|
request.profileID = profileID
|
||||||
|
do {
|
||||||
|
try socket.write(request.encode())
|
||||||
|
isImporting = true
|
||||||
|
} catch {
|
||||||
|
alert = Alert(error)
|
||||||
|
reset()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private nonisolated func importProfile(_ content: LibboxProfileContent, environments: ExtensionEnvironments, dismiss: DismissAction) async throws {
|
||||||
|
var type: ProfileType = .local
|
||||||
|
switch content.type {
|
||||||
|
case LibboxProfileTypeLocal:
|
||||||
|
type = .local
|
||||||
|
case LibboxProfileTypeiCloud:
|
||||||
|
type = .icloud
|
||||||
|
case LibboxProfileTypeRemote:
|
||||||
|
type = .remote
|
||||||
|
default:
|
||||||
|
break
|
||||||
|
}
|
||||||
|
let nextProfileID = try await ProfileManager.nextID()
|
||||||
|
let profileConfigDirectory = FilePath.sharedDirectory.appendingPathComponent("configs", isDirectory: true)
|
||||||
|
try FileManager.default.createDirectory(at: profileConfigDirectory, withIntermediateDirectories: true)
|
||||||
|
let profileConfig = profileConfigDirectory.appendingPathComponent("config_\(nextProfileID).json")
|
||||||
|
try content.config.write(to: profileConfig, atomically: true, encoding: .utf8)
|
||||||
|
var lastUpdated: Date?
|
||||||
|
if content.lastUpdated > 0 {
|
||||||
|
lastUpdated = Date(timeIntervalSince1970: Double(content.lastUpdated))
|
||||||
|
}
|
||||||
|
try await ProfileManager.create(Profile(name: content.name, type: type, path: profileConfig.relativePath, remoteURL: content.remotePath, autoUpdate: content.autoUpdate, lastUpdated: lastUpdated))
|
||||||
|
await reset()
|
||||||
|
await MainActor.run {
|
||||||
|
environments.profileUpdate.send()
|
||||||
|
dismiss()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#endif
|
||||||
@@ -7,21 +7,7 @@ import SwiftUI
|
|||||||
public struct NewProfileView: View {
|
public struct NewProfileView: View {
|
||||||
@EnvironmentObject private var environments: ExtensionEnvironments
|
@EnvironmentObject private var environments: ExtensionEnvironments
|
||||||
@Environment(\.dismiss) private var dismiss
|
@Environment(\.dismiss) private var dismiss
|
||||||
|
@StateObject private var viewModel: NewProfileViewModel
|
||||||
@State private var isSaving = false
|
|
||||||
@State private var profileName = ""
|
|
||||||
#if !os(tvOS)
|
|
||||||
@State private var profileType = ProfileType.local
|
|
||||||
#else
|
|
||||||
@State private var profileType = ProfileType.remote
|
|
||||||
#endif
|
|
||||||
@State private var fileImport = false
|
|
||||||
@State private var fileURL: URL!
|
|
||||||
@State private var remotePath = ""
|
|
||||||
@State private var autoUpdate = true
|
|
||||||
@State private var autoUpdateInterval: Int32 = 60
|
|
||||||
@State private var pickerPresented = false
|
|
||||||
@State private var alert: Alert?
|
|
||||||
|
|
||||||
public struct ImportRequest: Codable, Hashable {
|
public struct ImportRequest: Codable, Hashable {
|
||||||
public let name: String
|
public let name: String
|
||||||
@@ -29,20 +15,16 @@ public struct NewProfileView: View {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public init(_ importRequest: ImportRequest? = nil) {
|
public init(_ importRequest: ImportRequest? = nil) {
|
||||||
if let importRequest {
|
_viewModel = StateObject(wrappedValue: NewProfileViewModel(importRequest: importRequest))
|
||||||
_profileName = .init(initialValue: importRequest.name)
|
|
||||||
_profileType = .init(initialValue: .remote)
|
|
||||||
_remotePath = .init(initialValue: importRequest.url)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public var body: some View {
|
public var body: some View {
|
||||||
FormView {
|
FormView {
|
||||||
FormItem(String(localized: "Name")) {
|
FormItem(String(localized: "Name")) {
|
||||||
TextField("Name", text: $profileName, prompt: Text("Required"))
|
TextField("Name", text: $viewModel.profileName, prompt: Text("Required"))
|
||||||
.multilineTextAlignment(.trailing)
|
.multilineTextAlignment(.trailing)
|
||||||
}
|
}
|
||||||
Picker(selection: $profileType) {
|
Picker(selection: $viewModel.profileType) {
|
||||||
#if !os(tvOS)
|
#if !os(tvOS)
|
||||||
Text("Local").tag(ProfileType.local)
|
Text("Local").tag(ProfileType.local)
|
||||||
Text("iCloud").tag(ProfileType.icloud)
|
Text("iCloud").tag(ProfileType.icloud)
|
||||||
@@ -51,8 +33,8 @@ public struct NewProfileView: View {
|
|||||||
} label: {
|
} label: {
|
||||||
Text("Type")
|
Text("Type")
|
||||||
}
|
}
|
||||||
if profileType == .local {
|
if viewModel.profileType == .local {
|
||||||
Picker(selection: $fileImport) {
|
Picker(selection: $viewModel.fileImport) {
|
||||||
Text("Create New").tag(false)
|
Text("Create New").tag(false)
|
||||||
Text("Import").tag(true)
|
Text("Import").tag(true)
|
||||||
} label: {
|
} label: {
|
||||||
@@ -62,42 +44,42 @@ public struct NewProfileView: View {
|
|||||||
.disabled(true)
|
.disabled(true)
|
||||||
#endif
|
#endif
|
||||||
viewBuilder {
|
viewBuilder {
|
||||||
if fileImport {
|
if viewModel.fileImport {
|
||||||
HStack {
|
HStack {
|
||||||
Text("File Path")
|
Text("File Path")
|
||||||
Spacer()
|
Spacer()
|
||||||
Spacer()
|
Spacer()
|
||||||
if let fileURL {
|
if let fileURL = viewModel.fileURL {
|
||||||
Button(fileURL.fileName) {
|
Button(fileURL.fileName) {
|
||||||
pickerPresented = true
|
viewModel.pickerPresented = true
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
Button("Choose") {
|
Button("Choose") {
|
||||||
pickerPresented = true
|
viewModel.pickerPresented = true
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else if profileType == .icloud {
|
} else if viewModel.profileType == .icloud {
|
||||||
FormItem(String(localized: "Path")) {
|
FormItem(String(localized: "Path")) {
|
||||||
TextField("Path", text: $remotePath, prompt: Text("Required"))
|
TextField("Path", text: $viewModel.remotePath, prompt: Text("Required"))
|
||||||
.multilineTextAlignment(.trailing)
|
.multilineTextAlignment(.trailing)
|
||||||
#if !os(macOS)
|
#if !os(macOS)
|
||||||
.keyboardType(.asciiCapableNumberPad)
|
.keyboardType(.asciiCapableNumberPad)
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
} else if profileType == .remote {
|
} else if viewModel.profileType == .remote {
|
||||||
FormItem(String(localized: "URL")) {
|
FormItem(String(localized: "URL")) {
|
||||||
TextField("URL", text: $remotePath, prompt: Text("Required"))
|
TextField("URL", text: $viewModel.remotePath, prompt: Text("Required"))
|
||||||
.multilineTextAlignment(.trailing)
|
.multilineTextAlignment(.trailing)
|
||||||
#if !os(macOS)
|
#if !os(macOS)
|
||||||
.keyboardType(.URL)
|
.keyboardType(.URL)
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
Toggle("Auto Update", isOn: $autoUpdate)
|
Toggle("Auto Update", isOn: $viewModel.autoUpdate)
|
||||||
FormItem(String(localized: "Auto Update Interval")) {
|
FormItem(String(localized: "Auto Update Interval")) {
|
||||||
TextField("Auto Update Interval", text: $autoUpdateInterval.stringBinding(defaultValue: 60), prompt: Text("In Minutes"))
|
TextField("Auto Update Interval", text: $viewModel.autoUpdateInterval.stringBinding(defaultValue: 60), prompt: Text("In Minutes"))
|
||||||
.multilineTextAlignment(.trailing)
|
.multilineTextAlignment(.trailing)
|
||||||
#if !os(macOS)
|
#if !os(macOS)
|
||||||
.keyboardType(.numberPad)
|
.keyboardType(.numberPad)
|
||||||
@@ -105,11 +87,11 @@ public struct NewProfileView: View {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
Section {
|
Section {
|
||||||
if !isSaving {
|
if !viewModel.isSaving {
|
||||||
FormButton {
|
FormButton {
|
||||||
isSaving = true
|
viewModel.isSaving = true
|
||||||
Task {
|
Task {
|
||||||
await createProfile()
|
await viewModel.createProfile(environments: environments, dismiss: dismiss)
|
||||||
}
|
}
|
||||||
} label: {
|
} label: {
|
||||||
Label("Create", systemImage: "doc.fill.badge.plus")
|
Label("Create", systemImage: "doc.fill.badge.plus")
|
||||||
@@ -120,143 +102,23 @@ public struct NewProfileView: View {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
.navigationTitle("New Profile")
|
.navigationTitle("New Profile")
|
||||||
.alertBinding($alert)
|
.alertBinding($viewModel.alert)
|
||||||
#if os(iOS) || os(macOS)
|
#if os(iOS) || os(macOS)
|
||||||
.fileImporter(
|
.fileImporter(
|
||||||
isPresented: $pickerPresented,
|
isPresented: $viewModel.pickerPresented,
|
||||||
allowedContentTypes: [.json],
|
allowedContentTypes: [.json],
|
||||||
allowsMultipleSelection: false
|
allowsMultipleSelection: false
|
||||||
) { result in
|
) { result in
|
||||||
do {
|
do {
|
||||||
let urls = try result.get()
|
let urls = try result.get()
|
||||||
if !urls.isEmpty {
|
if !urls.isEmpty {
|
||||||
fileURL = urls[0]
|
viewModel.fileURL = urls[0]
|
||||||
}
|
}
|
||||||
} catch {
|
} catch {
|
||||||
alert = Alert(error)
|
viewModel.alert = Alert(error)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
private func createProfile() async {
|
|
||||||
defer {
|
|
||||||
isSaving = false
|
|
||||||
}
|
|
||||||
if profileName.isEmpty {
|
|
||||||
alert = Alert(errorMessage: String(localized: "Missing profile name"))
|
|
||||||
return
|
|
||||||
}
|
|
||||||
if remotePath.isEmpty {
|
|
||||||
if profileType == .icloud {
|
|
||||||
alert = Alert(errorMessage: String(localized: "Missing path"))
|
|
||||||
return
|
|
||||||
} else if profileType == .remote {
|
|
||||||
alert = Alert(errorMessage: String(localized: "Missing URL"))
|
|
||||||
return
|
|
||||||
}
|
|
||||||
}
|
|
||||||
do {
|
|
||||||
try await createProfileBackground()
|
|
||||||
} catch {
|
|
||||||
alert = Alert(error)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
environments.profileUpdate.send()
|
|
||||||
dismiss()
|
|
||||||
#if os(macOS)
|
|
||||||
resetFields()
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
private func resetFields() {
|
|
||||||
profileName = ""
|
|
||||||
profileType = .local
|
|
||||||
fileImport = false
|
|
||||||
fileURL = nil
|
|
||||||
remotePath = ""
|
|
||||||
}
|
|
||||||
|
|
||||||
private nonisolated func createProfileBackground() async throws {
|
|
||||||
let nextProfileID = try await ProfileManager.nextID()
|
|
||||||
|
|
||||||
var savePath = ""
|
|
||||||
var remoteURL: String? = nil
|
|
||||||
var lastUpdated: Date? = nil
|
|
||||||
|
|
||||||
let profileName = await profileName
|
|
||||||
let profileType = await profileType
|
|
||||||
let fileImport = await fileImport
|
|
||||||
let fileURL = await fileURL
|
|
||||||
let remotePath = await remotePath
|
|
||||||
let autoUpdate = await autoUpdate
|
|
||||||
let autoUpdateInterval = await autoUpdateInterval
|
|
||||||
|
|
||||||
if profileType == .local {
|
|
||||||
let profileConfigDirectory = FilePath.sharedDirectory.appendingPathComponent("configs", isDirectory: true)
|
|
||||||
try FileManager.default.createDirectory(at: profileConfigDirectory, withIntermediateDirectories: true)
|
|
||||||
let profileConfig = profileConfigDirectory.appendingPathComponent("config_\(nextProfileID).json")
|
|
||||||
if fileImport {
|
|
||||||
guard let fileURL else {
|
|
||||||
throw NSError(domain: "Missing file", code: 0)
|
|
||||||
}
|
|
||||||
if !fileURL.startAccessingSecurityScopedResource() {
|
|
||||||
throw NSError(domain: "Missing access to selected file", code: 0)
|
|
||||||
}
|
|
||||||
defer {
|
|
||||||
fileURL.stopAccessingSecurityScopedResource()
|
|
||||||
}
|
|
||||||
try String(contentsOf: fileURL).write(to: profileConfig, atomically: true, encoding: .utf8)
|
|
||||||
} else {
|
|
||||||
try "{}".write(to: profileConfig, atomically: true, encoding: .utf8)
|
|
||||||
}
|
|
||||||
savePath = profileConfig.relativePath
|
|
||||||
} else if profileType == .icloud {
|
|
||||||
if !FileManager.default.fileExists(atPath: FilePath.iCloudDirectory.path) {
|
|
||||||
try FileManager.default.createDirectory(at: FilePath.iCloudDirectory, withIntermediateDirectories: true)
|
|
||||||
}
|
|
||||||
let saveURL = FilePath.iCloudDirectory.appendingPathComponent(remotePath, isDirectory: false)
|
|
||||||
_ = saveURL.startAccessingSecurityScopedResource()
|
|
||||||
defer {
|
|
||||||
saveURL.stopAccessingSecurityScopedResource()
|
|
||||||
}
|
|
||||||
do {
|
|
||||||
_ = try String(contentsOf: saveURL)
|
|
||||||
} catch {
|
|
||||||
try "{}".write(to: saveURL, atomically: true, encoding: .utf8)
|
|
||||||
}
|
|
||||||
savePath = remotePath
|
|
||||||
} else if profileType == .remote {
|
|
||||||
let remoteContent = try HTTPClient().getString(remotePath)
|
|
||||||
var error: NSError?
|
|
||||||
LibboxCheckConfig(remoteContent, &error)
|
|
||||||
if let error {
|
|
||||||
throw error
|
|
||||||
}
|
|
||||||
let profileConfigDirectory = FilePath.sharedDirectory.appendingPathComponent("configs", isDirectory: true)
|
|
||||||
try FileManager.default.createDirectory(at: profileConfigDirectory, withIntermediateDirectories: true)
|
|
||||||
let profileConfig = profileConfigDirectory.appendingPathComponent("config_\(nextProfileID).json")
|
|
||||||
try remoteContent.write(to: profileConfig, atomically: true, encoding: .utf8)
|
|
||||||
savePath = profileConfig.relativePath
|
|
||||||
remoteURL = remotePath
|
|
||||||
lastUpdated = .now
|
|
||||||
}
|
|
||||||
try await ProfileManager.create(Profile(
|
|
||||||
name: profileName,
|
|
||||||
type: profileType,
|
|
||||||
path: savePath,
|
|
||||||
remoteURL: remoteURL,
|
|
||||||
autoUpdate: autoUpdate,
|
|
||||||
autoUpdateInterval: autoUpdateInterval,
|
|
||||||
lastUpdated: lastUpdated
|
|
||||||
))
|
|
||||||
if profileType == .remote {
|
|
||||||
#if os(iOS) || os(tvOS)
|
|
||||||
try UIProfileUpdateTask.configure()
|
|
||||||
#else
|
|
||||||
try await ProfileUpdateTask.configure()
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,150 @@
|
|||||||
|
import Foundation
|
||||||
|
import Libbox
|
||||||
|
import Library
|
||||||
|
import SwiftUI
|
||||||
|
|
||||||
|
@MainActor
|
||||||
|
public final class NewProfileViewModel: ObservableObject {
|
||||||
|
@Published public var isSaving = false
|
||||||
|
@Published public var profileName = ""
|
||||||
|
#if !os(tvOS)
|
||||||
|
@Published public var profileType = ProfileType.local
|
||||||
|
#else
|
||||||
|
@Published public var profileType = ProfileType.remote
|
||||||
|
#endif
|
||||||
|
@Published public var fileImport = false
|
||||||
|
@Published public var fileURL: URL?
|
||||||
|
@Published public var remotePath = ""
|
||||||
|
@Published public var autoUpdate = true
|
||||||
|
@Published public var autoUpdateInterval: Int32 = 60
|
||||||
|
@Published public var pickerPresented = false
|
||||||
|
@Published public var alert: Alert?
|
||||||
|
|
||||||
|
public init(importRequest: NewProfileView.ImportRequest? = nil) {
|
||||||
|
if let importRequest {
|
||||||
|
profileName = importRequest.name
|
||||||
|
profileType = .remote
|
||||||
|
remotePath = importRequest.url
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public func resetFields() {
|
||||||
|
profileName = ""
|
||||||
|
profileType = .local
|
||||||
|
fileImport = false
|
||||||
|
fileURL = nil
|
||||||
|
remotePath = ""
|
||||||
|
}
|
||||||
|
|
||||||
|
public func createProfile(environments: ExtensionEnvironments, dismiss: DismissAction) async {
|
||||||
|
defer {
|
||||||
|
isSaving = false
|
||||||
|
}
|
||||||
|
if profileName.isEmpty {
|
||||||
|
alert = Alert(errorMessage: String(localized: "Missing profile name"))
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if remotePath.isEmpty {
|
||||||
|
if profileType == .icloud {
|
||||||
|
alert = Alert(errorMessage: String(localized: "Missing path"))
|
||||||
|
return
|
||||||
|
} else if profileType == .remote {
|
||||||
|
alert = Alert(errorMessage: String(localized: "Missing URL"))
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
do {
|
||||||
|
try await createProfileBackground()
|
||||||
|
} catch {
|
||||||
|
alert = Alert(error)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
environments.profileUpdate.send()
|
||||||
|
dismiss()
|
||||||
|
#if os(macOS)
|
||||||
|
resetFields()
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
|
private nonisolated func createProfileBackground() async throws {
|
||||||
|
let nextProfileID = try await ProfileManager.nextID()
|
||||||
|
|
||||||
|
var savePath = ""
|
||||||
|
var remoteURL: String?
|
||||||
|
var lastUpdated: Date?
|
||||||
|
|
||||||
|
let profileName = await profileName
|
||||||
|
let profileType = await profileType
|
||||||
|
let fileImport = await fileImport
|
||||||
|
let fileURL = await fileURL
|
||||||
|
let remotePath = await remotePath
|
||||||
|
let autoUpdate = await autoUpdate
|
||||||
|
let autoUpdateInterval = await autoUpdateInterval
|
||||||
|
|
||||||
|
if profileType == .local {
|
||||||
|
let profileConfigDirectory = FilePath.sharedDirectory.appendingPathComponent("configs", isDirectory: true)
|
||||||
|
try FileManager.default.createDirectory(at: profileConfigDirectory, withIntermediateDirectories: true)
|
||||||
|
let profileConfig = profileConfigDirectory.appendingPathComponent("config_\(nextProfileID).json")
|
||||||
|
if fileImport {
|
||||||
|
guard let fileURL else {
|
||||||
|
throw NSError(domain: "Missing file", code: 0)
|
||||||
|
}
|
||||||
|
if !fileURL.startAccessingSecurityScopedResource() {
|
||||||
|
throw NSError(domain: "Missing access to selected file", code: 0)
|
||||||
|
}
|
||||||
|
defer {
|
||||||
|
fileURL.stopAccessingSecurityScopedResource()
|
||||||
|
}
|
||||||
|
try String(contentsOf: fileURL).write(to: profileConfig, atomically: true, encoding: .utf8)
|
||||||
|
} else {
|
||||||
|
try "{}".write(to: profileConfig, atomically: true, encoding: .utf8)
|
||||||
|
}
|
||||||
|
savePath = profileConfig.relativePath
|
||||||
|
} else if profileType == .icloud {
|
||||||
|
if !FileManager.default.fileExists(atPath: FilePath.iCloudDirectory.path) {
|
||||||
|
try FileManager.default.createDirectory(at: FilePath.iCloudDirectory, withIntermediateDirectories: true)
|
||||||
|
}
|
||||||
|
let saveURL = FilePath.iCloudDirectory.appendingPathComponent(remotePath, isDirectory: false)
|
||||||
|
_ = saveURL.startAccessingSecurityScopedResource()
|
||||||
|
defer {
|
||||||
|
saveURL.stopAccessingSecurityScopedResource()
|
||||||
|
}
|
||||||
|
do {
|
||||||
|
_ = try String(contentsOf: saveURL)
|
||||||
|
} catch {
|
||||||
|
try "{}".write(to: saveURL, atomically: true, encoding: .utf8)
|
||||||
|
}
|
||||||
|
savePath = remotePath
|
||||||
|
} else if profileType == .remote {
|
||||||
|
let remoteContent = try HTTPClient().getString(remotePath)
|
||||||
|
var error: NSError?
|
||||||
|
LibboxCheckConfig(remoteContent, &error)
|
||||||
|
if let error {
|
||||||
|
throw error
|
||||||
|
}
|
||||||
|
let profileConfigDirectory = FilePath.sharedDirectory.appendingPathComponent("configs", isDirectory: true)
|
||||||
|
try FileManager.default.createDirectory(at: profileConfigDirectory, withIntermediateDirectories: true)
|
||||||
|
let profileConfig = profileConfigDirectory.appendingPathComponent("config_\(nextProfileID).json")
|
||||||
|
try remoteContent.write(to: profileConfig, atomically: true, encoding: .utf8)
|
||||||
|
savePath = profileConfig.relativePath
|
||||||
|
remoteURL = remotePath
|
||||||
|
lastUpdated = .now
|
||||||
|
}
|
||||||
|
try await ProfileManager.create(Profile(
|
||||||
|
name: profileName,
|
||||||
|
type: profileType,
|
||||||
|
path: savePath,
|
||||||
|
remoteURL: remoteURL,
|
||||||
|
autoUpdate: autoUpdate,
|
||||||
|
autoUpdateInterval: autoUpdateInterval,
|
||||||
|
lastUpdated: lastUpdated
|
||||||
|
))
|
||||||
|
if profileType == .remote {
|
||||||
|
#if os(iOS) || os(tvOS)
|
||||||
|
try UIProfileUpdateTask.configure()
|
||||||
|
#else
|
||||||
|
try await ProfileUpdateTask.configure()
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -10,18 +10,7 @@ public struct ProfileView: View {
|
|||||||
@EnvironmentObject private var environments: ExtensionEnvironments
|
@EnvironmentObject private var environments: ExtensionEnvironments
|
||||||
@Environment(\.importProfile) private var importProfile
|
@Environment(\.importProfile) private var importProfile
|
||||||
@Environment(\.importRemoteProfile) private var importRemoteProfile
|
@Environment(\.importRemoteProfile) private var importRemoteProfile
|
||||||
@State private var importRemoteProfileRequest: NewProfileView.ImportRequest?
|
@StateObject private var viewModel = ProfileViewModel()
|
||||||
@State private var importRemoteProfilePresented = false
|
|
||||||
|
|
||||||
@State private var isLoading = true
|
|
||||||
@State private var isUpdating = false
|
|
||||||
|
|
||||||
@State private var alert: Alert?
|
|
||||||
@State private var profileList: [ProfilePreview] = []
|
|
||||||
|
|
||||||
#if os(iOS) || os(tvOS)
|
|
||||||
@State private var editMode = EditMode.inactive
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if os(tvOS)
|
#if os(tvOS)
|
||||||
@Environment(\.devicePickerSupports) private var devicePickerSupports
|
@Environment(\.devicePickerSupports) private var devicePickerSupports
|
||||||
@@ -30,16 +19,17 @@ public struct ProfileView: View {
|
|||||||
public init() {}
|
public init() {}
|
||||||
public var body: some View {
|
public var body: some View {
|
||||||
VStack {
|
VStack {
|
||||||
if isLoading {
|
if viewModel.isLoading {
|
||||||
ProgressView().onAppear {
|
ProgressView().onAppear {
|
||||||
|
viewModel.setEnvironments(environments)
|
||||||
Task {
|
Task {
|
||||||
await doReload()
|
await viewModel.doReload()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
ZStack {
|
ZStack {
|
||||||
if let importRemoteProfileRequest {
|
if let importRemoteProfileRequest = viewModel.importRemoteProfileRequest {
|
||||||
NavigationDestinationCompat(isPresented: $importRemoteProfilePresented) {
|
NavigationDestinationCompat(isPresented: $viewModel.importRemoteProfilePresented) {
|
||||||
NewProfileView(importRemoteProfileRequest)
|
NewProfileView(importRemoteProfileRequest)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -50,7 +40,7 @@ public struct ProfileView: View {
|
|||||||
} label: {
|
} label: {
|
||||||
Text("New Profile").foregroundColor(.accentColor)
|
Text("New Profile").foregroundColor(.accentColor)
|
||||||
}
|
}
|
||||||
.disabled(editMode.isEditing)
|
.disabled(viewModel.editMode.isEditing)
|
||||||
#elseif os(macOS)
|
#elseif os(macOS)
|
||||||
FormNavigationLink {
|
FormNavigationLink {
|
||||||
NewProfileView()
|
NewProfileView()
|
||||||
@@ -73,20 +63,20 @@ public struct ProfileView: View {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
if profileList.isEmpty {
|
if viewModel.profileList.isEmpty {
|
||||||
Text("Empty profiles")
|
Text("Empty profiles")
|
||||||
} else {
|
} else {
|
||||||
List {
|
List {
|
||||||
ForEach(profileList, id: \.id) { profile in
|
ForEach(viewModel.profileList, id: \.id) { profile in
|
||||||
viewBuilder {
|
viewBuilder {
|
||||||
#if os(iOS) || os(tvOS)
|
#if os(iOS) || os(tvOS)
|
||||||
if editMode.isEditing == true {
|
if viewModel.editMode.isEditing == true {
|
||||||
Text(profile.name)
|
Text(profile.name)
|
||||||
} else {
|
} else {
|
||||||
ProfileItem(self, profile)
|
ProfileItem(viewModel, profile)
|
||||||
}
|
}
|
||||||
#else
|
#else
|
||||||
ProfileItem(self, profile)
|
ProfileItem(viewModel, profile)
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -98,55 +88,55 @@ public struct ProfileView: View {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
.disabled(isUpdating)
|
.disabled(viewModel.isUpdating)
|
||||||
.alertBinding($alert, $isLoading)
|
.alertBinding($viewModel.alert, $viewModel.isLoading)
|
||||||
.onAppear {
|
.onAppear {
|
||||||
if let profile = importProfile.wrappedValue {
|
if let profile = importProfile.wrappedValue {
|
||||||
importProfile.wrappedValue = nil
|
importProfile.wrappedValue = nil
|
||||||
createImportProfileDialog(profile)
|
viewModel.createImportProfileDialog(profile)
|
||||||
}
|
}
|
||||||
if let remoteProfile = importRemoteProfile.wrappedValue {
|
if let remoteProfile = importRemoteProfile.wrappedValue {
|
||||||
importRemoteProfile.wrappedValue = nil
|
importRemoteProfile.wrappedValue = nil
|
||||||
createImportRemoteProfileDialog(remoteProfile)
|
viewModel.createImportRemoteProfileDialog(remoteProfile)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
.onChangeCompat(of: importProfile.wrappedValue) { newValue in
|
.onChangeCompat(of: importProfile.wrappedValue) { newValue in
|
||||||
if let newValue {
|
if let newValue {
|
||||||
importProfile.wrappedValue = nil
|
importProfile.wrappedValue = nil
|
||||||
createImportProfileDialog(newValue)
|
viewModel.createImportProfileDialog(newValue)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
.onChangeCompat(of: importRemoteProfile.wrappedValue) { newValue in
|
.onChangeCompat(of: importRemoteProfile.wrappedValue) { newValue in
|
||||||
if let newValue {
|
if let newValue {
|
||||||
importRemoteProfile.wrappedValue = nil
|
importRemoteProfile.wrappedValue = nil
|
||||||
createImportRemoteProfileDialog(newValue)
|
viewModel.createImportRemoteProfileDialog(newValue)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
.onReceive(environments.profileUpdate) { _ in
|
.onReceive(environments.profileUpdate) { _ in
|
||||||
Task {
|
Task {
|
||||||
await doReload()
|
await viewModel.doReload()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#if os(iOS)
|
#if os(iOS)
|
||||||
.toolbar {
|
.toolbar {
|
||||||
ToolbarItem(placement: .navigationBarTrailing) {
|
ToolbarItem(placement: .navigationBarTrailing) {
|
||||||
EditButton().disabled(profileList.isEmpty && !editMode.isEditing)
|
EditButton().disabled(viewModel.profileList.isEmpty && !viewModel.editMode.isEditing)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#elseif os(tvOS)
|
#elseif os(tvOS)
|
||||||
.toolbar {
|
.toolbar {
|
||||||
ToolbarItem(placement: .navigationBarTrailing) {
|
ToolbarItem(placement: .navigationBarTrailing) {
|
||||||
if editMode == .inactive {
|
if viewModel.editMode == .inactive {
|
||||||
Button(action: {
|
Button(action: {
|
||||||
editMode = .active
|
viewModel.editMode = .active
|
||||||
}) {
|
}) {
|
||||||
Image(systemName: "square.and.pencil")
|
Image(systemName: "square.and.pencil")
|
||||||
}
|
}
|
||||||
.tint(.accentColor)
|
.tint(.accentColor)
|
||||||
.disabled(profileList.isEmpty)
|
.disabled(viewModel.profileList.isEmpty)
|
||||||
} else {
|
} else {
|
||||||
Button(action: {
|
Button(action: {
|
||||||
editMode = .inactive
|
viewModel.editMode = .inactive
|
||||||
}) {
|
}) {
|
||||||
Image(systemName: "checkmark.square.fill")
|
Image(systemName: "checkmark.square.fill")
|
||||||
}
|
}
|
||||||
@@ -156,126 +146,27 @@ public struct ProfileView: View {
|
|||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
#if os(iOS) || os(tvOS)
|
#if os(iOS) || os(tvOS)
|
||||||
.environment(\.editMode, $editMode)
|
.environment(\.editMode, $viewModel.editMode)
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
private func createImportProfileDialog(_ profile: LibboxProfileContent) {
|
|
||||||
alert = Alert(
|
|
||||||
title: Text("Import Profile"),
|
|
||||||
message: Text("Are you sure to import profile \(profile.name)?"),
|
|
||||||
primaryButton: .default(Text("Import")) {
|
|
||||||
Task {
|
|
||||||
do {
|
|
||||||
try await profile.importProfile()
|
|
||||||
} catch {
|
|
||||||
alert = Alert(error)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
await doReload()
|
|
||||||
}
|
|
||||||
},
|
|
||||||
secondaryButton: .cancel()
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
private func createImportRemoteProfileDialog(_ newValue: LibboxImportRemoteProfile) {
|
|
||||||
importRemoteProfileRequest = .init(name: newValue.name, url: newValue.url)
|
|
||||||
alert = Alert(
|
|
||||||
title: Text("Import Remote Profile"),
|
|
||||||
message: Text("Are you sure to import remote profile \(newValue.name)? You will connect to \(newValue.host) to download the configuration."),
|
|
||||||
primaryButton: .default(Text("Import")) {
|
|
||||||
importRemoteProfilePresented = true
|
|
||||||
},
|
|
||||||
secondaryButton: .cancel()
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
private func doReload() async {
|
|
||||||
defer {
|
|
||||||
isLoading = false
|
|
||||||
}
|
|
||||||
if ApplicationLibrary.inPreview {
|
|
||||||
profileList = [
|
|
||||||
ProfilePreview(Profile(id: 0, name: "profile local", type: .local, path: "")),
|
|
||||||
ProfilePreview(Profile(id: 1, name: "profile remote", type: .remote, path: "", lastUpdated: Date(timeIntervalSince1970: 0))),
|
|
||||||
]
|
|
||||||
} else {
|
|
||||||
do {
|
|
||||||
profileList = try await ProfileManager.list().map { ProfilePreview($0) }
|
|
||||||
} catch {
|
|
||||||
alert = Alert(error)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
}
|
|
||||||
environments.emptyProfiles = profileList.isEmpty
|
|
||||||
}
|
|
||||||
|
|
||||||
private func updateProfile(_ profile: Profile) async {
|
|
||||||
await updateProfileBackground(profile)
|
|
||||||
isUpdating = false
|
|
||||||
}
|
|
||||||
|
|
||||||
private nonisolated func updateProfileBackground(_ profile: Profile) async {
|
|
||||||
do {
|
|
||||||
_ = try await profile.updateRemoteProfile()
|
|
||||||
} catch {
|
|
||||||
await MainActor.run {
|
|
||||||
alert = Alert(error)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private func deleteProfile(_ profile: Profile) async {
|
|
||||||
do {
|
|
||||||
_ = try await ProfileManager.delete(profile)
|
|
||||||
} catch {
|
|
||||||
alert = Alert(error)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
environments.profileUpdate.send()
|
|
||||||
}
|
|
||||||
|
|
||||||
private func moveProfile(from source: IndexSet, to destination: Int) {
|
private func moveProfile(from source: IndexSet, to destination: Int) {
|
||||||
profileList.move(fromOffsets: source, toOffset: destination)
|
viewModel.moveProfile(from: source, to: destination)
|
||||||
for (index, profile) in profileList.enumerated() {
|
|
||||||
profileList[index].order = UInt32(index)
|
|
||||||
profile.origin.order = UInt32(index)
|
|
||||||
}
|
|
||||||
Task {
|
|
||||||
do {
|
|
||||||
try await ProfileManager.update(profileList.map(\.origin))
|
|
||||||
} catch {
|
|
||||||
alert = Alert(error)
|
|
||||||
}
|
|
||||||
environments.profileUpdate.send()
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private func deleteProfile(where profileIndex: IndexSet) {
|
private func deleteProfile(where profileIndex: IndexSet) {
|
||||||
let profileToDelete = profileIndex.map { index in
|
viewModel.deleteProfile(where: profileIndex)
|
||||||
profileList[index].origin
|
|
||||||
}
|
|
||||||
profileList.remove(atOffsets: profileIndex)
|
|
||||||
environments.emptyProfiles = profileList.isEmpty
|
|
||||||
Task {
|
|
||||||
do {
|
|
||||||
_ = try await ProfileManager.delete(profileToDelete)
|
|
||||||
} catch {
|
|
||||||
alert = Alert(error)
|
|
||||||
}
|
|
||||||
environments.profileUpdate.send()
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@MainActor
|
@MainActor
|
||||||
public struct ProfileItem: View {
|
public struct ProfileItem: View {
|
||||||
private let parent: ProfileView
|
@EnvironmentObject private var environments: ExtensionEnvironments
|
||||||
|
@ObservedObject private var viewModel: ProfileViewModel
|
||||||
@State private var profile: ProfilePreview
|
@State private var profile: ProfilePreview
|
||||||
@State private var shareLinkPresented = false
|
@State private var shareLinkPresented = false
|
||||||
|
|
||||||
public init(_ parent: ProfileView, _ profile: ProfilePreview) {
|
public init(_ viewModel: ProfileViewModel, _ profile: ProfilePreview) {
|
||||||
self.parent = parent
|
self.viewModel = viewModel
|
||||||
_profile = State(initialValue: profile)
|
_profile = State(initialValue: profile)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -303,7 +194,7 @@ public struct ProfileView: View {
|
|||||||
shareLinkView.padding()
|
shareLinkView.padding()
|
||||||
}
|
}
|
||||||
.contextMenu {
|
.contextMenu {
|
||||||
ProfileShareButton(parent.$alert, profile.origin) {
|
ProfileShareButton($viewModel.alert, profile.origin) {
|
||||||
Label("Share", systemImage: "square.and.arrow.up.fill")
|
Label("Share", systemImage: "square.and.arrow.up.fill")
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -314,9 +205,9 @@ public struct ProfileView: View {
|
|||||||
Label("Share URL as QR Code", systemImage: "qrcode")
|
Label("Share URL as QR Code", systemImage: "qrcode")
|
||||||
}
|
}
|
||||||
Button {
|
Button {
|
||||||
parent.isUpdating = true
|
viewModel.isUpdating = true
|
||||||
Task {
|
Task {
|
||||||
await parent.updateProfile(profile.origin)
|
await viewModel.updateProfile(profile.origin)
|
||||||
profile = ProfilePreview(profile.origin)
|
profile = ProfilePreview(profile.origin)
|
||||||
}
|
}
|
||||||
} label: {
|
} label: {
|
||||||
@@ -325,7 +216,7 @@ public struct ProfileView: View {
|
|||||||
}
|
}
|
||||||
Button(role: .destructive) {
|
Button(role: .destructive) {
|
||||||
Task {
|
Task {
|
||||||
await parent.deleteProfile(profile.origin)
|
await viewModel.deleteProfile(profile.origin)
|
||||||
}
|
}
|
||||||
} label: {
|
} label: {
|
||||||
Label("Delete", systemImage: "trash.fill")
|
Label("Delete", systemImage: "trash.fill")
|
||||||
@@ -346,9 +237,9 @@ public struct ProfileView: View {
|
|||||||
HStack {
|
HStack {
|
||||||
if profile.type == .remote {
|
if profile.type == .remote {
|
||||||
Button {
|
Button {
|
||||||
parent.isUpdating = true
|
viewModel.isUpdating = true
|
||||||
Task {
|
Task {
|
||||||
await parent.updateProfile(profile.origin)
|
await viewModel.updateProfile(profile.origin)
|
||||||
profile = ProfilePreview(profile.origin)
|
profile = ProfilePreview(profile.origin)
|
||||||
}
|
}
|
||||||
} label: {
|
} label: {
|
||||||
@@ -366,13 +257,13 @@ public struct ProfileView: View {
|
|||||||
shareLinkView
|
shareLinkView
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
ProfileShareButton(parent.$alert, profile.origin) {
|
ProfileShareButton($viewModel.alert, profile.origin) {
|
||||||
Image(systemName: "square.and.arrow.up.fill")
|
Image(systemName: "square.and.arrow.up.fill")
|
||||||
}
|
}
|
||||||
.padding(.leading, 4)
|
.padding(.leading, 4)
|
||||||
Button {
|
Button {
|
||||||
Task {
|
Task {
|
||||||
await parent.deleteProfile(profile.origin)
|
await viewModel.deleteProfile(profile.origin)
|
||||||
}
|
}
|
||||||
} label: {
|
} label: {
|
||||||
Image(systemName: "trash.fill")
|
Image(systemName: "trash.fill")
|
||||||
|
|||||||
@@ -0,0 +1,135 @@
|
|||||||
|
import Foundation
|
||||||
|
import Libbox
|
||||||
|
import Library
|
||||||
|
import SwiftUI
|
||||||
|
|
||||||
|
@MainActor
|
||||||
|
public class ProfileViewModel: ObservableObject {
|
||||||
|
@Published public var importRemoteProfileRequest: NewProfileView.ImportRequest?
|
||||||
|
@Published public var importRemoteProfilePresented = false
|
||||||
|
@Published public var isLoading = true
|
||||||
|
@Published public var isUpdating = false
|
||||||
|
@Published public var alert: Alert?
|
||||||
|
@Published public var profileList: [ProfilePreview] = []
|
||||||
|
|
||||||
|
#if os(iOS) || os(tvOS)
|
||||||
|
@Published public var editMode = EditMode.inactive
|
||||||
|
#endif
|
||||||
|
|
||||||
|
private weak var environments: ExtensionEnvironments?
|
||||||
|
|
||||||
|
public init() {}
|
||||||
|
|
||||||
|
public func setEnvironments(_ environments: ExtensionEnvironments) {
|
||||||
|
self.environments = environments
|
||||||
|
}
|
||||||
|
|
||||||
|
public func createImportProfileDialog(_ profile: LibboxProfileContent) {
|
||||||
|
alert = Alert(
|
||||||
|
title: Text("Import Profile"),
|
||||||
|
message: Text("Are you sure to import profile \(profile.name)?"),
|
||||||
|
primaryButton: .default(Text("Import")) {
|
||||||
|
Task {
|
||||||
|
do {
|
||||||
|
try await profile.importProfile()
|
||||||
|
} catch {
|
||||||
|
self.alert = Alert(error)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
await self.doReload()
|
||||||
|
self.environments?.emptyProfiles = self.profileList.isEmpty
|
||||||
|
}
|
||||||
|
},
|
||||||
|
secondaryButton: .cancel()
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
public func createImportRemoteProfileDialog(_ newValue: LibboxImportRemoteProfile) {
|
||||||
|
importRemoteProfileRequest = .init(name: newValue.name, url: newValue.url)
|
||||||
|
alert = Alert(
|
||||||
|
title: Text("Import Remote Profile"),
|
||||||
|
message: Text("Are you sure to import remote profile \(newValue.name)? You will connect to \(newValue.host) to download the configuration."),
|
||||||
|
primaryButton: .default(Text("Import")) {
|
||||||
|
self.importRemoteProfilePresented = true
|
||||||
|
},
|
||||||
|
secondaryButton: .cancel()
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
public func doReload() async {
|
||||||
|
defer {
|
||||||
|
isLoading = false
|
||||||
|
}
|
||||||
|
if ApplicationLibrary.inPreview {
|
||||||
|
profileList = [
|
||||||
|
ProfilePreview(Profile(id: 0, name: "profile local", type: .local, path: "")),
|
||||||
|
ProfilePreview(Profile(id: 1, name: "profile remote", type: .remote, path: "", lastUpdated: Date(timeIntervalSince1970: 0))),
|
||||||
|
]
|
||||||
|
} else {
|
||||||
|
do {
|
||||||
|
profileList = try await ProfileManager.list().map { ProfilePreview($0) }
|
||||||
|
} catch {
|
||||||
|
alert = Alert(error)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
environments?.emptyProfiles = profileList.isEmpty
|
||||||
|
}
|
||||||
|
|
||||||
|
public func updateProfile(_ profile: Profile) async {
|
||||||
|
await updateProfileBackground(profile)
|
||||||
|
isUpdating = false
|
||||||
|
}
|
||||||
|
|
||||||
|
private nonisolated func updateProfileBackground(_ profile: Profile) async {
|
||||||
|
do {
|
||||||
|
_ = try await profile.updateRemoteProfile()
|
||||||
|
} catch {
|
||||||
|
await MainActor.run {
|
||||||
|
alert = Alert(error)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public func deleteProfile(_ profile: Profile) async {
|
||||||
|
do {
|
||||||
|
_ = try await ProfileManager.delete(profile)
|
||||||
|
environments?.profileUpdate.send()
|
||||||
|
environments?.emptyProfiles = profileList.isEmpty
|
||||||
|
} catch {
|
||||||
|
alert = Alert(error)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public func moveProfile(from source: IndexSet, to destination: Int) {
|
||||||
|
profileList.move(fromOffsets: source, toOffset: destination)
|
||||||
|
for (index, profile) in profileList.enumerated() {
|
||||||
|
profileList[index].order = UInt32(index)
|
||||||
|
profile.origin.order = UInt32(index)
|
||||||
|
}
|
||||||
|
Task {
|
||||||
|
do {
|
||||||
|
try await ProfileManager.update(profileList.map(\.origin))
|
||||||
|
environments?.profileUpdate.send()
|
||||||
|
} catch {
|
||||||
|
alert = Alert(error)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public func deleteProfile(where profileIndex: IndexSet) {
|
||||||
|
let profileToDelete = profileIndex.map { index in
|
||||||
|
profileList[index].origin
|
||||||
|
}
|
||||||
|
profileList.remove(atOffsets: profileIndex)
|
||||||
|
Task {
|
||||||
|
do {
|
||||||
|
_ = try await ProfileManager.delete(profileToDelete)
|
||||||
|
environments?.emptyProfiles = profileList.isEmpty
|
||||||
|
environments?.profileUpdate.send()
|
||||||
|
} catch {
|
||||||
|
alert = Alert(error)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -5,10 +5,7 @@ import SwiftUI
|
|||||||
@MainActor
|
@MainActor
|
||||||
public struct ServiceLogView: View {
|
public struct ServiceLogView: View {
|
||||||
@Environment(\.dismiss) private var dismiss
|
@Environment(\.dismiss) private var dismiss
|
||||||
|
@StateObject private var viewModel = ServiceLogViewModel()
|
||||||
@State private var isLoading = true
|
|
||||||
@State private var content = ""
|
|
||||||
@State private var alert: Alert?
|
|
||||||
|
|
||||||
private let logFont = Font.system(.caption, design: .monospaced)
|
private let logFont = Font.system(.caption, design: .monospaced)
|
||||||
|
|
||||||
@@ -16,18 +13,18 @@ public struct ServiceLogView: View {
|
|||||||
|
|
||||||
public var body: some View {
|
public var body: some View {
|
||||||
viewBuilder {
|
viewBuilder {
|
||||||
if isLoading {
|
if viewModel.isLoading {
|
||||||
ProgressView().onAppear {
|
ProgressView().onAppear {
|
||||||
Task {
|
Task {
|
||||||
await loadContent()
|
await viewModel.loadContent()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
if content.isEmpty {
|
if viewModel.isEmpty {
|
||||||
Text("Empty content")
|
Text("Empty content")
|
||||||
} else {
|
} else {
|
||||||
ScrollView {
|
ScrollView {
|
||||||
Text(content)
|
Text(viewModel.content)
|
||||||
.font(logFont)
|
.font(logFont)
|
||||||
.frame(maxWidth: .infinity, alignment: .topLeading)
|
.frame(maxWidth: .infinity, alignment: .topLeading)
|
||||||
}
|
}
|
||||||
@@ -36,17 +33,17 @@ public struct ServiceLogView: View {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
.toolbar {
|
.toolbar {
|
||||||
if !content.isEmpty {
|
if !viewModel.isEmpty {
|
||||||
#if !os(tvOS)
|
#if !os(tvOS)
|
||||||
ShareButtonCompat($alert) {
|
ShareButtonCompat($viewModel.alert) {
|
||||||
Label("Export", systemImage: "square.and.arrow.up.fill")
|
Label("Export", systemImage: "square.and.arrow.up.fill")
|
||||||
} itemURL: {
|
} itemURL: {
|
||||||
try content.generateShareFile(name: "service.log")
|
try viewModel.generateShareFile()
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
Button(role: .destructive) {
|
Button(role: .destructive) {
|
||||||
Task {
|
Task {
|
||||||
await deleteContent()
|
await viewModel.deleteContent(dismiss: dismiss)
|
||||||
}
|
}
|
||||||
} label: {
|
} label: {
|
||||||
#if !os(tvOS)
|
#if !os(tvOS)
|
||||||
@@ -58,56 +55,10 @@ public struct ServiceLogView: View {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
.alertBinding($alert)
|
.alertBinding($viewModel.alert)
|
||||||
.navigationTitle("Service Log")
|
.navigationTitle("Service Log")
|
||||||
#if os(tvOS)
|
#if os(tvOS)
|
||||||
.focusable()
|
.focusable()
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
private nonisolated func loadContent() async {
|
|
||||||
var content = ""
|
|
||||||
do {
|
|
||||||
content = try String(contentsOf: FilePath.cacheDirectory.appendingPathComponent("stderr.log"))
|
|
||||||
} catch {}
|
|
||||||
if content.isEmpty {
|
|
||||||
do {
|
|
||||||
content = try String(contentsOf: FilePath.cacheDirectory.appendingPathComponent("stderr.log.old"))
|
|
||||||
} catch {}
|
|
||||||
}
|
|
||||||
#if DEBUG
|
|
||||||
if content.isEmpty {
|
|
||||||
content = "Empty content"
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
if !content.isEmpty {
|
|
||||||
var systemInfo = utsname()
|
|
||||||
uname(&systemInfo)
|
|
||||||
let machineMirror = Mirror(reflecting: systemInfo.machine)
|
|
||||||
let machineName = machineMirror.children.reduce("") { identifier, element in
|
|
||||||
guard let value = element.value as? Int8, value != 0 else { return identifier }
|
|
||||||
return identifier + String(UnicodeScalar(UInt8(value)))
|
|
||||||
}
|
|
||||||
var deviceInfo = String("Machine: ") + machineName + "\n"
|
|
||||||
#if os(iOS)
|
|
||||||
await deviceInfo += String("System: ") + (UIDevice.current.systemName) + " " + (UIDevice.current.systemVersion) + "\n"
|
|
||||||
#elseif os(macOS)
|
|
||||||
deviceInfo += String("System: ") + "macOS " + ProcessInfo().operatingSystemVersionString + "\n"
|
|
||||||
#endif
|
|
||||||
content = deviceInfo + "\n" + content
|
|
||||||
}
|
|
||||||
await MainActor.run { [content] in
|
|
||||||
self.content = content
|
|
||||||
isLoading = false
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private nonisolated func deleteContent() async {
|
|
||||||
try? FileManager.default.removeItem(at: FilePath.cacheDirectory.appendingPathComponent("stderr.log"))
|
|
||||||
try? FileManager.default.removeItem(at: FilePath.cacheDirectory.appendingPathComponent("stderr.log.old"))
|
|
||||||
await MainActor.run {
|
|
||||||
dismiss()
|
|
||||||
isLoading = true
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,64 @@
|
|||||||
|
import Foundation
|
||||||
|
import Library
|
||||||
|
import SwiftUI
|
||||||
|
|
||||||
|
@MainActor
|
||||||
|
final class ServiceLogViewModel: ObservableObject {
|
||||||
|
@Published var isLoading = true
|
||||||
|
@Published var content = ""
|
||||||
|
@Published var alert: Alert?
|
||||||
|
|
||||||
|
var isEmpty: Bool {
|
||||||
|
content.isEmpty
|
||||||
|
}
|
||||||
|
|
||||||
|
nonisolated func loadContent() async {
|
||||||
|
var content = ""
|
||||||
|
do {
|
||||||
|
content = try String(contentsOf: FilePath.cacheDirectory.appendingPathComponent("stderr.log"))
|
||||||
|
} catch {}
|
||||||
|
if content.isEmpty {
|
||||||
|
do {
|
||||||
|
content = try String(contentsOf: FilePath.cacheDirectory.appendingPathComponent("stderr.log.old"))
|
||||||
|
} catch {}
|
||||||
|
}
|
||||||
|
#if DEBUG
|
||||||
|
if content.isEmpty {
|
||||||
|
content = "Empty content"
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
if !content.isEmpty {
|
||||||
|
var systemInfo = utsname()
|
||||||
|
uname(&systemInfo)
|
||||||
|
let machineMirror = Mirror(reflecting: systemInfo.machine)
|
||||||
|
let machineName = machineMirror.children.reduce("") { identifier, element in
|
||||||
|
guard let value = element.value as? Int8, value != 0 else { return identifier }
|
||||||
|
return identifier + String(UnicodeScalar(UInt8(value)))
|
||||||
|
}
|
||||||
|
var deviceInfo = String("Machine: ") + machineName + "\n"
|
||||||
|
#if os(iOS)
|
||||||
|
await deviceInfo += String("System: ") + (UIDevice.current.systemName) + " " + (UIDevice.current.systemVersion) + "\n"
|
||||||
|
#elseif os(macOS)
|
||||||
|
deviceInfo += String("System: ") + "macOS " + ProcessInfo().operatingSystemVersionString + "\n"
|
||||||
|
#endif
|
||||||
|
content = deviceInfo + "\n" + content
|
||||||
|
}
|
||||||
|
await MainActor.run { [content] in
|
||||||
|
self.content = content
|
||||||
|
isLoading = false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
nonisolated func deleteContent(dismiss: DismissAction) async {
|
||||||
|
try? FileManager.default.removeItem(at: FilePath.cacheDirectory.appendingPathComponent("stderr.log"))
|
||||||
|
try? FileManager.default.removeItem(at: FilePath.cacheDirectory.appendingPathComponent("stderr.log.old"))
|
||||||
|
await MainActor.run {
|
||||||
|
dismiss()
|
||||||
|
isLoading = true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func generateShareFile() throws -> URL {
|
||||||
|
try content.generateShareFile(name: "service.log")
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -92,8 +92,7 @@ public struct SettingView: View {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@State private var isLoading = true
|
@StateObject private var viewModel = SettingViewModel()
|
||||||
@State private var taiwanFlagAvailable = false
|
|
||||||
|
|
||||||
public init() {}
|
public init() {}
|
||||||
public var body: some View {
|
public var body: some View {
|
||||||
@@ -146,24 +145,15 @@ public struct SettingView: View {
|
|||||||
Label("Service Log", systemImage: "doc.on.clipboard")
|
Label("Service Log", systemImage: "doc.on.clipboard")
|
||||||
}
|
}
|
||||||
FormTextItem("Taiwan Flag Available", "touchid") {
|
FormTextItem("Taiwan Flag Available", "touchid") {
|
||||||
if isLoading {
|
if viewModel.isLoading {
|
||||||
Text("Loading...")
|
Text("Loading...")
|
||||||
.onAppear {
|
.onAppear {
|
||||||
Task.detached {
|
Task.detached {
|
||||||
let available: Bool
|
await viewModel.checkTaiwanFlagAvailability()
|
||||||
if ApplicationLibrary.inPreview {
|
|
||||||
available = true
|
|
||||||
} else {
|
|
||||||
available = !DeviceCensorship.isChinaDevice()
|
|
||||||
}
|
|
||||||
await MainActor.run {
|
|
||||||
taiwanFlagAvailable = available
|
|
||||||
isLoading = false
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
Text(taiwanFlagAvailable.toString())
|
Text(viewModel.taiwanFlagAvailable.toString())
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,21 @@
|
|||||||
|
import Library
|
||||||
|
import SwiftUI
|
||||||
|
|
||||||
|
@MainActor
|
||||||
|
final class SettingViewModel: ObservableObject {
|
||||||
|
@Published var isLoading = true
|
||||||
|
@Published var taiwanFlagAvailable = false
|
||||||
|
|
||||||
|
nonisolated func checkTaiwanFlagAvailability() async {
|
||||||
|
let available: Bool
|
||||||
|
if ApplicationLibrary.inPreview {
|
||||||
|
available = true
|
||||||
|
} else {
|
||||||
|
available = !DeviceCensorship.isChinaDevice()
|
||||||
|
}
|
||||||
|
await MainActor.run {
|
||||||
|
taiwanFlagAvailable = available
|
||||||
|
isLoading = false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -7,7 +7,7 @@ public enum FullDiskAccessPermissionRequired: Error {
|
|||||||
public class ExtensionStartupError: Error {
|
public class ExtensionStartupError: Error {
|
||||||
let message: String
|
let message: String
|
||||||
|
|
||||||
init(_ message: String) {
|
public init(_ message: String) {
|
||||||
self.message = message
|
self.message = message
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+13
-80
@@ -1,5 +1,4 @@
|
|||||||
import ApplicationLibrary
|
import ApplicationLibrary
|
||||||
import Libbox
|
|
||||||
import Library
|
import Library
|
||||||
import SwiftUI
|
import SwiftUI
|
||||||
|
|
||||||
@@ -7,11 +6,7 @@ import SwiftUI
|
|||||||
public struct MainView: View {
|
public struct MainView: View {
|
||||||
@Environment(\.controlActiveState) private var controlActiveState
|
@Environment(\.controlActiveState) private var controlActiveState
|
||||||
@EnvironmentObject private var environments: ExtensionEnvironments
|
@EnvironmentObject private var environments: ExtensionEnvironments
|
||||||
|
@StateObject private var viewModel = MainViewModel()
|
||||||
@State private var selection = NavigationPage.dashboard
|
|
||||||
@State private var importProfile: LibboxProfileContent?
|
|
||||||
@State private var importRemoteProfile: LibboxImportRemoteProfile?
|
|
||||||
@State private var alert: Alert?
|
|
||||||
|
|
||||||
public init() {}
|
public init() {}
|
||||||
|
|
||||||
@@ -21,96 +16,34 @@ public struct MainView: View {
|
|||||||
.navigationSplitViewColumnWidth(150)
|
.navigationSplitViewColumnWidth(150)
|
||||||
} detail: {
|
} detail: {
|
||||||
NavigationStack {
|
NavigationStack {
|
||||||
selection.contentView
|
viewModel.selection.contentView
|
||||||
.navigationTitle(selection.title)
|
.navigationTitle(viewModel.selection.title)
|
||||||
}
|
}
|
||||||
.navigationSplitViewColumnWidth(650)
|
.navigationSplitViewColumnWidth(650)
|
||||||
}
|
}
|
||||||
.frame(minHeight: 500)
|
.frame(minHeight: 500)
|
||||||
.onAppear {
|
.onAppear {
|
||||||
environments.postReload()
|
viewModel.onAppear(environments: environments)
|
||||||
#if !DEBUG
|
|
||||||
if Variant.useSystemExtension {
|
|
||||||
Task {
|
|
||||||
checkApplicationPath()
|
|
||||||
}
|
}
|
||||||
}
|
.alertBinding($viewModel.alert)
|
||||||
#endif
|
|
||||||
}
|
|
||||||
.alertBinding($alert)
|
|
||||||
.toolbar {
|
.toolbar {
|
||||||
ToolbarItem(placement: .navigation) {
|
ToolbarItem(placement: .navigation) {
|
||||||
StartStopButton()
|
StartStopButton()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
.onChangeCompat(of: controlActiveState) { newValue in
|
.onChangeCompat(of: controlActiveState) { newValue in
|
||||||
if newValue != .inactive {
|
viewModel.onControlActiveStateChange(newValue, environments: environments)
|
||||||
environments.postReload()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
.onChangeCompat(of: selection) { value in
|
|
||||||
if value == .logs {
|
|
||||||
environments.connectLog()
|
|
||||||
}
|
}
|
||||||
|
.onChangeCompat(of: viewModel.selection) { value in
|
||||||
|
viewModel.onSelectionChange(value, environments: environments)
|
||||||
}
|
}
|
||||||
.onReceive(environments.openSettings) {
|
.onReceive(environments.openSettings) {
|
||||||
selection = .settings
|
viewModel.openSettings()
|
||||||
}
|
}
|
||||||
.environment(\.selection, $selection)
|
.environment(\.selection, $viewModel.selection)
|
||||||
.environment(\.importProfile, $importProfile)
|
.environment(\.importProfile, $viewModel.importProfile)
|
||||||
.environment(\.importRemoteProfile, $importRemoteProfile)
|
.environment(\.importRemoteProfile, $viewModel.importRemoteProfile)
|
||||||
.handlesExternalEvents(preferring: [], allowing: ["*"])
|
.handlesExternalEvents(preferring: [], allowing: ["*"])
|
||||||
.onOpenURL(perform: openURL)
|
.onOpenURL(perform: viewModel.openURL)
|
||||||
}
|
|
||||||
|
|
||||||
private func openURL(url: URL) {
|
|
||||||
if url.host == "import-remote-profile" {
|
|
||||||
var error: NSError?
|
|
||||||
importRemoteProfile = LibboxParseRemoteProfileImportLink(url.absoluteString, &error)
|
|
||||||
if error != nil {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
if selection != .profiles {
|
|
||||||
selection = .profiles
|
|
||||||
}
|
|
||||||
} else if url.pathExtension == "bpf" {
|
|
||||||
Task {
|
|
||||||
await importURLProfile(url)
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
alert = Alert(errorMessage: String(localized: "Handled unknown URL \(url.absoluteString)"))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private func importURLProfile(_ url: URL) async {
|
|
||||||
do {
|
|
||||||
_ = url.startAccessingSecurityScopedResource()
|
|
||||||
importProfile = try await .from(readURL(url))
|
|
||||||
url.stopAccessingSecurityScopedResource()
|
|
||||||
} catch {
|
|
||||||
alert = Alert(error)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
if selection != .profiles {
|
|
||||||
selection = .profiles
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private nonisolated func readURL(_ url: URL) async throws -> Data {
|
|
||||||
try Data(contentsOf: url)
|
|
||||||
}
|
|
||||||
|
|
||||||
private func checkApplicationPath() {
|
|
||||||
let directoryName = URL(filePath: Bundle.main.bundlePath).deletingLastPathComponent().pathComponents.last
|
|
||||||
if directoryName != "Applications" {
|
|
||||||
alert = Alert(
|
|
||||||
title: Text("Wrong application location"),
|
|
||||||
message: Text("This app needs to be placed under the Applications folder to work."),
|
|
||||||
dismissButton: .default(Text("Ok")) {
|
|
||||||
NSWorkspace.shared.selectFile(Bundle.main.bundlePath, inFileViewerRootedAtPath: "")
|
|
||||||
NSApp.terminate(nil)
|
|
||||||
}
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,91 @@
|
|||||||
|
import AppKit
|
||||||
|
import ApplicationLibrary
|
||||||
|
import Libbox
|
||||||
|
import Library
|
||||||
|
import SwiftUI
|
||||||
|
|
||||||
|
@MainActor
|
||||||
|
public class MainViewModel: ObservableObject {
|
||||||
|
@Published public var selection = NavigationPage.dashboard
|
||||||
|
@Published public var importProfile: LibboxProfileContent?
|
||||||
|
@Published public var importRemoteProfile: LibboxImportRemoteProfile?
|
||||||
|
@Published public var alert: Alert?
|
||||||
|
|
||||||
|
public init() {}
|
||||||
|
|
||||||
|
public func onAppear(environments: ExtensionEnvironments) {
|
||||||
|
environments.postReload()
|
||||||
|
#if !DEBUG
|
||||||
|
if Variant.useSystemExtension {
|
||||||
|
checkApplicationPath()
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
|
public func onControlActiveStateChange(_ newValue: ControlActiveState, environments: ExtensionEnvironments) {
|
||||||
|
if newValue != .inactive {
|
||||||
|
environments.postReload()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public func onSelectionChange(_ newValue: NavigationPage, environments: ExtensionEnvironments) {
|
||||||
|
if newValue == .logs {
|
||||||
|
environments.connectLog()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public func openSettings() {
|
||||||
|
selection = .settings
|
||||||
|
}
|
||||||
|
|
||||||
|
public func openURL(_ url: URL) {
|
||||||
|
if url.host == "import-remote-profile" {
|
||||||
|
var error: NSError?
|
||||||
|
importRemoteProfile = LibboxParseRemoteProfileImportLink(url.absoluteString, &error)
|
||||||
|
if error != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if selection != .profiles {
|
||||||
|
selection = .profiles
|
||||||
|
}
|
||||||
|
} else if url.pathExtension == "bpf" {
|
||||||
|
Task {
|
||||||
|
await importURLProfile(url)
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
alert = Alert(errorMessage: String(localized: "Handled unknown URL \(url.absoluteString)"))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private func importURLProfile(_ url: URL) async {
|
||||||
|
do {
|
||||||
|
_ = url.startAccessingSecurityScopedResource()
|
||||||
|
importProfile = try await .from(readURL(url))
|
||||||
|
url.stopAccessingSecurityScopedResource()
|
||||||
|
} catch {
|
||||||
|
alert = Alert(error)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if selection != .profiles {
|
||||||
|
selection = .profiles
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private nonisolated func readURL(_ url: URL) async throws -> Data {
|
||||||
|
try Data(contentsOf: url)
|
||||||
|
}
|
||||||
|
|
||||||
|
private func checkApplicationPath() {
|
||||||
|
let directoryName = URL(filePath: Bundle.main.bundlePath).deletingLastPathComponent().pathComponents.last
|
||||||
|
if directoryName != "Applications" {
|
||||||
|
alert = Alert(
|
||||||
|
title: Text("Wrong application location"),
|
||||||
|
message: Text("This app needs to be placed under the Applications folder to work."),
|
||||||
|
dismissButton: .default(Text("Ok")) {
|
||||||
|
NSWorkspace.shared.selectFile(Bundle.main.bundlePath, inFileViewerRootedAtPath: "")
|
||||||
|
NSApp.terminate(nil)
|
||||||
|
}
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user