From 7e87b7ec28adbfa630541dfcdd950f91c4c86d6b Mon Sep 17 00:00:00 2001 From: Sebastian Hildebrandt Date: Fri, 11 Mar 2022 21:41:41 +0100 Subject: [PATCH] cpu() improved socket detection by name (windows) --- docs/index.html | 4 ++-- lib/cpu.js | 23 +++++++++++++++++++++++ 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/docs/index.html b/docs/index.html index fa46eaa..8752a29 100644 --- a/docs/index.html +++ b/docs/index.html @@ -206,7 +206,7 @@
-
15,199
+
15,202
Lines of code
@@ -214,7 +214,7 @@
Downloads last month
-
523
+
532
Dependents
diff --git a/lib/cpu.js b/lib/cpu.js index 423f0e4..e50e7a3 100644 --- a/lib/cpu.js +++ b/lib/cpu.js @@ -515,6 +515,25 @@ const socketTypes = { 63: 'LGA4677', }; +const socketTypesByName = { + 'LGA1150': 'i7-5775C i3-4340 i3-4170 G3250 i3-4160T i3-4160 E3-1231 G3258 G3240 i7-4790S i7-4790K i7-4790 i5-4690K i5-4690 i5-4590T i5-4590S i5-4590 i5-4460 i3-4360 i3-4150 G1820 G3420 G3220 i7-4771 i5-4440 i3-4330 i3-4130T i3-4130 E3-1230 i7-4770S i7-4770K i7-4770 i5-4670K i5-4670 i5-4570T i5-4570S i5-4570 i5-4430', + 'LGA1151': 'i9-9900KS E-2288G E-2224 G5420 i9-9900T i9-9900 i7-9700T i7-9700F i7-9700E i7-9700 i5-9600 i5-9500T i5-9500F i5-9500 i5-9400T i3-9350K i3-9300 i3-9100T i3-9100F i3-9100 G4930 i9-9900KF i7-9700KF i5-9600KF i5-9400F i5-9400 i3-9350KF i9-9900K i7-9700K i5-9600K G5500 G5400 i7-8700T i7-8086K i5-8600 i5-8500T i5-8500 i5-8400T i3-8300 i3-8100T G4900 i7-8700K i7-8700 i5-8600K i5-8400 i3-8350K i3-8100 E3-1270 G4600 G4560 i7-7700T i7-7700K i7-7700 i5-7600K i5-7600 i5-7500T i5-7500 i5-7400 i3-7350K i3-7300 i3-7100T i3-7100 G3930 G3900 G4400 i7-6700T i7-6700K i7-6700 i5-6600K i5-6600 i5-6500T i5-6500 i5-6400T i5-6400 i3-6300 i3-6100T i3-6100 E3-1270 E3-1270 T4500 T4400', + '1155': 'G440 G460 G465 G470 G530T G540T G550T G1610T G1620T G530 G540 G1610 G550 G1620 G555 G1630 i3-2100T i3-2120T i3-3220T i3-3240T i3-3250T i3-2100 i3-2105 i3-2102 i3-3210 i3-3220 i3-2125 i3-2120 i3-3225 i3-2130 i3-3245 i3-3240 i3-3250 i5-3570T i5-2500T i5-2400S i5-2405S i5-2390T i5-3330S i5-2500S i5-3335S i5-2300 i5-3450S i5-3340S i5-3470S i5-3475S i5-3470T i5-2310 i5-3550S i5-2320 i5-3330 i5-3350P i5-3450 i5-2400 i5-3340 i5-3570S i5-2380P i5-2450P i5-3470 i5-2500K i5-3550 i5-2500 i5-3570 i5-3570K i5-2550K i7-3770T i7-2600S i7-3770S i7-2600K i7-2600 i7-3770 i7-3770K i7-2700K G620T G630T G640T G2020T G645T G2100T G2030T G622 G860T G620 G632 G2120T G630 G640 G2010 G840 G2020 G850 G645 G2030 G860 G2120 G870 G2130 G2140 E3-1220L E3-1220L E3-1260L E3-1265L E3-1220 E3-1225 E3-1220 E3-1235 E3-1225 E3-1230 E3-1230 E3-1240 E3-1245 E3-1270 E3-1275 E3-1240 E3-1245 E3-1270 E3-1280 E3-1275 E3-1290 E3-1280 E3-1290' +}; + +function getSocketTypesByName(str) { + let result = ''; + for (const key in socketTypesByName) { + const names = socketTypesByName[key].split(' '); + for (let i = 0; i < names.length; i++) { + if (str.indexOf(names[i]) >= 0) { + result = key; + } + } + } + return result; +} + function cpuManufacturer(str) { let result = str; str = str.toLowerCase(); @@ -850,6 +869,10 @@ function getCpu() { if (socketTypes[socketId]) { result.socket = socketTypes[socketId]; } + const socketByName = getSocketTypesByName(name); + if (socketByName) { + result.socket = socketByName; + } // # threads / # cores const countProcessors = util.countLines(lines, 'Caption'); const countThreads = util.getValue(lines, 'NumberOfLogicalProcessors', ':');