homebridge-lib 5.3.1 → 5.3.2-0

package/lib/SystemInfo.js

@@ -293,29 +293,26 @@ class SystemInfo extends events.EventEmitter {
         }
       }
     }
-    text = await this.exec(
-      'plutil', '-convert', 'json', '-o', '-',
-      process.env.HOME + '/Library/Preferences/com.apple.SystemProfiler.plist'
-    )
-    const s = JSON.parse(text)['CPU Names']
-    if (s != null) {
-      // This is empty on my MacBook Pro (14-inch, 2021).
-      for (const key of Object.keys(s)) {
-        if (key.startsWith(id.slice(-4))) {
-          prettyName = s[key]
+    try {
+      if (process.arch === 'x64') { // Intel
+        text = await this.exec(
+          'plutil', '-p',
+          process.env.HOME + '/Library/Preferences/com.apple.SystemProfiler.plist'
+        )
+        const regexp = RegExp('"' + id.slice(-4) + '.*" => "(.*)"')
+        const a = regexp.exec(text)
+        if (a[1] != null) {
+          prettyName = a[1]
+        }
+      } else { // Apple silicon
+        text = await this.execShell('ioreg -l | grep product-description')
+        const a = /"product-description" = <"([^"]*)">/.exec(text)
+        if (a != null) {
+          prettyName = a[1]
         }
       }
-    } else {
-      // text = await this.exec(
-      //   'ioreg', '-c', 'IOPlatformDevice', '-d', '4', '-n', 'product'
-      // )
-      text = await this.execShell('ioreg -l | grep product-description')
-      // This is empty on my Intel Macs - I think the key is registered for
-      // running iPad apps on Apple chips.
-      const a = /"product-description" = <"([^"]*)">/.exec(text)
-      if (a != null) {
-        prettyName = a[1]
-      }
+    } catch (error) {
+      this.emit('error', error)
     }
     return {
       id: id,

package/package.json

@@ -3,7 +3,7 @@
   "description": "Library for homebridge plugins",
   "author": "Erik Baauw",
   "license": "Apache-2.0",
-  "version": "5.3.1",
+  "version": "5.3.2-0",
   "keywords": [
     "homekit",
     "homebridge"