homebridge-lib 5.6.1 → 5.6.4

package/lib/OptionParser.js

@@ -56,7 +56,7 @@ class OptionParser extends events.EventEmitter {
   static get patterns () {
     return Object.freeze({
       _host: /^(?:\[(.+)\]|([^:]+))(?::([0-9]{1,5}))?$/,
-      hostname: /^[a-zA-Z](:?[a-zA-Z0-9-]*[a-zA-Z0-9])*(:?\.[a-zA-Z](:?[a-zA-Z0-9-]*[a-zA-Z0-9])*)*$/,
+      hostname: /^[a-zA-Z0-9](:?[a-zA-Z0-9-]*[a-zA-Z0-9])*(:?\.[a-zA-Z0-9](:?[a-zA-Z0-9-]*[a-zA-Z0-9])*)*$/,
       int: /^\s*([+-]?)([0-9]+(?:\.0*)?)\s*$/,
       intBin: /^\s*([+-]?)(?:0[bB])([01]+)\s*$/,
       intOct: /^\s*([+-]?)(?:0[oO])([0-8]+)\s*$/,

package/lib/Platform.js

@@ -101,10 +101,7 @@ class Platform extends homebridgeLib.Delegate {
         my: Object.freeze(my.Characteristics)
       })
     }
-    context[Platform.name] = {
-      packageJson: packageJson,
-      platformName: platformName
-    }
+    context[Platform.name] = { packageJson, platformName }
     homebridge.registerPlatform(
       packageJson.name, platformName, Platform, true
     )

package/lib/SystemInfo.js

@@ -173,13 +173,22 @@ class SystemInfo extends events.EventEmitter {
   async init () {
     switch (process.platform) {
       case 'linux':
-        try {
-          this.osInfo = await this.getPiOsInfo()
-        } catch (error) { this.emit('error', error) }
-        if (['arm', 'arm64'].includes(process.arch)) {
+        if (await this.existsFile('/etc/synoinfo.conf')) {
+          try {
+            this.osInfo = await this.getDsmInfo()
+          } catch (error) { this.emit('error', error) }
           try {
-            this.hwInfo = await this.getRpiInfo()
+            this.hwInfo = await this.getSynoInfo()
           } catch (error) { this.emit('error', error) }
+        } else {
+          try {
+            this.osInfo = await this.getPiOsInfo()
+          } catch (error) { this.emit('error', error) }
+          if (['arm', 'arm64'].includes(process.arch)) {
+            try {
+              this.hwInfo = await this.getRpiInfo()
+            } catch (error) { this.emit('error', error) }
+          }
         }
         break
       case 'darwin':
@@ -293,10 +302,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')
@@ -365,6 +376,84 @@ class SystemInfo extends events.EventEmitter {
     }
   }
 
+  /** Extract Synology info from `/etc/synoinfo.conf`
+    * @return {object} - The extracted info.
+    */
+  async getSynoInfo () {
+    let device = ''
+    let id
+    let model = ''
+    const text = await this.readTextFile('/etc/synoinfo.conf')
+    const lines = text.replace(/"/g, '').split('\n')
+    for (const line of lines) {
+      const fields = line.split('=')
+      if (fields.length === 2) {
+        switch (fields[0].trim()) {
+          case 'pushservice_dsserial':
+            id = fields[1] // e.g 1970PDN255608
+            break
+          case 'upnpdevicetype':
+            device = fields[1] // e.g. DiskStation
+            break
+          case 'upnpmodelname':
+            model = fields[1] // e.g. DS918+
+            break
+          default:
+            break
+        }
+      }
+    }
+    return {
+      id,
+      manufacturer: 'Synology',
+      model: [device, model].join(' '),
+      prettyName: ['Synologgy', device, model].join(' ')
+    }
+  }
+
+  /** Extract DSM info from `/etc/VERSION`.
+    * @return {object} - The extracted info.
+    */
+  async getDsmInfo () {
+    let build, prettyName, update, version
+    const text = await this.readTextFile('/etc/VERSION')
+    const lines = text.replace(/"/g, '').split('\n')
+    for (const line of lines) {
+      const fields = line.split('=')
+      if (fields.length === 2) {
+        switch (fields[0].trim()) {
+          case 'buildnumber':
+            build = fields[1] // e.g. 42661
+            break
+          case 'productversion':
+            version = fields[1] // e.g. 7.1
+            break
+          case 'smallfixnumber':
+            update = fields[1] // e.g. 3
+            break
+          default:
+            break
+        }
+      }
+    }
+    prettyName = 'DSM'
+    if (version != null) {
+      prettyName += ' ' + version
+      if (build != null) {
+        prettyName += '-' + build
+      }
+      if (update != null) {
+        prettyName += ' Update ' + update
+      }
+    }
+    return {
+      build,
+      prettyName,
+      update,
+      version
+    }
+  }
+
   /** Execute a command on the local machine.
     * @param {string} command - The command.
     * @param {...string} ...args - The command parameters.
@@ -402,6 +491,18 @@ class SystemInfo extends events.EventEmitter {
     })
   }
 
+  /** Check if file exists.
+    * @param {string} fileName - The file name.
+    * @return {bool} - True iff file exists,
+    */
+  async existsFile (fileName) {
+    try {
+      await fs.access(fileName)
+      return true
+    } catch (error) {}
+    return false
+  }
+
   /** Read a text file.
     * @param {string} fileName - The file name.
     * @return {string} - The contents of the file.

package/package.json

@@ -3,7 +3,7 @@
   "description": "Library for homebridge plugins",
   "author": "Erik Baauw",
   "license": "Apache-2.0",
-  "version": "5.6.1",
+  "version": "5.6.4",
   "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",