node-os-utils 1.3.2 → 1.3.6

package/.travis.yml

@@ -2,5 +2,6 @@ language: node_js
 node_js:
   - "8.15.1"
   - "12.18.0"
+  - "14.16.0"
 script:
   - "npm run test"

package/lib/drive.js

@@ -66,16 +66,16 @@ bucket.drive = {
         diskInfo = main
       }
 
-      var total = Math.ceil(((diskInfo['1K-blocks'] || diskInfo['1024-blocks']) * 1024) / Math.pow(1024, 2))
       var used = Math.ceil(diskInfo.Used * 1024 / Math.pow(1024, 2))
       var free = Math.ceil((diskInfo.Available || diskInfo.Avail) * 1024 / Math.pow(1024, 2))
+      var total = used + free;
 
       var totalGb = (total / 1024).toFixed(1)
       var usedGb = (used / 1024).toFixed(1)
       var freeGb = (free / 1024).toFixed(1)
 
-      var usedPercentage = (100 * usedGb / totalGb).toFixed(1)
-      var freePercentage = (100 * freeGb / totalGb).toFixed(1)
+      var usedPercentage = (100 * used / total).toFixed(1)
+      var freePercentage = (100 * free / total).toFixed(1)
 
       return Promise.resolve({
         totalGb: totalGb,

package/lib/mem.js

@@ -139,12 +139,14 @@ bucket.mem = {
     var totalMemMb = parseFloat((totalMem / 1024 / 1024).toFixed(2))
     var usedMemMb = parseFloat(((totalMem - freeMem) / 1024 / 1024).toFixed(2))
     var freeMemMb = parseFloat((totalMemMb - usedMemMb).toFixed(2))
+    var usedMemPercentage = parseFloat((100 * ((totalMem - freeMem) / totalMem)).toFixed(2))
     var freeMemPercentage = parseFloat((100 * (freeMem / totalMem)).toFixed(2))
 
     return {
       totalMemMb: totalMemMb,
       usedMemMb: usedMemMb,
       freeMemMb: freeMemMb,
+      usedMemPercentage: usedMemPercentage,
       freeMemPercentage: freeMemPercentage,
     }
   }),

package/lib/netstat.js

@@ -106,7 +106,7 @@ bucket.netstat = {
     if(bucket.isNotSupported(out)) return ifconfigStats()
 
     var names = new RegExp(/[0-9]+: ([\S]+): /g)
-    var RX = new RegExp(/ {4}RX: bytes {2}packets {2}errors {2}dropped overrun mcast\s*\n\s*([0-9]+) /gm)
+    var RX = new RegExp(/ {4}RX: bytes {2}packets {2}errors {2}dropped (overrun|missed) {1,2}mcast\s*\n\s*([0-9]+) /gm)
     var TX = new RegExp(/ {4}TX: bytes {2}packets {2}errors {2}dropped carrier collsns\s*\n\s*([0-9]+) /g)
 
     var stats = []
@@ -121,7 +121,7 @@ bucket.netstat = {
 
     i = 0
     while ((res = RX.exec(out)) !== null) {
-      stats[i++].inputBytes = res[1]
+      stats[i++].inputBytes = res[2]
     }
 
     i = 0

package/lib/os.js

@@ -97,37 +97,41 @@ bucket.os = {
     var interfaces = os.networkInterfaces()
     var ip = ''
     var i = 0
-
-    if (platform === 'linux') {
-      for (i = 0; i < interfaces.eth0.length; i++) {
-        if (os.networkInterfaces().eth0[i].family === 'IPv4') {
-          ip = os.networkInterfaces().eth0[i].address
-          break
+    try {
+
+      if (platform === 'linux' && interfaces.eth0) {
+        for (i = 0; i < interfaces.eth0.length; i++) {
+          if (os.networkInterfaces().eth0[i].family === 'IPv4') {
+            ip = os.networkInterfaces().eth0[i].address
+            break
+          }
         }
-      }
 
-      return ip
-    }
+        return ip
+      }
 
-    if (platform === 'darwin') {
-      for (i = 0; i < interfaces.en0.length; i++) {
-        if (os.networkInterfaces().en0[i].family === 'IPv4') {
-          ip = os.networkInterfaces().en0[i].address
-          break
+      if (platform === 'darwin') {
+        for (i = 0; i < interfaces.en0.length; i++) {
+          if (os.networkInterfaces().en0[i].family === 'IPv4') {
+            ip = os.networkInterfaces().en0[i].address
+            break
+          }
         }
-      }
 
-      return ip
-    }
+        return ip
+      }
 
-    for (i in interfaces) {
-      var item = interfaces[i]
-      for (var j in item) {
-        if (item[j]['internal'] === false && item[j]['family'] === 'IPv4') {
-          ip = item[j]['address']
-          break
+      for (i in interfaces) {
+        var item = interfaces[i]
+        for (var j in item) {
+          if (item[j]['internal'] === false && item[j]['family'] === 'IPv4') {
+            ip = item[j]['address']
+            break
+          }
         }
       }
+    } catch (error){
+      ip = 'LOCALHOST'
     }
 
     return ip

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-os-utils",
-  "version": "1.3.2",
+  "version": "1.3.6",
   "description": "An operating system utility library.",
   "main": "index.js",
   "scripts": {