Merge commit '6847a54c0f25219490324521ec98c326a353e1a8' into fix/eperm-in-repair-button

This commit is contained in:
Fazri Gading
2026-02-01 21:27:59 +08:00

View File

@@ -116,117 +116,402 @@ function detectGpu() {
}
function detectGpuLinux() {
const output = execSync('lspci -nn | grep \'VGA\\|3D\'', { encoding: 'utf8' });
let output = '';
try {
output = execSync('lspci -nn | grep -E "VGA|3D"', { encoding: 'utf8' });
} catch (e) {
return { mode: 'integrated', vendor: 'intel', integratedName: 'Unknown', dedicatedName: null };
}
const lines = output.split('\n').filter(line => line.trim());
let integratedName = null;
let dedicatedName = null;
let hasNvidia = false;
let hasAmd = false;
let gpus = {
integrated: [],
dedicated: []
};
for (const line of lines) {
if (line.includes('VGA') || line.includes('3D')) {
const match = line.match(/\[([^\]]+)\]/g);
let modelName = null;
if (match && match.length >= 2) {
modelName = match[1].slice(1, -1);
// Example: 01:00.0 VGA compatible controller [0300]: NVIDIA Corporation TU116 [GeForce GTX 1660 Ti] [10de:2182] (rev a1)
// Matches all content inside [...]
const brackets = line.match(/\[([^\]]+)\]/g);
let name = line; // fallback
let vendorId = '';
if (brackets && brackets.length >= 2) {
const idBracket = brackets.find(b => b.includes(':')); // [10de:2182]
if (idBracket) {
vendorId = idBracket.replace(/[\[\]]/g, '').split(':')[0].toLowerCase();
// The bracket before the ID bracket is usually the model name.
const idIndex = brackets.indexOf(idBracket);
if (idIndex > 0) {
name = brackets[idIndex - 1].replace(/[\[\]]/g, '');
}
}
} else if (brackets && brackets.length === 1) {
name = brackets[0].replace(/[\[\]]/g, '');
}
if (line.includes('10de:') || line.toLowerCase().includes('nvidia')) {
hasNvidia = true;
dedicatedName = "NVIDIA " + modelName || 'NVIDIA GPU';
console.log('Detected NVIDIA GPU:', dedicatedName);
} else if (line.includes('1002:') || line.toLowerCase().includes('amd') || line.toLowerCase().includes('radeon')) {
hasAmd = true;
dedicatedName = "AMD " + modelName || 'AMD GPU';
console.log('Detected AMD GPU:', dedicatedName);
} else if (line.includes('8086:') || line.toLowerCase().includes('intel')) {
integratedName = "Intel " + modelName || 'Intel GPU';
console.log('Detected Intel GPU:', integratedName);
// Clean name
name = name.trim();
const lowerName = name.toLowerCase();
const lowerLine = line.toLowerCase();
// Vendor detection
const isNvidia = lowerLine.includes('nvidia') || vendorId === '10de';
const isAmd = lowerLine.includes('amd') || lowerLine.includes('radeon') || vendorId === '1002';
const isIntel = lowerLine.includes('intel') || vendorId === '8086';
// Intel Arc detection
const isIntelArc = isIntel && (lowerName.includes('arc') || lowerName.includes('a770') || lowerName.includes('a750') || lowerName.includes('a380'));
let vendor = 'unknown';
if (isNvidia) vendor = 'nvidia';
else if (isAmd) vendor = 'amd';
else if (isIntel) vendor = 'intel';
let vramMb = 0;
// VRAM Detection Logic
if (isNvidia) {
try {
// Try nvidia-smi
const smiOutput = execSync('nvidia-smi --query-gpu=memory.total --format=csv,noheader,nounits', { encoding: 'utf8', stdio: ['ignore', 'pipe', 'ignore'] }).trim();
const vramVal = parseInt(smiOutput.split('\n')[0]); // Take first if multiple
if (!isNaN(vramVal)) {
vramMb = vramVal;
}
} catch (err) {
// failed
}
} else if (isAmd) {
// Try /sys/class/drm/card*/device/mem_info_vram_total
// This is a bit heuristical, we need to match the card.
// But usually checking any card with AMD vendor in /sys is a good guess if we just want "the AMD GPU vram".
try {
const cards = fs.readdirSync('/sys/class/drm').filter(c => c.startsWith('card') && !c.includes('-'));
for (const card of cards) {
try {
const vendorFile = fs.readFileSync(`/sys/class/drm/${card}/device/vendor`, 'utf8').trim();
if (vendorFile === '0x1002') { // AMD vendor ID
const vramBytes = fs.readFileSync(`/sys/class/drm/${card}/device/mem_info_vram_total`, 'utf8').trim();
vramMb = Math.round(parseInt(vramBytes) / (1024 * 1024));
if (vramMb > 0) break;
}
} catch (e2) {}
}
} catch (err) {}
} else if (isIntel) {
// Try lspci -v to get prefetchable memory (stolen/dedicated aperture)
try {
// Extract slot from line, e.g. "00:02.0"
const slot = line.split(' ')[0];
if (slot && /^[0-9a-f:.]+$/.test(slot)) {
const verbose = execSync(`lspci -v -s ${slot}`, { encoding: 'utf8', stdio: ['ignore', 'pipe', 'ignore'] });
const vLines = verbose.split('\n');
for (const vLine of vLines) {
// Match "Memory at ... (..., prefetchable) [size=256M]"
// Must ensure it is prefetchable and NOT non-prefetchable
if (vLine.includes('prefetchable') && !vLine.includes('non-prefetchable')) {
const match = vLine.match(/size=([0-9]+)([KMGT])/);
if (match) {
let size = parseInt(match[1]);
const unit = match[2];
if (unit === 'G') size *= 1024;
else if (unit === 'K') size /= 1024;
// M is default
if (size > 0) {
vramMb = size;
break;
}
}
}
}
}
} catch (e) {
// ignore
}
}
const gpuInfo = {
name: name,
vendor: vendor,
vram: vramMb
};
if (isNvidia || isAmd || isIntelArc) {
gpus.dedicated.push(gpuInfo);
} else if (isIntel) {
gpus.integrated.push(gpuInfo);
} else {
// Unknown vendor or other, fallback to integrated list to be safe
gpus.integrated.push(gpuInfo);
}
}
if (hasNvidia) {
return { mode: 'dedicated', vendor: 'nvidia', integratedName: integratedName || 'Intel GPU', dedicatedName };
} else if (hasAmd) {
return { mode: 'dedicated', vendor: 'amd', integratedName: integratedName || 'Intel GPU', dedicatedName };
} else {
return { mode: 'integrated', vendor: 'intel', integratedName: integratedName || 'Intel GPU', dedicatedName: null };
// Fallback: Attempt to get Integrated VRAM via glxinfo if it's STILL 0 (common for Intel iGPUs if lspci failed)
// glxinfo -B usually reports the active renderer's "Video memory" which includes shared memory for iGPUs.
if (gpus.integrated.length > 0 && gpus.integrated[0].vram === 0) {
try {
const glxOut = execSync('glxinfo -B', { encoding: 'utf8', stdio: ['ignore', 'pipe', 'ignore'] });
const lines = glxOut.split('\n');
let glxVendor = '';
let glxMem = 0;
for (const line of lines) {
const trim = line.trim();
if (trim.startsWith('Device:')) {
const lower = trim.toLowerCase();
if (lower.includes('intel')) glxVendor = 'intel';
else if (lower.includes('nvidia')) glxVendor = 'nvidia';
else if (lower.includes('amd') || lower.includes('ati')) glxVendor = 'amd';
} else if (trim.startsWith('Video memory:')) {
// Example: "Video memory: 15861MB"
const memStr = trim.split(':')[1].replace('MB', '').trim();
glxMem = parseInt(memStr, 10);
}
}
// If glxinfo reports Intel and we have an Intel integrated GPU, update it
// We check vendor match to ensure we don't accidentally assign Nvidia VRAM to Intel if user is running on dGPU
if (glxVendor === 'intel' && gpus.integrated[0].vendor === 'intel' && glxMem > 0) {
gpus.integrated[0].vram = glxMem;
}
} catch (err) {
// glxinfo missing or failed, ignore
}
}
const primaryDedicated = gpus.dedicated[0] || null;
const primaryIntegrated = gpus.integrated[0] || { name: 'Intel GPU', vram: 0 };
return {
mode: primaryDedicated ? 'dedicated' : 'integrated',
vendor: primaryDedicated ? primaryDedicated.vendor : (gpus.integrated[0] ? gpus.integrated[0].vendor : 'intel'),
integratedName: primaryIntegrated.name,
dedicatedName: primaryDedicated ? primaryDedicated.name : null,
dedicatedVram: primaryDedicated ? primaryDedicated.vram : 0,
integratedVram: primaryIntegrated.vram
};
}
function detectGpuWindows() {
const output = execSync('wmic path win32_VideoController get name', { encoding: 'utf8' });
const lines = output.split('\n').map(line => line.trim()).filter(line => line && line !== 'Name');
let output = '';
let commandUsed = 'cim'; // Track which command succeeded
let integratedName = null;
let dedicatedName = null;
let hasNvidia = false;
let hasAmd = false;
for (const line of lines) {
const lowerLine = line.toLowerCase();
if (lowerLine.includes('nvidia')) {
hasNvidia = true;
dedicatedName = line;
console.log('Detected NVIDIA GPU:', dedicatedName);
} else if (lowerLine.includes('amd') || lowerLine.includes('radeon')) {
hasAmd = true;
dedicatedName = line;
console.log('Detected AMD GPU:', dedicatedName);
} else if (lowerLine.includes('intel')) {
integratedName = line;
console.log('Detected Intel GPU:', integratedName);
}
}
if (hasNvidia) {
return { mode: 'dedicated', vendor: 'nvidia', integratedName: integratedName || 'Intel GPU', dedicatedName };
} else if (hasAmd) {
return { mode: 'dedicated', vendor: 'amd', integratedName: integratedName || 'Intel GPU', dedicatedName };
} else {
return { mode: 'integrated', vendor: 'intel', integratedName: integratedName || 'Intel GPU', dedicatedName: null };
}
}
function detectGpuMac() {
const output = execSync('system_profiler SPDisplaysDataType', { encoding: 'utf8' });
const lines = output.split('\n');
let integratedName = null;
let dedicatedName = null;
let hasNvidia = false;
let hasAmd = false;
for (const line of lines) {
if (line.includes('Chipset Model:')) {
const gpuName = line.split('Chipset Model:')[1].trim();
const lowerGpu = gpuName.toLowerCase();
if (lowerGpu.includes('nvidia')) {
hasNvidia = true;
dedicatedName = gpuName;
console.log('Detected NVIDIA GPU:', dedicatedName);
} else if (lowerGpu.includes('amd') || lowerGpu.includes('radeon')) {
hasAmd = true;
dedicatedName = gpuName;
console.log('Detected AMD GPU:', dedicatedName);
} else if (lowerGpu.includes('intel') || lowerGpu.includes('iris') || lowerGpu.includes('uhd')) {
integratedName = gpuName;
console.log('Detected Intel GPU:', integratedName);
} else if (!dedicatedName && !integratedName) {
// Fallback for Apple Silicon or other
integratedName = gpuName;
try {
// Fetch Name and AdapterRAM (VRAM in bytes)
output = execSync(
'powershell -NoProfile -ExecutionPolicy Bypass -Command "Get-CimInstance Win32_VideoController | Select-Object Name, AdapterRAM | ConvertTo-Csv -NoTypeInformation"',
{ encoding: 'utf8', stdio: ['ignore', 'pipe', 'ignore'] }
);
} catch (e) {
try {
// Fallback to Get-WmiObject (Older PowerShell)
commandUsed = 'wmi';
output = execSync(
'powershell -NoProfile -ExecutionPolicy Bypass -Command "Get-WmiObject Win32_VideoController | Select-Object Name, AdapterRAM | ConvertTo-Csv -NoTypeInformation"',
{ encoding: 'utf8', stdio: ['ignore', 'pipe', 'ignore'] }
);
} catch (e2) {
// Fallback to wmic (Deprecated, often missing on newer Windows)
// Note: This fallback likely won't provide VRAM in the same reliable CSV format easily,
// so we stick to just getting the Name to at least allow the app to launch.
try {
commandUsed = 'wmic';
output = execSync('wmic path win32_VideoController get name', { encoding: 'utf8' });
} catch (err) {
return { mode: 'unknown', vendor: 'none', integratedName: null, dedicatedName: null };
}
}
}
if (hasNvidia) {
return { mode: 'dedicated', vendor: 'nvidia', integratedName: integratedName || 'Integrated GPU', dedicatedName };
} else if (hasAmd) {
return { mode: 'dedicated', vendor: 'amd', integratedName: integratedName || 'Integrated GPU', dedicatedName };
// Parse lines.
// PowerShell CSV output (Get-CimInstance/Get-WmiObject) usually looks like:
// "Name","AdapterRAM"
// "NVIDIA GeForce RTX 3060","12884901888"
//
// WMIC output is just plain text lines with the name (if we used the wmic command above).
const lines = output.split(/\r?\n/).filter(l => l.trim().length > 0);
let gpus = {
integrated: [],
dedicated: []
};
for (const line of lines) {
// Skip header lines
if (line.toLowerCase().includes('name') && (line.includes('AdapterRAM') || commandUsed === 'wmic')) {
continue;
}
let name = '';
let vramBytes = 0;
if (commandUsed === 'wmic') {
name = line.trim();
} else {
// Parse CSV: "Name","AdapterRAM"
// Simple regex to handle potential quotes.
// This assumes simple CSV structure from ConvertTo-Csv.
const parts = line.split(',');
// Remove surrounding quotes if present
const rawName = parts[0] ? parts[0].replace(/^"|"$/g, '') : '';
const rawRam = parts[1] ? parts[1].replace(/^"|"$/g, '') : '0';
name = rawName.trim();
vramBytes = parseInt(rawRam, 10) || 0;
}
if (!name) continue;
const lowerName = name.toLowerCase();
const vramMb = Math.round(vramBytes / (1024 * 1024));
// Logic for dGPU detection; added isIntelArc check
const isNvidia = lowerName.includes('nvidia');
const isAmd = lowerName.includes('amd') || lowerName.includes('radeon');
const isIntelArc = lowerName.includes('arc') && lowerName.includes('intel');
const gpuInfo = {
name: name,
vendor: isNvidia ? 'nvidia' : (isAmd ? 'amd' : (isIntelArc ? 'intel' : 'unknown')),
vram: vramMb
};
if (isNvidia || isAmd || isIntelArc) {
gpus.dedicated.push(gpuInfo);
} else if (lowerName.includes('intel') || lowerName.includes('iris') || lowerName.includes('uhd')) {
gpus.integrated.push(gpuInfo);
} else {
// Fallback: If unknown vendor but high VRAM (> 512MB), treat as dedicated?
// Or just assume integrated if generic "Microsoft Basic Display Adapter" etc.
// For now, if we can't identify it as dedicated vendor, put in integrated/other.
gpus.integrated.push(gpuInfo);
}
}
const primaryDedicated = gpus.dedicated[0] || null;
const primaryIntegrated = gpus.integrated[0] || { name: 'Intel GPU', vram: 0 };
return {
mode: primaryDedicated ? 'dedicated' : 'integrated',
vendor: primaryDedicated ? primaryDedicated.vendor : 'intel', // Default to intel if only integrated found
integratedName: primaryIntegrated.name,
dedicatedName: primaryDedicated ? primaryDedicated.name : null,
// Add VRAM info if available (mostly for debug or UI)
dedicatedVram: primaryDedicated ? primaryDedicated.vram : 0,
integratedVram: primaryIntegrated.vram
};
}
function detectGpuMac() {
let output = '';
try {
output = execSync('system_profiler SPDisplaysDataType', { encoding: 'utf8' });
} catch (e) {
return { mode: 'integrated', vendor: 'intel', integratedName: 'Unknown', dedicatedName: null };
}
const lines = output.split('\n');
let gpus = {
integrated: [],
dedicated: []
};
let currentGpu = null;
for (const line of lines) {
const trimmed = line.trim();
// New block starts with "Chipset Model:"
if (trimmed.startsWith('Chipset Model:')) {
if (currentGpu) {
// Push previous
categorizeMacGpu(currentGpu, gpus);
}
currentGpu = {
name: trimmed.split(':')[1].trim(),
vendor: 'unknown',
vram: 0
};
} else if (currentGpu) {
if (trimmed.startsWith('VRAM (Total):') || trimmed.startsWith('VRAM (Dynamic, Max):')) {
// Parse VRAM: "1.5 GB" or "1536 MB"
const valParts = trimmed.split(':')[1].trim().split(' ');
let val = parseFloat(valParts[0]);
if (valParts[1] && valParts[1].toUpperCase() === 'GB') {
val = val * 1024;
}
currentGpu.vram = Math.round(val);
} else if (trimmed.startsWith('Vendor:') || trimmed.startsWith('Vendor Name:')) {
// "Vendor: NVIDIA (0x10de)"
const v = trimmed.split(':')[1].toLowerCase();
if (v.includes('nvidia')) currentGpu.vendor = 'nvidia';
else if (v.includes('amd') || v.includes('ati')) currentGpu.vendor = 'amd';
else if (v.includes('intel')) currentGpu.vendor = 'intel';
else if (v.includes('apple')) currentGpu.vendor = 'apple';
}
}
}
// Push last one
if (currentGpu) {
categorizeMacGpu(currentGpu, gpus);
}
// If we have an Apple Silicon GPU (vendor=apple) but VRAM is 0, fetch system memory as it is unified.
gpus.dedicated.forEach(gpu => {
if (gpu.vendor === 'apple' && gpu.vram === 0) {
try {
const memSize = execSync('sysctl -n hw.memsize', { encoding: 'utf8' }).trim();
// memSize is in bytes
const memMb = Math.round(parseInt(memSize, 10) / (1024 * 1024));
if (memMb > 0) gpu.vram = memMb;
} catch (err) {
// ignore
}
}
});
const primaryDedicated = gpus.dedicated[0] || null;
const primaryIntegrated = gpus.integrated[0] || { name: 'Integrated GPU', vram: 0 };
return {
mode: primaryDedicated ? 'dedicated' : 'integrated',
vendor: primaryDedicated ? primaryDedicated.vendor : (gpus.integrated[0] ? gpus.integrated[0].vendor : 'intel'),
integratedName: primaryIntegrated.name,
dedicatedName: primaryDedicated ? primaryDedicated.name : null,
dedicatedVram: primaryDedicated ? primaryDedicated.vram : 0,
integratedVram: primaryIntegrated.vram
};
}
function categorizeMacGpu(gpu, gpus) {
const lowerName = gpu.name.toLowerCase();
// Refine vendor if still unknown
if (gpu.vendor === 'unknown') {
if (lowerName.includes('nvidia')) gpu.vendor = 'nvidia';
else if (lowerName.includes('amd') || lowerName.includes('radeon')) gpu.vendor = 'amd';
else if (lowerName.includes('intel')) gpu.vendor = 'intel';
else if (lowerName.includes('apple') || lowerName.includes('m1') || lowerName.includes('m2') || lowerName.includes('m3')) gpu.vendor = 'apple';
}
const isNvidia = gpu.vendor === 'nvidia';
const isAmd = gpu.vendor === 'amd';
const isApple = gpu.vendor === 'apple';
// Per user request, "project is not meant for Intel Mac (x86)",
// so we treat Apple Silicon as the primary "dedicated-like" GPU for this app's context.
if (isNvidia || isAmd || isApple) {
gpus.dedicated.push(gpu);
} else {
return { mode: 'integrated', vendor: 'intel', integratedName: integratedName || 'Integrated GPU', dedicatedName: null };
// Intel or unknown
gpus.integrated.push(gpu);
}
}
@@ -267,11 +552,78 @@ function setupGpuEnvironment(gpuPreference) {
return envVars;
}
function getSystemType() {
const platform = getOS();
try {
if (platform === 'linux') return getSystemTypeLinux();
if (platform === 'windows') return getSystemTypeWindows();
if (platform === 'darwin') return getSystemTypeMac();
return 'desktop'; // Default to desktop if unknown
} catch (err) {
console.warn('Failed to detect system type, defaulting to desktop:', err.message);
return 'desktop';
}
}
function getSystemTypeLinux() {
try {
// Try reliable DMI check first
if (fs.existsSync('/sys/class/dmi/id/chassis_type')) {
const type = parseInt(fs.readFileSync('/sys/class/dmi/id/chassis_type', 'utf8').trim());
// 8=Portable, 9=Laptop, 10=Notebook, 11=Hand Held, 12=Docking Station, 14=Sub Notebook
if ([8, 9, 10, 11, 12, 14, 31, 32].includes(type)) {
return 'laptop';
}
}
// Fallback to chassis_id for some systems? Usually chassis_type is enough.
return 'desktop';
} catch (e) {
return 'desktop';
}
}
function getSystemTypeWindows() {
try {
const output = execSync(
'powershell -NoProfile -ExecutionPolicy Bypass -Command "Get-CimInstance Win32_SystemEnclosure | Select-Object -ExpandProperty ChassisTypes"',
{ encoding: 'utf8', stdio: ['ignore', 'pipe', 'ignore'] }).trim();
// Output might be a single number or array.
// Clean it up
const types = output.split(/\s+/).map(t => parseInt(t)).filter(n => !isNaN(n));
// Laptop codes: 8, 9, 10, 11, 12, 14, 31, 32
const laptopCodes = [8, 9, 10, 11, 12, 14, 31, 32];
for (const t of types) {
if (laptopCodes.includes(t)) return 'laptop';
}
return 'desktop';
} catch (e) {
// Fallback wmic
try {
const output = execSync('wmic path win32_systemenclosure get chassistypes', { encoding: 'utf8' }).trim();
if (output.includes('8') || output.includes('9') || output.includes('10') || output.includes('14')) return 'laptop';
} catch (err) {}
return 'desktop';
}
}
function getSystemTypeMac() {
try {
const model = execSync('sysctl -n hw.model', { encoding: 'utf8' }).trim().toLowerCase();
if (model.includes('book')) return 'laptop';
return 'desktop';
} catch (e) {
return 'desktop';
}
}
module.exports = {
getOS,
getArch,
isWaylandSession,
setupWaylandEnvironment,
detectGpu,
setupGpuEnvironment
setupGpuEnvironment,
getSystemType
};