fixed issue battery(), modified package.json - files

CHANGELOG.md

@@ -100,6 +100,7 @@ Other changes
 
 | Version        | Date           | Comment  |
 | -------------- | -------------- | -------- |
+| 3.45.10        | 2018-11-03     | fixed issue `battery()`, modified `package.json` - files |
 | 3.45.9         | 2018-10-22     | fixed node 4 incompatibility |
 | 3.45.8         | 2018-10-22     | `system()` fix Raspberry Pi detection |
 | 3.45.7         | 2018-10-05     | fixed typos |

lib/battery.js

@@ -82,6 +82,9 @@ module.exports = function (callback) {
                   result.percent = 100.0 * result.currentcapacity / result.maxcapacity;
                 }
               }
+              if (result.ischarging) {
+                result.hasbattery = true;
+              }
               if (energy && power) {
                 result.timeremaining = Math.floor(energy / power * 60);
               }

lib/dockerSocket.js

@@ -23,6 +23,7 @@ class DockerSocket {
 
       let socket = net.createConnection({ path: socketPath });
       let alldata = '';
+      let data;
 
       socket.on('connect', () => {
         socket.write('GET http:/containers/json' + (all ? '?all=1' : '') + ' HTTP/1.0\r\n\r\n');
@@ -39,9 +40,14 @@ class DockerSocket {
 
       socket.on('end', () => {
         let startbody = alldata.indexOf('\r\n\r\n');
-        alldata = alldata.substring(startbody, 100000).replace(/[\n\r]/g, '');
+        alldata = alldata.substring(startbody, 10000000).replace(/[\n\r]/g, '');
         socket = false;
-        callback(JSON.parse(alldata));
+        try {
+          data = JSON.parse(alldata);
+          callback(data);
+        } catch (err) {
+          callback({});
+        }
       });
     } catch (err) {
       callback({});
@@ -54,6 +60,7 @@ class DockerSocket {
       try {
         let socket = net.createConnection({ path: socketPath });
         let alldata = '';
+        let data;
 
         socket.on('connect', () => {
           socket.write('GET http:/containers/' + id + '/stats?stream=0 HTTP/1.0\r\n\r\n');
@@ -70,9 +77,14 @@ class DockerSocket {
 
         socket.on('end', () => {
           let startbody = alldata.indexOf('\r\n\r\n');
-          alldata = alldata.substring(startbody, 100000).replace(/[\n\r]/g, '');
+          alldata = alldata.substring(startbody, 10000000).replace(/[\n\r]/g, '');
           socket = false;
-          callback(JSON.parse(alldata));
+          try {
+            data = JSON.parse(alldata);
+            callback(data);
+          } catch (err) {
+            callback({});
+          }
         });
       } catch (err) {
         callback({});
@@ -88,6 +100,7 @@ class DockerSocket {
       try {
         let socket = net.createConnection({ path: socketPath });
         let alldata = '';
+        let data;
 
         socket.on('connect', () => {
           socket.write('GET http:/containers/' + id + '/top?ps_args=-opid,ppid,pgid,vsz,time,etime,nice,ruser,user,rgroup,group,stat,rss,args HTTP/1.0\r\n\r\n');
@@ -104,9 +117,14 @@ class DockerSocket {
 
         socket.on('end', () => {
           let startbody = alldata.indexOf('\r\n\r\n');
-          alldata = alldata.substring(startbody, 100000).replace(/[\n\r]/g, '');
+          alldata = alldata.substring(startbody, 10000000).replace(/[\n\r]/g, '');
           socket = false;
-          callback(JSON.parse(alldata));
+          try {
+            data = JSON.parse(alldata);
+            callback(data);
+          } catch (err) {
+            callback({});
+          }
         });
       } catch (err) {
         callback({});

package.json

@@ -9,6 +9,9 @@
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
   },
+  "files": [
+    "lib/"
+  ],
   "keywords": [
     "system information",
     "sysinfo",