uuid() fix unique mac address issue (Android)

sebhildebrandt · Feb 28, 2023 · b5f5c4e · b5f5c4e
1 parent 35f3b3d
commit b5f5c4e
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 17 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -82,7 +82,8 @@ For major (breaking) changes - **version 4, 3 and 2** - see end of page.
 
 | Version | Date       | Comment                                                                                             |
 | ------- | ---------- | --------------------------------------------------------------------------------------------------- |
-| 5.17.11 | 2023-02-27 | `blockDevices()` raid added label, uuid  (linux)                                                    |
+| 5.17.12 | 2023-02-28 | `uuid()` fix unique mac address issue (Android)                                                     |
+| 5.17.11 | 2023-02-27 | `blockDevices()` raid added label, uuid (linux)                                                     |
 | 5.17.10 | 2023-02-23 | `blockDevices()` fixed parsing raids (linux)                                                        |
 | 5.17.9  | 2023-02-11 | `system()` fixed model Apple Silicon                                                                |
 | 5.17.8  | 2023-01-30 | `system()` improved virtual host detection for Parallels                                            |

diff --git a/docs/history.html b/docs/history.html
@@ -57,6 +57,11 @@ <h3>Full version history</h3>
                     </tr>
                   </thead>
                   <tbody>
+                    <tr>
+                      <th scope="row">5.17.12</th>
+                      <td>2023-02-28</td>
+                      <td><span class="code">uuid()</span> fix unique mac address issue (Android)</td>
+                    </tr>
                     <tr>
                       <th scope="row">5.17.11</th>
                       <td>2023-02-27</td>

diff --git a/docs/index.html b/docs/index.html
@@ -170,7 +170,7 @@
       <img class="logo" src="assets/logo.png" alt="logo">
       <div class="title">systeminformation</div>
       <div class="subtitle"><span id="typed"></span>&nbsp;</div>
-      <div class="version">New Version: <span id="version">5.17.10</span></div>
+      <div class="version">New Version: <span id="version">5.17.12</span></div>
       <button class="btn btn-light" onclick="location.href='https://github.com/sebhildebrandt/systeminformation'">View on Github <i class=" fab fa-github"></i></button>
     </div>
     <div class="down">

diff --git a/lib/osinfo.js b/lib/osinfo.js
@@ -1047,25 +1047,29 @@ function shell(callback) {
 exports.shell = shell;
 
 function getUniqueMacAdresses() {
-  const ifaces = os.networkInterfaces();
   let macs = [];
-  for (let dev in ifaces) {
-    if ({}.hasOwnProperty.call(ifaces, dev)) {
-      ifaces[dev].forEach(function (details) {
-        if (details && details.mac && details.mac !== '00:00:00:00:00:00') {
-          const mac = details.mac.toLowerCase();
-          if (macs.indexOf(mac) === -1) {
-            macs.push(mac);
+  try {
+    const ifaces = os.networkInterfaces();
+    for (let dev in ifaces) {
+      if ({}.hasOwnProperty.call(ifaces, dev)) {
+        ifaces[dev].forEach(function (details) {
+          if (details && details.mac && details.mac !== '00:00:00:00:00:00') {
+            const mac = details.mac.toLowerCase();
+            if (macs.indexOf(mac) === -1) {
+              macs.push(mac);
+            }
           }
-        }
-      });
+        });
+      }
     }
+    macs = macs.sort(function (a, b) {
+      if (a < b) { return -1; }
+      if (a > b) { return 1; }
+      return 0;
+    });
+  } catch (e) {
+    macs.push('00:00:00:00:00:00');
   }
-  macs = macs.sort(function (a, b) {
-    if (a < b) { return -1; }
-    if (a > b) { return 1; }
-    return 0;
-  });
   return macs;
 }