homebridge-lib 5.6.0 → 5.6.2

package/lib/Platform.js

@@ -62,8 +62,6 @@ class Platform extends homebridgeLib.Delegate {
   static loadPlatform (homebridge, packageJson, platformName, Platform) {
     if (context.homebridge == null) {
       context.homebridge = homebridge
-      context.packageJson = packageJson
-      context.platformName = platformName
       context.homebridgeVersion = homebridge.serverVersion
       context.PlatformAccessory = homebridge.platformAccessory
       const hap = {
@@ -103,6 +101,7 @@ class Platform extends homebridgeLib.Delegate {
         my: Object.freeze(my.Characteristics)
       })
     }
+    context[Platform.name] = { packageJson, platformName }
     homebridge.registerPlatform(
       packageJson.name, platformName, Platform, true
     )
@@ -120,7 +119,7 @@ class Platform extends homebridgeLib.Delegate {
     * @type {object}
     * @readonly
     */
-  get packageJson () { return context.packageJson }
+  get packageJson () { return this._myContext.packageJson }
 
   /** Create a new instance of the platform plugin.
     *
@@ -140,19 +139,21 @@ class Platform extends homebridgeLib.Delegate {
     this._log = log
     this._configJson = configJson
     this._homebridge = homebridge
-    this._platformName = context.platformName
-    this._pluginName = context.packageJson.name
-    this._pluginVersion = context.packageJson.version
+    this._myContext = context[this.className]
+    this._platformName = this._myContext.platformName
+    this._pluginName = this._myContext.packageJson.name
+    this._pluginVersion = this._myContext.packageJson.version
 
     this._accessories = {}
     this._accessoryDelegates = {}
 
-    if (context.platform != null) {
+    if (this._myContext.platform != null) {
       this.fatal(
-        'config.json: duplicate entry for %s platform', context.platformName
+        'config.json: duplicate entry for %s platform',
+        this._myContext.platformName
       )
     }
-    context.platform = this
+    this._myContext.platform = this
     this._identify()
 
     this._homebridge

package/lib/SystemInfo.js

@@ -293,10 +293,12 @@ class SystemInfo extends events.EventEmitter {
           'plutil', '-p',
           process.env.HOME + '/Library/Preferences/com.apple.SystemProfiler.plist'
         )
-        const regexp = RegExp('"' + id.slice(-4) + '.*" => "(.*)"')
+        const regexp = RegExp(
+          '"(' + id.slice(-4) + '|' + id.slice(-3) + ').*" => "(.*)"'
+        )
         const a = regexp.exec(text)
-        if (a[1] != null) {
-          prettyName = a[1]
+        if (a != null) {
+          prettyName = a[2]
         }
       } else { // Apple silicon
         text = await this.execShell('ioreg -l | grep product-description')

package/package.json

@@ -3,7 +3,7 @@
   "description": "Library for homebridge plugins",
   "author": "Erik Baauw",
   "license": "Apache-2.0",
-  "version": "5.6.0",
+  "version": "5.6.2",
   "keywords": [
     "homekit",
     "homebridge"
@@ -21,8 +21,8 @@
     "upnp": "cli/upnp.js"
   },
   "engines": {
-    "homebridge": "^1.4.1",
-    "node": "^16.15.1"
+    "homebridge": "^1.5.0",
+    "node": "^16.16.0"
   },
   "dependencies": {
     "@homebridge/plugin-ui-utils": "~0.0.19",