Update 'README.md'

README.md

@@ -5,7 +5,7 @@ digd.js
 | [dig.js](https://git.coolaj86.com/coolaj86/dig.js)
 | [mdig.js](https://git.coolaj86.com/coolaj86/mdig.js)
 | **digd.js**
-| Sponsored by [Daplie](https://daplie.com).
+| A [Root project](https://rootprojects.org).
 
 A lightweight DNS / mDNS daemon (server) in node.js.
 
@@ -39,8 +39,7 @@ npm install -g 'git+https://git.coolaj86.com/coolaj86/digd.js.git#v1.2.0'
 
 ### without git
 
-Don't have git? Well, you can also bow down to the gods of the centralized, monopolized, concentrated, *dictator*net
+Don't have git? You can use npm's centralized repository:
-(as we like to call it here at Daplie Labs), if that's how you roll:
 
 ```bash
 npm install -g digd.js

dist/etc/systemd/system/digd.js.service

@@ -8,7 +8,7 @@ Wants=network-online.target systemd-networkd-wait-online.service
 # Restart on crash (bad signal), but not on 'clean' failure (error exit code)
 # Allow up to 3 restarts within 10 seconds
 # (it's unlikely that a user or properly-running script will do this)
-Restart=on-abnormal
+Restart=always
 StartLimitInterval=10
 StartLimitBurst=3
 

lib/tcpd.js

@@ -27,10 +27,9 @@ module.exports.create = function (cli, dnsd) {
 
         // TODO pad two bytes for lengths
         dnsd.onMessage(nb, function (err, newAb, dbgmsg) {
+          var lenbuf = Buffer.from([ newAb.length >> 8, newAb.length & 255 ]);
           // TODO XXX generate legit error packet
           if (err) { console.error("Error", err); c.end(); return; }
-
-          var lenbuf = Buffer.from([ newAb.length >> 8, newAb.length & 255 ]);
           console.log('TCP ' + dbgmsg);
 
           c.write(lenbuf);
@@ -54,11 +53,10 @@ module.exports.create = function (cli, dnsd) {
         process.exit(0);
       }
       console.error("TCP Server Error:");
-      console.error(err.stack);
+      console.error(err);
       tcpServer.close(function () {
         setTimeout(runTcp, 1000);
       });
-      //throw new Error(err);
     });
 
     tcpServer.listen(cli.port, function () {

lib/udpd.js

@@ -1,66 +1,58 @@
 'use strict';
 
 module.exports.create = function (cli, dnsd) {
-  function runUdp() {
+  var server = require('dgram').createSocket({
-    var server = require('dgram').createSocket({
+    type: cli.udp6 ? 'udp6' : 'udp4'
-      type: cli.udp6 ? 'udp6' : 'udp4'
+  , reuseAddr: true
-    , reuseAddr: true
+  });
-    });
+  server.bind({
-    server.bind({
+    port: cli.port
-      port: cli.port
+  , address: cli.address
-    , address: cli.address
+  });
-    });
 
-    var handlers = {};
+  var handlers = {};
-    handlers.onError = function (err) {
+  handlers.onError = function (err) {
-      if ('EACCES' === err.code) {
+    if ('EACCES' === err.code) {
-        console.error("");
+      console.error("");
-        console.error("EACCES: Couldn't bind to port. You probably need to use sudo, authbind, or setcap.");
+      console.error("EACCES: Couldn't bind to port. You probably need to use sudo, authbind, or setcap.");
-        console.error("");
+      console.error("");
-        process.exit(123);
+      process.exit(123);
-        return;
+      return;
-      }
+    }
-      console.error("UDP Server Error:");
+    console.error("error:", err.stack);
-      console.error(err.stack);
+    server.close();
-      server.close(function () {
+  };
-        setTimeout(runUdp, 1000);
+
+  handlers.onMessage = function (nb, rinfo) {
+    //console.log('[DEBUG] got a UDP message', nb.length);
+    //console.log(nb.toString('hex'));
+
+    dnsd.onMessage(nb, function (err, newAb, dbgmsg) {
+      // TODO send legit error message
+      if (err) { server.send(Buffer.from([0x00])); return; }
+      server.send(newAb, rinfo.port, rinfo.address, function () {
+        console.log(dbgmsg, rinfo.port, rinfo.address);
       });
-      //throw new Error(err);
+    });
-    };
+  };
 
-    handlers.onMessage = function (nb, rinfo) {
+  handlers.onListening = function () {
-      //console.log('[DEBUG] got a UDP message', nb.length);
+    /*jshint validthis:true*/
-      //console.log(nb.toString('hex'));
+    var server = this;
 
-      dnsd.onMessage(nb, function (err, newAb, dbgmsg) {
+    if (cli.mdns || '224.0.0.251' === cli.nameserver) {
-        // TODO send legit error message
+      server.setBroadcast(true);
-        if (err) { server.send(Buffer.from([0x00]), rinfo.port, rinfo.address); return; }
+      server.addMembership(cli.nameserver);
-        server.send(newAb, rinfo.port, rinfo.address, function () {
+    }
-          console.log('[dnsd.onMessage] ' + dbgmsg, rinfo.port, rinfo.address);
-        });
-      });
-    };
 
-    handlers.onListening = function () {
+    console.log('');
-      /*jshint validthis:true*/
+    console.log('Bound and Listening:');
-      var server = this;
+    console.log(server.address().address + '#' + server.address().port + ' (' + server.type + ')');
+  };
 
-      if (cli.mdns || '224.0.0.251' === cli.nameserver) {
+  server.on('error', handlers.onError);
-        server.setBroadcast(true);
+  server.on('message', handlers.onMessage);
-        server.addMembership(cli.nameserver);
+  server.on('listening', handlers.onListening);
-      }
 
-      console.log('');
+  return server;
-      console.log('Bound and Listening:');
-      console.log(server.address().address + '#' + server.address().port + ' (' + server.type + ')');
-    };
-
-    server.on('error', handlers.onError);
-    server.on('message', handlers.onMessage);
-    server.on('listening', handlers.onListening);
-
-    return server;
-  }
-
-  return runUdp();
 };

package.json

@@ -1,6 +1,6 @@
 {
   "name": "digd.js",
-  "version": "1.2.2",
+  "version": "1.2.1",
   "description": "A lightweight DNS / mDNS daemon (server) for creating and capturing DNS and mDNS query and response packets to disk as binary and/or JSON. Options are similar to the Unix dig command.",
   "main": "bin/digd.js",
   "homepage": "https://git.coolaj86.com/coolaj86/digd.js",