mirror of
https://github.com/AvengeMedia/DankMaterialShell.git
synced 2026-08-02 11:38:30 -04:00
dc75f1f01d
* Add hotspot contract layer with capability-gated dispatch. Establish the interface and manager plumbing for hotspot support so backends can opt in without expanding the core Backend contract. Only backends that implement HotspotBackend get hotspot state propagated; others are forced to unsupported regardless of what they self-report. * Add IPC handlers and API docs for hotspot actions. Wire up configure/ start/ stop hotspot through the request router so the QML service layer can drive hotspot operations. Bump API version to 27 and document the capability-gating contract clients should follow. * Implement NetworkManager hotspot backend. Implement HotspotBackend on NetworkManagerBackend with DMS-owned profile management, AP capability detection, and band validation. Device resolution is deferred to StartHotspot when no device is specified, so profiles survive hardware changes. * Isolate client Wi-Fi state from AP-mode connections. Filter AP-mode profiles and access points out of all client Wi-Fi paths so the DMS hotspot (and user-created APs) never appear as saved networks, visible networks, or connected state. This protects existing client behavior before hotspot controls are exposed in the UI. * Prefer idle radios for automatic hotspot device selection. * Add hotspot properties and methods to QML service layer. Expose hotspot state and actions through DMSNetworkService, NetworkService, and LegacyNetworkService. Capability is gated on API version and backend-reported support, not backend name checks, and stays stable when Wi-Fi radio is disabled. * Add hotspot controls to Settings and Control Center. Settings shows a hotspot setup card as a sibling in the Wi-Fi tab with SSID, password, device, band, save, and start/ stop controls. Control Center shows a compact row that toggles a configured hotspot or routes to Settings for initial setup. Both stay visible when Wi-Fi is disabled, explaining the requirement instead of hiding. * Add translator context to hotspot strings.
376 lines
15 KiB
QML
376 lines
15 KiB
QML
pragma Singleton
|
|
pragma ComponentBehavior: Bound
|
|
|
|
import QtQuick
|
|
import Quickshell
|
|
import qs.Services
|
|
|
|
Singleton {
|
|
id: root
|
|
readonly property var log: Log.scoped("NetworkService")
|
|
|
|
property bool networkAvailable: activeService !== null
|
|
property string backend: activeService?.backend ?? ""
|
|
property string networkStatus: activeService?.networkStatus ?? "disconnected"
|
|
property string primaryConnection: activeService?.primaryConnection ?? ""
|
|
|
|
property string ethernetIP: activeService?.ethernetIP ?? ""
|
|
property string ethernetInterface: activeService?.ethernetInterface ?? ""
|
|
property bool ethernetConnected: activeService?.ethernetConnected ?? false
|
|
property string ethernetConnectionUuid: activeService?.ethernetConnectionUuid ?? ""
|
|
property var ethernetDevices: activeService?.ethernetDevices ?? []
|
|
|
|
property var wiredConnections: activeService?.wiredConnections ?? []
|
|
|
|
property string wifiIP: activeService?.wifiIP ?? ""
|
|
property string wifiInterface: activeService?.wifiInterface ?? ""
|
|
property bool wifiConnected: activeService?.wifiConnected ?? false
|
|
property bool wifiEnabled: activeService?.wifiEnabled ?? true
|
|
property string wifiConnectionUuid: activeService?.wifiConnectionUuid ?? ""
|
|
property string wifiDevicePath: activeService?.wifiDevicePath ?? ""
|
|
property string activeAccessPointPath: activeService?.activeAccessPointPath ?? ""
|
|
property var wifiDevices: activeService?.wifiDevices ?? []
|
|
property string wifiDeviceOverride: activeService?.wifiDeviceOverride ?? ""
|
|
property string connectingDevice: activeService?.connectingDevice ?? ""
|
|
|
|
property string currentWifiSSID: activeService?.currentWifiSSID ?? ""
|
|
property int wifiSignalStrength: activeService?.wifiSignalStrength ?? 0
|
|
property var wifiNetworks: activeService?.wifiNetworks ?? []
|
|
property var savedConnections: activeService?.savedConnections ?? []
|
|
property var ssidToConnectionName: activeService?.ssidToConnectionName ?? ({})
|
|
property var wifiSignalIcon: activeService?.wifiSignalIcon ?? "wifi_off"
|
|
|
|
property string userPreference: activeService?.userPreference ?? "auto"
|
|
property bool isConnecting: activeService?.isConnecting ?? false
|
|
readonly property bool isWifiConnecting: isConnecting && !ethernetConnected && !wifiToggling
|
|
property string connectingSSID: activeService?.connectingSSID ?? ""
|
|
property string connectionError: activeService?.connectionError ?? ""
|
|
|
|
property bool isScanning: activeService?.isScanning ?? false
|
|
property bool autoScan: activeService?.autoScan ?? false
|
|
|
|
property bool wifiAvailable: activeService?.wifiAvailable ?? true
|
|
property bool wifiToggling: activeService?.wifiToggling ?? false
|
|
property bool changingPreference: activeService?.changingPreference ?? false
|
|
property string targetPreference: activeService?.targetPreference ?? ""
|
|
property var savedWifiNetworks: activeService?.savedWifiNetworks ?? []
|
|
readonly property int savedWifiStateApiVersion: activeService?.savedWifiStateApiVersion ?? 26
|
|
readonly property int hotspotApiVersion: activeService?.hotspotApiVersion ?? 28
|
|
property bool hotspotSupported: activeService?.hotspotSupported ?? false
|
|
property bool hotspotAvailable: activeService?.hotspotAvailable ?? false
|
|
property bool hotspotConfigured: activeService?.hotspotConfigured ?? false
|
|
property bool hotspotEnabled: activeService?.hotspotEnabled ?? false
|
|
property bool hotspotActivating: activeService?.hotspotActivating ?? false
|
|
property bool hotspotSecured: activeService?.hotspotSecured ?? false
|
|
property bool hotspotWouldDisconnectWifi: activeService?.hotspotWouldDisconnectWifi ?? false
|
|
property string hotspotSSID: activeService?.hotspotSSID ?? ""
|
|
property string hotspotDevice: activeService?.hotspotDevice ?? ""
|
|
property string hotspotBand: activeService?.hotspotBand ?? ""
|
|
property bool hotspotBusy: activeService?.hotspotBusy ?? false
|
|
property string hotspotError: activeService?.hotspotError ?? ""
|
|
property string connectionStatus: activeService?.connectionStatus ?? ""
|
|
property string lastConnectionError: activeService?.lastConnectionError ?? ""
|
|
property bool passwordDialogShouldReopen: activeService?.passwordDialogShouldReopen ?? false
|
|
property bool autoRefreshEnabled: activeService?.autoRefreshEnabled ?? false
|
|
property string wifiPassword: activeService?.wifiPassword ?? ""
|
|
property string forgetSSID: activeService?.forgetSSID ?? ""
|
|
|
|
property string networkInfoSSID: activeService?.networkInfoSSID ?? ""
|
|
property string networkInfoDetails: activeService?.networkInfoDetails ?? ""
|
|
property bool networkInfoLoading: activeService?.networkInfoLoading ?? false
|
|
|
|
property string networkWiredInfoUUID: activeService?.networkWiredInfoUUID ?? ""
|
|
property string networkWiredInfoDetails: activeService?.networkWiredInfoDetails ?? ""
|
|
property bool networkWiredInfoLoading: activeService?.networkWiredInfoLoading ?? false
|
|
|
|
property int refCount: activeService?.refCount ?? 0
|
|
property bool stateInitialized: activeService?.stateInitialized ?? false
|
|
|
|
property bool subscriptionConnected: activeService?.subscriptionConnected ?? false
|
|
|
|
property var vpnProfiles: activeService?.vpnProfiles ?? []
|
|
property var vpnActive: activeService?.vpnActive ?? []
|
|
property bool vpnAvailable: activeService?.vpnAvailable ?? false
|
|
property bool vpnIsBusy: activeService?.vpnIsBusy ?? false
|
|
property bool vpnConnected: activeService?.vpnConnected ?? false
|
|
property string vpnActiveUuid: activeService?.activeUuid ?? ""
|
|
property string vpnActiveName: activeService?.activeName ?? ""
|
|
|
|
property string credentialsToken: activeService?.credentialsToken ?? ""
|
|
property string credentialsSSID: activeService?.credentialsSSID ?? ""
|
|
property string credentialsSetting: activeService?.credentialsSetting ?? ""
|
|
property var credentialsFields: activeService?.credentialsFields ?? []
|
|
property var credentialsHints: activeService?.credentialsHints ?? []
|
|
property string credentialsReason: activeService?.credentialsReason ?? ""
|
|
property bool credentialsRequested: activeService?.credentialsRequested ?? false
|
|
|
|
signal networksUpdated
|
|
signal connectionChanged
|
|
signal credentialsNeeded(string token, string ssid, string setting, var fields, var hints, string reason, string connType, string connName, string vpnService, var fieldsInfo)
|
|
|
|
property var activeService: null
|
|
|
|
readonly property string socketPath: Quickshell.env("DMS_SOCKET")
|
|
|
|
// Backend adoption must be state-checked here, not only edge-triggered below:
|
|
// with staged shell loading this singleton can be instantiated after
|
|
// DMSNetworkService already resolved its capabilities, so the change signal
|
|
// may never fire again.
|
|
Component.onCompleted: {
|
|
log.info("Initializing...");
|
|
if (!socketPath || socketPath.length === 0) {
|
|
log.info("DMS_SOCKET not set, network backend unavailable");
|
|
return;
|
|
}
|
|
if (DMSNetworkService.networkAvailable) {
|
|
log.info("Network capability already available, using DMSNetworkService");
|
|
useDMSService();
|
|
return;
|
|
}
|
|
log.debug("DMS_SOCKET found, waiting for capabilities...");
|
|
}
|
|
|
|
Connections {
|
|
target: DMSNetworkService
|
|
|
|
function onNetworkAvailableChanged() {
|
|
if (!activeService && DMSNetworkService.networkAvailable) {
|
|
log.info("Network capability detected, using DMSNetworkService");
|
|
useDMSService();
|
|
}
|
|
}
|
|
}
|
|
|
|
function useDMSService() {
|
|
activeService = DMSNetworkService;
|
|
log.info("Switched to DMSNetworkService, networkAvailable:", networkAvailable);
|
|
connectSignals();
|
|
}
|
|
|
|
function connectSignals() {
|
|
if (activeService) {
|
|
if (activeService.networksUpdated) {
|
|
activeService.networksUpdated.connect(root.networksUpdated);
|
|
}
|
|
if (activeService.connectionChanged) {
|
|
activeService.connectionChanged.connect(root.connectionChanged);
|
|
}
|
|
if (activeService.credentialsNeeded) {
|
|
activeService.credentialsNeeded.connect(root.credentialsNeeded);
|
|
}
|
|
}
|
|
}
|
|
|
|
function addRef() {
|
|
if (activeService && activeService.addRef) {
|
|
activeService.addRef();
|
|
}
|
|
}
|
|
|
|
function removeRef() {
|
|
if (activeService && activeService.removeRef) {
|
|
activeService.removeRef();
|
|
}
|
|
}
|
|
|
|
function getState() {
|
|
if (activeService && activeService.getState) {
|
|
activeService.getState();
|
|
}
|
|
}
|
|
|
|
function scanWifi() {
|
|
if (activeService && activeService.scanWifi) {
|
|
activeService.scanWifi();
|
|
}
|
|
}
|
|
|
|
function scanWifiNetworks() {
|
|
if (activeService && activeService.scanWifiNetworks) {
|
|
activeService.scanWifiNetworks();
|
|
}
|
|
}
|
|
|
|
function refreshSavedWifiNetworks() {
|
|
if (activeService && activeService.refreshSavedWifiNetworks) {
|
|
activeService.refreshSavedWifiNetworks();
|
|
}
|
|
}
|
|
|
|
function connectToWifi(ssid, password = "", username = "", anonymousIdentity = "", domainSuffixMatch = "") {
|
|
if (activeService && activeService.connectToWifi) {
|
|
activeService.connectToWifi(ssid, password, username, anonymousIdentity, domainSuffixMatch);
|
|
}
|
|
}
|
|
|
|
function disconnectWifi() {
|
|
if (activeService && activeService.disconnectWifi) {
|
|
activeService.disconnectWifi();
|
|
}
|
|
}
|
|
|
|
function forgetWifiNetwork(ssid) {
|
|
if (activeService && activeService.forgetWifiNetwork) {
|
|
activeService.forgetWifiNetwork(ssid);
|
|
}
|
|
}
|
|
|
|
function toggleWifiRadio() {
|
|
if (activeService && activeService.toggleWifiRadio) {
|
|
activeService.toggleWifiRadio();
|
|
}
|
|
}
|
|
|
|
function enableWifiDevice() {
|
|
if (activeService && activeService.enableWifiDevice) {
|
|
activeService.enableWifiDevice();
|
|
}
|
|
}
|
|
|
|
function setNetworkPreference(preference) {
|
|
if (activeService && activeService.setNetworkPreference) {
|
|
activeService.setNetworkPreference(preference);
|
|
}
|
|
}
|
|
|
|
function setConnectionPriority(type) {
|
|
if (activeService && activeService.setConnectionPriority) {
|
|
activeService.setConnectionPriority(type);
|
|
}
|
|
}
|
|
|
|
function connectToWifiAndSetPreference(ssid, password, username = "", anonymousIdentity = "", domainSuffixMatch = "") {
|
|
if (activeService && activeService.connectToWifiAndSetPreference) {
|
|
activeService.connectToWifiAndSetPreference(ssid, password, username, anonymousIdentity, domainSuffixMatch);
|
|
}
|
|
}
|
|
|
|
function toggleNetworkConnection(type) {
|
|
if (activeService && activeService.toggleNetworkConnection) {
|
|
activeService.toggleNetworkConnection(type);
|
|
}
|
|
}
|
|
|
|
function disconnectEthernetDevice(deviceName) {
|
|
if (activeService && activeService.disconnectEthernetDevice) {
|
|
activeService.disconnectEthernetDevice(deviceName);
|
|
}
|
|
}
|
|
|
|
function startAutoScan() {
|
|
if (activeService && activeService.startAutoScan) {
|
|
activeService.startAutoScan();
|
|
}
|
|
}
|
|
|
|
function stopAutoScan() {
|
|
if (activeService && activeService.stopAutoScan) {
|
|
activeService.stopAutoScan();
|
|
}
|
|
}
|
|
|
|
function fetchNetworkInfo(ssid) {
|
|
if (activeService && activeService.fetchNetworkInfo) {
|
|
activeService.fetchNetworkInfo(ssid);
|
|
}
|
|
}
|
|
|
|
function fetchWiredNetworkInfo(uuid) {
|
|
if (activeService && activeService.fetchWiredNetworkInfo) {
|
|
activeService.fetchWiredNetworkInfo(uuid);
|
|
}
|
|
}
|
|
|
|
function getNetworkInfo(ssid) {
|
|
if (activeService && activeService.getNetworkInfo) {
|
|
return activeService.getNetworkInfo(ssid);
|
|
}
|
|
return null;
|
|
}
|
|
|
|
function getWiredNetworkInfo(uuid) {
|
|
if (activeService && activeService.getWiredNetworkInfo) {
|
|
return activeService.getWiredNetworkInfo(uuid);
|
|
}
|
|
return null;
|
|
}
|
|
|
|
function refreshNetworkState() {
|
|
if (activeService && activeService.refreshNetworkState) {
|
|
activeService.refreshNetworkState();
|
|
}
|
|
}
|
|
|
|
function connectToSpecificWiredConfig(uuid) {
|
|
if (activeService && activeService.connectToSpecificWiredConfig) {
|
|
activeService.connectToSpecificWiredConfig(uuid);
|
|
}
|
|
}
|
|
|
|
function submitCredentials(token, secrets, save) {
|
|
if (activeService && activeService.submitCredentials) {
|
|
activeService.submitCredentials(token, secrets, save);
|
|
}
|
|
}
|
|
|
|
function cancelCredentials(token) {
|
|
if (activeService && activeService.cancelCredentials) {
|
|
activeService.cancelCredentials(token);
|
|
}
|
|
}
|
|
|
|
function setWifiAutoconnect(ssid, autoconnect) {
|
|
if (activeService && activeService.setWifiAutoconnect) {
|
|
activeService.setWifiAutoconnect(ssid, autoconnect);
|
|
}
|
|
}
|
|
|
|
function configureHotspot(ssid, password = "", device = "", band = "", callback = null) {
|
|
if (activeService && activeService.configureHotspot) {
|
|
return activeService.configureHotspot(ssid, password, device, band, callback);
|
|
}
|
|
return false;
|
|
}
|
|
|
|
function startHotspot(callback = null) {
|
|
if (activeService && activeService.startHotspot) {
|
|
return activeService.startHotspot(callback);
|
|
}
|
|
return false;
|
|
}
|
|
|
|
function stopHotspot(callback = null) {
|
|
if (activeService && activeService.stopHotspot) {
|
|
return activeService.stopHotspot(callback);
|
|
}
|
|
return false;
|
|
}
|
|
|
|
function configureAndStartHotspot(ssid, password = "", device = "", band = "", callback = null) {
|
|
if (activeService && activeService.configureAndStartHotspot) {
|
|
return activeService.configureAndStartHotspot(ssid, password, device, band, callback);
|
|
}
|
|
return false;
|
|
}
|
|
|
|
function getHotspotSecrets(callback) {
|
|
if (activeService && activeService.getHotspotSecrets) {
|
|
return activeService.getHotspotSecrets(callback);
|
|
}
|
|
return false;
|
|
}
|
|
|
|
function hotspotTargetWouldDisconnectWifi(device, band = "") {
|
|
if (activeService && activeService.hotspotTargetWouldDisconnectWifi) {
|
|
return activeService.hotspotTargetWouldDisconnectWifi(device, band);
|
|
}
|
|
return false;
|
|
}
|
|
|
|
function setWifiDeviceOverride(deviceName) {
|
|
if (activeService && activeService.setWifiDeviceOverride) {
|
|
activeService.setWifiDeviceOverride(deviceName);
|
|
}
|
|
}
|
|
}
|