Lot's of new stuff

Author: StephenDev0

StikJIT/StikJIT-Bridging-Header.h

@@ -3,6 +3,7 @@
 //
 
 #include "idevice/JITEnableContext.h"
+#import "Utilities/ProcessInspectorBridge.h"
 #include "idevice/idevice.h"
 #include "idevice/heartbeat.h"
 #include "JSSupport/JSSupport.h"

StikJIT/StikJITApp.swift

@@ -155,6 +155,7 @@ class TunnelManager: ObservableObject {
     static var shared = TunnelManager()
 
     private var vpnManager: NETunnelProviderManager?
+    private var pendingStopRequest = false
     private var tunnelDeviceIp: String {
         UserDefaults.standard.string(forKey: "TunnelDeviceIP") ?? "10.7.0.0"
     }
@@ -205,6 +206,10 @@ class TunnelManager: ObservableObject {
                         self.updateTunnelStatus(from: firstManager.connection.status)
                         VPNLogger.shared.log("Using existing tunnel configuration")
                     }
+                    if self.pendingStopRequest, let manager = self.vpnManager {
+                        VPNLogger.shared.log("Pending stop request detected during preference load")
+                        self.stopVPN(with: manager)
+                    }
                 } else {
                     VPNLogger.shared.log("No existing tunnel configuration found")
                 }
@@ -326,7 +331,16 @@ class TunnelManager: ObservableObject {
     }
 
     func stopVPN() {
-        guard let manager = vpnManager else { return }
+        guard let manager = vpnManager else {
+            pendingStopRequest = true
+            loadTunnelPreferences()
+            return
+        }
+        pendingStopRequest = false
+        stopVPN(with: manager)
+    }
+    
+    private func stopVPN(with manager: NETunnelProviderManager) {
         tunnelStatus = .disconnecting
         manager.connection.stopVPNTunnel()
         VPNLogger.shared.log("Network tunnel stop initiated")

StikJIT/Utilities/ProcessInspectorBridge.h

@@ -0,0 +1,13 @@
+//
+//  ProcessInspectorBridge.h
+//  StikJIT
+//
+
+#import "../idevice/JITEnableContext.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+FOUNDATION_EXPORT NSArray<NSDictionary*> * _Nullable FetchDeviceProcessList(NSError **error);
+FOUNDATION_EXPORT BOOL KillDeviceProcess(int pid, NSError **error);
+
+NS_ASSUME_NONNULL_END

StikJIT/Utilities/ProcessInspectorBridge.m

@@ -0,0 +1,34 @@
+//
+//  ProcessInspectorBridge.m
+//  StikJIT
+//
+
+#import "ProcessInspectorBridge.h"
+
+NSArray<NSDictionary*> * _Nullable FetchDeviceProcessList(NSError **error) {
+    @try {
+        return [[JITEnableContext shared] fetchProcessListWithError:error];
+    } @catch (NSException *exception) {
+        if (error) {
+            NSString *message = [NSString stringWithFormat:@"Process fetch failed: %@", exception.reason ?: @"Unknown error"];
+            *error = [NSError errorWithDomain:@"ProcessInspectorBridge"
+                                         code:-500
+                                     userInfo:@{NSLocalizedDescriptionKey: message}];
+        }
+        return nil;
+    }
+}
+
+BOOL KillDeviceProcess(int pid, NSError **error) {
+    @try {
+        return [[JITEnableContext shared] killProcessWithPID:pid error:error];
+    } @catch (NSException *exception) {
+        if (error) {
+            NSString *message = [NSString stringWithFormat:@"Process kill failed: %@", exception.reason ?: @"Unknown error"];
+            *error = [NSError errorWithDomain:@"ProcessInspectorBridge"
+                                         code:-501
+                                     userInfo:@{NSLocalizedDescriptionKey: message}];
+        }
+        return NO;
+    }
+}

StikJIT/Utilities/TabConfiguration.swift

@@ -0,0 +1,37 @@
+import Foundation
+
+enum TabConfiguration {
+    static let storageKey = "enabledTabIdentifiers"
+    static let maxSelectableTabs = 4
+    static let allowedIDs: [String] = ["home", "console", "scripts", "profiles", "processes", "deviceinfo", "location"]
+    static let defaultIDs: [String] = ["home", "console", "scripts", "profiles"]
+    static let defaultRawValue = serialize(defaultIDs)
+    
+    static func sanitize(raw: String) -> [String] {
+        let ids = raw
+            .split(separator: ",")
+            .map { String($0).trimmingCharacters(in: .whitespacesAndNewlines) }
+        return sanitize(ids: ids)
+    }
+    
+    static func sanitize(ids: [String]) -> [String] {
+        var result: [String] = []
+        for id in ids {
+            guard allowedIDs.contains(id) else { continue }
+            if !result.contains(id) {
+                result.append(id)
+            }
+            if result.count == maxSelectableTabs {
+                break
+            }
+        }
+        if result.isEmpty {
+            result = defaultIDs
+        }
+        return result
+    }
+    
+    static func serialize(_ ids: [String]) -> String {
+        sanitize(ids: ids).joined(separator: ",")
+    }
+}

StikJIT/Views/MainTabView.swift

@@ -7,10 +7,25 @@
 
 import SwiftUI
 
+private struct TabDescriptor: Identifiable {
+    let id: String
+    let title: String
+    let systemImage: String
+    let builder: () -> AnyView
+}
+
+extension Notification.Name {
+    static let switchToTab = Notification.Name("MainTabSwitchNotification")
+}
+
 struct MainTabView: View {
     @AppStorage("customAccentColor") private var customAccentColorHex: String = ""
     @AppStorage("appTheme") private var appThemeRaw: String = AppTheme.system.rawValue
-    @State private var selection: Int = 0
+    @AppStorage(TabConfiguration.storageKey) private var enabledTabIdentifiers: String = TabConfiguration.defaultRawValue
+    @AppStorage("primaryTabSelection") private var selection: String = TabConfiguration.defaultIDs.first ?? "home"
+    @State private var switchObserver: Any?
+    @State private var detachedTab: TabDescriptor?
+    @State private var didSetInitialHome = false
 
     // Update checking
     @State private var showForceUpdate: Bool = false
@@ -27,41 +42,109 @@ struct MainTabView: View {
     }
 
     private var isAppStoreBuild: Bool {
-        themeExpansion?.isAppStoreBuild ?? true
+        #if APPSTORE
+        return true
+        #else
+        return false
+        #endif
     }
 
+    private let configurableTabs: [TabDescriptor] = [
+        TabDescriptor(id: "home", title: "Home", systemImage: "house") { AnyView(HomeView()) },
+        TabDescriptor(id: "console", title: "Console", systemImage: "terminal") { AnyView(ConsoleLogsView()) },
+        TabDescriptor(id: "scripts", title: "Scripts", systemImage: "scroll") { AnyView(ScriptListView()) },
+        TabDescriptor(id: "profiles", title: "Profiles", systemImage: "magazine.fill") { AnyView(ProfileView()) },
+        TabDescriptor(id: "processes", title: "Processes", systemImage: "rectangle.stack.person.crop") { AnyView(ProcessInspectorView()) },
+        TabDescriptor(id: "deviceinfo", title: "Device Info", systemImage: "iphone.and.arrow.forward") { AnyView(DeviceInfoView()) },
+        TabDescriptor(id: "location", title: "Location", systemImage: "location") { AnyView(LocationSimulationView()) }
+    ]
+    
+    private var availableTabs: [TabDescriptor] {
+        configurableTabs.filter { descriptor in
+            descriptor.id != "location" || !isAppStoreBuild
+        }
+    }
+    
+    private let settingsTab = TabDescriptor(id: "settings", title: "Settings", systemImage: "gearshape.fill") {
+        AnyView(SettingsView())
+    }
+    
+    private var selectedTabDescriptors: [TabDescriptor] {
+        let ids = TabConfiguration.sanitize(raw: enabledTabIdentifiers)
+        return ids.compactMap { id in
+            availableTabs.first(where: { $0.id == id })
+        }
+    }
+    
+    private func ensureSelectionIsValid() {
+        let ids = selectedTabDescriptors.map { $0.id }
+        if ids.contains(selection) || selection == settingsTab.id {
+            return
+        }
+        selection = ids.first ?? settingsTab.id
+    }
+    
     var body: some View {
         ZStack {
             // Allow global themed background to show
             Color.clear.ignoresSafeArea()
 
             // Main tabs
             TabView(selection: $selection) {
-                HomeView()
-                    .tabItem { Label("Home", systemImage: "house") }
-                    .tag(0)
-
-                ConsoleLogsView()
-                    .tabItem { Label("Console", systemImage: "terminal") }
-                    .tag(1)
-
-                ScriptListView()
-                    .tabItem { Label("Scripts", systemImage: "scroll") }
-                    .tag(2)
+                ForEach(selectedTabDescriptors) { descriptor in
+                    descriptor.builder()
+                        .tabItem { Label(descriptor.title, systemImage: descriptor.systemImage) }
+                        .tag(descriptor.id)
+                }
 
-                ProfileView()
-                    .tabItem { Label("Profiles", systemImage: "magazine.fill") }
-                    .tag(3)
-
-                SettingsView()
-                    .tabItem { Label("Settings", systemImage: "gearshape.fill") }
-                    .tag(4)
+                settingsTab.builder()
+                    .tabItem { Label(settingsTab.title, systemImage: settingsTab.systemImage) }
+                    .tag(settingsTab.id)
             }
             .id((themeExpansion?.hasThemeExpansion == true) ? customAccentColorHex : "default-accent")
             .tint(accentColor)
             .preferredColorScheme(preferredScheme)
             .onAppear {
+                enabledTabIdentifiers = TabConfiguration.serialize(TabConfiguration.sanitize(raw: enabledTabIdentifiers))
+                ensureSelectionIsValid()
+                if !didSetInitialHome {
+                    if selectedTabDescriptors.contains(where: { $0.id == "home" }) {
+                        selection = "home"
+                    } else if let descriptor = availableTabs.first(where: { $0.id == "home" }) {
+                        detachedTab = descriptor
+                    }
+                    didSetInitialHome = true
+                }
                 checkForUpdate()
+                switchObserver = NotificationCenter.default.addObserver(forName: .switchToTab, object: nil, queue: .main) { note in
+                    guard let id = note.object as? String else { return }
+                    if selectedTabDescriptors.contains(where: { $0.id == id }) {
+                        selection = id
+                    } else if let descriptor = availableTabs.first(where: { $0.id == id }) {
+                        detachedTab = descriptor
+                    }
+                }
+            }
+            .onDisappear {
+                if let observer = switchObserver {
+                    NotificationCenter.default.removeObserver(observer)
+                    switchObserver = nil
+                }
+            }
+            .onChange(of: enabledTabIdentifiers) { _ in
+                ensureSelectionIsValid()
+            }
+            .sheet(item: $detachedTab) { descriptor in
+                NavigationStack {
+                    descriptor.builder()
+                        .toolbar {
+                            ToolbarItem(placement: .cancellationAction) {
+                                Button("Close") {
+                                    detachedTab = nil
+                                }
+                            }
+                        }
+                }
             }
 
             if showForceUpdate {