systeminformation 5.27.5 → 5.27.7

package/README.md

@@ -30,8 +30,8 @@
 
 ## The Systeminformation Project
 
-This is amazing. Started as a small project just for myself, it now has > 17,000
-lines of code, > 650 versions published, up to 8 mio downloads per month, > 350
+This is amazing. Started as a small project just for myself, it now has > 18,000
+lines of code, > 700 versions published, up to 9 mio downloads per month, > 380
 mio downloads overall. Top 10 NPM ranking for backend packages. Thank you to all
 who contributed to this project!
 

package/lib/osinfo.js

@@ -34,11 +34,17 @@ const _sunos = (_platform === 'sunos');
 
 function time() {
   let t = new Date().toString().split(' ');
+  let timezoneName = '';
+  try {
+    timezoneName = Intl.DateTimeFormat().resolvedOptions().timeZone;
+  } catch {
+    timezoneName = (t.length >= 7) ? t.slice(6).join(' ').replace(/\(/g, '').replace(/\)/g, '') : '';
+  }
   const result = {
     current: Date.now(),
     uptime: os.uptime(),
     timezone: (t.length >= 7) ? t[5] : '',
-    timezoneName: Intl ? Intl.DateTimeFormat().resolvedOptions().timeZone : (t.length >= 7) ? t.slice(6).join(' ').replace(/\(/g, '').replace(/\)/g, '') : ''
+    timezoneName
   };
   if (_darwin || _linux) {
     try {

package/lib/system.js

@@ -16,6 +16,7 @@
 const fs = require('fs');
 const os = require('os');
 const util = require('./util');
+const { uuid } = require('./osinfo');
 const exec = require('child_process').exec;
 const execSync = require('child_process').execSync;
 const execPromise = util.promisify(require('child_process').exec);
@@ -120,13 +121,18 @@ function system(callback) {
               util.noop();
             }
           }
-          if (!result.uuid && (_freebsd || _openbsd || _netbsd)) {
+          if (_freebsd || _openbsd || _netbsd) {
             try {
-              const lines = execSync('sysctl -i kern.hostuuid kern.hostid', util.execOptsLinux).toString().split('\n');
-              result.uuid = util.getValue(lines, 'kern.hostuuid', ':').toLowerCase();
+              const lines = execSync('sysctl -i kern.hostuuid kern.hostid hw.model', util.execOptsLinux).toString().split('\n');
+              if (!result.uuid) {
+                result.uuid = util.getValue(lines, 'kern.hostuuid', ':').toLowerCase();
+              }
               if (!result.serial || result.serial === '-') {
                 result.serial = util.getValue(lines, 'kern.hostid', ':').toLowerCase();
               }
+              if (!result.model || result.model === 'Computer') {
+                result.model = util.getValue(lines, 'hw.model', ':').trim();
+              }
             } catch (e) {
               util.noop();
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "systeminformation",
-  "version": "5.27.5",
+  "version": "5.27.7",
   "description": "Advanced, lightweight system and OS information library",
   "license": "MIT",
   "author": "Sebastian Hildebrandt <hildebrandt@plus-innovations.com> (https://plus-innovations.com)",