Merge branch 'master' of https://github.com/JsOS-Team/JsOS

Author: PROPHESSOR

js/__loader.js

@@ -249,7 +249,7 @@
           } else {
             /* eslint-disable max-len */
             evalScriptFn(
-              `((require,exports,module,__filename,__dirname) => {${content}})(((m) => {return function require(path){require.cache=m.require.cache;require.register=m.require.register;return m.require(path)}})(global.module),global.module.exports,global.module,global.module.filename,global.module.dirname)`,
+              `((require,exports,module,__filename,__dirname) => {${content}})(((m) => {function require(path){return m.require(path)};require.cache=m.require.cache;require.register=m.require.register;return require})(global.module),global.module.exports,global.module,global.module.filename,global.module.dirname)`,
               displayPath);
             /* eslint-enable max-len */
           }

js/apps/netinfo/index.js

@@ -0,0 +1,77 @@
+// NetInfo application
+// By ivan770
+
+// Gonna add MAC later
+
+'use strict';
+
+function main (cmd, args, api, res) {
+  const io = api.stdio;
+
+  if (args === 'interfaces'){
+    const interfaces = require('../../core/net/interfaces');
+
+    try {
+      var arr = interfaces.getAll();
+      arr.forEach(function (item, i, arr) {
+        io.writeLine(i + ': ' + item.name);
+      });
+    } catch (err) {
+      io.setColor('red');
+      io.writeLine('Unable to get network interfaces');
+
+      return res(1);
+    }
+
+  } else if (args === '') {
+    io.setColor('red');
+    io.writeLine('NetInfo testing tool.');
+    io.writeLine('Created by ivan770');
+    io.writeLine('');
+    io.setColor('green');
+    io.writeLine('interfaces - Get all network interfaces');
+    io.writeLine('stats - Get network usage stats');
+    io.writeLine('ip - Get IPv4 addresses');
+  } else if (args === 'stats') {
+    const netstat = require('../../core/net/net-stat');
+
+    try {
+      var receiveCount = netstat.receiveCount;
+      var transmitCount = netstat.transmitCount;
+      io.writeLine(`'Receive: ${receiveCount}'`);
+      io.writeLine(`'Transmit: ${transmitCount}'`);
+    } catch (err) {
+      io.setColor('red');
+      io.writeLine('Unable to get network stats');
+
+      return res(1);
+    }
+  } else if (args === 'ip'){
+    const ip = require('../../core/net/ip4-address');
+
+    var IPLoopback = ip.LOOPBACK;
+    var IPAny = ip.ANY;
+    var IPBroadcast = ip.BROADCAST;
+    io.writeLine(`'IPV4 Loopback: ${IPLoopback}'`);
+    io.writeLine(`'IPV4 Any: ${IPAny}'`);
+    io.writeLine(`'IPV4 Broadcast: ${IPBroadcast}'`);
+
+  /* } else if (args === 'mac') {
+    const mac = require('../../core/net/mac-address');
+
+    var MACBroadcast = mac.BROADCAST;
+    io.writeLine(`'MAC Broadcast: ${MACBroadcast}'`); */
+
+  } else {
+    io.setColor('red')
+    io.writeLine(`'Invalid argument : ${args}'`);
+
+    return res(1);
+  }
+
+  return res(0);
+}
+
+exports.call = main;
+
+exports.commands = ['netinfo'];

js/core/stdio/default.js

@@ -49,6 +49,7 @@ defaultStdio.onsetbackgroundcolor = (bg) => {
 };
 
 defaultStdio.onmoveto = (x, y) => tty.moveTo(x, y);
+defaultStdio.onmoveoffset = (offset) => tty.moveOffset(offset);
 
 defaultStdio.onread = (cb) => tty.read(cb);
 

js/core/stdio/interface.js

@@ -23,6 +23,7 @@ class StdioInterface {
     this.onsetcolor = () => {};
     this.onsetbackgroundcolor = () => {};
     this.onmoveto = () => {};
+    this.onmoveoffset = () => {};
 
     this.write = this.write.bind(this);
     this.writeError = this.writeError.bind(this);
@@ -62,6 +63,9 @@ class StdioInterface {
   moveTo (x, y) {
     this.onmoveto(x, y);
   }
+  moveOffset (offset) {
+    this.onmoveoffset(offset);
+  }
 
   clear () {
     this.onclear();

package-lock.json

@@ -46,6 +46,7 @@
     "buffer": "^4.3.0",
     "commander": "1.2.0",
     "constants-browserify": "^1.0.0",
+    "debug": "^3.1.0",
     "diff_match_patch": "0.1.1",
     "eshttp": "git+https://github.com/JsOS-Team/eshttp.git",
     "event-controller": "^1.0.1",