js/service/*, js/utils

Author: Face Kapow

js/service/dhcp-client/dhcp-options.js

@@ -20,27 +20,19 @@ exports.OPTION_ADDRESS_TIME = 51;
 exports.OPTION_MESSAGE_TYPE = 53;
 exports.OPTION_SERVER_ID = 54;
 
-exports.find = function(options, id, minLength) {
-  minLength = minLength || 0;
-
-  for (var i = 0; i < options.length; ++i) {
-    if (options[i].id === id && options[i].bytes.length >= minLength) {
-      return options[i].bytes;
-    }
+exports.find = (options, id, minLength = 0) => {
+  for (const opt of options) {
+    if (opt.id === id && opt.bytes.length >= minLength) return opt.bytes;
   }
-
   return null;
 };
 
-exports.findAll = function(options, id, minLength) {
-  minLength = minLength || 0;
-  var result = [];
-
-  for (var i = 0; i < options.length; ++i) {
-    if (options[i].id === id && options[i].bytes.length >= minLength) {
-      result.push(options[i].bytes);
+exports.findAll = (options, id, minLength = 0) => {
+  const result = [];
+  for (const opt of options) {
+    if (opt.id === id && opt.bytes.length >= minLength) {
+      result.push(opt.bytes);
     }
   }
-
   return result;
 };

js/service/dhcp-client/dhcp-packet.js

@@ -13,15 +13,14 @@
 // limitations under the License.
 
 'use strict';
-var u8view = require('u8-view');
-var runtime = require('../../core');
-var IP4Address = runtime.net.IP4Address;
+const u8view = require('u8-view');
+const { IP4Address } = require('../../core').net;
 
-var OPERATION_REQUEST = 1;
-var OPERATION_RESPONSE = 2;
+const OPERATION_REQUEST = 1;
+const OPERATION_RESPONSE = 2;
 
-var OPTIONS_OFFSET = 28 + 16 + 192;
-var magicCookie = 0x63825363;
+const OPTIONS_OFFSET = 28 + 16 + 192;
+const magicCookie = 0x63825363;
 
 exports.packetType = {
   DISCOVER: 1,
@@ -31,19 +30,14 @@ exports.packetType = {
   ACK: 5,
   NAK: 6,
   RELEASE: 7,
-  INFORM: 8
+  INFORM: 8,
 };
 
-exports.create = function(type, srcMAC, options) {
-  var i, j;
-  options = options || [];
+exports.create = (type, srcMAC, options = []) => {
+  let optionsLength = 8; // cookie (4b), type (3b) and 0xff (1b)
+  for (const opt of options) optionsLength += opt.bytes.length + 2; // id (1b) and len (1b)
 
-  var optionsLength = 8; // cookie (4b), type (3b) and 0xff (1b)
-  for (i = 0; i < options.length; ++i) {
-    optionsLength += options[i].bytes.length + 2; // id (1b) and len (1b)
-  }
-
-  var u8 = new Uint8Array(OPTIONS_OFFSET + optionsLength);
+  const u8 = new Uint8Array(OPTIONS_OFFSET + optionsLength);
   u8[0] = OPERATION_REQUEST; // request
   u8[1] = 1; // over ethernet
   u8[2] = 6; // hw address 6 bytes
@@ -63,70 +57,47 @@ exports.create = function(type, srcMAC, options) {
   u8[33] = srcMAC.f;
   u8view.setUint32BE(u8, OPTIONS_OFFSET, magicCookie);
 
-  var optionsOffset = OPTIONS_OFFSET + 4;
+  let optionsOffset = OPTIONS_OFFSET + 4;
 
   // Option: DHCP Message
   u8[optionsOffset++] = 53; // id
   u8[optionsOffset++] = 1;  // len
   u8[optionsOffset++] = type;
 
   // Other options
-  for (i = 0; i < options.length; ++i) {
-    var option = options[i];
+  for (const option of options) {
     u8[optionsOffset++] = option.id; // id
     u8[optionsOffset++] = option.bytes.length & 0xff;  // len
-    for (j = 0; j < option.bytes.length; ++j) {
-      u8[optionsOffset++] = option.bytes[j] >>> 0;
-    }
+    for (const byte of option.bytes) u8[optionsOffset++] = byte >>> 0;
   }
 
   u8[optionsOffset] = 255; // end of option list
   return u8;
 };
 
-exports.getOperation = function(u8) {
-  return u8[0];
-};
-
-exports.getRequestId = function(u8) {
-  return u8view.getUint32BE(u8, 4);
-};
-
-exports.getYourIP = function(u8) {
-  return new IP4Address(u8[16], u8[17], u8[18], u8[19]);
-};
-
-exports.getServerIP = function(u8) {
-  return new IP4Address(u8[20], u8[21], u8[22], u8[23]);
-};
+exports.getOperation = u8 => u8[0];
+exports.getRequestId = u8 => u8view.getUint32BE(u8, 4);
+exports.getYourIP = u8 => new IP4Address(u8[16], u8[17], u8[18], u8[19]);
+exports.getServerIP = u8 => new IP4Address(u8[20], u8[21], u8[22], u8[23]);
+exports.isValidMagicCookie = u8 => magicCookie === u8view.getUint32BE(u8, OPTIONS_OFFSET);
 
-exports.isValidMagicCookie = function(u8) {
-  return magicCookie === u8view.getUint32BE(u8, OPTIONS_OFFSET);
-};
-
-exports.getOptions = function(u8) {
-  var i, j;
-  var options = [];
+exports.getOptions = (u8) => {
+  let i;
+  let j;
+  const options = [];
   for (i = OPTIONS_OFFSET + 4; i < u8.length; ++i) {
-    var optId = u8[i++];
-    var optLen = u8[i++];
-
-    if (0xff === optId) {
-      break;
-    }
+    const optId = u8[i++];
+    const optLen = u8[i++];
 
-    if (0x00 === optId) {
-      continue;
-    }
+    if (optId === 0xff) break;
+    if (optId === 0x00) continue;
 
-    var bytes = [];
-    for (j = 0; j < optLen; ++j) {
-      bytes.push(u8[i++]);
-    }
+    const bytes = [];
+    for (j = 0; j < optLen; ++j) bytes.push(u8[i++]);
 
     options.push({
       id: optId,
-      bytes: bytes
+      bytes,
     });
 
     --i;

js/service/dhcp-client/index.js

@@ -13,118 +13,103 @@
 // limitations under the License.
 
 'use strict';
-var dhcpPacket = require('./dhcp-packet');
-var dhcpOptions = require('./dhcp-options');
-var runtime = require('../../core');
-var IP4Address = runtime.net.IP4Address;
-
-var STATE_IDLE = 0;
-var STATE_DISCOVER_SENT = 1;
-var STATE_REQUEST_SENT = 2;
-var STATE_ACK_RECEIVED = 2;
-var STATE_ERROR = 3;
-
-function sendPacket(socket, srcMAC, type, serverIP, yourIP) {
+const dhcpPacket = require('./dhcp-packet');
+const dhcpOptions = require('./dhcp-options');
+const runtime = require('../../core');
+const { IP4Address } = runtime.net;
+
+const STATE_IDLE = 0;
+const STATE_DISCOVER_SENT = 1;
+const STATE_REQUEST_SENT = 2;
+const STATE_ACK_RECEIVED = 2;
+// const STATE_ERROR = 3;
+
+const sendPacket = (socket, srcMAC, type, serverIP, yourIP) => {
   // Request info option
-  var opt55 = {id: 55, bytes: [
-    1, // subnet
-    3, // router
-    6  // dns
-  ]};
+  const opt55 = {
+    id: 55,
+    bytes: [
+      1, // subnet
+      3, // router
+      6, // dns
+    ],
+  };
 
-  var options;
+  let options;
   if (serverIP && yourIP) {
-    var opt54 = {id: 54, bytes: [serverIP.a, serverIP.b, serverIP.c, serverIP.d]};
-    var opt50 = {id: 50, bytes: [yourIP.a, yourIP.b, yourIP.c, yourIP.d]};
+    const opt54 = { id: 54, bytes: [serverIP.a, serverIP.b, serverIP.c, serverIP.d] };
+    const opt50 = { id: 50, bytes: [yourIP.a, yourIP.b, yourIP.c, yourIP.d] };
     options = [opt55, opt54, opt50];
   } else {
     options = [opt55];
   }
 
-  var u8 = dhcpPacket.create(type, srcMAC, options);
+  const u8 = dhcpPacket.create(type, srcMAC, options);
   socket.send(IP4Address.BROADCAST, 67, u8);
-}
+};
 
-function checkPacket(u8) {
-  var op = dhcpPacket.getOperation(u8);
-  if (op !== dhcpPacket.OPERATION_RESPONSE) {
-    return false;
-  }
+const checkPacket = (u8) => {
+  const op = dhcpPacket.getOperation(u8);
 
-  if (!dhcpPacket.isValidMagicCookie(u8)) {
-    return false;
-  }
+  if (op !== dhcpPacket.OPERATION_RESPONSE) return false;
+  if (!dhcpPacket.isValidMagicCookie(u8)) return false;
 
   return true;
-}
+};
 
-function optionToIP(options, id) {
-  var option = dhcpOptions.find(options, id, 4);
-  if (!option) {
-    return IP4Address.ANY;
-  }
+const optionToIP = (options, id) => {
+  const option = dhcpOptions.find(options, id, 4);
+  if (!option) return IP4Address.ANY;
 
   return new IP4Address(option[0], option[1], option[2], option[3]);
-}
+};
 
-function optionToIPsArray(options, id) {
-  var selected = dhcpOptions.findAll(options, id, 4);
-  var result = [];
-  for (var i = 0, l = selected.length; i < l; ++i) {
-    result.push(new IP4Address(selected[i][0], selected[i][1], selected[i][2], selected[i][3]));
-  }
+const optionToIPsArray = (options, id) => {
+  const selected = dhcpOptions.findAll(options, id, 4);
+  const result = [];
+  for (const sel of selected) result.push(new IP4Address(sel[0], sel[1], sel[2], sel[3]));
 
   return result;
-}
+};
 
-function dhcpConfigure(intf, cb) {
-  var macAddress = intf.getMACAddress();
-  var socket = new runtime.net.UDPSocket();
-  var clientState = STATE_IDLE;
+const dhcpConfigure = (intf, cb) => {
+  const macAddress = intf.getMACAddress();
+  const socket = new runtime.net.UDPSocket();
+  let clientState = STATE_IDLE;
 
-  function handleOffer(serverIP, yourIP, options) {
-    var serverId = optionToIP(options, dhcpOptions.OPTION_SERVER_ID);
-    if (serverId.isAny()) {
-      serverId = serverIP;
-    }
+  const handleOffer = (serverIP, yourIP, options) => {
+    let serverId = optionToIP(options, dhcpOptions.OPTION_SERVER_ID);
+    if (serverId.isAny()) serverId = serverIP;
 
     sendPacket(socket, macAddress, dhcpPacket.packetType.REQUEST, serverId, yourIP);
     clientState = STATE_REQUEST_SENT;
-  }
+  };
 
-  function handleAck(serverIP, yourIP, options) {
+  const handleAck = (serverIP, yourIP, options) => {
     clientState = STATE_ACK_RECEIVED;
-    var subnetMask = optionToIP(options, dhcpOptions.OPTION_SUBNET_MASK);
-    var routerIPs = optionToIPsArray(options, dhcpOptions.OPTION_ROUTER);
-    var dnsIPs = optionToIPsArray(options, dhcpOptions.OPTION_DOMAIN);
 
     return cb({
       ip: yourIP,
-      mask: subnetMask,
-      routers: routerIPs,
-      dns: dnsIPs
+      mask: optionToIP(options, dhcpOptions.OPTION_SUBNET_MASK),
+      routers: optionToIPsArray(options, dhcpOptions.OPTION_ROUTER),
+      dns: optionToIPsArray(options, dhcpOptions.OPTION_DOMAIN),
     });
-  }
+  };
 
-  function parseMessage(serverIP, u8) {
-    if (!checkPacket(u8)) {
-      return;
-    }
+  const parseMessage = (serverIP, u8) => {
+    if (!checkPacket(u8)) return;
 
-    var options = dhcpPacket.getOptions(u8);
-    var messageTypeOption = dhcpOptions.find(options, dhcpOptions.OPTION_MESSAGE_TYPE, 1);
+    const options = dhcpPacket.getOptions(u8);
+    const messageTypeOption = dhcpOptions.find(options, dhcpOptions.OPTION_MESSAGE_TYPE, 1);
 
-    if (!messageTypeOption) {
-      return;
-    }
+    if (!messageTypeOption) return;
 
-    var messageType = messageTypeOption[0];
-    var yourIP = dhcpPacket.getYourIP(u8);
+    const messageType = messageTypeOption[0];
+    const yourIP = dhcpPacket.getYourIP(u8);
 
     // debug('GOT response', messageType, JSON.stringify(options));
 
-    if (clientState === STATE_DISCOVER_SENT &&
-        messageType === dhcpPacket.packetType.OFFER) {
+    if (clientState === STATE_DISCOVER_SENT && messageType === dhcpPacket.packetType.OFFER) {
       handleOffer(serverIP, yourIP, options);
       return;
     }
@@ -133,31 +118,31 @@ function dhcpConfigure(intf, cb) {
       handleAck(serverIP, yourIP, options);
       return;
     }
-  }
+  };
 
-  function err(e) {
+  /* const err = (e) => {
     clientState = STATE_ERROR;
     debug(e.stack);
-  }
+  }; */
 
-  socket.onmessage = function(ip, port, u8) {
+  socket.onmessage = (ip, port, u8) => {
     debug('CLIENT OK', ip, port, u8);
     parseMessage(ip, u8);
   };
 
   socket.bindToInterface(intf, 68);
   sendPacket(socket, macAddress, dhcpPacket.packetType.DISCOVER, null, null);
   clientState = STATE_DISCOVER_SENT;
-}
+};
 
-runtime.net.onInterfaceAdded.add(function(intf) {
+runtime.net.onInterfaceAdded.add((intf) => {
   debug('intf add');
 
-  dhcpConfigure(intf, function(config) {
+  dhcpConfigure(intf, (config) => {
     debug('configure dhcp ok', JSON.stringify(config));
     intf.configure(config.ip, config.mask);
 
-    var subnet = config.ip.and(config.mask);
+    const subnet = config.ip.and(config.mask);
     runtime.net.route.addSubnet(subnet, config.mask, null, intf);
     runtime.net.route.addDefault(config.routers[0], intf);
     intf.setNetworkEnabled(true);

js/service/dns-resolver/index.js

@@ -13,5 +13,5 @@
 // limitations under the License.
 
 'use strict';
-var DNSClient = require('../../component/dns-client');
+const DNSClient = require('../../component/dns-client');
 module.exports = new DNSClient();