nmcli: fix errors + disable most logs
This commit is contained in:
2 * r + 2 * t
parent
d123dc0b7e
commit
9825ad4d31
1 changed files with 333 additions and 291 deletions
|
|
@ -1,4 +1,5 @@
|
|||
pragma Singleton
|
||||
pragma ComponentBehavior: Bound
|
||||
|
||||
import Quickshell
|
||||
import Quickshell.Io
|
||||
|
|
@ -30,7 +31,6 @@ Singleton {
|
|||
readonly property var activeEthernet: ethernetDevices.find(d => d.connected) ?? null
|
||||
|
||||
property list<var> activeProcesses: []
|
||||
property var debugLogger: null
|
||||
|
||||
// Constants
|
||||
readonly property string deviceTypeWifi: "wifi"
|
||||
|
|
@ -55,37 +55,12 @@ Singleton {
|
|||
readonly property string connectionParamPassword: "password"
|
||||
readonly property string connectionParamBssid: "802-11-wireless.bssid"
|
||||
|
||||
function setDebugLogger(logger: var): void {
|
||||
root.debugLogger = logger;
|
||||
}
|
||||
|
||||
function log(message: string): void {
|
||||
if (root.debugLogger) {
|
||||
root.debugLogger(message);
|
||||
} else {
|
||||
console.log("[Nmcli]", message);
|
||||
}
|
||||
}
|
||||
|
||||
function appendLog(message: string): void {
|
||||
log(message);
|
||||
}
|
||||
|
||||
function detectPasswordRequired(error: string): bool {
|
||||
if (!error || error.length === 0) {
|
||||
return false;
|
||||
}
|
||||
|
||||
return (error.includes("Secrets were required") ||
|
||||
error.includes("Secrets were required, but not provided") ||
|
||||
error.includes("No secrets provided") ||
|
||||
error.includes("802-11-wireless-security.psk") ||
|
||||
error.includes("password for") ||
|
||||
(error.includes("password") && !error.includes("Connection activated") && !error.includes("successfully")) ||
|
||||
(error.includes("Secrets") && !error.includes("Connection activated") && !error.includes("successfully")) ||
|
||||
(error.includes("802.11") && !error.includes("Connection activated") && !error.includes("successfully"))) &&
|
||||
!error.includes("Connection activated") &&
|
||||
!error.includes("successfully");
|
||||
return (error.includes("Secrets were required") || error.includes("Secrets were required, but not provided") || error.includes("No secrets provided") || error.includes("802-11-wireless-security.psk") || error.includes("password for") || (error.includes("password") && !error.includes("Connection activated") && !error.includes("successfully")) || (error.includes("Secrets") && !error.includes("Connection activated") && !error.includes("successfully")) || (error.includes("802.11") && !error.includes("Connection activated") && !error.includes("successfully"))) && !error.includes("Connection activated") && !error.includes("successfully");
|
||||
}
|
||||
|
||||
function parseNetworkOutput(output: string): list<var> {
|
||||
|
|
@ -97,9 +72,7 @@ Singleton {
|
|||
const rep = new RegExp("\\\\:", "g");
|
||||
const rep2 = new RegExp(PLACEHOLDER, "g");
|
||||
|
||||
const allNetworks = output.trim().split("\n")
|
||||
.filter(line => line && line.length > 0)
|
||||
.map(n => {
|
||||
const allNetworks = output.trim().split("\n").filter(line => line && line.length > 0).map(n => {
|
||||
const net = n.replace(rep, PLACEHOLDER).split(":");
|
||||
return {
|
||||
active: net[0] === "yes",
|
||||
|
|
@ -109,8 +82,7 @@ Singleton {
|
|||
bssid: (net[4]?.replace(rep2, ":") ?? "").trim(),
|
||||
security: (net[5] ?? "").trim()
|
||||
};
|
||||
})
|
||||
.filter(n => n.ssid && n.ssid.length > 0);
|
||||
}).filter(n => n.ssid && n.ssid.length > 0);
|
||||
|
||||
return allNetworks;
|
||||
}
|
||||
|
|
@ -188,9 +160,7 @@ Singleton {
|
|||
return false;
|
||||
}
|
||||
|
||||
return state === "100 (connected)" ||
|
||||
state === "connected" ||
|
||||
state.startsWith("connected");
|
||||
return state === "100 (connected)" || state === "connected" || state.startsWith("connected");
|
||||
}
|
||||
|
||||
function executeCommand(args: list<string>, callback: var): void {
|
||||
|
|
@ -213,21 +183,23 @@ Singleton {
|
|||
}
|
||||
|
||||
function getDeviceStatus(callback: var): void {
|
||||
executeCommand(["-t", "-f", root.deviceStatusFields, root.nmcliCommandDevice, "status"], (result) => {
|
||||
if (callback) callback(result.output);
|
||||
executeCommand(["-t", "-f", root.deviceStatusFields, root.nmcliCommandDevice, "status"], result => {
|
||||
if (callback)
|
||||
callback(result.output);
|
||||
});
|
||||
}
|
||||
|
||||
function getWirelessInterfaces(callback: var): void {
|
||||
executeCommand(["-t", "-f", root.deviceStatusFields, root.nmcliCommandDevice, "status"], (result) => {
|
||||
executeCommand(["-t", "-f", root.deviceStatusFields, root.nmcliCommandDevice, "status"], result => {
|
||||
const interfaces = parseDeviceStatusOutput(result.output, root.deviceTypeWifi);
|
||||
root.wirelessInterfaces = interfaces;
|
||||
if (callback) callback(interfaces);
|
||||
if (callback)
|
||||
callback(interfaces);
|
||||
});
|
||||
}
|
||||
|
||||
function getEthernetInterfaces(callback: var): void {
|
||||
executeCommand(["-t", "-f", root.deviceStatusFields, root.nmcliCommandDevice, "status"], (result) => {
|
||||
executeCommand(["-t", "-f", root.deviceStatusFields, root.nmcliCommandDevice, "status"], result => {
|
||||
const interfaces = parseDeviceStatusOutput(result.output, root.deviceTypeEthernet);
|
||||
const devices = [];
|
||||
|
||||
|
|
@ -251,13 +223,14 @@ Singleton {
|
|||
|
||||
root.ethernetInterfaces = interfaces;
|
||||
root.ethernetDevices = devices;
|
||||
if (callback) callback(interfaces);
|
||||
if (callback)
|
||||
callback(interfaces);
|
||||
});
|
||||
}
|
||||
|
||||
function connectEthernet(connectionName: string, interfaceName: string, callback: var): void {
|
||||
if (connectionName && connectionName.length > 0) {
|
||||
executeCommand([root.nmcliCommandConnection, "up", connectionName], (result) => {
|
||||
executeCommand([root.nmcliCommandConnection, "up", connectionName], result => {
|
||||
if (result.success) {
|
||||
Qt.callLater(() => {
|
||||
getEthernetInterfaces(() => {});
|
||||
|
|
@ -268,10 +241,11 @@ Singleton {
|
|||
}
|
||||
}, 500);
|
||||
}
|
||||
if (callback) callback(result);
|
||||
if (callback)
|
||||
callback(result);
|
||||
});
|
||||
} else if (interfaceName && interfaceName.length > 0) {
|
||||
executeCommand([root.nmcliCommandDevice, "connect", interfaceName], (result) => {
|
||||
executeCommand([root.nmcliCommandDevice, "connect", interfaceName], result => {
|
||||
if (result.success) {
|
||||
Qt.callLater(() => {
|
||||
getEthernetInterfaces(() => {});
|
||||
|
|
@ -280,62 +254,94 @@ Singleton {
|
|||
}, 1000);
|
||||
}, 500);
|
||||
}
|
||||
if (callback) callback(result);
|
||||
if (callback)
|
||||
callback(result);
|
||||
});
|
||||
} else {
|
||||
if (callback) callback({ success: false, output: "", error: "No connection name or interface specified", exitCode: -1 });
|
||||
if (callback)
|
||||
callback({
|
||||
success: false,
|
||||
output: "",
|
||||
error: "No connection name or interface specified",
|
||||
exitCode: -1
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
function disconnectEthernet(connectionName: string, callback: var): void {
|
||||
if (!connectionName || connectionName.length === 0) {
|
||||
if (callback) callback({ success: false, output: "", error: "No connection name specified", exitCode: -1 });
|
||||
if (callback)
|
||||
callback({
|
||||
success: false,
|
||||
output: "",
|
||||
error: "No connection name specified",
|
||||
exitCode: -1
|
||||
});
|
||||
return;
|
||||
}
|
||||
|
||||
executeCommand([root.nmcliCommandConnection, "down", connectionName], (result) => {
|
||||
executeCommand([root.nmcliCommandConnection, "down", connectionName], result => {
|
||||
if (result.success) {
|
||||
root.ethernetDeviceDetails = null;
|
||||
Qt.callLater(() => {
|
||||
getEthernetInterfaces(() => {});
|
||||
}, 500);
|
||||
}
|
||||
if (callback) callback(result);
|
||||
if (callback)
|
||||
callback(result);
|
||||
});
|
||||
}
|
||||
|
||||
function getAllInterfaces(callback: var): void {
|
||||
executeCommand(["-t", "-f", root.deviceStatusFields, root.nmcliCommandDevice, "status"], (result) => {
|
||||
executeCommand(["-t", "-f", root.deviceStatusFields, root.nmcliCommandDevice, "status"], result => {
|
||||
const interfaces = parseDeviceStatusOutput(result.output, "both");
|
||||
if (callback) callback(interfaces);
|
||||
if (callback)
|
||||
callback(interfaces);
|
||||
});
|
||||
}
|
||||
|
||||
function isInterfaceConnected(interfaceName: string, callback: var): void {
|
||||
executeCommand([root.nmcliCommandDevice, "status"], (result) => {
|
||||
executeCommand([root.nmcliCommandDevice, "status"], result => {
|
||||
const lines = result.output.trim().split("\n");
|
||||
for (const line of lines) {
|
||||
const parts = line.split(/\s+/);
|
||||
if (parts.length >= 3 && parts[0] === interfaceName) {
|
||||
const connected = isConnectedState(parts[2]);
|
||||
if (callback) callback(connected);
|
||||
if (callback)
|
||||
callback(connected);
|
||||
return;
|
||||
}
|
||||
}
|
||||
if (callback) callback(false);
|
||||
if (callback)
|
||||
callback(false);
|
||||
});
|
||||
}
|
||||
|
||||
function connectToNetworkWithPasswordCheck(ssid: string, isSecure: bool, callback: var, bssid: string): void {
|
||||
if (isSecure) {
|
||||
const hasBssid = bssid !== undefined && bssid !== null && bssid.length > 0;
|
||||
connectWireless(ssid, "", bssid, (result) => {
|
||||
connectWireless(ssid, "", bssid, result => {
|
||||
if (result.success) {
|
||||
if (callback) callback({ success: true, usedSavedPassword: true, output: result.output, error: "", exitCode: 0 });
|
||||
if (callback)
|
||||
callback({
|
||||
success: true,
|
||||
usedSavedPassword: true,
|
||||
output: result.output,
|
||||
error: "",
|
||||
exitCode: 0
|
||||
});
|
||||
} else if (result.needsPassword) {
|
||||
if (callback) callback({ success: false, needsPassword: true, output: result.output, error: result.error, exitCode: result.exitCode });
|
||||
if (callback)
|
||||
callback({
|
||||
success: false,
|
||||
needsPassword: true,
|
||||
output: result.output,
|
||||
error: result.error,
|
||||
exitCode: result.exitCode
|
||||
});
|
||||
} else {
|
||||
if (callback) callback(result);
|
||||
if (callback)
|
||||
callback(result);
|
||||
}
|
||||
});
|
||||
} else {
|
||||
|
|
@ -353,7 +359,12 @@ Singleton {
|
|||
const maxRetries = 2;
|
||||
|
||||
if (callback) {
|
||||
root.pendingConnection = { ssid: ssid, bssid: hasBssid ? bssid : "", callback: callback, retryCount: retries };
|
||||
root.pendingConnection = {
|
||||
ssid: ssid,
|
||||
bssid: hasBssid ? bssid : "",
|
||||
callback: callback,
|
||||
retryCount: retries
|
||||
};
|
||||
connectionCheckTimer.start();
|
||||
immediateCheckTimer.checkCount = 0;
|
||||
immediateCheckTimer.start();
|
||||
|
|
@ -369,54 +380,45 @@ Singleton {
|
|||
if (password && password.length > 0) {
|
||||
cmd.push(root.connectionParamPassword, password);
|
||||
}
|
||||
executeCommand(cmd, (result) => {
|
||||
executeCommand(cmd, result => {
|
||||
if (result.needsPassword && callback) {
|
||||
if (callback) callback(result);
|
||||
if (callback)
|
||||
callback(result);
|
||||
return;
|
||||
}
|
||||
|
||||
if (!result.success && root.pendingConnection && retries < maxRetries) {
|
||||
log("Connection failed, retrying... (attempt " + (retries + 1) + "/" + maxRetries + ")");
|
||||
console.warn("[NMCLI] Connection failed, retrying... (attempt " + (retries + 1) + "/" + maxRetries + ")");
|
||||
Qt.callLater(() => {
|
||||
connectWireless(ssid, password, bssid, callback, retries + 1);
|
||||
}, 1000);
|
||||
} else if (!result.success && root.pendingConnection) {
|
||||
} else if (result.success && callback) {
|
||||
} else if (!result.success && !root.pendingConnection) {
|
||||
if (callback) callback(result);
|
||||
} else if (!result.success && root.pendingConnection) {} else if (result.success && callback) {} else if (!result.success && !root.pendingConnection) {
|
||||
if (callback)
|
||||
callback(result);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
function createConnectionWithPassword(ssid: string, bssidUpper: string, password: string, callback: var): void {
|
||||
checkAndDeleteConnection(ssid, () => {
|
||||
const cmd = [root.nmcliCommandConnection, "add",
|
||||
root.connectionParamType, root.deviceTypeWifi,
|
||||
root.connectionParamConName, ssid,
|
||||
root.connectionParamIfname, "*",
|
||||
root.connectionParamSsid, ssid,
|
||||
root.connectionParamBssid, bssidUpper,
|
||||
root.securityKeyMgmt, root.keyMgmtWpaPsk,
|
||||
root.securityPsk, password];
|
||||
const cmd = [root.nmcliCommandConnection, "add", root.connectionParamType, root.deviceTypeWifi, root.connectionParamConName, ssid, root.connectionParamIfname, "*", root.connectionParamSsid, ssid, root.connectionParamBssid, bssidUpper, root.securityKeyMgmt, root.keyMgmtWpaPsk, root.securityPsk, password];
|
||||
|
||||
executeCommand(cmd, (result) => {
|
||||
executeCommand(cmd, result => {
|
||||
if (result.success) {
|
||||
loadSavedConnections(() => {});
|
||||
activateConnection(ssid, callback);
|
||||
} else {
|
||||
const hasDuplicateWarning = result.error && (
|
||||
result.error.includes("another connection with the name") ||
|
||||
result.error.includes("Reference the connection by its uuid")
|
||||
);
|
||||
const hasDuplicateWarning = result.error && (result.error.includes("another connection with the name") || result.error.includes("Reference the connection by its uuid"));
|
||||
|
||||
if (hasDuplicateWarning || (result.exitCode > 0 && result.exitCode < 10)) {
|
||||
loadSavedConnections(() => {});
|
||||
activateConnection(ssid, callback);
|
||||
} else {
|
||||
log("Connection profile creation failed, trying fallback...");
|
||||
console.warn("[NMCLI] Connection profile creation failed, trying fallback...");
|
||||
let fallbackCmd = [root.nmcliCommandDevice, root.nmcliCommandWifi, "connect", ssid, root.connectionParamPassword, password];
|
||||
executeCommand(fallbackCmd, (fallbackResult) => {
|
||||
if (callback) callback(fallbackResult);
|
||||
executeCommand(fallbackCmd, fallbackResult => {
|
||||
if (callback)
|
||||
callback(fallbackResult);
|
||||
});
|
||||
}
|
||||
}
|
||||
|
|
@ -425,31 +427,35 @@ Singleton {
|
|||
}
|
||||
|
||||
function checkAndDeleteConnection(ssid: string, callback: var): void {
|
||||
executeCommand([root.nmcliCommandConnection, "show", ssid], (result) => {
|
||||
executeCommand([root.nmcliCommandConnection, "show", ssid], result => {
|
||||
if (result.success) {
|
||||
executeCommand([root.nmcliCommandConnection, "delete", ssid], (deleteResult) => {
|
||||
executeCommand([root.nmcliCommandConnection, "delete", ssid], deleteResult => {
|
||||
Qt.callLater(() => {
|
||||
if (callback) callback();
|
||||
if (callback)
|
||||
callback();
|
||||
}, 300);
|
||||
});
|
||||
} else {
|
||||
if (callback) callback();
|
||||
if (callback)
|
||||
callback();
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
function activateConnection(connectionName: string, callback: var): void {
|
||||
executeCommand([root.nmcliCommandConnection, "up", connectionName], (result) => {
|
||||
if (callback) callback(result);
|
||||
executeCommand([root.nmcliCommandConnection, "up", connectionName], result => {
|
||||
if (callback)
|
||||
callback(result);
|
||||
});
|
||||
}
|
||||
|
||||
function loadSavedConnections(callback: var): void {
|
||||
executeCommand(["-t", "-f", root.connectionListFields, root.nmcliCommandConnection, "show"], (result) => {
|
||||
executeCommand(["-t", "-f", root.connectionListFields, root.nmcliCommandConnection, "show"], result => {
|
||||
if (!result.success) {
|
||||
root.savedConnections = [];
|
||||
root.savedConnectionSsids = [];
|
||||
if (callback) callback([]);
|
||||
if (callback)
|
||||
callback([]);
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
@ -485,7 +491,8 @@ Singleton {
|
|||
} else {
|
||||
root.savedConnectionSsids = [];
|
||||
root.wifiConnectionQueue = [];
|
||||
if (callback) callback(root.savedConnectionSsids);
|
||||
if (callback)
|
||||
callback(root.savedConnectionSsids);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -494,7 +501,7 @@ Singleton {
|
|||
const connectionName = root.wifiConnectionQueue[root.currentSsidQueryIndex];
|
||||
root.currentSsidQueryIndex++;
|
||||
|
||||
executeCommand(["-t", "-f", root.wirelessSsidField, root.nmcliCommandConnection, "show", connectionName], (result) => {
|
||||
executeCommand(["-t", "-f", root.wirelessSsidField, root.nmcliCommandConnection, "show", connectionName], result => {
|
||||
if (result.success) {
|
||||
processSsidOutput(result.output);
|
||||
}
|
||||
|
|
@ -503,7 +510,8 @@ Singleton {
|
|||
} else {
|
||||
root.wifiConnectionQueue = [];
|
||||
root.currentSsidQueryIndex = 0;
|
||||
if (callback) callback(root.savedConnectionSsids);
|
||||
if (callback)
|
||||
callback(root.savedConnectionSsids);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -538,62 +546,65 @@ Singleton {
|
|||
}
|
||||
}
|
||||
|
||||
const hasSsid = root.savedConnectionSsids.some(savedSsid =>
|
||||
savedSsid && savedSsid.toLowerCase().trim() === ssidLower
|
||||
);
|
||||
const hasSsid = root.savedConnectionSsids.some(savedSsid => savedSsid && savedSsid.toLowerCase().trim() === ssidLower);
|
||||
|
||||
if (hasSsid) {
|
||||
return true;
|
||||
}
|
||||
|
||||
const hasConnectionName = root.savedConnections.some(connName =>
|
||||
connName && connName.toLowerCase().trim() === ssidLower
|
||||
);
|
||||
const hasConnectionName = root.savedConnections.some(connName => connName && connName.toLowerCase().trim() === ssidLower);
|
||||
|
||||
return hasConnectionName;
|
||||
}
|
||||
|
||||
function forgetNetwork(ssid: string, callback: var): void {
|
||||
if (!ssid || ssid.length === 0) {
|
||||
if (callback) callback({ success: false, output: "", error: "No SSID specified", exitCode: -1 });
|
||||
if (callback)
|
||||
callback({
|
||||
success: false,
|
||||
output: "",
|
||||
error: "No SSID specified",
|
||||
exitCode: -1
|
||||
});
|
||||
return;
|
||||
}
|
||||
|
||||
const connectionName = root.savedConnections.find(conn =>
|
||||
conn && conn.toLowerCase().trim() === ssid.toLowerCase().trim()
|
||||
) || ssid;
|
||||
const connectionName = root.savedConnections.find(conn => conn && conn.toLowerCase().trim() === ssid.toLowerCase().trim()) || ssid;
|
||||
|
||||
executeCommand([root.nmcliCommandConnection, "delete", connectionName], (result) => {
|
||||
executeCommand([root.nmcliCommandConnection, "delete", connectionName], result => {
|
||||
if (result.success) {
|
||||
Qt.callLater(() => {
|
||||
loadSavedConnections(() => {});
|
||||
}, 500);
|
||||
}
|
||||
if (callback) callback(result);
|
||||
if (callback)
|
||||
callback(result);
|
||||
});
|
||||
}
|
||||
|
||||
function disconnect(interfaceName: string, callback: var): void {
|
||||
if (interfaceName && interfaceName.length > 0) {
|
||||
executeCommand([root.nmcliCommandDevice, "disconnect", interfaceName], (result) => {
|
||||
if (callback) callback(result.success ? result.output : "");
|
||||
executeCommand([root.nmcliCommandDevice, "disconnect", interfaceName], result => {
|
||||
if (callback)
|
||||
callback(result.success ? result.output : "");
|
||||
});
|
||||
} else {
|
||||
executeCommand([root.nmcliCommandDevice, "disconnect", root.deviceTypeWifi], (result) => {
|
||||
if (callback) callback(result.success ? result.output : "");
|
||||
executeCommand([root.nmcliCommandDevice, "disconnect", root.deviceTypeWifi], result => {
|
||||
if (callback)
|
||||
callback(result.success ? result.output : "");
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
function disconnectFromNetwork(): void {
|
||||
if (active && active.ssid) {
|
||||
executeCommand([root.nmcliCommandConnection, "down", active.ssid], (result) => {
|
||||
executeCommand([root.nmcliCommandConnection, "down", active.ssid], result => {
|
||||
if (result.success) {
|
||||
getNetworks(() => {});
|
||||
}
|
||||
});
|
||||
} else {
|
||||
executeCommand([root.nmcliCommandDevice, "disconnect", root.deviceTypeWifi], (result) => {
|
||||
executeCommand([root.nmcliCommandDevice, "disconnect", root.deviceTypeWifi], result => {
|
||||
if (result.success) {
|
||||
getNetworks(() => {});
|
||||
}
|
||||
|
|
@ -602,13 +613,14 @@ Singleton {
|
|||
}
|
||||
|
||||
function getDeviceDetails(interfaceName: string, callback: var): void {
|
||||
executeCommand([root.nmcliCommandDevice, "show", interfaceName], (result) => {
|
||||
if (callback) callback(result.output);
|
||||
executeCommand([root.nmcliCommandDevice, "show", interfaceName], result => {
|
||||
if (callback)
|
||||
callback(result.output);
|
||||
});
|
||||
}
|
||||
|
||||
function refreshStatus(callback: var): void {
|
||||
getDeviceStatus((output) => {
|
||||
getDeviceStatus(output => {
|
||||
const lines = output.trim().split("\n");
|
||||
let connected = false;
|
||||
let activeIf = "";
|
||||
|
|
@ -631,31 +643,48 @@ Singleton {
|
|||
root.activeInterface = activeIf;
|
||||
root.activeConnection = activeConn;
|
||||
|
||||
if (callback) callback({ connected, interface: activeIf, connection: activeConn });
|
||||
if (callback)
|
||||
callback({
|
||||
connected,
|
||||
interface: activeIf,
|
||||
connection: activeConn
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
function bringInterfaceUp(interfaceName: string, callback: var): void {
|
||||
if (interfaceName && interfaceName.length > 0) {
|
||||
executeCommand([root.nmcliCommandDevice, "connect", interfaceName], (result) => {
|
||||
executeCommand([root.nmcliCommandDevice, "connect", interfaceName], result => {
|
||||
if (callback) {
|
||||
callback(result);
|
||||
}
|
||||
});
|
||||
} else {
|
||||
if (callback) callback({ success: false, output: "", error: "No interface specified", exitCode: -1 });
|
||||
if (callback)
|
||||
callback({
|
||||
success: false,
|
||||
output: "",
|
||||
error: "No interface specified",
|
||||
exitCode: -1
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
function bringInterfaceDown(interfaceName: string, callback: var): void {
|
||||
if (interfaceName && interfaceName.length > 0) {
|
||||
executeCommand([root.nmcliCommandDevice, "disconnect", interfaceName], (result) => {
|
||||
executeCommand([root.nmcliCommandDevice, "disconnect", interfaceName], result => {
|
||||
if (callback) {
|
||||
callback(result);
|
||||
}
|
||||
});
|
||||
} else {
|
||||
if (callback) callback({ success: false, output: "", error: "No interface specified", exitCode: -1 });
|
||||
if (callback)
|
||||
callback({
|
||||
success: false,
|
||||
output: "",
|
||||
error: "No interface specified",
|
||||
exitCode: -1
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -664,7 +693,7 @@ Singleton {
|
|||
if (interfaceName && interfaceName.length > 0) {
|
||||
cmd.push(root.connectionParamIfname, interfaceName);
|
||||
}
|
||||
executeCommand(cmd, (result) => {
|
||||
executeCommand(cmd, result => {
|
||||
if (callback) {
|
||||
callback(result);
|
||||
}
|
||||
|
|
@ -677,14 +706,16 @@ Singleton {
|
|||
|
||||
function enableWifi(enabled: bool, callback: var): void {
|
||||
const cmd = enabled ? "on" : "off";
|
||||
executeCommand([root.nmcliCommandRadio, root.nmcliCommandWifi, cmd], (result) => {
|
||||
executeCommand([root.nmcliCommandRadio, root.nmcliCommandWifi, cmd], result => {
|
||||
if (result.success) {
|
||||
getWifiStatus((status) => {
|
||||
getWifiStatus(status => {
|
||||
root.wifiEnabled = status;
|
||||
if (callback) callback(result);
|
||||
if (callback)
|
||||
callback(result);
|
||||
});
|
||||
} else {
|
||||
if (callback) callback(result);
|
||||
if (callback)
|
||||
callback(result);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
|
@ -695,21 +726,24 @@ Singleton {
|
|||
}
|
||||
|
||||
function getWifiStatus(callback: var): void {
|
||||
executeCommand([root.nmcliCommandRadio, root.nmcliCommandWifi], (result) => {
|
||||
executeCommand([root.nmcliCommandRadio, root.nmcliCommandWifi], result => {
|
||||
if (result.success) {
|
||||
const enabled = result.output.trim() === "enabled";
|
||||
root.wifiEnabled = enabled;
|
||||
if (callback) callback(enabled);
|
||||
if (callback)
|
||||
callback(enabled);
|
||||
} else {
|
||||
if (callback) callback(root.wifiEnabled);
|
||||
if (callback)
|
||||
callback(root.wifiEnabled);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
function getNetworks(callback: var): void {
|
||||
executeCommand(["-g", root.networkDetailFields, "d", "w"], (result) => {
|
||||
executeCommand(["-g", root.networkDetailFields, "d", "w"], result => {
|
||||
if (!result.success) {
|
||||
if (callback) callback([]);
|
||||
if (callback)
|
||||
callback([]);
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
@ -717,11 +751,7 @@ Singleton {
|
|||
const networks = deduplicateNetworks(allNetworks);
|
||||
const rNetworks = root.networks;
|
||||
|
||||
const destroyed = rNetworks.filter(rn => !networks.find(n =>
|
||||
n.frequency === rn.frequency &&
|
||||
n.ssid === rn.ssid &&
|
||||
n.bssid === rn.bssid
|
||||
));
|
||||
const destroyed = rNetworks.filter(rn => !networks.find(n => n.frequency === rn.frequency && n.ssid === rn.ssid && n.bssid === rn.bssid));
|
||||
for (const network of destroyed) {
|
||||
const index = rNetworks.indexOf(network);
|
||||
if (index >= 0) {
|
||||
|
|
@ -731,11 +761,7 @@ Singleton {
|
|||
}
|
||||
|
||||
for (const network of networks) {
|
||||
const match = rNetworks.find(n =>
|
||||
n.frequency === network.frequency &&
|
||||
n.ssid === network.ssid &&
|
||||
n.bssid === network.bssid
|
||||
);
|
||||
const match = rNetworks.find(n => n.frequency === network.frequency && n.ssid === network.ssid && n.bssid === network.bssid);
|
||||
if (match) {
|
||||
match.lastIpcObject = network;
|
||||
} else {
|
||||
|
|
@ -745,7 +771,8 @@ Singleton {
|
|||
}
|
||||
}
|
||||
|
||||
if (callback) callback(root.networks);
|
||||
if (callback)
|
||||
callback(root.networks);
|
||||
checkPendingConnection();
|
||||
});
|
||||
}
|
||||
|
|
@ -755,9 +782,10 @@ Singleton {
|
|||
if (interfaceName && interfaceName.length > 0) {
|
||||
cmd.push(root.connectionParamIfname, interfaceName);
|
||||
}
|
||||
executeCommand(cmd, (result) => {
|
||||
executeCommand(cmd, result => {
|
||||
if (!result.success) {
|
||||
if (callback) callback([]);
|
||||
if (callback)
|
||||
callback([]);
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
@ -766,7 +794,8 @@ Singleton {
|
|||
const seenSSIDs = new Set();
|
||||
|
||||
for (const line of lines) {
|
||||
if (!line || line.length === 0) continue;
|
||||
if (!line || line.length === 0)
|
||||
continue;
|
||||
|
||||
const parts = line.split(":");
|
||||
if (parts.length >= 1) {
|
||||
|
|
@ -790,7 +819,8 @@ Singleton {
|
|||
return b.signalValue - a.signalValue;
|
||||
});
|
||||
|
||||
if (callback) callback(ssids);
|
||||
if (callback)
|
||||
callback(ssids);
|
||||
});
|
||||
}
|
||||
|
||||
|
|
@ -833,10 +863,12 @@ Singleton {
|
|||
|
||||
component CommandProcess: Process {
|
||||
id: proc
|
||||
|
||||
property var callback: null
|
||||
property list<string> command: []
|
||||
property bool callbackCalled: false
|
||||
property int exitCode: 0
|
||||
|
||||
signal processFinished
|
||||
|
||||
environment: ({
|
||||
|
|
@ -846,58 +878,58 @@ Singleton {
|
|||
|
||||
stdout: StdioCollector {
|
||||
id: stdoutCollector
|
||||
onStreamFinished: {
|
||||
}
|
||||
}
|
||||
|
||||
stderr: StdioCollector {
|
||||
id: stderrCollector
|
||||
|
||||
onStreamFinished: {
|
||||
const error = text.trim();
|
||||
if (error && error.length > 0) {
|
||||
const output = (stdoutCollector && stdoutCollector.text) ? stdoutCollector.text : "";
|
||||
handlePasswordRequired(proc, error, output, -1);
|
||||
root.handlePasswordRequired(proc, error, output, -1);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
onExited: {
|
||||
proc.exitCode = exitCode;
|
||||
onExited: code => {
|
||||
exitCode = code;
|
||||
|
||||
Qt.callLater(() => {
|
||||
if (proc.callbackCalled) {
|
||||
proc.processFinished();
|
||||
if (callbackCalled) {
|
||||
processFinished();
|
||||
return;
|
||||
}
|
||||
|
||||
if (proc.callback) {
|
||||
const output = (stdoutCollector && stdoutCollector.text) ? stdoutCollector.text : "";
|
||||
const error = (stderrCollector && stderrCollector.text) ? stderrCollector.text : "";
|
||||
const success = proc.exitCode === 0;
|
||||
const success = exitCode === 0;
|
||||
const cmdIsConnection = isConnectionCommand(proc.command);
|
||||
|
||||
if (handlePasswordRequired(proc, error, output, proc.exitCode)) {
|
||||
proc.processFinished();
|
||||
if (root.handlePasswordRequired(proc, error, output, exitCode)) {
|
||||
processFinished();
|
||||
return;
|
||||
}
|
||||
|
||||
const needsPassword = cmdIsConnection && detectPasswordRequired(error);
|
||||
const needsPassword = cmdIsConnection && root.detectPasswordRequired(error);
|
||||
|
||||
if (!success && cmdIsConnection && root.pendingConnection) {
|
||||
const failedSsid = root.pendingConnection.ssid;
|
||||
root.connectionFailed(failedSsid);
|
||||
}
|
||||
|
||||
proc.callbackCalled = true;
|
||||
proc.callback({
|
||||
callbackCalled = true;
|
||||
callback({
|
||||
success: success,
|
||||
output: output,
|
||||
error: error,
|
||||
exitCode: proc.exitCode,
|
||||
needsPassword: needsPassword || false
|
||||
});
|
||||
proc.processFinished();
|
||||
processFinished();
|
||||
} else {
|
||||
proc.processFinished();
|
||||
processFinished();
|
||||
}
|
||||
});
|
||||
}
|
||||
|
|
@ -905,6 +937,7 @@ Singleton {
|
|||
|
||||
Component {
|
||||
id: commandProc
|
||||
|
||||
CommandProcess {}
|
||||
}
|
||||
|
||||
|
|
@ -921,11 +954,13 @@ Singleton {
|
|||
|
||||
Component {
|
||||
id: apComp
|
||||
|
||||
AccessPoint {}
|
||||
}
|
||||
|
||||
Timer {
|
||||
id: connectionCheckTimer
|
||||
|
||||
interval: 4000
|
||||
onTriggered: {
|
||||
if (root.pendingConnection) {
|
||||
|
|
@ -938,8 +973,8 @@ Singleton {
|
|||
if (proc && proc.stderr && proc.stderr.text) {
|
||||
const error = proc.stderr.text.trim();
|
||||
if (error && error.length > 0) {
|
||||
if (isConnectionCommand(proc.command)) {
|
||||
const needsPassword = detectPasswordRequired(error);
|
||||
if (root.isConnectionCommand(proc.command)) {
|
||||
const needsPassword = root.detectPasswordRequired(error);
|
||||
|
||||
if (needsPassword && !proc.callbackCalled && root.pendingConnection) {
|
||||
const pending = root.pendingConnection;
|
||||
|
|
@ -994,10 +1029,12 @@ Singleton {
|
|||
|
||||
Timer {
|
||||
id: immediateCheckTimer
|
||||
|
||||
property int checkCount: 0
|
||||
|
||||
interval: 500
|
||||
repeat: true
|
||||
triggeredOnStart: false
|
||||
property int checkCount: 0
|
||||
|
||||
onTriggered: {
|
||||
if (root.pendingConnection) {
|
||||
|
|
@ -1009,7 +1046,12 @@ Singleton {
|
|||
immediateCheckTimer.stop();
|
||||
immediateCheckTimer.checkCount = 0;
|
||||
if (root.pendingConnection.callback) {
|
||||
root.pendingConnection.callback({ success: true, output: "Connected", error: "", exitCode: 0 });
|
||||
root.pendingConnection.callback({
|
||||
success: true,
|
||||
output: "Connected",
|
||||
error: "",
|
||||
exitCode: 0
|
||||
});
|
||||
}
|
||||
root.pendingConnection = null;
|
||||
} else {
|
||||
|
|
@ -1018,8 +1060,8 @@ Singleton {
|
|||
if (proc && proc.stderr && proc.stderr.text) {
|
||||
const error = proc.stderr.text.trim();
|
||||
if (error && error.length > 0) {
|
||||
if (isConnectionCommand(proc.command)) {
|
||||
const needsPassword = detectPasswordRequired(error);
|
||||
if (root.isConnectionCommand(proc.command)) {
|
||||
const needsPassword = root.detectPasswordRequired(error);
|
||||
|
||||
if (needsPassword && !proc.callbackCalled && root.pendingConnection && root.pendingConnection.callback) {
|
||||
connectionCheckTimer.stop();
|
||||
|
|
@ -1069,7 +1111,12 @@ Singleton {
|
|||
immediateCheckTimer.stop();
|
||||
immediateCheckTimer.checkCount = 0;
|
||||
if (root.pendingConnection.callback) {
|
||||
root.pendingConnection.callback({ success: true, output: "Connected", error: "", exitCode: 0 });
|
||||
root.pendingConnection.callback({
|
||||
success: true,
|
||||
output: "Connected",
|
||||
error: "",
|
||||
exitCode: 0
|
||||
});
|
||||
}
|
||||
root.pendingConnection = null;
|
||||
} else {
|
||||
|
|
@ -1104,21 +1151,24 @@ Singleton {
|
|||
if (activeInterface && activeInterface.device) {
|
||||
interfaceName = activeInterface.device;
|
||||
} else {
|
||||
if (callback) callback(null);
|
||||
if (callback)
|
||||
callback(null);
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
executeCommand(["device", "show", interfaceName], (result) => {
|
||||
executeCommand(["device", "show", interfaceName], result => {
|
||||
if (!result.success || !result.output) {
|
||||
root.wirelessDeviceDetails = null;
|
||||
if (callback) callback(null);
|
||||
if (callback)
|
||||
callback(null);
|
||||
return;
|
||||
}
|
||||
|
||||
const details = parseDeviceDetails(result.output, false);
|
||||
root.wirelessDeviceDetails = details;
|
||||
if (callback) callback(details);
|
||||
if (callback)
|
||||
callback(details);
|
||||
});
|
||||
}
|
||||
|
||||
|
|
@ -1130,21 +1180,24 @@ Singleton {
|
|||
if (activeInterface && activeInterface.device) {
|
||||
interfaceName = activeInterface.device;
|
||||
} else {
|
||||
if (callback) callback(null);
|
||||
if (callback)
|
||||
callback(null);
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
executeCommand(["device", "show", interfaceName], (result) => {
|
||||
executeCommand(["device", "show", interfaceName], result => {
|
||||
if (!result.success || !result.output) {
|
||||
root.ethernetDeviceDetails = null;
|
||||
if (callback) callback(null);
|
||||
if (callback)
|
||||
callback(null);
|
||||
return;
|
||||
}
|
||||
|
||||
const details = parseDeviceDetails(result.output, true);
|
||||
root.ethernetDeviceDetails = details;
|
||||
if (callback) callback(details);
|
||||
if (callback)
|
||||
callback(details);
|
||||
});
|
||||
}
|
||||
|
||||
|
|
@ -1202,38 +1255,28 @@ Singleton {
|
|||
|
||||
Process {
|
||||
id: rescanProc
|
||||
|
||||
command: ["nmcli", "dev", root.nmcliCommandWifi, "list", "--rescan", "yes"]
|
||||
onExited: {
|
||||
getNetworks(() => {});
|
||||
}
|
||||
onExited: root.getNetworks()
|
||||
}
|
||||
|
||||
Process {
|
||||
id: monitorProc
|
||||
|
||||
running: true
|
||||
command: ["nmcli", "monitor"]
|
||||
environment: ({
|
||||
LANG: "C.UTF-8",
|
||||
LC_ALL: "C.UTF-8"
|
||||
})
|
||||
|
||||
stdout: SplitParser {
|
||||
onRead: {
|
||||
log("Connection state change detected, refreshing...");
|
||||
root.refreshOnConnectionChange();
|
||||
}
|
||||
}
|
||||
|
||||
onExited: {
|
||||
log("Monitor process exited, restarting...");
|
||||
Qt.callLater(() => {
|
||||
monitorProc.running = true;
|
||||
}, 2000);
|
||||
onRead: root.refreshOnConnectionChange()
|
||||
}
|
||||
onExited: Qt.callLater(() => monitorProc.running = true, 2000)
|
||||
}
|
||||
|
||||
function refreshOnConnectionChange(): void {
|
||||
getNetworks((networks) => {
|
||||
getNetworks(networks => {
|
||||
const newActive = root.active;
|
||||
|
||||
if (newActive && newActive.active) {
|
||||
|
|
@ -1299,4 +1342,3 @@ Singleton {
|
|||
}, 2000);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue